AE86 5 năm trước cách đây
mục cha
commit
b18ff6a745

+ 1 - 3
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/Checker.java

@@ -1,7 +1,5 @@
 package org.dbsyncer.biz.checker;
 
-import org.dbsyncer.parser.model.ConfigModel;
-
 import java.util.Map;
 
 /**
@@ -17,6 +15,6 @@ public interface Checker {
      * @param params 修改参数
      * @return
      */
-    ConfigModel checkConfigModel(Map<String, String> params);
+    String checkConfigModel(Map<String, String> params);
 
 }

+ 5 - 3
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/ConnectorChecker.java

@@ -6,6 +6,7 @@ package org.dbsyncer.biz.checker.impl;
 import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.biz.checker.AbstractChecker;
 import org.dbsyncer.biz.checker.ConnectorConfigChecker;
+import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.connector.config.ConnectorConfig;
 import org.dbsyncer.connector.config.DatabaseConfig;
 import org.dbsyncer.manager.Manager;
@@ -44,7 +45,7 @@ public class ConnectorChecker extends AbstractChecker implements ApplicationCont
     }
 
     @Override
-    public ConfigModel checkConfigModel(Map<String, String> params) {
+    public String checkConfigModel(Map<String, String> params) {
         logger.info("check connector params:{}", params);
         Assert.notEmpty(params, "ConnectorChecker check params is null.");
         String id = params.get(ConfigConstant.CONFIG_MODEL_ID);
@@ -60,7 +61,8 @@ public class ConnectorChecker extends AbstractChecker implements ApplicationCont
         ConnectorConfigChecker checker = map.get(type);
         Assert.notNull(checker, "Checker can not be null.");
         checker.modify(connector, params);
-        return connector;
+
+        return JsonUtil.objToJson(connector);
     }
 
     /**
@@ -70,7 +72,7 @@ public class ConnectorChecker extends AbstractChecker implements ApplicationCont
      * @return
      */
     private String toLowerCaseFirstOne(String s) {
-        if (StringUtils.isBlank(s) || Character.isLowerCase(s.charAt(0))){
+        if (StringUtils.isBlank(s) || Character.isLowerCase(s.charAt(0))) {
             return s;
         }
         return new StringBuilder().append(Character.toLowerCase(s.charAt(0))).append(s.substring(1)).toString();

+ 5 - 4
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/MappingChecker.java

@@ -6,6 +6,7 @@ package org.dbsyncer.biz.checker.impl;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.dbsyncer.biz.checker.AbstractChecker;
+import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.parser.constant.ModelConstant;
@@ -34,7 +35,7 @@ public class MappingChecker extends AbstractChecker {
     private Manager manager;
 
     @Override
-    public ConfigModel checkConfigModel(Map<String, String> params) {
+    public String checkConfigModel(Map<String, String> params) {
         logger.info("check mapping params:{}", params);
         Assert.notEmpty(params, "MappingChecker check params is null.");
         String id = params.get(ConfigConstant.CONFIG_MODEL_ID);
@@ -46,8 +47,8 @@ public class MappingChecker extends AbstractChecker {
 
         // 同步方式(仅支持全量或增量同步方式)
         String model = params.get("model");
-        if(StringUtils.isNotBlank(model)){
-            if(StringUtils.equals(ModelConstant.FULL, model) || StringUtils.equals(ModelConstant.INCREMENT, model)){
+        if (StringUtils.isNotBlank(model)) {
+            if (StringUtils.equals(ModelConstant.FULL, model) || StringUtils.equals(ModelConstant.INCREMENT, model)) {
                 mapping.setModel(model);
             }
         }
@@ -65,7 +66,7 @@ public class MappingChecker extends AbstractChecker {
         this.modifySuperConfigModel(mapping, params);
 
         // 增量配置
-        return mapping;
+        return JsonUtil.objToJson(mapping);
     }
 
 }

+ 4 - 2
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/TableGroupChecker.java

@@ -6,6 +6,7 @@ package org.dbsyncer.biz.checker.impl;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.dbsyncer.biz.checker.AbstractChecker;
+import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.parser.constant.ModelConstant;
@@ -35,7 +36,7 @@ public class TableGroupChecker extends AbstractChecker {
     private Manager manager;
 
     @Override
-    public ConfigModel checkConfigModel(Map<String, String> params) {
+    public String checkConfigModel(Map<String, String> params) {
         logger.info("check tableGroup params:{}", params);
         Assert.notEmpty(params, "TableGroupChecker check params is null.");
         String id = params.get(ConfigConstant.CONFIG_MODEL_ID);
@@ -47,6 +48,7 @@ public class TableGroupChecker extends AbstractChecker {
 
         // 修改高级配置:过滤条件/转换配置/插件配置
         this.modifySuperConfigModel(tableGroup, params);
-        return tableGroup;
+
+        return JsonUtil.objToJson(tableGroup);
     }
 }

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

@@ -45,8 +45,8 @@ public class ConnectorServiceImpl implements ConnectorService {
 
     @Override
     public String edit(Map<String, String> params) {
-        ConfigModel model = connectorChecker.checkConfigModel(params);
-        return manager.editConnector(JsonUtil.objToJson(model));
+        String json = connectorChecker.checkConfigModel(params);
+        return manager.editConnector(json);
     }
 
     @Override

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

@@ -63,8 +63,8 @@ public class MappingServiceImpl implements MappingService {
     @Override
     public String edit(Map<String, String> params) {
         logger.info("检查驱动是否停止运行");
-        ConfigModel model = mappingChecker.checkConfigModel(params);
-        return manager.editMapping(JsonUtil.objToJson(model));
+        String json = mappingChecker.checkConfigModel(params);
+        return manager.editMapping(json);
     }
 
     @Override

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

@@ -56,8 +56,8 @@ public class TableGroupServiceImpl implements TableGroupService {
 
     @Override
     public String edit(Map<String, String> params) {
-        ConfigModel model = tableGroupChecker.checkConfigModel(params);
-        return manager.editTableGroup(JsonUtil.objToJson(model));
+        String json = tableGroupChecker.checkConfigModel(params);
+        return manager.editTableGroup(json);
     }
 
     @Override