Merge remote-tracking branch 'origin/dev/one' into dev/one

common/src/main/java/com/diagbot/util/RegexValidateUtil.java

@@ -37,7 +37,7 @@ public class RegexValidateUtil {
     public static boolean checkMobileNumber(String mobileNumber) {
         boolean flag = false;
         try {
-            Pattern regex = Pattern.compile("^(((13[0-9])|(15([0-3]|[5-9]))|(18[0,5-9]))\\d{8})|(0\\d{2}-\\d{8})|(0\\d{3}-\\d{7})$");
+            Pattern regex = Pattern.compile("^((13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\\d{8})|(0\\d{2}-\\d{8})|(0\\d{3}-\\d{7})$");
             Matcher matcher = regex.matcher(mobileNumber);
             flag = matcher.matches();
         } catch (Exception e) {
@@ -66,14 +66,15 @@ public class RegexValidateUtil {
     }
 
     public static void main(String[] args) {
-        System.out.println(checkEmail("14_8@qw.df"));
+//        System.out.println(checkEmail("14_8@qw.df"));
         System.out.println(checkMobileNumber("139247001"));
         System.out.println(checkMobileNumber("13529600202"));
-        System.out.println(checkPassWord("13529600202"));
-        System.out.println(checkPassWord("12345"));
-        System.out.println(checkPassWord("12345678"));
-        System.out.println(checkPassWord("AAAAAAAA"));
-        System.out.println(checkPassWord("1234567890abcdefg"));
-        System.out.println(checkPassWord("123456AA33q"));
+//        System.out.println(checkPassWord("13529600202"));
+//        System.out.println(checkPassWord("12345"));
+//        System.out.println(checkPassWord("12345678"));
+//        System.out.println(checkPassWord("AAAAAAAA"));
+//        System.out.println(checkPassWord("1234567890abcdefg"));
+//        System.out.println(checkPassWord("123456AA33q"));
+        System.out.println(checkMobileNumber("18234686106"));
     }
 }