From 89328011373960a2e324cbb78c9457bc0628d4eb Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 20 Dec 2019 16:03:23 +0800 Subject: [PATCH] fix bug --- CHANGELOG.md | 8 ++++++++ README.md | 8 ++++---- bin/version.txt | 2 +- docs/js/version.js | 2 +- 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 +- .../java/cn/hutool/core/util/ClassUtil.java | 18 ++++++++++++++++-- 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 +- .../src/main/java/cn/hutool/http/HttpUtil.java | 5 ++++- hutool-json/pom.xml | 2 +- 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 +- 27 files changed, 55 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1130c6b6e..df45b8fe4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ ------------------------------------------------------------------------------------------------------------- +## 5.1.1 + +### 新特性 +* 【core 】 ClassUtil.isSimpleValueType增加TemporalAccessor支持（issue#I170HK@Gitee） +### Bug修复 + +------------------------------------------------------------------------------------------------------------- + ## 5.1.0 ### 新特性 diff --git a/README.md b/README.md index 890f81032..d910ec4cc 100644 --- a/README.md +++ b/README.md @@ -116,21 +116,21 @@ Hutool的存在就是为了减少代码搜索成本，避免网络上参差不 cn.hutool hutool-all - 5.1.0 + 5.1.1 ``` ### Gradle ``` -compile 'cn.hutool:hutool-all:5.1.0' +compile 'cn.hutool:hutool-all:5.1.1' ``` ### 非Maven项目 点击以下任一链接，下载`hutool-all-X.X.X.jar`即可： -- [Maven中央库1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.1.0/) -- [Maven中央库2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/5.1.0/) +- [Maven中央库1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.1.1/) +- [Maven中央库2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/5.1.1/) > 注意 > Hutool 5.x支持JDK8+，对Android平台没有测试，不能保证所有工具类获工具方法可用。 diff --git a/bin/version.txt b/bin/version.txt index 831446cbd..ac14c3dfa 100755 --- a/bin/version.txt +++ b/bin/version.txt @@ -1 +1 @@ -5.1.0 +5.1.1 diff --git a/docs/js/version.js b/docs/js/version.js index f2bed6ac7..4642eda4a 100644 --- a/docs/js/version.js +++ b/docs/js/version.js @@ -1 +1 @@ -var version = '5.1.0' \ No newline at end of file +var version = '5.1.1' \ No newline at end of file diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index f508c9951..4a3ea6b30 100644 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-all diff --git a/hutool-aop/pom.xml b/hutool-aop/pom.xml index 591c997ba..99f5999aa 100644 --- a/hutool-aop/pom.xml +++ b/hutool-aop/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-aop diff --git a/hutool-bloomFilter/pom.xml b/hutool-bloomFilter/pom.xml index 5456e63f6..d9cbd5a30 100644 --- a/hutool-bloomFilter/pom.xml +++ b/hutool-bloomFilter/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-bloomFilter diff --git a/hutool-bom/pom.xml b/hutool-bom/pom.xml index 6143bad27..8cdee01cf 100644 --- a/hutool-bom/pom.xml +++ b/hutool-bom/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-bom diff --git a/hutool-cache/pom.xml b/hutool-cache/pom.xml index 209e4f901..a4035f288 100644 --- a/hutool-cache/pom.xml +++ b/hutool-cache/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-cache diff --git a/hutool-captcha/pom.xml b/hutool-captcha/pom.xml index d265a607b..b9a64b38c 100644 --- a/hutool-captcha/pom.xml +++ b/hutool-captcha/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-captcha diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml index 69f1b5d7c..970a7c959 100644 --- a/hutool-core/pom.xml +++ b/hutool-core/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-core diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java index 44c586614..24b9ed729 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java @@ -8,6 +8,8 @@ import java.lang.reflect.Modifier; import java.lang.reflect.Type; import java.net.URI; import java.net.URL; +import java.time.LocalDateTime; +import java.time.temporal.TemporalAccessor; import java.util.Date; import java.util.Enumeration; import java.util.HashSet; @@ -744,7 +746,17 @@ public class ClassUtil { /** * 是否为简单值类型
- * 包括：原始类型,、String、other CharSequence, a Number, a Date, a URI, a URL, a Locale or a Class. + * 包括： + * 
+	 *     原始类型
+	 *     String、other CharSequence
+	 *     Number
+	 *     Date
+	 *     URI
+	 *     URL
+	 *     Locale
+	 *     Class
+	 *
* * @param clazz 类 * @return 是否为简单值类型 @@ -758,7 +770,9 @@ public class ClassUtil { || clazz.equals(URI.class) // || clazz.equals(URL.class) // || clazz.equals(Locale.class) // - || clazz.equals(Class.class);// + || clazz.equals(Class.class)// + // jdk8 date object + || TemporalAccessor.class.isAssignableFrom(clazz); // } /** diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index 7c59621ba..8584bd708 100644 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-cron diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml index ddfa8ed48..2fe5aef5d 100644 --- a/hutool-crypto/pom.xml +++ b/hutool-crypto/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-crypto diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index de2f39ad9..11dbb57db 100644 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-db diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml index e7e03fc25..7629a4279 100644 --- a/hutool-dfa/pom.xml +++ b/hutool-dfa/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-dfa diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index 4db3d90e4..d7772a286 100644 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-extra diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index 55c8146e4..f5ac2debc 100644 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-http diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java b/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java index 69086a467..61730c507 100644 --- a/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java +++ b/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java @@ -549,10 +549,13 @@ public class HttpUtil { int pathEndPos = paramsStr.indexOf('?'); if (pathEndPos > -1) { paramsStr = StrUtil.subSuf(paramsStr, pathEndPos + 1); + if (StrUtil.isBlank(paramsStr)) { + return Collections.emptyMap(); + } } - final Map> params = new LinkedHashMap<>(); final int len = paramsStr.length(); + final Map> params = new LinkedHashMap<>(); String name = null; int pos = 0; // 未处理字符开始位置 int i; // 未处理字符结束位置 diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml index dc7a793f4..aa9357175 100644 --- a/hutool-json/pom.xml +++ b/hutool-json/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-json diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml index 19096e48f..718df7b6c 100644 --- a/hutool-log/pom.xml +++ b/hutool-log/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-log diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml index 34503c4a1..c9843a88f 100644 --- a/hutool-poi/pom.xml +++ b/hutool-poi/pom.xml @@ -8,7 +8,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-poi diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml index 8136f34b1..366202cc0 100644 --- a/hutool-script/pom.xml +++ b/hutool-script/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-script diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml index 9e7415828..9d68166a5 100644 --- a/hutool-setting/pom.xml +++ b/hutool-setting/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-setting diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml index 4a272ea09..3ff238071 100644 --- a/hutool-socket/pom.xml +++ b/hutool-socket/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-socket diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml index 92f0d76b9..55ae8f852 100644 --- a/hutool-system/pom.xml +++ b/hutool-system/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool-system diff --git a/pom.xml b/pom.xml index ba375caad..1228b4f11 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ cn.hutool hutool-parent - 5.1.0 + 5.1.1-SNAPSHOT hutool 提供丰富的Java工具方法 https://github.com/looly/hutool