update 不兼容整体升级 springboot 4.X

update springboot 3.5 => 4.0
update springdoc 2.8 => 3.0
update mybatis-plus 3.5.14 => 3.5.15
update redisson 3.52.0 => 4.1.0
update dynamic-ds 4.3.1 => 4.5.0

ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java

@@ -2,7 +2,7 @@ package org.dromara.common.web.config;
 
 import org.dromara.common.web.core.I18nLocaleResolver;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
+import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.servlet.LocaleResolver;
 

ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java

@@ -1,63 +1,63 @@
-package org.dromara.common.web.config;
-
-import io.undertow.server.DefaultByteBufferPool;
-import io.undertow.server.handlers.DisallowedMethodsHandler;
-import io.undertow.util.HttpString;
-import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
-import org.dromara.common.core.utils.SpringUtils;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
-import org.springframework.boot.web.server.WebServerFactoryCustomizer;
-import org.springframework.core.task.VirtualThreadTaskExecutor;
-
-/**
- * Undertow 自定义配置
- *
- * @author Lion Li
- */
-@AutoConfiguration
-public class UndertowConfig implements WebServerFactoryCustomizer<UndertowServletWebServerFactory> {
-
-    /**
-     * 自定义 Undertow 配置
-     * <p>
-     * 主要配置内容包括：
-     * 1. 配置 WebSocket 部署信息
-     * 2. 在虚拟线程模式下使用虚拟线程池
-     * 3. 禁用不安全的 HTTP 方法，如 CONNECT、TRACE、TRACK
-     * </p>
-     *
-     * @param factory Undertow 的 Web 服务器工厂
-     */
-    @Override
-    public void customize(UndertowServletWebServerFactory factory) {
-        factory.addDeploymentInfoCustomizers(deploymentInfo -> {
-            // 配置 WebSocket 部署信息，设置 WebSocket 使用的缓冲区池
-            WebSocketDeploymentInfo webSocketDeploymentInfo = new WebSocketDeploymentInfo();
-            webSocketDeploymentInfo.setBuffers(new DefaultByteBufferPool(true, 1024));
-            deploymentInfo.addServletContextAttribute("io.undertow.websockets.jsr.WebSocketDeploymentInfo", webSocketDeploymentInfo);
-
-            // 如果启用了虚拟线程，配置 Undertow 使用虚拟线程池
-            if (SpringUtils.isVirtual()) {
-                // 创建虚拟线程池，线程池前缀为 "undertow-"
-                VirtualThreadTaskExecutor executor = new VirtualThreadTaskExecutor("undertow-");
-                // 设置虚拟线程池为执行器和异步执行器
-                deploymentInfo.setExecutor(executor);
-                deploymentInfo.setAsyncExecutor(executor);
-            }
-
-            // 配置禁止某些不安全的 HTTP 方法（如 CONNECT、TRACE、TRACK）
-            deploymentInfo.addInitialHandlerChainWrapper(handler -> {
-                // 禁止三个方法 CONNECT/TRACE/TRACK 也是不安全的 避免爬虫骚扰
-                HttpString[] disallowedHttpMethods = {
-                    HttpString.tryFromString("CONNECT"),
-                    HttpString.tryFromString("TRACE"),
-                    HttpString.tryFromString("TRACK")
-                };
-                // 使用 DisallowedMethodsHandler 拦截并拒绝这些方法的请求
-                return new DisallowedMethodsHandler(handler, disallowedHttpMethods);
-            });
-        });
-    }
-
-}
+//package org.dromara.common.web.config;
+//
+//import io.undertow.server.DefaultByteBufferPool;
+//import io.undertow.server.handlers.DisallowedMethodsHandler;
+//import io.undertow.util.HttpString;
+//import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
+//import org.dromara.common.core.utils.SpringUtils;
+//import org.springframework.boot.autoconfigure.AutoConfiguration;
+//import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
+//import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+//import org.springframework.core.task.VirtualThreadTaskExecutor;
+//
+///**
+// * Undertow 自定义配置
+// *
+// * @author Lion Li
+// */
+//@AutoConfiguration
+//public class UndertowConfig implements WebServerFactoryCustomizer<UndertowServletWebServerFactory> {
+//
+//    /**
+//     * 自定义 Undertow 配置
+//     * <p>
+//     * 主要配置内容包括：
+//     * 1. 配置 WebSocket 部署信息
+//     * 2. 在虚拟线程模式下使用虚拟线程池
+//     * 3. 禁用不安全的 HTTP 方法，如 CONNECT、TRACE、TRACK
+//     * </p>
+//     *
+//     * @param factory Undertow 的 Web 服务器工厂
+//     */
+//    @Override
+//    public void customize(UndertowServletWebServerFactory factory) {
+//        factory.addDeploymentInfoCustomizers(deploymentInfo -> {
+//            // 配置 WebSocket 部署信息，设置 WebSocket 使用的缓冲区池
+//            WebSocketDeploymentInfo webSocketDeploymentInfo = new WebSocketDeploymentInfo();
+//            webSocketDeploymentInfo.setBuffers(new DefaultByteBufferPool(true, 1024));
+//            deploymentInfo.addServletContextAttribute("io.undertow.websockets.jsr.WebSocketDeploymentInfo", webSocketDeploymentInfo);
+//
+//            // 如果启用了虚拟线程，配置 Undertow 使用虚拟线程池
+//            if (SpringUtils.isVirtual()) {
+//                // 创建虚拟线程池，线程池前缀为 "undertow-"
+//                VirtualThreadTaskExecutor executor = new VirtualThreadTaskExecutor("undertow-");
+//                // 设置虚拟线程池为执行器和异步执行器
+//                deploymentInfo.setExecutor(executor);
+//                deploymentInfo.setAsyncExecutor(executor);
+//            }
+//
+//            // 配置禁止某些不安全的 HTTP 方法（如 CONNECT、TRACE、TRACK）
+//            deploymentInfo.addInitialHandlerChainWrapper(handler -> {
+//                // 禁止三个方法 CONNECT/TRACE/TRACK 也是不安全的 避免爬虫骚扰
+//                HttpString[] disallowedHttpMethods = {
+//                    HttpString.tryFromString("CONNECT"),
+//                    HttpString.tryFromString("TRACE"),
+//                    HttpString.tryFromString("TRACK")
+//                };
+//                // 使用 DisallowedMethodsHandler 拦截并拒绝这些方法的请求
+//                return new DisallowedMethodsHandler(handler, disallowedHttpMethods);
+//            });
+//        });
+//    }
+//
+//}

ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java

