1、依赖升级：springboot 2.7.18 -> 3.4.5，springcloud 2021.x -> 2024.x ，其余包同步yudao升级；2、微服务配置简化；

cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/datasource/config/ChenfengDataSourceAutoConfiguration.java

@@ -1,7 +1,7 @@
 package com.cf.imes.framework.datasource.config;
 
 import com.cf.imes.framework.datasource.core.filter.DruidAdRemoveFilter;
-import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
+import com.alibaba.druid.spring.boot3.autoconfigure.properties.DruidStatProperties;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/datasource/config/ChenfengDataSourceEncryptConfiguration.java

@@ -4,7 +4,6 @@ import com.baomidou.dynamic.datasource.event.DataSourceInitEvent;
 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
 import com.cf.imes.framework.mybatis.core.event.ChenfengDataSourceEncryptInitEvent;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 
@@ -13,8 +12,7 @@ import org.springframework.context.annotation.Bean;
  * @author Gqr
  * @since 2024/8/26 18:20
  */
-@AutoConfiguration
-@AutoConfigureBefore(DynamicDataSourceAutoConfiguration.class)
+@AutoConfiguration(before = DynamicDataSourceAutoConfiguration.class)
 @ConditionalOnProperty(name = "chenfeng.encrypt.enable", havingValue = "true")
 public class ChenfengDataSourceEncryptConfiguration {
     @Bean

cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/datasource/core/filter/DruidAdRemoveFilter.java

@@ -3,10 +3,10 @@ package com.cf.imes.framework.datasource.core.filter;
 import com.alibaba.druid.util.Utils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**

cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/config/ChenfengMybatisAutoConfiguration.java

@@ -1,6 +1,7 @@
 package com.cf.imes.framework.mybatis.config;
 
 import cn.hutool.core.text.CharSequenceUtil;
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
 import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.cf.imes.framework.mybatis.core.generator.SnowFlakeGenerator;
@@ -25,7 +26,7 @@ import org.springframework.core.env.ConfigurableEnvironment;
  *
  * @author 晨丰科技
  */
-@AutoConfiguration
+@AutoConfiguration(before = MybatisPlusAutoConfiguration.class) // 目的：先于 MyBatis Plus 自动配置，避免 @MapperScan 可能扫描不到 Mapper 打印 warn 日志
 @MapperScan(value = "${chenfeng.info.base-package}", annotationClass = Mapper.class,
         lazyInitialization = "${mybatis.lazy-initialization:false}") // Mapper 懒加载，目前仅用于单元测试
 public class ChenfengMybatisAutoConfiguration {

cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/core/handler/DefaultDBFieldHandler.java

@@ -13,8 +13,8 @@ import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.util.StringUtils;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;

cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/core/mapper/BaseMapperX.java

@@ -172,10 +172,6 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
         return Db.updateBatchById(entities, size);
     }
 
-    default Boolean insertOrUpdate(T entity) {
-        return  Db.saveOrUpdate(entity);
-    }
-
     default Boolean insertOrUpdateBatch(Collection<T> collection) {
         return Db.saveOrUpdateBatch(collection);
     }

cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/core/type/JsonLongSetTypeHandler.java

@@ -4,6 +4,7 @@ import com.cf.imes.framework.common.util.json.JsonUtils;
 import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler;
 import com.fasterxml.jackson.core.type.TypeReference;
 
+import java.lang.reflect.Field;
 import java.util.Set;
 
 /**
@@ -18,13 +19,21 @@ public class JsonLongSetTypeHandler extends AbstractJsonTypeHandler<Object> {
 
     private static final TypeReference<Set<Long>> TYPE_REFERENCE = new TypeReference<Set<Long>>(){};
 
+    public JsonLongSetTypeHandler(Class<?> type, Field field) {
+        super(type, field);
+    }
+
+    public JsonLongSetTypeHandler(Class<?> type) {
+        super(type);
+    }
+
     @Override
-    protected Object parse(String json) {
+    public Object parse(String json) {
         return JsonUtils.parseObject(json, TYPE_REFERENCE);
     }
 
     @Override
-    protected String toJson(Object obj) {
+    public String toJson(Object obj) {
         return JsonUtils.toJsonString(obj);
     }