From 6620b5434d5473bafd94460985cd1fe6bea00225 Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Tue, 30 Jan 2024 13:45:30 +0800
Subject: [PATCH] =?UTF-8?q?chore(pom.xml):=20=E5=8D=87=E7=BA=A7=20SpringBo?=
 =?UTF-8?q?ot=E3=80=81Mybatis-Plus=20=E8=87=B3=E6=9C=80=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mall-oms/oms-api/pom.xml                            |  2 +-
 mall-oms/oms-boot/pom.xml                           |  2 +-
 mall-pms/pms-api/pom.xml                            |  2 +-
 mall-pms/pms-boot/pom.xml                           |  2 +-
 mall-sms/sms-api/pom.xml                            |  2 +-
 mall-sms/sms-boot/pom.xml                           |  2 +-
 mall-ums/ums-api/pom.xml                            |  2 +-
 mall-ums/ums-boot/pom.xml                           |  2 +-
 pom.xml                                             |  8 ++++----
 youlai-common/common-core/pom.xml                   |  2 +-
 youlai-common/common-mybatis/pom.xml                |  4 ++--
 .../pom.xml                                         | 13 ++++++-------
 youlai-common/common-web/pom.xml                    |  2 +-
 youlai-common/pom.xml                               |  2 +-
 youlai-gateway/pom.xml                              |  2 +-
 youlai-system/system-api/pom.xml                    |  2 +-
 youlai-system/system-boot/pom.xml                   |  2 +-
 17 files changed, 26 insertions(+), 27 deletions(-)
 rename youlai-common/{common-security => common-resourceserver}/pom.xml (96%)

diff --git a/mall-oms/oms-api/pom.xml b/mall-oms/oms-api/pom.xml
index 594c3ba79..4d56d9f21 100644
--- a/mall-oms/oms-api/pom.xml
+++ b/mall-oms/oms-api/pom.xml
@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
 
         <dependency>
diff --git a/mall-oms/oms-boot/pom.xml b/mall-oms/oms-boot/pom.xml
index 120e83fd2..27c178b7f 100644
--- a/mall-oms/oms-boot/pom.xml
+++ b/mall-oms/oms-boot/pom.xml
@@ -85,7 +85,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-security</artifactId>
+            <artifactId>common-resourceserver</artifactId>
         </dependency>
 
         <dependency>
diff --git a/mall-pms/pms-api/pom.xml b/mall-pms/pms-api/pom.xml
index 7899b622e..43ded1441 100644
--- a/mall-pms/pms-api/pom.xml
+++ b/mall-pms/pms-api/pom.xml
@@ -26,7 +26,7 @@
 
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
             <optional>true</optional>
         </dependency>
 
diff --git a/mall-pms/pms-boot/pom.xml b/mall-pms/pms-boot/pom.xml
index 79fb399df..2fb1b1290 100644
--- a/mall-pms/pms-boot/pom.xml
+++ b/mall-pms/pms-boot/pom.xml
@@ -84,7 +84,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-security</artifactId>
+            <artifactId>common-resourceserver</artifactId>
         </dependency>
 
         <dependency>
diff --git a/mall-sms/sms-api/pom.xml b/mall-sms/sms-api/pom.xml
index e2fdd0487..26aa7d8e4 100644
--- a/mall-sms/sms-api/pom.xml
+++ b/mall-sms/sms-api/pom.xml
@@ -20,7 +20,7 @@
 
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
 
         <!-- 远程调用HTTP客户端 -->
diff --git a/mall-sms/sms-boot/pom.xml b/mall-sms/sms-boot/pom.xml
index 5afce6380..5585db912 100644
--- a/mall-sms/sms-boot/pom.xml
+++ b/mall-sms/sms-boot/pom.xml
@@ -80,7 +80,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-security</artifactId>
+            <artifactId>common-resourceserver</artifactId>
         </dependency>
 
         <dependency>
diff --git a/mall-ums/ums-api/pom.xml b/mall-ums/ums-api/pom.xml
index 9fb7b5f9f..95921070a 100644
--- a/mall-ums/ums-api/pom.xml
+++ b/mall-ums/ums-api/pom.xml
@@ -19,7 +19,7 @@
 
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
             <optional>true</optional>
         </dependency>
 
