diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/JacksonConfig.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/JacksonConfiguration.java similarity index 98% rename from pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/JacksonConfig.java rename to pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/JacksonConfiguration.java index 6b51ebf8b..d8db68025 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/JacksonConfig.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/JacksonConfiguration.java @@ -36,7 +36,7 @@ import java.util.TimeZone; @ConditionalOnClass(ObjectMapper.class) @AutoConfigureBefore(JacksonAutoConfiguration.class) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) -public class JacksonConfig implements WebMvcConfigurer { +public class JacksonConfiguration implements WebMvcConfigurer { private static final String ASIA_SHANGHAI = "Asia/Shanghai"; diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/MessageSourceConfig.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/MessageSourceConfiguration.java similarity index 97% rename from pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/MessageSourceConfig.java rename to pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/MessageSourceConfiguration.java index 2eac2fb6b..dd854f248 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/MessageSourceConfig.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/MessageSourceConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.context.support.ReloadableResourceBundleMessageSource * 国际化配置 */ @Configuration -public class MessageSourceConfig { +public class MessageSourceConfiguration { @Bean public MessageSource messageSource() { diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/RestTemplateConfig.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/RestTemplateConfiguration.java similarity index 96% rename from pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/RestTemplateConfig.java rename to pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/RestTemplateConfiguration.java index 64d71428a..e87f95391 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/RestTemplateConfig.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/RestTemplateConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.web.client.RestTemplate; * @date 2018/8/16 RestTemplate */ @Configuration -public class RestTemplateConfig { +public class RestTemplateConfiguration { @Bean public RestTemplate restTemplate() { diff --git a/pigx-common/pigx-common-core/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-core/src/main/resources/META-INF/spring.factories index 8bdf5ad3b..3722ba55a 100644 --- a/pigx-common/pigx-common-core/src/main/resources/META-INF/spring.factories +++ b/pigx-common/pigx-common-core/src/main/resources/META-INF/spring.factories @@ -1,5 +1,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.pig4cloud.pigx.common.core.config.JacksonConfig,\ - com.pig4cloud.pigx.common.core.config.MessageSourceConfig,\ - com.pig4cloud.pigx.common.core.config.RestTemplateConfig,\ + com.pig4cloud.pigx.common.core.config.JacksonConfiguration,\ + com.pig4cloud.pigx.common.core.config.MessageSourceConfiguration,\ + com.pig4cloud.pigx.common.core.config.RestTemplateConfiguration,\ com.pig4cloud.pigx.common.core.util.SpringContextHolder diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisCacheManagerConfig.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisCacheManagerConfiguration.java similarity index 97% rename from pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisCacheManagerConfig.java rename to pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisCacheManagerConfiguration.java index c87b1c91f..08281e6fa 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisCacheManagerConfig.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisCacheManagerConfiguration.java @@ -33,7 +33,7 @@ import java.util.List; */ @Configuration @ConditionalOnMissingBean(CacheManagerCustomizers.class) -public class RedisCacheManagerConfig { +public class RedisCacheManagerConfiguration { @Bean public CacheManagerCustomizers cacheManagerCustomizers( diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfiguration.java similarity index 97% rename from pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java rename to pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfiguration.java index a48393102..8378cafc0 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfiguration.java @@ -35,10 +35,9 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; */ @EnableCaching @Configuration -@AllArgsConstructor @AutoConfigureBefore(name = { "org.redisson.spring.starter.RedissonAutoConfiguration", "org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration" }) -public class RedisTemplateConfig { +public class RedisTemplateConfiguration { @Bean @Primary diff --git a/pigx-common/pigx-common-data/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-data/src/main/resources/META-INF/spring.factories index 1e6cfcfda..fab35cebc 100644 --- a/pigx-common/pigx-common-data/src/main/resources/META-INF/spring.factories +++ b/pigx-common/pigx-common-data/src/main/resources/META-INF/spring.factories @@ -1,7 +1,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.pig4cloud.pigx.common.data.cache.RedisTemplateConfig,\ + com.pig4cloud.pigx.common.data.cache.RedisTemplateConfiguration,\ com.pig4cloud.pigx.common.data.cache.RedisMessageConfiguration,\ - com.pig4cloud.pigx.common.data.cache.RedisCacheManagerConfig,\ + com.pig4cloud.pigx.common.data.cache.RedisCacheManagerConfiguration,\ com.pig4cloud.pigx.common.data.cache.RedisCacheAutoConfiguration,\ com.pig4cloud.pigx.common.data.tenant.PigxTenantConfigProperties,\ com.pig4cloud.pigx.common.data.tenant.TenantContextHolderFilter,\ diff --git a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/DynamicDataSourceAutoConfiguration.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/DynamicDataSourceAutoConfiguration.java index 5daa24ca9..b394914c1 100644 --- a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/DynamicDataSourceAutoConfiguration.java +++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/DynamicDataSourceAutoConfiguration.java @@ -19,11 +19,11 @@ package com.pig4cloud.pigx.common.datasource; import com.baomidou.dynamic.datasource.processor.DsProcessor; import com.baomidou.dynamic.datasource.provider.DynamicDataSourceProvider; +import com.pig4cloud.pigx.common.datasource.config.ClearTtlDsConfiguration; import com.pig4cloud.pigx.common.datasource.config.DruidDataSourceProperties; import com.pig4cloud.pigx.common.datasource.config.JdbcDynamicDataSourceProvider; import com.pig4cloud.pigx.common.datasource.config.LastParamDsProcessor; -import com.pig4cloud.pigx.common.datasource.config.WebMvcConfig; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.jasypt.encryption.StringEncryptor; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -39,7 +39,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * 动态数据源切换配置 */ @Configuration -@AllArgsConstructor +@RequiredArgsConstructor @AutoConfigureAfter(DataSourceAutoConfiguration.class) @EnableConfigurationProperties(DruidDataSourceProperties.class) public class DynamicDataSourceAutoConfiguration { @@ -60,7 +60,7 @@ public class DynamicDataSourceAutoConfiguration { @Bean public WebMvcConfigurer webMvcConfigurer() { - return new WebMvcConfig(); + return new ClearTtlDsConfiguration(); } } diff --git a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/WebMvcConfig.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/ClearTtlDsConfiguration.java similarity index 85% rename from pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/WebMvcConfig.java rename to pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/ClearTtlDsConfiguration.java index 77da071e1..3137ec580 100644 --- a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/WebMvcConfig.java +++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/ClearTtlDsConfiguration.java @@ -7,11 +7,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @author lengleng * @date 2020/12/11 */ -public class WebMvcConfig implements WebMvcConfigurer { +public class ClearTtlDsConfiguration implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(new ClearTtlDsInterceptor()).addPathPatterns("/**"); } -} \ No newline at end of file +}