Merge remote-tracking branch 'origin/master'

jeecg-module-sync/src/main/java/org/jeecg/dataSource/controller/StasDataSourceController.java

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

jeecg-module-sync/src/main/java/org/jeecg/dataSource/service/IStasDataSourceService.java

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

jeecg-module-sync/src/main/java/org/jeecg/dataSource/service/impl/StasDataSourceServiceImpl.java

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