From 2b4f70f88dafd3ba500c2557f55cd02c48d58b46 Mon Sep 17 00:00:00 2001 From: looly Date: Mon, 20 Dec 2021 09:34:14 +0800 Subject: [PATCH] fix bug --- CHANGELOG.md | 3 ++- .../src/main/java/cn/hutool/core/text/PasswdStrength.java | 2 +- .../test/java/cn/hutool/core/text/PasswdStrengthTest.java | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9a751e2f..4779d58af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------------------------------------- -# 5.7.18 (2021-12-17) +# 5.7.18 (2021-12-20) ### 🐣新特性 * 【core 】 新增CollStreamUtil.groupKeyValue(pr#479@Gitee) @@ -18,6 +18,7 @@ * 【core 】 修复CharSequenceUtil.replace问题(issue#I4M16G@Gitee) * 【json 】 修复JSONObject 初始化大小值未被使用问题(issue#2016@Github) * 【core 】 修复StrUtil.startWith都为null返回错误问题(issue#I4MV7Q@Gitee) +* 【core 】 修复PasswdStrength检测问题(issue#I4N48X@Gitee) ------------------------------------------------------------------------------------------------------------- # 5.7.17 (2021-12-09) diff --git a/hutool-core/src/main/java/cn/hutool/core/text/PasswdStrength.java b/hutool-core/src/main/java/cn/hutool/core/text/PasswdStrength.java index c104ed75b..d4805738b 100755 --- a/hutool-core/src/main/java/cn/hutool/core/text/PasswdStrength.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/PasswdStrength.java @@ -159,7 +159,7 @@ public class PasswdStrength { } } - if (StrUtil.isNumeric(passwd) && len >= 6) { // 19881010 or 881010 + if (StrUtil.isNumeric(passwd) && len >= 6 && len <= 8) { // 19881010 or 881010 int year = 0; if (len == 8 || len == 6) { year = Integer.parseInt(passwd.substring(0, len - 4)); diff --git a/hutool-core/src/test/java/cn/hutool/core/text/PasswdStrengthTest.java b/hutool-core/src/test/java/cn/hutool/core/text/PasswdStrengthTest.java index a775805fb..edc863868 100755 --- a/hutool-core/src/test/java/cn/hutool/core/text/PasswdStrengthTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/text/PasswdStrengthTest.java @@ -9,4 +9,10 @@ public class PasswdStrengthTest { String passwd = "2hAj5#mne-ix.86H"; Assert.assertEquals(13, PasswdStrength.check(passwd)); } + + @Test + public void strengthNumberTest(){ + String passwd = "9999999999999"; + Assert.assertEquals(0, PasswdStrength.check(passwd)); + } }