rename

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

@@ -151,7 +151,7 @@ public class MappingChecker extends AbstractChecker {
             // 合并配置
             for (TableGroup g : groupAll) {
                 tableGroupChecker.mergeConfig(mapping, g);
-                manager.editTableGroup(g);
+                manager.editConfigModel(g);
             }
         }
     }
@@ -197,7 +197,7 @@ public class MappingChecker extends AbstractChecker {
         getMetaTotal(meta, mapping.getModel());
 
         meta.setUpdateTime(Instant.now().toEpochMilli());
-        manager.editMeta(meta);
+        manager.editConfigModel(meta);
     }
 
     private void addMeta(Mapping mapping) {
@@ -209,7 +209,7 @@ public class MappingChecker extends AbstractChecker {
         // 修改基本配置
         this.modifyConfigModel(meta, new HashMap<>());
 
-        String id = manager.addMeta(meta);
+        String id = manager.addConfigModel(meta);
         mapping.setMetaId(id);
     }
 

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/system/SystemConfigChecker.java

@@ -42,7 +42,7 @@ public class SystemConfigChecker extends AbstractChecker {
         // 修改基本配置
         this.modifyConfigModel(systemConfig, params);
 
-        manager.addSystemConfig(systemConfig);
+        manager.addConfigModel(systemConfig);
         return systemConfig;
     }
 
@@ -51,9 +51,7 @@ public class SystemConfigChecker extends AbstractChecker {
         logger.info("params:{}", params);
         Assert.notEmpty(params, "Config check params is null.");
 
-        String id = params.get(ConfigConstant.CONFIG_MODEL_ID);
-        Assert.hasText(id, "Config id is empty.");
-        SystemConfig systemConfig = manager.getSystemConfig(id);
+        SystemConfig systemConfig = manager.getSystemConfig();
         Assert.notNull(systemConfig, "配置文件为空.");
 
         // 刷新监控间隔（秒）

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

@@ -44,7 +44,7 @@ public class ConnectorServiceImpl extends BaseServiceImpl implements ConnectorSe
         ConfigModel model = connectorChecker.checkAddConfigModel(params);
         log(LogType.ConnectorLog.INSERT, model);
 
-        return manager.addConnector(model);
+        return manager.addConfigModel(model);
     }
 
     @Override
@@ -56,7 +56,7 @@ public class ConnectorServiceImpl extends BaseServiceImpl implements ConnectorSe
         params.put(ConfigConstant.CONFIG_MODEL_NAME, connector.getName() + "(复制)");
         ConfigModel model = connectorChecker.checkAddConfigModel(params);
         log(LogType.ConnectorLog.COPY, model);
-        manager.addConnector(model);
+        manager.addConfigModel(model);
 
         return String.format("复制成功[%s]", model.getName());
     }
@@ -66,7 +66,7 @@ public class ConnectorServiceImpl extends BaseServiceImpl implements ConnectorSe
         ConfigModel model = connectorChecker.checkEditConfigModel(params);
         log(LogType.ConnectorLog.UPDATE, model);
 
-        return manager.editConnector(model);
+        return manager.editConfigModel(model);
     }
 
     @Override
@@ -85,7 +85,7 @@ public class ConnectorServiceImpl extends BaseServiceImpl implements ConnectorSe
         Connector connector = manager.getConnector(id);
         log(LogType.ConnectorLog.DELETE, connector);
 
-        manager.removeConnector(id);
+        manager.removeConfigModel(id);
         return "删除连接器成功!";
     }
 

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

@@ -47,7 +47,7 @@ public class MappingServiceImpl extends BaseServiceImpl implements MappingServic
         ConfigModel model = mappingChecker.checkAddConfigModel(params);
         log(LogType.MappingLog.INSERT, (Mapping) model);
 
-        String id = manager.addMapping(model);
+        String id = manager.addConfigModel(model);
 
         // 匹配相似表 on
         String autoMatchTable = params.get("autoMatchTable");
@@ -68,7 +68,7 @@ public class MappingServiceImpl extends BaseServiceImpl implements MappingServic
             log(LogType.MappingLog.UPDATE, model);
 
             mappingChecker.batchMergeTableGroupConfig(model, params);
-            return manager.editMapping(model);
+            return manager.editConfigModel(model);
         }
     }
 
@@ -85,17 +85,17 @@ public class MappingServiceImpl extends BaseServiceImpl implements MappingServic
             log(LogType.MetaLog.CLEAR, meta);
 
             // 删除meta
