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 b394914c1..46da81735 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,10 +19,7 @@ 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.*; import lombok.RequiredArgsConstructor; import org.jasypt.encryption.StringEncryptor; import org.springframework.boot.autoconfigure.AutoConfigureAfter; @@ -30,6 +27,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** @@ -40,6 +38,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; */ @Configuration @RequiredArgsConstructor +@Import(DynamicLogConfiguration.class) @AutoConfigureAfter(DataSourceAutoConfiguration.class) @EnableConfigurationProperties(DruidDataSourceProperties.class) public class DynamicDataSourceAutoConfiguration { diff --git a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicLogConfiguration.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicLogConfiguration.java new file mode 100644 index 000000000..44abf9d7e --- /dev/null +++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicLogConfiguration.java @@ -0,0 +1,17 @@ +package com.pig4cloud.pigx.common.datasource.config; + +import com.pig4cloud.pigx.common.core.factory.YamlPropertySourceFactory; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.context.annotation.PropertySource; + +/** + * @author lengleng + * @date 2022/8/8 + * + * 注入SQL 格式化的插件 + */ +@ConditionalOnClass(name = "com.pig4cloud.pigx.common.data.mybatis.DruidSqlLogFilter") +@PropertySource(value = "classpath:dynamic-ds-log.yaml", factory = YamlPropertySourceFactory.class) +public class DynamicLogConfiguration { + +} diff --git a/pigx-common/pigx-common-datasource/src/main/resources/dynamic-ds-log.yaml b/pigx-common/pigx-common-datasource/src/main/resources/dynamic-ds-log.yaml new file mode 100644 index 000000000..712c24f76 --- /dev/null +++ b/pigx-common/pigx-common-datasource/src/main/resources/dynamic-ds-log.yaml @@ -0,0 +1,7 @@ +# 动态数据源增加 sqlLogFilter 格式化输出 +spring: + datasource: + dynamic: + druid: + proxyFilters: + - sqlLogFilter