Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

3 天以前 28d2b0a2b33c786670f4999e4b634036de2d6883

 server/system_service/src/main/java/com/doumee/core/utils/PwdCheckUtil.java

@@ -65,14 +65,14 @@
    }

    public static void main(String[] args) {
        checkPassword("fasdagd");
        checkPassword("41234123");
        checkPassword("#$%^&&*(");
        checkPassword("fasd$$");
        checkPassword("41234%%%");
        checkPassword("fasd41^(324");
        checkPassword("fa413%^&*");
        checkPassword("&%fa413%^&*");
        checkPassword("123456a");
//        checkPassword("41234123");
//        checkPassword("#$%^&&*(");
//        checkPassword("fasd$$");
//        checkPassword("41234%%%");
//        checkPassword("fasd41^(324");
//        checkPassword("fa413%^&*");
//        checkPassword("&%fa413%^&*");
    }

}