diff --git a/web/bin/run-web.bat b/web/bin/run-web.bat index e6bc298b..87fff68b 100644 --- a/web/bin/run-web.bat +++ b/web/bin/run-web.bat @@ -11,12 +11,21 @@ echo. %~d0 cd %~dp0 +rem 打包Web工程(开始) cd .. call mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U cd target +rem 打包Web工程(结束) title %cd% + +rem 优化JVM参数 set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m + +rem 方式一、配置环境名称 +rem set JAVA_OPTS=%JAVA_OPTS% -Dspring.profiles.active=prod + +rem 方式二、配置外部属性文件(建议) rem set JAVA_OPTS=%JAVA_OPTS% -Dspring.config.location=%cd%\app.yml if "%JAVA_HOME%" == "" goto noJavaHome @@ -32,6 +41,7 @@ set RUN_JAVA="%JAVA_HOME%\bin\java" goto runJava :runJava +rem 根据情况修改 web.war 为您的 war 包名称 call "%RUN_JAVA%" %JAVA_OPTS% -jar web.war goto end diff --git a/web/bin/run-web.sh b/web/bin/run-web.sh index fc85ab2a..ede67743 100644 --- a/web/bin/run-web.sh +++ b/web/bin/run-web.sh @@ -6,15 +6,23 @@ # * # */ echo "" -echo "[淇℃伅] 浣跨敤 Spring Boot Tomcat 杩愯 Web 宸ョ▼銆" +echo "[淇℃伅] 鎵撳寘Web宸ョ▼锛屽苟杩愯Web宸ョ▼銆" echo "" +# 鎵撳寘Web宸ョ▼锛堝紑濮嬶級 cd .. mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U cd target +# 鎵撳寘Web宸ョ▼锛堢粨鏉燂級 -JAVA_OPTS="-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m" -#JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=$PWD\app.yml" +# 浼樺寲JVM鍙傛暟 +JAVA_OPTS="$MAVEN_OPTS -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m" + +# 鏂瑰紡涓銆侀厤缃幆澧冨悕绉 +# JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=prod" + +# 鏂瑰紡浜屻侀厤缃閮ㄥ睘鎬ф枃浠讹紙寤鸿锛 +# JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=$PWD\app.yml" if [ -z "$JAVA_HOME" ]; then RUN_JAVA=java @@ -22,4 +30,5 @@ 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 diff --git a/web/pom.xml b/web/pom.xml index ce30d1e2..548ba5c6 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -19,7 +19,7 @@ - web + web com.jeesite.modules.config.Application diff --git a/web/src/main/webapp/WEB-INF/startup.bat b/web/src/main/webapp/WEB-INF/startup.bat index 3810265e..6dd3ce9c 100644 --- a/web/src/main/webapp/WEB-INF/startup.bat +++ b/web/src/main/webapp/WEB-INF/startup.bat @@ -15,8 +15,16 @@ rem echo. cd %~dp0 title %cd% + +rem 优化JVM参数 set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m +rem 方式一、配置环境名称 +rem set JAVA_OPTS=%JAVA_OPTS% -Dspring.profiles.active=prod + +rem 方式二、配置外部属性文件(建议) +rem set JAVA_OPTS=%JAVA_OPTS% -Dspring.config.location=%cd%\app.yml + if "%JAVA_HOME%" == "" goto noJavaHome if not "%JAVA_HOME%" == "" goto gotJavaHome goto end diff --git a/web/src/main/webapp/WEB-INF/startup.sh b/web/src/main/webapp/WEB-INF/startup.sh index f2d6ef3b..417e5bab 100644 --- a/web/src/main/webapp/WEB-INF/startup.sh +++ b/web/src/main/webapp/WEB-INF/startup.sh @@ -9,8 +9,15 @@ echo "" echo "[淇℃伅] 杩愯Web宸ョ▼銆" echo "" +# 浼樺寲JVM鍙傛暟 JAVA_OPTS="$MAVEN_OPTS -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m" +# 鏂瑰紡涓銆侀厤缃幆澧冨悕绉 +# JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=prod" + +# 鏂瑰紡浜屻侀厤缃閮ㄥ睘鎬ф枃浠讹紙寤鸿锛 +# JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=$PWD\app.yml" + if [ -z "$JAVA_HOME" ]; then RUN_JAVA=java else