From 72d5fed50cb27b05486cb4b202ef3f71aa33b8fc Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 24 Feb 2018 22:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96bat=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=8E=8Bwar=E5=8C=85=E5=90=8E=E5=8F=AF?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=89=A7=E8=A1=8Cstartup.bat=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E9=A1=B9=E7=9B=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/bin/run-web.bat                           | 26 +++++++++++++++++++
 .../main/webapp/startup.bat}                  | 11 ++------
 2 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 web/bin/run-web.bat
 rename web/{bin/run-war.bat => src/main/webapp/startup.bat} (53%)

diff --git a/web/bin/run-web.bat b/web/bin/run-web.bat
new file mode 100644
index 00000000..e2f35661
--- /dev/null
+++ b/web/bin/run-web.bat
@@ -0,0 +1,26 @@
+@echo off
+rem /**
+rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+rem  *
+rem  * Author: ThinkGem@163.com
+rem  */
+echo.
+echo [信息] 打包Web工程，并运行Web工程。
+echo.
+rem pause
+rem echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+
+call mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U
+
+cd target/
+call unzip -n *.war -d web
+
+cd web
+call startup.bat
+
+pause
\ No newline at end of file
diff --git a/web/bin/run-war.bat b/web/src/main/webapp/startup.bat
similarity index 53%
rename from web/bin/run-war.bat
rename to web/src/main/webapp/startup.bat
index f5097f60..7f4ae4ab 100644
--- a/web/bin/run-war.bat
+++ b/web/src/main/webapp/startup.bat
@@ -3,9 +3,10 @@ rem /**
 rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
 rem  *
 rem  * Author: ThinkGem@163.com
+rem  * 
 rem  */
 echo.
-echo [信息] 打包Web工程，并运行Web工程。
+echo [信息] 运行Web工程。
 echo.
 rem pause
 rem echo.
@@ -13,18 +14,10 @@ rem echo.
 %~d0
 cd %~dp0
 
-cd ../
-call mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U
-
 title %cd%
 
-rem set JAVA_OPTS= -Xms256m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=512m
 set JAVA_OPTS= -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
 
-cd target/
-call unzip -n jeesite-web.war -d jeesite-web
-
-cd jeesite-web
 call java org.springframework.boot.loader.WarLauncher
 
 pause
\ No newline at end of file