-            manager.removeMeta(metaId);
+            manager.removeConfigModel(metaId);
             log(LogType.MetaLog.DELETE, meta);
 
             // 删除tableGroup
             List<TableGroup> groupList = manager.getTableGroupAll(id);
             if (!CollectionUtils.isEmpty(groupList)) {
-                groupList.forEach(t -> manager.removeTableGroup(t.getId()));
+                groupList.forEach(t -> manager.removeConfigModel(t.getId()));
             }
 
             // 删除驱动
-            manager.removeMapping(id);
+            manager.removeConfigModel(id);
             log(LogType.MappingLog.DELETE, mapping);
         }
         return "驱动删除成功";
@@ -218,7 +218,7 @@ public class MappingServiceImpl extends BaseServiceImpl implements MappingServic
         if (meta.getTotal().get() <= (meta.getSuccess().get() + meta.getFail().get())) {
             meta.getFail().set(0);
             meta.getSuccess().set(0);
-            manager.editMeta(meta);
+            manager.editConfigModel(meta);
         }
     }
 

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/ProjectGroupServiceImpl.java

@@ -48,7 +48,7 @@ public class ProjectGroupServiceImpl extends BaseServiceImpl implements ProjectG
         ConfigModel model = projectGroupChecker.checkAddConfigModel(params);
         log(LogType.ConnectorLog.INSERT, model);
 
-        return manager.addProjectGroup(model);
+        return manager.addConfigModel(model);
     }
 
     @Override
@@ -56,7 +56,7 @@ public class ProjectGroupServiceImpl extends BaseServiceImpl implements ProjectG
         ConfigModel model = projectGroupChecker.checkEditConfigModel(params);
         log(LogType.ConnectorLog.UPDATE, model);
 
-        return manager.editProjectGroup(model);
+        return manager.editConfigModel(model);
     }
 
     @Override
@@ -64,7 +64,7 @@ public class ProjectGroupServiceImpl extends BaseServiceImpl implements ProjectG
         ProjectGroup projectGroup = manager.getProjectGroup(id);
         log(LogType.ConnectorLog.DELETE, projectGroup);
         Assert.notNull(projectGroup, "该分组已被删除");
-        manager.removeProjectGroup(id);
+        manager.removeConfigModel(id);
         return "删除分组成功!";
     }
 

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/SystemConfigServiceImpl.java

@@ -10,8 +10,8 @@ import org.dbsyncer.manager.Manager;
 import org.dbsyncer.manager.template.PreloadTemplate;
 import org.dbsyncer.parser.logger.LogService;
 import org.dbsyncer.parser.logger.LogType;
-import org.dbsyncer.parser.model.SystemConfig;
 import org.dbsyncer.parser.model.ConfigModel;
