From d8f393f7d90c410bd2b2adf92225b76603e5d2e6 Mon Sep 17 00:00:00 2001 From: Looly Date: Sun, 18 Jul 2021 23:57:48 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=81release=205.7.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hutool-all/pom.xml | 2 +- hutool-aop/pom.xml | 2 +- hutool-bloomFilter/pom.xml | 2 +- hutool-bom/pom.xml | 2 +- hutool-cache/pom.xml | 2 +- hutool-captcha/pom.xml | 2 +- hutool-core/pom.xml | 2 +- .../cn/hutool/core/io/CharsetDetector.java | 19 ------------------- hutool-cron/pom.xml | 2 +- hutool-crypto/pom.xml | 2 +- hutool-db/pom.xml | 2 +- hutool-dfa/pom.xml | 2 +- hutool-extra/pom.xml | 2 +- hutool-http/pom.xml | 2 +- hutool-json/pom.xml | 2 +- hutool-jwt/pom.xml | 2 +- .../src/main/java/cn/hutool/jwt/JWT.java | 1 + hutool-log/pom.xml | 2 +- hutool-poi/pom.xml | 2 +- hutool-script/pom.xml | 2 +- hutool-setting/pom.xml | 2 +- hutool-socket/pom.xml | 2 +- hutool-system/pom.xml | 2 +- pom.xml | 2 +- 24 files changed, 23 insertions(+), 41 deletions(-) diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index 4977b7aa6..9d270d46d 100644 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-all diff --git a/hutool-aop/pom.xml b/hutool-aop/pom.xml index b26bf1051..228c34943 100644 --- a/hutool-aop/pom.xml +++ b/hutool-aop/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-aop diff --git a/hutool-bloomFilter/pom.xml b/hutool-bloomFilter/pom.xml index f15c7580a..6a0818aae 100644 --- a/hutool-bloomFilter/pom.xml +++ b/hutool-bloomFilter/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-bloomFilter diff --git a/hutool-bom/pom.xml b/hutool-bom/pom.xml index fa9b8326b..603c8b4a7 100644 --- a/hutool-bom/pom.xml +++ b/hutool-bom/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-bom diff --git a/hutool-cache/pom.xml b/hutool-cache/pom.xml index 6c93bbd83..d23b0c233 100644 --- a/hutool-cache/pom.xml +++ b/hutool-cache/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-cache diff --git a/hutool-captcha/pom.xml b/hutool-captcha/pom.xml index 61d79e1f0..24a44e19a 100644 --- a/hutool-captcha/pom.xml +++ b/hutool-captcha/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-captcha diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml index d4df2fb11..cfc15d529 100644 --- a/hutool-core/pom.xml +++ b/hutool-core/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-core diff --git a/hutool-core/src/main/java/cn/hutool/core/io/CharsetDetector.java b/hutool-core/src/main/java/cn/hutool/core/io/CharsetDetector.java index 04a8da001..d24e6f540 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/CharsetDetector.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/CharsetDetector.java @@ -82,25 +82,6 @@ public class CharsetDetector { return null; } - /** - * 判断编码，判断后会关闭流 - * - * @param in 流 - * @param charset 编码 - * @return 编码 - */ - private static Charset detectCharset(InputStream in, Charset charset) throws IOException { - CharsetDecoder decoder = charset.newDecoder(); - - final byte[] buffer = new byte[512]; - while (in.read(buffer) > -1) { - if (identify(buffer, decoder)) { - return charset; - } - } - return null; - } - /** * 通过try的方式测试指定bytes是否可以被解码，从而判断是否为指定编码 * diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index fadd667e3..8727affbd 100644 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-cron diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml index 13758bda6..e15506f5b 100644 --- a/hutool-crypto/pom.xml +++ b/hutool-crypto/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-crypto diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index 04d0dc98a..39d23e158 100644 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-db diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml index e90626734..e3791a031 100644 --- a/hutool-dfa/pom.xml +++ b/hutool-dfa/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-dfa diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index e7f0045dc..a138224a4 100644 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-extra diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index edcb956f4..df95e6f70 100644 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-http diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml index 236a90b5e..fa3184eac 100644 --- a/hutool-json/pom.xml +++ b/hutool-json/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-json diff --git a/hutool-jwt/pom.xml b/hutool-jwt/pom.xml index 536df3578..6b9f32d09 100644 --- a/hutool-jwt/pom.xml +++ b/hutool-jwt/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-jwt diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/JWT.java b/hutool-jwt/src/main/java/cn/hutool/jwt/JWT.java index 4cb674eb9..ae61ac017 100644 --- a/hutool-jwt/src/main/java/cn/hutool/jwt/JWT.java +++ b/hutool-jwt/src/main/java/cn/hutool/jwt/JWT.java @@ -341,6 +341,7 @@ public class JWT implements RegisteredPayload { *
  • {@link JWTPayload#ISSUED_AT}： 签发时间不能晚于当前时间
    • * * + * @param leeway 容忍空间，单位：秒。当不能晚于当前时间时，向后容忍；不能早于向前容忍。 * @return 是否有效 * @see JWTValidator * @since 5.7.4 diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml index f01417c2f..69401932d 100644 --- a/hutool-log/pom.xml +++ b/hutool-log/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-log diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml index 0cb52c0e6..0205a3b3e 100644 --- a/hutool-poi/pom.xml +++ b/hutool-poi/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-poi diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml index f6c4d900d..e8e0a2bb0 100644 --- a/hutool-script/pom.xml +++ b/hutool-script/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-script diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml index e18fcfa0e..43d8dc563 100644 --- a/hutool-setting/pom.xml +++ b/hutool-setting/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-setting diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml index d7e1ae1ad..2b14d8d7a 100644 --- a/hutool-socket/pom.xml +++ b/hutool-socket/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-socket diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml index 7e568c8cc..e9e263bde 100644 --- a/hutool-system/pom.xml +++ b/hutool-system/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool-system diff --git a/pom.xml b/pom.xml index 8220386a4..94d1d0af9 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ cn.hutool hutool-parent - 5.7.5-SNAPSHOT + 5.7.5 hutool Hutool是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。 https://github.com/looly/hutool