1
0
AE86 3 жил өмнө
parent
commit
273852bec5

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

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

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/AbstractDatabaseConnector.java

@@ -54,7 +54,7 @@ public abstract class AbstractDatabaseConnector extends AbstractConnector
 
     @Override
     public String getConnectorMapperCacheKey(DatabaseConfig config) {
-        return String.format("%s-%s", config.getUrl(), config.getUsername());
+        return String.format("%s-%s-%s", config.getConnectorType(), config.getUrl(), config.getUsername());
     }
 
     @Override

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESConnector.java

@@ -80,7 +80,7 @@ public final class ESConnector extends AbstractConnector implements Connector<ES
 
     @Override
     public String getConnectorMapperCacheKey(ESConfig config) {
-        return String.format("%s-%s-%s-%s", config.getUrl(), config.getIndex(), config.getType(), config.getUsername());
+        return String.format("%s-%s-%s-%s-%s", config.getConnectorType(), config.getUrl(), config.getIndex(), config.getType(), config.getUsername());
     }
 
     @Override

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/kafka/KafkaConnector.java

@@ -41,7 +41,7 @@ public class KafkaConnector extends AbstractConnector implements Connector<Kafka
 
     @Override
     public String getConnectorMapperCacheKey(KafkaConfig config) {
-        return String.format("%s-%s-%s", config.getBootstrapServers(), config.getTopic(), config.getGroupId());
+        return String.format("%s-%s-%s-%s", config.getConnectorType(), config.getBootstrapServers(), config.getTopic(), config.getGroupId());
     }
 
     @Override

+ 5 - 5
dbsyncer-web/src/main/resources/static/js/mapping/edit.js

@@ -129,18 +129,18 @@ function bindMappingTableGroupAddClick($sourceSelect, $targetSelect) {
         // 如果存在多个选择,只筛选相似表
         var sLen = m.sourceTable.length;
         var tLen = m.targetTable.length;
-        if(1 < sLen || 1 < tLen){
+        if (1 < sLen || 1 < tLen) {
             var mark = [];
-            for(j = 0; j < sLen; j++) {
-                if(-1 != m.targetTable.indexOf(m.sourceTable[j])){
+            for (j = 0; j < sLen; j++) {
+                if (-1 != m.targetTable.indexOf(m.sourceTable[j])) {
                     mark.push(m.sourceTable[j]);
                 }
             }
             m.sourceTable = mark;
             m.targetTable = mark;
         }
-        m.sourceTable = m.sourceTable.join();
-        m.targetTable = m.targetTable.join();
+        m.sourceTable = m.sourceTable.join('|');
+        m.targetTable = m.targetTable.join('|');
 
         doPoster("/tableGroup/add", m, function (data) {
             if (data.success == true) {