From b04a228a1a5bc0a575dd9e29e515285708b8ca85 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Mon, 16 Oct 2023 21:25:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=AF=86=E7=A0=81=E8=AE=BE=E7=BD=AE=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cnadmin/system/model/request/UpdatePasswordRequest.java | 1 - .../cnadmin/system/service/impl/UserServiceImpl.java | 5 ++++- .../user/center/components/security-settings/update-pwd.vue | 2 ++ .../webapi/controller/system/UserCenterController.java | 4 ++-- .../resources/db/changelog/v1.0.0/continew-admin_data.sql | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdatePasswordRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdatePasswordRequest.java index ba2668fb..2729e5bd 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdatePasswordRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdatePasswordRequest.java @@ -41,7 +41,6 @@ public class UpdatePasswordRequest implements Serializable { */ @Schema(description = "当前密码（加密后）", example = "E7c72TH+LDxKTwavjM99W1MdI9Lljh79aPKiv3XB9MXcplhm7qJ1BJCj28yaflbdVbfc366klMtjLIWQGqb0qw==") - @NotBlank(message = "当前密码不能为空") private String oldPassword; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java index ad6f51a5..3f65b031 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java @@ -200,7 +200,10 @@ public class UserServiceImpl extends BaseServiceImpl { + userStore.getInfo(); handleCancel(); proxy.$message.success(res.msg); }); diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java index 02869519..c177a6eb 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java @@ -78,10 +78,10 @@ public class UserCenterController { public R updatePassword(@Validated @RequestBody UpdatePasswordRequest updatePasswordRequest) { String rawOldPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(updatePasswordRequest.getOldPassword())); - ValidationUtils.throwIfBlank(rawOldPassword, "当前密码解密失败"); + ValidationUtils.throwIfNull(rawOldPassword, "当前密码解密失败"); String rawNewPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(updatePasswordRequest.getNewPassword())); - ValidationUtils.throwIfBlank(rawNewPassword, "新密码解密失败"); + ValidationUtils.throwIfNull(rawNewPassword, "新密码解密失败"); ValidationUtils.throwIf(!ReUtil.isMatch(RegexConsts.PASSWORD, rawNewPassword), "密码长度为 6 到 32 位，可以包含字母、数字、下划线，特殊字符，同时包含字母和数字"); userService.updatePassword(rawOldPassword, rawNewPassword, LoginHelper.getUserId()); diff --git a/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_data.sql b/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_data.sql index 5ba962e9..797f8fe4 100644 --- a/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_data.sql +++ b/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_data.sql @@ -61,8 +61,8 @@ VALUES INSERT IGNORE INTO `sys_user` (`id`, `username`, `nickname`, `password`, `gender`, `email`, `phone`, `avatar`, `description`, `status`, `is_system`, `pwd_reset_time`, `dept_id`, `create_user`, `create_time`, `update_user`, `update_time`) VALUES -(1, 'admin', '超级管理员', '9802815bcc5baae7feb1ae0d0566baf2', 1, 'charles7c@126.com', '18888888888', NULL, '系统初始用户', 1, b'1', NULL, 1, 1, NOW(), NULL, NULL), -(2, 'test', '测试员', '8e114197e1b33783a00542ad67e80516', 2, NULL, NULL, NULL, NULL, 2, b'0', NULL, 5, 1, NOW(), NULL, NULL); +(1, 'admin', '超级管理员', '9802815bcc5baae7feb1ae0d0566baf2', 1, 'charles7c@126.com', '18888888888', NULL, '系统初始用户', 1, b'1', NOW(), 1, 1, NOW(), NULL, NULL), +(2, 'test', '测试员', '8e114197e1b33783a00542ad67e80516', 2, NULL, NULL, NULL, NULL, 2, b'0', NOW(), 5, 1, NOW(), NULL, NULL); -- 初始化默认角色和菜单关联数据 INSERT IGNORE INTO `sys_role_menu`