+import org.dbsyncer.parser.model.SystemConfig;
 import org.dbsyncer.plugin.enums.FileSuffixEnum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,19 +52,19 @@ public class SystemConfigServiceImpl implements SystemConfigService {
     @Override
     public String edit(Map<String, String> params) {
         ConfigModel model = systemConfigChecker.checkEditConfigModel(params);
-        manager.editSystemConfig(model);
+        manager.editConfigModel(model);
         return "修改成功.";
     }
 
     @Override
     public SystemConfigVo getSystemConfigVo() {
-        return convertConfig2Vo(getSystemConfigModel());
+        return convertConfig2Vo(getSystemConfig());
     }
 
     @Override
     public List<ConfigModel> getConfigModelAll() {
         List<ConfigModel> list = new ArrayList<>();
-        list.add(getSystemConfigModel());
+        list.add(getSystemConfig());
         list.add(userService.getUserConfig());
         manager.getConnectorAll().forEach(config -> list.add(config));
         manager.getMappingAll().forEach(config -> list.add(config));
@@ -98,9 +98,19 @@ public class SystemConfigServiceImpl implements SystemConfigService {
         }
     }
 
-    private synchronized SystemConfig getSystemConfigModel() {
-        List<SystemConfig> all = manager.getSystemConfigAll();
-        return CollectionUtils.isEmpty(all) ? (SystemConfig) systemConfigChecker.checkAddConfigModel(new HashMap<>()) : all.get(0);
+    private SystemConfig getSystemConfig() {
+        SystemConfig config = manager.getSystemConfig();
+        if (null != config) {
+            return config;
+        }
+
+        synchronized (this) {
+            config = manager.getSystemConfig();
+            if (null == config) {
+                config = (SystemConfig) systemConfigChecker.checkAddConfigModel(new HashMap<>());
+            }
+            return config;
+        }
     }
 
     private SystemConfigVo convertConfig2Vo(SystemConfig systemConfig) {

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

@@ -51,7 +51,7 @@ public class TableGroupServiceImpl extends BaseServiceImpl implements TableGroup
                 log(LogType.TableGroupLog.INSERT, model);
                 int tableGroupCount = manager.getTableGroupCount(mappingId);
                 model.setIndex(tableGroupCount + 1);
-                id = manager.addTableGroup(model);
+                id = manager.addConfigModel(model);
             }
 
             // 合并驱动公共字段
@@ -70,7 +70,7 @@ public class TableGroupServiceImpl extends BaseServiceImpl implements TableGroup
         TableGroup model = (TableGroup) tableGroupChecker.checkEditConfigModel(params);
         log(LogType.TableGroupLog.UPDATE, model);
 
-        return manager.editTableGroup(model);
+        return manager.editConfigModel(model);
     }
 
     @Override
@@ -83,7 +83,7 @@ public class TableGroupServiceImpl extends BaseServiceImpl implements TableGroup
         Stream.of(StringUtil.split(ids, ",")).parallel().forEach(id -> {
             TableGroup model = manager.getTableGroup(id);
             log(LogType.TableGroupLog.DELETE, model);
-            manager.removeTableGroup(id);
+            manager.removeConfigModel(id);
         });
 
         // 合并驱动公共字段
@@ -114,7 +114,7 @@ public class TableGroupServiceImpl extends BaseServiceImpl implements TableGroup
             while (i > 0) {
                 TableGroup g = list.get(size - i);
                 g.setIndex(i);
-                manager.editTableGroup(g);
+                manager.editConfigModel(g);
                 i--;
             }
         }
@@ -135,7 +135,7 @@ public class TableGroupServiceImpl extends BaseServiceImpl implements TableGroup
 
         mapping.setSourceColumn(sourceColumn);
         mapping.setTargetColumn(targetColumn);
-        manager.editMapping(mapping);
+        manager.editConfigModel(mapping);
     }
 
     private List<Field> pickCommonFields(List<Field> column, List<Field> target) {

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/UserServiceImpl.java

@@ -5,7 +5,6 @@ import org.dbsyncer.biz.UserService;
 import org.dbsyncer.biz.checker.impl.user.UserConfigChecker;
 import org.dbsyncer.biz.enums.UserRoleEnum;
 import org.dbsyncer.biz.vo.UserInfoVo;
-import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.SHA1Util;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.manager.Manager;
@@ -64,7 +63,8 @@ public class UserServiceImpl implements UserService {
         // 注册新用户
         userConfig.getUserInfoList().add(new UserInfo(username, nickname, SHA1Util.b64_sha1(password), UserRoleEnum.USER.getCode(), mail));
 
-        return manager.editUserConfig(userConfig);
+        logService.log(LogType.UserLog.INSERT, String.format("[%s]添加[%s]账号成功", currentUser.getUsername(), username));
+        return manager.editConfigModel(userConfig);
     }
 
     @Override
@@ -104,10 +104,10 @@ public class UserServiceImpl implements UserService {
             newPwd = SHA1Util.b64_sha1(newPwd);
             Assert.isTrue(!StringUtil.equals(newPwd, updateUser.getPassword()), "新旧密码不能完全一样.");
             updateUser.setPassword(newPwd);
-            logService.log(LogType.SystemLog.INFO, String.format("[%s]修改[%s]账号密码成功", currentUser.getUsername(), username));
+            logService.log(LogType.UserLog.UPDATE, String.format("[%s]修改[%s]账号密码成功", currentUser.getUsername(), username));
         }
 
-        return manager.editUserConfig(userConfig);
+        return manager.editConfigModel(userConfig);
     }
 
     @Override
@@ -127,7 +127,8 @@ public class UserServiceImpl implements UserService {
         UserInfo deleteUser = userConfig.getUserInfo(username);
         Assert.notNull(deleteUser, "用户已删除.");
         userConfig.removeUserInfo(username);
-        manager.editUserConfig(userConfig);
+        manager.editConfigModel(userConfig);
+        logService.log(LogType.UserLog.DELETE, String.format("[%s]删除[%s]账号成功", currentUser.getUsername(), username));
         return "删除用户成功!";
     }
 
