From 9a2cfe36909fc1da1cc0f550a33d3c79a7318bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=BF=98=E5=88=9D=E5=BF=83?= Date: Wed, 25 Nov 2020 13:17:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?crypto=20=E7=9A=84=20Padding=20=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E6=96=B0=E5=A2=9E=20PKCS7Padding=20=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hutool-crypto/src/main/java/cn/hutool/crypto/Padding.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/Padding.java b/hutool-crypto/src/main/java/cn/hutool/crypto/Padding.java index 63fbfb97c..b9237ec37 100644 --- a/hutool-crypto/src/main/java/cn/hutool/crypto/Padding.java +++ b/hutool-crypto/src/main/java/cn/hutool/crypto/Padding.java @@ -23,5 +23,10 @@ public enum Padding { OAEPPadding, PKCS1Padding, PKCS5Padding, + /** + * 注意需要引入对应jar 包 + * @see cn.hutool.crypto.GlobalBouncyCastleProvider#setUseBouncyCastle + */ + PKCS7Padding, SSL3Padding } From 4512ec414b97a2e6a111958d15622d5c1bf4f12d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=BF=98=E5=88=9D=E5=BF=83?= Date: Wed, 25 Nov 2020 13:33:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=E5=B9=B4=E6=9C=88?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/hutool/core/date/DatePattern.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DatePattern.java b/hutool-core/src/main/java/cn/hutool/core/date/DatePattern.java index 1f54dc1de..5e7cf962d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DatePattern.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/DatePattern.java @@ -28,6 +28,30 @@ public class DatePattern { public static final Pattern REGEX_NORM = Pattern.compile("\\d{4}-\\d{1,2}-\\d{1,2}(\\s\\d{1,2}:\\d{1,2}(:\\d{1,2})?)?(.\\d{1,3})?"); //-------------------------------------------------------------------------------------------------------------------------------- Normal + /** + * 年月格式：yyyy-MM + */ + public static final String NORM_MONTH_PATTERN = "yyyy-MM"; + /** + * 年月格式 {@link FastDateFormat}：yyyy-MM + */ + public static final FastDateFormat NORM_MONTH_FORMAT = FastDateFormat.getInstance(NORM_MONTH_PATTERN); + /** + * 年月格式 {@link FastDateFormat}：yyyy-MM + */ + public static final DateTimeFormatter NORM_MONTH_FORMATTER = DateTimeFormatter.ofPattern(NORM_MONTH_PATTERN); + /** + * 简单年月格式：yyyyMM + */ + public static final String SIMPLE_MONTH_PATTERN = "yyyyMM"; + /** + * 简单年月格式 {@link FastDateFormat}：yyyyMM + */ + public static final FastDateFormat SIMPLE_MONTH_FORMAT = FastDateFormat.getInstance(SIMPLE_MONTH_PATTERN); + /** + * 简单年月格式 {@link FastDateFormat}：yyyyMM + */ + public static final DateTimeFormatter SIMPLE_MONTH_FORMATTER = DateTimeFormatter.ofPattern(SIMPLE_MONTH_PATTERN); /** * 标准日期格式：yyyy-MM-dd */ From 8a308bd13cd98b26f43149c9e9132a16a820ee48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=BF=98=E5=88=9D=E5=BF=83?= Date: Thu, 26 Nov 2020 18:39:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=20padding=20=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hutool-crypto/src/main/java/cn/hutool/crypto/Padding.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/Padding.java b/hutool-crypto/src/main/java/cn/hutool/crypto/Padding.java index b9237ec37..63fbfb97c 100644 --- a/hutool-crypto/src/main/java/cn/hutool/crypto/Padding.java +++ b/hutool-crypto/src/main/java/cn/hutool/crypto/Padding.java @@ -23,10 +23,5 @@ public enum Padding { OAEPPadding, PKCS1Padding, PKCS5Padding, - /** - * 注意需要引入对应jar 包 - * @see cn.hutool.crypto.GlobalBouncyCastleProvider#setUseBouncyCastle - */ - PKCS7Padding, SSL3Padding }