ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复IdcardUtil.isValidHKCard校验问题

Browse Source
This commit is contained in:
Looly 2024-07-30 16:00:40 +08:00
parent 46e2d3982e
commit c4dd255a1d
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hutool-core/src/main/java/org/dromara/hutool/core/data/IdcardUtil.java
View File

@ -296,6 +296,10 @@ public class IdcardUtil {
if (StrUtil.isBlank(idcard)) { if (StrUtil.isBlank(idcard)) {
return false; return false;
} }
if(false == idcard.matches("^[A-Z]{1,2}[0-9]{6}\\(?[0-9A]\\)?$")){
return false;
}
String card = idcard.replaceAll("[()]", ""); String card = idcard.replaceAll("[()]", "");
int sum; int sum;
if (card.length() == 9) { if (card.length() == 9) {

46
hutool-core/src/test/java/org/dromara/hutool/core/data/IdcardUtilTest.java
View File

@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test;
import java.util.Date; import java.util.Date;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.*;
/** /**
* 身份证单元测试 * 身份证单元测试
@ -42,15 +42,15 @@ public class IdcardUtilTest {
// 无效 // 无效
String idCard = "360198910283844"; String idCard = "360198910283844";
Assertions.assertFalse(IdcardUtil.isValidCard(idCard)); assertFalse(IdcardUtil.isValidCard(idCard));
// 生日无效 // 生日无效
idCard = "201511221897205960"; idCard = "201511221897205960";
Assertions.assertFalse(IdcardUtil.isValidCard(idCard)); assertFalse(IdcardUtil.isValidCard(idCard));
// 生日无效 // 生日无效
idCard = "815727834224151"; idCard = "815727834224151";
Assertions.assertFalse(IdcardUtil.isValidCard(idCard)); assertFalse(IdcardUtil.isValidCard(idCard));
} }
@Test @Test
@ -129,67 +129,75 @@ public class IdcardUtilTest {
@Test @Test
public void isValidCard18Test(){ public void isValidCard18Test(){
boolean isValidCard18 = IdcardUtil.isValidCard18("3301022011022000D6"); boolean isValidCard18 = IdcardUtil.isValidCard18("3301022011022000D6");
Assertions.assertFalse(isValidCard18); assertFalse(isValidCard18);
// 不忽略大小写情况下，X严格校验必须大写 // 不忽略大小写情况下，X严格校验必须大写
isValidCard18 = IdcardUtil.isValidCard18("33010219200403064x", false); isValidCard18 = IdcardUtil.isValidCard18("33010219200403064x", false);
Assertions.assertFalse(isValidCard18); assertFalse(isValidCard18);
isValidCard18 = IdcardUtil.isValidCard18("33010219200403064X", false); isValidCard18 = IdcardUtil.isValidCard18("33010219200403064X", false);
Assertions.assertTrue(isValidCard18); assertTrue(isValidCard18);
// 非严格校验下大小写皆可 // 非严格校验下大小写皆可
isValidCard18 = IdcardUtil.isValidCard18("33010219200403064x"); isValidCard18 = IdcardUtil.isValidCard18("33010219200403064x");
Assertions.assertTrue(isValidCard18); assertTrue(isValidCard18);
isValidCard18 = IdcardUtil.isValidCard18("33010219200403064X"); isValidCard18 = IdcardUtil.isValidCard18("33010219200403064X");
Assertions.assertTrue(isValidCard18); assertTrue(isValidCard18);
// 香港人在大陆身份证 // 香港人在大陆身份证
isValidCard18 = IdcardUtil.isValidCard18("81000019980902013X"); isValidCard18 = IdcardUtil.isValidCard18("81000019980902013X");
Assertions.assertTrue(isValidCard18); assertTrue(isValidCard18);
// 澳门人在大陆身份证 // 澳门人在大陆身份证
isValidCard18 = IdcardUtil.isValidCard18("820000200009100032"); isValidCard18 = IdcardUtil.isValidCard18("820000200009100032");
Assertions.assertTrue(isValidCard18); assertTrue(isValidCard18);
// 台湾人在大陆身份证 // 台湾人在大陆身份证
isValidCard18 = IdcardUtil.isValidCard18("830000200209060065"); isValidCard18 = IdcardUtil.isValidCard18("830000200209060065");
Assertions.assertTrue(isValidCard18); assertTrue(isValidCard18);
// 身份证允许调用为空null // 身份证允许调用为空null
isValidCard18 = !IdcardUtil.isValidCard18(null); isValidCard18 = !IdcardUtil.isValidCard18(null);
Assertions.assertTrue(isValidCard18); assertTrue(isValidCard18);
} }
@Test @Test
public void isValidHKCardIdTest(){ public void isValidHKCardIdTest(){
final String hkCard="P174468(6)"; final String hkCard="P174468(6)";
final boolean flag=IdcardUtil.isValidHKCard(hkCard); final boolean flag=IdcardUtil.isValidHKCard(hkCard);
Assertions.assertTrue(flag); assertTrue(flag);
} }
@Test @Test
public void isValidTWCardIdTest() { public void isValidTWCardIdTest() {
final String twCard = "B221690311"; final String twCard = "B221690311";
boolean flag = IdcardUtil.isValidTWCard(twCard); boolean flag = IdcardUtil.isValidTWCard(twCard);
Assertions.assertTrue(flag); assertTrue(flag);
final String errTwCard1 = "M517086311"; final String errTwCard1 = "M517086311";
flag = IdcardUtil.isValidTWCard(errTwCard1); flag = IdcardUtil.isValidTWCard(errTwCard1);
Assertions.assertFalse(flag); assertFalse(flag);
final String errTwCard2 = "B2216903112"; final String errTwCard2 = "B2216903112";
flag = IdcardUtil.isValidTWCard(errTwCard2); flag = IdcardUtil.isValidTWCard(errTwCard2);
Assertions.assertFalse(flag); assertFalse(flag);
} }
@Test @Test
void foreignTest() { void foreignTest() {
// 新版外国人永久居留身份证号码 // 新版外国人永久居留身份证号码
final String FOREIGN_ID_18 = "932682198501010017"; final String FOREIGN_ID_18 = "932682198501010017";
Assertions.assertTrue(IdcardUtil.isValidCard(FOREIGN_ID_18)); assertTrue(IdcardUtil.isValidCard(FOREIGN_ID_18));
final Date date = DateUtil.parse("2017-04-10"); final Date date = DateUtil.parse("2017-04-10");
assertEquals(IdcardUtil.getAge(FOREIGN_ID_18, date), 32); assertEquals(IdcardUtil.getAge(FOREIGN_ID_18, date), 32);
// 新版外国人永久居留身份证 // 新版外国人永久居留身份证
Assertions.assertTrue(IdcardUtil.isValidCard18("932682198501010017")); assertTrue(IdcardUtil.isValidCard18("932682198501010017"));
}
@Test
public void issueIAFOLITest() {
final String idcard = "H01487002";
assertFalse(IdcardUtil.isValidHKCard(idcard));
assertNull(IdcardUtil.isValidCard10(idcard));
assertFalse(IdcardUtil.isValidCard(idcard));
} }
} }