Merge remote-tracking branch 'origin/v5-dev' into v5-dev

CHANGELOG.md

@@ -3,14 +3,29 @@
 
 -------------------------------------------------------------------------------------------------------------
 
-# 5.6.2 (2021-03-21)
+# 5.6.3 (2021-03-28)
+
+### 新特性
+### Bug修复
+
+-------------------------------------------------------------------------------------------------------------
+
+# 5.6.2 (2021-03-28)
 
 ### 新特性
 * 【core   】     Validator增加车架号(车辆识别码)验证、驾驶证（驾驶证档案编号）的正则校验（pr#280@Gitee）
 * 【core   】     CopyOptions增加propertiesFilter（pr#281@Gitee）
 * 【extra  】     增加Wit模板引擎支持
 * 【core   】     增加DesensitizedUtil（pr#282@Gitee）
+* 【core   】     增加DateTime字符串构造（issue#I3CQZG@Gitee）
+* 【core   】     修改ArrayUtil代码风格（pr#287@Gitee）
+* 【json   】     JSONConfig增加setStripTrailingZeros配置（issue#I3DJI8@Gitee）
+* 【db     】     升级兼容BeeCP3.x
+
 ### Bug修复
+* 【core   】     修复FileTypeUtil中OFD格式判断问题（pr#1489@Github）
+* 【core   】     修复CamelCaseLinkedMap和CaseInsensitiveLinkedMap的Linked失效问题（pr#1490@Github）
+* 【core   】     修复UrlPath中=被转义的问题
 
 -------------------------------------------------------------------------------------------------------------
 

README-EN.md

@@ -125,19 +125,19 @@ Each module can be introduced individually, or all modules can be introduced by
 <dependency>
     <groupId>cn.hutool</groupId>
     <artifactId>hutool-all</artifactId>
-    <version>5.6.2</version>
+    <version>5.6.3</version>
 </dependency>
 ```
 
 ### Gradle
 ```
-compile 'cn.hutool:hutool-all:5.6.2'
+compile 'cn.hutool:hutool-all:5.6.3'
 ```
 
 ## Download
 
-- [Maven1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.6.2/)
+- [Maven1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.6.3/)
-- [Maven2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/5.6.2/)
+- [Maven2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/5.6.3/)
 
 > note:
 > Hutool 5.x supports JDK8+ and is not tested on Android platforms, and cannot guarantee that all tool classes or tool methods are available.

README.md

@@ -123,20 +123,20 @@ Hutool的存在就是为了减少代码搜索成本，避免网络上参差不
 <dependency>
     <groupId>cn.hutool</groupId>
     <artifactId>hutool-all</artifactId>
-    <version>5.6.2</version>
+    <version>5.6.3</version>
 </dependency>
 ```
 
 ### Gradle
 ```
-compile 'cn.hutool:hutool-all:5.6.2'
+compile 'cn.hutool:hutool-all:5.6.3'
 ```
 
 ### 非Maven项目
 
 点击以下任一链接，下载`hutool-all-X.X.X.jar`即可：
 
-- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.6.2/)
+- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.6.3/)
 
 > 注意
 > Hutool 5.x支持JDK8+，对Android平台没有测试，不能保证所有工具类或工具方法可用。

bin/version.txt

@@ -1 +1 @@
-5.6.2
+5.6.3

docs/js/version.js

@@ -1 +1 @@
-var version = '5.6.2'
+var version = '5.6.3'

hutool-all/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-all</artifactId>

hutool-aop/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-aop</artifactId>
@@ -19,7 +19,7 @@
 	<properties>
 		<!-- versions -->
 		<cglib.version>3.3.0</cglib.version>
-		<spring.version>5.3.4</spring.version>
+		<spring.version>5.3.5</spring.version>
 	</properties>
 
 	<dependencies>

hutool-bloomFilter/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-bloomFilter</artifactId>

hutool-bom/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-bom</artifactId>

hutool-cache/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-cache</artifactId>

hutool-captcha/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-captcha</artifactId>

hutool-core/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-core</artifactId>

hutool-core/src/main/java/cn/hutool/core/date/DateTime.java

