From 528059f2580a1418a23b1f3effe55cd74c5b0445 Mon Sep 17 00:00:00 2001
From: Kimi Liu <839536@qq.com>
Date: Thu, 7 Jul 2022 16:42:08 +0800
Subject: [PATCH 1/2] v6.5.3
---
bus-gitlab/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/bus-gitlab/pom.xml b/bus-gitlab/pom.xml
index 77d6c78b08..4a0a07e23c 100755
--- a/bus-gitlab/pom.xml
+++ b/bus-gitlab/pom.xml
@@ -57,26 +57,31 @@
org.glassfish.jersey.inject
jersey-hk2
${jersey.version}
+ true
org.glassfish.jersey.core
jersey-client
${jersey.version}
+ true
org.glassfish.jersey.connectors
jersey-apache-connector
${jersey.version}
+ true
org.glassfish.jersey.media
jersey-media-multipart
${jersey.version}
+ true
org.glassfish.jersey.media
jersey-media-json-jackson
${jersey.version}
+ true
jakarta.servlet
From 6b5789c08a4ecb71683f14c2437f74ea2c939b9b Mon Sep 17 00:00:00 2001
From: Kimi Liu <839536@qq.com>
Date: Thu, 7 Jul 2022 17:48:24 +0800
Subject: [PATCH 2/2] v6.5.3
---
.../org/aoju/bus/core/lang/Validator.java | 29 +++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java
index badbc12918..3676f09755 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java
@@ -1150,4 +1150,33 @@ public static T validateCarDrivingLicence(T value, Stri
return value;
}
+ /**
+ * 验证是否符合密码要求
+ *
+ * @param value 值
+ * @param weak 是否弱密码
+ * @return 否符合密码要求
+ */
+ public static boolean isPassword(String value, boolean... weak) {
+ boolean result = false;
+ for (final boolean element : weak) {
+ result ^= element;
+ }
+ return result ? isMatchRegex(RegEx.PASSWORD_WEAK, value) : isMatchRegex(RegEx.PASSWORD_STRONG, value);
+ }
+
+ /**
+ * 验证是是否符合密码要求
+ *
+ * @param value 值
+ * @param errorMsg 验证错误的信息
+ * @param weak 是否弱密码
+ * @throws ValidateException 验证异常
+ */
+ public static void validatePassword(String value, String errorMsg, boolean... weak) throws ValidateException {
+ if (false == isPassword(value, weak)) {
+ throw new ValidateException(errorMsg);
+ }
+ }
+
}