From 90bef6031ce58d0becd9e95d470d491edbdb3ead Mon Sep 17 00:00:00 2001
From: wjh <wjh@mulangcloud.com>
Date: Tue, 18 Jul 2023 23:32:18 +0800
Subject: [PATCH 1/3] fix:[jdk17]support jdk17 compile.

---
 pom.xml             | 6 +++---
 ruoyi-admin/pom.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index ebadb8280..057318642 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
         <ruoyi.version>4.7.7</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <shiro.version>1.10.1</shiro.version>
         <thymeleaf.extras.shiro.version>2.1.0</thymeleaf.extras.shiro.version>
@@ -206,7 +206,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.10.1</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -241,4 +241,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 60d3a723f..ce2203c9f 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -74,7 +74,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.1.1.RELEASE</version>
+                <version>3.1.1</version>
                 <configuration>
                     <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
                 </configuration>
@@ -131,4 +131,4 @@
         <finalName>${project.artifactId}</finalName>
     </build>
 
-</project>
\ No newline at end of file
+</project>

From 5adb4cd0139102b1043eef5d2fb7dbee42d6327f Mon Sep 17 00:00:00 2001
From: wjh <wjh@mulangcloud.com>
Date: Tue, 18 Jul 2023 23:48:48 +0800
Subject: [PATCH 2/3] fix:reduce mvn compile warning

---
 ruoyi-admin/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index ce2203c9f..aadc88886 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -45,8 +45,9 @@
 
         <!-- Mysql驱动包 -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId> 
+            <artifactId>mysql-connector-j</artifactId>
+            <version>8.0.33</version>
         </dependency>
 
         <!-- 核心模块-->

From 825bbecd6f2667475aca0a60f9a0845d42d4f145 Mon Sep 17 00:00:00 2001
From: wjh <wjh@mulangcloud.com>
Date: Mon, 24 Jul 2023 02:09:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:[jdk17]=E7=A7=BB=E9=99=A4openjdk=2017?=
 =?UTF-8?q?=20=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84jvm=20=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ry.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ry.sh b/ry.sh
index d6a9cf33a..19a2092a3 100644
--- a/ry.sh
+++ b/ry.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 # ./ry.sh start 启动 stop 停止 restart 重启 status 状态
 AppName=ruoyi-admin.jar
+AppJar="ruoyi-admin/target/${AppName}"
 
 # JVM参数
-JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps  -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
+JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDetails "
 APP_HOME=`pwd`
-LOG_PATH=$APP_HOME/logs/$AppName.log
 
 if [ "$1" = "" ];
 then
@@ -26,7 +26,7 @@ function start()
 	if [ x"$PID" != x"" ]; then
 	    echo "$AppName is running..."
 	else
-		nohup java $JVM_OPTS -jar $AppName > /dev/null 2>&1 &
+		nohup java $JVM_OPTS -jar ${AppJar} > /dev/null 2>&1 &
 		echo "Start $AppName success..."
 	fi
 }