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

kaiyu

2021-03-18 1ec0374d08be45c6c6854705211dbd6c067dfab7

 screen-common/src/main/java/com/moral/util/RegexUtils.java

@@ -12,8 +12,12 @@
     * @return 证成功返回true，验证失败返回false
     */
    public static boolean checkAccount(String account) {
        String regex = "[a-zA-Z]\\w{3,19}";
        String regex = "[a-zA-Z]\\w{2,19}";
        return account.matches(regex);
    }

    public static void main(String[] args) {

    }

    /**
@@ -23,7 +27,7 @@
     * @return 证成功返回true，验证失败返回false
     */
    public static boolean checkPassword(String password) {
        String regex = "[0-9a-zA-Z_]\\w{3,19}";
        String regex = "[0-9a-zA-Z_]\\w{2,19}";
        return password.matches(regex);
    }