优化逻辑

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/connector/ConnectorChecker.java

@@ -52,7 +52,6 @@ public class ConnectorChecker extends AbstractChecker {
 
         Connector connector = new Connector();
         connector.setName(name);
-        connector.setType(ConfigConstant.CONNECTOR);
         AbstractConnectorConfig config = getConfig(connectorType);
         connector.setConfig(config);
 

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/group/ProjectGroupChecker.java

@@ -36,7 +36,6 @@ public class ProjectGroupChecker extends AbstractChecker {
     public ConfigModel checkAddConfigModel(Map<String, String> params) {
         String name = params.get(ConfigConstant.CONFIG_MODEL_NAME);
         ProjectGroup projectGroup = new ProjectGroup();
-        projectGroup.setType(ConfigConstant.PROJECT_GROUP);
         projectGroup.setName(name);
 
         modifyProjectGroup(projectGroup, params);

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

@@ -57,7 +57,6 @@ public class MappingChecker extends AbstractChecker {
 
         Mapping mapping = new Mapping();
         mapping.setName(name);
-        mapping.setType(ConfigConstant.MAPPING);
         mapping.setSourceConnectorId(sourceConnectorId);
         mapping.setTargetConnectorId(targetConnectorId);
         mapping.setModel(ModelEnum.FULL.getCode());
@@ -203,8 +202,6 @@ public class MappingChecker extends AbstractChecker {
     private void addMeta(Mapping mapping) {
         Meta meta = new Meta();
         meta.setMappingId(mapping.getId());
-        meta.setType(ConfigConstant.META);
-        meta.setName(ConfigConstant.META);
 
         // 修改基本配置
         this.modifyConfigModel(meta, new HashMap<>());

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

@@ -37,7 +37,6 @@ public class SystemConfigChecker extends AbstractChecker {
     public ConfigModel checkAddConfigModel(Map<String, String> params) {
         SystemConfig systemConfig = new SystemConfig();
         systemConfig.setName("系统配置");
-        systemConfig.setType(ConfigConstant.SYSTEM);
 
         // 修改基本配置
         this.modifyConfigModel(systemConfig, params);

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/tablegroup/TableGroupChecker.java

@@ -63,8 +63,6 @@ public class TableGroupChecker extends AbstractChecker {
         // 获取连接器信息
         TableGroup tableGroup = new TableGroup();
         tableGroup.setFieldMapping(new ArrayList<>());
-        tableGroup.setName(ConfigConstant.TABLE_GROUP);
-        tableGroup.setType(ConfigConstant.TABLE_GROUP);
         tableGroup.setMappingId(mappingId);
         tableGroup.setSourceTable(getTable(mapping.getSourceConnectorId(), sourceTable, sourceTablePK));
         tableGroup.setTargetTable(getTable(mapping.getTargetConnectorId(), targetTable, targetTablePK));

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

@@ -4,10 +4,8 @@ import org.dbsyncer.biz.BizException;
 import org.dbsyncer.biz.checker.AbstractChecker;
 import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.parser.model.UserConfig;
-import org.dbsyncer.storage.constant.ConfigConstant;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.Map;
 
 /**
@@ -22,8 +20,6 @@ public class UserConfigChecker extends AbstractChecker {
     public ConfigModel checkAddConfigModel(Map<String, String> params) {
         UserConfig config = new UserConfig();
         config.setName("用户配置");
-        config.setType(ConfigConstant.USER);
-        config.setUserInfoList(new ArrayList<>());
 
         // 修改基本配置
         this.modifyConfigModel(config, params);

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

@@ -23,11 +23,9 @@ 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;
-import org.dbsyncer.storage.constant.ConfigConstant;
 import org.dbsyncer.storage.enums.StorageDataStatusEnum;
 import org.dbsyncer.storage.enums.StorageEnum;
 import org.dbsyncer.storage.query.Query;
@@ -85,19 +83,13 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
 
     @Override
     public SystemConfig getSystemConfig() {
-        SystemConfig systemConfig = new SystemConfig();
-        systemConfig.setType(ConfigConstant.SYSTEM);
-        QueryConfig<SystemConfig> queryConfig = new QueryConfig<>(systemConfig);
-        List<SystemConfig> list = operationTemplate.queryAll(queryConfig);
+        List<SystemConfig> list = operationTemplate.queryAll(SystemConfig.class);
         return CollectionUtils.isEmpty(list) ? null : list.get(0);
     }
 
     @Override
     public UserConfig getUserConfig() {
-        UserConfig userConfig = new UserConfig();
-        userConfig.setType(ConfigConstant.USER);
-        QueryConfig<UserConfig> queryConfig = new QueryConfig<>(userConfig);
-        List<UserConfig> list = operationTemplate.queryAll(queryConfig);
+        List<UserConfig> list = operationTemplate.queryAll(UserConfig.class);
         return CollectionUtils.isEmpty(list) ? null : list.get(0);
     }
 
@@ -108,11 +100,7 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
 
     @Override
     public List<ProjectGroup> getProjectGroupAll() {
-        ProjectGroup projectGroup = new ProjectGroup();
-        projectGroup.setType(ConfigConstant.PROJECT_GROUP);
-        QueryConfig<ProjectGroup> queryConfig = new QueryConfig<>(projectGroup);
-        List<ProjectGroup> groups = operationTemplate.queryAll(queryConfig);
-        return groups;
+        return operationTemplate.queryAll(ProjectGroup.class);
     }
 
     @Override
@@ -147,9 +135,7 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
 
     @Override
     public List<Connector> getConnectorAll() {
-        QueryConfig<Connector> queryConfig = new QueryConfig<>(new Connector());
-        List<Connector> connectors = operationTemplate.queryAll(queryConfig);
-        return connectors;
+        return operationTemplate.queryAll(Connector.class);
     }
 
     @Override
@@ -174,9 +160,7 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
 
     @Override
     public List<Mapping> getMappingAll() {
-        QueryConfig<Mapping> queryConfig = new QueryConfig<>(new Mapping());
-        List<Mapping> mappings = operationTemplate.queryAll(queryConfig);
-        return mappings;
+        return operationTemplate.queryAll(Mapping.class);
     }
 
     @Override
@@ -186,11 +170,8 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
 
     @Override
     public List<TableGroup> getTableGroupAll(String mappingId) {
-        TableGroup tableGroup = new TableGroup();
-        tableGroup.setMappingId(mappingId);
-        QueryConfig<TableGroup> queryConfig = new QueryConfig<>(tableGroup, GroupStrategyEnum.TABLE);
-        List<TableGroup> tableGroups = operationTemplate.queryAll(queryConfig);
-        return tableGroups;
+        TableGroup tableGroup = new TableGroup().setMappingId(mappingId);
+        return operationTemplate.queryAll(new QueryConfig(tableGroup, GroupStrategyEnum.TABLE));
     }
 
     @Override
@@ -204,10 +185,8 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
 
     @Override
     public int getTableGroupCount(String mappingId) {
-        TableGroup tableGroup = new TableGroup();
-        tableGroup.setMappingId(mappingId);
-        QueryConfig queryConfig = new QueryConfig<>(tableGroup, GroupStrategyEnum.TABLE);
-        return operationTemplate.queryCount(queryConfig);
+        TableGroup tableGroup = new TableGroup().setMappingId(mappingId);
+        return operationTemplate.queryCount(new QueryConfig<>(tableGroup, GroupStrategyEnum.TABLE));
     }
 
     @Override
@@ -227,8 +206,7 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
 
     @Override
     public List<Meta> getMetaAll() {
-        QueryConfig<Meta> queryConfig = new QueryConfig<>(new Meta());
-        return operationTemplate.queryAll(queryConfig);
+        return operationTemplate.queryAll(Meta.class);
     }
 
     @Override

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

@@ -41,6 +41,15 @@ public final class OperationTemplate {
     @Autowired
     private CacheService cacheService;
 
+    public <T> List<T> queryAll(Class<T> valueType) {
+        try {
+            ConfigModel configModel = (ConfigModel) valueType.newInstance();
+            return queryAll(new QueryConfig<T>(configModel));
+        } catch (Exception e) {
+            throw new ManagerException(e);
+        }
+    }
+
     public <T> List<T> queryAll(QueryConfig<T> query) {
         ConfigModel model = query.getConfigModel();
         String groupId = getGroupId(model, query.getGroupStrategyEnum());

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

@@ -33,6 +33,8 @@ public class Meta extends ConfigModel {
     private long endTime;
 
     public Meta() {
+        super.setType(ConfigConstant.META);
+        super.setName(ConfigConstant.META);
         init();
     }
 
@@ -44,7 +46,6 @@ 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/ProjectGroup.java

@@ -1,5 +1,7 @@
 package org.dbsyncer.parser.model;
 
+import org.dbsyncer.storage.constant.ConfigConstant;
+
 import java.util.List;
 
 /**
@@ -9,6 +11,10 @@ import java.util.List;
  **/
 public class ProjectGroup extends ConfigModel {
 
+    public ProjectGroup() {
+        super.setType(ConfigConstant.PROJECT_GROUP);
+    }
+
     /**
      * 连接器ID列表
      */

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

@@ -1,5 +1,7 @@
 package org.dbsyncer.parser.model;
 
+import org.dbsyncer.storage.constant.ConfigConstant;
+
 /**
  * 系统配置
  *
@@ -9,6 +11,10 @@ package org.dbsyncer.parser.model;
  */
 public class SystemConfig extends ConfigModel {
 
+    public SystemConfig() {
+        super.setType(ConfigConstant.SYSTEM);
+    }
+
     private int refreshInterval = 5;
 
     public int getRefreshInterval() {

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

@@ -15,6 +15,7 @@ public class TableGroup extends AbstractConfigModel {
 
     public TableGroup() {
         super.setType(ConfigConstant.TABLE_GROUP);
+        super.setName(ConfigConstant.TABLE_GROUP);
     }
 
     // 排序索引

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

@@ -1,5 +1,7 @@
 package org.dbsyncer.parser.model;
 
+import org.dbsyncer.storage.constant.ConfigConstant;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -15,22 +17,26 @@ public class UserConfig extends ConfigModel {
 
     private List<UserInfo> userInfoList = new ArrayList<>();
 
-    public void removeUserInfo(String username){
+    public UserConfig() {
+        super.setType(ConfigConstant.USER);
+    }
+
+    public void removeUserInfo(String username) {
         Iterator<UserInfo> iterator = userInfoList.iterator();
-        while (iterator.hasNext()){
+        while (iterator.hasNext()) {
             UserInfo next = iterator.next();
-            if(next.getUsername().equals(username)){
+            if (next.getUsername().equals(username)) {
                 iterator.remove();
                 break;
             }
         }
     }
 
-    public UserInfo getUserInfo(String username){
+    public UserInfo getUserInfo(String username) {
         Iterator<UserInfo> iterator = userInfoList.iterator();
-        while (iterator.hasNext()){
+        while (iterator.hasNext()) {
             UserInfo next = iterator.next();
-            if(next.getUsername().equals(username)){
+            if (next.getUsername().equals(username)) {
                 return next;
             }
         }

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

@@ -142,7 +142,7 @@ public class WebAppConfig extends WebSecurityConfigurerAdapter implements Authen
         password = SHA1Util.b64_sha1(password);
 
         UserInfo userInfo = userConfigService.getUserInfo(username);
-        if (null != userInfo && !StringUtil.equals(userInfo.getPassword(), password)) {
+        if (null == userInfo || !StringUtil.equals(userInfo.getPassword(), password)) {
             throw new BadCredentialsException("对不起,您输入的帐号或密码错误");
         }
         List<GrantedAuthority> authorities = AuthorityUtils.commaSeparatedStringToAuthorityList(userInfo.getRoleCode());

dbsyncer-web/src/main/resources/public/user/edit.html

@@ -107,8 +107,6 @@ xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
       const newPwd = data.newPwd;
       doPoster("/user/edit", data, function (data) {
         if (data.success == true) {
-          bootGrowl("修改用户成功！", "success");
-          backUserIndexPage();
           // 刷新个人信息
           if (currentUserName == username) {
             // 修改个人密码后需要重新登录
@@ -120,6 +118,8 @@ xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
             }
             refreshLoginUser();
           }
+          bootGrowl("修改用户成功！", "success");
+          backUserIndexPage();
         } else {
           bootGrowl(data.resultValue, "danger");
         }