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 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 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 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 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(){{ + put("driveClass",driveClass); + put("jdbcUrl",jdbcUrl); + }}; } /** @@ -599,10 +607,13 @@ public class DataSourceServiceImpl extends ServiceImpl 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(){{ + put("driveClass",driveClass); + put("jdbcUrl",jdbcUrl); + }}; } /** @@ -612,10 +623,13 @@ public class DataSourceServiceImpl extends ServiceImpl 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(){{ + put("driveClass",driveClass); + put("jdbcUrl",jdbcUrl); + }}; } /**