AE86 9 mesi fa
parent
commit
9cd5504fc3

+ 2 - 2
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/group/ProjectGroupChecker.java

@@ -69,8 +69,8 @@ public class ProjectGroupChecker extends AbstractChecker {
     }
 
     private void modifyProjectGroup(ProjectGroup projectGroup, Map<String, String> params) {
-        String[] connectorIds = StringUtil.split(params.get("connectorIds"), "|");
-        String[] mappingIds = StringUtil.split(params.get("mappingIds"), "|");
+        String[] connectorIds = StringUtil.split(params.get("connectorIds"), StringUtil.VERTICAL_LINE);
+        String[] mappingIds = StringUtil.split(params.get("mappingIds"), StringUtil.VERTICAL_LINE);
         boolean exist = (connectorIds != null && connectorIds.length > 0) | (mappingIds != null && mappingIds.length > 0);
         Assert.isTrue(exist, "请选择连接或驱动.");
 

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/MappingChecker.java

@@ -150,7 +150,7 @@ public class MappingChecker extends AbstractChecker {
         List<TableGroup> groupAll = profileComponent.getTableGroupAll(mapping.getId());
         if (!CollectionUtils.isEmpty(groupAll)) {
             // 手动排序
-            String[] sortedTableGroupIds = StringUtil.split(params.get("sortedTableGroupIds"), "|");
+            String[] sortedTableGroupIds = StringUtil.split(params.get("sortedTableGroupIds"), StringUtil.VERTICAL_LINE);
             if (null != sortedTableGroupIds && sortedTableGroupIds.length > 0) {
                 Map<String, TableGroup> tableGroupMap = groupAll.stream().collect(Collectors.toMap(TableGroup::getId, f -> f, (k1, k2) -> k1));
                 groupAll.clear();

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/PluginServiceImpl.java

@@ -53,7 +53,7 @@ public class PluginServiceImpl implements PluginService {
             vos.addAll(pluginAll.stream().map(plugin -> {
                 PluginVo vo = new PluginVo();
                 BeanUtils.copyProperties(plugin, vo);
-                vo.setMappingName(StringUtil.join(pluginClassNameMap.get(plugin.getClassName()), "|"));
+                vo.setMappingName(StringUtil.join(pluginClassNameMap.get(plugin.getClassName()), StringUtil.VERTICAL_LINE));
                 return vo;
             }).collect(Collectors.toList()));
         }

+ 2 - 2
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/TableGroupServiceImpl.java

@@ -46,8 +46,8 @@ public class TableGroupServiceImpl extends BaseServiceImpl implements TableGroup
 
         synchronized (LOCK) {
             // table1, table2
-            String[] sourceTableArray = StringUtil.split(params.get("sourceTable"), "|");
-            String[] targetTableArray = StringUtil.split(params.get("targetTable"), "|");
+            String[] sourceTableArray = StringUtil.split(params.get("sourceTable"), StringUtil.VERTICAL_LINE);
+            String[] targetTableArray = StringUtil.split(params.get("targetTable"), StringUtil.VERTICAL_LINE);
             int tableSize = sourceTableArray.length;
             Assert.isTrue(tableSize == targetTableArray.length, "数据源表和目标源表关系必须为一组");
 

+ 4 - 0
dbsyncer-common/src/main/java/org/dbsyncer/common/util/StringUtil.java

@@ -27,6 +27,10 @@ public abstract class StringUtil {
 
     public static final String POINT = ".";
 
+    public static final String VERTICAL_LINE = "|";
+
+    public static final String COMMA = ",";
+
     public static boolean equals(CharSequence cs1, CharSequence cs2) {
         return StringUtils.equals(cs1, cs2);
     }