配置参数和脚本优化

modules/core/src/main/resources/templates/modules/gen/config.xml

@@ -158,7 +158,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-bulid.bat.xml</template>
 			<template>module_cloud/web/bin/docker-bulid.sh.xml</template>

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

@@ -5,30 +5,26 @@
 	<name>Dockerfile</name>
 	<filePath>${module.moduleCode}/${module.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
+#ENV JAVA_OPTS "$JAVA_OPTS -Xms256m -Xmx1024m"
-#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 -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-${module.moduleCode}:4.4
+#docker run -p 8983:8983 thinkgem/jeesite-cloud-module-${module.moduleCode}:4.4
 ]]>
 	</content>
 </template>

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

@@ -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>${module.moduleCode}/${module.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-43
-        ext-config:
-          - data-id: application.yml
-            group: jeesite-cloud-43
-]]>
-	</content>
-</template>

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
+mkdir app
-copy web.war web
+copy web.war app
-cd web
+cd app
 jar -xvf web.war
+del web.war
 cd WEB-INF
 call startup.bat
 

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
+mkdir app
-cp web.war ./web
+cp web.war ./app
-cd web
+cd app
 jar -xvf web.war
+rm web.war
 cd WEB-INF
 exec ./startup.sh
 ]]>

modules/core/src/main/resources/views/modules/sys/areaList.html

@@ -17,13 +17,13 @@
 			</div>
 		</div>
 		<div class="box-body">
-			<#form:form id="searchForm" model="${area}" action="${ctx}/sys/area/listPageData" method="post" class="form-inline hide"
+			<#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}">
+					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<div class="form-group">
+				<div class="form-group">
-					<label class="control-label">区域代码：</label>
+					<label class="control-label">区域代码：</label>
-					<div class="control-inline">
+					<div class="control-inline">
-						<#form:input path="areaCode" maxlength="100" class="form-control"/>
+						<#form:input path="areaCode" maxlength="100" class="form-control"/>
-					</div>
+					</div>
 				</div>
 				<div class="form-group">
 					<label class="control-label">区域名称：</label>
@@ -36,11 +36,11 @@
 					<div class="control-inline width-60">
 						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
 					</div>
-				</div>
+				</div>
-				<div class="form-group">
+				<div class="form-group">
-					<button type="submit" class="btn btn-primary btn-sm">查询</button>
+					<button type="submit" class="btn btn-primary btn-sm">查询</button>
-					<button type="reset" class="btn btn-default btn-sm">重置</button>
+					<button type="reset" class="btn btn-default btn-sm">重置</button>
-				</div>
+				</div>
 			</#form:form>			
 			<table id="dataGrid"></table>
 			<div id="dataGridPage"></div>

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
+#ENV JAVA_OPTS "$JAVA_OPTS -Xms256m -Xmx1024m"
-#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 -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
+mkdir app
-copy web.war web
+copy web.war app
-cd web
+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
+mkdir app
-cp web.war ./web
+cp web.war ./app
-cd web
+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?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+  url: jdbc:mysql://192.168.56.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
-  username: root
+  username: jeesite
-  password: 123456
+  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"