优化逻辑

dbsyncer-biz/src/main/java/org/dbsyncer/biz/UserService.java → dbsyncer-biz/src/main/java/org/dbsyncer/biz/UserConfigService.java

@@ -8,11 +8,13 @@ import java.util.List;
 import java.util.Map;
 
 /**
+ * 用戶配置服務
+ *
  * @author AE86
  * @version 1.0.0
  * @date 2022/11/17 0:16
  */
-public interface UserService {
+public interface UserConfigService {
 
     /**
      * 获取登录用户属性KEY

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

@@ -2,7 +2,7 @@ package org.dbsyncer.biz.impl;
 
 import org.apache.commons.io.FileUtils;
 import org.dbsyncer.biz.SystemConfigService;
-import org.dbsyncer.biz.UserService;
+import org.dbsyncer.biz.UserConfigService;
 import org.dbsyncer.biz.checker.Checker;
 import org.dbsyncer.biz.vo.SystemConfigVo;
 import org.dbsyncer.common.util.CollectionUtils;
@@ -47,7 +47,7 @@ public class SystemConfigServiceImpl implements SystemConfigService {
     private LogService logService;
 
     @Autowired
-    private UserService userService;
+    private UserConfigService userConfigService;
 
     @Override
     public String edit(Map<String, String> params) {
@@ -65,7 +65,7 @@ public class SystemConfigServiceImpl implements SystemConfigService {
     public List<ConfigModel> getConfigModelAll() {
         List<ConfigModel> list = new ArrayList<>();
         list.add(getSystemConfig());
-        list.add(userService.getUserConfig());
+        list.add(userConfigService.getUserConfig());
         manager.getConnectorAll().forEach(config -> list.add(config));
         manager.getMappingAll().forEach(config -> list.add(config));
         manager.getMetaAll().forEach(config -> list.add(config));

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

@@ -1,7 +1,7 @@
 package org.dbsyncer.biz.impl;
 
 import org.dbsyncer.biz.BizException;
-import org.dbsyncer.biz.UserService;
+import org.dbsyncer.biz.UserConfigService;
 import org.dbsyncer.biz.checker.impl.user.UserConfigChecker;
 import org.dbsyncer.biz.enums.UserRoleEnum;
 import org.dbsyncer.biz.vo.UserInfoVo;
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
  * @date 2022/11/17 0:16
  */
 @Service
-public class UserServiceImpl implements UserService {
+public class UserConfigServiceImpl implements UserConfigService {
 
     private static final String DEFAULT_USERNAME = "admin";
 
@@ -56,7 +56,7 @@ public class UserServiceImpl implements UserService {
 
         // 验证当前登录用户合法身份（必须是管理员操作）
         UserConfig userConfig = getUserConfig();
-        UserInfo currentUser = userConfig.getUserInfo(params.get(UserService.CURRENT_USER_NAME));
+        UserInfo currentUser = userConfig.getUserInfo(params.get(UserConfigService.CURRENT_USER_NAME));
         Assert.isTrue(null == currentUser || UserRoleEnum.isAdmin(currentUser.getRoleCode()), "No permission.");
         // 新用户合法性（用户不能重复）
         Assert.isNull(userConfig.getUserInfo(username), "用户已存在，请换个账号");
@@ -78,7 +78,7 @@ public class UserServiceImpl implements UserService {
 
         // 验证当前登录用户合法身份（管理员或本人操作）
         UserConfig userConfig = getUserConfig();
-        UserInfo currentUser = userConfig.getUserInfo(params.get(UserService.CURRENT_USER_NAME));
+        UserInfo currentUser = userConfig.getUserInfo(params.get(UserConfigService.CURRENT_USER_NAME));
         boolean admin = null != currentUser && UserRoleEnum.isAdmin(currentUser.getRoleCode());
         boolean self = null != currentUser && StringUtil.equals(currentUser.getUsername(), username);
         Assert.isTrue(admin || self, "No permission.");
@@ -117,7 +117,7 @@ public class UserServiceImpl implements UserService {
 
         // 验证当前登录用户合法身份（必须是管理员操作）
         UserConfig userConfig = getUserConfig();
-        UserInfo currentUser = userConfig.getUserInfo(params.get(UserService.CURRENT_USER_NAME));
+        UserInfo currentUser = userConfig.getUserInfo(params.get(UserConfigService.CURRENT_USER_NAME));
         Assert.isTrue(UserRoleEnum.isAdmin(currentUser.getRoleCode()), "No permission.");
 
         // 不能删除自己

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

@@ -147,9 +147,7 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
 
     @Override
     public List<Connector> getConnectorAll() {
-        Connector connector = new Connector();
-        connector.setType(ConfigConstant.CONNECTOR);
-        QueryConfig<Connector> queryConfig = new QueryConfig<>(connector);
+        QueryConfig<Connector> queryConfig = new QueryConfig<>(new Connector());
         List<Connector> connectors = operationTemplate.queryAll(queryConfig);
         return connectors;
     }
@@ -176,9 +174,7 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
 
     @Override
     public List<Mapping> getMappingAll() {
-        Mapping mapping = new Mapping();
-        mapping.setType(ConfigConstant.MAPPING);
-        QueryConfig<Mapping> queryConfig = new QueryConfig<>(mapping);
+        QueryConfig<Mapping> queryConfig = new QueryConfig<>(new Mapping());
         List<Mapping> mappings = operationTemplate.queryAll(queryConfig);
         return mappings;
     }
@@ -191,7 +187,6 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
     @Override
     public List<TableGroup> getTableGroupAll(String mappingId) {
         TableGroup tableGroup = new TableGroup();
-        tableGroup.setType(ConfigConstant.TABLE_GROUP);
         tableGroup.setMappingId(mappingId);
         QueryConfig<TableGroup> queryConfig = new QueryConfig<>(tableGroup, GroupStrategyEnum.TABLE);
         List<TableGroup> tableGroups = operationTemplate.queryAll(queryConfig);
@@ -210,7 +205,6 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
     @Override
     public int getTableGroupCount(String mappingId) {
         TableGroup tableGroup = new TableGroup();
-        tableGroup.setType(ConfigConstant.TABLE_GROUP);
         tableGroup.setMappingId(mappingId);
         QueryConfig queryConfig = new QueryConfig<>(tableGroup, GroupStrategyEnum.TABLE);
         return operationTemplate.queryCount(queryConfig);
@@ -233,9 +227,7 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
 
     @Override
     public List<Meta> getMetaAll() {
-        Meta meta = new Meta();
-        meta.setType(ConfigConstant.META);
-        QueryConfig<Meta> queryConfig = new QueryConfig<>(meta);
+        QueryConfig<Meta> queryConfig = new QueryConfig<>(new Meta());
         return operationTemplate.queryAll(queryConfig);
     }
 

dbsyncer-manager/src/main/java/org/dbsyncer/manager/strategy/TableGroupStrategy.java

@@ -3,9 +3,7 @@ package org.dbsyncer.manager.strategy;
 import org.dbsyncer.manager.GroupStrategy;
 import org.dbsyncer.manager.ManagerException;
 import org.dbsyncer.parser.model.ConfigModel;
-import org.dbsyncer.parser.model.Mapping;
 import org.dbsyncer.parser.model.TableGroup;
-import org.dbsyncer.storage.constant.ConfigConstant;
 
 /**
  * @author AE86
@@ -23,11 +21,7 @@ public class TableGroupStrategy implements GroupStrategy {
             // 格式：${type} + "_" + ${mappingId}
             return new StringBuilder(type).append("_").append(mappingId).toString();
         }
-        if (model instanceof Mapping) {
-            Mapping m = (Mapping) model;
-            return new StringBuilder(ConfigConstant.TABLE_GROUP).append("_").append(m.getId()).toString();
-        }
-        throw new ManagerException(String.format("Not support config model \"%s\".", model));
+        throw new ManagerException(String.format("UnSupported config model \"%s\".", model.getClass().getName()));
     }
 
 }

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

@@ -8,7 +8,6 @@ import org.dbsyncer.manager.Manager;
 import org.dbsyncer.manager.command.PreloadCommand;
 import org.dbsyncer.manager.enums.CommandEnum;
 import org.dbsyncer.manager.model.OperationConfig;
-import org.dbsyncer.manager.model.QueryConfig;
 import org.dbsyncer.manager.template.OperationTemplate.Group;
 import org.dbsyncer.parser.Parser;
 import org.dbsyncer.parser.enums.MetaEnum;
@@ -134,10 +133,7 @@ public final class PreloadTemplate implements ApplicationListener<ContextRefresh
     }
 
     private void launch() {
-        Meta meta = new Meta();
-        meta.setType(ConfigConstant.META);
-        QueryConfig<Meta> queryConfig = new QueryConfig<>(meta);
-        List<Meta> metas = operationTemplate.queryAll(queryConfig);
+        List<Meta> metas = manager.getMetaAll();
         if (!CollectionUtils.isEmpty(metas)) {
             metas.forEach(m -> {
                 // 恢复驱动状态

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

@@ -12,7 +12,7 @@ public class ConfigModel {
     private String id;
 
     /**
-     * connector/mapping/tableGroup/meta/config/ProjectGroup/UserConfig
+     * system/user/connector/mapping/tableGroup/meta/projectGroup
      *
      * @see ConfigConstant
      */

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

@@ -2,6 +2,7 @@ package org.dbsyncer.parser.model;
 
 import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.connector.model.Table;
+import org.dbsyncer.storage.constant.ConfigConstant;
 
 import java.util.List;
 
@@ -12,6 +13,10 @@ import java.util.List;
  */
 public class Connector extends ConfigModel{
 
+    public Connector() {
+        super.setType(ConfigConstant.CONNECTOR);
+    }
+
     /**
      * 表名,["MY_USER", "T_MY_USER", "table_999"]
      */

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

@@ -3,6 +3,7 @@ package org.dbsyncer.parser.model;
 import org.dbsyncer.connector.model.Field;
 import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.parser.enums.ModelEnum;
+import org.dbsyncer.storage.constant.ConfigConstant;
 
 import java.util.List;
 
@@ -15,6 +16,10 @@ import java.util.List;
  */
 public class Mapping extends AbstractConfigModel {
 
+    public Mapping() {
+        super.setType(ConfigConstant.MAPPING);
+    }
+
     // 数据源连接器ID
     private String sourceConnectorId;
 

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

@@ -1,6 +1,7 @@
 package org.dbsyncer.parser.model;
 
 import org.dbsyncer.parser.enums.MetaEnum;
+import org.dbsyncer.storage.constant.ConfigConstant;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -43,6 +44,7 @@ public class Meta extends ConfigModel {
     }
 
     private void init(){
+        super.setType(ConfigConstant.META);
         this.state = MetaEnum.READY.getCode();
         this.total = new AtomicLong(0);
         this.success = new AtomicLong(0);

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

@@ -1,6 +1,7 @@
 package org.dbsyncer.parser.model;
 
 import org.dbsyncer.connector.model.Table;
+import org.dbsyncer.storage.constant.ConfigConstant;
 
 import java.util.List;
 import java.util.Map;
@@ -12,6 +13,10 @@ import java.util.Map;
  */
 public class TableGroup extends AbstractConfigModel {
 
+    public TableGroup() {
+        super.setType(ConfigConstant.TABLE_GROUP);
+    }
+
     // 排序索引
     private int index;
 

dbsyncer-web/src/main/java/org/dbsyncer/web/config/WebAppConfig.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.web.config;
 
-import org.dbsyncer.biz.UserService;
+import org.dbsyncer.biz.UserConfigService;
 import org.dbsyncer.biz.vo.RestResult;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.common.util.SHA1Util;
@@ -60,7 +60,7 @@ public class WebAppConfig extends WebSecurityConfigurerAdapter implements Authen
     private static final int MAXIMUM_SESSIONS = 1;
 
     @Autowired
-    private UserService userService;
+    private UserConfigService userConfigService;
 
 
     /**
@@ -141,7 +141,7 @@ public class WebAppConfig extends WebSecurityConfigurerAdapter implements Authen
         String password = (String) authentication.getCredentials();
         password = SHA1Util.b64_sha1(password);
 
-        UserInfo userInfo = userService.getUserInfo(username);
+        UserInfo userInfo = userConfigService.getUserInfo(username);
         if (null != userInfo && !StringUtil.equals(userInfo.getPassword(), password)) {
             throw new BadCredentialsException("对不起,您输入的帐号或密码错误");
         }

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/index/ProjectGroupController.java

@@ -94,14 +94,13 @@ public class ProjectGroupController extends BaseController {
     /**
      * 参数： id(必)
      *
-     * @param request
      * @return org.dbsyncer.biz.vo.RestResult
      * @author xinpeng.Fu
      * @date 2022/6/15 16:10
      **/
     @PostMapping("/remove")
     @ResponseBody
-    public RestResult remove(HttpServletRequest request, @RequestParam(value = "id") String id) {
+    public RestResult remove(@RequestParam(value = "id") String id) {
         try {
             return RestResult.restSuccess(projectGroupService.remove(id));
         } catch (Exception e) {
@@ -112,7 +111,7 @@ public class ProjectGroupController extends BaseController {
 
     @GetMapping("/getAll")
     @ResponseBody
-    public RestResult getAll(HttpServletRequest request) {
+    public RestResult getAll() {
         try {
             return RestResult.restSuccess(projectGroupService.getProjectGroupAll());
         } catch (Exception e) {

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/user/UserController.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.web.controller.user;
 
-import org.dbsyncer.biz.UserService;
+import org.dbsyncer.biz.UserConfigService;
 import org.dbsyncer.biz.vo.RestResult;
 import org.dbsyncer.biz.vo.UserInfoVo;
 import org.dbsyncer.web.controller.BaseController;
@@ -34,12 +34,12 @@ public class UserController extends BaseController {
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
-    private UserService userService;
+    private UserConfigService userConfigService;
 
     @RequestMapping("")
     public String index(ModelMap model) {
         model.put("currentUser", getUserInfoVo());
-        model.put("users", userService.getUserInfoAll(getUserName()));
+        model.put("users", userConfigService.getUserInfoAll(getUserName()));
         return "user/user";
     }
 
@@ -51,8 +51,8 @@ public class UserController extends BaseController {
     @GetMapping("/page/edit")
     public String pageEdit(ModelMap model, String username) {
         String currentUserName = getUserName();
-        model.put(UserService.CURRENT_USER_NAME, currentUserName);
-        model.put("currentUser", userService.getUserInfoVo(currentUserName, username));
+        model.put(UserConfigService.CURRENT_USER_NAME, currentUserName);
+        model.put("currentUser", userConfigService.getUserInfoVo(currentUserName, username));
         return "user/edit";
     }
 
@@ -67,7 +67,7 @@ public class UserController extends BaseController {
     public RestResult add(HttpServletRequest request) {
         try {
             Map<String, String> params = getParamsWithUserName(request);
-            return RestResult.restSuccess(userService.add(params));
+            return RestResult.restSuccess(userConfigService.add(params));
         } catch (Exception e) {
             logger.error(e.getLocalizedMessage(), e);
             return RestResult.restFail(e.getMessage());
@@ -79,7 +79,7 @@ public class UserController extends BaseController {
     public RestResult edit(HttpServletRequest request) {
         try {
             Map<String, String> params = getParamsWithUserName(request);
-            return RestResult.restSuccess(userService.edit(params));
+            return RestResult.restSuccess(userConfigService.edit(params));
         } catch (Exception e) {
             logger.error(e.getLocalizedMessage(), e);
             return RestResult.restFail(e.getMessage());
@@ -91,7 +91,7 @@ public class UserController extends BaseController {
     public RestResult remove(HttpServletRequest request) {
         try {
             Map<String, String> params = getParamsWithUserName(request);
-            return RestResult.restSuccess(userService.remove(params));
+            return RestResult.restSuccess(userConfigService.remove(params));
         } catch (Exception e) {
             logger.error(e.getLocalizedMessage(), e);
             return RestResult.restFail(e.getMessage());
@@ -100,7 +100,7 @@ public class UserController extends BaseController {
 
     private Map<String, String> getParamsWithUserName(HttpServletRequest request) {
         Map<String, String> params = getParams(request);
-        params.put(UserService.CURRENT_USER_NAME, getUserName());
+        params.put(UserConfigService.CURRENT_USER_NAME, getUserName());
         return params;
     }
 
@@ -111,7 +111,7 @@ public class UserController extends BaseController {
      */
     private UserInfoVo getUserInfoVo() {
         String currentUserName = getUserName();
-        return userService.getUserInfoVo(currentUserName, currentUserName);
+        return userConfigService.getUserInfoVo(currentUserName, currentUserName);
     }
 
     private String getUserName() {