Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDr...

puzhibing

2023-07-26 709a4a10be56952ead6340e4822fce41a66e47cd

 management/guns-admin/src/main/webapp/static/modular/system/user/user_info.js

@@ -34,10 +34,10 @@
                    field: 'rePassword',
                    message: '两次密码不一致'
                },
                regexp: {
                    regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
                    message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
                },
                // regexp: {
                //     regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
                //     message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
                // },
            }
        },
        rePassword: {
@@ -49,10 +49,10 @@
                    field: 'password',
                    message: '两次密码不一致'
                },
                regexp: {
                    regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
                    message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
                },
                // regexp: {
                //     regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
                //     message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
                // },
            }
        }
    }
@@ -298,11 +298,11 @@
        Feng.error("新密码不能和原始密码相同");
        return
    }
    let patt = /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/;
    if(!patt.test(newPwd)){
        Feng.error("密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符");
        return
    }
    // let patt = /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/;
    // if(!patt.test(newPwd)){
    //     Feng.error("密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符");
    //     return
    // }
    var ajax = new $ax(Feng.ctxPath + "/mgr/changePwd", function (data) {
        Feng.success("修改成功!");
    }, function (data) {