From 66e55f32587be994a0dbe00b7bf7268f8b03d38b Mon Sep 17 00:00:00 2001 From: PIGCLOUD Date: Fri, 20 Mar 2026 11:32:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor(pigx-common-datasource):=20=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E5=8A=A8=E6=80=81=E6=95=B0=E6=8D=AE=E6=BA=90=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除 DEFAULT_QUERY_DS_SQL 常量定义 - 直接使用传入的 queryDsSql 参数，简化条件判断逻辑 - 优化构造函数参数初始化方式 --- .../datasource/config/JdbcDynamicDataSourceProvider.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/JdbcDynamicDataSourceProvider.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/JdbcDynamicDataSourceProvider.java index 7b1b7bb3a..4d6d9a1f8 100644 --- a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/JdbcDynamicDataSourceProvider.java +++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/JdbcDynamicDataSourceProvider.java @@ -47,8 +47,6 @@ public class JdbcDynamicDataSourceProvider extends AbstractJdbcDataSourceProvide private static final String SQL_LOG_FILTER = "sqlLogFilter"; - private static final String DEFAULT_QUERY_DS_SQL = "select * from gen_datasource_conf where del_flag = ?"; - private final String queryDsSql; private final StringEncryptor stringEncryptor; @@ -59,7 +57,7 @@ public class JdbcDynamicDataSourceProvider extends AbstractJdbcDataSourceProvide super(defaultDataSourceCreator, masterDataSource.getDriverClassName(), masterDataSource.getUrl(), masterDataSource.getUsername(), masterDataSource.getPassword()); this.stringEncryptor = stringEncryptor; - this.queryDsSql = queryDsSql != null ? queryDsSql : DEFAULT_QUERY_DS_SQL; + this.queryDsSql = queryDsSql; } /**