From 0194adc794e4c29abf3018524b8a00419828c6fc Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Tue, 3 Feb 2026 14:30:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=90=8E?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=94=A8=E6=96=B0=E5=AF=86=E7=A0=81=E7=99=BB?= =?UTF-8?q?=E5=BD=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/application/service/UserApplicationService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java index 2fa47fdc6..894fc935e 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java @@ -113,6 +113,7 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; +import static com.mhd.common.core.utils.AESUtil.decrypt; import static com.mhd.common.core.utils.PageUtils.startPage; @Service @@ -1820,14 +1821,18 @@ public class UserApplicationService { userDO.setUserAccountType(userPo.getUserAccountType()); CheckDO checkDO = userFactory.getCheckDo(userDO); checkDO.setDataSources(userPo.getDataSources()); + if (StringUtils.isNotEmpty(userDO.getUserPassword()) && userDO.getUserPassword().equals(userPo.getUserPassword())){ + userDO.setUserPassword(null); + } //用户密码传值 if (StringUtils.isNotEmpty(userDO.getUserPassword())) { String userPassword = userDO.getUserPassword(); - checkDO.setUserPassword(userPassword); + String decrypt = decrypt(userPassword);//解密 + checkDO.setUserPassword(decrypt); // 生成随机8位数盐 String salt = userPo.getUserSalt(); //加密算法，PBEWithMD5AndDES， - String passwordEncode = PasswordUtil.encrypt(userDO.getUserAccount(), userPassword, salt); + String passwordEncode = PasswordUtil.encrypt(userDO.getUserAccount(), decrypt, salt); userDO.setUserPassword(passwordEncode); } if (ObjectUtil.isNotNull(userDO.getUserAreaCountyId()) && !"0".equals(userDO.getUserAreaCountyId())) {