manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配置参数和脚本优化

Browse Source
This commit is contained in:
thinkgem
2022-04-24 17:48:16 +08:00
parent 93a09be05d
commit 6dce23a32f
22 changed files with 106 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/src/main/resources/templates/modules/gen/config.xml
View File

@@ -212,7 +212,6 @@
<template>module_cloud/client/bin/package.sh.xml</template>
<template>module_cloud/client/src/main/java/package.xml</template>
<template>module_cloud/client/pom.xml</template>
<template>module_cloud/web/bin/docker/app.xml</template>
<template>module_cloud/web/bin/docker/Dockerfile.xml</template>
<template>module_cloud/web/bin/docker-build.bat.xml</template>
<template>module_cloud/web/bin/docker-build.sh.xml</template>

18
modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
View File

@@ -5,30 +5,26 @@
<name>Dockerfile</name>
<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin/docker</filePath>
<fileName>Dockerfile</fileName>
<content><![CDATA[FROM frolvlad/alpine-java:jdk8-slim
<content><![CDATA[FROM openjdk:8-slim
LABEL maintainer="ThinkGem@163.com"
ENV TZ "Asia/Shanghai"
ENV LANG C.UTF-8
VOLUME /tmp
WORKDIR /app
#RUN mkdir WEB-INF
#ADD jeesite.lic ./WEB-INF
ADD ./maven/web.war ./app.war
RUN jar -xvf app.war
#RUN chmod -R 755 ./*
WORKDIR /app/WEB-INF
ADD ./app.yml ./classes/config/bootstrap-prod.yml
#ADD jeesite.lic ./
#ENV JAVA_OPTS "-Xms256m -Xmx1024m"
#ENV JAVA_OPTS "$JAVA_OPTS -Xms256m -Xmx1024m"
ENV JAVA_OPTS "$JAVA_OPTS -Dspring.profiles.active=prod"
ENTRYPOINT java -cp /app $JAVA_OPTS org.springframework.boot.loader.WarLauncher
ENTRYPOINT jar -xvf app.war && rm app.war && cd WEB-INF && sh startup.sh
EXPOSE 8983
#docker run -p 8983:8983 com.jeesite/jeesite-cloud-module-${moduleCode}:5.0
#docker run -p 8983:8983 thinkgem/jeesite-cloud-module-${moduleCode}:5.0
]]>
</content>
</template>

62
modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml
View File

@@ -1,62 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
No deletion without permission, or be held responsible to law. -->
<template>
<name>app</name>
<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin/docker</filePath>
<fileName>app.yml</fileName>
<content><![CDATA[
#======================================#
#========== Cloud settings ============#
#======================================#
# 服务注册
eureka:
# 实例设置
instance:
# 实例主机名称
hostname: 10.0.2.15
# 实例是否允许使用IP
preferIpAddress: false
# 客户端设置
client:
# 注册中心地址（集群时指定另外一个注册中心地址）
serviceUrl.defaultZone: http://10.0.2.15:8970/eureka/
#======================================#
#========== Spring settings ===========#
#======================================#
spring:
# 分布式配置中心
cloud:
config:
discovery:
enabled: true
serviceId: jeesite-cloud-config
# Consul 服务发现
consul:
host: 10.0.2.15
port: 8500
discovery:
hostname: 10.0.2.15
preferIpAddress: false
# 服务注册和配置
nacos:
discovery:
server-addr: 10.0.2.15:8848
config:
server-addr: 10.0.2.15:8848
file-extension: yml
group: jeesite-cloud-50
ext-config:
- data-id: application.yml
group: jeesite-cloud-50
]]>
</content>
</template>

7
modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml
View File

@@ -28,10 +28,11 @@ rem 打包Web工程（结束）
rem 根据情况修改 web.jar 为您的 jar 包名称
mkdir web
copy web.war web
cd web
mkdir app
copy web.war app
cd app
jar -xvf web.war
del web.war
cd WEB-INF
call startup.bat

7
modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml
View File

@@ -25,10 +25,11 @@ cd target
# 根据情况修改 web.jar 为您的 jar 包名称
mkdir web
cp web.war ./web
cd web
mkdir app
cp web.war ./app
cd app
jar -xvf web.war
rm web.war
cd WEB-INF
exec ./startup.sh
]]>

2
modules/core/src/main/resources/views/modules/sys/user/empUserForm.html
View File

