public/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2026-05-11 06:12:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
update springboot 3.5 => 4.0
update springcloud 2025.0 => 2025.1
update springcloud-alibaba 2025.0 => 2025.1
update nacos 2.5 => 3.1
update spring-boot-admin 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.3.0
update dynamic-ds 4.3.1 => 4.5.0
This commit is contained in:
疯狂的狮子Li
2026-03-18 20:37:39 +08:00
parent fbddd6d027
commit 2f22f9dedd
34 changed files with 710 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java
View File

@@ -2,7 +2,6 @@ package org.dromara.gateway;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
/**
@@ -10,7 +9,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
*
* @author ruoyi
*/
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
@SpringBootApplication
public class RuoYiGatewayApplication {
public static void main(String[] args) {
SpringApplication application = new SpringApplication(RuoYiGatewayApplication.class);

16
ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalLogFilter.java
View File

@@ -3,10 +3,6 @@ package org.dromara.gateway.filter;
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 lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.SystemConstants;
@@ -25,6 +21,10 @@ import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono;
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.Set;
@@ -65,8 +65,8 @@ public class GlobalLogFilter implements GlobalFilter, Ordered {
} else {
String jsonParam = WebFluxUtils.resolveBodyFromCacheRequest(exchange);
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();
}
@@ -102,14 +102,14 @@ public class GlobalLogFilter implements GlobalFilter, Ordered {
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) {

2
ruoyi-gateway/src/main/java/org/dromara/gateway/handler/GatewayExceptionHandler.java
View File

@@ -2,7 +2,7 @@ package org.dromara.gateway.handler;
import org.dromara.gateway.utils.WebFluxUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
import org.springframework.boot.webflux.error.ErrorWebExceptionHandler;
import org.springframework.cloud.gateway.support.NotFoundException;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;