Compare commits
4 Commits
66d3ffd0d0
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
537d81beb1 | ||
|
|
25c4bf7ad1 | ||
|
|
3e88e757a8 | ||
|
|
e5ac5fa492 |
45
.drone.yml
Normal file
45
.drone.yml
Normal 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
8
Dockerfile
Normal 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"]
|
||||
@@ -141,6 +141,9 @@
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<mainClass>com.jsh.erp.ErpApplication</mainClass>
|
||||
</configuration>
|
||||
<version>2.0.3.RELEASE</version>
|
||||
<executions>
|
||||
<execution>
|
||||
|
||||
@@ -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.driverClassName=com.mysql.cj.jdbc.Driver
|
||||
spring.datasource.username=root
|
||||
spring.datasource.password=123456
|
||||
spring.datasource.password=Qweewqzzx1
|
||||
#mybatis-plus配置
|
||||
mybatis-plus.mapper-locations=classpath:./mapper_xml/*.xml
|
||||
# Redis
|
||||
spring.redis.host=127.0.0.1
|
||||
spring.redis.port=6379
|
||||
spring.redis.password=1234abcd
|
||||
spring.redis.password=
|
||||
#租户对应的角色id
|
||||
manage.roleId=10
|
||||
#租户允许创建的用户数
|
||||
|
||||
6
jshERP-web/public/index.html
vendored
6
jshERP-web/public/index.html
vendored
@@ -5,7 +5,7 @@
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<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系统,进销存,进销存系统" />
|
||||
<link rel="icon" href="<%= BASE_URL %>static/favicon.ico">
|
||||
<style>
|
||||
@@ -248,7 +248,7 @@
|
||||
if (ajax.readyState===4 &&ajax.status===200) {
|
||||
res = ajax.responseText;
|
||||
} else {
|
||||
res = 'ERP系统';
|
||||
res = 'MileStone Co. ERP';
|
||||
}
|
||||
}
|
||||
ajax.open('get', url, false);
|
||||
@@ -295,7 +295,7 @@ translate.language.setLocal('chinese_simplified');
|
||||
translate.service.use('client.edge');
|
||||
//翻译自定义
|
||||
translate.nomenclature.append('chinese_simplified','english',`
|
||||
管伊佳ERP=GuanYiJia
|
||||
MileStone Co. ERP=MileStone Co. ERP
|
||||
`)
|
||||
//开启html页面变化的监控,对变化部分会进行自动翻译
|
||||
translate.listener.start();
|
||||
|
||||
@@ -193,7 +193,7 @@
|
||||
background-size: 100%;
|
||||
position: relative;
|
||||
width: 340px;
|
||||
height: 460px;
|
||||
height: 500px;
|
||||
background: rgba(255, 255, 255, 1);
|
||||
border-radius: 8px;
|
||||
right: 0;
|
||||
@@ -212,24 +212,28 @@
|
||||
text-align: center;
|
||||
|
||||
.header {
|
||||
height: 44px;
|
||||
line-height: 44px;
|
||||
margin-top: 35px;
|
||||
margin-bottom: 35px;
|
||||
height: auto;
|
||||
line-height: 1.3;
|
||||
margin-top: 30px;
|
||||
margin-bottom: 30px;
|
||||
text-align: center;
|
||||
.title {
|
||||
font-size: 35px;
|
||||
color: #666;
|
||||
font-size: 28px;
|
||||
background: linear-gradient(135deg, #1890ff, #722ed1);
|
||||
-webkit-background-clip: text;
|
||||
-webkit-text-fill-color: transparent;
|
||||
background-clip: text;
|
||||
font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
|
||||
font-weight: 700;
|
||||
position: relative;
|
||||
top: 2px;
|
||||
letter-spacing: 1px;
|
||||
display: inline;
|
||||
}
|
||||
.desc {
|
||||
font-size: 16px;
|
||||
color: #666;
|
||||
margin-top: 12px;
|
||||
margin-left: 10px;
|
||||
margin-bottom: 40px;
|
||||
font-size: 14px;
|
||||
color: #999;
|
||||
margin-top: 4px;
|
||||
margin-left: 8px;
|
||||
display: inline;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<span class="action" v-if="showAd">
|
||||
<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" />
|
||||
<span>管伊佳ERP网络版198元1年</span>
|
||||
<span>MileStone Co. ERP</span>
|
||||
</a>
|
||||
</span>
|
||||
<!-- update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
|
||||
|
||||
@@ -131,7 +131,7 @@
|
||||
<div slot="content">
|
||||
<img src="/static/weixin.jpg" style="width:258px" />
|
||||
</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>
|
||||
© 2015-2030 {{systemTitle}} V3.6
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user