From 03e1d25afbdab94ae187fe49ec6d4ef4ccc29101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Fri, 22 Jul 2022 12:27:12 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8D=87=E7=BA=A7=20springboot=202.7.?= =?UTF-8?q?2=20=E9=87=8D=E6=9E=84=E4=BD=BF=E7=94=A8=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=85=8D=E7=BD=AE=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../ruoyi/common/core/config/ApplicationConfig.java | 4 ++-- .../com/ruoyi/common/core/config/AsyncConfig.java | 4 ++-- .../com/ruoyi/common/core/config/JacksonConfig.java | 4 ++-- .../com/ruoyi/common/core/config/ValidatorConfig.java | 4 ++-- .../src/main/resources/META-INF/spring.factories | 8 -------- ...ework.boot.autoconfigure.AutoConfiguration.imports | 5 +++++ .../src/main/resources/META-INF/spring.factories | 2 -- ...ework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 2 -- ...ework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 1 - .../config/IdempotentAutoConfiguration.java | 6 ++---- .../src/main/resources/META-INF/spring.factories | 2 -- ...ework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../com/ruoyi/common/job/config/XxlJobConfig.java | 4 ++-- .../src/main/resources/META-INF/spring.factories | 2 -- ...ework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 2 -- ...ework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../java/com/ruoyi/common/log/aspect/LogAspect.java | 4 ++-- .../src/main/resources/META-INF/spring.factories | 3 --- ...ework.boot.autoconfigure.AutoConfiguration.imports | 2 ++ .../ruoyi/common/mail/config/MailConfiguration.java | 2 ++ .../src/main/resources/META-INF/spring.factories | 2 -- ...ework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../mybatis/config/MybatisPlusConfiguration.java | 4 ++-- .../src/main/resources/META-INF/spring.factories | 3 --- ...ework.boot.autoconfigure.AutoConfiguration.imports | 2 ++ .../src/main/resources/META-INF/spring.factories | 1 - .../ruoyi/common/redis/config/RedisConfiguration.java | 2 ++ .../src/main/resources/META-INF/spring.factories | 4 ---- ...ework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../common/satoken/config/SaTokenConfiguration.java | 4 ++-- .../src/main/resources/META-INF/spring.factories | 4 ---- ...ework.boot.autoconfigure.AutoConfiguration.imports | 3 +++ .../src/main/resources/META-INF/spring.factories | 1 - .../common/security/config/SecurityConfiguration.java | 4 ++-- .../src/main/resources/META-INF/spring.factories | 3 --- ...ework.boot.autoconfigure.AutoConfiguration.imports | 2 ++ .../ruoyi/common/sms/config/SmsAutoConfiguration.java | 3 ++- .../src/main/resources/META-INF/spring.factories | 2 -- ...ework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../swagger/config/SwaggerAutoConfiguration.java | 3 ++- .../src/main/resources/META-INF/spring.factories | 3 --- ...ework.boot.autoconfigure.AutoConfiguration.imports | 2 ++ .../java/com/ruoyi/common/web/config/I18nConfig.java | 6 ++---- .../java/com/ruoyi/common/web/config/NacosConfig.java | 11 +++++------ .../com/ruoyi/common/web/config/UndertowConfig.java | 4 ++-- .../src/main/resources/META-INF/spring.factories | 4 ---- ...ework.boot.autoconfigure.AutoConfiguration.imports | 3 +++ 51 files changed, 66 insertions(+), 87 deletions(-) delete mode 100644 ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring.factories create mode 100644 ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-dict/src/main/resources/META-INF/spring.factories create mode 100644 ruoyi-common/ruoyi-common-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/spring.factories create mode 100644 ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-excel/src/main/resources/META-INF/spring.factories delete mode 100644 ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring.factories create mode 100644 ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring.factories create mode 100644 ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring.factories create mode 100644 ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring.factories create mode 100644 ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring.factories create mode 100644 ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-oss/src/main/resources/META-INF/spring.factories delete mode 100644 ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring.factories create mode 100644 ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring.factories create mode 100644 ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-seata/src/main/resources/META-INF/spring.factories delete mode 100644 ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring.factories create mode 100644 ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring.factories create mode 100644 ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring.factories create mode 100644 ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring.factories create mode 100644 ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/pom.xml b/pom.xml index f040d6e0..f89b1b40 100644 --- a/pom.xml +++ b/pom.xml @@ -17,9 +17,9 @@ UTF-8 UTF-8 1.8 - 2.6.9 + 2.7.2 2021.0.3 - 2.6.7 + 2.7.2 2.2.2 3.5.10 1.5.22 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java index 6c1642fd..ef741a07 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java @@ -1,6 +1,6 @@ package com.ruoyi.common.core.config; -import org.springframework.context.annotation.Configuration; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.EnableAspectJAutoProxy; /** @@ -8,7 +8,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; * * @author Lion Li */ -@Configuration(proxyBeanMethods = false) +@AutoConfiguration // 表示通过aop框架暴露该代理对象,AopContext能够访问 @EnableAspectJAutoProxy(exposeProxy = true) public class ApplicationConfig { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java index 1b606bb5..75a3cb05 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java @@ -6,8 +6,8 @@ import com.ruoyi.common.core.utils.SpringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.AsyncConfigurerSupport; import org.springframework.scheduling.annotation.EnableAsync; @@ -21,7 +21,7 @@ import java.util.concurrent.*; */ @Slf4j @EnableAsync -@Configuration(proxyBeanMethods = false) +@AutoConfiguration public class AsyncConfig extends AsyncConfigurerSupport { private static final int CORE_POOL_SIZE = 10; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/JacksonConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/JacksonConfig.java index 801b6bdc..1a8c90bf 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/JacksonConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/JacksonConfig.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.ruoyi.common.core.jackson.BigNumberSerializer; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.context.annotation.Bean; @@ -23,7 +23,7 @@ import java.util.TimeZone; * @author Lion Li */ @Slf4j -@AutoConfigureBefore(JacksonAutoConfiguration.class) +@AutoConfiguration(before = JacksonAutoConfiguration.class) public class JacksonConfig { @Bean diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ValidatorConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ValidatorConfig.java index 941d495d..4a1b483f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ValidatorConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ValidatorConfig.java @@ -2,9 +2,9 @@ package com.ruoyi.common.core.config; import org.hibernate.validator.HibernateValidator; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; import javax.validation.Validator; @@ -15,7 +15,7 @@ import java.util.Properties; * * @author Lion Li */ -@Configuration(proxyBeanMethods = false) +@AutoConfiguration public class ValidatorConfig { @Autowired diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 2241e9b8..00000000 --- a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,8 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.core.utils.SpringUtils,\ - com.ruoyi.common.core.config.ApplicationConfig,\ - com.ruoyi.common.core.config.JacksonConfig,\ - com.ruoyi.common.core.config.ValidatorConfig,\ - com.ruoyi.common.core.config.AsyncConfig - - diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..df1b8d62 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +com.ruoyi.common.core.utils.SpringUtils +com.ruoyi.common.core.config.ApplicationConfig +com.ruoyi.common.core.config.JacksonConfig +com.ruoyi.common.core.config.ValidatorConfig +com.ruoyi.common.core.config.AsyncConfig diff --git a/ruoyi-common/ruoyi-common-dict/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-dict/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 3d9fd7d4..00000000 --- a/ruoyi-common/ruoyi-common-dict/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.dict.service.impl.DictServiceImpl \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..59edd222 --- /dev/null +++ b/ruoyi-common/ruoyi-common-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.dict.service.impl.DictServiceImpl diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/spring.factories deleted file mode 100644 index d3d1422e..00000000 --- a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.dubbo.properties.DubboCustomProperties \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..7a8e5348 --- /dev/null +++ b/ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.dubbo.properties.DubboCustomProperties diff --git a/ruoyi-common/ruoyi-common-excel/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-excel/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 485802b1..00000000 --- a/ruoyi-common/ruoyi-common-excel/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration= \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/config/IdempotentAutoConfiguration.java b/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/config/IdempotentAutoConfiguration.java index ed6c2cb3..4311849a 100644 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/config/IdempotentAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/config/IdempotentAutoConfiguration.java @@ -2,17 +2,15 @@ package com.ruoyi.common.idempotent.config; import com.ruoyi.common.idempotent.aspectj.RepeatSubmitAspect; import com.ruoyi.common.redis.config.RedisConfiguration; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; /** * 幂等功能配置 * * @author Lion Li */ -@Configuration(proxyBeanMethods = false) -@AutoConfigureAfter(RedisConfiguration.class) +@AutoConfiguration(after = RedisConfiguration.class) public class IdempotentAutoConfiguration { @Bean diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring.factories deleted file mode 100644 index d76c5e4b..00000000 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.idempotent.config.IdempotentAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..d75729f3 --- /dev/null +++ b/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.idempotent.config.IdempotentAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/config/XxlJobConfig.java b/ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/config/XxlJobConfig.java index 1861134b..94e7e4e8 100644 --- a/ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/config/XxlJobConfig.java +++ b/ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/config/XxlJobConfig.java @@ -4,10 +4,10 @@ import com.ruoyi.common.job.config.properties.XxlJobProperties; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; /** * xxl-job config @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Configuration; * @author Lion Li */ @Slf4j -@Configuration(proxyBeanMethods = false) +@AutoConfiguration @EnableConfigurationProperties(XxlJobProperties.class) @AllArgsConstructor @ConditionalOnProperty(prefix = "xxl.job", name = "enabled", havingValue = "true") diff --git a/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 64fc02a8..00000000 --- a/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.job.config.XxlJobConfig \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..dfcf8a60 --- /dev/null +++ b/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.job.config.XxlJobConfig diff --git a/ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/spring.factories index 50137508..d5686dbb 100644 --- a/ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/spring.factories +++ b/ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/spring.factories @@ -1,4 +1,2 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.loadbalance.config.CustomLoadBalanceAutoConfiguration org.springframework.boot.env.EnvironmentPostProcessor=\ com.ruoyi.common.loadbalance.config.CustomEnvironmentPostProcessor diff --git a/ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..b452aeb6 --- /dev/null +++ b/ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.loadbalance.config.CustomLoadBalanceAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java index cad0e085..dedd9137 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java @@ -15,7 +15,7 @@ import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.http.HttpMethod; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; @@ -32,7 +32,7 @@ import java.util.Map; */ @Slf4j @Aspect -@Configuration(proxyBeanMethods = false) +@AutoConfiguration public class LogAspect { @Autowired diff --git a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 4a5ae7d5..00000000 --- a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.log.service.AsyncLogService,\ - com.ruoyi.common.log.aspect.LogAspect diff --git a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..ee96a679 --- /dev/null +++ b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.ruoyi.common.log.service.AsyncLogService +com.ruoyi.common.log.aspect.LogAspect diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfiguration.java b/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfiguration.java index edad8dd7..c455e142 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfiguration.java +++ b/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfiguration.java @@ -2,6 +2,7 @@ package com.ruoyi.common.mail.config; import cn.hutool.extra.mail.MailAccount; import com.ruoyi.common.mail.config.properties.MailProperties; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -11,6 +12,7 @@ import org.springframework.context.annotation.Bean; * * @author Michelle.Chung */ +@AutoConfiguration @ConditionalOnProperty(value = "mail.enabled", havingValue = "true") @EnableConfigurationProperties(MailProperties.class) public class MailConfiguration { diff --git a/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 6b8a02e4..00000000 --- a/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.mail.config.MailConfiguration diff --git a/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..0a9e1a01 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.mail.config.MailConfiguration diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/config/MybatisPlusConfiguration.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/config/MybatisPlusConfiguration.java index 1af9536b..abd2b3cc 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/config/MybatisPlusConfiguration.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/config/MybatisPlusConfiguration.java @@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerIntercept import com.ruoyi.common.mybatis.handler.CreateAndUpdateMetaObjectHandler; import com.ruoyi.common.mybatis.interceptor.PlusDataPermissionInterceptor; import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import org.springframework.transaction.annotation.EnableTransactionManagement; @@ -20,8 +20,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; * * @author Lion Li */ +@AutoConfiguration @EnableTransactionManagement(proxyTargetClass = true) -@Configuration(proxyBeanMethods = false) @MapperScan("${mybatis-plus.mapperPackage}") public class MybatisPlusConfiguration { diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 6df5c2ec..00000000 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.mybatis.config.MybatisPlusConfiguration,\ - com.ruoyi.common.mybatis.service.SysDataScopeService diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..e071cd36 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.ruoyi.common.mybatis.config.MybatisPlusConfiguration +com.ruoyi.common.mybatis.service.SysDataScopeService diff --git a/ruoyi-common/ruoyi-common-oss/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-oss/src/main/resources/META-INF/spring.factories deleted file mode 100644 index ab43764e..00000000 --- a/ruoyi-common/ruoyi-common-oss/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration= diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/RedisConfiguration.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/RedisConfiguration.java index 17b7d5fe..65068f81 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/RedisConfiguration.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/RedisConfiguration.java @@ -11,6 +11,7 @@ import org.redisson.spring.cache.CacheConfig; import org.redisson.spring.cache.RedissonSpringCacheManager; import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CachingConfigurerSupport; @@ -27,6 +28,7 @@ import java.util.Map; * @author Lion Li */ @Slf4j +@AutoConfiguration @EnableCaching @EnableConfigurationProperties(RedissonProperties.class) public class RedisConfiguration extends CachingConfigurerSupport { diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring.factories deleted file mode 100644 index a23b8825..00000000 --- a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,4 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.redis.config.RedisConfiguration - - diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..9dfcce2a --- /dev/null +++ b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.redis.config.RedisConfiguration diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/SaTokenConfiguration.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/SaTokenConfiguration.java index a64fa819..2d1d74c9 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/SaTokenConfiguration.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/SaTokenConfiguration.java @@ -2,15 +2,15 @@ package com.ruoyi.common.satoken.config; import cn.dev33.satoken.jwt.StpLogicJwtForSimple; import cn.dev33.satoken.stp.StpLogic; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; /** * Sa-Token 配置 * * @author Lion Li */ -@Configuration(proxyBeanMethods = false) +@AutoConfiguration public class SaTokenConfiguration { @Bean diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 35e7e722..00000000 --- a/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,4 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.satoken.core.dao.PlusSaTokenDao,\ - com.ruoyi.common.satoken.core.service.SaPermissionImpl,\ - com.ruoyi.common.satoken.config.SaTokenConfiguration diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..ec1ea549 --- /dev/null +++ b/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +com.ruoyi.common.satoken.core.dao.PlusSaTokenDao +com.ruoyi.common.satoken.core.service.SaPermissionImpl +com.ruoyi.common.satoken.config.SaTokenConfiguration diff --git a/ruoyi-common/ruoyi-common-seata/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-seata/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 485802b1..00000000 --- a/ruoyi-common/ruoyi-common-seata/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration= \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfiguration.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfiguration.java index 6e69da60..fa6b31ba 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfiguration.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfiguration.java @@ -5,8 +5,8 @@ import cn.dev33.satoken.id.SaIdUtil; import cn.dev33.satoken.interceptor.SaAnnotationInterceptor; import cn.dev33.satoken.util.SaResult; import com.ruoyi.common.core.constant.HttpStatus; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -15,7 +15,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * * @author Lion Li */ -@Configuration(proxyBeanMethods = false) +@AutoConfiguration public class SecurityConfiguration implements WebMvcConfigurer { /** diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 92e852ff..00000000 --- a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.security.handler.GlobalExceptionHandler,\ - com.ruoyi.common.security.config.SecurityConfiguration diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..4ff10398 --- /dev/null +++ b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.ruoyi.common.security.handler.GlobalExceptionHandler +com.ruoyi.common.security.config.SecurityConfiguration diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsAutoConfiguration.java b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsAutoConfiguration.java index 29161d13..88d13040 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsAutoConfiguration.java @@ -4,6 +4,7 @@ import com.ruoyi.common.sms.config.properties.SmsProperties; import com.ruoyi.common.sms.core.AliyunSmsTemplate; import com.ruoyi.common.sms.core.SmsTemplate; import com.ruoyi.common.sms.core.TencentSmsTemplate; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -16,7 +17,7 @@ import org.springframework.context.annotation.Configuration; * @author Lion Li * @version 4.2.0 */ -@Configuration(proxyBeanMethods = false) +@AutoConfiguration @EnableConfigurationProperties(SmsProperties.class) public class SmsAutoConfiguration { diff --git a/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 1058e084..00000000 --- a/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.sms.config.SmsAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..e4081a1f --- /dev/null +++ b/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.sms.config.SmsAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java index b0cf798b..58df8cff 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java @@ -7,6 +7,7 @@ import com.ruoyi.common.swagger.config.properties.SwaggerProperties; import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -30,7 +31,7 @@ import java.util.function.Predicate; * * @author Lion Li */ -@Configuration(proxyBeanMethods = false) +@AutoConfiguration @EnableKnife4j @EnableConfigurationProperties(SwaggerProperties.class) @ConditionalOnProperty(name = "swagger.enabled", matchIfMissing = true) diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 727b377b..00000000 --- a/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.swagger.config.SwaggerAutoConfiguration,\ - com.ruoyi.common.swagger.config.SwaggerBeanPostProcessor diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..bab0482f --- /dev/null +++ b/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.ruoyi.common.swagger.config.SwaggerAutoConfiguration +com.ruoyi.common.swagger.config.SwaggerBeanPostProcessor diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/I18nConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/I18nConfig.java index 04fd09cd..dd766199 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/I18nConfig.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/I18nConfig.java @@ -1,10 +1,9 @@ package com.ruoyi.common.web.config; import com.ruoyi.common.web.core.I18nLocaleResolver; -import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.LocaleResolver; /** @@ -12,8 +11,7 @@ import org.springframework.web.servlet.LocaleResolver; * * @author Lion Li */ -@Configuration(proxyBeanMethods = false) -@AutoConfigureBefore(WebMvcAutoConfiguration.class) +@AutoConfiguration(before = WebMvcAutoConfiguration.class) public class I18nConfig { @Bean diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/NacosConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/NacosConfig.java index 67280d5e..d82ed13d 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/NacosConfig.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/NacosConfig.java @@ -7,25 +7,24 @@ import com.alibaba.cloud.nacos.discovery.NacosDiscoveryAutoConfiguration; import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration; import com.alibaba.cloud.nacos.discovery.NacosWatch; import com.ruoyi.common.web.nacos.CustomNacosWatch; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.client.ConditionalOnBlockingDiscoveryEnabled; import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; /** * 自定义 nacos 监听 解决与 Undertow 整合报错问题 * * @author Lion Li */ -@Configuration(proxyBeanMethods = false) +@AutoConfiguration( + before = NacosDiscoveryClientConfiguration.class, + after = NacosDiscoveryAutoConfiguration.class +) @ConditionalOnDiscoveryEnabled @ConditionalOnBlockingDiscoveryEnabled @ConditionalOnNacosDiscoveryEnabled -@AutoConfigureBefore(NacosDiscoveryClientConfiguration.class) -@AutoConfigureAfter(NacosDiscoveryAutoConfiguration.class) public class NacosConfig { @Bean diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/UndertowConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/UndertowConfig.java index 8aa29e1e..6659c3c0 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/UndertowConfig.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/UndertowConfig.java @@ -2,16 +2,16 @@ package com.ruoyi.common.web.config; import io.undertow.server.DefaultByteBufferPool; import io.undertow.websockets.jsr.WebSocketDeploymentInfo; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory; import org.springframework.boot.web.server.WebServerFactoryCustomizer; -import org.springframework.context.annotation.Configuration; /** * Undertow 自定义配置 * * @author Lion Li */ -@Configuration(proxyBeanMethods = false) +@AutoConfiguration public class UndertowConfig implements WebServerFactoryCustomizer { /** diff --git a/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring.factories deleted file mode 100644 index ad7224f2..00000000 --- a/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,4 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.ruoyi.common.web.config.I18nConfig,\ - com.ruoyi.common.web.config.UndertowConfig,\ - com.ruoyi.common.web.config.NacosConfig diff --git a/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..043902cc --- /dev/null +++ b/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +com.ruoyi.common.web.config.I18nConfig +com.ruoyi.common.web.config.UndertowConfig +com.ruoyi.common.web.config.NacosConfig