@@ -167,22 +168,20 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public UserConfig getUserConfig() {
-        List<UserConfig> all = manager.getUserConfigAll();
-        if (!CollectionUtils.isEmpty(all)) {
-            return all.get(0);
+        UserConfig config = manager.getUserConfig();
+        if (null != config) {
+            return config;
         }
 
         synchronized (this) {
-            all = manager.getUserConfigAll();
-            if (!CollectionUtils.isEmpty(all)) {
-                return all.get(0);
+            config = manager.getUserConfig();
+            if (null == config) {
+                config = (UserConfig) userConfigChecker.checkAddConfigModel(new HashMap<>());
+                UserRoleEnum admin = UserRoleEnum.ADMIN;
+                config.getUserInfoList().add(new UserInfo(DEFAULT_USERNAME, DEFAULT_USERNAME, DEFAULT_PASSWORD, admin.getCode(), ""));
+                manager.addConfigModel(config);
             }
-
-            UserConfig userConfig = (UserConfig) userConfigChecker.checkAddConfigModel(new HashMap<>());
-            UserRoleEnum admin = UserRoleEnum.ADMIN;
-            userConfig.getUserInfoList().add(new UserInfo(DEFAULT_USERNAME, DEFAULT_USERNAME, DEFAULT_PASSWORD, admin.getCode(), ""));
-            manager.addUserConfig(userConfig);
-            return userConfig;
+            return config;
         }
     }
 

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

@@ -27,24 +27,39 @@ import java.util.Map;
  */
 public interface Manager extends Executor {
 
-    // user
-    String addUserConfig(ConfigModel model);
-
-    String editUserConfig(ConfigModel model);
-
-    UserConfig getUserConfig(String id);
+    /**
+     * 添加ConfigModel
+     *
+     * @param model
+     * @return id
+     */
+    String addConfigModel(ConfigModel model);
+
+    /**
+     * 编辑ConfigModel
+     *
+     * @param model
+     * @return id
+     */
+    String editConfigModel(ConfigModel model);
+
+    /**
+     * 刪除ConfigModel
+     *
+      * @param id
+     * @return
+     */
+    void removeConfigModel(String id);
+
+    // system
+    SystemConfig getSystemConfig();
 
-    List<UserConfig> getUserConfigAll();
+    // user
+    UserConfig getUserConfig();
 
     // project group
-    String addProjectGroup(ConfigModel model);
-
-    String editProjectGroup(ConfigModel model);
-
     ProjectGroup getProjectGroup(String id);
 
-    void removeProjectGroup(String id);
-
     List<ProjectGroup> getProjectGroupAll();
 
     // Connector
@@ -58,12 +73,6 @@ public interface Manager extends Executor {
 
     MetaInfo getMetaInfo(String connectorId, String tableName);
 
-    String addConnector(ConfigModel model);
-
-    String editConnector(ConfigModel model);
-
-    void removeConnector(String connectorId);
-
     Connector getConnector(String connectorId);
 
     List<Connector> getConnectorAll();
@@ -71,23 +80,11 @@ public interface Manager extends Executor {
     void checkAllConnectorStatus();
 
     // Mapping
-    String addMapping(ConfigModel model);
-
-    String editMapping(ConfigModel model);
-
-    void removeMapping(String mappingId);
-
     Mapping getMapping(String mappingId);
 
     List<Mapping> getMappingAll();
 
     // TableGroup
-    String addTableGroup(ConfigModel model);
-
-    String editTableGroup(ConfigModel model);
-
-    void removeTableGroup(String tableGroupId);
-
     TableGroup getTableGroup(String tableGroupId);
 
     List<TableGroup> getTableGroupAll(String mappingId);
@@ -101,25 +98,10 @@ public interface Manager extends Executor {
     long getCount(String connectorId, Map<String, String> command);
 
     // Meta
-    String addMeta(ConfigModel model);
-
-    String editMeta(ConfigModel model);
-
     Meta getMeta(String metaId);
 
-    void removeMeta(String metaId);
-
     List<Meta> getMetaAll();
 
-    // Config
-    String addSystemConfig(ConfigModel model);
-
-    String editSystemConfig(ConfigModel model);
-
-    SystemConfig getSystemConfig(String configId);
-
-    List<SystemConfig> getSystemConfigAll();
-
     // Data
     Paging queryData(Query query, String collectionId);
 

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

@@ -69,37 +69,36 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
     private Map<String, Puller> map;
 
     @Override
-    public String addUserConfig(ConfigModel model) {
+    public String addConfigModel(ConfigModel model) {
         return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_ADD));
     }
 
     @Override
-    public String editUserConfig(ConfigModel model) {
+    public String editConfigModel(ConfigModel model) {
         return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_EDIT));
     }
 
     @Override
-    public UserConfig getUserConfig(String id) {
-        return operationTemplate.queryObject(UserConfig.class, id);
-    }
-
-    @Override
-    public List<UserConfig> getUserConfigAll() {
-        UserConfig userConfig = new UserConfig();
-        userConfig.setType(ConfigConstant.USER);
-        QueryConfig<UserConfig> queryConfig = new QueryConfig<>(userConfig);
-        List<UserConfig> userConfigs = operationTemplate.queryAll(queryConfig);
-        return userConfigs;
+    public void removeConfigModel(String id) {
+        operationTemplate.remove(new OperationConfig(id));
     }
 
     @Override
-    public String addProjectGroup(ConfigModel model) {
-        return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_ADD));
+    public SystemConfig getSystemConfig() {
+        SystemConfig systemConfig = new SystemConfig();
+        systemConfig.setType(ConfigConstant.SYSTEM);
+        QueryConfig<SystemConfig> queryConfig = new QueryConfig<>(systemConfig);
+        List<SystemConfig> list = operationTemplate.queryAll(queryConfig);
+        return CollectionUtils.isEmpty(list) ? null : list.get(0);
     }
 
     @Override
-    public String editProjectGroup(ConfigModel model) {
-        return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_EDIT));
+    public UserConfig getUserConfig() {
+        UserConfig userConfig = new UserConfig();
+        userConfig.setType(ConfigConstant.USER);
+        QueryConfig<UserConfig> queryConfig = new QueryConfig<>(userConfig);
+        List<UserConfig> list = operationTemplate.queryAll(queryConfig);
+        return CollectionUtils.isEmpty(list) ? null : list.get(0);
     }
 
     @Override
@@ -107,11 +106,6 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
         return operationTemplate.queryObject(ProjectGroup.class, id);
     }
 
-    @Override
-    public void removeProjectGroup(String id) {
-        operationTemplate.remove(new OperationConfig(id));
-    }
-
     @Override
     public List<ProjectGroup> getProjectGroupAll() {
         ProjectGroup projectGroup = new ProjectGroup();
@@ -146,21 +140,6 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
         return parser.getMetaInfo(connectorId, tableName);
     }
 
-    @Override
-    public String addConnector(ConfigModel model) {
-        return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_ADD));
-    }
-
-    @Override
-    public String editConnector(ConfigModel model) {
-        return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_EDIT));
-    }
-
-    @Override
-    public void removeConnector(String connectorId) {
-        operationTemplate.remove(new OperationConfig(connectorId));
-    }
-
     @Override
     public Connector getConnector(String connectorId) {
         return operationTemplate.queryObject(Connector.class, connectorId);
@@ -190,21 +169,6 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
         }
     }
 
