From 4cf671dc7fc279e26b2dafea27ad13989c0ef28b Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sun, 14 Oct 2018 21:32:41 +0800 Subject: [PATCH] update bin script --- web/bin/run-web.bat | 8 ++++---- web/bin/run-web.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/bin/run-web.bat b/web/bin/run-web.bat index dbea3e52..9da2a804 100644 --- a/web/bin/run-web.bat +++ b/web/bin/run-web.bat @@ -22,12 +22,12 @@ 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 方式一、配置外部自定义的属性文件(建议) 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 diff --git a/web/bin/run-web.sh b/web/bin/run-web.sh index ede67743..609c74cb 100644 --- a/web/bin/run-web.sh +++ b/web/bin/run-web.sh @@ -18,12 +18,12 @@ cd target # 浼樺寲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" +# 鏂瑰紡浜屻侀厤缃幆澧冨悕绉帮紝鍔犺浇涓嶅悓鐨勫睘鎬ф枃浠 +# JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=prod" + if [ -z "$JAVA_HOME" ]; then RUN_JAVA=java else