update 升级 全部依赖版本与适配性代码修改

pom.xml

@@ -21,14 +21,14 @@
 
         <!-- Spring 生态依赖版本 -->
         <spring-boot.version>4.1.0</spring-boot.version>
-        <spring-boot-admin.version>4.1.1</spring-boot-admin.version>
+        <spring-boot-admin.version>4.1.2</spring-boot-admin.version>
         <spring-ai.version>2.0.0</spring-ai.version>
         <springdoc.version>3.0.3</springdoc.version>
 
         <!-- 数据访问与持久化相关依赖版本 -->
         <mybatis.version>3.5.19</mybatis.version>
-        <mybatis-plus.version>3.5.16</mybatis-plus.version>
-        <mybatis-plus-join.version>1.5.7</mybatis-plus-join.version>
+        <mybatis-plus.version>3.5.17</mybatis-plus.version>
+        <mybatis-plus-join.version>1.5.9</mybatis-plus-join.version>
         <dynamic-ds.version>4.5.0</dynamic-ds.version>
         <anyline.version>8.7.3-20260306</anyline.version>
         <easy-es.version>3.0.2</easy-es.version>
@@ -37,7 +37,7 @@
         <!-- 安全认证与加密相关依赖版本 -->
         <satoken.version>1.45.0</satoken.version>
         <justauth.version>1.16.7</justauth.version>
-        <bouncycastle.version>1.84</bouncycastle.version>
+        <bouncycastle.version>1.85</bouncycastle.version>
 
         <!-- 缓存、锁与任务调度相关依赖版本 -->
         <redisson.version>4.6.1</redisson.version>
@@ -46,26 +46,26 @@
         <snailai.version>1.0.0</snailai.version>
 
         <!-- 通用工具、编译增强与代码生成相关依赖版本 -->
-        <hutool.version>5.8.46</hutool.version>
+        <hutool.version>5.8.47</hutool.version>
         <mapstruct-plus.version>1.5.1</mapstruct-plus.version>
         <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
-        <lombok.version>1.18.42</lombok.version>
+        <lombok.version>1.18.46</lombok.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
         <fesod.version>2.0.2-incubating</fesod.version>
-        <fory.version>1.2.0</fory.version>
+        <fory.version>1.3.0</fory.version>
 
         <!-- 三方集成与业务扩展相关依赖版本 -->
         <!-- 离线IP地址定位库 -->
-        <ip2region.version>3.3.6</ip2region.version>
+        <ip2region.version>3.3.7</ip2region.version>
         <!-- OSS 配置 -->
-        <aws.sdk.version>2.42.9</aws.sdk.version>
+        <aws.sdk.version>2.48.1</aws.sdk.version>
         <!-- SMS 配置 -->
         <sms4j.version>3.3.5</sms4j.version>
         <!-- 工作流配置 -->
-        <warm-flow.version>1.8.8</warm-flow.version>
+        <warm-flow.version>1.8.9</warm-flow.version>
         <liteflow.version>2.16.0</liteflow.version>
         <!-- mqtt客户端 -->
-        <mica-mqtt.version>2.6.6</mica-mqtt.version>
+        <mica-mqtt.version>2.6.8</mica-mqtt.version>
 
         <!-- Maven 构建插件版本 -->
         <maven-jar-plugin.version>3.5.0</maven-jar-plugin.version>

ruoyi-common/ruoyi-common-mybatis/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.injector.methods.SelectList;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
-import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.base.JoinMapper;
 import com.github.yulichang.method.*;
 import com.github.yulichang.toolkit.MPJTableMapperHelper;
@@ -113,23 +112,13 @@ public class MPJSqlInjector extends DefaultSqlInjector {
      */
     private List<AbstractMethod> getJoinMethod() {
         List<AbstractMethod> list = new ArrayList<>();
-        if (VersionUtils.compare(VersionUtils.getVersion(), "3.5.0") >= 0) {
-            list.add(new DeleteJoin(SqlMethod.DELETE_JOIN.getMethod()));
-            list.add(new UpdateJoin(SqlMethod.UPDATE_JOIN.getMethod()));
-            list.add(new UpdateJoinAndNull(SqlMethod.UPDATE_JOIN_AND_NULL.getMethod()));
-            list.add(new SelectJoinCount(SqlMethod.SELECT_JOIN_COUNT.getMethod()));
-            list.add(new SelectJoinOne(SqlMethod.SELECT_JOIN_ONE.getMethod()));
-            list.add(new SelectJoinList(SqlMethod.SELECT_JOIN_LIST.getMethod()));
-            list.add(new SelectJoinPage(SqlMethod.SELECT_JOIN_PAGE.getMethod()));
-        } else {
-            list.add(new DeleteJoin());
-            list.add(new UpdateJoin());
-            list.add(new UpdateJoinAndNull());
-            list.add(new SelectJoinCount());
-            list.add(new SelectJoinOne());
-            list.add(new SelectJoinList());
-            list.add(new SelectJoinPage());
-        }
+        list.add(new DeleteJoin(SqlMethod.DELETE_JOIN.getMethod()));
+        list.add(new UpdateJoin(SqlMethod.UPDATE_JOIN.getMethod()));
+        list.add(new UpdateJoinAndNull(SqlMethod.UPDATE_JOIN_AND_NULL.getMethod()));
+        list.add(new SelectJoinCount(SqlMethod.SELECT_JOIN_COUNT.getMethod()));
+        list.add(new SelectJoinOne(SqlMethod.SELECT_JOIN_ONE.getMethod()));
+        list.add(new SelectJoinList(SqlMethod.SELECT_JOIN_LIST.getMethod()));
+        list.add(new SelectJoinPage(SqlMethod.SELECT_JOIN_PAGE.getMethod()));
         return list;
     }
 

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java

@@ -20,14 +20,16 @@ public class PlusPostInitTableInfoHandler implements PostInitTableInfoHandler {
      *
      * @param tableInfo     表信息
      * @param configuration MyBatis 配置
+     * @return 调整后的表信息
      */
     @Override
-    public void postTableInfo(TableInfo tableInfo, Configuration configuration) {
+    public TableInfo postTableInfo(TableInfo tableInfo, Configuration configuration) {
         String flag = SpringUtils.getProperty("mybatis-plus.enableLogicDelete", "true");
         // 只有关闭时 统一设置false 为true时mp自动判断不处理
         if (!Convert.toBool(flag)) {
             ReflectUtils.setFieldValue(tableInfo, "withLogicDelete", false);
         }
+        return tableInfo;
     }
 
 }