refactor(): 重构测试连接

dev
chao 2024-04-25 16:52:08 +08:00
parent 543a97c3ac
commit 3632f62a4e
1 changed files with 23 additions and 9 deletions

View File

@ -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);
}};
}
/**