From 6082545e1a3d012e26ccbd4798fbc9198133f3cb Mon Sep 17 00:00:00 2001
From: chenjh3 <chenjh3@wangsu.com>
Date: Wed, 24 May 2023 14:04:16 +0800
Subject: [PATCH] =?UTF-8?q?springboot=E5=8D=87=E7=BA=A7=E5=88=B02.7.12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                        |  2 +-
 ruoyi-admin/pom.xml                            | 10 ++++++++--
 ruoyi-admin/src/main/resources/application.yml |  3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index cdef43401..0ee94c7e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.5.14</version>
+                <version>2.7.12</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 60d3a723f..6ff39c2ce 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -45,8 +45,14 @@
 
         <!-- Mysql驱动包 -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- 核心模块-->
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 4cbeb8d0b..db6b0fe3c 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -72,6 +72,9 @@ spring:
     restart:
       # 热部署开关
       enabled: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
 
 # MyBatis
 mybatis: