From 660cc073e9a8e9b3574369dbb51c192083cde321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Fri, 13 Mar 2020 13:03:00 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20pigx-common-d?= =?UTF-8?q?s=20=E4=BE=9D=E8=B5=96=E9=A1=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-common/pigx-common-datasource/pom.xml | 56 +------------------ .../config/DruidDataSourceProperties.java | 18 +++++- .../config/JdbcDynamicDataSourceProvider.java | 5 +- .../support/DataSourceConstants.java | 4 -- .../pigx/codegen/mapper/GeneratorMapper.java | 2 + pom.xml | 2 +- 6 files changed, 22 insertions(+), 65 deletions(-) diff --git a/pigx-common/pigx-common-datasource/pom.xml b/pigx-common/pigx-common-datasource/pom.xml index 6f586e0ee..9939cfb2a 100644 --- a/pigx-common/pigx-common-datasource/pom.xml +++ b/pigx-common/pigx-common-datasource/pom.xml @@ -17,70 +17,16 @@ pigx 动态切换数据源 - - org.springframework.boot - spring-boot-starter-jdbc - - - javax.servlet - javax.servlet-api - - - org.springframework - spring-webmvc - - - - com.pig4cloud - pigx-common-core - com.baomidou dynamic-datasource-spring-boot-starter - - com.baomidou - mybatis-plus-boot-starter - - - mysql - mysql-connector-java - com.alibaba druid-spring-boot-starter - - - - com.pig4cloud - pigx-common-swagger - - - - com.pig4cloud - pigx-common-security - - - com.pig4cloud - pigx-common-log - - - - velocity - org.apache.velocity - ${velocity.version} - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-undertow + provided \ No newline at end of file diff --git a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DruidDataSourceProperties.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DruidDataSourceProperties.java index 08a8ba6d3..5c9164b7f 100644 --- a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DruidDataSourceProperties.java +++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DruidDataSourceProperties.java @@ -14,13 +14,29 @@ import org.springframework.stereotype.Component; @Component @ConfigurationProperties("spring.datasource.druid") public class DruidDataSourceProperties { + + /** + * 数据源用户名 + */ private String username; + + /** + * 数据源密码 + */ private String password; + + /** + * jdbcurl + */ private String url; + + /** + * 数据源驱动 + */ private String driverClassName; /** * 查询数据源的SQL */ - private String queryDsSql; + private String queryDsSql = "select * from gen_datasource_conf where del_flag = 0"; } 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 621426c87..3881d21ef 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 @@ -17,7 +17,6 @@ package com.pig4cloud.pigx.common.datasource.config; -import cn.hutool.core.util.StrUtil; import com.baomidou.dynamic.datasource.provider.AbstractJdbcDataSourceProvider; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.pig4cloud.pigx.common.datasource.support.DataSourceConstants; @@ -54,9 +53,7 @@ public class JdbcDynamicDataSourceProvider extends AbstractJdbcDataSourceProvide */ @Override protected Map executeStmt(Statement statement) throws SQLException { - ResultSet rs = statement.executeQuery(StrUtil.isBlank(properties.getQueryDsSql()) - ? DataSourceConstants.QUERY_DS_SQL - : properties.getQueryDsSql()); + ResultSet rs = statement.executeQuery(properties.getQueryDsSql()); Map map = new HashMap<>(8); while (rs.next()) { diff --git a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DataSourceConstants.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DataSourceConstants.java index 620554711..07a34ea62 100644 --- a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DataSourceConstants.java +++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DataSourceConstants.java @@ -7,10 +7,6 @@ package com.pig4cloud.pigx.common.datasource.support; * 数据源相关常量 */ public interface DataSourceConstants { - /** - * 查询数据源的SQL - */ - String QUERY_DS_SQL = "select * from gen_datasource_conf where del_flag = 0"; /** * 数据源名称 diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GeneratorMapper.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GeneratorMapper.java index 5af04db55..6e5639d82 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GeneratorMapper.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GeneratorMapper.java @@ -48,6 +48,7 @@ public interface GeneratorMapper { * 查询表信息 * * @param tableName 表名称 + * @param dsName 数据源名称 * @return */ @DS("#last") @@ -57,6 +58,7 @@ public interface GeneratorMapper { * 查询表列信息 * * @param tableName 表名称 + * @param dsName 数据源名称 * @return */ @DS("#last") diff --git a/pom.xml b/pom.xml index 169e85e90..3f294d936 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ 1.8 1.8 2.2.2 - 5.1.5 + 5.2.0 1.6.2 2.9.2 2.0.2