From f46200bf83b7453148b41abde5c47effff716044 Mon Sep 17 00:00:00 2001
From: cheny1608 <cheny1608@chinaunicom.cn>
Date: Tue, 7 Apr 2026 11:17:32 +0800
Subject: [PATCH 1/2] Upgrade Spring Boot from 2.5.15 to 2.7.18

- Upgrade spring-boot.version to 2.7.18 (latest 2.7.x LTS release)
- Add explicit mysql-connector-java version management (8.0.33) as it's
  no longer managed by Spring Boot 2.7.x BOM
- Update spring-boot-maven-plugin to use ${spring-boot.version} property
- Add spring.mvc.pathmatch.matching-strategy=ant_path_matcher to resolve
  Springfox 3.0.0 compatibility issue with Spring Boot 2.7.x path matching
---
 pom.xml                                        | 10 +++++++++-
 ruoyi-admin/pom.xml                            |  2 +-
 ruoyi-admin/src/main/resources/application.yml |  4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 50be7fb07..16c3d3f4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,13 +17,14 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-        <spring-boot.version>2.5.15</spring-boot.version>
+        <spring-boot.version>2.7.18</spring-boot.version>
         <shiro.version>1.13.0</shiro.version>
         <thymeleaf.extras.shiro.version>2.1.0</thymeleaf.extras.shiro.version>
         <druid.version>1.2.28</druid.version>
         <yauaa.version>7.32.0</yauaa.version>
         <kaptcha.version>2.3.3</kaptcha.version>
         <swagger.version>3.0.0</swagger.version>
+        <mysql.version>8.0.33</mysql.version>
         <pagehelper.boot.version>1.4.7</pagehelper.boot.version>
         <fastjson.version>1.2.83</fastjson.version>
         <oshi.version>6.10.0</oshi.version>
@@ -166,6 +167,13 @@
                 </exclusions>
             </dependency>
 
+            <!-- MySQL驱动 -->
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>${mysql.version}</version>
+            </dependency>
+
             <!-- io常用工具类 -->
             <dependency>
                 <groupId>commons-io</groupId>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 47167acd3..14c4891c7 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -67,7 +67,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.15</version>
+                <version>${spring-boot.version}</version>
                 <configuration>
                     <fork>true</fork>
                 </configuration>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 57c6eec90..5ca9132e9 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -67,6 +67,10 @@ spring:
       max-file-size: 10MB
       # 设置总上传的文件大小
       max-request-size: 20MB
+  mvc:
+    # 解决 Springfox 与 Spring Boot 2.7.x 的兼容性问题
+    pathmatch:
+      matching-strategy: ant_path_matcher
 
 # MyBatis
 mybatis:

From 516f35dfea962fb45a28fe834c885211ad7d023a Mon Sep 17 00:00:00 2001
From: cheny1608 <cheny1608@chinaunicom.cn>
Date: Tue, 7 Apr 2026 11:28:51 +0800
Subject: [PATCH 2/2] Revert MySQL driver dependency changes

---
 pom.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 16c3d3f4f..b36d0da8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,6 @@
         <yauaa.version>7.32.0</yauaa.version>
         <kaptcha.version>2.3.3</kaptcha.version>
         <swagger.version>3.0.0</swagger.version>
-        <mysql.version>8.0.33</mysql.version>
         <pagehelper.boot.version>1.4.7</pagehelper.boot.version>
         <fastjson.version>1.2.83</fastjson.version>
         <oshi.version>6.10.0</oshi.version>
@@ -167,13 +166,6 @@
                 </exclusions>
             </dependency>
 
-            <!-- MySQL驱动 -->
-            <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>${mysql.version}</version>
-            </dependency>
-
             <!-- io常用工具类 -->
             <dependency>
                 <groupId>commons-io</groupId>