From 0cf9420b73eb4db6c18f74cb3294e5f5a1e1cf3a Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 24 May 2020 23:27:20 +0800
Subject: [PATCH] update batch

---
 web/bin/docker/Dockerfile                     |  2 +-
 web/bin/run-web.bat                           | 34 ++++---------------
 web/bin/run-web.sh                            | 23 ++++---------
 web/pom.xml                                   |  4 +--
 web/src/main/resources/config/application.yml |  4 +--
 5 files changed, 19 insertions(+), 48 deletions(-)

diff --git a/web/bin/docker/Dockerfile b/web/bin/docker/Dockerfile
index d77b47d2..44cdb9ef 100644
--- a/web/bin/docker/Dockerfile
+++ b/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
diff --git a/web/bin/run-web.bat b/web/bin/run-web.bat
index f026dab6..7ecc596e 100644
--- a/web/bin/run-web.bat
+++ b/web/bin/run-web.bat
@@ -17,33 +17,13 @@ call mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U
 cd target
 rem 打包Web工程（结束）
 
-title %cd%
 
-rem 优化JVM参数
-set "JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
+rem 根据情况修改 web.jar 为您的 jar 包名称
+mkdir web
+copy web.war web
+cd web
+jar -xvf web.war
+cd WEB-INF
+call startup.bat
 
-rem 方式一、配置外部自定义的属性文件（建议）
-rem set "JAVA_OPTS=%JAVA_OPTS% -Dspring.config.location=%cd%\app.yml"
-
-rem 方式二、配置环境名称，加载不同的属性文件
-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 根据情况修改 web.war 为您的 war 包名称
-call "%RUN_JAVA%" %JAVA_OPTS% -jar web.war
-goto end
-
-:end
 pause
\ No newline at end of file
diff --git a/web/bin/run-web.sh b/web/bin/run-web.sh
index e214ebd8..53a70f0e 100644
--- a/web/bin/run-web.sh
+++ b/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"
 
-# 鏂瑰紡涓�銆侀厤缃閮ㄨ嚜瀹氫箟鐨勫睘鎬ф枃浠讹紙寤鸿锛�
-# JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=$PWD\app.yml"
-
-# 鏂瑰紡浜屻�侀厤缃幆澧冨悕绉帮紝鍔犺浇涓嶅悓鐨勫睘鎬ф枃浠�
-# JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=prod"
-
-if [ -z "$JAVA_HOME" ]; then
-  RUN_JAVA=java
-else
-  RUN_JAVA="$JAVA_HOME"/bin/java
-fi
-
-# 鏍规嵁鎯呭喌淇敼 web.war 涓烘偍鐨� war 鍖呭悕绉�
-exec $RUN_JAVA $JAVA_OPTS -jar web.war
\ No newline at end of file
+# 鏍规嵁鎯呭喌淇敼 web.jar 涓烘偍鐨� jar 鍖呭悕绉�
+mkdir web
+cp web.war ./web
+cd web
+jar -xvf web.war
+cd WEB-INF
+exec ./startup.sh
diff --git a/web/pom.xml b/web/pom.xml
index 0895d7f3..30bf0722 100644
--- a/web/pom.xml
+++ b/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>
 
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 65b239a4..3761e973 100644
--- a/web/src/main/resources/config/application.yml
+++ b/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: