From 1d94e4511d7674fe054dfddc4893e80d9529768a Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 28 Jul 2024 13:22:34 +0800
Subject: [PATCH] spring boot 3.2

---
 .../module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml | 2 +-
 .../module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml  | 2 +-
 parent/pom.xml                                               | 5 +----
 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                  | 2 +-
 web/src/main/webapp/WEB-INF/startup.bat                      | 2 +-
 web/src/main/webapp/WEB-INF/startup.sh                       | 2 +-
 11 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml
index 6635502e..de67a742 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml
@@ -52,7 +52,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.launch.WarLauncher
 goto end
 
 :end
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml
index a3cb4f98..6c8d6e79 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml
@@ -39,7 +39,7 @@ else
   RUN_JAVA="$JAVA_HOME"/bin/java
 fi
 
-exec "$RUN_JAVA" -cp $CLASS_PATH $JAVA_OPTS org.springframework.boot.loader.WarLauncher
+exec "$RUN_JAVA" -cp $CLASS_PATH $JAVA_OPTS org.springframework.boot.loader.launch.WarLauncher
 ]]>
 	</content>
 </template>
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index 8b30df3a..e697db2a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -71,6 +71,7 @@
 		<resource.delimiter>@</resource.delimiter>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
+		<maven.compiler.release>${java.version}</maven.compiler.release>
 		<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version><!-- 其它版本可能会出现VM崩溃 -->
 		<eclipse-plugin-download-sources>false</eclipse-plugin-download-sources>
 		<eclipse-plugin-download-javadocs>false</eclipse-plugin-download-javadocs>
@@ -127,10 +128,6 @@
 					<configuration>
 						<parameters>true</parameters>
 						<showWarnings>true</showWarnings>
-						<!-- <compilerArguments>
-							<verbose /> 输出有关编译器正在执行的操作的消息
-							<bootclasspath>${JAVA_HOME}\jre\lib\rt.jar;${JAVA_HOME}\jre\lib\jce.jar</bootclasspath>
-						</compilerArguments> -->
 					</configuration>
 				</plugin>
 
diff --git a/web-api/src/main/webapp/WEB-INF/startup.bat b/web-api/src/main/webapp/WEB-INF/startup.bat
index 7d4f47a3..fd6ced8b 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.launch.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..b30ebb23 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.launch.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..fd6ced8b 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.launch.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..b30ebb23 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.launch.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..fd6ced8b 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.launch.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 1c77d403..b30ebb23 100644
--- a/web-mini/src/main/webapp/WEB-INF/startup.sh
+++ b/web-mini/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.launch.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..fd6ced8b 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.launch.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..b30ebb23 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.launch.WarLauncher
\ No newline at end of file