用户默认密码配置

.gitignore

@@ -13,6 +13,7 @@ target/
 *.iml
 *.ipr
 *.log
+*.log.gz
 
 ### Eclipse ###
 .apt_generated

system/src/main/java/com/tofly/system/entity/dto/UserDto.java

@@ -40,7 +40,6 @@ public class UserDto extends BaseDto implements Serializable {
     /**
     * 密码
     */
-    @NotBlank(message="[密码]不能为空",groups = BaseDto.Add.class)
     @Size(max= 255,message="编码长度不能超过255")
     @ApiModelProperty("密码")
     @Length(max= 255,message="编码长度不能超过255")

system/src/main/java/com/tofly/system/service/impl/SysUserServiceImpl.java

@@ -119,7 +119,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         boolean b = FtpUtil.uploadFile2Ftp(file, filename);
         if (b) {
             sysUser.setAvatar(filename);
-            //sysUser.setPassword(PasswordUtil.passwordEncode(user.getPassword()));
         }
         //密码加密
         setPwd(userDto, sysUser);
@@ -140,6 +139,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         if (StringUtils.hasText(userDto.getPassword())) {
             String newPwd = bCryptPasswordEncoder.encode(userDto.getPassword());
             sysUser.setPassword(newPwd);
+        }else {
+            sysUser.setPassword(SysConstants.getUserDefaultPwd());
         }
     }
 
@@ -156,10 +157,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         boolean b = FtpUtil.uploadFile2Ftp(file, filename);
         if (b) {
             sysUser.setAvatar(filename);
-            //sysUser.setPassword(PasswordUtil.passwordEncode(user.getPassword()));
         }
-        //密码加密
-        setPwd(userDto, sysUser);
+        //修改用户-密码不修改
+        sysUser.setPassword(null);
         //修改
         if (!updateById(sysUser)) {
             throw new RuntimeException(ResultEnum.UPDATE_FAIL.getMessage());