p96170835
/
diboot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
mazhicheng 2020-02-22 16:00:01 +08:00
parent cf1ef4cc48 d1519bbe87
commit 92553a56d2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
iam-base-starter/src/main/java/com/diboot/iam/service/impl/IamAccountServiceImpl.java
View File

@ -28,7 +28,9 @@ public class IamAccountServiceImpl extends BaseIamServiceImpl<IamAccountMapper,
@Override
public boolean createEntity(IamAccount iamAccount) {
// 生成加密盐并加密
IamSecurityUtils.encryptPwd(iamAccount);
if (V.notEmpty(iamAccount.getAuthSecret())){
IamSecurityUtils.encryptPwd(iamAccount);
}
// 保存
try{
return super.createEntity(iamAccount);

4
iam-base-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
View File

@ -108,7 +108,9 @@ public class IamUserServiceImpl extends BaseIamServiceImpl<IamUserMapper, IamUse
.setAuthType(Cons.DICTCODE_AUTH_TYPE.PWD.name())
.setStatus(userAccountDTO.getStatus());
// 设置密码
IamSecurityUtils.encryptPwd(iamAccount);
if (V.notEmpty(iamAccount.getAuthSecret())){
IamSecurityUtils.encryptPwd(iamAccount);
}
boolean accountSuccess = iamAccountService.createEntity(iamAccount);
// 批量创建角色关联关系