From 3632f62a4ea4d2d9391098ee9ab6d2404c3c2e02 Mon Sep 17 00:00:00 2001
From: chao <3072464591@QQ.com>
Date: Thu, 25 Apr 2024 16:52:08 +0800
Subject: [PATCH] =?UTF-8?q?refactor():=20=E9=87=8D=E6=9E=84=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DataSourceServiceImpl.java   | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/service/impl/DataSourceServiceImpl.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/service/impl/DataSourceServiceImpl.java
index 6419a9c..5a3692a 100644
--- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/service/impl/DataSourceServiceImpl.java
+++ b/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/service/impl/DataSourceServiceImpl.java
@@ -25,7 +25,9 @@ import redis.clients.jedis.Jedis;
 
 import java.sql.*;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -566,15 +568,18 @@ public class DataSourceServiceImpl extends ServiceImpl<DataSourceMapper, DataSou
     public boolean testDatasource(DataSource dataSource, DataType dataType) {
         if ("mysql".equals(dataType.getDataType())) {
             log.info("MySQL测试连接");
-            return this.mysqlConnection(dataSource, dataType);
+            Map<String, String> mysqlEdConnection = this.mysqlConnection(dataSource, dataType);
+            return testDatasource(mysqlEdConnection.get("driveClass"), mysqlEdConnection.get("jdbcUrl"),dataSource.getDataSourceUsername(),dataSource.getDataSourcePassword());
         }
         if ("oracle".equals(dataType.getDataType())) {
             log.info("Oracle测试连接");
-            return this.oracleConnection(dataSource, dataType);
+            Map<String, String> mysqlEdConnection = this.mysqlConnection(dataSource, dataType);
+            return testDatasource(mysqlEdConnection.get("driveClass"), mysqlEdConnection.get("jdbcUrl"),dataSource.getDataSourceUsername(),dataSource.getDataSourcePassword());
         }
         if ("sqlserver".equals(dataType.getDataType())) {
             log.info("SQLServer测试连接");
-            return this.sqlserverConnection(dataSource, dataType);
+            Map<String, String> mysqlEdConnection = this.mysqlConnection(dataSource, dataType);
+            return testDatasource(mysqlEdConnection.get("driveClass"), mysqlEdConnection.get("jdbcUrl"),dataSource.getDataSourceUsername(),dataSource.getDataSourcePassword());
         }
         return false;
     }
@@ -586,10 +591,13 @@ public class DataSourceServiceImpl extends ServiceImpl<DataSourceMapper, DataSou
      * @param dataType   数据源类型对象
      * @return 是否连接成功
      */
-    public boolean mysqlConnection(DataSource dataSource, DataType dataType) {
+    public Map<String,String> mysqlConnection(DataSource dataSource, DataType dataType) {
         String driveClass = dataType.getDriverManager();
         String jdbcUrl = dataType.getJdbcPre() + dataSource.getDataSourceIp() + ":" + dataSource.getDataSourcePort() + "/" + dataSource.getDataSourceDatabaseName() + "?" + dataSource.getAdditionalConfiguration();
-        return testDatasource(driveClass, jdbcUrl, dataSource.getDataSourceUsername(), dataSource.getDataSourcePassword());
+        return new HashMap<String , String>(){{
+            put("driveClass",driveClass);
+            put("jdbcUrl",jdbcUrl);
+        }};
     }
 
     /**
@@ -599,10 +607,13 @@ public class DataSourceServiceImpl extends ServiceImpl<DataSourceMapper, DataSou
      * @param dataType   数据源类型对象
      * @return 是否连接成功
      */
-    public boolean oracleConnection(DataSource dataSource, DataType dataType) {
+    public Map<String,String> oracleConnection(DataSource dataSource, DataType dataType) {
         String driveClass = dataType.getDriverManager();
         String jdbcUrl = dataType.getJdbcPre() + dataSource.getDataSourceIp() + ":" + dataSource.getDataSourcePort() + ":" + dataSource.getDataSourceDatabaseName();
-        return testDatasource(driveClass, jdbcUrl, dataSource.getDataSourceUsername(), dataSource.getDataSourcePassword());
+        return new HashMap<String , String>(){{
+            put("driveClass",driveClass);
+            put("jdbcUrl",jdbcUrl);
+        }};
     }
 
     /**
@@ -612,10 +623,13 @@ public class DataSourceServiceImpl extends ServiceImpl<DataSourceMapper, DataSou
      * @param dataType   数据源类型对象
      * @return 是否连接成功
      */
-    public boolean sqlserverConnection(DataSource dataSource, DataType dataType) {
+    public HashMap<String, String> sqlserverConnection(DataSource dataSource, DataType dataType) {
         String driveClass = dataType.getDriverManager();
         String jdbcUrl = dataType.getJdbcPre() + dataSource.getDataSourceIp() + ":" + dataSource.getDataSourcePort() + ";databaseName=" + dataSource.getDataSourceDatabaseName();
-        return testDatasource(driveClass, jdbcUrl, dataSource.getDataSourceUsername(), dataSource.getDataSourcePassword());
+        return new HashMap<String , String>(){{
+            put("driveClass",driveClass);
+            put("jdbcUrl",jdbcUrl);
+        }};
     }
 
     /**