weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_lzh_wms_20260120' into wms_dev

Browse Source
This commit is contained in:
zhou-hongcheng
2026-02-03 16:08:54 +08:00
parent 0e87b0d4b1 0194adc794
commit 910e1bac83
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java
+7 -2
View File
@@ -113,6 +113,7 @@ import java.util.*;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.mhd.common.core.utils.AESUtil.decrypt;
import static com.mhd.common.core.utils.PageUtils.startPage; import static com.mhd.common.core.utils.PageUtils.startPage;
@Service @Service
@@ -1820,14 +1821,18 @@ public class UserApplicationService {
userDO.setUserAccountType(userPo.getUserAccountType()); userDO.setUserAccountType(userPo.getUserAccountType());
CheckDO checkDO = userFactory.getCheckDo(userDO); CheckDO checkDO = userFactory.getCheckDo(userDO);
checkDO.setDataSources(userPo.getDataSources()); checkDO.setDataSources(userPo.getDataSources());
if (StringUtils.isNotEmpty(userDO.getUserPassword()) && userDO.getUserPassword().equals(userPo.getUserPassword())){
userDO.setUserPassword(null);
}
//用户密码传值 //用户密码传值
if (StringUtils.isNotEmpty(userDO.getUserPassword())) { if (StringUtils.isNotEmpty(userDO.getUserPassword())) {
String userPassword = userDO.getUserPassword(); String userPassword = userDO.getUserPassword();
checkDO.setUserPassword(userPassword); String decrypt = decrypt(userPassword);//解密
checkDO.setUserPassword(decrypt);
// 生成随机8位数盐 // 生成随机8位数盐
String salt = userPo.getUserSalt(); String salt = userPo.getUserSalt();
//加密算法，PBEWithMD5AndDES， //加密算法，PBEWithMD5AndDES，
String passwordEncode = PasswordUtil.encrypt(userDO.getUserAccount(), userPassword, salt); String passwordEncode = PasswordUtil.encrypt(userDO.getUserAccount(), decrypt, salt);
userDO.setUserPassword(passwordEncode); userDO.setUserPassword(passwordEncode);
} }
if (ObjectUtil.isNotNull(userDO.getUserAreaCountyId()) && !"0".equals(userDO.getUserAreaCountyId())) { if (ObjectUtil.isNotNull(userDO.getUserAreaCountyId()) && !"0".equals(userDO.getUserAreaCountyId())) {