diff --git a/web/src/main/webapp/WEB-INF/startup.bat b/web/src/main/webapp/WEB-INF/startup.bat index 6dd3ce9c..40eff033 100644 --- a/web/src/main/webapp/WEB-INF/startup.bat +++ b/web/src/main/webapp/WEB-INF/startup.bat @@ -3,7 +3,6 @@ rem /** rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. rem * rem * Author: ThinkGem@163.com -rem * rem */ echo. echo [信息] 运行Web工程。 @@ -16,14 +15,20 @@ cd %~dp0 title %cd% +rem 设置JDK目录 +rem set "JAVA_HOME=%cd%\jdk1.8.0_x64" + +rem 设置类加载路径 +set "CLASS_PATH=%cd%/../" + rem 优化JVM参数 -set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m +set "JAVA_OPTS=-Xms512m -Xmx1024m" -rem 方式一、配置环境名称 -rem set JAVA_OPTS=%JAVA_OPTS% -Dspring.profiles.active=prod +rem 方式一、配置外部自定义的属性文件(建议) +rem set "JAVA_OPTS=%JAVA_OPTS% -Dspring.config.location=%cd%\app.yml" -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 @@ -34,11 +39,11 @@ set RUN_JAVA=java goto runJava :gotJavaHome -set RUN_JAVA="%JAVA_HOME%\bin\java" +set "RUN_JAVA=%JAVA_HOME%\bin\java" goto runJava :runJava -call "%RUN_JAVA%" -cp %cd%/../ %JAVA_OPTS% org.springframework.boot.loader.WarLauncher +call "%RUN_JAVA%" -cp %CLASS_PATH% %JAVA_OPTS% org.springframework.boot.loader.WarLauncher goto end :end diff --git a/web/src/main/webapp/WEB-INF/startup.sh b/web/src/main/webapp/WEB-INF/startup.sh index 417e5bab..6446b860 100644 --- a/web/src/main/webapp/WEB-INF/startup.sh +++ b/web/src/main/webapp/WEB-INF/startup.sh @@ -3,25 +3,30 @@ # * Copyright (c) 2013-Now http://jeesite.com All rights reserved. # * # * Author: ThinkGem@163.com -# * # */ echo "" echo "[淇℃伅] 杩愯Web宸ョ▼銆" echo "" +# 璁剧疆JDK鐩綍 +# JAVA_HOME="$PWD/jdk1.8.0_x64" + +# 璁剧疆绫诲姞杞借矾寰 +CLASS_PATH="$PWD/../" + # 浼樺寲JVM鍙傛暟 -JAVA_OPTS="$MAVEN_OPTS -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m" +JAVA_OPTS="-Xms512m -Xmx1024m" -# 鏂瑰紡涓銆侀厤缃幆澧冨悕绉 +# 鏂瑰紡涓銆侀厤缃閮ㄨ嚜瀹氫箟鐨勫睘鎬ф枃浠讹紙寤鸿锛 +# JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=$PWD/app.yml" + +# 鏂瑰紡浜屻侀厤缃幆澧冨悕绉帮紝鍔犺浇涓嶅悓鐨勫睘鎬ф枃浠 # 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 RUN_JAVA="$JAVA_HOME"/bin/java fi -exec $RUN_JAVA -cp $PWD/../ $JAVA_OPTS org.springframework.boot.loader.WarLauncher \ No newline at end of file +exec $RUN_JAVA -cp $CLASS_PATH $JAVA_OPTS org.springframework.boot.loader.WarLauncher \ No newline at end of file