update springboot 3.2.4 => 3.2.5

update springcloud 2023.0.0 => 2023.0.1
update springcloud-alibaba 2022.0.0.0 => 2023.0.1.0
update mybatis-plus 3.5.5 => 3.5.6 适配更改代码
update springdoc 2.4.0 => 2.5.0
update easyexcel 3.3.3 => 3.3.4
update redisson 3.27.2 => 3.29.0
update lombok 1.18.30 => 1.18.32
update sms4j 3.2.0 => 3.2.1

pom.xml

@@ -17,27 +17,26 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
-        <spring-boot.version>3.2.4</spring-boot.version>
-        <spring-cloud.version>2023.0.0</spring-cloud.version>
+        <spring-boot.version>3.2.5</spring-boot.version>
+        <spring-cloud.version>2023.0.1</spring-cloud.version>
         <spring-boot-admin.version>3.2.3</spring-boot-admin.version>
-        <spring-boot.mybatis>3.0.3</spring-boot.mybatis>
-        <mybatis.version>3.5.15</mybatis.version>
-        <mybatis-plus.version>3.5.5</mybatis-plus.version>
+        <mybatis.version>3.5.16</mybatis.version>
+        <mybatis-plus.version>3.5.6</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
         <dynamic-ds.version>4.3.0</dynamic-ds.version>
         <velocity.version>2.3</velocity.version>
-        <swagger.core.version>2.2.20</swagger.core.version>
-        <springdoc.version>2.4.0</springdoc.version>
+        <swagger.core.version>2.2.21</swagger.core.version>
+        <springdoc.version>2.5.0</springdoc.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
         <poi.version>5.2.3</poi.version>
-        <easyexcel.version>3.3.3</easyexcel.version>
-        <hutool.version>5.8.26</hutool.version>
-        <redisson.version>3.27.2</redisson.version>
+        <easyexcel.version>3.3.4</easyexcel.version>
+        <hutool.version>5.8.27</hutool.version>
+        <redisson.version>3.29.0</redisson.version>
         <lock4j.version>2.2.7</lock4j.version>
         <powerjob.version>4.3.6</powerjob.version>
         <easyretry.version>3.2.0</easyretry.version>
         <satoken.version>1.37.0</satoken.version>
-        <lombok.version>1.18.30</lombok.version>
+        <lombok.version>1.18.32</lombok.version>
         <logstash.version>7.4</logstash.version>
         <easy-es.version>2.0.0-beta7</easy-es.version>
         <elasticsearch.version>7.14.0</elasticsearch.version>
@@ -58,7 +57,7 @@
         <okhttp.version>4.10.0</okhttp.version>
 
         <!-- SMS 配置 -->
-        <sms4j.version>3.2.0</sms4j.version>
+        <sms4j.version>3.2.1</sms4j.version>
 
         <!-- 插件版本 -->
         <maven-compiler-plugin.verison>3.11.0</maven-compiler-plugin.verison>
@@ -171,13 +170,6 @@
                 <version>${satoken.version}</version>
             </dependency>
 
-            <!-- Mybatis 依赖配置 -->
-            <dependency>
-                <groupId>org.mybatis.spring.boot</groupId>
-                <artifactId>mybatis-spring-boot-starter</artifactId>
-                <version>${spring-boot.mybatis}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.mybatis</groupId>
                 <artifactId>mybatis</artifactId>

ruoyi-common/ruoyi-common-alibaba-bom/pom.xml

@@ -15,7 +15,7 @@
 
     <properties>
         <revision>2.2.0-SNAPSHOT</revision>
-        <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
+        <spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version>
         <sentinel.version>1.8.6</sentinel.version>
         <seata.version>1.7.1</seata.version>
         <nacos.client.version>2.2.1</nacos.client.version>

ruoyi-common/ruoyi-common-mybatis/pom.xml

@@ -27,20 +27,9 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.mybatis</groupId>
-                    <artifactId>mybatis-spring</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!-- sql性能分析插件 -->

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java

@@ -2,14 +2,15 @@ package org.dromara.common.mybatis.interceptor;
 
 import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
-import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport;
+import com.baomidou.mybatisplus.extension.plugins.handler.MultiDataPermissionHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.BaseMultiTableInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.delete.Delete;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
-import net.sf.jsqlparser.statement.select.SelectBody;
 import net.sf.jsqlparser.statement.select.SetOperationList;
 import net.sf.jsqlparser.statement.update.Update;
 import org.apache.ibatis.executor.Executor;
@@ -32,7 +33,7 @@ import java.util.List;
  * @version 3.5.0
  */
 @Slf4j
-public class PlusDataPermissionInterceptor extends JsqlParserSupport implements InnerInterceptor {
+public class PlusDataPermissionInterceptor extends BaseMultiTableInnerInterceptor implements InnerInterceptor {
 
     private final PlusDataPermissionHandler dataPermissionHandler;
 
@@ -75,11 +76,10 @@ public class PlusDataPermissionInterceptor extends JsqlParserSupport implements
 
     @Override
     protected void processSelect(Select select, int index, String sql, Object obj) {
-        SelectBody selectBody = select.getSelectBody();
-        if (selectBody instanceof PlainSelect plainSelect) {
-            this.setWhere(plainSelect, (String) obj);
-        } else if (selectBody instanceof SetOperationList setOperationList) {
-            List<SelectBody> selectBodyList = setOperationList.getSelects();
+        if (select instanceof PlainSelect) {
+            this.setWhere((PlainSelect) select, (String) obj);
+        } else if (select instanceof SetOperationList setOperationList) {
+            List<Select> selectBodyList = setOperationList.getSelects();
             selectBodyList.forEach(s -> this.setWhere((PlainSelect) s, (String) obj));
         }
     }
@@ -113,5 +113,11 @@ public class PlusDataPermissionInterceptor extends JsqlParserSupport implements
         }
     }
 
+    @Override
+    public Expression buildTableExpression(Table table, Expression where, String whereSegment) {
+        // 只有新版数据权限处理器才会执行到这里
+        final MultiDataPermissionHandler handler = (MultiDataPermissionHandler) dataPermissionHandler;
+        return handler.getSqlSegment(table, where, whereSegment);
+    }
 }