Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-04-07 89c6943973621c6dfc23844999245cc35ee477b4

 screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java

@@ -291,7 +291,7 @@
        }
        //正则校验密码
        String password = user.getPassword();
        if (password != null) {

            //密码解密
            //password = AESUtils.decrypt(password, AESKey);
            if (!RegexUtils.checkPassword(password)) {
@@ -299,7 +299,7 @@
                result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
                return result;
            }
        }

        //正则校验手机号
        if (user.getMobile() != null && !RegexUtils.checkMobile(user.getMobile())) {
            result.put("code", ResponseCodeEnum.MOBILE_INVALID.getCode());