diff --git a/mall-ums/ums-boot/pom.xml b/mall-ums/ums-boot/pom.xml
index c9e7d4ad5..08545462d 100644
--- a/mall-ums/ums-boot/pom.xml
+++ b/mall-ums/ums-boot/pom.xml
@@ -70,7 +70,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-security</artifactId>
+            <artifactId>common-resourceserver</artifactId>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index 0e5b64c37..900f7b28b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.5</version>
+        <version>3.2.1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -46,7 +46,7 @@
         <!-- db && orm -->
         <mysql.version>8.0.28</mysql.version>
         <druid.version>1.2.20</druid.version>
-        <mybatis-plus.version>3.5.4</mybatis-plus.version>
+        <mybatis-plus.version>3.5.5</mybatis-plus.version>
 
         <!-- api doc -->
         <knife4j.version>4.3.0</knife4j.version>
@@ -130,7 +130,7 @@
 
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
 
@@ -210,7 +210,7 @@
 
             <dependency>
                 <groupId>com.youlai</groupId>
-                <artifactId>common-security</artifactId>
+                <artifactId>common-resourceserver</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
diff --git a/youlai-common/common-core/pom.xml b/youlai-common/common-core/pom.xml
index 1664c6b85..da157ec2b 100644
--- a/youlai-common/common-core/pom.xml
+++ b/youlai-common/common-core/pom.xml
@@ -24,7 +24,7 @@
 
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
             <optional>true</optional>
         </dependency>
 
diff --git a/youlai-common/common-mybatis/pom.xml b/youlai-common/common-mybatis/pom.xml
index bf64e99fc..d037a0d68 100644
--- a/youlai-common/common-mybatis/pom.xml
+++ b/youlai-common/common-mybatis/pom.xml
@@ -34,7 +34,7 @@
 
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
 
         <dependency>
@@ -45,7 +45,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-security</artifactId>
+            <artifactId>common-resourceserver</artifactId>
             <optional>true</optional>
         </dependency>
 
diff --git a/youlai-common/common-security/pom.xml b/youlai-common/common-resourceserver/pom.xml
similarity index 96%
rename from youlai-common/common-security/pom.xml
rename to youlai-common/common-resourceserver/pom.xml
index 7d586fd30..68e132292 100644
--- a/youlai-common/common-security/pom.xml
+++ b/youlai-common/common-resourceserver/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>common-security</artifactId>
+    <artifactId>common-resourceserver</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -17,6 +17,11 @@
     </properties>
 
     <dependencies>
+        <!-- OAuth2 Resource Server -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.youlai</groupId>
@@ -39,12 +44,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- OAuth2 Resource Server -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/youlai-common/common-web/pom.xml b/youlai-common/common-web/pom.xml
index c20a4e4c3..c3d82a1d5 100644
--- a/youlai-common/common-web/pom.xml
+++ b/youlai-common/common-web/pom.xml
@@ -66,7 +66,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-security</artifactId>
+            <artifactId>common-resourceserver</artifactId>
             <optional>true</optional>
         </dependency>
 
diff --git a/youlai-common/pom.xml b/youlai-common/pom.xml
index 1da26cee5..c9cf05637 100644
--- a/youlai-common/pom.xml
+++ b/youlai-common/pom.xml
@@ -23,7 +23,7 @@
         <module>common-log</module>
         <module>common-sms</module>
         <module>common-file</module>
-        <module>common-security</module>
+        <module>common-resourceserver</module>
         <module>common-seata</module>
     </modules>
 </project>
diff --git a/youlai-gateway/pom.xml b/youlai-gateway/pom.xml
index 349386917..41bf96043 100644
--- a/youlai-gateway/pom.xml
+++ b/youlai-gateway/pom.xml
@@ -49,7 +49,7 @@
         <!-- OAuth2 Client -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
+            <artifactId>spring-boot-starter-oauth2-client</artifactId>
         </dependency>
 
         <!-- Sentinel -->
diff --git a/youlai-system/system-api/pom.xml b/youlai-system/system-api/pom.xml
index 922d1a821..1e1ebadbd 100644
--- a/youlai-system/system-api/pom.xml
+++ b/youlai-system/system-api/pom.xml
@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
             <optional>true</optional>
         </dependency>
 
diff --git a/youlai-system/system-boot/pom.xml b/youlai-system/system-boot/pom.xml
index 8bf7851a6..eef21a83a 100644
--- a/youlai-system/system-boot/pom.xml
+++ b/youlai-system/system-boot/pom.xml
@@ -109,7 +109,7 @@
 
         <dependency>
             <groupId>com.youlai</groupId>
-            <artifactId>common-security</artifactId>
+            <artifactId>common-resourceserver</artifactId>
         </dependency>
 
         <dependency>