ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

!848 【轻量级pr】V6 isValidCard18增加：idcard是的null的判断

Browse Source 
Merge pull request !848 from dazer007/v6-dev-isValidCard18-null-deal
This commit is contained in:
Looly 2022-10-22 08:45:39 +00:00 committed by Gitee
commit c2c2ab0fde
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
View File

@ -274,7 +274,7 @@ public class IdcardUtil {
* @since 5.5.7 * @since 5.5.7
*/ */
public static boolean isValidCard18(final String idcard, final boolean ignoreCase) { public static boolean isValidCard18(final String idcard, final boolean ignoreCase) {
if (CHINA_ID_MAX_LENGTH != idcard.length()) { if (StrUtil.isBlank(idcard) || CHINA_ID_MAX_LENGTH != idcard.length()) {
return false; return false;
} }
@ -307,7 +307,7 @@ public class IdcardUtil {
* @return 是否合法 * @return 是否合法
*/ */
public static boolean isValidCard15(final String idcard) { public static boolean isValidCard15(final String idcard) {
if (CHINA_ID_MIN_LENGTH != idcard.length()) { if (StrUtil.isBlank(idcard) || CHINA_ID_MIN_LENGTH != idcard.length()) {
return false; return false;
} }
if (ReUtil.isMatch(PatternPool.NUMBERS, idcard)) { if (ReUtil.isMatch(PatternPool.NUMBERS, idcard)) {
@ -410,6 +410,9 @@ public class IdcardUtil {
* @return 验证码是否符合 * @return 验证码是否符合
*/ */
public static boolean isValidHKCard(final String idcard) { public static boolean isValidHKCard(final String idcard) {
if (StrUtil.isBlank(idcard)) {
return false;
}
String card = idcard.replaceAll("[()]", ""); String card = idcard.replaceAll("[()]", "");
int sum; int sum;
if (card.length() == 9) { if (card.length() == 9) {

4
hutool-core/src/test/java/cn/hutool/core/util/IdcardUtilTest.java
View File

@ -127,6 +127,10 @@ public class IdcardUtilTest {
// 台湾人在大陆身份证 // 台湾人在大陆身份证
isValidCard18 = IdcardUtil.isValidCard18("830000200209060065"); isValidCard18 = IdcardUtil.isValidCard18("830000200209060065");
Assert.assertTrue(isValidCard18); Assert.assertTrue(isValidCard18);
// 身份证允许调用为空null
isValidCard18 = !IdcardUtil.isValidCard18(null);
Assert.assertTrue(isValidCard18);
} }
@Test @Test