resolve conflict

dbsyncer-manager/src/main/java/org/dbsyncer/manager/ManagerFactory.java

@@ -68,12 +68,12 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
 
     @Override
     public String addProjectGroup(ConfigModel model) {
-        return operationTemplate.execute(new OperationConfig(model, HandlerEnum.OPR_ADD.getHandler()));
+        return operationTemplate.execute(new OperationConfig(model, HandlerEnum.OPR_ADD));
     }
 
     @Override
     public String editProjectGroup(ConfigModel model) {
-        return operationTemplate.execute(new OperationConfig(model, HandlerEnum.OPR_EDIT.getHandler()));
+        return operationTemplate.execute(new OperationConfig(model, HandlerEnum.OPR_EDIT));
     }
 
     @Override

dbsyncer-manager/src/main/java/org/dbsyncer/manager/enums/HandlerEnum.java

@@ -87,7 +87,7 @@ public enum HandlerEnum {
     /**
      * 预加载ProjectGroup
      */
-    PRELOAD_PROJECT_GROUP(new AbstractPreloadHandler(){
+    PRELOAD_PROJECT_GROUP(ConfigConstant.PROJECT_GROUP, true, new AbstractPreloadHandler(){
         @Override
         protected Object preload(PreloadCallBack preloadCallBack) {
             return preloadCallBack.parseProjectGroup();
@@ -129,4 +129,4 @@ public enum HandlerEnum {
     public GroupStrategyEnum getGroupStrategyEnum() {
         return groupStrategyEnum;
     }
-}
+}

dbsyncer-storage/src/main/java/org/dbsyncer/storage/constant/ConfigConstant.java

@@ -16,7 +16,7 @@ public class ConfigConstant {
     public static final String CONFIG_MODEL_CREATE_TIME = "createTime";
     public static final String CONFIG_MODEL_UPDATE_TIME = "updateTime";
     public static final String CONFIG_MODEL_JSON = "json";
-    public static final String PROJECT_GROUP = "projectGroup";
+
     /**
      * 配置类型
      */
@@ -25,6 +25,7 @@ public class ConfigConstant {
     public static final String TABLE_GROUP = "tableGroup";
     public static final String META = "meta";
     public static final String CONFIG = "config";
+    public static final String PROJECT_GROUP = "projectGroup";
 
     /**
      * 数据