-    @Override
-    public String addMapping(ConfigModel model) {
-        return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_ADD));
-    }
-
-    @Override
-    public String editMapping(ConfigModel model) {
-        return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_EDIT));
-    }
-
-    @Override
-    public void removeMapping(String mappingId) {
-        operationTemplate.remove(new OperationConfig(mappingId));
-    }
-
     @Override
     public Mapping getMapping(String mappingId) {
         return operationTemplate.queryObject(Mapping.class, mappingId);
@@ -219,21 +183,6 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
         return mappings;
     }
 
-    @Override
-    public String addTableGroup(ConfigModel model) {
-        return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_ADD, GroupStrategyEnum.TABLE));
-    }
-
-    @Override
-    public String editTableGroup(ConfigModel model) {
-        return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_EDIT, GroupStrategyEnum.TABLE));
-    }
-
-    @Override
-    public void removeTableGroup(String tableGroupId) {
-        operationTemplate.remove(new OperationConfig(tableGroupId, GroupStrategyEnum.TABLE));
-    }
-
     @Override
     public TableGroup getTableGroup(String tableGroupId) {
         return operationTemplate.queryObject(TableGroup.class, tableGroupId);
@@ -277,26 +226,11 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
         return parser.getCount(connectorId, command);
     }
 
-    @Override
-    public String addMeta(ConfigModel model) {
-        return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_ADD));
-    }
-
-    @Override
-    public String editMeta(ConfigModel model) {
-        return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_EDIT));
-    }
-
     @Override
     public Meta getMeta(String metaId) {
         return operationTemplate.queryObject(Meta.class, metaId);
     }
 
-    @Override
-    public void removeMeta(String metaId) {
-        operationTemplate.remove(new OperationConfig(metaId));
-    }
-
     @Override
     public List<Meta> getMetaAll() {
         Meta meta = new Meta();
@@ -305,29 +239,6 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
         return operationTemplate.queryAll(queryConfig);
     }
 
-    @Override
-    public String addSystemConfig(ConfigModel model) {
-        return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_ADD));
-    }
-
-    @Override
-    public String editSystemConfig(ConfigModel model) {
-        return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_EDIT));
-    }
-
-    @Override
-    public SystemConfig getSystemConfig(String configId) {
-        return operationTemplate.queryObject(SystemConfig.class, configId);
-    }
-
-    @Override
-    public List<SystemConfig> getSystemConfigAll() {
-        SystemConfig systemConfig = new SystemConfig();
-        systemConfig.setType(ConfigConstant.SYSTEM);
-        QueryConfig<SystemConfig> queryConfig = new QueryConfig<>(systemConfig);
-        return operationTemplate.queryAll(queryConfig);
-    }
-
     @Override
     public Paging queryData(Query query, String collectionId) {
         query.setType(StorageEnum.DATA);
@@ -434,7 +345,7 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
         if (null != meta && meta.getState() != code) {
             meta.setState(code);
             meta.setUpdateTime(Instant.now().toEpochMilli());
-            editMeta(meta);
+            editConfigModel(meta);
         }
     }
 

dbsyncer-manager/src/main/java/org/dbsyncer/manager/puller/FullPuller.java

@@ -138,7 +138,7 @@ public class FullPuller extends AbstractPuller implements ApplicationListener<Fu
         snapshot.put(ParserEnum.PAGE_INDEX.getCode(), String.valueOf(task.getPageIndex()));
         snapshot.put(ParserEnum.CURSOR.getCode(), String.valueOf(task.getCursor()));
         snapshot.put(ParserEnum.TABLE_GROUP_INDEX.getCode(), String.valueOf(task.getTableGroupIndex()));
-        manager.editMeta(meta);
+        manager.editConfigModel(meta);
     }
 
 }

dbsyncer-manager/src/main/java/org/dbsyncer/manager/puller/IncrementPuller.java

@@ -109,7 +109,7 @@ public class IncrementPuller extends AbstractPuller implements ScheduledTaskJob
                 long now = Instant.now().toEpochMilli();
                 meta.setBeginTime(now);
                 meta.setEndTime(now);
-                manager.editMeta(meta);
+                manager.editConfigModel(meta);
                 map.putIfAbsent(metaId, getExtractor(mapping, connector, list, meta));
                 map.get(metaId).start();
             } catch (Exception e) {
@@ -208,7 +208,7 @@ public class IncrementPuller extends AbstractPuller implements ScheduledTaskJob
             Meta meta = manager.getMeta(metaId);
             if (null != meta) {
                 meta.setSnapshot(snapshot);
-                manager.editMeta(meta);
+                manager.editConfigModel(meta);
             }
         }
 

dbsyncer-parser/src/main/java/org/dbsyncer/parser/logger/LogType.java

@@ -270,4 +270,36 @@ public interface LogType {
         }
     }
 
+    /**
+     * 用户日志8
+     */
+    enum UserLog implements LogType {
+        INSERT("80", "新增"),
+        UPDATE("81", "修改"),
+        DELETE("82", "删除");
+
+        private String type;
+        private String message;
+
+        UserLog(String type, String message) {
+            this.type = type;
+            this.message = message;
+        }
+
+        @Override
+        public String getName() {
+            return "用户日志";
+        }
+
+        @Override
+        public String getType() {
+            return type;
+        }
+
+        @Override
+        public String getMessage() {
+            return message;
+        }
+    }
+
 }

dbsyncer-web/src/main/resources/public/system/system.html

@@ -13,12 +13,7 @@
         <!-- 操作 -->
         <div class="row">
             <!-- 系统参数配置 -->
-            <div class="col-md-3">
-                <!-- 隐藏表单值 -->
-                <div class="form-group hidden">
-                    <input name="id" type="text" th:value="${config?.id}"/>
-                </div>
-            </div>
+            <div class="col-md-3"></div>
             <div class="col-md-6">
                 <div class="form-group">
                     <label class="col-sm-4 control-label">刷新监控频率(秒) <strong class="driverVerifcateRequired">*</strong></label>