diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 7309ddb..0dad26d 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -59,7 +59,6 @@ 3.9.0 0.1.55 2.7.0 - 4.1.90.Final 2.7.0 3.0.0 @@ -343,6 +342,12 @@ de.codecentric spring-boot-admin-starter-server ${spring-boot-admin.version} + + + de.codecentric + spring-boot-admin-server-cloud + + de.codecentric @@ -526,12 +531,6 @@ - io.netty - netty-all - ${netty-all.version} - - - com.xingyuv spring-boot-starter-captcha-plus ${captcha-plus.version} diff --git a/yudao-framework/yudao-spring-boot-starter-redis/pom.xml b/yudao-framework/yudao-spring-boot-starter-redis/pom.xml index c1a728b..8f4e580 100644 --- a/yudao-framework/yudao-spring-boot-starter-redis/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-redis/pom.xml @@ -33,12 +33,6 @@ - io.netty - netty-all - - - - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/config/YudaoXssAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/config/YudaoXssAutoConfiguration.java index d5d892c..8cf5d53 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/config/YudaoXssAutoConfiguration.java +++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/config/YudaoXssAutoConfiguration.java @@ -21,6 +21,7 @@ import static cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration.cr @AutoConfiguration @EnableConfigurationProperties(XssProperties.class) +@ConditionalOnProperty(prefix = "yudao.xss", name = "enable", havingValue = "true", matchIfMissing = true) // 设置为 false 时,禁用 public class YudaoXssAutoConfiguration implements WebMvcConfigurer { /**