add user

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

@@ -28,13 +28,6 @@ public interface ConfigService {
      */
     ConfigVo getConfig();
 
-    /**
-     * 获取密码
-     *
-     * @return
-     */
-    String getPassword();
-
     /**
      * 获取所有配置
      *

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

@@ -1,6 +1,8 @@
 package org.dbsyncer.biz;
 
-import org.dbsyncer.biz.vo.UserVo;
+import org.dbsyncer.biz.vo.UserInfoVo;
+
+import java.util.Map;
 
 /**
  * @author AE86
@@ -10,11 +12,32 @@ import org.dbsyncer.biz.vo.UserVo;
 public interface UserService {
 
     /**
-     * 获取登录用户信息
+     * 新增用戶
+     *
+     * @param params
+     */
+    String add(Map<String, String> params);
+
+    /**
+     * 修改用戶
+     *
+     * @param params
+     */
+    String edit(Map<String, String> params);
+
+    /**
+     * 获取用户密码
+     *
+     * @return
+     */
+    String getPassword(String username);
+
+    /**
+     * 获取用户信息VO
      *
      * @param username
      * @return
      */
-    UserVo getUserVo(String username);
+    UserInfoVo getUserInfoVo(String username);
 
 }

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

@@ -1,9 +1,7 @@
 package org.dbsyncer.biz.checker.impl.config;
 
-import org.dbsyncer.biz.BizException;
 import org.dbsyncer.biz.checker.AbstractChecker;
 import org.dbsyncer.common.util.NumberUtil;
