init

ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ApplicationConfig.java

@@ -1,6 +1,6 @@
 package com.ruoyi.component.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
+@AutoConfiguration
 // 表示通过aop框架暴露该代理对象,AopContext能够访问
 @EnableAspectJAutoProxy(exposeProxy = true)
 public class ApplicationConfig {

ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/AsyncConfig.java

@@ -5,7 +5,7 @@ import com.ruoyi.component.core.exception.ServiceException;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.scheduling.annotation.AsyncConfigurerSupport;
 import org.springframework.scheduling.annotation.EnableAsync;
 
@@ -19,7 +19,7 @@ import java.util.concurrent.ScheduledExecutorService;
  * @author Lion Li
  */
 @EnableAsync(proxyTargetClass = true)
-@Configuration
+@AutoConfiguration
 public class AsyncConfig extends AsyncConfigurerSupport {
 
     @Autowired

ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ValidatorConfig.java

@@ -2,9 +2,9 @@ package com.ruoyi.component.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
+@AutoConfiguration
 public class ValidatorConfig {
 
     @Autowired

ruoyi-component/ruoyi-component-json/src/main/java/com/ruoyi/component/json/config/JacksonConfig.java

@@ -6,7 +6,9 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.component.json.handler.BigNumberSerializer;
 import lombok.extern.slf4j.Slf4j;
+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;
 import org.springframework.context.annotation.Configuration;
 
@@ -22,7 +24,7 @@ import java.util.TimeZone;
  * @author Lion Li
  */
 @Slf4j
-@Configuration
+@AutoConfiguration(before = JacksonAutoConfiguration.class)
 public class JacksonConfig {
 
     @Bean

ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/aspect/LogAspect.java

@@ -7,19 +7,19 @@ import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.component.core.domain.model.LoginUser;
 import com.ruoyi.component.core.enums.HttpMethod;
 import com.ruoyi.component.core.util.ServletUtils;
+import com.ruoyi.component.core.util.StringUtils;
+import com.ruoyi.component.core.util.spring.SpringUtils;
 import com.ruoyi.component.json.utils.JsonUtils;
 import com.ruoyi.component.log.annotation.Log;
 import com.ruoyi.component.log.enums.BusinessStatus;
 import com.ruoyi.component.log.event.OperLogEvent;
 import com.ruoyi.component.satoken.utils.LoginHelper;
-import com.ruoyi.component.core.util.StringUtils;
-import com.ruoyi.component.core.util.spring.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.Aspect;
-import org.springframework.stereotype.Component;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -36,7 +36,7 @@ import java.util.StringJoiner;
  */
 @Slf4j
 @Aspect
-@Component
+@AutoConfiguration
 public class LogAspect {
 
     /**

ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/MailConfig.java

@@ -3,6 +3,7 @@ package com.ruoyi.component.mail.config;
 import cn.hutool.extra.mail.MailAccount;
 import com.ruoyi.component.mail.config.properties.MailProperties;
 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;
 
@@ -11,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author Michelle.Chung
  */
-@Configuration
+@EnableConfigurationProperties(MailProperties.class)
 public class MailConfig {
 
     @Bean

ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/properties/MailProperties.java

@@ -10,7 +10,6 @@ import org.springframework.stereotype.Component;
  * @author Michelle.Chung
  */
 @Data
-@Component
 @ConfigurationProperties(prefix = "mail")
 public class MailProperties {
 

ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/config/MybatisPlusConfig.java

@@ -1,6 +1,7 @@
 package com.ruoyi.component.mybatis.config;
 
 import cn.hutool.core.net.NetUtil;
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
 import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
@@ -10,8 +11,9 @@ import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerIntercept
 import com.ruoyi.component.mybatis.handler.CreateAndUpdateMetaObjectHandler;
 import com.ruoyi.component.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.PropertySource;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
@@ -20,8 +22,9 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  * @author Lion Li
  */
 @EnableTransactionManagement(proxyTargetClass = true)
-@Configuration
+@AutoConfiguration(before = MybatisPlusAutoConfiguration.class)
 @MapperScan("${mybatis-plus.mapperPackage}")
+@PropertySource(value = "classpath:common-mybatis.yml")
 public class MybatisPlusConfig {
 
     @Bean

ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/config/RedisConfig.java

@@ -8,11 +8,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.redisson.codec.JsonJacksonCodec;
 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.EnableCaching;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 /**
  * redis配置
@@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Lion Li
  */
 @Slf4j
-@Configuration
+@AutoConfiguration
 @EnableCaching
 @EnableConfigurationProperties(RedissonProperties.class)
 public class RedisConfig {

ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/config/SaTokenConfig.java

@@ -6,10 +6,9 @@ import cn.dev33.satoken.stp.StpInterface;
 import cn.dev33.satoken.stp.StpLogic;
 import com.ruoyi.component.satoken.core.PlusSaTokenDao;
 import com.ruoyi.component.satoken.core.SaPermissionImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
@@ -17,9 +16,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  *
  * @author Lion Li
  */
-@RequiredArgsConstructor
-@Slf4j
-@Configuration
+@AutoConfiguration
+@PropertySource(value = "classpath:common-satoken.yml")
 public class SaTokenConfig implements WebMvcConfigurer {
 
     @Bean

ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/handler/AllUrlHandler.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ReUtil;
 import com.ruoyi.component.core.util.spring.SpringUtils;
 import lombok.Data;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
@@ -18,7 +19,7 @@ import java.util.regex.Pattern;
  * @author Lion Li
  */
 @Data
-@Component
+@AutoConfiguration
 public class AllUrlHandler implements InitializingBean {
 
     private static final Pattern PATTERN = Pattern.compile("\\{(.*?)\\}");

ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/config/TranslationConfig.java

@@ -7,7 +7,7 @@ import com.ruoyi.component.translation.core.handler.TranslationBeanSerializerMod
 import com.ruoyi.component.translation.core.handler.TranslationHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 
 import javax.annotation.PostConstruct;
 import java.util.HashMap;
@@ -20,7 +20,7 @@ import java.util.Map;
  * @author Lion Li
  */
 @Slf4j
-@Configuration
+@AutoConfiguration
 public class TranslationConfig {
 
     @Autowired

ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/DictTypeTranslationImpl.java

@@ -6,6 +6,7 @@ import com.ruoyi.component.translation.constant.TransConstant;
 import com.ruoyi.component.translation.core.TranslationInterface;
 import com.ruoyi.component.core.util.StringUtils;
 import lombok.AllArgsConstructor;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.stereotype.Component;
 
 /**
@@ -13,7 +14,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Lion Li
  */
-@Component
+@AutoConfiguration
 @AllArgsConstructor
 @TranslationType(type = TransConstant.DICT_TYPE_TO_LABEL)
 public class DictTypeTranslationImpl implements TranslationInterface<String> {

ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/OssUrlTranslationImpl.java

@@ -5,6 +5,7 @@ import com.ruoyi.component.translation.annotation.TranslationType;
 import com.ruoyi.component.translation.constant.TransConstant;
 import com.ruoyi.component.translation.core.TranslationInterface;
 import lombok.AllArgsConstructor;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.stereotype.Component;
 
 /**
@@ -12,7 +13,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Lion Li
  */
-@Component
+@AutoConfiguration
 @AllArgsConstructor
 @TranslationType(type = TransConstant.OSS_ID_TO_URL)
 public class OssUrlTranslationImpl implements TranslationInterface<String> {

ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/UserNameTranslationImpl.java

@@ -5,6 +5,7 @@ import com.ruoyi.component.translation.annotation.TranslationType;
 import com.ruoyi.component.translation.constant.TransConstant;
 import com.ruoyi.component.translation.core.TranslationInterface;
 import lombok.AllArgsConstructor;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.stereotype.Component;
 
 /**
@@ -12,7 +13,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Lion Li
  */
-@Component
+@AutoConfiguration
 @AllArgsConstructor
 @TranslationType(type = TransConstant.USER_ID_TO_NAME)
 public class UserNameTranslationImpl implements TranslationInterface<String> {

ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/CaptchaConfig.java

@@ -4,6 +4,9 @@ import cn.hutool.captcha.CaptchaUtil;
 import cn.hutool.captcha.CircleCaptcha;
 import cn.hutool.captcha.LineCaptcha;
 import cn.hutool.captcha.ShearCaptcha;
+import com.ruoyi.component.web.config.properties.CaptchaProperties;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Lazy;
 
@@ -14,6 +17,8 @@ import java.awt.*;
  *
  * @author Lion Li
  */
+@AutoConfiguration
+@EnableConfigurationProperties(CaptchaProperties.class)
 public class CaptchaConfig {
 
     private static final int WIDTH = 160;

ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/FilterConfig.java

@@ -5,7 +5,9 @@ import com.ruoyi.component.web.config.properties.XssProperties;
 import com.ruoyi.component.web.filter.RepeatableFilter;
 import com.ruoyi.component.web.filter.XssFilter;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 
@@ -18,6 +20,8 @@ import java.util.Map;
  *
  * @author Lion Li
  */
+@AutoConfiguration
+@EnableConfigurationProperties(XssProperties.class)
 public class FilterConfig {
 
     @Autowired

ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/I18nConfig.java

@@ -1,6 +1,8 @@
 package com.ruoyi.component.web.config;
 
 import cn.hutool.core.util.StrUtil;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.servlet.LocaleResolver;
 
@@ -13,6 +15,7 @@ import java.util.Locale;
  *
  * @author Lion Li
  */
+@AutoConfiguration(before = WebMvcAutoConfiguration.class)
 public class I18nConfig {
 
     @Bean

ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/ResourcesConfig.java

@@ -1,6 +1,7 @@
 package com.ruoyi.component.web.config;
 
 import com.ruoyi.component.web.interceptor.PlusWebInvokeTimeInterceptor;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
@@ -14,6 +15,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  *
  * @author Lion Li
  */
+@AutoConfiguration
 public class ResourcesConfig implements WebMvcConfigurer {
 
     @Override

ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/UndertowConfig.java

@@ -2,6 +2,7 @@ package com.ruoyi.component.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;
 
@@ -10,6 +11,7 @@ import org.springframework.boot.web.server.WebServerFactoryCustomizer;
  *
  * @author Lion Li
  */
+@AutoConfiguration
 public class UndertowConfig implements WebServerFactoryCustomizer<UndertowServletWebServerFactory> {
 
     /**

ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/properties/CaptchaProperties.java

@@ -12,7 +12,6 @@ import org.springframework.stereotype.Component;
  * @author Lion Li
  */
 @Data
-@Component
 @ConfigurationProperties(prefix = "captcha")
 public class CaptchaProperties {
 

ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/properties/XssProperties.java

@@ -2,7 +2,6 @@ package com.ruoyi.component.web.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
 
 /**
  * xss过滤 配置属性
@@ -10,7 +9,6 @@ import org.springframework.stereotype.Component;
  * @author Lion Li
  */
 @Data
-@Component
 @ConfigurationProperties(prefix = "xss")
 public class XssProperties {