@@ -122,7 +122,7 @@ public class DateTime extends Date {
 	 */
 	public DateTime(Date date) {
 		this(
-				date.getTime(),//
+				date,//
 				(date instanceof DateTime) ? ((DateTime) date).timeZone : TimeZone.getDefault()
 		);
 	}
@@ -135,7 +135,7 @@ public class DateTime extends Date {
 	 * @since 4.1.2
 	 */
 	public DateTime(Date date, TimeZone timeZone) {
-		this(date.getTime(), timeZone);
+		this(ObjectUtil.defaultIfNull(date, new Date()).getTime(), timeZone);
 	}
 
 	/**
@@ -211,6 +211,38 @@ public class DateTime extends Date {
 		this.timeZone = ObjectUtil.defaultIfNull(timeZone, TimeZone.getDefault());
 	}
 
+	/**
+	 * 构造格式：<br>
+	 * <ol>
+	 * <li>yyyy-MM-dd HH:mm:ss</li>
+	 * <li>yyyy/MM/dd HH:mm:ss</li>
+	 * <li>yyyy.MM.dd HH:mm:ss</li>
+	 * <li>yyyy年MM月dd日 HH时mm分ss秒</li>
+	 * <li>yyyy-MM-dd</li>
+	 * <li>yyyy/MM/dd</li>
+	 * <li>yyyy.MM.dd</li>
+	 * <li>HH:mm:ss</li>
+	 * <li>HH时mm分ss秒</li>
+	 * <li>yyyy-MM-dd HH:mm</li>
+	 * <li>yyyy-MM-dd HH:mm:ss.SSS</li>
+	 * <li>yyyyMMddHHmmss</li>
+	 * <li>yyyyMMddHHmmssSSS</li>
+	 * <li>yyyyMMdd</li>
+	 * <li>EEE, dd MMM yyyy HH:mm:ss z</li>
+	 * <li>EEE MMM dd HH:mm:ss zzz yyyy</li>
+	 * <li>yyyy-MM-dd'T'HH:mm:ss'Z'</li>
+	 * <li>yyyy-MM-dd'T'HH:mm:ss.SSS'Z'</li>
+	 * <li>yyyy-MM-dd'T'HH:mm:ssZ</li>
+	 * <li>yyyy-MM-dd'T'HH:mm:ss.SSSZ</li>
+	 * </ol>
+	 *
+	 * @param dateStr Date字符串
+	 * @since 5.6.2
+	 */
+	public DateTime(CharSequence dateStr) {
+		this(DateUtil.parse(dateStr));
+	}
+
 	/**
 	 * 构造
 	 *

hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java

@@ -60,7 +60,6 @@ public class FileTypeUtil {
 		FILE_TYPE_MAP.put("4d546864000000060001", "mid"); // MIDI (mid)
 		FILE_TYPE_MAP.put("526172211a0700cf9073", "rar"); // WinRAR
 		FILE_TYPE_MAP.put("235468697320636f6e66", "ini");
-		FILE_TYPE_MAP.put("504B0304140000000800", "ofd"); // ofd文件 国标版式文件
 		FILE_TYPE_MAP.put("504B03040a0000000000", "jar");
 		FILE_TYPE_MAP.put("504B0304140008000800", "jar");
 		// MS Excel 注意：word、msi 和 excel的文件头一样
@@ -140,7 +139,7 @@ public class FileTypeUtil {
 	 * <pre>
 	 *     1、无法识别类型默认按照扩展名识别
 	 *     2、xls、doc、msi头信息无法区分，按照扩展名区分
-	 *     3、zip可能为docx、xlsx、pptx、jar、war头信息无法区分，按照扩展名区分
+	 *     3、zip可能为docx、xlsx、pptx、jar、war、ofd头信息无法区分，按照扩展名区分
 	 * </pre>
 	 * @param in {@link InputStream}
 	 * @param filename 文件名
@@ -162,7 +161,7 @@ public class FileTypeUtil {
 				typeName = "msi";
 			}
 		} else if ("zip".equals(typeName)) {
-			// zip可能为docx、xlsx、pptx、jar、war等格式，扩展名辅助判断
+			// zip可能为docx、xlsx、pptx、jar、war、ofd等格式，扩展名辅助判断
 			final String extName = FileUtil.extName(filename);
 			if ("docx".equalsIgnoreCase(extName)) {
 				typeName = "docx";
@@ -174,6 +173,8 @@ public class FileTypeUtil {
 				typeName = "jar";
 			} else if ("war".equalsIgnoreCase(extName)) {
 				typeName = "war";
+			} else if ("ofd".equalsIgnoreCase(extName)) {
+				typeName = "ofd";
 			}
 		}
 		return typeName;

hutool-core/src/main/java/cn/hutool/core/map/CamelCaseLinkedMap.java

@@ -1,5 +1,7 @@
 package cn.hutool.core.map;
 
+import cn.hutool.core.util.StrUtil;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -13,7 +15,7 @@ import java.util.Map;
  * @param <V> 值类型
  * @since 4.0.7
  */
-public class CamelCaseLinkedMap<K, V> extends CamelCaseMap<K, V> {
+public class CamelCaseLinkedMap<K, V> extends CustomKeyMap<K, V> {
 	private static final long serialVersionUID = 4043263744224569870L;
 
 	// ------------------------------------------------------------------------- Constructor start
@@ -63,4 +65,18 @@ public class CamelCaseLinkedMap<K, V> extends CamelCaseMap<K, V> {
 		super(new LinkedHashMap<>(initialCapacity, loadFactor));
 	}
 	// ------------------------------------------------------------------------- Constructor end
+
+	/**
+	 * 将Key转为驼峰风格，如果key为字符串的话
+	 *
+	 * @param key KEY
+	 * @return 驼峰Key
+	 */
+	@Override
+	protected Object customKey(Object key) {
+		if (key instanceof CharSequence) {
+			key = StrUtil.toCamelCase(key.toString());
+		}
+		return key;
+	}
 }

hutool-core/src/main/java/cn/hutool/core/map/CaseInsensitiveLinkedMap.java

@@ -13,7 +13,7 @@ import java.util.Map;
  * @param <V> 值类型
  * @since 3.3.1
  */
-public class CaseInsensitiveLinkedMap<K, V> extends CaseInsensitiveMap<K, V> {
+public class CaseInsensitiveLinkedMap<K, V> extends CustomKeyMap<K, V> {
 	private static final long serialVersionUID = 4043263744224569870L;
 
 	// ------------------------------------------------------------------------- Constructor start
@@ -64,4 +64,18 @@ public class CaseInsensitiveLinkedMap<K, V> extends CaseInsensitiveMap<K, V> {
 		super(new LinkedHashMap<>(initialCapacity, loadFactor));
 	}
 	// ------------------------------------------------------------------------- Constructor end
+
+	/**
+	 * 将Key转为小写
+	 *
+	 * @param key KEY
+	 * @return 小写KEY
+	 */
+	@Override
+	protected Object customKey(Object key) {
+		if (key instanceof CharSequence) {
+			key = key.toString().toLowerCase();
+		}
+		return key;
+	}
 }

hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java

@@ -128,7 +128,7 @@ public class UrlPath {
 
 		final StringBuilder builder = new StringBuilder();
 		for (String segment : segments) {
-			builder.append(CharUtil.SLASH).append(URLUtil.encodeAll(segment, charset));
+			builder.append(CharUtil.SLASH).append(URLUtil.encode(segment, charset));
 		}
 		if (withEngTag || StrUtil.isEmpty(builder)) {
 			builder.append(CharUtil.SLASH);

hutool-core/src/main/java/cn/hutool/core/text/UnicodeUtil.java

@@ -54,6 +54,30 @@ public class UnicodeUtil {
 		return sb.toString();
 	}
 
+	/**
+	 * 字符编码为Unicode形式
+	 *
+	 * @param c 被编码的字符
+	 * @return Unicode字符串
+	 * @since 5.6.2
+	 * @see HexUtil#toUnicodeHex(char)
+	 */
+	public static String toUnicode(char c) {
+		return HexUtil.toUnicodeHex(c);
+	}
+
+	/**
+	 * 字符编码为Unicode形式
+	 *
+	 * @param c 被编码的字符
+	 * @return Unicode字符串
+	 * @since 5.6.2
+	 * @see HexUtil#toUnicodeHex(int)
+	 */
+	public static String toUnicode(int c) {
+		return HexUtil.toUnicodeHex(c);
+	}
+
 	/**
 	 * 字符串编码为Unicode形式
 	 *

hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java

@@ -89,7 +89,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	 * @return 是否为非空
 	 */
 	public static <T> boolean isNotEmpty(T[] array) {
-		return (array != null && array.length != 0);
+		return (null != array && array.length != 0);
 	}
 
 	/**
@@ -653,7 +653,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	 * @since 3.2.2
 	 */
 	public static <T extends CharSequence> T[] removeEmpty(T[] array) {
-		return filter(array, (Filter<T>) t -> false == StrUtil.isEmpty(t));
+		return filter(array, StrUtil::isNotEmpty);
 	}
 
 	/**
@@ -665,7 +665,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	 * @since 3.2.2
 	 */
 	public static <T extends CharSequence> T[] removeBlank(T[] array) {
-		return filter(array, (Filter<T>) t -> false == StrUtil.isBlank(t));
+		return filter(array, StrUtil::isNotBlank);
 	}
 
 	/**
@@ -900,11 +900,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	 * @return 是否为数组对象，如果为{@code null} 返回false
 	 */
 	public static boolean isArray(Object obj) {
-		if (null == obj) {
+		return null != obj && obj.getClass().isArray();
-			// throw new NullPointerException("Object check for isArray is null");
-			return false;
-		}
-		return obj.getClass().isArray();
 	}
 
 	/**
@@ -1227,35 +1223,39 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	 * @return 连接后的字符串
 	 */
 	public static String join(Object array, CharSequence conjunction) {
-		if (isArray(array)) {
+		if(null == array){
-			final Class<?> componentType = array.getClass().getComponentType();
+			throw new NullPointerException("Array must be not null!");
-			if (componentType.isPrimitive()) {
+		}
-				final String componentTypeName = componentType.getName();
+		if (false == isArray(array)) {
-				switch (componentTypeName) {
+			throw new IllegalArgumentException(StrUtil.format("[{}] is not a Array!", array.getClass()));
-					case "long":
+		}
-						return join((long[]) array, conjunction);
+
-					case "int":
+		final Class<?> componentType = array.getClass().getComponentType();
-						return join((int[]) array, conjunction);
+		if (componentType.isPrimitive()) {
-					case "short":
+			final String componentTypeName = componentType.getName();
-						return join((short[]) array, conjunction);
+			switch (componentTypeName) {
-					case "char":
+				case "long":
-						return join((char[]) array, conjunction);
+					return join((long[]) array, conjunction);
-					case "byte":
+				case "int":
-						return join((byte[]) array, conjunction);
+					return join((int[]) array, conjunction);
-					case "boolean":
+				case "short":
-						return join((boolean[]) array, conjunction);
+					return join((short[]) array, conjunction);
-					case "float":
+				case "char":
-						return join((float[]) array, conjunction);
+					return join((char[]) array, conjunction);
-					case "double":
+				case "byte":
-						return join((double[]) array, conjunction);
+					return join((byte[]) array, conjunction);
-					default:
+				case "boolean":
-						throw new UtilException("Unknown primitive type: [{}]", componentTypeName);
+					return join((boolean[]) array, conjunction);
-				}
+				case "float":
-			} else {
+					return join((float[]) array, conjunction);
-				return join((Object[]) array, conjunction);
+				case "double":
-			}
+					return join((double[]) array, conjunction);
+				default:
+					throw new UtilException("Unknown primitive type: [{}]", componentTypeName);
+			}
+		} else {
+			return join((Object[]) array, conjunction);
 		}
-		throw new UtilException(StrUtil.format("[{}] is not a Array!", array.getClass()));
 	}
 
 	/**
@@ -1266,7 +1266,9 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	 * @since 3.0.1
 	 */
 	public static byte[] toArray(ByteBuffer bytebuffer) {
-		if (false == bytebuffer.hasArray()) {
+		if (bytebuffer.hasArray()) {
+			return Arrays.copyOfRange(bytebuffer.array(), bytebuffer.position(), bytebuffer.limit());
+		} else {
 			int oldPosition = bytebuffer.position();
 			bytebuffer.position(0);
 			int size = bytebuffer.limit();
@@ -1274,8 +1276,6 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 			bytebuffer.get(buffers);
 			bytebuffer.position(oldPosition);
 			return buffers;
-		} else {
-			return Arrays.copyOfRange(bytebuffer.array(), bytebuffer.position(), bytebuffer.limit());
 		}
 	}
 

hutool-core/src/main/java/cn/hutool/core/util/CharUtil.java

@@ -366,4 +366,47 @@ public class CharUtil {
 	public static int digit16(int b) {
 		return Character.digit(b, 16);
 	}
+
+	/**
+	 * 将字母、数字转换为带圈的字符：
+	 * <pre>
+	 *     '1' -》 '①'
+	 *     'A' -》 'Ⓐ'
+	 *     'a' -》 'ⓐ'
+	 * </pre>
+	 *
+	 * @param c 被转换的字符，如果字符不支持转换，返回原字符
+	 * @return 转换后的字符
+	 * @since 5.6.2
+	 */
+	public static char toCloseChar(char c){
+		int result = c;
+		if(c >='1' && c <= '9'){
+			result = '①' + c - '1';
+		} else if(c >='A' && c <= 'Z'){
+			result = 'Ⓐ' + c - 'A';
+		} else if(c >='a' && c <= 'z'){
+			result = 'ⓐ' + c - 'a';
+		}
+		return (char) result;
+	}
+
+	/**
+	 * 将[1-20]数字转换为带圈的字符：
+	 * <pre>
+	 *     1 -》 '①'
+	 *     12 -》 '⑫'
+	 *     20 -》 '⑳'
+	 * </pre>
+	 *
+	 * @param number 被转换的数字
+	 * @return 转换后的字符
+	 * @since 5.6.2
+	 */
+	public static char toCloseByNumber(int number){
+		if(number > 20){
+			throw new IllegalArgumentException("Number must be [1-20]");
+		}
+		return (char) ('①' + number - 1);
+	}
 }

hutool-core/src/main/java/cn/hutool/core/util/DesensitizedUtil.java

@@ -57,11 +57,12 @@ public class DesensitizedUtil {
 	 * DesensitizedUtil.desensitized("duandazhi-jack@gmail.com.cn", DesensitizedUtils.DesensitizedType.EMAIL)) = "d*************@gmail.com.cn"
 	 * DesensitizedUtil.desensitized("1234567890", DesensitizedUtils.DesensitizedType.PASSWORD)) = "**********"
 	 * DesensitizedUtil.desensitized("苏D40000", DesensitizedUtils.DesensitizedType.CAR_LICENSE)) = "苏D4***0"
+	 * </pre>
 	 *
-	 * @author dazer and neusoft and qiaomu
+	 * @param str              字符串
-	 * @param str 字符串
 	 * @param desensitizedType 脱敏类型;可以脱敏：用户id、中文名、身份证号、座机号、手机号、地址、电子邮件、密码
 	 * @return 脱敏之后的字符串
+	 * @author dazer and neusoft and qiaomu
 	 * @since 5.6.2
 	 */
 	public static String desensitized(CharSequence str, DesensitizedUtil.DesensitizedType desensitizedType) {
@@ -77,7 +78,7 @@ public class DesensitizedUtil {
 				newStr = DesensitizedUtil.chineseName(String.valueOf(str));
 				break;
 			case ID_CARD:
-				newStr = DesensitizedUtil.idCardNum(String.valueOf(str),1,2);
+				newStr = DesensitizedUtil.idCardNum(String.valueOf(str), 1, 2);
 				break;
 			case FIXED_PHONE:
 				newStr = DesensitizedUtil.fixedPhone(String.valueOf(str));
@@ -159,7 +160,7 @@ public class DesensitizedUtil {
 		if (StrUtil.isBlank(num)) {
 			return StrUtil.EMPTY;
 		}
-		return StrUtil.hide(num, 4, num.length()-2);
+		return StrUtil.hide(num, 4, num.length() - 2);
 	}
 
 	/**
@@ -172,7 +173,7 @@ public class DesensitizedUtil {
 		if (StrUtil.isBlank(num)) {
 			return StrUtil.EMPTY;
 		}
-		return StrUtil.hide(num, 3, num.length()-4);
+		return StrUtil.hide(num, 3, num.length() - 4);
 	}
 
 	/**
@@ -187,11 +188,11 @@ public class DesensitizedUtil {
 			return StrUtil.EMPTY;
 		}
 		int length = address.length();
-		return StrUtil.hide(address, length-sensitiveSize, length);
+		return StrUtil.hide(address, length - sensitiveSize, length);
 	}
 
 	/**
-	 * 【电子邮箱】邮箱前缀仅显示第一个字母，前缀其他隐藏，用星号代替，@及后面的地址显示，比如：d**@126.com>
+	 * 【电子邮箱】邮箱前缀仅显示第一个字母，前缀其他隐藏，用星号代替，@及后面的地址显示，比如：d**@126.com
 	 *
 	 * @param email 邮箱
 	 * @return 脱敏后的邮箱
@@ -222,11 +223,11 @@ public class DesensitizedUtil {
 
 	/**
 	 * 【中国车牌】车牌中间用*代替
-	 * eg1：null       => ""
+	 * eg1：null       -》 ""
-	 * eg1：""         => ""
+	 * eg1：""         -》 ""
-	 * eg3：苏D40000   => 苏D4***0
+	 * eg3：苏D40000   -》 苏D4***0
-	 * eg4：陕A12345D  => 陕A1****D
+	 * eg4：陕A12345D  -》 陕A1****D
-	 * eg5：京A123     => 京A123     如果是错误的车牌，不处理
+	 * eg5：京A123     -》 京A123     如果是错误的车牌，不处理
 	 *
 	 * @param carLicense 完整的车牌号
 	 * @return 脱敏后的车牌

hutool-core/src/main/java/cn/hutool/core/util/HexUtil.java

@@ -262,7 +262,7 @@ public class HexUtil {
 	 * 转换的字符串如果u后不足4位，则前面用0填充，例如：
 	 *
 	 * <pre>
-	 * '我' =》\u4f60
+	 * '你' =》\u4f60
 	 * </pre>
 	 *
 	 * @param value int值，也可以是char
@@ -287,7 +287,7 @@ public class HexUtil {
 	 * 转换的字符串如果u后不足4位，则前面用0填充，例如：
 	 *
 	 * <pre>
-	 * '我' =》\u4f60
+	 * '你' =》'\u4f60'
 	 * </pre>
 	 *
 	 * @param ch char值

hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java

@@ -1,6 +1,7 @@
 package cn.hutool.core.collection;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Console;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.lang.Editor;
 import cn.hutool.core.lang.Filter;

hutool-core/src/test/java/cn/hutool/core/date/DateTimeTest.java

@@ -32,6 +32,27 @@ public class DateTimeTest {
 		Assert.assertEquals(5, day);
 	}
 
+	@Test
+	public void datetimeTest2() {
+		DateTime dateTime = new DateTime("2017-01-05 12:34:23");
+
+		// 年
+		int year = dateTime.year();
+		Assert.assertEquals(2017, year);
+
+		// 季度（非季节）
+		Quarter season = dateTime.quarterEnum();
+		Assert.assertEquals(Quarter.Q1, season);
+
+		// 月份
+		Month month = dateTime.monthEnum();
+		Assert.assertEquals(Month.JANUARY, month);
+
+		// 日
+		int day = dateTime.dayOfMonth();
+		Assert.assertEquals(5, day);
+	}
+
 	@Test
 	public void quarterTest() {
 		DateTime dateTime = new DateTime("2017-01-05 12:34:23", DatePattern.NORM_DATETIME_FORMAT);

hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java

@@ -235,4 +235,12 @@ public class UrlBuilderTest {
 		final UrlBuilder urlBuilder = UrlBuilder.of(webUrl, StandardCharsets.UTF_8);
 		Assert.assertEquals("a=123&b=4%3F6&c=789", urlBuilder.getQueryStr());
 	}
+
+	@Test
+	public void encodePathTest(){
+		// Path中的某些符号无需转义，比如=
+		final String urlStr = "http://hq.sinajs.cn/list=sh600519";
+		final UrlBuilder urlBuilder = UrlBuilder.ofHttp(urlStr, CharsetUtil.CHARSET_UTF_8);
+		Assert.assertEquals(urlStr, urlBuilder.toString());
+	}
 }

hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java

@@ -53,6 +53,12 @@ public class ArrayUtilTest {
 	public void isNotEmptyTest() {
 		int[] a = {1, 2};
 		Assert.assertTrue(ArrayUtil.isNotEmpty(a));
+
+		String[] b = {"a", "b", "c"};
+		Assert.assertTrue(ArrayUtil.isNotEmpty(b));
+
+		Object c = new Object[]{"1", "2", 3, 4D};
+		Assert.assertTrue(ArrayUtil.isNotEmpty(c));
 	}
 
 	@Test
@@ -253,15 +259,19 @@ public class ArrayUtilTest {
 		String[] array = {"aa", "bb", "cc", "dd"};
 		String join = ArrayUtil.join(array, ",", "[", "]");
 		Assert.assertEquals("[aa],[bb],[cc],[dd]", join);
+
+		Object array2 = new String[]{"aa", "bb", "cc", "dd"};
+		String join2 = ArrayUtil.join(array2, ",");
+		Assert.assertEquals("aa,bb,cc,dd", join2);
 	}
 
 	@Test
 	public void getArrayTypeTest() {
 		Class<?> arrayType = ArrayUtil.getArrayType(int.class);
-		Assert.assertEquals(int[].class, arrayType);
+		Assert.assertSame(int[].class, arrayType);
 
 		arrayType = ArrayUtil.getArrayType(String.class);
-		Assert.assertEquals(String[].class, arrayType);
+		Assert.assertSame(String[].class, arrayType);
 	}
 
 	@Test
@@ -384,4 +394,34 @@ public class ArrayUtilTest {
 		final int[] reverse = ArrayUtil.reverse(a);
 		Assert.assertArrayEquals(new int[]{4,3,2,1}, reverse);
 	}
+
+	@Test
+	public void removeEmptyTest() {
+		String[] a = {"a", "b", "", null, " ", "c"};
+		String[] resultA = {"a", "b", " ", "c"};
+		Assert.assertArrayEquals(ArrayUtil.removeEmpty(a), resultA);
+	}
+
+	@Test
+	public void removeBlankTest() {
+		String[] a = {"a", "b", "", null, " ", "c"};
+		String[] resultA = {"a", "b", "c"};
+		Assert.assertArrayEquals(ArrayUtil.removeBlank(a), resultA);
+	}
+
+	@Test
+	public void nullToEmptyTest() {
+		String[] a = {"a", "b", "", null, " ", "c"};
+		String[] resultA = {"a", "b", "", "", " ", "c"};
+		Assert.assertArrayEquals(ArrayUtil.nullToEmpty(a), resultA);
+	}
+
+	@Test
+	public void wrapTest() {
+		Object a = new int[]{1, 2, 3, 4};
+		Object[] wrapA = ArrayUtil.wrap(a);
+		for (Object o : wrapA) {
+			Assert.assertTrue(o instanceof Integer);
+		}
+	}
 }

hutool-core/src/test/java/cn/hutool/core/util/CharUtilTest.java

@@ -38,4 +38,18 @@ public class CharUtilTest {
 		char a3 = '\u3000';
 		Assert.assertTrue(CharUtil.isBlankChar(a3));
 	}
+
+	@Test
+	public void toCloseCharTest(){
+		Assert.assertEquals('②', CharUtil.toCloseChar('2'));
+		Assert.assertEquals('Ⓜ', CharUtil.toCloseChar('M'));
+		Assert.assertEquals('ⓡ', CharUtil.toCloseChar('r'));
+	}
+
+	@Test
+	public void toCloseByNumberTest(){
+		Assert.assertEquals('②', CharUtil.toCloseByNumber(2));
+		Assert.assertEquals('⑫', CharUtil.toCloseByNumber(12));
+		Assert.assertEquals('⑳', CharUtil.toCloseByNumber(20));
+	}
 }

hutool-cron/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-cron</artifactId>

hutool-crypto/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-crypto</artifactId>

hutool-db/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-db</artifactId>
@@ -26,7 +26,7 @@
 		<mongo.version>3.12.8</mongo.version>
 		<sqlite.version>3.34.0</sqlite.version>
 		<hsqldb.version>2.5.1</hsqldb.version>
-		<jedis.version>3.5.1</jedis.version>
+		<jedis.version>3.5.2</jedis.version>
 	</properties>
 
 	<dependencies>
@@ -79,8 +79,8 @@
 		</dependency>
 		<dependency>
 			<groupId>com.github.chris2018998</groupId>
-			<artifactId>BeeCP</artifactId>
+			<artifactId>beecp</artifactId>
-			<version>2.5.3</version>
+			<version>3.1.2</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>slf4j-api</artifactId>
@@ -148,7 +148,7 @@
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.2.18.jre7</version>
+			<version>42.2.19.jre7</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

hutool-db/src/main/java/cn/hutool/db/ds/bee/BeeDSFactory.java

@@ -33,11 +33,6 @@ public class BeeDSFactory extends AbstractDSFactory {
 		final BeeDataSourceConfig beeConfig = new BeeDataSourceConfig(driver, jdbcUrl, user, pass);
 		poolSetting.toBean(beeConfig);
 
-		// 修复BeeCP默认参数无效问题
-		if(beeConfig.getBorrowConcurrentSize() > beeConfig.getMaxActive()){
-			beeConfig.setMaxActive(beeConfig.getBorrowConcurrentSize() + 1);
-		}
-
 		// remarks等特殊配置，since 5.3.8
 		String connValue;
 		for (String key : KEY_CONN_PROPS) {

hutool-dfa/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-dfa</artifactId>

hutool-extra/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-extra</artifactId>
@@ -30,7 +30,7 @@
 		<net.version>3.7.2</net.version>
 		<emoji-java.version>5.1.1</emoji-java.version>
 		<servlet-api.version>4.0.1</servlet-api.version>
-		<spring-boot.version>2.4.3</spring-boot.version>
+		<spring-boot.version>2.4.4</spring-boot.version>
 		<cglib.version>3.3.0</cglib.version>
 	</properties>
 
@@ -241,7 +241,7 @@
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-analyzers-smartcn</artifactId>
-			<version>8.7.0</version>
+			<version>8.8.1</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -426,7 +426,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
-			<version>5.3.2</version>
+			<version>5.3.5</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
@@ -448,7 +448,7 @@
 		<dependency>
 			<groupId>org.tukaani</groupId>
 			<artifactId>xz</artifactId>
-			<version>1.8</version>
+			<version>1.9</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java

@@ -320,7 +320,7 @@ public class QrCodeUtil {
 	// ------------------------------------------------------------------------------------------------------------------- decode
 
 	/**
-	 * 解码二维码图片为文本
+	 * 解码二维码或条形码图片为文本
 	 *
 	 * @param qrCodeInputstream 二维码输入流
 	 * @return 解码文本
@@ -330,7 +330,7 @@ public class QrCodeUtil {
 	}
 
 	/**
-	 * 解码二维码图片为文本
+	 * 解码二维码或条形码图片为文本
 	 *
 	 * @param qrCodeFile 二维码文件
 	 * @return 解码文本
@@ -340,7 +340,7 @@ public class QrCodeUtil {
 	}
 
 	/**
-	 * 将二维码图片解码为文本
+	 * 将二维码或条形码图片解码为文本
 	 *
 	 * @param image {@link Image} 二维码图片
 	 * @return 解码后的文本
@@ -350,7 +350,7 @@ public class QrCodeUtil {
 	}
 
 	/**
-	 * 将二维码图片解码为文本
+	 * 将二维码或条形码图片解码为文本
 	 *
 	 * @param image         {@link Image} 二维码图片
 	 * @param isTryHarder   是否优化精度

hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java

@@ -58,6 +58,7 @@ public class ServletUtil {
 	public static final String METHOD_TRACE = "TRACE";
 
 	// --------------------------------------------------------- getParam start
+
 	/**
 	 * 获得所有请求参数
 	 *
@@ -92,7 +93,7 @@ public class ServletUtil {
 	 * @since 4.0.2
 	 */
 	public static String getBody(ServletRequest request) {
-		try(final BufferedReader reader = request.getReader()) {
+		try (final BufferedReader reader = request.getReader()) {
 			return IoUtil.read(reader);
 		} catch (IOException e) {
 			throw new IORuntimeException(e);
@@ -117,12 +118,13 @@ public class ServletUtil {
 	// --------------------------------------------------------- getParam end
 
 	// --------------------------------------------------------- fillBean start
+
 	/**
 	 * ServletRequest 参数转Bean
 	 *
-	 * @param <T> Bean类型
+	 * @param <T>         Bean类型
-	 * @param request ServletRequest
+	 * @param request     ServletRequest
-	 * @param bean Bean
+	 * @param bean        Bean
 	 * @param copyOptions 注入时的设置
 	 * @return Bean
 	 * @since 3.0.4
@@ -133,17 +135,17 @@ public class ServletUtil {
 			@Override
 			public Object value(String key, Type valueType) {
 				String[] values = request.getParameterValues(key);
-				if(ArrayUtil.isEmpty(values)){
+				if (ArrayUtil.isEmpty(values)) {
 					values = request.getParameterValues(beanName + StrUtil.DOT + key);
-					if(ArrayUtil.isEmpty(values)){
+					if (ArrayUtil.isEmpty(values)) {
 						return null;
 					}
 				}
 
-				if(1 == values.length){
+				if (1 == values.length) {
 					// 单值表单直接返回这个值
 					return values[0];
-				}else{
+				} else {
 					// 多值表单返回数组
 					return values;
 				}
@@ -160,9 +162,9 @@ public class ServletUtil {
 	/**
 	 * ServletRequest 参数转Bean
 	 *
-	 * @param <T> Bean类型
+	 * @param <T>           Bean类型
-	 * @param request {@link ServletRequest}
+	 * @param request       {@link ServletRequest}
-	 * @param bean Bean
+	 * @param bean          Bean
 	 * @param isIgnoreError 是否忽略注入错误
 	 * @return Bean
 	 */
@@ -173,9 +175,9 @@ public class ServletUtil {
 	/**
 	 * ServletRequest 参数转Bean
 	 *
-	 * @param <T> Bean类型
+	 * @param <T>           Bean类型
-	 * @param request ServletRequest
+	 * @param request       ServletRequest
-	 * @param beanClass Bean Class
+	 * @param beanClass     Bean Class
 	 * @param isIgnoreError 是否忽略注入错误
 	 * @return Bean
 	 */
@@ -202,12 +204,12 @@ public class ServletUtil {
 	 * 需要注意的是，使用此方法获取的客户IP地址必须在Http服务器（例如Nginx）中配置头信息，否则容易造成IP伪造。
 	 * </p>
 	 *
-	 * @param request 请求对象{@link HttpServletRequest}
+	 * @param request          请求对象{@link HttpServletRequest}
 	 * @param otherHeaderNames 其他自定义头文件，通常在Http服务器（例如Nginx）中配置
 	 * @return IP地址
 	 */
 	public static String getClientIP(HttpServletRequest request, String... otherHeaderNames) {
-		String[] headers = { "X-Forwarded-For", "X-Real-IP", "Proxy-Client-IP", "WL-Proxy-Client-IP", "HTTP_CLIENT_IP", "HTTP_X_FORWARDED_FOR" };
+		String[] headers = {"X-Forwarded-For", "X-Real-IP", "Proxy-Client-IP", "WL-Proxy-Client-IP", "HTTP_CLIENT_IP", "HTTP_X_FORWARDED_FOR"};
 		if (ArrayUtil.isNotEmpty(otherHeaderNames)) {
 			headers = ArrayUtil.addAll(headers, otherHeaderNames);
 		}
@@ -223,7 +225,7 @@ public class ServletUtil {
 	 * 需要注意的是，使用此方法获取的客户IP地址必须在Http服务器（例如Nginx）中配置头信息，否则容易造成IP伪造。
 	 * </p>
 	 *
-	 * @param request 请求对象{@link HttpServletRequest}
+	 * @param request     请求对象{@link HttpServletRequest}
 	 * @param headerNames 自定义头，通常在Http服务器（例如Nginx）中配置
 	 * @return IP地址
 	 * @since 4.4.1
@@ -258,7 +260,7 @@ public class ServletUtil {
 	 * 包括文件和普通表单数据<br>
 	 * 在同一次请求中，此方法只能被执行一次！
 	 *
-	 * @param request {@link ServletRequest}
+	 * @param request       {@link ServletRequest}
 	 * @param uploadSetting 上传文件的设定，包括最大文件大小、保存在内存的边界大小、临时目录、扩展名限定等
 	 * @return MultiPart表单
 	 * @throws IORuntimeException IO异常
@@ -276,6 +278,7 @@ public class ServletUtil {
 	}
 
 	// --------------------------------------------------------- Header start
+
 	/**
 	 * 获取请求所有的头（header）信息
 	 *
@@ -300,7 +303,7 @@ public class ServletUtil {
 	/**
 	 * 忽略大小写获得请求header中的信息
 	 *
-	 * @param request 请求对象{@link HttpServletRequest}
+	 * @param request        请求对象{@link HttpServletRequest}
 	 * @param nameIgnoreCase 忽略大小写头信息的KEY
 	 * @return header值
 	 */
@@ -320,8 +323,8 @@ public class ServletUtil {
 	/**
 	 * 获得请求header中的信息
 	 *
-	 * @param request 请求对象{@link HttpServletRequest}
+	 * @param request     请求对象{@link HttpServletRequest}
-	 * @param name 头信息的KEY
+	 * @param name        头信息的KEY
 	 * @param charsetName 字符集
 	 * @return header值
 	 */
@@ -333,7 +336,7 @@ public class ServletUtil {
 	 * 获得请求header中的信息
 	 *
 	 * @param request 请求对象{@link HttpServletRequest}
-	 * @param name 头信息的KEY
+	 * @param name    头信息的KEY
 	 * @param charset 字符集
 	 * @return header值
 	 * @since 4.6.2
@@ -402,11 +405,12 @@ public class ServletUtil {
 	// --------------------------------------------------------- Header end
 
 	// --------------------------------------------------------- Cookie start
+
 	/**
 	 * 获得指定的Cookie
 	 *
 	 * @param httpServletRequest {@link HttpServletRequest}
-	 * @param name cookie名
+	 * @param name               cookie名
 	 * @return Cookie对象
 	 */
 	public static Cookie getCookie(HttpServletRequest httpServletRequest, String name) {
@@ -421,7 +425,7 @@ public class ServletUtil {
 	 */
 	public static Map<String, Cookie> readCookieMap(HttpServletRequest httpServletRequest) {
 		final Cookie[] cookies = httpServletRequest.getCookies();
-		if(ArrayUtil.isEmpty(cookies)){
+		if (ArrayUtil.isEmpty(cookies)) {
 			return MapUtil.empty();
 		}
 
@@ -435,7 +439,7 @@ public class ServletUtil {
 	 * 设定返回给客户端的Cookie
 	 *
 	 * @param response 响应对象{@link HttpServletResponse}
-	 * @param cookie Servlet Cookie对象
+	 * @param cookie   Servlet Cookie对象
 	 */
 	public static void addCookie(HttpServletResponse response, Cookie cookie) {
 		response.addCookie(cookie);
@@ -445,8 +449,8 @@ public class ServletUtil {
 	 * 设定返回给客户端的Cookie
 	 *
 	 * @param response 响应对象{@link HttpServletResponse}
-	 * @param name Cookie名
+	 * @param name     Cookie名
-	 * @param value Cookie值
+	 * @param value    Cookie值
 	 */
 	public static void addCookie(HttpServletResponse response, String name, String value) {
 		response.addCookie(new Cookie(name, value));
@@ -455,12 +459,12 @@ public class ServletUtil {
 	/**
 	 * 设定返回给客户端的Cookie
 	 *
-	 * @param response 响应对象{@link HttpServletResponse}
+	 * @param response        响应对象{@link HttpServletResponse}
-	 * @param name cookie名
+	 * @param name            cookie名
-	 * @param value cookie值
+	 * @param value           cookie值
 	 * @param maxAgeInSeconds -1: 关闭浏览器清除Cookie. 0: 立即清除Cookie. &gt;0 : Cookie存在的秒数.
-	 * @param path Cookie的有效路径
+	 * @param path            Cookie的有效路径
-	 * @param domain the domain name within which this cookie is visible; form is according to RFC 2109
+	 * @param domain          the domain name within which this cookie is visible; form is according to RFC 2109
 	 */
 	public static void addCookie(HttpServletResponse response, String name, String value, int maxAgeInSeconds, String path, String domain) {
 		Cookie cookie = new Cookie(name, value);
@@ -477,9 +481,9 @@ public class ServletUtil {
 	 * Path: "/"<br>
 	 * No Domain
 	 *
-	 * @param response 响应对象{@link HttpServletResponse}
+	 * @param response        响应对象{@link HttpServletResponse}
-	 * @param name cookie名
+	 * @param name            cookie名
-	 * @param value cookie值
+	 * @param value           cookie值
 	 * @param maxAgeInSeconds -1: 关闭浏览器清除Cookie. 0: 立即清除Cookie. &gt;0 : Cookie存在的秒数.
 	 */
 	public static void addCookie(HttpServletResponse response, String name, String value, int maxAgeInSeconds) {
@@ -488,6 +492,7 @@ public class ServletUtil {
 
 	// --------------------------------------------------------- Cookie end
 	// --------------------------------------------------------- Response start
+
 	/**
 	 * 获得PrintWriter
 	 *
@@ -506,8 +511,8 @@ public class ServletUtil {
 	/**
 	 * 返回数据给客户端
 	 *
-	 * @param response 响应对象{@link HttpServletResponse}
+	 * @param response    响应对象{@link HttpServletResponse}
-	 * @param text 返回的内容
+	 * @param text        返回的内容
 	 * @param contentType 返回的类型
 	 */
 	public static void write(HttpServletResponse response, String text, String contentType) {
@@ -528,7 +533,7 @@ public class ServletUtil {
 	 * 返回文件给客户端
 	 *
 	 * @param response 响应对象{@link HttpServletResponse}
-	 * @param file 写出的文件对象
+	 * @param file     写出的文件对象
 	 * @since 4.1.15
 	 */
 	public static void write(HttpServletResponse response, File file) {
@@ -546,21 +551,21 @@ public class ServletUtil {
 	/**
 	 * 返回数据给客户端
 	 *
-	 * @param response 响应对象{@link HttpServletResponse}
+	 * @param response    响应对象{@link HttpServletResponse}
-	 * @param in 需要返回客户端的内容
+	 * @param in          需要返回客户端的内容
 	 * @param contentType 返回的类型
-	 *                       如：
+	 *                    如：
-	 *                       1、application/pdf、
+	 *                    1、application/pdf、
-	 *                       2、application/vnd.ms-excel、
+	 *                    2、application/vnd.ms-excel、
-	 *                       3、application/msword、
+	 *                    3、application/msword、
-	 *                       4、application/vnd.ms-powerpoint
+	 *                    4、application/vnd.ms-powerpoint
-	 *        docx、xlsx 这种 office 2007 格式 设置 MIME;网页里面docx 文件是没问题，但是下载下来了之后就变成doc格式了
+	 *                    docx、xlsx 这种 office 2007 格式 设置 MIME;网页里面docx 文件是没问题，但是下载下来了之后就变成doc格式了
-	 *        https://blog.csdn.net/cyh2260629/article/details/73824760
+	 *                    https://blog.csdn.net/cyh2260629/article/details/73824760
-	 *                      5、MIME_EXCELX_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+	 *                    5、MIME_EXCELX_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-	 *                      6、MIME_PPTX_TYPE = "application/vnd.openxmlformats-officedocument.presentationml.presentation";
+	 *                    6、MIME_PPTX_TYPE = "application/vnd.openxmlformats-officedocument.presentationml.presentation";
-	 *                      7、MIME_WORDX_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+	 *                    7、MIME_WORDX_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
-	 *                      8、MIME_STREAM_TYPE = "application/octet-stream;charset=utf-8"; #原始字节流
+	 *                    8、MIME_STREAM_TYPE = "application/octet-stream;charset=utf-8"; #原始字节流
-	 * @param fileName 文件名
+	 * @param fileName    文件名
 	 * @since 4.1.15
 	 */
 	public static void write(HttpServletResponse response, InputStream in, String contentType, String fileName) {
@@ -573,8 +578,8 @@ public class ServletUtil {
 	/**
 	 * 返回数据给客户端
 	 *
-	 * @param response 响应对象{@link HttpServletResponse}
+	 * @param response    响应对象{@link HttpServletResponse}
-	 * @param in 需要返回客户端的内容
+	 * @param in          需要返回客户端的内容
 	 * @param contentType 返回的类型
 	 */
 	public static void write(HttpServletResponse response, InputStream in, String contentType) {
@@ -586,7 +591,7 @@ public class ServletUtil {
 	 * 返回数据给客户端
 	 *
 	 * @param response 响应对象{@link HttpServletResponse}
-	 * @param in 需要返回客户端的内容
+	 * @param in       需要返回客户端的内容
 	 */
 	public static void write(HttpServletResponse response, InputStream in) {
 		write(response, in, IoUtil.DEFAULT_BUFFER_SIZE);
@@ -595,8 +600,8 @@ public class ServletUtil {
 	/**
 	 * 返回数据给客户端
 	 *
-	 * @param response 响应对象{@link HttpServletResponse}
+	 * @param response   响应对象{@link HttpServletResponse}
-	 * @param in 需要返回客户端的内容
+	 * @param in         需要返回客户端的内容
 	 * @param bufferSize 缓存大小
 	 */
 	public static void write(HttpServletResponse response, InputStream in, int bufferSize) {
@@ -616,15 +621,15 @@ public class ServletUtil {
 	 * 设置响应的Header
 	 *
 	 * @param response 响应对象{@link HttpServletResponse}
-	 * @param name 名
+	 * @param name     名
-	 * @param value 值，可以是String，Date， int
+	 * @param value    值，可以是String，Date， int
 	 */
 	public static void setHeader(HttpServletResponse response, String name, Object value) {
 		if (value instanceof String) {
 			response.setHeader(name, (String) value);
 		} else if (Date.class.isAssignableFrom(value.getClass())) {
 			response.setDateHeader(name, ((Date) value).getTime());
-		} else if (value instanceof Integer || "int".equals(value.getClass().getSimpleName().toLowerCase())) {
+		} else if (value instanceof Integer || "int".equalsIgnoreCase(value.getClass().getSimpleName())) {
 			response.setIntHeader(name, (int) value);
 		} else {
 			response.setHeader(name, value.toString());

hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java

@@ -9,6 +9,8 @@ import cn.hutool.extra.template.TemplateConfig.ResourceMode;
 import cn.hutool.extra.template.TemplateEngine;
 import com.jfinal.template.source.FileSourceFactory;
 
+import java.io.File;
+
 /**
  * Enjoy库的引擎包装
  *
@@ -99,7 +101,8 @@ public class EnjoyEngine implements TemplateEngine {
 				break;
 			case WEB_ROOT:
 				engine.setSourceFactory(new FileSourceFactory());
-				engine.setBaseTemplatePath(FileUtil.getAbsolutePath(FileUtil.getWebRoot()));
+				final File root = FileUtil.file(FileUtil.getWebRoot(), config.getPath());
+				engine.setBaseTemplatePath(FileUtil.getAbsolutePath(root));
 				break;
 			default:
 				break;

hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java

@@ -1,11 +1,16 @@
 package cn.hutool.extra.template.engine.wit;
 
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.lang.Dict;
 import cn.hutool.extra.template.Template;
 import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateException;
 import org.febit.wit.Engine;
 import org.febit.wit.exceptions.ResourceNotFoundException;
+import org.febit.wit.util.Props;
+
+import java.io.File;
 
 /**
  * Wit(http://zqq90.github.io/webit-script/)模板引擎封装
@@ -75,10 +80,34 @@ public class WitEngine implements TemplateEngine {
 	 * @return {@link Engine}
 	 */
 	private static Engine createEngine(TemplateConfig config) {
-		if (null == config) {
+		final Props configProps = Engine.createConfigProps("");
-			config = TemplateConfig.DEFAULT;
+		Dict dict = null;
+
+		if (null != config) {
+			dict = Dict.create();
+			// 自定义编码
+			dict.set("DEFAULT_ENCODING", config.getCharset());
+
+			switch (config.getResourceMode()){
+				case CLASSPATH:
+					configProps.set("pathLoader.root", config.getPath());
+					configProps.set("routeLoader.defaultLoader", "classpathLoader");
+					break;
+				case STRING:
+					configProps.set("routeLoader.defaultLoader", "stringLoader");
+					break;
+				case FILE:
+					configProps.set("pathLoader.root", config.getPath());
+					configProps.set("routeLoader.defaultLoader", "fileLoader");
+					break;
+				case WEB_ROOT:
+					final File root = FileUtil.file(FileUtil.getWebRoot(), config.getPath());
+					configProps.set("pathLoader.root", FileUtil.getAbsolutePath(root));
+					configProps.set("routeLoader.defaultLoader", "fileLoader");
+					break;
+			}
 		}
 
-		return Engine.create();
+		return Engine.create(configProps,dict);
 	}
 }

hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java

@@ -54,6 +54,14 @@ public class QrCodeUtilTest {
 		Console.log(decode);
 	}
 
+	@Test
+	@Ignore
+	public void decodeTest2() {
+		// 条形码
+		String decode = QrCodeUtil.decode(FileUtil.file("d:/test/90.png"));
+		Console.log(decode);
+	}
+
 	@Test
 	@Ignore
 	public void generateAsBase64Test(){

hutool-extra/src/test/java/cn/hutool/extra/servlet/ServletUtilTest.java

@@ -1,5 +1,6 @@
 package cn.hutool.extra.servlet;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import javax.servlet.http.HttpServletResponse;
@@ -8,18 +9,22 @@ import java.nio.charset.StandardCharsets;
 
 /**
  * ServletUtil工具类测试
+ *
  * @author dazer
  * @date 2021/3/24 15:02
  * @see ServletUtil
  */
 public class ServletUtilTest {
+
 	@Test
+	@Ignore
 	public void writeTest() {
 		HttpServletResponse response = null;
-		byte[] bytes = new String("地球是我们共同的家园，需要大家珍惜.").getBytes(StandardCharsets.UTF_8);
+		byte[] bytes = "地球是我们共同的家园，需要大家珍惜.".getBytes(StandardCharsets.UTF_8);
 
 		//下载文件
 		// 这里没法直接测试，直接写到这里，方便调用；
+		//noinspection ConstantConditions
 		if (response != null) {
 			String fileName = "签名文件.pdf";
 			String contentType = "application/pdf";// application/octet-stream、image/jpeg、image/gif

hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java

@@ -157,10 +157,20 @@ public class TemplateUtilTest {
 
 	@Test
 	public void WitEngineTest() {
-		TemplateEngine engine = TemplateUtil.createEngine(
+		//classpath模板
-				new TemplateConfig("templates", ResourceMode.CLASSPATH).setCustomEngine(WitEngine.class));
+		TemplateConfig config = new TemplateConfig("templates", ResourceMode.CLASSPATH)
-		Template template = engine.getTemplate("/templates/wit_test.wit");
+				.setCustomEngine(WitEngine.class);
+		TemplateEngine engine = TemplateUtil.createEngine(config);
+		Template template = engine.getTemplate("/wit_test.wit");
 		String result = template.render(Dict.create().set("name", "hutool"));
 		Assert.assertEquals("hello,hutool", StrUtil.trim(result));
+
+		// 字符串模板
+		config = new TemplateConfig("templates", ResourceMode.STRING)
+				.setCustomEngine(WitEngine.class);
+		engine = TemplateUtil.createEngine(config);
+		template = engine.getTemplate("<%var name;%>hello,${name}");
+		result = template.render(Dict.create().set("name", "hutool"));
+		Assert.assertEquals("hello,hutool", StrUtil.trim(result));
 	}
 }

hutool-http/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-http</artifactId>

hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java

@@ -318,4 +318,11 @@ public class HttpUtilTest {
 		final String s = HttpUtil.get(url);
 		Console.log(s);
 	}
+
+	@Test
+	@Ignore
+	public void sinajsTest(){
+		final String s = HttpUtil.get("http://hq.sinajs.cn/list=sh600519");
+		Console.log(s);
+	}
 }

hutool-json/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-json</artifactId>

hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java

@@ -50,7 +50,9 @@ final class InternalJSONUtil {
 		} else if (value instanceof Iterable || value instanceof Iterator || value.getClass().isArray()) {
 			new JSONArray(value).write(writer, indentFactor, indent);
 		} else if (value instanceof Number) {
-			writer.write(NumberUtil.toStr((Number) value));
+			// since 5.6.2可配置是否去除末尾多余0，例如如果为true,5.0返回5
+			final boolean isStripTrailingZeros = null == config || config.isStripTrailingZeros();
+			writer.write(NumberUtil.toStr((Number) value, isStripTrailingZeros));
 		} else if (value instanceof Date || value instanceof Calendar || value instanceof TemporalAccessor) {
 			final String format = (null == config) ? null : config.getDateFormat();
 			writer.write(formatDate(value, format));

hutool-json/src/main/java/cn/hutool/json/JSONConfig.java

@@ -36,6 +36,11 @@ public class JSONConfig implements Serializable {
 	 */
 	private boolean transientSupport = true;
 
+	/**
+	 * 是否去除末尾多余0，例如如果为true,5.0返回5
+	 */
+	private boolean stripTrailingZeros = true;
+
 	/**
 	 * 创建默认的配置项
 	 *
@@ -192,4 +197,23 @@ public class JSONConfig implements Serializable {
 		this.transientSupport = transientSupport;
 		return this;
 	}
+
+	/**
+	 * 是否去除末尾多余0，例如如果为true,5.0返回5
+	 * @return 是否去除末尾多余0，例如如果为true,5.0返回5
+	 * @since 5.6.2
+	 */
+	public boolean isStripTrailingZeros() {
+		return stripTrailingZeros;
+	}
+
+	/**
+	 * 设置是否去除末尾多余0，例如如果为true,5.0返回5
+	 * @param stripTrailingZeros 是否去除末尾多余0，例如如果为true,5.0返回5
+	 * @since 5.6.2
+	 */
+	public JSONConfig setStripTrailingZeros(boolean stripTrailingZeros) {
+		this.stripTrailingZeros = stripTrailingZeros;
+		return this;
+	}
 }

hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java

@@ -173,6 +173,23 @@ public class JSONUtilTest {
 		Assert.assertEquals("{\"test2\":12.0}", jsonObject.toString());
 	}
 
+	@Test
+	public void setStripTrailingZerosTest() {
+		// 默认去除多余的0
+		final JSONObject jsonObjectDefault = JSONUtil.createObj()
+				.set("test2", 12.00D);
+		Assert.assertEquals("{\"test2\":12}", jsonObjectDefault.toString());
+
+		// 不去除多余的0
+		final JSONObject jsonObject = JSONUtil.createObj(JSONConfig.create().setStripTrailingZeros(false))
+				.set("test2", 12.00D);
+		Assert.assertEquals("{\"test2\":12.0}", jsonObject.toString());
+
+		// 去除多余的0
+		jsonObject.getConfig().setStripTrailingZeros(true);
+		Assert.assertEquals("{\"test2\":12}", jsonObject.toString());
+	}
+
 	@Test
 	public void parseObjTest() {
 		// 测试转义

hutool-log/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-log</artifactId>

hutool-poi/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-poi</artifactId>
@@ -44,7 +44,7 @@
 		<dependency>
 			<groupId>org.ofdrw</groupId>
 			<artifactId>ofdrw-full</artifactId>
-			<version>1.7.3</version>
+			<version>1.7.4</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>

hutool-script/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-script</artifactId>

hutool-setting/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-setting</artifactId>

hutool-socket/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-socket</artifactId>

hutool-system/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.6.2-SNAPSHOT</version>
+		<version>5.6.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-system</artifactId>
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.github.oshi</groupId>
 			<artifactId>oshi-core</artifactId>
-			<version>5.6.0</version>
+			<version>5.6.1</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

pom.xml

@@ -8,7 +8,7 @@
 
 	<groupId>cn.hutool</groupId>
 	<artifactId>hutool-parent</artifactId>
-	<version>5.6.2-SNAPSHOT</version>
+	<version>5.6.3-SNAPSHOT</version>
 	<name>hutool</name>
 	<description>Hutool是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。</description>
 	<url>https://github.com/looly/hutool</url>