bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-05-17 14:27:48 +08:00
parent a71a21d070 25089dac0a
commit e33e2c8094
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java
View File

@ -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<String> roles = permissionService.getRolePermission(user);

12
sgzb-ui/src/views/system/user/profile/resetPwd.vue
View File

@ -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" },