diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index b04c318..d30dce3 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -3,7 +3,7 @@ ruoyi: # 名称 name: RuoYi-Vue-Plus # 版本 - version: ${ruoyi-vue-plus.version} + version: ${revision} # 版权年份 copyrightYear: 2023 # 缓存懒加载 @@ -154,39 +154,11 @@ mybatis-plus: mapperLocations: classpath*:mapper/**/*Mapper.xml # 实体扫描,多个package用逗号或者分号分隔 typeAliasesPackage: com.ruoyi.**.domain - # 启动时是否检查 MyBatis XML 文件的存在,默认不检查 - checkConfigLocation: false - configuration: - # 自动驼峰命名规则(camel case)映射 - mapUnderscoreToCamelCase: true - # MyBatis 自动映射策略 - # NONE:不启用 PARTIAL:只对非嵌套 resultMap 自动映射 FULL:对所有 resultMap 自动映射 - autoMappingBehavior: PARTIAL - # MyBatis 自动映射时未知列或未知属性处理策 - # NONE:不做处理 WARNING:打印相关警告 FAILING:抛出异常和详细信息 - autoMappingUnknownColumnBehavior: NONE - # 更详细的日志输出 会有性能损耗 org.apache.ibatis.logging.stdout.StdOutImpl - # 关闭日志记录 (可单纯使用 p6spy 分析) org.apache.ibatis.logging.nologging.NoLoggingImpl - # 默认日志输出 org.apache.ibatis.logging.slf4j.Slf4jImpl - logImpl: org.apache.ibatis.logging.nologging.NoLoggingImpl global-config: - # 是否打印 Logo banner - banner: true dbConfig: # 主键类型 # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID idType: ASSIGN_ID - # 逻辑已删除值 - logicDeleteValue: 2 - # 逻辑未删除值 - logicNotDeleteValue: 0 - # 字段验证策略之 insert,在 insert 的时候的字段验证策略 - # IGNORED 忽略 NOT_NULL 非NULL NOT_EMPTY 非空 DEFAULT 默认 NEVER 不加入 SQL - insertStrategy: NOT_NULL - # 字段验证策略之 update,在 update 的时候的字段验证策略 - updateStrategy: NOT_NULL - # 字段验证策略之 select,在 select 的时候的字段验证策略既 wrapper 根据内部 entity 生成的 where 条件 - where-strategy: NOT_NULL # 数据加密 mybatis-encryptor: # 是否开启加密 @@ -240,23 +212,10 @@ lock4j: acquire-timeout: 3000 # 分布式锁的超时时间,默认为 30 秒 expire: 30000 -cai: - enable-api-encryption: true - websocket: false - coin-name: 黄钻 - home-name: 恋香 --- # Actuator 监控端点的配置项 management: endpoints: enabled-by-default: false -# web: -# exposure: -# include: '*' -# endpoint: -# health: -# show-details: ALWAYS -# logfile: -# external-file: ./logs/sys-console.log ali: oss: enable: false diff --git a/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ApplicationConfig.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ApplicationConfig.java index 4404821..8f69db1 100644 --- a/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ApplicationConfig.java +++ b/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 { diff --git a/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/AsyncConfig.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/AsyncConfig.java index 0c70e1c..e321507 100644 --- a/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/AsyncConfig.java +++ b/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 diff --git a/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ValidatorConfig.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ValidatorConfig.java index c695e7b..fd1ae29 100644 --- a/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ValidatorConfig.java +++ b/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 diff --git a/ruoyi-component/ruoyi-component-json/src/main/java/com/ruoyi/component/json/config/JacksonConfig.java b/ruoyi-component/ruoyi-component-json/src/main/java/com/ruoyi/component/json/config/JacksonConfig.java index efe09f7..980da5c 100644 --- a/ruoyi-component/ruoyi-component-json/src/main/java/com/ruoyi/component/json/config/JacksonConfig.java +++ b/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 diff --git a/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/aspect/LogAspect.java b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/aspect/LogAspect.java index eca208f..dd7f3cf 100644 --- a/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/aspect/LogAspect.java +++ b/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 { /** diff --git a/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/MailConfig.java b/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/MailConfig.java index 65eaa73..4c0a121 100644 --- a/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/MailConfig.java +++ b/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 diff --git a/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/properties/MailProperties.java b/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/properties/MailProperties.java index cb1d789..b0c62a0 100644 --- a/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/properties/MailProperties.java +++ b/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 { diff --git a/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/config/MybatisPlusConfig.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/config/MybatisPlusConfig.java index 87c8f06..db46ced 100644 --- a/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/config/MybatisPlusConfig.java +++ b/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 diff --git a/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/config/RedisConfig.java b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/config/RedisConfig.java index ca05c8c..7131536 100644 --- a/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/config/RedisConfig.java +++ b/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 { diff --git a/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/config/SaTokenConfig.java b/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/config/SaTokenConfig.java index 2e0948c..321d997 100644 --- a/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/config/SaTokenConfig.java +++ b/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 diff --git a/ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/handler/AllUrlHandler.java b/ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/handler/AllUrlHandler.java index ffb20e0..51685e3 100644 --- a/ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/handler/AllUrlHandler.java +++ b/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("\\{(.*?)\\}"); diff --git a/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/config/TranslationConfig.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/config/TranslationConfig.java index 8b54e89..47cd372 100644 --- a/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/config/TranslationConfig.java +++ b/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 diff --git a/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/DictTypeTranslationImpl.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/DictTypeTranslationImpl.java index e478a79..7a78d1d 100644 --- a/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/DictTypeTranslationImpl.java +++ b/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 { diff --git a/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/OssUrlTranslationImpl.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/OssUrlTranslationImpl.java index 68aa8dd..158fefe 100644 --- a/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/OssUrlTranslationImpl.java +++ b/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 { diff --git a/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/UserNameTranslationImpl.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/UserNameTranslationImpl.java index 42ea36c..728be4c 100644 --- a/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/UserNameTranslationImpl.java +++ b/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 { diff --git a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/CaptchaConfig.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/CaptchaConfig.java index 8725fd1..4050eaa 100644 --- a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/CaptchaConfig.java +++ b/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; diff --git a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/FilterConfig.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/FilterConfig.java index fcfb363..be9c1cd 100644 --- a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/FilterConfig.java +++ b/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 diff --git a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/I18nConfig.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/I18nConfig.java index 3f928e2..14ee113 100644 --- a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/I18nConfig.java +++ b/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 diff --git a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/ResourcesConfig.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/ResourcesConfig.java index 3696fdf..b0edf05 100644 --- a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/ResourcesConfig.java +++ b/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 diff --git a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/UndertowConfig.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/UndertowConfig.java index e16d213..8b96225 100644 --- a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/UndertowConfig.java +++ b/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 { /** diff --git a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/properties/CaptchaProperties.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/properties/CaptchaProperties.java index ff95f6e..e2491d7 100644 --- a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/properties/CaptchaProperties.java +++ b/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 { diff --git a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/properties/XssProperties.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/properties/XssProperties.java index 4ca7907..533fa1f 100644 --- a/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/properties/XssProperties.java +++ b/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 {