rename

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

@@ -1,6 +1,6 @@
 package org.dbsyncer.biz;
 
-import org.dbsyncer.biz.vo.ConfigVo;
+import org.dbsyncer.biz.vo.SystemConfigVo;
 import org.dbsyncer.parser.model.ConfigModel;
 
 import java.io.File;
@@ -26,7 +26,7 @@ public interface ConfigService {
      *
      * @return
      */
-    ConfigVo getConfig();
+    SystemConfigVo getConfig();
 
     /**
      * 获取所有配置

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

@@ -4,7 +4,7 @@ import org.apache.commons.io.FileUtils;
 import org.dbsyncer.biz.ConfigService;
 import org.dbsyncer.biz.UserService;
 import org.dbsyncer.biz.checker.Checker;
-import org.dbsyncer.biz.vo.ConfigVo;
+import org.dbsyncer.biz.vo.SystemConfigVo;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.manager.template.PreloadTemplate;
@@ -57,7 +57,7 @@ public class ConfigServiceImpl implements ConfigService {
     }
 
     @Override
-    public ConfigVo getConfig() {
+    public SystemConfigVo getConfig() {
         return convertConfig2Vo(getConfigModel());
     }
 
@@ -103,10 +103,10 @@ public class ConfigServiceImpl implements ConfigService {
         return CollectionUtils.isEmpty(all) ? (Config) configChecker.checkAddConfigModel(new HashMap<>()) : all.get(0);
     }
 
-    private ConfigVo convertConfig2Vo(Config config) {
-        ConfigVo configVo = new ConfigVo();
-        BeanUtils.copyProperties(config, configVo);
-        return configVo;
+    private SystemConfigVo convertConfig2Vo(Config config) {
+        SystemConfigVo systemConfigVo = new SystemConfigVo();
+        BeanUtils.copyProperties(config, systemConfigVo);
+        return systemConfigVo;
     }
 
 }

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

@@ -2,6 +2,6 @@ package org.dbsyncer.biz.vo;
 
 import org.dbsyncer.parser.model.Config;
 
-public class ConfigVo extends Config {
+public class SystemConfigVo extends Config {
 
 }

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

@@ -1,6 +1,8 @@
 package org.dbsyncer.parser.model;
 
 /**
+ * 系统配置
+ *
  * @version 1.0.0
  * @Author AE86
  * @Date 2020-05-29 20:13

dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/UserConfig.java

@@ -15,24 +15,7 @@ public class UserConfig extends ConfigModel {
 
     private List<UserInfo> userInfoList = new ArrayList<>();
 
-    public synchronized void addUserInfo(UserInfo userInfo){
-        if(userInfoList.contains(userInfo)){
-            return;
-        }
-        userInfoList.add(userInfo);
-    }
-
-    public synchronized void updateUserInfo(UserInfo userInfo){
-        for (UserInfo u : userInfoList) {
-            if(u.getUsername().equals(userInfo.getUsername())){
-                u.setNickname(userInfo.getNickname());
-                u.setPassword(userInfo.getPassword());
-                break;
-            }
-        }
-    }
-
-    public synchronized void removeUserInfo(String username){
+    public void removeUserInfo(String username){
         Iterator<UserInfo> iterator = userInfoList.iterator();
         while (iterator.hasNext()){
             UserInfo next = iterator.next();
@@ -43,7 +26,7 @@ public class UserConfig extends ConfigModel {
         }
     }
 
-    public synchronized UserInfo getUserInfo(String username){
+    public UserInfo getUserInfo(String username){
         Iterator<UserInfo> iterator = userInfoList.iterator();
         while (iterator.hasNext()){
             UserInfo next = iterator.next();

dbsyncer-storage/src/main/java/org/dbsyncer/storage/enums/StorageEnum.java

@@ -8,7 +8,7 @@ package org.dbsyncer.storage.enums;
 public enum StorageEnum {
 
     /**
-     * 配置：连接器、驱动、映射关系、同步信息、系统配置
+     * 配置：连接器、驱动、映射关系、同步信息、分組配置、系统配置、用戶配置
      */
     CONFIG("config"),
     /**

dbsyncer-storage/src/main/java/org/dbsyncer/storage/strategy/impl/ConfigStrategy.java

@@ -5,7 +5,7 @@ import org.dbsyncer.storage.strategy.Strategy;
 import org.springframework.stereotype.Component;
 
 /**
- * 配置：Connector、Mapping、TableGroup、Meta、SysConfig
+ * 配置：Connector、Mapping、TableGroup、Meta、ProjectGroup、SystemConfig、UserConfig
  *
  * @author AE86
  * @version 1.0.0

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

@@ -4,9 +4,9 @@ import org.dbsyncer.biz.ConfigService;
 import org.dbsyncer.biz.ConnectorService;
 import org.dbsyncer.biz.MonitorService;
 import org.dbsyncer.biz.vo.AppReportMetricVo;
-import org.dbsyncer.biz.vo.ConfigVo;
 import org.dbsyncer.biz.vo.HistoryStackVo;
 import org.dbsyncer.biz.vo.RestResult;
+import org.dbsyncer.biz.vo.SystemConfigVo;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.DateFormatUtil;
 import org.dbsyncer.monitor.enums.DiskMetricEnum;
@@ -32,7 +32,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequestMapping("/monitor")
@@ -157,7 +160,7 @@ public class MonitorController extends BaseController {
     @GetMapping("/getRefreshInterval")
     public RestResult getRefreshInterval() {
         try {
-            ConfigVo config = configService.getConfig();
+            SystemConfigVo config = configService.getConfig();
             return RestResult.restSuccess(config.getRefreshInterval());
         } catch (Exception e) {
             logger.error(e.getLocalizedMessage(), e.getClass());