From a60944c9250d36797af969fabddad403c1670ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E8=B0=83?= <3084898776@qq.com> Date: Wed, 4 Sep 2024 20:40:58 +0800 Subject: [PATCH] =?UTF-8?q?09042040:=E4=BC=98=E5=8C=96=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/source/domain/DataSource.java | 14 ++++--- .../muyu/source/pool/config/BaseConfig.java | 38 +++++++++---------- .../service/Impl/DataSourceServiceImpl.java | 8 +++- 3 files changed, 34 insertions(+), 26 deletions(-) diff --git a/muyu-source-common/src/main/java/com/muyu/source/domain/DataSource.java b/muyu-source-common/src/main/java/com/muyu/source/domain/DataSource.java index 939f60b..8afdf49 100644 --- a/muyu-source-common/src/main/java/com/muyu/source/domain/DataSource.java +++ b/muyu-source-common/src/main/java/com/muyu/source/domain/DataSource.java @@ -216,7 +216,7 @@ public class DataSource extends BaseEntity { .maxNum(req.getMaxNum()) .maxWaitSize(req.getMaxWaitSize()) .maxWaitTime(req.getMaxWaitTime()) - .driverName(req.getDriverName()) + .driverName("com.mysql.cj.jdbc.Driver") .build(); } @@ -226,13 +226,17 @@ public class DataSource extends BaseEntity { */ public String getUrl(){ StringBuilder urlSb = new StringBuilder(BaseConfig.MYSQLJDBCPRO); - urlSb.append(this.ip);//拼接ip + //拼接ip + urlSb.append(this.ip); urlSb.append(":"); - urlSb.append(this.port); //拼接端口 + //拼接端口 + urlSb.append(this.port); urlSb.append("/"); - urlSb.append(this.databaseName);//拼接数据库 + //拼接数据库 + urlSb.append(this.databaseName); urlSb.append("?"); - urlSb.append(this.connectionParam);//useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + //useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + urlSb.append(this.connectionParam); return urlSb.toString(); } diff --git a/muyu-source-common/src/main/java/com/muyu/source/pool/config/BaseConfig.java b/muyu-source-common/src/main/java/com/muyu/source/pool/config/BaseConfig.java index e701760..6b1f749 100644 --- a/muyu-source-common/src/main/java/com/muyu/source/pool/config/BaseConfig.java +++ b/muyu-source-common/src/main/java/com/muyu/source/pool/config/BaseConfig.java @@ -19,25 +19,25 @@ public class BaseConfig { public static final String SELECT="select "; public static final String SELECTALL="select * from "; public static final String FROM=" from "; - public static final String SELECTFIELD=" SELECT \" +\n" + - " \" COLUMN_NAME , \" +\n" + - " \" COLUMN_COMMENT ,\" +\n" + - " \" CASE WHEN COLUMN_KEY = 'PRI' THEN '是' ELSE '否' END ,\" +\n" + - " \" CASE \\n\" +\n" + - " \" WHEN DATA_TYPE = 'int' THEN 'Integer' \" +\n" + - " \" WHEN DATA_TYPE = 'bigint' THEN 'Long' \" +\n" + - " \" WHEN DATA_TYPE = 'varchar' THEN 'String' \" +\n" + - " \" WHEN DATA_TYPE = 'decimal' THEN 'BigDecimal' \" +\n" + - " \" WHEN DATA_TYPE = 'tinyint' AND COLUMN_TYPE = 'tinyint(1)' THEN 'Boolean'\" +\n" + - " \" ELSE DATA_TYPE \\n\" +\n" + - " \" END , \" +\n" + - " \" DATA_TYPE , \\n\" +\n" + - " \" COLUMN_TYPE , \\n\" +\n" + - " \" CHARACTER_MAXIMUM_LENGTH , \\n\" +\n" + - " \" NUMERIC_SCALE , \\n\" +\n" + - " \" IS_NULLABLE , \\n\" +\n" + - " \" COLUMN_DEFAULT \\n\" +\n" + - " \"FROM INFORMATION_SCHEMA.COLUMNS "; + public static final String SELECTFIELD=" SELECT \" +\n" + + " \" COLUMN_NAME , \" +\n" + + " \" COLUMN_COMMENT ,\" +\n" + + " \" CASE WHEN COLUMN_KEY = 'PRI' THEN '是' ELSE '否' END ,\" +\n" + + " \" CASE \\n\" +\n" + + " \" WHEN DATA_TYPE = 'int' THEN 'Integer' \" +\n" + + " \" WHEN DATA_TYPE = 'bigint' THEN 'Long' \" +\n" + + " \" WHEN DATA_TYPE = 'varchar' THEN 'String' \" +\n" + + " \" WHEN DATA_TYPE = 'decimal' THEN 'BigDecimal' \" +\n" + + " \" WHEN DATA_TYPE = 'tinyint' AND COLUMN_TYPE = 'tinyint(1)' THEN 'Boolean'\" +\n" + + " \" ELSE DATA_TYPE \\n\" +\n" + + " \" END , \" +\n" + + " \" DATA_TYPE , \\n\" +\n" + + " \" COLUMN_TYPE , \\n\" +\n" + + " \" CHARACTER_MAXIMUM_LENGTH , \\n\" +\n" + + " \" NUMERIC_SCALE , \\n\" +\n" + + " \" IS_NULLABLE , \\n\" +\n" + + " \" COLUMN_DEFAULT \\n\" +\n" + + " \"FROM INFORMATION_SCHEMA.COLUMNS "; diff --git a/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataSourceServiceImpl.java b/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataSourceServiceImpl.java index 796294e..c31bfda 100644 --- a/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataSourceServiceImpl.java +++ b/muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataSourceServiceImpl.java @@ -23,6 +23,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import static com.muyu.source.pool.config.BaseConfig.SELECTALL; +import static com.muyu.source.pool.config.BaseConfig.SELECTFIELD; /** * @author Lenovo @@ -244,6 +245,9 @@ public class DataSourceServiceImpl extends ServiceImpl