update batch

web/bin/docker/Dockerfile

@@ -20,4 +20,4 @@ ENTRYPOINT java -cp /app $JAVA_OPTS org.springframework.boot.loader.WarLauncher
 
 EXPOSE 8980
 
-# docker run -p 8980:8980 com.jeesite/jeesite-web:4.1
+# docker run -p 8980:8980 com.jeesite/jeesite-web:4.2

web/bin/run-web.bat

@@ -17,33 +17,13 @@ call mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U
 cd target
 rem <20><><EFBFBD><EFBFBD>Web<65><62><EFBFBD>̣<EFBFBD><CCA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
-title %cd%
 
-rem <20>Ż<EFBFBD>JVM<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+rem <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD> web.jar Ϊ<><CEAA><EFBFBD><EFBFBD> jar <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-set "JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
+mkdir web
+copy web.war web
+cd web
+jar -xvf web.war
+cd WEB-INF
+call startup.bat
 
-rem <20><>ʽһ<CABD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ⲿ<EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>飩
-rem set "JAVA_OPTS=%JAVA_OPTS% -Dspring.config.location=%cd%\app.yml"
-
-rem <20><>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƣ<EFBFBD><C6A3><EFBFBD><EFBFBD>ز<EFBFBD>ͬ<EFBFBD><CDAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
-rem set "JAVA_OPTS=%JAVA_OPTS% -Dspring.profiles.active=prod"
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not "%JAVA_HOME%" == "" goto gotJavaHome
-goto end
-
-:noJavaHome
-set RUN_JAVA=java
-goto runJava
-
-:gotJavaHome
-set "RUN_JAVA=%JAVA_HOME%\bin\java"
-goto runJava
-
-:runJava
-rem <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD> web.war Ϊ<><CEAA><EFBFBD><EFBFBD> war <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-call "%RUN_JAVA%" %JAVA_OPTS% -jar web.war
-goto end
-
-:end
 pause

web/bin/run-web.sh

@@ -15,20 +15,11 @@ mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U
 cd target
 # 打包Web工程（结束）
 
-# 优化JVM参数
-JAVA_OPTS="$MAVEN_OPTS -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
 
-# 方式一、配置外部自定义的属性文件（建议）
+# 根据情况修改 web.jar 为您的 jar 包名称
-# JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=$PWD\app.yml"
+mkdir web
-
+cp web.war ./web
-# 方式二、配置环境名称，加载不同的属性文件
+cd web
-# JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=prod"
+jar -xvf web.war
-
+cd WEB-INF
-if [ -z "$JAVA_HOME" ]; then
+exec ./startup.sh
-  RUN_JAVA=java
-else
-  RUN_JAVA="$JAVA_HOME"/bin/java
-fi
-
-# 根据情况修改 web.war 为您的 war 包名称
-exec $RUN_JAVA $JAVA_OPTS -jar web.war

web/pom.xml

@@ -19,7 +19,7 @@
 	
 	<properties>
 		
-		<finalName>web</finalName><!-- war包的名称 -->
+		<finalName>web</finalName><!-- war or jar 包的名称 -->
 		<start-class>com.jeesite.modules.Application</start-class>
 		
 		<!-- environment setting -->
@@ -28,7 +28,7 @@
 		
 		<!-- docker service -->
 		<docker.registryUrl>http://192.168.56.102:2375</docker.registryUrl>
-		<docker.imageName>${project.groupId}/${project.artifactId}:4.1</docker.imageName>
+		<docker.imageName>${project.groupId}/${project.artifactId}:4.2</docker.imageName>
 		
 	</properties>
 

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

@@ -8,7 +8,7 @@ productName: JeeSite Demo
 companyName: ThinkGem
 
 # 产品版本、版权年份
-productVersion: V4.1
+productVersion: V4.2
 copyrightYear: 2020
 
 #是否演示模式
@@ -20,7 +20,7 @@ demoMode: false
 
 server:
 
-  port: 8981
+  port: 8980
   servlet:
     context-path: /js
   tomcat: