rename

dbsyncer-biz/src/main/java/org/dbsyncer/biz/ConfigService.java → dbsyncer-biz/src/main/java/org/dbsyncer/biz/SystemConfigService.java

@@ -8,11 +8,13 @@ import java.util.List;
 import java.util.Map;
 
 /**
+ * 系统配置
+ *
  * @author AE86
  * @version 1.0.0
  * @date 2020/5/30 23:14
  */
-public interface ConfigService {
+public interface SystemConfigService {
 
     /**
      * 修改系统配置
@@ -26,10 +28,10 @@ public interface ConfigService {
      *
      * @return
      */
-    SystemConfigVo getConfig();
+    SystemConfigVo getSystemConfigVo();
 
     /**
-     * 获取所有配置
+     * 获取所有配置（system、user、connector、mapping、tableGroup、meta、projectGroup）
      *
      * @return
      */

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

@@ -1,4 +1,4 @@
-package org.dbsyncer.biz.checker.impl.config;
+package org.dbsyncer.biz.checker.impl.system;
 
 import org.dbsyncer.biz.checker.AbstractChecker;
 import org.dbsyncer.common.util.NumberUtil;
@@ -6,7 +6,7 @@ import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.parser.logger.LogService;
 import org.dbsyncer.parser.logger.LogType;
-import org.dbsyncer.parser.model.Config;
+import org.dbsyncer.parser.model.SystemConfig;
 import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.storage.constant.ConfigConstant;
 import org.slf4j.Logger;
@@ -23,7 +23,7 @@ import java.util.Map;
  * @date 2020/1/8 15:17
  */
 @Component
-public class ConfigChecker extends AbstractChecker {
+public class SystemConfigChecker extends AbstractChecker {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -35,15 +35,15 @@ public class ConfigChecker extends AbstractChecker {
 
     @Override
     public ConfigModel checkAddConfigModel(Map<String, String> params) {
-        Config config = new Config();
-        config.setName("系统配置");
-        config.setType(ConfigConstant.CONFIG);
+        SystemConfig systemConfig = new SystemConfig();
+        systemConfig.setName("系统配置");
+        systemConfig.setType(ConfigConstant.SYSTEM);
 
         // 修改基本配置
-        this.modifyConfigModel(config, params);
+        this.modifyConfigModel(systemConfig, params);
 
-        manager.addConfig(config);
-        return config;
+        manager.addSystemConfig(systemConfig);
+        return systemConfig;
     }
 
     @Override
@@ -53,20 +53,20 @@ public class ConfigChecker extends AbstractChecker {
 
         String id = params.get(ConfigConstant.CONFIG_MODEL_ID);
         Assert.hasText(id, "Config id is empty.");
-        Config config = manager.getConfig(id);
-        Assert.notNull(config, "配置文件为空.");
+        SystemConfig systemConfig = manager.getSystemConfig(id);
+        Assert.notNull(systemConfig, "配置文件为空.");
 
         // 刷新监控间隔（秒）
         String refreshInterval = params.get("refreshInterval");
         if (StringUtil.isNotBlank(refreshInterval)) {
             int time = NumberUtil.toInt(refreshInterval, 10);
-            config.setRefreshInterval(time);
+            systemConfig.setRefreshInterval(time);
         }
         logService.log(LogType.SystemLog.INFO, "修改系统配置");
 
         // 修改基本配置
-        this.modifyConfigModel(config, params);
-        return config;
+        this.modifyConfigModel(systemConfig, params);
+        return systemConfig;
     }
 
 }

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/user/UserConfigChecker.java

@@ -22,7 +22,7 @@ public class UserConfigChecker extends AbstractChecker {
     public ConfigModel checkAddConfigModel(Map<String, String> params) {
         UserConfig config = new UserConfig();
         config.setName("用户配置");
-        config.setType(ConfigConstant.USER_CONFIG);
+        config.setType(ConfigConstant.USER);
         config.setUserInfoList(new ArrayList<>());
 
         // 修改基本配置

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

@@ -1,7 +1,7 @@
 package org.dbsyncer.biz.impl;
 
 import org.apache.commons.io.FileUtils;
-import org.dbsyncer.biz.ConfigService;
+import org.dbsyncer.biz.SystemConfigService;
 import org.dbsyncer.biz.UserService;
 import org.dbsyncer.biz.checker.Checker;
 import org.dbsyncer.biz.vo.SystemConfigVo;
@@ -10,7 +10,7 @@ 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.Config;
+import org.dbsyncer.parser.model.SystemConfig;
 import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.plugin.enums.FileSuffixEnum;
 import org.springframework.beans.BeanUtils;
@@ -32,13 +32,13 @@ import java.util.Map;
  * @date 2019/10/17 23:20
  */
 @Service
-public class ConfigServiceImpl implements ConfigService {
+public class SystemConfigServiceImpl implements SystemConfigService {
 
     @Autowired
     private Manager manager;
 
     @Autowired
-    private Checker configChecker;
+    private Checker systemConfigChecker;
 
     @Autowired
     private PreloadTemplate preloadTemplate;
@@ -51,20 +51,20 @@ public class ConfigServiceImpl implements ConfigService {
 
     @Override
     public String edit(Map<String, String> params) {
-        ConfigModel model = configChecker.checkEditConfigModel(params);
-        manager.editConfig(model);
+        ConfigModel model = systemConfigChecker.checkEditConfigModel(params);
+        manager.editSystemConfig(model);
         return "修改成功.";
     }
 
     @Override
-    public SystemConfigVo getConfig() {
-        return convertConfig2Vo(getConfigModel());
+    public SystemConfigVo getSystemConfigVo() {
+        return convertConfig2Vo(getSystemConfigModel());
     }
 
     @Override
     public List<ConfigModel> getConfigModelAll() {
         List<ConfigModel> list = new ArrayList<>();
-        list.add(getConfigModel());
+        list.add(getSystemConfigModel());
         list.add(userService.getUserConfig());
         manager.getConnectorAll().forEach(config -> list.add(config));
         manager.getMappingAll().forEach(config -> list.add(config));
@@ -98,14 +98,14 @@ public class ConfigServiceImpl implements ConfigService {
         }
     }
 
-    private synchronized Config getConfigModel() {
-        List<Config> all = manager.getConfigAll();
-        return CollectionUtils.isEmpty(all) ? (Config) configChecker.checkAddConfigModel(new HashMap<>()) : all.get(0);
+    private synchronized SystemConfig getSystemConfigModel() {
+        List<SystemConfig> all = manager.getSystemConfigAll();
+        return CollectionUtils.isEmpty(all) ? (SystemConfig) systemConfigChecker.checkAddConfigModel(new HashMap<>()) : all.get(0);
     }
 
-    private SystemConfigVo convertConfig2Vo(Config config) {
+    private SystemConfigVo convertConfig2Vo(SystemConfig systemConfig) {
         SystemConfigVo systemConfigVo = new SystemConfigVo();
-        BeanUtils.copyProperties(config, systemConfigVo);
+        BeanUtils.copyProperties(systemConfig, systemConfigVo);
         return systemConfigVo;
     }
 

dbsyncer-biz/src/main/java/org/dbsyncer/biz/vo/SystemConfigVo.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.biz.vo;
 
-import org.dbsyncer.parser.model.Config;
+import org.dbsyncer.parser.model.SystemConfig;
 
-public class SystemConfigVo extends Config {
+public class SystemConfigVo extends SystemConfig {
 
 }

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

@@ -112,13 +112,13 @@ public interface Manager extends Executor {
     List<Meta> getMetaAll();
 
     // Config
-    String addConfig(ConfigModel model);
+    String addSystemConfig(ConfigModel model);
 
-    String editConfig(ConfigModel model);
+    String editSystemConfig(ConfigModel model);
 
-    Config getConfig(String configId);
+    SystemConfig getSystemConfig(String configId);
 
-    List<Config> getConfigAll();
+    List<SystemConfig> getSystemConfigAll();
 
     // Data
     Paging queryData(Query query, String collectionId);

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

@@ -23,6 +23,7 @@ import org.dbsyncer.parser.enums.ModelEnum;
 import org.dbsyncer.parser.logger.LogService;
 import org.dbsyncer.parser.logger.LogType;
 import org.dbsyncer.parser.model.*;
+import org.dbsyncer.parser.model.SystemConfig;
 import org.dbsyncer.plugin.PluginFactory;
 import org.dbsyncer.plugin.config.Plugin;
 import org.dbsyncer.storage.StorageService;
@@ -85,7 +86,7 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
     @Override
     public List<UserConfig> getUserConfigAll() {
         UserConfig userConfig = new UserConfig();
-        userConfig.setType(ConfigConstant.USER_CONFIG);
+        userConfig.setType(ConfigConstant.USER);
         QueryConfig<UserConfig> queryConfig = new QueryConfig<>(userConfig);
         List<UserConfig> userConfigs = operationTemplate.queryAll(queryConfig);
         return userConfigs;
@@ -305,25 +306,25 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
     }
 
     @Override
-    public String addConfig(ConfigModel model) {
+    public String addSystemConfig(ConfigModel model) {
         return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_ADD));
     }
 
     @Override
-    public String editConfig(ConfigModel model) {
+    public String editSystemConfig(ConfigModel model) {
         return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_EDIT));
     }
 
     @Override
-    public Config getConfig(String configId) {
-        return operationTemplate.queryObject(Config.class, configId);
+    public SystemConfig getSystemConfig(String configId) {
+        return operationTemplate.queryObject(SystemConfig.class, configId);
     }
 
     @Override
-    public List<Config> getConfigAll() {
-        Config config = new Config();
-        config.setType(ConfigConstant.CONFIG);
-        QueryConfig<Config> queryConfig = new QueryConfig<>(config);
+    public List<SystemConfig> getSystemConfigAll() {
+        SystemConfig systemConfig = new SystemConfig();
+        systemConfig.setType(ConfigConstant.SYSTEM);
+        QueryConfig<SystemConfig> queryConfig = new QueryConfig<>(systemConfig);
         return operationTemplate.queryAll(queryConfig);
     }
 

dbsyncer-manager/src/main/java/org/dbsyncer/manager/command/PreloadCommand.java

@@ -3,6 +3,7 @@ package org.dbsyncer.manager.command;
 import org.dbsyncer.manager.Command;
 import org.dbsyncer.parser.Parser;
 import org.dbsyncer.parser.model.*;
+import org.dbsyncer.parser.model.SystemConfig;
 
 public class PreloadCommand implements Command {
 
@@ -15,6 +16,14 @@ public class PreloadCommand implements Command {
         this.json = json;
     }
 
+    public Object parseSystemConfig() {
+        return parser.parseObject(json, SystemConfig.class);
+    }
+
+    public Object parseUserConfig() {
+        return parser.parseObject(json, UserConfig.class);
+    }
+
     public Object parseConnector() {
         return parser.parseConnector(json);
     }
@@ -31,15 +40,8 @@ public class PreloadCommand implements Command {
         return parser.parseObject(json, Meta.class);
     }
 
-    public Object parseConfig() {
-        return parser.parseObject(json, Config.class);
-    }
-
     public Object parseProjectGroup() {
         return parser.parseObject(json, ProjectGroup.class);
     }
 
-    public Object parseUserConfig() {
-        return parser.parseObject(json, UserConfig.class);
-    }
 }

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

@@ -22,6 +22,16 @@ public enum CommandEnum {
      */
     OPR_EDIT("edit", (cmd) -> ((PersistenceCommand) cmd).edit()),
 
+    /**
+     * 预加载SystemConfig
+     */
+    PRELOAD_SYSTEM(ConfigConstant.SYSTEM, true, (cmd) -> ((PreloadCommand) cmd).parseSystemConfig()),
+
+    /**
+     * 预加载UserConfig
+     */
+    PRELOAD_USER(ConfigConstant.USER, true, (cmd) -> ((PreloadCommand) cmd).parseUserConfig()),
+
     /**
      * 预加载Connector
      */
@@ -42,20 +52,10 @@ public enum CommandEnum {
      */
     PRELOAD_META(ConfigConstant.META, true, (cmd) -> ((PreloadCommand) cmd).parseMeta()),
 
-    /**
-     * 预加载Config
-     */
-    PRELOAD_CONFIG(ConfigConstant.CONFIG, true, (cmd) -> ((PreloadCommand) cmd).parseConfig()),
-
     /**
      * 预加载ProjectGroup
      */
-    PRELOAD_PROJECT_GROUP(ConfigConstant.PROJECT_GROUP, true, (cmd) -> ((PreloadCommand) cmd).parseProjectGroup()),
-
-    /**
-     * 预加载用户配置
-     */
-    USER_CONFIG(ConfigConstant.USER_CONFIG, true, (cmd) -> ((PreloadCommand) cmd).parseUserConfig());
+    PRELOAD_PROJECT_GROUP(ConfigConstant.PROJECT_GROUP, true, (cmd) -> ((PreloadCommand) cmd).parseProjectGroup());
 
     private String modelType;
     private boolean preload;

dbsyncer-manager/src/main/java/org/dbsyncer/manager/template/PreloadTemplate.java

@@ -90,8 +90,10 @@ public final class PreloadTemplate implements ApplicationListener<ContextRefresh
             return;
         }
 
-        // Load config
-        reload(map, CommandEnum.PRELOAD_CONFIG);
+        // Load system
+        reload(map, CommandEnum.PRELOAD_SYSTEM);
+        // Load user
+        reload(map, CommandEnum.PRELOAD_USER);
         // Load connectors
         reload(map, CommandEnum.PRELOAD_CONNECTOR);
         // Load mappings
@@ -100,8 +102,6 @@ public final class PreloadTemplate implements ApplicationListener<ContextRefresh
         reload(map, CommandEnum.PRELOAD_META);
         // Load projectGroups
         reload(map, CommandEnum.PRELOAD_PROJECT_GROUP);
-        // Load userConfig
-        reload(map, CommandEnum.USER_CONFIG);
         launch();
     }
 

dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/Config.java → dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/SystemConfig.java

@@ -7,7 +7,7 @@ package org.dbsyncer.parser.model;
  * @Author AE86
  * @Date 2020-05-29 20:13
  */
-public class Config extends ConfigModel {
+public class SystemConfig extends ConfigModel {
 
     private int refreshInterval = 5;
 

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

@@ -20,13 +20,13 @@ public class ConfigConstant {
     /**
      * 配置类型
      */
+    public static final String SYSTEM = "system";
+    public static final String USER = "user";
     public static final String CONNECTOR = "connector";
     public static final String MAPPING = "mapping";
     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";
-    public static final String USER_CONFIG = "userConfig";
 
     /**
      * 数据

dbsyncer-storage/src/main/resources/dbsyncer_config.sql

@@ -1,7 +1,7 @@
 CREATE TABLE `dbsyncer_config`  (
   `ID` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '唯一ID',
   `NAME` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '名称',
-  `TYPE` varchar(24) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'connector、mapping、tableGroup、meta、config',
+  `TYPE` varchar(24) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'system、user、connector、mapping、tableGroup、meta、projectGroup',
   `CREATE_TIME` bigint(0) NOT NULL COMMENT '创建时间',
   `UPDATE_TIME` bigint(0) NOT NULL COMMENT '修改时间',
   `JSON` mediumtext CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '配置信息',

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/config/ConfigController.java

@@ -2,7 +2,7 @@ package org.dbsyncer.web.controller.config;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.dbsyncer.biz.ConfigService;
+import org.dbsyncer.biz.SystemConfigService;
 import org.dbsyncer.biz.vo.RestResult;
 import org.dbsyncer.cache.CacheService;
 import org.dbsyncer.common.config.AppConfig;
@@ -34,7 +34,7 @@ public class ConfigController {
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
-    private ConfigService configService;
+    private SystemConfigService systemConfigService;
 
     @Autowired
     private CacheService cacheService;
@@ -50,7 +50,7 @@ public class ConfigController {
 
     @RequestMapping("")
     public String index(ModelMap model) {
-        model.put("config", configService.getConfigModelAll());
+        model.put("config", systemConfigService.getConfigModelAll());
         model.put("fileSize", JsonUtil.objToJson(cacheService.getAll()).getBytes(Charset.defaultCharset()).length);
         return "config/config";
     }
@@ -76,12 +76,12 @@ public class ConfigController {
                         continue;
                     }
                     String filename = files[i].getOriginalFilename();
-                    configService.checkFileSuffix(filename);
+                    systemConfigService.checkFileSuffix(filename);
                     String tmpdir = System.getProperty("java.io.tmpdir");
                     File dest = new File(tmpdir + filename);
                     FileUtils.deleteQuietly(dest);
                     FileUtils.copyInputStreamToFile(files[i].getInputStream(), dest);
-                    configService.refreshConfig(dest);
+                    systemConfigService.refreshConfig(dest);
                     String msg = String.format("导入配置文件%s", filename);
                     logger.info(msg);
                     logService.log(LogType.CacheLog.IMPORT, msg);

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/monitor/MonitorController.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.web.controller.monitor;
 
-import org.dbsyncer.biz.ConfigService;
+import org.dbsyncer.biz.SystemConfigService;
 import org.dbsyncer.biz.ConnectorService;
 import org.dbsyncer.biz.MonitorService;
 import org.dbsyncer.biz.vo.AppReportMetricVo;
@@ -54,7 +54,7 @@ public class MonitorController extends BaseController {
     private ConnectorService connectorService;
 
     @Autowired
-    private ConfigService configService;
+    private SystemConfigService systemConfigService;
 
     @Autowired
     private MetricsEndpoint metricsEndpoint;
@@ -160,7 +160,7 @@ public class MonitorController extends BaseController {
     @GetMapping("/getRefreshInterval")
     public RestResult getRefreshInterval() {
         try {
-            SystemConfigVo config = configService.getConfig();
+            SystemConfigVo config = systemConfigService.getSystemConfigVo();
             return RestResult.restSuccess(config.getRefreshInterval());
         } catch (Exception e) {
             logger.error(e.getLocalizedMessage(), e.getClass());

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/system/SystemController.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.web.controller.system;
 
-import org.dbsyncer.biz.ConfigService;
+import org.dbsyncer.biz.SystemConfigService;
 import org.dbsyncer.biz.vo.RestResult;
 import org.dbsyncer.web.controller.BaseController;
 import org.slf4j.Logger;
@@ -20,38 +20,38 @@ import java.util.Map;
 @RequestMapping(value = "/system")
 public class SystemController extends BaseController {
 
-	private final Logger logger = LoggerFactory.getLogger(getClass());
-
-	@Autowired
-	private ConfigService configService;
-
-	@RequestMapping("")
-	public String index(ModelMap model) {
-		model.put("config", configService.getConfig());
-		return "system/system";
-	}
-
-	@PostMapping("/edit")
-	@ResponseBody
-	public RestResult edit(HttpServletRequest request) {
-		try {
-			Map<String, String> params = getParams(request);
-			return RestResult.restSuccess(configService.edit(params));
-		} catch (Exception e) {
-			logger.error(e.getLocalizedMessage(), e.getClass());
-			return RestResult.restFail(e.getMessage());
-		}
-	}
-
-	@GetMapping("/queryConfig")
-	@ResponseBody
-	public RestResult queryConfig(HttpServletRequest request) {
-		try {
-			return RestResult.restSuccess(configService.getConfig());
-		} catch (Exception e) {
-			logger.error(e.getLocalizedMessage(), e.getClass());
-			return RestResult.restFail(e.getMessage());
-		}
-	}
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private SystemConfigService systemConfigService;
+
+    @RequestMapping("")
+    public String index(ModelMap model) {
+        model.put("config", systemConfigService.getSystemConfigVo());
+        return "system/system";
+    }
+
+    @PostMapping("/edit")
+    @ResponseBody
+    public RestResult edit(HttpServletRequest request) {
+        try {
+            Map<String, String> params = getParams(request);
+            return RestResult.restSuccess(systemConfigService.edit(params));
+        } catch (Exception e) {
+            logger.error(e.getLocalizedMessage(), e.getClass());
+            return RestResult.restFail(e.getMessage());
+        }
+    }
+
+    @GetMapping("/queryConfig")
+    @ResponseBody
+    public RestResult queryConfig() {
+        try {
+            return RestResult.restSuccess(systemConfigService.getSystemConfigVo());
+        } catch (Exception e) {
+            logger.error(e.getLocalizedMessage(), e.getClass());
+            return RestResult.restFail(e.getMessage());
+        }
+    }
 
 }

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

@@ -40,5 +40,5 @@
     </form>
 </div>
 
-<script th:src="@{/js/ststem/index.js}"></script>
+<script th:src="@{/js/system/index.js}"></script>
 </html>