-import org.dbsyncer.common.util.SHA1Util;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.parser.logger.LogService;
@@ -14,7 +12,6 @@ import org.dbsyncer.storage.constant.ConfigConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
@@ -30,9 +27,6 @@ public class ConfigChecker extends AbstractChecker {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Value(value = "${dbsyncer.web.login.password}")
-    private String password;
-
     @Autowired
     private Manager manager;
 
@@ -44,7 +38,6 @@ public class ConfigChecker extends AbstractChecker {
         Config config = new Config();
         config.setName("系统配置");
         config.setType(ConfigConstant.CONFIG);
-        config.setPassword(password);
 
         // 修改基本配置
         this.modifyConfigModel(config, params);
@@ -63,20 +56,6 @@ public class ConfigChecker extends AbstractChecker {
         Config config = manager.getConfig(id);
         Assert.notNull(config, "配置文件为空.");
 
-        // 修改密码
-        String newPwd = params.get("newPwd");
-        String oldPwd = params.get("oldPwd");
-        if (StringUtil.isNotBlank(newPwd) && StringUtil.isNotBlank(oldPwd)) {
-            oldPwd = SHA1Util.b64_sha1(oldPwd);
-            if (!StringUtil.equals(config.getPassword(), oldPwd)) {
-                logService.log(LogType.SystemLog.ERROR, "修改密码失败");
-                throw new BizException("修改密码失败");
-            }
-            config.setPassword(SHA1Util.b64_sha1(newPwd));
-            logService.log(LogType.SystemLog.INFO, "修改密码成功");
-        }
-        logService.log(LogType.SystemLog.INFO, "修改系统配置");
-
         // 刷新监控间隔（秒）
         String refreshInterval = params.get("refreshInterval");
         if (StringUtil.isNotBlank(refreshInterval)) {
@@ -87,6 +66,7 @@ public class ConfigChecker extends AbstractChecker {
         // 刷新邮箱配置(有配置则发邮件)
         String email = params.get("email");
         config.setEmail(email);
+        logService.log(LogType.SystemLog.INFO, "修改系统配置");
 
         // 修改基本配置
         this.modifyConfigModel(config, params);

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

@@ -0,0 +1,102 @@
+package org.dbsyncer.biz.checker.impl.user;
+
+import org.dbsyncer.biz.BizException;
+import org.dbsyncer.biz.checker.AbstractChecker;
+import org.dbsyncer.common.util.SHA1Util;
+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.ConfigModel;
+import org.dbsyncer.parser.model.UserConfig;
+import org.dbsyncer.parser.model.UserInfo;
+import org.dbsyncer.storage.constant.ConfigConstant;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author AE86
+ * @version 1.0.0
+ * @date 2020/1/8 15:17
+ */
+@Component
+public class UserConfigChecker extends AbstractChecker {
+
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Value(value = "${dbsyncer.web.login.username}")
+    private String username;
+
+    @Value(value = "${dbsyncer.web.login.password}")
+    private String password;
+
+    @Autowired
+    private Manager manager;
+
+    @Autowired
+    private LogService logService;
+
+    @Override
+    public synchronized ConfigModel checkAddConfigModel(Map<String, String> params) {
+        UserConfig config = new UserConfig();
+        config.setName("用户配置");
+        config.setType(ConfigConstant.USER_CONFIG);
+        List<UserInfo> list = new ArrayList<>();
+        list.add(new UserInfo(username, "系统管理员", password));
+        config.setUserInfoList(list);
+
+        // 修改基本配置
+        this.modifyConfigModel(config, params);
+
+        manager.addUserConfig(config);
+        return config;
+    }
+
+    @Override
+    public synchronized ConfigModel checkEditConfigModel(Map<String, String> params) {
+        logger.info("params:{}", params);
+        Assert.notEmpty(params, "UserConfig check params is null.");
+
+        String id = params.get(ConfigConstant.CONFIG_MODEL_ID);
+        Assert.hasText(id, "UserConfig id is empty.");
+        UserConfig config = manager.getUserConfig(id);
+        Assert.notNull(config, "用户配置文件为空.");
+        String username = params.get("username");
+        Assert.hasText(username, "UserConfig username is empty.");
+        UserInfo userInfo = config.getUserInfo(username);
+        Assert.notNull(userInfo, "无效的用户.");
+
+        String nickname = params.get("nickname");
+        Assert.hasText(nickname, "UserConfig nickname is empty.");
+        // 修改密码
+        String newPwd = params.get("newPwd");
+        String oldPwd = params.get("oldPwd");
+        if (StringUtil.isNotBlank(newPwd) && StringUtil.isNotBlank(oldPwd)) {
+            oldPwd = SHA1Util.b64_sha1(oldPwd);
+
+            if (!StringUtil.equals(userInfo.getPassword(), oldPwd)) {
+                logService.log(LogType.SystemLog.ERROR, "修改密码失败");
+                throw new BizException("修改密码失败");
+            }
+            userInfo.setPassword(SHA1Util.b64_sha1(newPwd));
+            logService.log(LogType.SystemLog.INFO, "修改密码成功");
+        }
+
+        userInfo.setNickname(nickname);
+        userInfo.setPassword(password);
+        logService.log(LogType.SystemLog.INFO, String.format("[%s]修改密码成功", username));
+
+        // 修改基本配置
+        this.modifyConfigModel(config, params);
+        return config;
+    }
+
+}

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

@@ -46,12 +46,10 @@ public class ConfigServiceImpl implements ConfigService {
     private LogService logService;
 
     @Override
-    public String edit(Map<String, String> params) {
-        synchronized (this) {
-            getConfigModel();
-            ConfigModel model = configChecker.checkEditConfigModel(params);
-            manager.editConfig(model);
-        }
+    public synchronized String edit(Map<String, String> params) {
+        getConfigModel();
+        ConfigModel model = configChecker.checkEditConfigModel(params);
+        manager.editConfig(model);
         return "修改成功.";
     }
 
@@ -60,11 +58,6 @@ public class ConfigServiceImpl implements ConfigService {
         return convertConfig2Vo(getConfigModel());
     }
 
-    @Override
-    public String getPassword() {
-        return getConfigModel().getPassword();
-    }
-
     @Override
     public List<ConfigModel> getConfigModelAll() {
         List<ConfigModel> list = new ArrayList<>();
@@ -101,7 +94,7 @@ public class ConfigServiceImpl implements ConfigService {
         }
     }
 
-    private Config getConfigModel() {
+    private synchronized Config getConfigModel() {
         List<Config> all = manager.getConfigAll();
         return CollectionUtils.isEmpty(all) ? (Config) configChecker.checkAddConfigModel(new HashMap<>()) : all.get(0);
     }
@@ -109,8 +102,6 @@ public class ConfigServiceImpl implements ConfigService {
     private ConfigVo convertConfig2Vo(Config config) {
         ConfigVo configVo = new ConfigVo();
         BeanUtils.copyProperties(config, configVo);
-        // 避免密码直接暴露
-        configVo.setPassword("");
         return configVo;
     }
 

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

@@ -1,9 +1,21 @@
 package org.dbsyncer.biz.impl;
 
 import org.dbsyncer.biz.UserService;
-import org.dbsyncer.biz.vo.UserVo;
+import org.dbsyncer.biz.checker.Checker;
+import org.dbsyncer.biz.vo.UserInfoVo;
+import org.dbsyncer.common.util.CollectionUtils;
+import org.dbsyncer.manager.Manager;
+import org.dbsyncer.parser.model.ConfigModel;
+import org.dbsyncer.parser.model.UserConfig;
+import org.dbsyncer.parser.model.UserInfo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author AE86
  * @version 1.0.0
@@ -12,8 +24,47 @@ import org.springframework.stereotype.Service;
 @Service
 public class UserServiceImpl implements UserService {
 
+    @Autowired
+    private Manager manager;
+
+    @Autowired
+    private Checker userConfigChecker;
+
+    @Override
+    public synchronized String add(Map<String, String> params) {
+        getUserConfig();
+        ConfigModel configModel = userConfigChecker.checkAddConfigModel(params);
+        return manager.addUserConfig(configModel);
+    }
+
+    @Override
+    public String edit(Map<String, String> params) {
+        ConfigModel configModel = userConfigChecker.checkEditConfigModel(params);
+        return manager.editUserConfig(configModel);
+    }
+
     @Override
-    public UserVo getUserVo(String username) {
-        return new UserVo(username);
+    public String getPassword(String username) {
+        UserConfig userConfig = getUserConfig();
+        return userConfig != null ? userConfig.getUserInfo(username).getPassword() : null;
     }
+
+    @Override
+    public UserInfoVo getUserInfoVo(String username) {
+        return convertUserConfig2Vo(getUserConfig().getUserInfo(username));
+    }
+
+    private synchronized UserConfig getUserConfig() {
+        List<UserConfig> all = manager.getUserConfigAll();
+        return CollectionUtils.isEmpty(all) ? (UserConfig) userConfigChecker.checkAddConfigModel(new HashMap<>()) : all.get(0);
+    }
+
+    private UserInfoVo convertUserConfig2Vo(UserInfo userInfo) {
+        UserInfoVo userInfoVo = new UserInfoVo();
+        BeanUtils.copyProperties(userInfo, userInfoVo);
+        // 避免密码直接暴露
+        userInfoVo.setPassword("");
+        return userInfoVo;
+    }
+
 }

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

@@ -0,0 +1,11 @@
+package org.dbsyncer.biz.vo;
+
+import org.dbsyncer.parser.model.UserInfo;
+
+/**
+ * @author AE86
+ * @version 1.0.0
+ * @date 2022/11/17 0:14
+ */
+public class UserInfoVo extends UserInfo {
+}

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

@@ -1,44 +0,0 @@
-package org.dbsyncer.biz.vo;
-
-/**
- * @author AE86
- * @version 1.0.0
- * @date 2022/11/17 0:14
- */
-public class UserVo {
-
-    /**
-     * 账号
-     */
-    private String username;
-
-    /**
-     * 昵称
-     */
-    private String nickname;
-
-    public UserVo(String username) {
-        this(username, username);
-    }
-
-    public UserVo(String username, String nickname) {
-        this.username = username;
-        this.nickname = nickname;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getNickname() {
-        return nickname;
-    }
-
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-}

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

@@ -27,6 +27,15 @@ import java.util.Map;
  */
 public interface Manager extends Executor {
 
+    // user
+    String addUserConfig(ConfigModel model);
+
+    String editUserConfig(ConfigModel model);
+
+    UserConfig getUserConfig(String id);
+
+    List<UserConfig> getUserConfigAll();
+
     // project group
     String addProjectGroup(ConfigModel model);
 

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

@@ -67,6 +67,30 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
     @Autowired
     private Map<String, Puller> map;
 
+    @Override
+    public String addUserConfig(ConfigModel model) {
+        return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_ADD));
+    }
+
+    @Override
+    public String editUserConfig(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_CONFIG);
+        QueryConfig<UserConfig> queryConfig = new QueryConfig<>(userConfig);
+        List<UserConfig> userConfigs = operationTemplate.queryAll(queryConfig);
+        return userConfigs;
+    }
+
     @Override
     public String addProjectGroup(ConfigModel model) {
         return operationTemplate.execute(new OperationConfig(model, CommandEnum.OPR_ADD));
@@ -431,4 +455,4 @@ public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent>
         return puller;
     }
 
-}
+}

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

@@ -7,21 +7,11 @@ package org.dbsyncer.parser.model;
  */
 public class Config extends ConfigModel {
 
-    private String password;
-
     private int refreshInterval = 5;
 
     // 同步失败发送邮箱,多个以分号分割
     private String email;
 
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
     public int getRefreshInterval() {
         return refreshInterval;
     }

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
+     * connector/mapping/tableGroup/meta/config/ProjectGroup/UserConfig
      *
      * @see ConfigConstant
      */

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

@@ -0,0 +1,64 @@
+package org.dbsyncer.parser.model;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * 用户配置
+ *
+ * @author AE86
+ * @version 1.0.0
+ * @date 2022/11/17 22:54
+ */
+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){
+        Iterator<UserInfo> iterator = userInfoList.iterator();
+        while (iterator.hasNext()){
+            UserInfo next = iterator.next();
+            if(next.getUsername().equals(username)){
+                iterator.remove();
+                break;
+            }
+        }
+    }
+
+    public synchronized UserInfo getUserInfo(String username){
+        Iterator<UserInfo> iterator = userInfoList.iterator();
+        while (iterator.hasNext()){
+            UserInfo next = iterator.next();
+            if(next.getUsername().equals(username)){
+                return next;
+            }
+        }
+        return null;
+    }
+
+    public List<UserInfo> getUserInfoList() {
+        return userInfoList;
+    }
+
+    public void setUserInfoList(List<UserInfo> userInfoList) {
+        this.userInfoList = userInfoList;
+    }
+}

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

@@ -0,0 +1,71 @@
+package org.dbsyncer.parser.model;
+
+/**
+ * @author AE86
+ * @version 1.0.0
+ * @date 2022/11/17 23:09
+ */
+public class UserInfo {
+
+    /**
+     * 账号
+     */
+    private String username;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    public UserInfo() {
+    }
+
+    public UserInfo(String username, String nickname, String password) {
+        this.username = username;
+        this.nickname = nickname;
+        this.password = password;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if(obj instanceof UserInfo){
+            UserInfo userInfo = (UserInfo) obj;
+            return userInfo.username.equals(this.username);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return username.hashCode();
+    }
+}

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

@@ -26,6 +26,7 @@ public class ConfigConstant {
     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-web/src/main/java/org/dbsyncer/web/config/WebAppConfig.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.web.config;
 
-import org.dbsyncer.biz.ConfigService;
+import org.dbsyncer.biz.UserService;
 import org.dbsyncer.biz.vo.RestResult;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.common.util.SHA1Util;
@@ -8,7 +8,6 @@ import org.dbsyncer.common.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationProvider;
@@ -57,11 +56,9 @@ public class WebAppConfig extends WebSecurityConfigurerAdapter implements Authen
      */
     private static final int MAXIMUM_SESSIONS = 1;
 
-    @Value(value = "${dbsyncer.web.login.username}")
-    private String username;
-
     @Autowired
-    private ConfigService configService;
+    private UserService userService;
+
 
     /**
      * 登录失败
@@ -141,7 +138,7 @@ public class WebAppConfig extends WebSecurityConfigurerAdapter implements Authen
         String password = (String) authentication.getCredentials();
         password = SHA1Util.b64_sha1(password);
 
-        if (!StringUtil.equals(username, this.username) || !StringUtil.equals(configService.getPassword(), password)) {
+        if (!StringUtil.equals(userService.getPassword(username), password)) {
             throw new BadCredentialsException("对不起,您输入的帐号或密码错误");
         }
         return new UsernamePasswordAuthenticationToken(username, password, AuthorityUtils.commaSeparatedStringToAuthorityList("admin"));

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

@@ -51,7 +51,7 @@ public class IndexController {
     @ResponseBody
     public RestResult getUserInfo() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        return RestResult.restSuccess(userService.getUserVo(authentication.getName()));
+        return RestResult.restSuccess(userService.getUserInfoVo(authentication.getName()));
     }
 
 }