Compare commits

..

3 Commits

Author SHA1 Message Date
root
25c4bf7ad1 rebrand: rename to MileStone Co. ERP
All checks were successful
continuous-integration/drone/push Build is passing
2026-02-15 13:31:44 +01:00
root
3e88e757a8 Switch to Docker pipeline for Drone CI 2026-02-14 19:24:12 +01:00
root
e5ac5fa492 Add Dockerfile, Drone CI config, fix main class 2026-02-14 19:23:34 +01:00
7 changed files with 63 additions and 7 deletions

45
.drone.yml Normal file
View File

@@ -0,0 +1,45 @@
kind: pipeline
type: docker
name: build-and-deploy
steps:
- name: build-backend
image: maven:3.9-amazoncorretto-8
commands:
- cd jshERP-boot
- mvn package -DskipTests
volumes:
- name: maven-cache
path: /root/.m2
- name: build-frontend
image: node:18-alpine
commands:
- cd jshERP-web
- npm install --legacy-peer-deps
- npx vue-cli-service build
- name: docker-build-deploy
image: docker:dind
volumes:
- name: docker-sock
path: /var/run/docker.sock
commands:
- docker build -t jsherp:latest .
- docker stop jsherp || true
- docker rm jsherp || true
- docker run -d --name jsherp --network host -v /opt/jshERP/upload:/opt/jshERP/upload --restart unless-stopped jsherp:latest
volumes:
- name: maven-cache
host:
path: /root/.m2
- name: docker-sock
host:
path: /var/run/docker.sock
trigger:
branch:
- master
event:
- push

8
Dockerfile Normal file
View File

@@ -0,0 +1,8 @@
FROM amazoncorretto:8-alpine
RUN apk add --no-cache fontconfig ttf-dejavu
WORKDIR /app
COPY jshERP-boot/target/jshERP.jar /app/jshERP.jar
COPY jshERP-web/dist /app/static
RUN mkdir -p /opt/jshERP/upload /opt/tmp/tomcat
EXPOSE 9999
ENTRYPOINT ["java", "-jar", "/app/jshERP.jar"]

View File

@@ -141,6 +141,9 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>com.jsh.erp.ErpApplication</mainClass>
</configuration>
<version>2.0.3.RELEASE</version> <version>2.0.3.RELEASE</version>
<executions> <executions>
<execution> <execution>

View File

@@ -7,13 +7,13 @@ server.servlet.context-path=/jshERP-boot
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false spring.datasource.url=jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false
spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=123456 spring.datasource.password=Qweewqzzx1
#mybatis-plus配置 #mybatis-plus配置
mybatis-plus.mapper-locations=classpath:./mapper_xml/*.xml mybatis-plus.mapper-locations=classpath:./mapper_xml/*.xml
# Redis # Redis
spring.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password=1234abcd spring.redis.password=
#租户对应的角色id #租户对应的角色id
manage.roleId=10 manage.roleId=10
#租户允许创建的用户数 #租户允许创建的用户数

View File

@@ -5,7 +5,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta name="description" content="基于SpringBoot框架立志为中小企业提供开源好用的ERP软件目前专注进销存+财务功能。主要模块有零售管理、采购管理、销售管理、仓库管理、财务管理、报表查询、基础数据、系统管理等。" /> <meta name="description" content="MileStone Industrial Development Corporation ERP System" />
<meta name="keywords" content="erp,erp系统,进销存,进销存系统" /> <meta name="keywords" content="erp,erp系统,进销存,进销存系统" />
<link rel="icon" href="<%= BASE_URL %>static/favicon.ico"> <link rel="icon" href="<%= BASE_URL %>static/favicon.ico">
<style> <style>
@@ -248,7 +248,7 @@
if (ajax.readyState===4 &&ajax.status===200) { if (ajax.readyState===4 &&ajax.status===200) {
res = ajax.responseText; res = ajax.responseText;
} else { } else {
res = 'ERP系统'; res = 'MileStone Co. ERP';
} }
} }
ajax.open('get', url, false); ajax.open('get', url, false);
@@ -295,7 +295,7 @@ translate.language.setLocal('chinese_simplified');
translate.service.use('client.edge'); translate.service.use('client.edge');
//翻译自定义 //翻译自定义
translate.nomenclature.append('chinese_simplified','english',` translate.nomenclature.append('chinese_simplified','english',`
管伊佳ERP=GuanYiJia MileStone Co. ERP=MileStone Co. ERP
`) `)
//开启html页面变化的监控对变化部分会进行自动翻译 //开启html页面变化的监控对变化部分会进行自动翻译
translate.listener.start(); translate.listener.start();

View File

@@ -3,7 +3,7 @@
<span class="action" v-if="showAd"> <span class="action" v-if="showAd">
<a v-if="theme==='light'" class="ad_title" target="_blank" :href="payFeeUrl"> <a v-if="theme==='light'" class="ad_title" target="_blank" :href="payFeeUrl">
<a-icon type="cloud" theme="filled" style="color: yellow; font-size: 16px; line-height: 16px; padding-right: 5px" /> <a-icon type="cloud" theme="filled" style="color: yellow; font-size: 16px; line-height: 16px; padding-right: 5px" />
<span>管伊佳ERP网络版198元1年</span> <span>MileStone Co. ERP</span>
</a> </a>
</span> </span>
<!-- update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航 --> <!-- update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->

View File

@@ -131,7 +131,7 @@
<div slot="content"> <div slot="content">
<img src="/static/weixin.jpg" style="width:258px" /> <img src="/static/weixin.jpg" style="width:258px" />
</div> </div>
<a-button type="link" v-if="showWeixinSpan()">管伊佳ERP微信小程序</a-button> <a-button type="link" v-if="showWeixinSpan()">MileStone Co. ERP</a-button>
</a-popover> </a-popover>
&copy; 2015-2030 {{systemTitle}} V3.6 &copy; 2015-2030 {{systemTitle}} V3.6
</div> </div>