@@ -2,7 +2,6 @@ package org.dromara.common.web.handler;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpStatus;
-import com.fasterxml.jackson.core.JsonParseException;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.ConstraintViolation;
@@ -14,6 +13,7 @@ import org.dromara.common.core.exception.SseException;
 import org.dromara.common.core.exception.base.BaseException;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.json.utils.JsonUtils;
+import org.springframework.boot.json.JsonParseException;
 import org.springframework.context.MessageSourceResolvable;
 import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.expression.ExpressionException;

ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java

@@ -4,10 +4,6 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -19,6 +15,10 @@ import org.dromara.common.web.filter.RepeatedlyRequestWrapper;
 import org.springframework.http.MediaType;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.json.JsonMapper;
+import tools.jackson.databind.node.ArrayNode;
+import tools.jackson.databind.node.ObjectNode;
 
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -45,8 +45,8 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
             if (request instanceof RepeatedlyRequestWrapper) {
                 jsonParam = IoUtil.read(request.getReader());
                 if (StringUtils.isNotBlank(jsonParam)) {
-                    ObjectMapper objectMapper = JsonUtils.getObjectMapper();
-                    JsonNode rootNode = objectMapper.readTree(jsonParam);
+                    JsonMapper jsonMapper = JsonUtils.getJsonMapper();
+                    JsonNode rootNode = jsonMapper.readTree(jsonParam);
                     removeSensitiveFields(rootNode, SystemConstants.EXCLUDE_PROPERTIES);
                     jsonParam = rootNode.toString();
                 }
@@ -79,14 +79,14 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
             ObjectNode objectNode = (ObjectNode) node;
             // 收集要删除的字段名（避免 ConcurrentModification）
             Set<String> fieldsToRemove = new HashSet<>();
-            objectNode.fieldNames().forEachRemaining(fieldName -> {
+            objectNode.propertyNames().forEach(fieldName -> {
                 if (ArrayUtil.contains(excludeProperties, fieldName)) {
                     fieldsToRemove.add(fieldName);
                 }
             });
             fieldsToRemove.forEach(objectNode::remove);
             // 递归处理子节点
-            objectNode.elements().forEachRemaining(child -> removeSensitiveFields(child, excludeProperties));
+            objectNode.values().forEach(child -> removeSensitiveFields(child, excludeProperties));
         } else if (node.isArray()) {
             ArrayNode arrayNode = (ArrayNode) node;
             for (JsonNode child : arrayNode) {

ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -2,4 +2,3 @@ org.dromara.common.web.config.CaptchaConfig
 org.dromara.common.web.config.FilterConfig
 org.dromara.common.web.config.I18nConfig
 org.dromara.common.web.config.ResourcesConfig
-org.dromara.common.web.config.UndertowConfig