优化正则

Author: huyibing

server/rarecharacter/src/main/java/com/alipay/rarecharacter/test/NameUtilTest.java

@@ -58,27 +58,48 @@ public void codePointTest() {
 
     @Test
     public void isAllChineseTest() {
+        Assert.assertTrue(NameUtil.isAllChinese("\uD87A\uDDF5")); //韦华 unicode
         Assert.assertTrue(NameUtil.isAllChinese("张"));
         Assert.assertTrue(NameUtil.isAllChinese("张三"));
-        Assert.assertTrue(NameUtil.isAllChinese("张"));
-        Assert.assertTrue(NameUtil.isAllChinese("张"));
-        Assert.assertTrue(NameUtil.isAllChinese("张𮧵"));
-        Assert.assertTrue(NameUtil.isAllChinese(""));
-        Assert.assertTrue(NameUtil.isAllChinese(""));
-        Assert.assertTrue(NameUtil.isAllChinese("𮧵"));
-
-        Assert.assertFalse(NameUtil.isAllChinese("张yan"));
-        Assert.assertFalse(NameUtil.isAllChinese("张1"));
-        Assert.assertFalse(NameUtil.isAllChinese("张yan"));
-        Assert.assertFalse(NameUtil.isAllChinese("zhang san"));
+        Assert.assertTrue(NameUtil.isAllChinese("张是一只小小鸟"));
+        Assert.assertTrue(NameUtil.isAllChinese("䶮")); //龙天 unicode
+        Assert.assertTrue(NameUtil.isAllChinese("")); //龙天 pua
+        Assert.assertTrue(NameUtil.isAllChinese("张\uD87A\uDDF5")); //韦华 unicode
+        Assert.assertTrue(NameUtil.isAllChinese("")); //韦华pua
+        Assert.assertTrue(NameUtil.isAllChinese("张𬱖")); //由页 unicode
+        Assert.assertTrue(NameUtil.isAllChinese("张\uD870\uDF86")); //王莹 unicode
+        Assert.assertTrue(NameUtil.isAllChinese("张\uD87A\uDDF5")); //韦华 unicode
+        Assert.assertTrue(NameUtil.isAllChinese("张"));  //韦华pua
+        Assert.assertTrue(NameUtil.isAllChinese("张䶮")); //龙天 unicode
+        Assert.assertTrue(NameUtil.isAllChinese("张")); //龙天 pua
+        Assert.assertTrue(NameUtil.isAllChinese("张·麦麦提"));
+
+        Assert.assertFalse(NameUtil.isAllChinese("张？"));
+        Assert.assertFalse(NameUtil.isAllChinese("张?"));
         Assert.assertFalse(NameUtil.isAllChinese("张？"));
-        Assert.assertFalse(NameUtil.isAllChinese(""));
+        Assert.assertFalse(NameUtil.isAllChinese("张("));
+        Assert.assertFalse(NameUtil.isAllChinese("张)"));
+        Assert.assertFalse(NameUtil.isAllChinese("张（"));
+        Assert.assertFalse(NameUtil.isAllChinese("张）"));
+        Assert.assertFalse(NameUtil.isAllChinese("张{"));
+        Assert.assertFalse(NameUtil.isAllChinese("张【"));
+        Assert.assertFalse(NameUtil.isAllChinese("张*"));
+        Assert.assertFalse(NameUtil.isAllChinese("张&"));
+        Assert.assertFalse(NameUtil.isAllChinese("张^"));
+        Assert.assertFalse(NameUtil.isAllChinese("张%"));
+        Assert.assertFalse(NameUtil.isAllChinese("张$"));
+        Assert.assertFalse(NameUtil.isAllChinese("张#"));
         Assert.assertFalse(NameUtil.isAllChinese("张@"));
         Assert.assertFalse(NameUtil.isAllChinese("张!"));
-        Assert.assertFalse(NameUtil.isAllChinese("张%"));
-        Assert.assertFalse(NameUtil.isAllChinese("张*"));
-        Assert.assertFalse(NameUtil.isAllChinese("张`"));
         Assert.assertFalse(NameUtil.isAllChinese("张~"));
+        Assert.assertFalse(NameUtil.isAllChinese("张。"));
+        Assert.assertFalse(NameUtil.isAllChinese("张，"));
+        Assert.assertFalse(NameUtil.isAllChinese("张12"));
+        Assert.assertFalse(NameUtil.isAllChinese("张wei"));
+        Assert.assertFalse(NameUtil.isAllChinese("张wei3"));
+        Assert.assertFalse(NameUtil.isAllChinese("张wei3。"));
+        Assert.assertFalse(NameUtil.isAllChinese("123"));
+        Assert.assertFalse(NameUtil.isAllChinese("abc"));
     }
 
     @Test

server/rarecharacter/src/main/java/com/alipay/rarecharacter/util/NameUtil.java

@@ -27,12 +27,12 @@ public class NameUtil {
      * 扩展F	（7473个）	2CEB0-2EBE0
      * 扩展G	（4939个）	30000-3134A
      */
-    public static final Pattern ALL_CHINESE_PATTERN = Pattern.compile("([\u4e00-\u9fa5]|[\u9fa6-\u9fef]|[\u3400-\u4db5]|[\ue000-\uf8ff]|[\\x{20000}-\\x{2A6D6})] |[\\x{2A700}-\\x{2B734})]|[\\x{2B740}-\\x{2B81D})]|[\\x{2B820}-\\x{2CEA1})]|[\\x{2CEB0}-\\x{2EBE0})]|[\\x{30000}-\\x{3134A})])");
+    public static final Pattern ALL_CHINESE_PATTERN = Pattern.compile("([\u00B7]|[\u4e00-\u9fa5]|[\u9fa6-\u9fef]|[\u3400-\u4db5]|[\ue000-\uf8ff]|[\\x{20000}-\\x{2A6D6}] |[\\x{2A700}-\\x{2B734}]|[\\x{2B740}-\\x{2B81D}]|[\\x{2B820}-\\x{2CEA1}]|[\\x{2CEB0}-\\x{2EBE0}]|[\\x{30000}-\\x{3134A}])");
 
     /**
-     * 字符串全部为汉字校验正则
+     * 字符串全部为汉字校验正则（包括少数民族中圆点）
      */
-    public static final Pattern STRING_ALL_CHINESE_PATTERN = Pattern.compile("^([\u4e00-\u9fa5]|[\u9fa6-\u9fef]|[\u3400-\u4db5]|[\ue000-\uf8ff]|[\\x{20000}-\\x{2A6D6})] |[\\x{2A700}-\\x{2B734})]|[\\x{2B740}-\\x{2B81D})]|[\\x{2B820}-\\x{2CEA1})]|[\\x{2CEB0}-\\x{2EBE0})]|[\\x{30000}-\\x{3134A})])+$");
+    public static final Pattern STRING_ALL_CHINESE_PATTERN = Pattern.compile("^([\u00B7]|[\u4e00-\u9fa5]|[\u9fa6-\u9fef]|[\u3400-\u4db5]|[\ue000-\uf8ff]|[\\x{20000}-\\x{2A6D6}] |[\\x{2A700}-\\x{2B734}]|[\\x{2B740}-\\x{2B81D}]|[\\x{2B820}-\\x{2CEA1}]|[\\x{2CEB0}-\\x{2EBE0}]|[\\x{30000}-\\x{3134A}])+$");
 
     /**
      * BMP平面汉字正则
@@ -181,7 +181,7 @@ public static boolean isAllChinese(String in) {
         if (StringUtils.isBlank(in)) {
             return false;
         }
-        return STRING_ALL_CHINESE_PATTERN.matcher(in).find();
+        return STRING_ALL_CHINESE_PATTERN.matcher(in).matches();
     }
 
     /**
@@ -289,20 +289,6 @@ public static boolean isContainOneChinese(String certName) {
         return ALL_CHINESE_PATTERN.matcher(certName).find();
     }
 
-
-    /**
-     * 是否包含PINYIN
-     *
-     * @param certName
-     * @return
-     */
-//    public static boolean isContainPinyin(String certName) {
-//        if (StringUtils.isBlank(certName)) {
-//            return false;
-//        }
-//        return INCLUDE_LETTER_REGEX.matcher(certName).find();
-//    }
-
     /**
      * 是否包含PINYIN
      *