From b712522c8e46d78853701a9cd3f39c2af2ab6d15 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 22 Sep 2025 09:35:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=84=9A=E6=9C=AC=20startup.?= =?UTF-8?q?sh(bat)=20=E6=94=AF=E6=8C=81=E6=8E=A5=E5=8F=97=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/cms-ai/src/test/resources/application.yml | 15 --------------- web-api/src/main/webapp/WEB-INF/startup.bat | 2 +- web-api/src/main/webapp/WEB-INF/startup.sh | 2 +- web-fast/src/main/webapp/WEB-INF/startup.bat | 2 +- web-fast/src/main/webapp/WEB-INF/startup.sh | 2 +- web-mini/src/main/webapp/WEB-INF/startup.bat | 2 +- web-mini/src/main/webapp/WEB-INF/startup.sh | 4 +++- web/src/main/webapp/WEB-INF/startup.bat | 2 +- web/src/main/webapp/WEB-INF/startup.sh | 2 +- 9 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 modules/cms-ai/src/test/resources/application.yml diff --git a/modules/cms-ai/src/test/resources/application.yml b/modules/cms-ai/src/test/resources/application.yml deleted file mode 100644 index 6753cf6b..00000000 --- a/modules/cms-ai/src/test/resources/application.yml +++ /dev/null @@ -1,15 +0,0 @@ - -# 数据库连接 -jdbc: - - # Mysql 数据库配置 - type: mysql - driver: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai - username: root - password: 123456 - testSql: SELECT 1 - -# 日志配置 -logging: - config: classpath:logback-test.xml diff --git a/web-api/src/main/webapp/WEB-INF/startup.bat b/web-api/src/main/webapp/WEB-INF/startup.bat index 7d4f47a3..859be986 100644 --- a/web-api/src/main/webapp/WEB-INF/startup.bat +++ b/web-api/src/main/webapp/WEB-INF/startup.bat @@ -44,7 +44,7 @@ set "RUN_JAVA=%JAVA_HOME%\bin\java" goto runJava :runJava -call "%RUN_JAVA%" -cp %CLASS_PATH% %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-api/src/main/webapp/WEB-INF/startup.sh b/web-api/src/main/webapp/WEB-INF/startup.sh index 1c77d403..0750e957 100644 --- a/web-api/src/main/webapp/WEB-INF/startup.sh +++ b/web-api/src/main/webapp/WEB-INF/startup.sh @@ -32,4 +32,4 @@ else RUN_JAVA="$JAVA_HOME"/bin/java fi -exec "$RUN_JAVA" -cp $CLASS_PATH $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 diff --git a/web-fast/src/main/webapp/WEB-INF/startup.bat b/web-fast/src/main/webapp/WEB-INF/startup.bat index 7d4f47a3..859be986 100644 --- a/web-fast/src/main/webapp/WEB-INF/startup.bat +++ b/web-fast/src/main/webapp/WEB-INF/startup.bat @@ -44,7 +44,7 @@ set "RUN_JAVA=%JAVA_HOME%\bin\java" goto runJava :runJava -call "%RUN_JAVA%" -cp %CLASS_PATH% %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-fast/src/main/webapp/WEB-INF/startup.sh b/web-fast/src/main/webapp/WEB-INF/startup.sh index 1c77d403..0750e957 100644 --- a/web-fast/src/main/webapp/WEB-INF/startup.sh +++ b/web-fast/src/main/webapp/WEB-INF/startup.sh @@ -32,4 +32,4 @@ else RUN_JAVA="$JAVA_HOME"/bin/java fi -exec "$RUN_JAVA" -cp $CLASS_PATH $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 diff --git a/web-mini/src/main/webapp/WEB-INF/startup.bat b/web-mini/src/main/webapp/WEB-INF/startup.bat index 7d4f47a3..859be986 100644 --- a/web-mini/src/main/webapp/WEB-INF/startup.bat +++ b/web-mini/src/main/webapp/WEB-INF/startup.bat @@ -44,7 +44,7 @@ set "RUN_JAVA=%JAVA_HOME%\bin\java" goto runJava :runJava -call "%RUN_JAVA%" -cp %CLASS_PATH% %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-mini/src/main/webapp/WEB-INF/startup.sh b/web-mini/src/main/webapp/WEB-INF/startup.sh index 2aeeb0a4..0750e957 100644 --- a/web-mini/src/main/webapp/WEB-INF/startup.sh +++ b/web-mini/src/main/webapp/WEB-INF/startup.sh @@ -9,6 +9,8 @@ echo "" echo "[信息] 运行Web工程。" echo "" +cd "$(cd "$(dirname "$0")"; pwd)" + # 设置JDK目录 # JAVA_HOME="$PWD/jdk1.8.0_x64" @@ -30,4 +32,4 @@ else RUN_JAVA="$JAVA_HOME"/bin/java fi -exec $RUN_JAVA -cp $CLASS_PATH $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 diff --git a/web/src/main/webapp/WEB-INF/startup.bat b/web/src/main/webapp/WEB-INF/startup.bat index 7d4f47a3..859be986 100644 --- a/web/src/main/webapp/WEB-INF/startup.bat +++ b/web/src/main/webapp/WEB-INF/startup.bat @@ -44,7 +44,7 @@ set "RUN_JAVA=%JAVA_HOME%\bin\java" goto runJava :runJava -call "%RUN_JAVA%" -cp %CLASS_PATH% %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 1c77d403..0750e957 100644 --- a/web/src/main/webapp/WEB-INF/startup.sh +++ b/web/src/main/webapp/WEB-INF/startup.sh @@ -32,4 +32,4 @@ else RUN_JAVA="$JAVA_HOME"/bin/java fi -exec "$RUN_JAVA" -cp $CLASS_PATH $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