From 4ec983a2fecfa7052eea03f744553f1fd5e38b64 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Tue, 9 Aug 2022 13:52:17 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20cl?=
 =?UTF-8?q?ose=20#4211=20=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81Druid=20=E6=97=A5=E5=BF=97=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DynamicDataSourceAutoConfiguration.java     |  7 +++----
 .../config/DynamicLogConfiguration.java         | 17 +++++++++++++++++
 .../src/main/resources/dynamic-ds-log.yaml      |  7 +++++++
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicLogConfiguration.java
 create mode 100644 pigx-common/pigx-common-datasource/src/main/resources/dynamic-ds-log.yaml

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