diff --git a/src/main/java/com/youlai/boot/system/model/form/PasswordUpdateForm.java b/src/main/java/com/youlai/boot/system/model/form/PasswordUpdateForm.java index 453207a2..aaab86d7 100644 --- a/src/main/java/com/youlai/boot/system/model/form/PasswordUpdateForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/PasswordUpdateForm.java @@ -19,4 +19,6 @@ public class PasswordUpdateForm { @Schema(description = "新密码") private String newPassword; + @Schema(description = "确认密码") + private String confirmPassword; } diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java index d950ffa9..5a8a6f42 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java @@ -12,8 +12,9 @@ import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.common.exception.BusinessException; 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.token.TokenManager; import com.youlai.boot.core.security.util.SecurityUtils; import com.youlai.boot.shared.mail.service.MailService; 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.mapper.UserMapper; 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.UserExportDTO; import com.youlai.boot.system.model.entity.DictItem; @@ -398,6 +398,11 @@ public class UserServiceImpl extends ServiceImpl implements Us throw new BusinessException("新密码不能与原密码相同"); } + // 判断新密码和确认密码是否一致 + if (passwordEncoder.matches(data.getNewPassword(), data.getConfirmPassword())) { + throw new BusinessException("新密码和确认密码不一致"); + } + String newPassword = data.getNewPassword(); boolean result = this.update(new LambdaUpdateWrapper() .eq(User::getId, userId)