diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java index 29c2af4e..3a0accbd 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java @@ -171,12 +171,9 @@ public class SysUserController extends BaseController { * * @return 用户信息 */ - @GetMapping("getInfo") + @GetMapping("/getInfo") public AjaxResult getInfo() { if (SecurityUtils.getLoginUser() != null) { - System.out.println(SecurityUtils.getLoginUser()); - System.out.println("===================================="); - System.out.println(SecurityUtils.getLoginUser().getSysUser().getUserId()); SysUser user = userService.selectUserById(SecurityUtils.getLoginUser().getSysUser().getUserId()); // 角色集合 Set roles = permissionService.getRolePermission(user); diff --git a/sgzb-ui/src/views/system/user/profile/resetPwd.vue b/sgzb-ui/src/views/system/user/profile/resetPwd.vue index 64e8f8c4..402b9d6e 100644 --- a/sgzb-ui/src/views/system/user/profile/resetPwd.vue +++ b/sgzb-ui/src/views/system/user/profile/resetPwd.vue @@ -21,6 +21,16 @@ import { updateUserPwd } from "@/api/system/user"; export default { data() { + const passwordRegex = (rule, value, callback) => { + const reg = /^((?=.*[A-Za-z])(?=.*\d)|(?=.*[A-Za-z])(?=.*[!@#$%^&*()_+\-\=])|(?=.*\d)(?=.*[!@#$%^&*()_+\-\=]))[A-Za-z\d!@#$%^&*()_+\-\=]{8,20}$/ + if (value.length < 8 || value.length > 20) { + callback(new Error("密码长度在 8 到 20 个字符")); + } else if (!reg.test(value)) { + callback(new Error("密码须包含数字、字母、特殊符号中的两种以上")); + } else { + callback() + } + } const equalToPassword = (rule, value, callback) => { if (this.user.newPassword !== value) { callback(new Error("两次输入的密码不一致")); @@ -41,7 +51,7 @@ export default { ], newPassword: [ { required: true, message: "新密码不能为空", trigger: "blur" }, - { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" } + { required: true, validator: passwordRegex, trigger: "blur" } ], confirmPassword: [ { required: true, message: "确认密码不能为空", trigger: "blur" },