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

fix code

Browse Source
This commit is contained in:
Looly 2024-03-29 11:58:47 +08:00
parent 69b3138b1b
commit d41a22a458
3 changed files with 17 additions and 5 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/CIN.java
View File

@ -317,8 +317,8 @@ public class CIN {
return false; return false;
} }
// 省份 // 截取省份代码。新版外国人永久居留身份证以9开头，第二三位是受理地代码
final String proCode = idCard.substring(0, 2); final String proCode = StrUtil.startWith(idCard, '9') ? idCard.substring(1, 3): idCard.substring(0, 2);
if (null == CITY_CODES.get(proCode)) { if (null == CITY_CODES.get(proCode)) {
return false; return false;
} }

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

@ -164,4 +164,17 @@ public class IdcardUtilTest {
flag = IdcardUtil.isValidTWCard(errTwCard2); flag = IdcardUtil.isValidTWCard(errTwCard2);
Assertions.assertFalse(flag); Assertions.assertFalse(flag);
} }
@Test
void foreignTest() {
// 新版外国人永久居留身份证号码
final String FOREIGN_ID_18 = "932682198501010017";
Assertions.assertTrue(IdcardUtil.isValidCard(FOREIGN_ID_18));
final DateTime date = DateUtil.parse("2017-04-10");
Assertions.assertEquals(IdcardUtil.getAge(FOREIGN_ID_18, date), 32);
// 新版外国人永久居留身份证
Assertions.assertTrue(IdcardUtil.isValidCard18("932682198501010017"));
}
} }

5
hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/matcher/PatternMatcher.java
View File

@ -13,7 +13,6 @@
package org.dromara.hutool.cron.pattern.matcher; package org.dromara.hutool.cron.pattern.matcher;
import org.dromara.hutool.core.date.DateUtil; import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.lang.Console;
import org.dromara.hutool.cron.pattern.Part; import org.dromara.hutool.cron.pattern.Part;
import java.time.Year; import java.time.Year;
@ -202,7 +201,7 @@ public class PatternMatcher {
if (i == Part.DAY_OF_MONTH.ordinal()) { if (i == Part.DAY_OF_MONTH.ordinal()) {
final boolean isLeapYear = DateUtil.isLeapYear(newValues[Part.YEAR.ordinal()]); final boolean isLeapYear = DateUtil.isLeapYear(newValues[Part.YEAR.ordinal()]);
final int month = values[Part.MONTH.ordinal()]; final int month = newValues[Part.MONTH.ordinal()];
nextValue = ((DayOfMonthMatcher) matchers[i]).nextAfter(values[i], month, isLeapYear); nextValue = ((DayOfMonthMatcher) matchers[i]).nextAfter(values[i], month, isLeapYear);
} else { } else {
nextValue = matchers[i].nextAfter(values[i]); nextValue = matchers[i].nextAfter(values[i]);
@ -235,7 +234,7 @@ public class PatternMatcher {
if (i == Part.DAY_OF_MONTH.ordinal()) { if (i == Part.DAY_OF_MONTH.ordinal()) {
final boolean isLeapYear = DateUtil.isLeapYear(newValues[Part.YEAR.ordinal()]); final boolean isLeapYear = DateUtil.isLeapYear(newValues[Part.YEAR.ordinal()]);
final int month = values[Part.MONTH.ordinal()]; final int month = newValues[Part.MONTH.ordinal()];
nextValue = ((DayOfMonthMatcher) matchers[i]).nextAfter(values[i] + 1, month, isLeapYear); nextValue = ((DayOfMonthMatcher) matchers[i]).nextAfter(values[i] + 1, month, isLeapYear);
} else { } else {
nextValue = matchers[i].nextAfter(values[i] + 1); nextValue = matchers[i].nextAfter(values[i] + 1);