Merge remote-tracking branch 'origin/master'

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

@@ -100,7 +100,7 @@ public class StasDataSourceController extends JeecgController<StasDataSource, IS
 	@GetMapping(value = "/targetUser")
 	public Result<?> queryTargetUserList(@RequestParam(name="taskId",required=false) String taskId) {
 		StasTaskConfig taskConfig = stasTaskConfigService.getById(taskId);
-		List<String> tableNameList= stasDataSourceService.queryUserList(taskConfig.getSourceId());
+		List<String> tableNameList= stasDataSourceService.queryUserList(taskConfig.getTargetId());
 		if (tableNameList != null && !"".equals(tableNameList)){
 			return Result.OK(tableNameList);
 		}

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

@@ -87,7 +87,12 @@ public class StasDataSourceServiceImpl extends ServiceImpl<StasDataSourceMapper,
         if(SourceDataTypeEnum.ORACLE.getKey() == stasDataSource.getType()){
             return queryDatabaseMetadata(stasDataSource, "SELECT username FROM ALL_USERS", "username");
         } else {
-            return queryDatabaseMetadata(stasDataSource, "SELECT datname AS username FROM pg_database WHERE datistemplate = false ORDER BY datname;", "username");
+            return queryDatabaseMetadata(stasDataSource,
+                    "SELECT schema_name username \n" +
+                    "FROM information_schema.schemata\n" +
+                    "WHERE schema_name NOT IN ('pg_catalog', 'information_schema')\n" +
+                    "AND schema_name NOT LIKE 'pg_toast%'\n" +
+                    "AND schema_name NOT LIKE 'pg_temp%'", "username");
         }
     }
 

jeecg-module-sync/src/main/java/org/jeecg/stasSyncStrategy/service/impl/StasSyncStrategyServiceImpl.java

@@ -257,8 +257,8 @@ public class StasSyncStrategyServiceImpl extends ServiceImpl<StasSyncStrategyMap
                                                           String targetOwner, String tableName) throws SQLException {
         StringBuilder sqlBuilder = new StringBuilder();
         //模式名称
-//        sqlBuilder.append("CREATE TABLE \"").append(targetOwner).append("\".\"").append(tableName).append("\" (\n");
-        sqlBuilder.append("CREATE TABLE \"").append(tableName).append("\" (\n");
+        sqlBuilder.append("CREATE TABLE \"").append(targetOwner).append("\".\"").append(tableName).append("\" (\n");
+//        sqlBuilder.append("CREATE TABLE \"").append(tableName).append("\" (\n");
 
         // 获取列信息
         String columnSql = "SELECT column_name, data_type, data_length, data_precision, data_scale, nullable " +