配置参数和脚本优化

web/bin/docker/Dockerfile

@@ -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
 

web/bin/docker/app.yml

@@ -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
-  

web/bin/run-web.bat

@@ -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
 

web/bin/run-web.sh

@@ -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

web/src/main/resources/config/application-prod.yml

@@ -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

web/src/main/webapp/WEB-INF/startup.sh

@@ -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"