From 612884e0f6561742547136b76f7d855302d68a52 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Wed, 24 Nov 2021 09:35:50 +0800
Subject: [PATCH 01/29] fix code

---
 hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java     | 2 ++
 .../src/main/java/cn/hutool/poi/excel/sax/Excel07SaxReader.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
index a43a053dc..d71606139 100644
--- a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
@@ -1624,7 +1624,9 @@ public class DateUtil extends CalendarUtil {
 	 *
 	 * @param date 日期
 	 * @return int
+	 * @deprecated 2022年后结果溢出，此方法废弃
 	 */
+	@Deprecated
 	public static int toIntSecond(Date date) {
 		return Integer.parseInt(DateUtil.format(date, "yyMMddHHmm"));
 	}
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel07SaxReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel07SaxReader.java
index 8d1bf84f2..e742e8fa1 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel07SaxReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel07SaxReader.java
@@ -56,7 +56,7 @@ public class Excel07SaxReader implements ExcelSaxReader<Excel07SaxReader> {
 
 	@Override
 	public Excel07SaxReader read(File file, String idOrRidOrSheetName) throws POIException {
-		try (OPCPackage open = OPCPackage.open(file, PackageAccess.READ);){
+		try (OPCPackage open = OPCPackage.open(file, PackageAccess.READ)){
 			return read(open, idOrRidOrSheetName);
 		} catch (InvalidFormatException | IOException e) {
 			throw new POIException(e);

From 1e82d7bd5f6905b1051b05a1ba6e5d505490e697 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Wed, 24 Nov 2021 09:36:56 +0800
Subject: [PATCH 02/29] fix code

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be9effe61..1273f46f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 -------------------------------------------------------------------------------------------------------------
 
-# 5.7.17 (2021-11-20)
+# 5.7.17 (2021-11-24)
 
 ### 🐣新特性
 * 【core   】     增加AsyncUtil（pr#457@Gitee）
@@ -21,6 +21,7 @@
 * 【core   】     ResourceClassLoader增加缓存（pr#1959@Github）
 * 【crypto 】     增加CipherWrapper，增加setRandom（issue#1958@Github）
 * 【core   】     Opt增加ofTry方法（pr#1956@Github）
+* 【core   】     DateUtil.toIntSecond标记为弃用（issue#I4JHPR@Gitee）
 * 
 ### 🐞Bug修复
 * 【core   】     修复FileResource构造fileName参数无效问题（issue#1942@Github）

From 3a043a261e90c6f9cc281b880820cecaba918eb6 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Wed, 24 Nov 2021 09:53:34 +0800
Subject: [PATCH 03/29] deprecated code

---
 CHANGELOG.md                                  |  1 +
 .../main/java/cn/hutool/db/AbstractDb.java    |  2 +
 .../java/cn/hutool/db/sql/SqlExecutor.java    | 44 ++++++++++---------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1273f46f2..e4ab637d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 * 【crypto 】     增加CipherWrapper，增加setRandom（issue#1958@Github）
 * 【core   】     Opt增加ofTry方法（pr#1956@Github）
 * 【core   】     DateUtil.toIntSecond标记为弃用（issue#I4JHPR@Gitee）
+* 【db     】     Db.executeBatch标记一个重载为弃用（issue#I4JIPH@Gitee）
 * 
 ### 🐞Bug修复
 * 【core   】     修复FileResource构造fileName参数无效问题（issue#1942@Github）
diff --git a/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java b/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java
index 77c20fcc4..0c40d4de2 100644
--- a/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java
+++ b/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java
@@ -239,7 +239,9 @@ public abstract class AbstractDb implements Serializable {
 	 * @param paramsBatch 批量的参数
 	 * @return 每个SQL执行影响的行数
 	 * @throws SQLException SQL执行异常
+	 * @deprecated 编译器无法区分重载
 	 */
+	@Deprecated
 	public int[] executeBatch(String sql, Object[]... paramsBatch) throws SQLException {
 		Connection conn = null;
 		try {
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java
index a64973625..e3aa4439b 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java
@@ -16,7 +16,7 @@ import java.util.Map;
 /**
  * SQL执行器，全部为静态方法，执行查询或非查询的SQL语句<br>
  * 此方法为JDBC的简单封装，与数据库类型无关
- * 
+ *
  * @author loolly
  *
  */
@@ -26,7 +26,7 @@ public class SqlExecutor {
 	 * 执行非查询语句<br>
 	 * 语句包括 插入、更新、删除<br>
 	 * 此方法不会关闭Connection
-	 * 
+	 *
 	 * @param conn 数据库连接对象
 	 * @param sql SQL，使用name做为占位符，例如:name
 	 * @param paramMap 参数Map
@@ -43,7 +43,7 @@ public class SqlExecutor {
 	 * 执行非查询语句<br>
 	 * 语句包括 插入、更新、删除<br>
 	 * 此方法不会关闭Connection
-	 * 
+	 *
 	 * @param conn 数据库连接对象
 	 * @param sql SQL
 	 * @param params 参数
@@ -63,7 +63,7 @@ public class SqlExecutor {
 	/**
 	 * 执行调用存储过程<br>
 	 * 此方法不会关闭Connection
-	 * 
+	 *
 	 * @param conn 数据库连接对象
 	 * @param sql SQL
 	 * @param params 参数
@@ -83,7 +83,7 @@ public class SqlExecutor {
 	/**
 	 * 执行调用存储过程<br>
 	 * 此方法不会关闭Connection
-	 * 
+	 *
 	 * @param conn 数据库连接对象
 	 * @param sql SQL
 	 * @param params 参数
@@ -99,7 +99,7 @@ public class SqlExecutor {
 	 * 执行非查询语句，返回主键<br>
 	 * 发查询语句包括 插入、更新、删除<br>
 	 * 此方法不会关闭Connection
-	 * 
+	 *
 	 * @param conn 数据库连接对象
 	 * @param sql SQL
 	 * @param paramMap 参数Map
@@ -116,7 +116,7 @@ public class SqlExecutor {
 	 * 执行非查询语句，返回主键<br>
 	 * 发查询语句包括 插入、更新、删除<br>
 	 * 此方法不会关闭Connection
-	 * 
+	 *
 	 * @param conn 数据库连接对象
 	 * @param sql SQL
 	 * @param params 参数
@@ -148,22 +148,24 @@ public class SqlExecutor {
 	 * 批量执行非查询语句<br>
 	 * 语句包括 插入、更新、删除<br>
 	 * 此方法不会关闭Connection
-	 * 
+	 *
 	 * @param conn 数据库连接对象
 	 * @param sql SQL
 	 * @param paramsBatch 批量的参数
 	 * @return 每个SQL执行影响的行数
 	 * @throws SQLException SQL执行异常
+	 * @deprecated 重载导致编译器无法区分
 	 */
+	@Deprecated
 	public static int[] executeBatch(Connection conn, String sql, Object[]... paramsBatch) throws SQLException {
 		return executeBatch(conn, sql, new ArrayIter<>(paramsBatch));
 	}
-	
+
 	/**
 	 * 批量执行非查询语句<br>
 	 * 语句包括 插入、更新、删除<br>
 	 * 此方法不会关闭Connection
-	 * 
+	 *
 	 * @param conn 数据库连接对象
 	 * @param sql SQL
 	 * @param paramsBatch 批量的参数
@@ -179,12 +181,12 @@ public class SqlExecutor {
 			DbUtil.close(ps);
 		}
 	}
-	
+
 	/**
 	 * 批量执行非查询语句<br>
 	 * 语句包括 插入、更新、删除<br>
 	 * 此方法不会关闭Connection
-	 * 
+	 *
 	 * @param conn 数据库连接对象
 	 * @param sqls SQL列表
 	 * @return 每个SQL执行影响的行数
@@ -194,12 +196,12 @@ public class SqlExecutor {
 	public static int[] executeBatch(Connection conn, String... sqls) throws SQLException {
 		return executeBatch(conn, new ArrayIter<>(sqls));
 	}
-	
+
 	/**
 	 * 批量执行非查询语句<br>
 	 * 语句包括 插入、更新、删除<br>
 	 * 此方法不会关闭Connection
-	 * 
+	 *
 	 * @param conn 数据库连接对象
 	 * @param sqls SQL列表
 	 * @return 每个SQL执行影响的行数
@@ -222,7 +224,7 @@ public class SqlExecutor {
 	/**
 	 * 执行查询语句，例如：select * from table where field1=:name1 <br>
 	 * 此方法不会关闭Connection
-	 * 
+	 *
 	 * @param <T> 处理结果类型
 	 * @param conn 数据库连接对象
 	 * @param sql 查询语句，使用参数名占位符，例如:name
@@ -240,7 +242,7 @@ public class SqlExecutor {
 	/**
 	 * 执行查询语句<br>
 	 * 此方法不会关闭Connection
-	 * 
+	 *
 	 * @param <T> 处理结果类型
 	 * @param conn 数据库连接对象
 	 * @param sql 查询语句
@@ -282,7 +284,7 @@ public class SqlExecutor {
 	 * executeUpdate 的返回值是一个整数（int），指示受影响的行数（即更新计数）。<br>
 	 * 对于 CREATE TABLE 或 DROP TABLE 等不操作行的语句，executeUpdate 的返回值总为零。<br>
 	 * 此方法不会关闭PreparedStatement
-	 * 
+	 *
 	 * @param ps PreparedStatement对象
 	 * @param params 参数
 	 * @return 影响的行数
@@ -297,7 +299,7 @@ public class SqlExecutor {
 	 * 可用于执行任何SQL语句，返回一个boolean值，表明执行该SQL语句是否返回了ResultSet。<br>
 	 * 如果执行后第一个结果是ResultSet，则返回true，否则返回false。<br>
 	 * 此方法不会关闭PreparedStatement
-	 * 
+	 *
 	 * @param ps PreparedStatement对象
 	 * @param params 参数
 	 * @return 如果执行后第一个结果是ResultSet，则返回true，否则返回false。
@@ -311,7 +313,7 @@ public class SqlExecutor {
 	/**
 	 * 执行查询语句<br>
 	 * 此方法不会关闭PreparedStatement
-	 * 
+	 *
 	 * @param <T> 处理结果类型
 	 * @param ps PreparedStatement
 	 * @param rsh 结果集处理对象
@@ -326,7 +328,7 @@ public class SqlExecutor {
 
 	/**
 	 * 执行查询语句并关闭PreparedStatement
-	 * 
+	 *
 	 * @param <T> 处理结果类型
 	 * @param ps PreparedStatement
 	 * @param rsh 结果集处理对象
@@ -345,7 +347,7 @@ public class SqlExecutor {
 	// -------------------------------------------------------------------------------------------------------------------------------- Private method start
 	/**
 	 * 执行查询
-	 * 
+	 *
 	 * @param ps {@link PreparedStatement}
 	 * @param rsh 结果集处理对象
 	 * @return 结果对象

From b2804a15c22dabc2f10c9fb8f17859500182d468 Mon Sep 17 00:00:00 2001
From: sunhao <qixiazhen@qq.com>
Date: Wed, 24 Nov 2021 11:09:44 +0800
Subject: [PATCH 04/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=E3=80=90=E5=B9=B6?=
 =?UTF-8?q?=E5=8F=91=E6=B5=8B=E8=AF=95=E5=90=8E=E6=9C=AA=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E6=B1=A0=E3=80=91=E3=80=81=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=97=A0=E6=84=8F=E4=B9=89=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/hutool/core/thread/ConcurrencyTester.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ConcurrencyTester.java b/hutool-core/src/main/java/cn/hutool/core/thread/ConcurrencyTester.java
index 9b53d4f34..1accd2368 100644
--- a/hutool-core/src/main/java/cn/hutool/core/thread/ConcurrencyTester.java
+++ b/hutool-core/src/main/java/cn/hutool/core/thread/ConcurrencyTester.java
@@ -40,10 +40,12 @@ public class ConcurrencyTester {
 		this.sf.clearWorker();
 
 		timeInterval.start();
-		this.sf//
-				.addRepeatWorker(runnable)//
-				.setBeginAtSameTime(true)// 同时开始
+		this.sf
+				.addRepeatWorker(runnable)
+				.setBeginAtSameTime(true)
 				.start();
+		// 停止线程池释放资源，避免空跑
+		this.sf.stop();
 
 		this.interval = timeInterval.interval();
 		return this;

From ff8317dd8c597fe175a9d8e310acfc3b3a2714b6 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Wed, 24 Nov 2021 15:39:31 +0800
Subject: [PATCH 05/29] fix code

---
 .../hutool/core/thread/ConcurrencyTester.java  | 18 ++++++++++++++----
 .../cn/hutool/core/thread/SyncFinisher.java    |  9 ++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ConcurrencyTester.java b/hutool-core/src/main/java/cn/hutool/core/thread/ConcurrencyTester.java
index 1accd2368..f0cdd33b5 100644
--- a/hutool-core/src/main/java/cn/hutool/core/thread/ConcurrencyTester.java
+++ b/hutool-core/src/main/java/cn/hutool/core/thread/ConcurrencyTester.java
@@ -2,6 +2,9 @@ package cn.hutool.core.thread;
 
 import cn.hutool.core.date.TimeInterval;
 
+import java.io.Closeable;
+import java.io.IOException;
+
 /**
  * 高并发测试工具类
  *
@@ -12,11 +15,14 @@ import cn.hutool.core.date.TimeInterval;
  * ct.test(() -&gt; {
  *      // 需要并发测试的业务代码
  * });
+ *
+ * Console.log(ct.getInterval());
+ * ct.close();
  * </pre>
  *
  * @author kwer
  */
-public class ConcurrencyTester {
+public class ConcurrencyTester implements Closeable {
 	private final SyncFinisher sf;
 	private final TimeInterval timeInterval;
 	private long interval;
@@ -31,7 +37,8 @@ public class ConcurrencyTester {
 	}
 
 	/**
-	 * 执行测试
+	 * 执行测试<br>
+	 * 执行测试后不会关闭线程池，可以调用{@link #close()}释放线程池
 	 *
 	 * @param runnable 要测试的内容
 	 * @return this
@@ -44,8 +51,6 @@ public class ConcurrencyTester {
 				.addRepeatWorker(runnable)
 				.setBeginAtSameTime(true)
 				.start();
-		// 停止线程池释放资源，避免空跑
-		this.sf.stop();
 
 		this.interval = timeInterval.interval();
 		return this;
@@ -76,4 +81,9 @@ public class ConcurrencyTester {
 	public long getInterval() {
 		return this.interval;
 	}
+
+	@Override
+	public void close() throws IOException {
+		this.sf.close();
+	}
 }
diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/SyncFinisher.java b/hutool-core/src/main/java/cn/hutool/core/thread/SyncFinisher.java
index 18ad5fad5..512c0d89b 100644
--- a/hutool-core/src/main/java/cn/hutool/core/thread/SyncFinisher.java
+++ b/hutool-core/src/main/java/cn/hutool/core/thread/SyncFinisher.java
@@ -2,6 +2,8 @@ package cn.hutool.core.thread;
 
 import cn.hutool.core.exceptions.UtilException;
 
+import java.io.Closeable;
+import java.io.IOException;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
@@ -25,7 +27,7 @@ import java.util.concurrent.ExecutorService;
  * @author Looly
  * @since 4.1.15
  */
-public class SyncFinisher {
+public class SyncFinisher implements Closeable {
 
 	private final Set<Worker> workers;
 	private final int threadSize;
@@ -173,6 +175,11 @@ public class SyncFinisher {
 		return endLatch.getCount();
 	}
 
+	@Override
+	public void close() throws IOException {
+		stop();
+	}
+
 	/**
 	 * 工作者，为一个线程
 	 *

From 30515f03518e417dfda4a83383f39e311f14e721 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Wed, 24 Nov 2021 23:10:59 +0800
Subject: [PATCH 06/29] add method

---
 CHANGELOG.md                                  |  1 +
 .../cn/hutool/core/text/CharSequenceUtil.java | 27 +++++++++++++++----
 .../core/text/CharSequenceUtilTest.java       | 13 +++++++++
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4ab637d5..1dbe0b555 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 * 【core   】     Opt增加ofTry方法（pr#1956@Github）
 * 【core   】     DateUtil.toIntSecond标记为弃用（issue#I4JHPR@Gitee）
 * 【db     】     Db.executeBatch标记一个重载为弃用（issue#I4JIPH@Gitee）
+* 【core   】     增加CharSequenceUtil.subPreGbk重载（issue#I4JO2E@Gitee）
 * 
 ### 🐞Bug修复
 * 【core   】     修复FileResource构造fileName参数无效问题（issue#1942@Github）
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
index 8310c72de..15a07faff 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
@@ -1979,19 +1979,32 @@ public class CharSequenceUtil {
 	 * 截取部分字符串，这里一个汉字的长度认为是2
 	 *
 	 * @param str    字符串
-	 * @param len    切割的位置
+	 * @param len    bytes切割到的位置（包含）
 	 * @param suffix 切割后加上后缀
 	 * @return 切割后的字符串
 	 * @since 3.1.1
 	 */
 	public static String subPreGbk(CharSequence str, int len, CharSequence suffix) {
+		return subPreGbk(str, len, true) + suffix;
+	}
+
+	/**
+	 * 截取部分字符串，这里一个汉字的长度认为是2<br>
+	 * 可以自定义halfUp，如len为10，如果截取后最后一个字符是半个字符，{@code true}表示保留，则长度是11，否则长度9
+	 *
+	 * @param str    字符串
+	 * @param len    bytes切割到的位置（包含）
+	 * @param halfUp 遇到截取一半的GBK字符，是否保留。
+	 * @return 切割后的字符串
+	 * @since 5.7.17
+	 */
+	public static String subPreGbk(CharSequence str, int len, boolean halfUp) {
 		if (isEmpty(str)) {
 			return str(str);
 		}
 
-		byte[] b;
 		int counterOfDoubleByte = 0;
-		b = str.toString().getBytes(CharsetUtil.CHARSET_GBK);
+		final byte[] b = bytes(str, CharsetUtil.CHARSET_GBK);
 		if (b.length <= len) {
 			return str.toString();
 		}
@@ -2002,9 +2015,13 @@ public class CharSequenceUtil {
 		}
 
 		if (counterOfDoubleByte % 2 != 0) {
-			len += 1;
+			if(halfUp){
+				len += 1;
+			}else{
+				len -= 1;
+			}
 		}
-		return new String(b, 0, len, CharsetUtil.CHARSET_GBK) + suffix;
+		return new String(b, 0, len, CharsetUtil.CHARSET_GBK);
 	}
 
 	/**
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
index a8b1e53c1..83c9179ac 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
@@ -1,5 +1,6 @@
 package cn.hutool.core.text;
 
+import cn.hutool.core.util.CharsetUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -65,4 +66,16 @@ public class CharSequenceUtilTest {
 		index = CharSequenceUtil.indexOf("abc123", 'b', 0, 3);
 		Assert.assertEquals(1, index);
 	}
+
+	@Test
+	public void subPreGbkTest(){
+		// https://gitee.com/dromara/hutool/issues/I4JO2E
+		String s = "华硕K42Intel酷睿i31代2G以下独立显卡不含机械硬盘固态硬盘120GB-192GB4GB-6GB";
+
+		String v = CharSequenceUtil.subPreGbk(s, 40, false);
+		Assert.assertEquals(39, v.getBytes(CharsetUtil.CHARSET_GBK).length);
+
+		v = CharSequenceUtil.subPreGbk(s, 40, true);
+		Assert.assertEquals(41, v.getBytes(CharsetUtil.CHARSET_GBK).length);
+	}
 }

From 99763a32b3d291a541fe94dc5d96bc7e782eb56f Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Wed, 24 Nov 2021 23:44:17 +0800
Subject: [PATCH 07/29] ignore bridge

---
 CHANGELOG.md                                  |  1 +
 .../cn/hutool/core/text/CharSequenceUtil.java |  7 ++++-
 .../java/cn/hutool/core/util/ReflectUtil.java | 27 ++++++++++---------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dbe0b555..e8c3b0b9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 * 【core   】     DateUtil.toIntSecond标记为弃用（issue#I4JHPR@Gitee）
 * 【db     】     Db.executeBatch标记一个重载为弃用（issue#I4JIPH@Gitee）
 * 【core   】     增加CharSequenceUtil.subPreGbk重载（issue#I4JO2E@Gitee）
+* 【core   】     ReflectUtil.getMethod排除桥接方法（pr#1965@Github）
 * 
 ### 🐞Bug修复
 * 【core   】     修复FileResource构造fileName参数无效问题（issue#1942@Github）
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
index 15a07faff..595a61d69 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
@@ -2551,7 +2551,12 @@ public class CharSequenceUtil {
 	}
 
 	/**
-	 * 比较两个字符串是否相等。
+	 * 比较两个字符串是否相等，规则如下
+	 * <ul>
+	 *     <li>str1和str2都为{@code null}</li>
+	 *     <li>忽略大小写使用{@link String#equalsIgnoreCase(String)}判断相等</li>
+	 *     <li>不忽略大小写使用{@link String#contentEquals(CharSequence)}判断相等</li>
+	 * </ul>
 	 *
 	 * @param str1       要比较的字符串1
 	 * @param str2       要比较的字符串2
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java
index affdcac6e..b0f9b1d7f 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java
@@ -84,7 +84,7 @@ public class ReflectUtil {
 	@SuppressWarnings("unchecked")
 	public static <T> Constructor<T>[] getConstructors(Class<T> beanClass) throws SecurityException {
 		Assert.notNull(beanClass);
-		return (Constructor<T>[]) CONSTRUCTORS_CACHE.get(beanClass, ()->getConstructorsDirectly(beanClass));
+		return (Constructor<T>[]) CONSTRUCTORS_CACHE.get(beanClass, () -> getConstructorsDirectly(beanClass));
 	}
 
 	/**
@@ -173,7 +173,7 @@ public class ReflectUtil {
 	 */
 	public static Field[] getFields(Class<?> beanClass) throws SecurityException {
 		Assert.notNull(beanClass);
-		return FIELDS_CACHE.get(beanClass, ()->getFieldsDirectly(beanClass, true));
+		return FIELDS_CACHE.get(beanClass, () -> getFieldsDirectly(beanClass, true));
 	}
 
 
@@ -498,11 +498,9 @@ public class ReflectUtil {
 	}
 
 	/**
-	 * 查找指定方法 如果找不到对应的方法则返回{@code null}
-	 *
-	 * <p>
-	 * 此方法为精准获取方法名，即方法名和参数数量和类型必须一致，否则返回{@code null}。
-	 * </p>
+	 * 查找指定方法 如果找不到对应的方法则返回{@code null}<br>
+	 * 此方法为精准获取方法名，即方法名和参数数量和类型必须一致，否则返回{@code null}。<br>
+	 * 如果查找的方法有多个同参数类型重载，查找第一个找到的方法
 	 *
 	 * @param clazz      类，如果为{@code null}返回{@code null}
 	 * @param ignoreCase 是否忽略大小写
@@ -520,10 +518,11 @@ public class ReflectUtil {
 		final Method[] methods = getMethods(clazz);
 		if (ArrayUtil.isNotEmpty(methods)) {
 			for (Method method : methods) {
-				if (StrUtil.equals(methodName, method.getName(), ignoreCase)) {
-					if (ClassUtil.isAllAssignableFrom(method.getParameterTypes(), paramTypes)) {
-						return method;
-					}
+				if (StrUtil.equals(methodName, method.getName(), ignoreCase)
+						&& ClassUtil.isAllAssignableFrom(method.getParameterTypes(), paramTypes)
+						//排除桥接方法，pr#1965@Github
+						&& false == method.isBridge()) {
+					return method;
 				}
 			}
 		}
@@ -586,7 +585,9 @@ public class ReflectUtil {
 		final Method[] methods = getMethods(clazz);
 		if (ArrayUtil.isNotEmpty(methods)) {
 			for (Method method : methods) {
-				if (StrUtil.equals(methodName, method.getName(), ignoreCase)) {
+				if (StrUtil.equals(methodName, method.getName(), ignoreCase)
+						// 排除桥接方法
+						&& false == method.isBridge()) {
 					return method;
 				}
 			}
@@ -635,7 +636,7 @@ public class ReflectUtil {
 	 */
 	public static Method[] getMethods(Class<?> beanClass) throws SecurityException {
 		Assert.notNull(beanClass);
-		return METHODS_CACHE.get(beanClass, ()-> getMethodsDirectly(beanClass, true));
+		return METHODS_CACHE.get(beanClass, () -> getMethodsDirectly(beanClass, true));
 	}
 
 	/**

From d5eabab63ea8e35c19dd707e39724828e610da79 Mon Sep 17 00:00:00 2001
From: duandazhi <ab601026460@163.com>
Date: Thu, 25 Nov 2021 16:59:39 +0800
Subject: [PATCH 08/29] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=B1=BB=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9=20?=
 =?UTF-8?q?=E6=B8=AF=E6=BE=B3=E5=8F=B0=20=E5=9C=A8=E5=A4=A7=E9=99=86?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=20=E7=9A=84=20=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=9B=20=E5=A4=A7=E9=99=86=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=20=E5=AF=B9=20810000=E3=80=81820000=E3=80=81830000=20?=
 =?UTF-8?q?=E5=BC=80=E9=80=9A=E7=9A=8418=E4=BD=8D=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E8=AF=81=20=E5=BE=80=E5=BE=80=E6=AF=94=E8=BE=83=E9=99=8C?=
 =?UTF-8?q?=E7=94=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/hutool/core/util/IdcardUtil.java   | 18 ++++++++++++++++++
 .../cn/hutool/core/util/IdcardUtilTest.java    | 12 ++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
index e7adc4a38..970de3ffc 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
@@ -202,6 +202,24 @@ public class IdcardUtil {
 	 * <li>通过上面得知如果余数是2，就会在身份证的第18位数字上出现罗马数字的Ⅹ。如果余数是10，身份证的最后一位号码就是2</li>
 	 * </ol>
 	 *
+	 <p>
+	 *  <ol>
+	 * 	     <li>香港人在大陆的身份证，【810000】开头；同样可以直接获取到 性别、出生日期</li>
+	 * 	     <li>81000019980902013X: 文绎循 男 1998-09-02</li>
+	 * 	     <li>810000201011210153: 辛烨 男 2010-11-21</li>
+	 * 	 </ol>
+	 * 	 <ol>
+	 *       <li>澳门人在大陆的身份证，【820000】开头；同样可以直接获取到 性别、出生日期</li>
+	 *       <li>820000200009100032: 黄敬杰 男 2000-09-10</li>
+	 *  </ol>
+	 *  <ol>
+	 *     <li>台湾人在大陆的身份证，【830000】开头；同样可以直接获取到 性别、出生日期</li>
+	 *     <li>830000200209060065: 王宜妃 女 2002-09-06</li>
+	 *     <li>830000194609150010: 苏建文 男 1946-09-14</li>
+	 *     <li>83000019810715006X: 刁婉琇 女 1981-07-15</li>
+	 * </ol>
+	 * </p>
+	 *
 	 * @param idcard 待验证的身份证
 	 * @return 是否有效的18位身份证，忽略x的大小写
 	 */
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/IdcardUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/IdcardUtilTest.java
index 24f423fc0..b9cd747a2 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/IdcardUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/IdcardUtilTest.java
@@ -103,6 +103,18 @@ public class IdcardUtilTest {
 		Assert.assertTrue(isValidCard18);
 		isValidCard18 = IdcardUtil.isValidCard18("33010219200403064X");
 		Assert.assertTrue(isValidCard18);
+
+		// 香港人在大陆身份证
+		isValidCard18 = IdcardUtil.isValidCard18("81000019980902013X");
+		Assert.assertTrue(isValidCard18);
+
+		// 澳门人在大陆身份证
+		isValidCard18 = IdcardUtil.isValidCard18("820000200009100032");
+		Assert.assertTrue(isValidCard18);
+
+		// 台湾人在大陆身份证
+		isValidCard18 = IdcardUtil.isValidCard18("830000200209060065");
+		Assert.assertTrue(isValidCard18);
 	}
 
 	@Test

From e57a927c9b63e5d3bae68955e405e09877b5ac6d Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Thu, 25 Nov 2021 17:45:18 +0800
Subject: [PATCH 09/29] fix code

---
 .../src/main/java/cn/hutool/core/lang/func/LambdaUtil.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java
index 02db6a2e1..f604ebb00 100644
--- a/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java
@@ -73,7 +73,7 @@ public class LambdaUtil {
 	 * @param func 需要解析的 lambda 对象
 	 * @return 返回解析后的结果
 	 */
-	private static <T> SerializedLambda _resolve(Serializable func) {
+	private static SerializedLambda _resolve(Serializable func) {
 		return cache.get(func.getClass().getName(), () -> ReflectUtil.invoke(func, "writeReplace"));
 	}
 }

From d3f2f85d1a2f234ed92179d816735dcb98005ddb Mon Sep 17 00:00:00 2001
From: scruel <scruelt@hotmail.com>
Date: Fri, 26 Nov 2021 14:45:23 +0800
Subject: [PATCH 10/29] fix doc typo

---
 .../src/main/java/cn/hutool/core/collection/CollectionUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollectionUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollectionUtil.java
index dde70af56..66d89dc9b 100644
--- a/hutool-core/src/main/java/cn/hutool/core/collection/CollectionUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollectionUtil.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.collection;
 
 /**
- * 集合相关工具类，包括数组，是{@link CollUtil} 的别名工具类类
+ * 集合相关工具类，包括数组，是 {@link CollUtil} 的别名工具类
  *
  * @author xiaoleilu
  * @see CollUtil

From c85f204da9445b58c2a42b06944812dc22ccf9c1 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Fri, 26 Nov 2021 20:38:13 +0800
Subject: [PATCH 11/29] change code

---
 CHANGELOG.md                                               | 3 ++-
 hutool-http/src/main/java/cn/hutool/http/HttpResponse.java | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8c3b0b9d..4a9ad47d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 -------------------------------------------------------------------------------------------------------------
 
-# 5.7.17 (2021-11-24)
+# 5.7.17 (2021-11-26)
 
 ### 🐣新特性
 * 【core   】     增加AsyncUtil（pr#457@Gitee）
@@ -25,6 +25,7 @@
 * 【db     】     Db.executeBatch标记一个重载为弃用（issue#I4JIPH@Gitee）
 * 【core   】     增加CharSequenceUtil.subPreGbk重载（issue#I4JO2E@Gitee）
 * 【core   】     ReflectUtil.getMethod排除桥接方法（pr#1965@Github）
+* 【http   】     completeFileNameFromHeader在使用path为路径时，自动解码（issue#I4K0FS@Gitee）
 * 
 ### 🐞Bug修复
 * 【core   】     修复FileResource构造fileName参数无效问题（issue#1942@Github）
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java b/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java
index f64f1ecd7..03ae911da 100644
--- a/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java
@@ -7,7 +7,6 @@ import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.io.StreamProgress;
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
@@ -434,7 +433,10 @@ public class HttpResponse extends HttpBase<HttpResponse> implements Closeable {
 			fileName = StrUtil.subSuf(path, path.lastIndexOf('/') + 1);
 			if (StrUtil.isBlank(fileName)) {
 				// 编码后的路径做为文件名
-				fileName = URLUtil.encodeQuery(path, CharsetUtil.CHARSET_UTF_8);
+				fileName = URLUtil.encodeQuery(path, charset);
+			} else {
+				// issue#I4K0FS@Gitee
+				fileName = URLUtil.decode(fileName, charset);
 			}
 		}
 		return FileUtil.file(targetFileOrDir, fileName);

From 95854cddb126efc2a80ea7c2c709f05c3493d230 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Fri, 26 Nov 2021 21:31:55 +0800
Subject: [PATCH 12/29] add options

---
 CHANGELOG.md                                  |  1 +
 .../java/cn/hutool/core/bean/PropDesc.java    | 39 ++++++++++---
 .../hutool/core/bean/copier/BeanCopier.java   | 55 ++++++++++++++++---
 .../hutool/core/bean/copier/CopyOptions.java  | 20 ++++++-
 .../core/bean/copier/BeanCopierTest.java      | 50 +++++++++++++++++
 5 files changed, 147 insertions(+), 18 deletions(-)
 create mode 100644 hutool-core/src/test/java/cn/hutool/core/bean/copier/BeanCopierTest.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a9ad47d9..4887c7fdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 * 【core   】     增加CharSequenceUtil.subPreGbk重载（issue#I4JO2E@Gitee）
 * 【core   】     ReflectUtil.getMethod排除桥接方法（pr#1965@Github）
 * 【http   】     completeFileNameFromHeader在使用path为路径时，自动解码（issue#I4K0FS@Gitee）
+* 【core   】     CopyOptions增加override配置（issue#I4JQ1N@Gitee）
 * 
 ### 🐞Bug修复
 * 【core   】     修复FileResource构造fileName参数无效问题（issue#1942@Github）
diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/PropDesc.java b/hutool-core/src/main/java/cn/hutool/core/bean/PropDesc.java
index 8fc238457..c9ea67472 100644
--- a/hutool-core/src/main/java/cn/hutool/core/bean/PropDesc.java
+++ b/hutool-core/src/main/java/cn/hutool/core/bean/PropDesc.java
@@ -121,18 +121,19 @@ public class PropDesc {
 
 	/**
 	 * 检查属性是否可读（即是否可以通过{@link #getValue(Object)}获取到值）
+	 *
 	 * @param checkTransient 是否检查Transient关键字或注解
 	 * @return 是否可读
 	 * @since 5.4.2
 	 */
-	public boolean isReadable(boolean checkTransient){
+	public boolean isReadable(boolean checkTransient) {
 		// 检查是否有getter方法或是否为public修饰
-		if(null == this.getter && false == ModifierUtil.isPublic(this.field)){
+		if (null == this.getter && false == ModifierUtil.isPublic(this.field)) {
 			return false;
 		}
 
 		// 检查transient关键字和@Transient注解
-		if(checkTransient && isTransientForGet()){
+		if (checkTransient && isTransientForGet()) {
 			return false;
 		}
 
@@ -164,7 +165,7 @@ public class PropDesc {
 	 * 首先调用字段对应的Getter方法获取值，如果Getter方法不存在，则判断字段如果为public，则直接获取字段值
 	 *
 	 * @param bean        Bean对象
-	 * @param targetType   返回属性值需要转换的类型，null表示不转换
+	 * @param targetType  返回属性值需要转换的类型，null表示不转换
 	 * @param ignoreError 是否忽略错误，包括转换错误和注入错误
 	 * @return this
 	 * @since 5.4.2
@@ -190,18 +191,19 @@ public class PropDesc {
 
 	/**
 	 * 检查属性是否可读（即是否可以通过{@link #getValue(Object)}获取到值）
+	 *
 	 * @param checkTransient 是否检查Transient关键字或注解
 	 * @return 是否可读
 	 * @since 5.4.2
 	 */
-	public boolean isWritable(boolean checkTransient){
+	public boolean isWritable(boolean checkTransient) {
 		// 检查是否有getter方法或是否为public修饰
-		if(null == this.setter && false == ModifierUtil.isPublic(this.field)){
+		if (null == this.setter && false == ModifierUtil.isPublic(this.field)) {
 			return false;
 		}
 
 		// 检查transient关键字和@Transient注解
-		if(checkTransient && isTransientForSet()){
+		if (checkTransient && isTransientForSet()) {
 			return false;
 		}
 
@@ -239,7 +241,28 @@ public class PropDesc {
 	 * @since 5.4.2
 	 */
 	public PropDesc setValue(Object bean, Object value, boolean ignoreNull, boolean ignoreError) {
-		if (ignoreNull && null == value) {
+		return setValue(bean, value, ignoreNull, ignoreError, true);
+	}
+
+	/**
+	 * 设置属性值，可以自动转换字段类型为目标类型
+	 *
+	 * @param bean        Bean对象
+	 * @param value       属性值，可以为任意类型
+	 * @param ignoreNull  是否忽略{@code null}值，true表示忽略
+	 * @param ignoreError 是否忽略错误，包括转换错误和注入错误
+	 * @param override    是否覆盖目标值，如果不覆盖，会先读取bean的值，非{@code null}则写，否则忽略。如果覆盖，则不判断直接写
+	 * @return this
+	 * @since 5.7.17
+	 */
+	public PropDesc setValue(Object bean, Object value, boolean ignoreNull, boolean ignoreError, boolean override) {
+		if (null == value && ignoreNull) {
+			return this;
+		}
+
+		// issue#I4JQ1N@Gitee
+		// 非覆盖模式下，如果目标值存在，则跳过
+		if (false == override && null != getValue(bean)) {
 			return this;
 		}
 
diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java b/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java
index bcfae58a1..ec0a01d22 100644
--- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java
+++ b/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java
@@ -140,13 +140,44 @@ public class BeanCopier<T> implements Copier<T>, Serializable {
 	 * Map转Map
 	 *
 	 * @param source 源Map
-	 * @param dest 目标Map
+	 * @param targetMap 目标Map
 	 */
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private void mapToMap(Map source, Map dest) {
-		if (null != dest && null != source) {
-			dest.putAll(source);
-		}
+	private void mapToMap(Map source, Map targetMap) {
+		source.forEach((key, value)->{
+			final CopyOptions copyOptions = this.copyOptions;
+			final HashSet<String> ignoreSet = (null != copyOptions.ignoreProperties) ? CollUtil.newHashSet(copyOptions.ignoreProperties) : null;
+
+			// issue#I4JQ1N@Gitee
+			// 非覆盖模式下，如果目标值存在，则跳过
+			if(false == copyOptions.override && null != targetMap.get(key)){
+				return;
+			}
+
+			if(key instanceof CharSequence){
+				if (CollUtil.contains(ignoreSet, key)) {
+					// 目标属性值被忽略或值提供者无此key时跳过
+					return;
+				}
+
+				// 对key做映射，映射后为null的忽略之
+				key = copyOptions.editFieldName(copyOptions.getMappedFieldName(key.toString(), false));
+				if(null == key){
+					return;
+				}
+
+				value = copyOptions.editFieldValue(key.toString(), value);
+			}
+
+
+			if ((null == value && copyOptions.ignoreNullValue) || source == value) {
+				// 当允许跳过空时，跳过
+				//值不能为bean本身，防止循环引用，此类也跳过
+				return;
+			}
+
+			targetMap.put(key, value);
+		});
 	}
 
 	/**
@@ -158,11 +189,11 @@ public class BeanCopier<T> implements Copier<T>, Serializable {
 	 */
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	private void beanToMap(Object bean, Map targetMap) {
-		final HashSet<String> ignoreSet = (null != copyOptions.ignoreProperties) ? CollUtil.newHashSet(copyOptions.ignoreProperties) : null;
 		final CopyOptions copyOptions = this.copyOptions;
+		final HashSet<String> ignoreSet = (null != copyOptions.ignoreProperties) ? CollUtil.newHashSet(copyOptions.ignoreProperties) : null;
 
 		BeanUtil.descForEach(bean.getClass(), (prop)->{
-			if(false == prop.isReadable(copyOptions.isTransientSupport())){
+			if(false == prop.isReadable(copyOptions.transientSupport)){
 				// 忽略的属性跳过之
 				return;
 			}
@@ -178,6 +209,12 @@ public class BeanCopier<T> implements Copier<T>, Serializable {
 				return;
 			}
 
+			// issue#I4JQ1N@Gitee
+			// 非覆盖模式下，如果目标值存在，则跳过
+			if(false == copyOptions.override && null != targetMap.get(key)){
+				return;
+			}
+
 			Object value;
 			try {
 				value = prop.getValue(bean);
@@ -230,7 +267,7 @@ public class BeanCopier<T> implements Copier<T>, Serializable {
 
 		// 遍历目标bean的所有属性
 		BeanUtil.descForEach(actualEditable, (prop)->{
-			if(false == prop.isWritable(this.copyOptions.isTransientSupport())){
+			if(false == prop.isWritable(this.copyOptions.transientSupport)){
 				// 字段不可写，跳过之
 				return;
 			}
@@ -270,7 +307,7 @@ public class BeanCopier<T> implements Copier<T>, Serializable {
 				return;
 			}
 
-			prop.setValue(bean, value, copyOptions.ignoreNullValue, copyOptions.ignoreError);
+			prop.setValue(bean, value, copyOptions.ignoreNullValue, copyOptions.ignoreError, copyOptions.override);
 		});
 	}
 }
diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/CopyOptions.java b/hutool-core/src/main/java/cn/hutool/core/bean/copier/CopyOptions.java
index b0e35315f..92ab2937a 100644
--- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/CopyOptions.java
+++ b/hutool-core/src/main/java/cn/hutool/core/bean/copier/CopyOptions.java
@@ -65,7 +65,11 @@ public class CopyOptions implements Serializable {
 	/**
 	 * 是否支持transient关键字修饰和@Transient注解，如果支持，被修饰的字段或方法对应的字段将被忽略。
 	 */
-	private boolean transientSupport = true;
+	protected boolean transientSupport = true;
+	/**
+	 * 是否覆盖目标值，如果不覆盖，会先读取目标对象的值，非{@code null}则写，否则忽略。如果覆盖，则不判断直接写
+	 */
+	protected boolean override = true;
 
 	/**
 	 * 创建拷贝选项
@@ -259,7 +263,9 @@ public class CopyOptions implements Serializable {
 	 *
 	 * @return 是否支持
 	 * @since 5.4.2
+	 * @deprecated 无需此方法，内部使用直接调用属性
 	 */
+	@Deprecated
 	public boolean isTransientSupport() {
 		return this.transientSupport;
 	}
@@ -276,6 +282,18 @@ public class CopyOptions implements Serializable {
 		return this;
 	}
 
+	/**
+	 * 设置是否覆盖目标值，如果不覆盖，会先读取目标对象的值，非{@code null}则写，否则忽略。如果覆盖，则不判断直接写
+	 *
+	 * @param override 是否覆盖目标值
+	 * @return this
+	 * @since 5.7.17
+	 */
+	public CopyOptions setOverride(boolean override) {
+		this.override = override;
+		return this;
+	}
+
 	/**
 	 * 获得映射后的字段名<br>
 	 * 当非反向，则根据源字段名获取目标字段名，反之根据目标字段名获取源字段名。
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/copier/BeanCopierTest.java b/hutool-core/src/test/java/cn/hutool/core/bean/copier/BeanCopierTest.java
new file mode 100644
index 000000000..0c314d18b
--- /dev/null
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/copier/BeanCopierTest.java
@@ -0,0 +1,50 @@
+package cn.hutool.core.bean.copier;
+
+import lombok.Data;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class BeanCopierTest {
+
+	/**
+	 * 测试在非覆盖模式下，目标对象有值则不覆盖
+	 */
+	@Test
+	public void beanToBeanNotOverrideTest() {
+		final A a = new A();
+		a.setValue("123");
+		final B b = new B();
+		b.setValue("abc");
+
+		final BeanCopier<B> copier = BeanCopier.create(a, b, CopyOptions.create().setOverride(false));
+		copier.copy();
+
+		Assert.assertEquals("abc", b.getValue());
+	}
+
+	/**
+	 * 测试在覆盖模式下，目标对象值被覆盖
+	 */
+	@Test
+	public void beanToBeanOverrideTest() {
+		final A a = new A();
+		a.setValue("123");
+		final B b = new B();
+		b.setValue("abc");
+
+		final BeanCopier<B> copier = BeanCopier.create(a, b, CopyOptions.create());
+		copier.copy();
+
+		Assert.assertEquals("123", b.getValue());
+	}
+
+	@Data
+	private static class A {
+		private String value;
+	}
+
+	@Data
+	private static class B {
+		private String value;
+	}
+}

From 06cc38734ca9fe65a102f7f35b22b6e8795dcc28 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Fri, 26 Nov 2021 21:49:01 +0800
Subject: [PATCH 13/29] add method

---
 CHANGELOG.md                                  |  1 +
 .../poi/excel/sax/Excel07SaxReader.java       |  2 +-
 .../hutool/poi/excel/sax/SheetRidReader.java  | 23 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4887c7fdf..f7f929b2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
 * 【core   】     ReflectUtil.getMethod排除桥接方法（pr#1965@Github）
 * 【http   】     completeFileNameFromHeader在使用path为路径时，自动解码（issue#I4K0FS@Gitee）
 * 【core   】     CopyOptions增加override配置（issue#I4JQ1N@Gitee）
+* 【poi    】     SheetRidReader可以获取所有sheet名（issue#I4JA3M@Gitee）
 * 
 ### 🐞Bug修复
 * 【core   】     修复FileResource构造fileName参数无效问题（issue#1942@Github）
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel07SaxReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel07SaxReader.java
index e742e8fa1..ee5c5710a 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel07SaxReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel07SaxReader.java
@@ -202,7 +202,7 @@ public class Excel07SaxReader implements ExcelSaxReader<Excel07SaxReader> {
 		}
 
 		// sheetIndex需转换为rid
-		final SheetRidReader ridReader = new SheetRidReader().read(xssfReader);
+		final SheetRidReader ridReader = SheetRidReader.parse(xssfReader);
 
 		if (StrUtil.startWithIgnoreCase(idOrRidOrSheetName, SHEET_NAME_PREFIX)) {
 			// name:开头的被认为是sheet名称直接处理
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java
index 76e295f8b..9cfc772b4 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/SheetRidReader.java
@@ -1,6 +1,7 @@
 package cn.hutool.poi.excel.sax;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
@@ -13,6 +14,7 @@ import org.xml.sax.helpers.DefaultHandler;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,6 +34,17 @@ import java.util.Map;
  */
 public class SheetRidReader extends DefaultHandler {
 
+	/**
+	 * 从{@link XSSFReader}中解析sheet名、sheet id等相关信息
+	 *
+	 * @param reader {@link XSSFReader}
+	 * @return SheetRidReader
+	 * @since 5.7.17
+	 */
+	public static SheetRidReader parse(XSSFReader reader) {
+		return new SheetRidReader().read(reader);
+	}
+
 	private final static String TAG_NAME = "sheet";
 	private final static String RID_ATTR = "r:id";
 	private final static String SHEET_ID_ATTR = "sheetId";
@@ -137,6 +150,16 @@ public class SheetRidReader extends DefaultHandler {
 		return null;
 	}
 
+	/**
+	 * 获取所有sheet名称
+	 *
+	 * @return sheet名称
+	 * @since 5.7.17
+	 */
+	public List<String> getSheetNames() {
+		return ListUtil.toList(this.NAME_RID_MAP.keySet());
+	}
+
 	@Override
 	public void startElement(String uri, String localName, String qName, Attributes attributes) {
 		if (TAG_NAME.equalsIgnoreCase(localName)) {

From 496d07c8d79f2b376e9165bc21752b160b4e40b4 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Fri, 26 Nov 2021 22:21:41 +0800
Subject: [PATCH 14/29] add test

---
 CHANGELOG.md                                                | 1 +
 .../src/test/java/cn/hutool/core/util/ArrayUtilTest.java    | 6 ++++++
 hutool-http/src/main/java/cn/hutool/http/HttpUtil.java      | 3 +++
 hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java  | 6 ++++++
 4 files changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7f929b2b..a9008a4f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 * 【core   】     修复FileResource构造fileName参数无效问题（issue#1942@Github）
 * 【cache  】     修复WeakCache键值强关联导致的无法回收问题（issue#1953@Github）
 * 【core   】     修复ZipUtil相对路径父路径获取null问题（issue#1961@Github）
+* 【http   】     修复HttpUtil.normalizeParams未判空导致的问题（issue#1975@Github）
 
 -------------------------------------------------------------------------------------------------------------
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java
index a7755e00e..5a0d71ca8 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java
@@ -182,6 +182,12 @@ public class ArrayUtilTest {
 		Assert.assertEquals(9, range[9]);
 	}
 
+	@Test(expected = NegativeArraySizeException.class)
+	public void rangeMinTest() {
+		//noinspection ResultOfMethodCallIgnored
+		ArrayUtil.range(0, Integer.MIN_VALUE);
+	}
+
 	@Test
 	public void maxTest() {
 		int max = ArrayUtil.max(1, 2, 13, 4, 5);
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 0257cd464..ffe7ed669 100644
--- a/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HttpUtil.java
@@ -539,6 +539,9 @@ public class HttpUtil {
 	 * @since 4.5.2
 	 */
 	public static String normalizeParams(String paramPart, Charset charset) {
+		if(StrUtil.isEmpty(paramPart)){
+			return paramPart;
+		}
 		final StrBuilder builder = StrBuilder.create(paramPart.length() + 16);
 		final int len = paramPart.length();
 		String name = null;
diff --git a/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java b/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
index e829d7752..00ad46b87 100644
--- a/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
@@ -302,6 +302,12 @@ public class HttpUtilTest {
 		Assert.assertEquals("%E5%8F%82%E6%95%B0", encodeResult);
 	}
 
+	@Test
+	public void normalizeBlankParamsTest() {
+		String encodeResult = HttpUtil.normalizeParams("", CharsetUtil.CHARSET_UTF_8);
+		Assert.assertEquals("", encodeResult);
+	}
+
 	@Test
 	public void getMimeTypeTest() {
 		String mimeType = HttpUtil.getMimeType("aaa.aaa");

From 7ece10a15d16c3ba0c17006f9df3ed5818edd830 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Fri, 26 Nov 2021 22:50:26 +0800
Subject: [PATCH 15/29] fix comment

---
 .../src/main/java/cn/hutool/core/lang/Opt.java     |  2 ++
 .../main/java/cn/hutool/core/util/IdcardUtil.java  | 14 ++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java
index f3b23892c..e03ad64cd 100644
--- a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java
+++ b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java
@@ -253,8 +253,10 @@ public class Opt<T> {
 	 * String hutool = Opt.ofBlankAble("hutool").mapOrElse(String::toUpperCase, () -> Console.log("yes")).mapOrElse(String::intern, () -> Console.log("Value is not present~")).get();
 	 * }</pre>
 	 *
+	 * @param <U> map后新的类型
 	 * @param mapper      包裹里的值存在时的操作
 	 * @param emptyAction 包裹里的值不存在时的操作
+	 * @return 新的类型的Opt
 	 * @throws NullPointerException 如果包裹里的值存在时，执行的操作为 {@code null}, 或者包裹里的值不存在时的操作为 {@code null}，则抛出{@code NPE}
 	 */
 	public <U> Opt<U> mapOrElse(Function<? super T, ? extends U> mapper, VoidFunc0 emptyAction) {
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
index 970de3ffc..4fa1201f3 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
@@ -154,7 +154,7 @@ public class IdcardUtil {
 	 * @return 是否有效
 	 */
 	public static boolean isValidCard(String idCard) {
-		if(StrUtil.isBlank(idCard)){
+		if (StrUtil.isBlank(idCard)) {
 			return false;
 		}
 
@@ -201,9 +201,7 @@ public class IdcardUtil {
 	 * <li>余数只可能有0 1 2 3 4 5 6 7 8 9 10这11个数字。其分别对应的最后一位身份证的号码为1 0 X 9 8 7 6 5 4 3 2</li>
 	 * <li>通过上面得知如果余数是2，就会在身份证的第18位数字上出现罗马数字的Ⅹ。如果余数是10，身份证的最后一位号码就是2</li>
 	 * </ol>
-	 *
-	 <p>
-	 *  <ol>
+	 * <ol>
 	 * 	     <li>香港人在大陆的身份证，【810000】开头；同样可以直接获取到 性别、出生日期</li>
 	 * 	     <li>81000019980902013X: 文绎循 男 1998-09-02</li>
 	 * 	     <li>810000201011210153: 辛烨 男 2010-11-21</li>
@@ -218,7 +216,6 @@ public class IdcardUtil {
 	 *     <li>830000194609150010: 苏建文 男 1946-09-14</li>
 	 *     <li>83000019810715006X: 刁婉琇 女 1981-07-15</li>
 	 * </ol>
-	 * </p>
 	 *
 	 * @param idcard 待验证的身份证
 	 * @return 是否有效的18位身份证，忽略x的大小写
@@ -255,7 +252,7 @@ public class IdcardUtil {
 	 * <li>通过上面得知如果余数是2，就会在身份证的第18位数字上出现罗马数字的Ⅹ。如果余数是10，身份证的最后一位号码就是2</li>
 	 * </ol>
 	 *
-	 * @param idcard 待验证的身份证
+	 * @param idcard     待验证的身份证
 	 * @param ignoreCase 是否忽略大小写。{@code true}则忽略X大小写，否则严格匹配大写。
 	 * @return 是否有效的18位身份证
 	 * @since 5.5.7
@@ -576,7 +573,7 @@ public class IdcardUtil {
 	 */
 	public static String getProvinceByIdCard(String idcard) {
 		final String code = getProvinceCodeByIdCard(idcard);
-		if(StrUtil.isNotBlank(code)){
+		if (StrUtil.isNotBlank(code)) {
 			return CITY_CODES.get(code);
 		}
 		return null;
@@ -617,7 +614,7 @@ public class IdcardUtil {
 	 * @return {@link Idcard}
 	 * @since 5.4.3
 	 */
-	public static Idcard getIdcardInfo(String idcard){
+	public static Idcard getIdcardInfo(String idcard) {
 		return new Idcard(idcard);
 	}
 
@@ -761,6 +758,7 @@ public class IdcardUtil {
 
 		/**
 		 * 获取年龄
+		 *
 		 * @return 年龄
 		 */
 		public int getAge() {

From 9e5d075b0d6b5d4d1c8b7a7a0e0c1415171e6bd1 Mon Sep 17 00:00:00 2001
From: SPPan <sppan24@163.com>
Date: Sat, 27 Nov 2021 22:32:15 +0800
Subject: [PATCH 16/29] =?UTF-8?q?POI=E8=AF=BB=E5=8F=96EXCEL=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E4=B8=BA1899=E5=B9=B4=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hutool/poi/excel/cell/values/NumericCellValue.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/NumericCellValue.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/NumericCellValue.java
index 951af97c2..bf160730e 100755
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/NumericCellValue.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/values/NumericCellValue.java
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.ExcelDateUtil;
 import cn.hutool.poi.excel.cell.CellValue;
+import java.util.Date;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.util.NumberToTextConverter;
@@ -24,7 +25,7 @@ public class NumericCellValue implements CellValue<Object> {
 	 *
 	 * @param cell {@link Cell}
 	 */
-	public NumericCellValue(Cell cell){
+	public NumericCellValue(Cell cell) {
 		this.cell = cell;
 	}
 
@@ -36,8 +37,13 @@ public class NumericCellValue implements CellValue<Object> {
 		if (null != style) {
 			// 判断是否为日期
 			if (ExcelDateUtil.isDateFormat(cell)) {
+				// 1899年写入会导致数据错乱，读取到1899年证明这个单元格的信息不关注年月日
+				Date dateCellValue = cell.getDateCellValue();
+				if ("1899".equals(DateUtil.format(dateCellValue, "yyyy"))) {
+					return DateUtil.format(dateCellValue, style.getDataFormatString());
+				}
 				// 使用Hutool的DateTime包装
-				return DateUtil.date(cell.getDateCellValue());
+				return DateUtil.date(dateCellValue);
 			}
 
 			final String format = style.getDataFormatString();

From d8182e94bf4dd3dbae08822e58e3a96c7fc8c9b1 Mon Sep 17 00:00:00 2001
From: SPPan <sppan24@163.com>
Date: Sat, 27 Nov 2021 22:48:57 +0800
Subject: [PATCH 17/29] =?UTF-8?q?=E5=A2=9E=E5=8A=A01899=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../poi/excel/NumericCellValueTest.java       |  26 ++++++++++++++++++
 .../src/test/resources/1899bug_demo.xlsx      | Bin 0 -> 10677 bytes
 2 files changed, 26 insertions(+)
 create mode 100644 hutool-poi/src/test/java/cn/hutool/poi/excel/NumericCellValueTest.java
 create mode 100644 hutool-poi/src/test/resources/1899bug_demo.xlsx

diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/NumericCellValueTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/NumericCellValueTest.java
new file mode 100644
index 000000000..df3cefeb1
--- /dev/null
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/NumericCellValueTest.java
@@ -0,0 +1,26 @@
+package cn.hutool.poi.excel;
+
+import cn.hutool.poi.excel.cell.values.NumericCellValue;
+import java.util.Date;
+import org.apache.poi.ss.usermodel.Cell;
+import org.junit.Test;
+
+public class NumericCellValueTest {
+
+	@Test
+	public void writeTest() {
+		final ExcelReader reader = ExcelUtil.getReader("1899bug_demo.xlsx");
+		ExcelWriter writer = ExcelUtil.getWriter("1899bug_write.xlsx");
+		Cell cell = reader.getCell(0, 0);
+		// 直接取值
+		// 和CellUtil.getCellValue(org.apache.poi.ss.usermodel.Cell)方法的结果一样
+		// 1899-12-31 04:39:00
+		Date cellValue = cell.getDateCellValue();
+		// 将这个值写入EXCEL中自定义样式的单元格，结果会是-1
+		writer.writeCellValue(0, 0, cellValue);
+		// 修改后的写入，单元格内容正常
+		writer.writeCellValue(1, 0, new NumericCellValue(cell).getValue());
+		writer.close();
+		reader.close();
+	}
+}
diff --git a/hutool-poi/src/test/resources/1899bug_demo.xlsx b/hutool-poi/src/test/resources/1899bug_demo.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..9424dc470c66174a84860ad79bd16c8fcd61f406
GIT binary patch
literal 10677
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
V01JtI$VL?M$%McMn&ywI{{b{~x`hA$

literal 0
HcmV?d00001


From 4aeaf827dc1598766417540675a24ef507663324 Mon Sep 17 00:00:00 2001
From: VampireAchao <achao1441470436@gmail.com>
Date: Sun, 28 Nov 2021 18:34:12 +0800
Subject: [PATCH 18/29] =?UTF-8?q?waitAny=E5=87=BD=E6=95=B0=E6=8F=90?=
 =?UTF-8?q?=E4=BE=9B=E8=BF=94=E5=9B=9E=E5=80=BC=EF=BC=8C=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E5=9C=A8=E8=8E=B7=E5=8F=96=E6=9C=80=E5=85=88=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=9A=84=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/hutool/core/thread/AsyncUtil.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/AsyncUtil.java b/hutool-core/src/main/java/cn/hutool/core/thread/AsyncUtil.java
index e7b7dc6d8..c9085b75b 100644
--- a/hutool-core/src/main/java/cn/hutool/core/thread/AsyncUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/thread/AsyncUtil.java
@@ -31,11 +31,12 @@ public class AsyncUtil {
 	 * 等待任意一个任务执行完毕，包裹了异常
 	 *
 	 * @param tasks 并行任务
+	 * @return 执行结束的任务返回值
 	 * @throws UndeclaredThrowableException 未受检异常
 	 */
-	public static void waitAny(CompletableFuture<?>... tasks) {
+	public static Object waitAny(CompletableFuture<?>... tasks) {
 		try {
-			CompletableFuture.anyOf(tasks).get();
+			return CompletableFuture.anyOf(tasks).get();
 		} catch (InterruptedException | ExecutionException e) {
 			throw new ThreadException(e);
 		}

From 2b65aaa6c35311472e39722c07605aa773e73126 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Sun, 28 Nov 2021 19:10:12 +0800
Subject: [PATCH 19/29] add test

---
 .../hutool/core/collection/CollUtilTest.java  | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
index c3be3c277..20574da8a 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
@@ -285,6 +285,27 @@ public class CollUtilTest {
 		Assert.assertEquals(CollUtil.newArrayList("b", "c"), filtered);
 	}
 
+	@Test
+	public void filterRemoveTest() {
+		ArrayList<String> list = CollUtil.newArrayList("a", "b", "c");
+
+		List<String> removed = new ArrayList<>();
+		ArrayList<String> filtered = CollUtil.filter(list, t -> {
+			if("a".equals(t)){
+				removed.add(t);
+				return false;
+			}
+			return true;
+		});
+
+		Assert.assertEquals(1, removed.size());
+		Assert.assertEquals("a", removed.get(0));
+
+		// 原地过滤
+		Assert.assertSame(list, filtered);
+		Assert.assertEquals(CollUtil.newArrayList("b", "c"), filtered);
+	}
+
 	@Test
 	public void removeNullTest() {
 		ArrayList<String> list = CollUtil.newArrayList("a", "b", "c", null, "", "  ");

From d465af13491b4617167a29b727a425724fd0fec0 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Sun, 28 Nov 2021 19:59:02 +0800
Subject: [PATCH 20/29] fix 1899

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9008a4f6..6dce179c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 * 【cache  】     修复WeakCache键值强关联导致的无法回收问题（issue#1953@Github）
 * 【core   】     修复ZipUtil相对路径父路径获取null问题（issue#1961@Github）
 * 【http   】     修复HttpUtil.normalizeParams未判空导致的问题（issue#1975@Github）
+* 【poi    】     修复读取日期类型的自定义样式单元格时间结果为1899年问题（pr#1977@Github）
 
 -------------------------------------------------------------------------------------------------------------
 

From 579ff22a7f85e77036fd4f4c600b1425257e1e78 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Mon, 29 Nov 2021 19:06:37 +0800
Subject: [PATCH 21/29] add return

---
 .../src/main/java/cn/hutool/core/thread/AsyncUtil.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/AsyncUtil.java b/hutool-core/src/main/java/cn/hutool/core/thread/AsyncUtil.java
index c9085b75b..ab9947744 100644
--- a/hutool-core/src/main/java/cn/hutool/core/thread/AsyncUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/thread/AsyncUtil.java
@@ -30,13 +30,15 @@ public class AsyncUtil {
 	/**
 	 * 等待任意一个任务执行完毕，包裹了异常
 	 *
+	 * @param <T>  任务返回值类型
 	 * @param tasks 并行任务
 	 * @return 执行结束的任务返回值
 	 * @throws UndeclaredThrowableException 未受检异常
 	 */
-	public static Object waitAny(CompletableFuture<?>... tasks) {
+	@SuppressWarnings("unchecked")
+	public static <T> T waitAny(CompletableFuture<?>... tasks) {
 		try {
-			return CompletableFuture.anyOf(tasks).get();
+			return (T) CompletableFuture.anyOf(tasks).get();
 		} catch (InterruptedException | ExecutionException e) {
 			throw new ThreadException(e);
 		}
@@ -45,8 +47,8 @@ public class AsyncUtil {
 	/**
 	 * 获取异步任务结果，包裹了异常
 	 *
-	 * @param task 异步任务
 	 * @param <T>  任务返回值类型
+	 * @param task 异步任务
 	 * @return 任务返回值
 	 * @throws RuntimeException 未受检异常
 	 */

From ddca2aab119a6741f776e812be47f5a25dcfea65 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Mon, 29 Nov 2021 19:07:30 +0800
Subject: [PATCH 22/29] add return

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dce179c1..69639ec62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 * 【http   】     completeFileNameFromHeader在使用path为路径时，自动解码（issue#I4K0FS@Gitee）
 * 【core   】     CopyOptions增加override配置（issue#I4JQ1N@Gitee）
 * 【poi    】     SheetRidReader可以获取所有sheet名（issue#I4JA3M@Gitee）
+* 【core   】     AsyncUtil.waitAny增加返回值（pr#473@Gitee）
 * 
 ### 🐞Bug修复
 * 【core   】     修复FileResource构造fileName参数无效问题（issue#1942@Github）

From 26c98330d214c295cd9169c73d61daf5d0705754 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Mon, 29 Nov 2021 19:13:26 +0800
Subject: [PATCH 23/29] add readme

---
 CHANGELOG.md | 2 +-
 README.md    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69639ec62..7d5d59309 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 -------------------------------------------------------------------------------------------------------------
 
-# 5.7.17 (2021-11-26)
+# 5.7.17 (2021-11-29)
 
 ### 🐣新特性
 * 【core   】     增加AsyncUtil（pr#457@Gitee）
diff --git a/README.md b/README.md
index 6b096cd29..15315f2bc 100644
--- a/README.md
+++ b/README.md
@@ -209,6 +209,7 @@ Hutool欢迎任何人为Hutool添砖加瓦，贡献代码，不过维护者是
 2. Hutool的缩进按照Eclipse（~~不要跟我说IDEA多好用，维护者非常懒，学不会~~，IDEA真香，改了Eclipse快捷键后舒服多了）默认（tab）缩进，所以请遵守（不要和我争执空格与tab的问题，这是一个病人的习惯）。
 3. 新加的方法不要使用第三方库的方法，Hutool遵循无依赖原则（除非在extra模块中加方法工具）。
 4. 请pull request到`v5-dev`分支。Hutool在5.x版本后使用了新的分支：`v5-master`是主分支，表示已经发布中央库的版本，这个分支不允许pr，也不允许修改。
+5. 我们如果关闭了你的issue或pr，请不要诧异，这是我们保持问题处理整洁的一种方式，你依旧可以继续讨论，当有讨论结果时我们会重新打开。
 
 -------------------------------------------------------------------------------
 

From e46c5e1c0cb1e0ba39c39d4582881914b6d0b6bd Mon Sep 17 00:00:00 2001
From: scruel <scruelt@hotmail.com>
Date: Tue, 30 Nov 2021 11:02:42 +0800
Subject: [PATCH 24/29] =?UTF-8?q?=E2=9C=A8=20add=20removeWithAddIf=20metho?=
 =?UTF-8?q?ds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/hutool/core/collection/CollUtil.java   | 40 +++++++++++++++++++
 .../hutool/core/collection/CollUtilTest.java  | 17 ++++++++
 2 files changed, 57 insertions(+)

diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
index f031f4bc8..329c37d5d 100644
--- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
@@ -1291,6 +1291,46 @@ public class CollUtil {
 		return filter(collection, StrUtil::isNotBlank);
 	}
 
+	/**
+	 * 移除集合中的多个元素，并将结果存放到指定的集合
+	 * 此方法直接修改原集合
+	 *
+	 * @param <T>              集合类型
+	 * @param <E>              集合元素类型
+	 * @param resultCollection 存放移除结果的集合
+	 * @param targetCollection 被操作移除元素的集合
+	 * @param filter           用于是否移除判断的过滤器
+	 */
+	public static <T extends Collection<E>, E> T removeWithAddIf(T targetCollection, T resultCollection, Predicate<? super E> filter) {
+		Objects.requireNonNull(filter);
+		final Iterator<E> each = targetCollection.iterator();
+		while (each.hasNext()) {
+			E next = each.next();
+			if (filter.test(next)) {
+				resultCollection.add(next);
+				each.remove();
+			}
+		}
+		return resultCollection;
+	}
+
+	/**
+	 * 移除集合中的多个元素，并将结果存放到生成的新集合中后返回
+	 * 此方法直接修改原集合
+	 *
+	 * @param <T>              集合类型
+	 * @param <E>              集合元素类型
+	 * @param targetCollection 被操作移除元素的集合
+	 * @param filter           用于是否移除判断的过滤器
+	 * @return 移除结果的集合
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T extends Collection<E>, E> T removeWithAddIf(T targetCollection, Predicate<? super E> filter) {
+		Collection<E> resultCollection = new ArrayList<>();
+		removeWithAddIf(targetCollection, resultCollection, filter);
+		return (T) resultCollection;
+	}
+
 	/**
 	 * 通过Editor抽取集合元素中的某些值返回为新列表<br>
 	 * 例如提供的是一个Bean列表，通过Editor接口实现获取某个字段值，返回这个字段值组成的新列表
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
index 20574da8a..833d4a79b 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
@@ -39,6 +39,23 @@ public class CollUtilTest {
 		Assert.assertFalse(CollUtil.contains(list, s -> s.startsWith("d")));
 	}
 
+	@Test
+	public void testRemoveWithAddIf() {
+		ArrayList<Integer> list = CollUtil.newArrayList(1, 2, 3);
+		ArrayList<Integer> exceptRemovedList = CollUtil.newArrayList(2, 3);
+		ArrayList<Integer> exceptResultList = CollUtil.newArrayList(1);
+
+		ArrayList<Integer> resultList = CollUtil.removeWithAddIf(list, ele -> 1 == ele);
+		Assert.assertEquals(list, exceptRemovedList);
+		Assert.assertEquals(resultList, exceptResultList);
+
+		list = CollUtil.newArrayList(1, 2, 3);
+		resultList = new ArrayList<>();
+		CollUtil.removeWithAddIf(list, resultList, ele -> 1 == ele);
+		Assert.assertEquals(list, exceptRemovedList);
+		Assert.assertEquals(resultList, exceptResultList);
+	}
+
 	@Test
 	public void testPadLeft() {
 		List<String> srcList = CollUtil.newArrayList();

From 109725da79fd3bb9fe5aca8b2eda9256713d4050 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Tue, 30 Nov 2021 11:53:13 +0800
Subject: [PATCH 25/29] add methods

---
 .../test/java/cn/hutool/core/math/CalculatorTest.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java b/hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java
index 7dbd128d2..7c67abdbe 100644
--- a/hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java
@@ -1,6 +1,7 @@
 package cn.hutool.core.math;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class CalculatorTest {
@@ -28,4 +29,12 @@ public class CalculatorTest {
 		final double conversion = Calculator.conversion("(88*66/23)%26+45%9");
 		Assert.assertEquals((88D * 66 / 23) % 26, conversion, 2);
 	}
+
+	@Test
+	@Ignore
+	public void conversationTest5(){
+		// https://github.com/dromara/hutool/issues/1984
+		final double conversion = Calculator.conversion("((1/1) / (1/1) -1) * 100");
+		Assert.assertEquals((88D * 66 / 23) % 26, conversion, 2);
+	}
 }

From 5ba1dde50d11435609d3c02126b9b3a26fcb57a0 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Tue, 30 Nov 2021 11:59:34 +0800
Subject: [PATCH 26/29] fix code

---
 .../java/cn/hutool/core/collection/CollUtil.java   | 14 +++++++-------
 .../cn/hutool/core/collection/CollUtilTest.java    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
index 329c37d5d..fb6783402 100644
--- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
@@ -1315,20 +1315,20 @@ public class CollUtil {
 	}
 
 	/**
-	 * 移除集合中的多个元素，并将结果存放到生成的新集合中后返回
+	 * 移除集合中的多个元素，并将结果存放到生成的新集合中后返回<br>
 	 * 此方法直接修改原集合
 	 *
 	 * @param <T>              集合类型
 	 * @param <E>              集合元素类型
 	 * @param targetCollection 被操作移除元素的集合
-	 * @param filter           用于是否移除判断的过滤器
+	 * @param predicate        用于是否移除判断的过滤器
 	 * @return 移除结果的集合
+	 * @since 5.7.17
 	 */
-	@SuppressWarnings("unchecked")
-	public static <T extends Collection<E>, E> T removeWithAddIf(T targetCollection, Predicate<? super E> filter) {
-		Collection<E> resultCollection = new ArrayList<>();
-		removeWithAddIf(targetCollection, resultCollection, filter);
-		return (T) resultCollection;
+	public static <T extends Collection<E>, E> List<E> removeWithAddIf(T targetCollection, Predicate<? super E> predicate) {
+		final List<E> removed = new ArrayList<>();
+		removeWithAddIf(targetCollection, removed, predicate);
+		return removed;
 	}
 
 	/**
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
index 833d4a79b..bd889916f 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
@@ -45,7 +45,7 @@ public class CollUtilTest {
 		ArrayList<Integer> exceptRemovedList = CollUtil.newArrayList(2, 3);
 		ArrayList<Integer> exceptResultList = CollUtil.newArrayList(1);
 
-		ArrayList<Integer> resultList = CollUtil.removeWithAddIf(list, ele -> 1 == ele);
+		List<Integer> resultList = CollUtil.removeWithAddIf(list, ele -> 1 == ele);
 		Assert.assertEquals(list, exceptRemovedList);
 		Assert.assertEquals(resultList, exceptResultList);
 

From cc723503852687ffc250dc54a1195fad588db114 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Tue, 30 Nov 2021 17:05:57 +0800
Subject: [PATCH 27/29] fix bug

---
 CHANGELOG.md                                              | 3 ++-
 .../src/main/java/cn/hutool/core/collection/CollUtil.java | 8 ++++----
 .../java/cn/hutool/core/collection/RingIndexUtil.java     | 3 ++-
 .../main/java/cn/hutool/http/webservice/SoapClient.java   | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d5d59309..134d92018 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 -------------------------------------------------------------------------------------------------------------
 
-# 5.7.17 (2021-11-29)
+# 5.7.17 (2021-11-30)
 
 ### 🐣新特性
 * 【core   】     增加AsyncUtil（pr#457@Gitee）
@@ -36,6 +36,7 @@
 * 【core   】     修复ZipUtil相对路径父路径获取null问题（issue#1961@Github）
 * 【http   】     修复HttpUtil.normalizeParams未判空导致的问题（issue#1975@Github）
 * 【poi    】     修复读取日期类型的自定义样式单元格时间结果为1899年问题（pr#1977@Github）
+* 【poi    】     修复SoapClient参数未使用问题
 
 -------------------------------------------------------------------------------------------------------------
 
diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
index fb6783402..94f4d357c 100644
--- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
@@ -1299,14 +1299,14 @@ public class CollUtil {
 	 * @param <E>              集合元素类型
 	 * @param resultCollection 存放移除结果的集合
 	 * @param targetCollection 被操作移除元素的集合
-	 * @param filter           用于是否移除判断的过滤器
+	 * @param predicate           用于是否移除判断的过滤器
 	 */
-	public static <T extends Collection<E>, E> T removeWithAddIf(T targetCollection, T resultCollection, Predicate<? super E> filter) {
-		Objects.requireNonNull(filter);
+	public static <T extends Collection<E>, E> T removeWithAddIf(T targetCollection, T resultCollection, Predicate<? super E> predicate) {
+		Objects.requireNonNull(predicate);
 		final Iterator<E> each = targetCollection.iterator();
 		while (each.hasNext()) {
 			E next = each.next();
-			if (filter.test(next)) {
+			if (predicate.test(next)) {
 				resultCollection.add(next);
 				each.remove();
 			}
diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/RingIndexUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/RingIndexUtil.java
index b997b1428..34fd8c738 100644
--- a/hutool-core/src/main/java/cn/hutool/core/collection/RingIndexUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/RingIndexUtil.java
@@ -56,7 +56,8 @@ public class RingIndexUtil {
 	}
 
 	/**
-	 * 通过cas操作 实现对指定值内的回环累加
+	 * 通过cas操作 实现对指定值内的回环累加<br>
+	 * 此方法一般用于大量数据完成回环累加（如数据库中的值大于int最大值）
 	 *
 	 * @param modulo     回环周期值
 	 * @param atomicLong 原子操作类
diff --git a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java b/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java
index 4c892c285..35b155fff 100644
--- a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java
+++ b/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java
@@ -338,7 +338,7 @@ public class SoapClient extends HttpBase<SoapClient> {
 	 */
 	public SoapClient setMethod(QName name, Map<String, Object> params, boolean useMethodPrefix) {
 		setMethod(name);
-		final String prefix = name.getPrefix();
+		final String prefix = useMethodPrefix ? name.getPrefix() : null;
 		final SOAPBodyElement methodEle = this.methodEle;
 		for (Entry<String, Object> entry : MapUtil.wrap(params)) {
 			setParam(methodEle, entry.getKey(), entry.getValue(), prefix);
@@ -618,7 +618,7 @@ public class SoapClient extends HttpBase<SoapClient> {
 	 * @param ele    方法节点
 	 * @param name   参数名
 	 * @param value  参数值
-	 * @param prefix 命名空间前缀
+	 * @param prefix 命名空间前缀， {@code null}表示不使用前缀
 	 * @return {@link SOAPElement}子节点
 	 */
 	@SuppressWarnings("rawtypes")

From f07f7864938b8613c1cb17c2cd4c7fa33f7c6476 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Tue, 30 Nov 2021 17:36:45 +0800
Subject: [PATCH 28/29] change to private

---
 CHANGELOG.md                                                | 1 +
 .../src/main/java/cn/hutool/core/math/Calculator.java       | 4 ++--
 hutool-db/pom.xml                                           | 2 +-
 hutool-extra/pom.xml                                        | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 134d92018..1ef6c0716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 * 【core   】     CopyOptions增加override配置（issue#I4JQ1N@Gitee）
 * 【poi    】     SheetRidReader可以获取所有sheet名（issue#I4JA3M@Gitee）
 * 【core   】     AsyncUtil.waitAny增加返回值（pr#473@Gitee）
+* 【core   】     Calculator.compare改为private（issue#1982@Github）
 * 
 ### 🐞Bug修复
 * 【core   】     修复FileResource构造fileName参数无效问题（issue#1942@Github）
diff --git a/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java b/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java
index 2117d47ee..a6c6a09d1 100644
--- a/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java
+++ b/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java
@@ -154,7 +154,7 @@ public class Calculator {
 	 * @param peek peek
 	 * @return 优先级
 	 */
-	public boolean compare(char cur, char peek) {// 如果是peek优先级高于cur，返回true，默认都是peek优先级要低
+	private boolean compare(char cur, char peek) {// 如果是peek优先级高于cur，返回true，默认都是peek优先级要低
 		final int offset = 40;
 		if(cur  == '%'){
 			// %优先级最高
@@ -165,7 +165,7 @@ public class Calculator {
 			peek = 47;
 		}
 
-		return operatPriority[(peek) - offset] >= operatPriority[(cur) - offset];
+		return operatPriority[peek - offset] >= operatPriority[cur - offset];
 	}
 
 	/**
diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml
index 835eede43..779270085 100644
--- a/hutool-db/pom.xml
+++ b/hutool-db/pom.xml
@@ -81,7 +81,7 @@
 		<dependency>
 			<groupId>com.github.chris2018998</groupId>
 			<artifactId>beecp</artifactId>
-			<version>3.2.9</version>
+			<version>3.3.0</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>slf4j-api</artifactId>
diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index 9f32ccf43..bbc362788 100644
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -241,7 +241,7 @@
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-analyzers-smartcn</artifactId>
-			<version>8.10.1</version>
+			<version>8.11.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -384,7 +384,7 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.2.6</version>
+			<version>1.2.7</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
@@ -432,7 +432,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
-			<version>5.3.12</version>
+			<version>5.3.13</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>

From c1b889a2b407d5451d4e33a257880ac6114a3d8b Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Tue, 30 Nov 2021 18:02:36 +0800
Subject: [PATCH 29/29] fix bug

---
 CHANGELOG.md                                                  | 1 +
 hutool-core/src/main/java/cn/hutool/core/text/StrBuilder.java | 1 -
 hutool-core/src/main/java/cn/hutool/core/util/HashUtil.java   | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ef6c0716..eddc54b42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
 * 【http   】     修复HttpUtil.normalizeParams未判空导致的问题（issue#1975@Github）
 * 【poi    】     修复读取日期类型的自定义样式单元格时间结果为1899年问题（pr#1977@Github）
 * 【poi    】     修复SoapClient参数未使用问题
+* 【core   】     修复HashUtil.cityHash128参数未使用问题
 
 -------------------------------------------------------------------------------------------------------------
 
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrBuilder.java b/hutool-core/src/main/java/cn/hutool/core/text/StrBuilder.java
index 69bc75f04..a09dc0681 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/StrBuilder.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/StrBuilder.java
@@ -470,7 +470,6 @@ public class StrBuilder implements CharSequence, Appendable, Serializable {
 	/**
 	 * 生成字符串
 	 */
-	@SuppressWarnings("NullableProblems")
 	@Override
 	public String toString() {
 		return toString(false);
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/HashUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/HashUtil.java
index b429318a6..97ee1537b 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/HashUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/HashUtil.java
@@ -543,6 +543,6 @@ public class HashUtil {
 	 * @since 5.2.5
 	 */
 	public static long[] cityHash128(byte[] data, Number128 seed) {
-		return CityHash.hash128(data).getLongArray();
+		return CityHash.hash128(data, seed).getLongArray();
 	}
-}
\ No newline at end of file
+}