diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java index 28b01acb..a486e65c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java @@ -75,7 +75,6 @@ public class UserServiceImpl extends BaseServiceImpl 0, "手机号已绑定其他账号,请更换其他手机号"); CheckUtils.throwIfEqual(newPhone, user.getPhone(), "新手机号不能与当前手机号相同"); @@ -224,7 +223,7 @@ public class UserServiceImpl extends BaseServiceImpl 0, "邮箱已绑定其他账号,请更换其他邮箱"); CheckUtils.throwIfEqual(newEmail, user.getEmail(), "新邮箱不能与当前邮箱相同"); diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java index 7dff0eee..3952a0dc 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java @@ -68,7 +68,7 @@ public class UserCenterController { private final UserService userService; private final UserSocialService userSocialService; private final AuthRequestFactory authRequestFactory; - private static final String PASSWORD_DECRYPT_FAILED = "当前密码解密失败"; + private static final String DECRYPT_FAILED = "当前密码解密失败"; private static final String CAPTCHA_EXPIRED = "验证码已失效"; @Operation(summary = "上传头像", description = "用户上传个人头像") @@ -91,7 +91,7 @@ public class UserCenterController { public R updatePassword(@Validated @RequestBody UserPasswordUpdateReq updateReq) { String rawOldPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(updateReq .getOldPassword())); - ValidationUtils.throwIfNull(rawOldPassword, PASSWORD_DECRYPT_FAILED); + ValidationUtils.throwIfNull(rawOldPassword, DECRYPT_FAILED); String rawNewPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(updateReq .getNewPassword())); ValidationUtils.throwIfNull(rawNewPassword, "新密码解密失败"); @@ -106,7 +106,7 @@ public class UserCenterController { public R updatePhone(@Validated @RequestBody UserPhoneUpdateReq updateReq) { String rawCurrentPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(updateReq .getCurrentPassword())); - ValidationUtils.throwIfBlank(rawCurrentPassword, PASSWORD_DECRYPT_FAILED); + ValidationUtils.throwIfBlank(rawCurrentPassword, DECRYPT_FAILED); String captchaKey = CacheConstants.CAPTCHA_KEY_PREFIX + updateReq.getNewPhone(); String captcha = RedisUtils.get(captchaKey); ValidationUtils.throwIfBlank(captcha, CAPTCHA_EXPIRED); @@ -121,7 +121,7 @@ public class UserCenterController { public R updateEmail(@Validated @RequestBody UserEmailUpdateRequest updateReq) { String rawCurrentPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(updateReq .getCurrentPassword())); - ValidationUtils.throwIfBlank(rawCurrentPassword, PASSWORD_DECRYPT_FAILED); + ValidationUtils.throwIfBlank(rawCurrentPassword, DECRYPT_FAILED); String captchaKey = CacheConstants.CAPTCHA_KEY_PREFIX + updateReq.getNewEmail(); String captcha = RedisUtils.get(captchaKey); ValidationUtils.throwIfBlank(captcha, CAPTCHA_EXPIRED);