Compare commits

..

No commits in common. "acd4edd80be9906712f883f1edb29b2a63b5a385" and "a1eeaa234ebab2094110c049198a54f39034644f" have entirely different histories.

3 changed files with 7 additions and 6 deletions

View File

@ -121,15 +121,15 @@ public class StasDataSourceController extends JeecgController<StasDataSource, IS
/**
* 数据库连接测试
* @param stasDataSource
* @param sourceId
* @return
*/
@AutoLog(value = "数据库连接测试")
@Operation(summary = "数据库连接测试")
@RequestMapping(value = "/testConnection", method = RequestMethod.GET)
public Result<StasDataSource> testConnection(StasDataSource stasDataSource) {
public Result<StasDataSource> testConnection(String sourceId) {
try {
boolean isValue = stasDataSourceService.testConnection(stasDataSource);
boolean isValue = stasDataSourceService.testConnection(sourceId);
if(isValue){
return Result.OK("连接成功");
}

View File

@ -39,10 +39,10 @@ import java.util.List;
/**
* 测试数据库连接
* @param stasDataSource
* @param sourceId
* @return
*/
boolean testConnection(StasDataSource stasDataSource);
boolean testConnection(String sourceId);
/**
* 查询所有用户信息

View File

@ -57,7 +57,8 @@ public class StasDataSourceServiceImpl extends ServiceImpl<StasDataSourceMapper,
}
@Override
public boolean testConnection(StasDataSource stasDataSource) {
public boolean testConnection(String sourceId) {
StasDataSource stasDataSource = this.baseMapper.selectById(sourceId);
Connection conn = null;
try {
String urlSource = "";