@@ -267,7 +267,7 @@ $("#empOfficeGrid").dataGrid({
}
});
<% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) {%>
<% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) { %>
// 加载角色列表
var roleGrid = $("#roleGrid").dataGrid({
url: '${ctx}/sys/role/treeData',

4
parent/pom.xml
View File

@@ -64,7 +64,9 @@
<eclipse-plugin-download-javadocs>false</eclipse-plugin-download-javadocs>
<!-- docker setting -->
<docker.run.port>8980:8980</docker.run.port>
<docker.dockerHost>http://192.168.56.102:2375</docker.dockerHost>
<docker.imageName>thinkgem/${project.artifactId}:5.0</docker.imageName>
<docker.run.port>8980:8980</docker.run.port>
</properties>

16
web-api/bin/docker/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM frolvlad/alpine-java:jdk8-slim
FROM openjdk:8-slim
LABEL maintainer="ThinkGem@163.com"
ENV TZ "Asia/Shanghai"
ENV LANG C.UTF-8
@@ -6,19 +6,15 @@ VOLUME /tmp
VOLUME /data
WORKDIR /app
#RUN mkdir WEB-INF
#ADD jeesite.lic ./WEB-INF
ADD ./maven/web.war ./app.war
RUN jar -xvf app.war
#RUN chmod -R 755 ./*
WORKDIR /app/WEB-INF
ADD ./app.yml ./classes/config/application-prod.yml
#ADD jeesite.lic ./
#ENV JAVA_OPTS "-Xms256m -Xmx1024m"
#ENV JAVA_OPTS "$JAVA_OPTS -Xms256m -Xmx1024m"
ENV JAVA_OPTS "$JAVA_OPTS -Dspring.profiles.active=prod"
ENTRYPOINT java -cp /app $JAVA_OPTS org.springframework.boot.loader.WarLauncher
ENTRYPOINT jar -xvf app.war && rm app.war && cd WEB-INF && sh startup.sh
EXPOSE 8980

26
web-api/bin/docker/app.yml
View File

@@ -1,26 +0,0 @@
# 数据库连接
jdbc:
# Mysql 数据库配置
type: mysql
driver: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.56.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
username: jeesite
password: jeesite
testSql: SELECT 1
# MyBatis 相关
mybatis:
# Mapper文件刷新线程
mapper:
refresh:
enabled: false
# 文件相关
file:
# 文件上传根路径，设置路径中不允许包含“userfiles”，在指定目录中系统会自动创建userfiles目录，如果不设置默认为contextPath路径
baseDir: /data

7
web-api/bin/run-web.bat
View File

@@ -20,10 +20,11 @@ rem
rem <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD> web.jar Ϊ<><CEAA><EFBFBD><EFBFBD> jar <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mkdir web
copy web.war web
cd web
mkdir app
copy web.war app
cd app
jar -xvf web.war
del web.war
cd WEB-INF
call startup.bat

7
web-api/bin/run-web.sh
View File

@@ -18,9 +18,10 @@ cd target
# 根据情况修改 web.jar 为您的 jar 包名称
mkdir web
cp web.war ./web
cd web
mkdir app
cp web.war ./app
cd app
jar -xvf web.war
rm web.war
cd WEB-INF
exec ./startup.sh

36
web-api/src/main/resources/config/application-prod.yml
View File

@@ -1,35 +1,41 @@
# 使用环境配置，只需 JVM 参数里加：-Dspring.profiles.active=prod
#======================================#
#========== Server settings ===========#
#======================================#
server:
port: 8980
servlet:
context-path: /js
#======================================#
#========== Database sttings ==========#
#======================================#
# 数据库连接
jdbc:
# Mysql 数据库配置
type: mysql
driver: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
username: root
password: 123456
url: jdbc:mysql://192.168.56.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
username: jeesite
password: jeesite
testSql: SELECT 1
#======================================#
#========== Spring settings ===========#
#======================================#
# 数据库连接池配置
pool:
# 初始化连接数
init: 1
# 最小连接数
minIdle: 3
# 最大连接数
maxActive: 20
# 日志配置
logging:
config: classpath:config/logback-spring-prod.xml
config: classpath:config/logback-spring-prod.xml
# MyBatis 相关
mybatis:
# Mapper文件刷新线程
mapper:
refresh:
enabled: false

2
web-api/src/main/webapp/WEB-INF/startup.sh
View File

@@ -16,7 +16,7 @@ echo ""
CLASS_PATH="$PWD/../"
# 优化JVM参数
JAVA_OPTS="-Xms512m -Xmx1024m"
# JAVA_OPTS="$JAVA_OPTS -Xms512m -Xmx1024m"
# 方式一、配置外部自定义的属性文件（建议）
# JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=$PWD/app.yml"

6
web-fast/bin/docker/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM frolvlad/alpine-java:jdk8-slim
FROM openjdk:8-slim
LABEL maintainer="ThinkGem@163.com"
ENV TZ "Asia/Shanghai"
ENV LANG C.UTF-8
@@ -6,9 +6,11 @@ VOLUME /tmp
VOLUME /data
WORKDIR /app
#ADD jeesite.lic ./
ADD ./maven/web.jar ./app.jar
#ENV JAVA_OPTS "-Xms256m -Xmx1024m"
#ENV JAVA_OPTS "$JAVA_OPTS -Xms256m -Xmx1024m"
ENV JAVA_OPTS "$JAVA_OPTS -Dspring.profiles.active=prod"
ENTRYPOINT java -jar $JAVA_OPTS app.jar

10
web-fast/src/main/resources/config/application-prod.yml
View File

@@ -12,6 +12,16 @@ jdbc:
password: jeesite
testSql: SELECT 1
# 数据库连接池配置
pool:
# 初始化连接数
init: 1
# 最小连接数
minIdle: 3
# 最大连接数
maxActive: 20
# 日志配置
logging:
config: classpath:config/logback-spring-prod.xml

2
web-fast/src/main/webapp/WEB-INF/startup.sh
View File

@@ -16,7 +16,7 @@ echo ""
CLASS_PATH="$PWD/../"
# 优化JVM参数
JAVA_OPTS="-Xms512m -Xmx1024m"
# JAVA_OPTS="$JAVA_OPTS -Xms512m -Xmx1024m"
# 方式一、配置外部自定义的属性文件（建议）
# JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=$PWD/app.yml"

16
web/bin/docker/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM frolvlad/alpine-java:jdk8-slim
FROM openjdk:8-slim
LABEL maintainer="ThinkGem@163.com"
ENV TZ "Asia/Shanghai"
ENV LANG C.UTF-8
@@ -6,19 +6,15 @@ VOLUME /tmp
VOLUME /data
WORKDIR /app
#RUN mkdir WEB-INF
#ADD jeesite.lic ./WEB-INF
ADD ./maven/web.war ./app.war
RUN jar -xvf app.war
#RUN chmod -R 755 ./*
WORKDIR /app/WEB-INF
ADD ./app.yml ./classes/config/application-prod.yml
#ADD jeesite.lic ./
#ENV JAVA_OPTS "-Xms256m -Xmx1024m"
#ENV JAVA_OPTS "$JAVA_OPTS -Xms256m -Xmx1024m"
ENV JAVA_OPTS "$JAVA_OPTS -Dspring.profiles.active=prod"
ENTRYPOINT java -cp /app $JAVA_OPTS org.springframework.boot.loader.WarLauncher
ENTRYPOINT jar -xvf app.war && rm app.war && cd WEB-INF && sh startup.sh
EXPOSE 8980

26
web/bin/docker/app.yml
View File

@@ -1,26 +0,0 @@
# 数据库连接
jdbc:
# Mysql 数据库配置
type: mysql
driver: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.56.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
username: jeesite
password: jeesite
testSql: SELECT 1
# MyBatis 相关
mybatis:
# Mapper文件刷新线程
mapper:
refresh:
enabled: false
# 文件相关
file:
# 文件上传根路径，设置路径中不允许包含“userfiles”，在指定目录中系统会自动创建userfiles目录，如果不设置默认为contextPath路径
baseDir: /data

7
web/bin/run-web.bat
View File

@@ -20,10 +20,11 @@ rem
rem <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD> web.jar Ϊ<><CEAA><EFBFBD><EFBFBD> jar <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mkdir web
copy web.war web
cd web
mkdir app
copy web.war app
cd app
jar -xvf web.war
del web.war
cd WEB-INF
call startup.bat

7
web/bin/run-web.sh
View File

@@ -18,9 +18,10 @@ cd target
# 根据情况修改 web.jar 为您的 jar 包名称
mkdir web
cp web.war ./web
cd web
mkdir app
cp web.war ./app
cd app
jar -xvf web.war
rm web.war
cd WEB-INF
exec ./startup.sh

36
web/src/main/resources/config/application-prod.yml
View File

@@ -1,35 +1,41 @@
# 使用环境配置，只需 JVM 参数里加：-Dspring.profiles.active=prod
#======================================#
#========== Server settings ===========#
#======================================#
server:
port: 8980
servlet:
context-path: /js
#======================================#
#========== Database sttings ==========#
#======================================#
# 数据库连接
jdbc:
# Mysql 数据库配置
type: mysql
driver: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
username: root
password: 123456
url: jdbc:mysql://192.168.56.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
username: jeesite
password: jeesite
testSql: SELECT 1
#======================================#
#========== Spring settings ===========#
#======================================#
# 数据库连接池配置
pool:
# 初始化连接数
init: 1
# 最小连接数
minIdle: 3
# 最大连接数
maxActive: 20
# 日志配置
logging:
config: classpath:config/logback-spring-prod.xml
config: classpath:config/logback-spring-prod.xml
# MyBatis 相关
mybatis:
# Mapper文件刷新线程
mapper:
refresh:
enabled: false

2
web/src/main/webapp/WEB-INF/startup.sh
View File

@@ -16,7 +16,7 @@ echo ""
CLASS_PATH="$PWD/../"
# 优化JVM参数
JAVA_OPTS="-Xms512m -Xmx1024m"
# JAVA_OPTS="$JAVA_OPTS -Xms512m -Xmx1024m"
# 方式一、配置外部自定义的属性文件（建议）
# JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=$PWD/app.yml"