添加用户

src/main/java/com/fdkankan/sale/config/SaTokenConfigure.java

@@ -116,7 +116,7 @@ public class SaTokenConfigure {
         if(!redisUtil.hasKey(redisKey)){
             throw new BusinessException(ResultCode.USER_NOT_LOGIN);
         }
-        sysUserService.saveByRedisKey(redisKey);
+        //sysUserService.saveByRedisKey(redisKey);
         redisUtil.expire(String.format(RedisKeyUtil.loginToken,StpUtil.getTokenValue()),21600);
         StpUtil.checkLogin();
     }

src/main/java/com/fdkankan/sale/controller/SysUserController.java

@@ -45,8 +45,7 @@ public class SysUserController extends BaseController{
 
     @PostMapping("/add")
     public ResultData add(@RequestBody SysUserParam param){
-        if(StringUtils.isEmpty(param.getUserName()) || StringUtils.isEmpty(param.getPassword())
-                || StringUtils.isEmpty(param.getNickName()) || param.getRoleId() == null){
+        if(StringUtils.isEmpty(param.getUserName()) || param.getRoleId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         param.setCreateUserId(getUserId());

src/main/java/com/fdkankan/sale/entity/SysUser.java

@@ -59,7 +59,7 @@ public class SysUser implements Serializable {
      * 创建者id
      */
     @TableField("create_user_id")
-    private Integer createUserId;
+    private Long createUserId;
 
     /**
      * 是否禁用 0禁用，1启用

src/main/java/com/fdkankan/sale/service/ISysUserService.java

@@ -21,6 +21,8 @@ public interface ISysUserService extends IService<SysUser> {
 
     SysUser getByUserName(String userName);
 
+    SysUser getByUserNameDb2(String userName);
+
     ManageLoginResponse getUserByUserNameAndPassword(String userName, String password);
 
     void addOrUpdate(SysUserParam param);

src/main/java/com/fdkankan/sale/service/impl/SysUserServiceImpl.java

@@ -59,6 +59,16 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
         }
         return list.get(0);
     }
+    @DS("db2")
+    public SysUser getByUserNameDb2(String userName) {
+        LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysUser::getUserName,userName);
+        List<SysUser> list = this.list(wrapper);
+        if(list == null || list.size() <=0){
+            return null;
+        }
+        return list.get(0);
+    }
 
 
     @Override
@@ -84,30 +94,20 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
 
     @Override
     public void addOrUpdate(SysUserParam param) {
-        if(param.getId() == null){
-            SysUser user = this.getByUserName(param.getUserName());
-            if(user !=null){
-                throw new BusinessException(ResultCode.USER_EXIST);
-            }
-        }
-        SysUser sysUser = new SysUser();
-        BeanUtils.copyProperties(param,sysUser);
-        if(!StringUtils.isEmpty(param.getPassword())){
-            String passwordMd5 = SecurityUtil.MD52(Base64Converter.decode(Base64Converter.subText(param.getPassword())));
-            sysUser.setPassword(passwordMd5);
-        }
-        if(!StringUtils.isEmpty(param.getNewPassword())){
-            String passwordMd5 = SecurityUtil.MD52(Base64Converter.decode(Base64Converter.subText(param.getNewPassword())));
-            sysUser.setPassword(passwordMd5);
+        SysUser user = this.getByUserNameDb2(param.getUserName());
+        if(user ==null){
+            throw new BusinessException(ResultCode.USER_NOT_EXIST);
         }
-        if(!StringUtils.isEmpty(param.getOldPassword()) && param.getId() != null){
-            String passwordMd5 = SecurityUtil.MD52(Base64Converter.decode(Base64Converter.subText(param.getOldPassword())));
-            SysUser byId = this.getById(param.getId());
-            if(!byId.getPassword().equals(passwordMd5)){
-                throw new BusinessException(ResultCode.OLD_PASSWORD_ERROR);
-            }
+        SysUser user2 = this.getByUserName(param.getUserName());
+        if(user2 !=null){
+            throw new BusinessException(ResultCode.USER_EXIST);
         }
-        this.saveOrUpdate(sysUser);
+        user.setId(null);
+        user.setManageId(user.getId());
+        user.setRoleId(param.getRoleId());
+        user.setCreateUserId(param.getCreateUserId());
+        user.setUpdateTime(null);
+        this.save(user);
     }
 
     @Override