gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【修复】修复密码为空时二次加密的bug

pull/22/head
xuyuxiang 2021-05-18 11:15:27 +08:00
parent 05ee5f14ca
commit af2ab01e59
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/factory/SysUserFactory.java
View File

@ -65,8 +65,6 @@ public class SysUserFactory {
String password = ConstantContextHolder.getDefaultPassWord(); String password = ConstantContextHolder.getDefaultPassWord();
//设置密码为Md5加密后的密码 //设置密码为Md5加密后的密码
sysUser.setPassword(BCrypt.hashpw(password, BCrypt.gensalt())); sysUser.setPassword(BCrypt.hashpw(password, BCrypt.gensalt()));
} else {
sysUser.setPassword(BCrypt.hashpw(sysUser.getPassword(), BCrypt.gensalt()));
} }
if (ObjectUtil.isEmpty(sysUser.getAvatar())) { if (ObjectUtil.isEmpty(sysUser.getAvatar())) {

6
snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
View File

@ -188,6 +188,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
SysUser sysUser = new SysUser(); SysUser sysUser = new SysUser();
BeanUtil.copyProperties(sysUserParam, sysUser); BeanUtil.copyProperties(sysUserParam, sysUser);
SysUserFactory.fillAddCommonUserInfo(sysUser); SysUserFactory.fillAddCommonUserInfo(sysUser);
if(ObjectUtil.isNotEmpty(sysUserParam.getPassword())) {
sysUser.setPassword(BCrypt.hashpw(sysUserParam.getPassword(), BCrypt.gensalt()));
}
this.save(sysUser); this.save(sysUser);
Long sysUserId = sysUser.getId(); Long sysUserId = sysUser.getId();
//增加员工信息 //增加员工信息
@ -257,6 +260,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
sysUser.setStatus(null); sysUser.setStatus(null);
//设置密码 //设置密码
SysUserFactory.fillBaseUserInfo(sysUser); SysUserFactory.fillBaseUserInfo(sysUser);
if(ObjectUtil.isNotEmpty(sysUserParam.getPassword())) {
sysUser.setPassword(BCrypt.hashpw(sysUserParam.getPassword(), BCrypt.gensalt()));
}
this.updateById(sysUser); this.updateById(sysUser);
Long sysUserId = sysUser.getId(); Long sysUserId = sysUser.getId();
//编辑员工信息 //编辑员工信息