From 17b4d2ad909a57c388006defe16077930673374e Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sun, 24 Apr 2022 17:43:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E5=92=8C?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/modules/gen/config.xml | 1 - .../web/bin/docker/Dockerfile.xml | 18 +++--- .../gen/module_cloud/web/bin/docker/app.xml | 62 ------------------- .../gen/module_cloud/web/bin/run-web.bat.xml | 7 ++- .../gen/module_cloud/web/bin/run-web.sh.xml | 7 ++- .../resources/views/modules/sys/areaList.html | 24 +++---- web/bin/docker/Dockerfile | 16 ++--- web/bin/docker/app.yml | 26 -------- web/bin/run-web.bat | 7 ++- web/bin/run-web.sh | 7 ++- .../resources/config/application-prod.yml | 36 ++++++----- web/src/main/webapp/WEB-INF/startup.sh | 2 +- 12 files changed, 63 insertions(+), 150 deletions(-) delete mode 100644 modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml delete mode 100644 web/bin/docker/app.yml diff --git a/modules/core/src/main/resources/templates/modules/gen/config.xml b/modules/core/src/main/resources/templates/modules/gen/config.xml index 574a1ffe..118d1845 100644 --- a/modules/core/src/main/resources/templates/modules/gen/config.xml +++ b/modules/core/src/main/resources/templates/modules/gen/config.xml @@ -158,7 +158,6 @@ - diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml index ace226b9..75bd6381 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml @@ -5,30 +5,26 @@ Dockerfile ${module.moduleCode}/${module.moduleCode}/bin/docker Dockerfile - \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml deleted file mode 100644 index c8fed16a..00000000 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml index e2433034..c1666d52 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml @@ -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 diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml index dbfdda54..e519cbac 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml @@ -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 ]]> diff --git a/modules/core/src/main/resources/views/modules/sys/areaList.html b/modules/core/src/main/resources/views/modules/sys/areaList.html index db05c71d..0f4aa071 100644 --- a/modules/core/src/main/resources/views/modules/sys/areaList.html +++ b/modules/core/src/main/resources/views/modules/sys/areaList.html @@ -17,13 +17,13 @@
- <#form:form id="searchForm" model="${area}" action="${ctx}/sys/area/listPageData" method="post" class="form-inline hide" - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="areaCode" maxlength="100" class="form-control"/> -
+ <#form:form id="searchForm" model="${area}" action="${ctx}/sys/area/listPageData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="areaCode" maxlength="100" class="form-control"/> +
@@ -36,11 +36,11 @@
<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
-
-
- - -
+
+
+ + +
diff --git a/web/bin/docker/Dockerfile b/web/bin/docker/Dockerfile index 28597de0..1d1f1646 100644 --- a/web/bin/docker/Dockerfile +++ b/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 diff --git a/web/bin/docker/app.yml b/web/bin/docker/app.yml deleted file mode 100644 index 0218f8f5..00000000 --- a/web/bin/docker/app.yml +++ /dev/null @@ -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 - diff --git a/web/bin/run-web.bat b/web/bin/run-web.bat index 31ed4512..e03845ac 100644 --- a/web/bin/run-web.bat +++ b/web/bin/run-web.bat @@ -20,10 +20,11 @@ rem 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 diff --git a/web/bin/run-web.sh b/web/bin/run-web.sh index 8a18da8e..6ff55294 100644 --- a/web/bin/run-web.sh +++ b/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 diff --git a/web/src/main/resources/config/application-prod.yml b/web/src/main/resources/config/application-prod.yml index 2da24c19..aedf382b 100644 --- a/web/src/main/resources/config/application-prod.yml +++ b/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?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 \ No newline at end of file + config: classpath:config/logback-spring-prod.xml + +# MyBatis 相关 +mybatis: + + # Mapper文件刷新线程 + mapper: + refresh: + enabled: false \ No newline at end of file diff --git a/web/src/main/webapp/WEB-INF/startup.sh b/web/src/main/webapp/WEB-INF/startup.sh index eba46cef..2aeeb0a4 100644 --- a/web/src/main/webapp/WEB-INF/startup.sh +++ b/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"