From 55c8c842dc912f947bddd284b408fa8a7cdc6617 Mon Sep 17 00:00:00 2001
From: dataprince <dataprince@163.com>
Date: Fri, 5 Jan 2024 11:43:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7mybatis-flex=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E5=88=B01.7.7=EF=BC=8C=E5=8E=BB=E6=8E=89mybatis-sprin?=
 =?UTF-8?q?g=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                               | 19 ++-----------------
 ruoyi-common/ruoyi-common-orm/pom.xml |  9 +--------
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index f7df0e9..16a9e73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,8 +18,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>21</java.version>
         <spring-boot.version>3.2.0</spring-boot.version>
-        <mybatis-flex.version>1.7.6</mybatis-flex.version>
-        <mybatis-spring.version>3.0.3</mybatis-spring.version>
+        <mybatis-flex.version>1.7.7</mybatis-flex.version>
         <satoken.version>1.37.0</satoken.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <HikariCP.version>5.0.1</HikariCP.version>
@@ -134,24 +133,10 @@
             <!-- mybatis-flex -->
             <dependency>
                 <groupId>com.mybatis-flex</groupId>
-                <artifactId>mybatis-flex-spring-boot-starter</artifactId>
+                <artifactId>mybatis-flex-spring-boot3-starter</artifactId>
                 <version>${mybatis-flex.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.mybatis</groupId>
-                        <artifactId>mybatis-spring</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
 
-            <!-- 添加已适配 springboot 3.2 的 mybatis-spring 依赖-->
-            <dependency>
-                <groupId>org.mybatis</groupId>
-                <artifactId>mybatis-spring</artifactId>
-                <version>${mybatis-spring.version}</version>
-            </dependency>
-
-
             <!-- Sa-Token 权限认证，在线文档：https://sa-token.cc -->
             <dependency>
                 <groupId>cn.dev33</groupId>
diff --git a/ruoyi-common/ruoyi-common-orm/pom.xml b/ruoyi-common/ruoyi-common-orm/pom.xml
index fc0ce33..dc8c4f7 100644
--- a/ruoyi-common/ruoyi-common-orm/pom.xml
+++ b/ruoyi-common/ruoyi-common-orm/pom.xml
@@ -29,12 +29,7 @@
         <!-- mybatis-flex -->
         <dependency>
             <groupId>com.mybatis-flex</groupId>
-            <artifactId>mybatis-flex-spring-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis-spring</artifactId>
+            <artifactId>mybatis-flex-spring-boot3-starter</artifactId>
         </dependency>
 
         <!-- pagehelper 分页插件 -->
@@ -43,8 +38,6 @@
             <artifactId>pagehelper</artifactId>
         </dependency>
 
-
-
     </dependencies>
 
 </project>