tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!32 fix:在个人中心修改密码确认密码字段不存在

Browse Source 
Merge pull request !32 from end/master
This commit is contained in:
坏小村
2025-06-06 08:45:43 +00:00
committed by Gitee
parent d257cb6b7d 42e25a0e58
commit 4c492784f3
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/youlai/boot/system/model/form/PasswordUpdateForm.java
View File

@@ -19,4 +19,6 @@ public class PasswordUpdateForm {
@Schema(description = "新密码") @Schema(description = "新密码")
private String newPassword; private String newPassword;
@Schema(description = "确认密码")
private String confirmPassword;
} }

9
src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
View File

@@ -12,8 +12,9 @@ import com.youlai.boot.common.constant.RedisConstants;
import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.common.constant.SystemConstants;
import com.youlai.boot.common.exception.BusinessException; import com.youlai.boot.common.exception.BusinessException;
import com.youlai.boot.common.model.Option; import com.youlai.boot.common.model.Option;
import com.youlai.boot.core.security.token.TokenManager; import com.youlai.boot.core.security.model.UserAuthCredentials;
import com.youlai.boot.core.security.service.PermissionService; import com.youlai.boot.core.security.service.PermissionService;
import com.youlai.boot.core.security.token.TokenManager;
import com.youlai.boot.core.security.util.SecurityUtils; import com.youlai.boot.core.security.util.SecurityUtils;
import com.youlai.boot.shared.mail.service.MailService; import com.youlai.boot.shared.mail.service.MailService;
import com.youlai.boot.shared.sms.enums.SmsTypeEnum; import com.youlai.boot.shared.sms.enums.SmsTypeEnum;
@@ -22,7 +23,6 @@ import com.youlai.boot.system.converter.UserConverter;
import com.youlai.boot.system.enums.DictCodeEnum; import com.youlai.boot.system.enums.DictCodeEnum;
import com.youlai.boot.system.mapper.UserMapper; import com.youlai.boot.system.mapper.UserMapper;
import com.youlai.boot.system.model.bo.UserBO; import com.youlai.boot.system.model.bo.UserBO;
import com.youlai.boot.core.security.model.UserAuthCredentials;
import com.youlai.boot.system.model.dto.CurrentUserDTO; import com.youlai.boot.system.model.dto.CurrentUserDTO;
import com.youlai.boot.system.model.dto.UserExportDTO; import com.youlai.boot.system.model.dto.UserExportDTO;
import com.youlai.boot.system.model.entity.DictItem; import com.youlai.boot.system.model.entity.DictItem;
@@ -510,6 +510,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
throw new BusinessException("新密码不能与原密码相同"); throw new BusinessException("新密码不能与原密码相同");
} }
// 判断新密码和确认密码是否一致
if (passwordEncoder.matches(data.getNewPassword(), data.getConfirmPassword())) {
throw new BusinessException("新密码和确认密码不一致");
}
String newPassword = data.getNewPassword(); String newPassword = data.getNewPassword();
boolean result = this.update(new LambdaUpdateWrapper<User>() boolean result = this.update(new LambdaUpdateWrapper<User>()
.eq(User::getId, userId) .eq(User::getId, userId)