配置参数和脚本优化

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

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

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

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

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>${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>

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
 

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

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

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