From df30c88c2c76da0cb607bcf129446f43c9a521da Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 09 Oct 2025 02:51:02 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
index d64eae3..165e02c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
@@ -15,6 +15,7 @@
import com.ruoyi.im.service.ImApiServcie;
import com.ruoyi.im.util.ConverterUtil;
import com.ruoyi.im.util.PhoneNumberValidatorUtil;
+import com.ruoyi.im.util.SymmetricCryptoUtil;
import com.ruoyi.system.domain.UserAccount;
import com.ruoyi.system.domain.vo.UserAccountUpdateVo;
import com.ruoyi.system.domain.vo.UserAccountVo;
@@ -243,15 +244,28 @@
public AjaxResult updateUserAccount(UserAccountUpdateVo vo) {
try {
- UserAccount userAccount = userAccountService.getById(vo.getId());
+ UserAccount userAccount = userAccountService.getOne(new LambdaQueryWrapper<UserAccount>()
+ .eq(UserAccount::getAccount,vo.getAccount())
+ );
if(ObjectUtil.isEmpty(userAccount)){
return AjaxResult.error("会员不存在！");
}
- PhoneNumberValidatorUtil.ValidationResult result = PhoneNumberValidatorUtil.validatePhoneNumber(vo.getPhoneNumber());
- if(!result.isValid()){
- return AjaxResult.error("手机号格式不正确！");
+ if(StringUtils.isNotEmpty(vo.getPhoneNumber())){
+ PhoneNumberValidatorUtil.ValidationResult result = PhoneNumberValidatorUtil.validatePhoneNumber(vo.getPhoneNumber());
+ if(!result.isValid()){
+ return AjaxResult.error("手机号格式不正确！");
+ }
}
- vo.setAccountId(userAccount.getCloudMessageAccount());
+ if(StringUtils.isNotEmpty(vo.getPassword()) && StringUtils.isEmpty(vo.getOldPassword())){
+ return AjaxResult.error("旧密码不能为空！");
+ }
+ if(StringUtils.isNotEmpty(vo.getPassword())){
+ String s = SymmetricCryptoUtil.decryptPassword(userAccount.getPassword());
+ if(!vo.getOldPassword().equals(s)){
+ return AjaxResult.error("旧密码不正确！");
+ }
+ }
+ vo.setAccount(userAccount.getCloudMessageAccount());
return imApiServcie.updateUserAccount(vo);
}catch (Exception e){
e.printStackTrace();
@@ -275,7 +289,7 @@
if(StringUtils.isEmpty(dto.getPassword())){
return Result.error("密码不能为空");
}
- if(StringUtils.isEmpty(dto.getNickname())){
+ if(StringUtils.isEmpty(dto.getNikeName())){
return Result.error("昵称不能为空");
}
}else if (dto.getType() == 1){
--
Gitblit v1.9.3