{
*
*
* 1. {@link SynchronousQueue} 它将任务直接提交给线程而不保持它们。当运行线程小于maxPoolSize时会创建新线程，否则触发异常策略
- * 2. {@link LinkedBlockingQueue} 默认无界队列，当运行线程大于corePoolSize时始终放入此队列，此时maximumPoolSize无效。
+ * 2. {@link LinkedBlockingQueue} 默认无界队列，当运行线程大于corePoolSize时始终放入此队列，此时maxPoolSize无效。
* 当构造LinkedBlockingQueue对象时传入参数，变为有界队列，队列满时，运行线程小于maxPoolSize时会创建新线程，否则触发异常策略
* 3. {@link ArrayBlockingQueue} 有界队列，相对无界队列有利于控制队列大小，队列满时，运行线程小于maxPoolSize时会创建新线程，否则触发异常策略
*
diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/FinalizableDelegatedExecutorService.java b/hutool-core/src/main/java/cn/hutool/core/thread/FinalizableDelegatedExecutorService.java
index 29749783d..d51d6e52b 100644
--- a/hutool-core/src/main/java/cn/hutool/core/thread/FinalizableDelegatedExecutorService.java
+++ b/hutool-core/src/main/java/cn/hutool/core/thread/FinalizableDelegatedExecutorService.java
@@ -8,6 +8,12 @@ import java.util.concurrent.ExecutorService;
* @author loolly
*/
public class FinalizableDelegatedExecutorService extends DelegatedExecutorService {
+
+ /**
+ * 构造
+ *
+ * @param executor {@link ExecutorService}
+ */
FinalizableDelegatedExecutorService(ExecutorService executor) {
super(executor);
}
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 8555a7dbc..e922795ad 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
@@ -16,9 +16,10 @@ import java.util.concurrent.ExecutorService;
* ps:
* //模拟1000个线程并发
* SyncFinisher sf = new SyncFinisher(1000);
- * concurrencyTestUtil.run(() -> {
+ * sf.addWorker(() -> {
* // 需要并发测试的业务代码
* });
+ * sf.start()
*
*
*
diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java b/hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java
index ab8ba9ef1..b7a5fe9db 100644
--- a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java
@@ -31,7 +31,7 @@ public class ThreadUtil {
* @param corePoolSize 同时执行的线程数大小
* @return ExecutorService
*/
- public static ExecutorService newExecutor(int corePoolSize) {
+ public static ExecutorService newExecutor(int corePoolSize) {
ExecutorBuilder builder = ExecutorBuilder.create();
if (corePoolSize > 0) {
builder.setCorePoolSize(corePoolSize);
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java
index 9fa54b2b3..fd33465bb 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java
@@ -61,7 +61,7 @@ public class EnumUtil {
*/
public static > E getEnumAt(Class enumClass, int index) {
final E[] enumConstants = enumClass.getEnumConstants();
- return index < enumConstants.length ? enumConstants[index] : null;
+ return index >= 0 && index < enumConstants.length ? enumConstants[index] : null;
}
/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java
index 19b3469de..867b54d42 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java
@@ -2731,14 +2731,14 @@ public class StrUtil {
}
/**
- * 包装多个字符串
+ * 使用单个字符包装多个字符串
*
* @param prefixAndSuffix 前缀和后缀
* @param strs 多个字符串
* @return 包装的字符串数组
- * @since 4.0.7
+ * @since 5.4.1
*/
- public static String[] wrapAll(CharSequence prefixAndSuffix, CharSequence... strs) {
+ public static String[] wrapAllWithPair(CharSequence prefixAndSuffix, CharSequence... strs) {
return wrapAll(prefixAndSuffix, prefixAndSuffix, strs);
}
@@ -2792,14 +2792,14 @@ public class StrUtil {
}
/**
- * 包装多个字符串，如果已经包装，则不再包装
+ * 使用成对的字符包装多个字符串，如果已经包装，则不再包装
*
* @param prefixAndSuffix 前缀和后缀
* @param strs 多个字符串
* @return 包装的字符串数组
- * @since 4.0.7
+ * @since 5.4.1
*/
- public static String[] wrapAllIfMissing(CharSequence prefixAndSuffix, CharSequence... strs) {
+ public static String[] wrapAllWithPairIfMissing(CharSequence prefixAndSuffix, CharSequence... strs) {
return wrapAllIfMissing(prefixAndSuffix, prefixAndSuffix, strs);
}
@@ -3427,7 +3427,7 @@ public class StrUtil {
* @param start 起始位置，如果小于0，从0开始查找
* @return 位置
*/
- public static int indexOf(final CharSequence str, char searchChar, int start) {
+ public static int indexOf(CharSequence str, char searchChar, int start) {
if (str instanceof String) {
return ((String) str).indexOf(searchChar, start);
} else {
@@ -3445,6 +3445,9 @@ public class StrUtil {
* @return 位置
*/
public static int indexOf(final CharSequence str, char searchChar, int start, int end) {
+ if(isEmpty(str)){
+ return INDEX_NOT_FOUND;
+ }
final int len = str.length();
if (start < 0 || start > len) {
start = 0;
@@ -3457,7 +3460,7 @@ public class StrUtil {
return i;
}
}
- return -1;
+ return INDEX_NOT_FOUND;
}
/**
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java b/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java
index f78d2259a..210282e10 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java
@@ -45,4 +45,27 @@ public class ChineseDateTest {
date = new ChineseDate(DateUtil.parseDate("1996-07-15"));
Assert.assertEquals("丙子鼠年 五月三十", date.toString());
}
+ @Test
+ public void getCyclicalYMDTest(){
+ //通过公历构建
+ ChineseDate chineseDate = new ChineseDate(DateUtil.parseDate("1993-01-06"));
+ String cyclicalYMD = chineseDate.getCyclicalYMD();
+ Assert.assertEquals("壬申年癸丑月丁亥日",cyclicalYMD);
+ }
+
+ @Test
+ public void getCyclicalYMDTest2(){
+ //通过农历构建
+ ChineseDate chineseDate = new ChineseDate(1992,12,14);
+ String cyclicalYMD = chineseDate.getCyclicalYMD();
+ Assert.assertEquals("壬申年癸丑月丁亥日",cyclicalYMD);
+ }
+
+ @Test
+ public void getCyclicalYMDTest3(){
+ //通过公历构建
+ ChineseDate chineseDate = new ChineseDate(DateUtil.parseDate("2020-08-28"));
+ String cyclicalYMD = chineseDate.getCyclicalYMD();
+ Assert.assertEquals("庚子年甲申月癸卯日",cyclicalYMD);
+ }
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java b/hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java
index dc47cdcd5..15682b41a 100644
--- a/hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java
@@ -55,4 +55,12 @@ public class ImgTest {
.pressImage(ImgUtil.read("d:/test/617180969474805871.jpg"), new Rectangle(0, 0, 800, 800), 1f)
.write(FileUtil.file("d:/test/pressImg_result.jpg"));
}
+
+ @Test
+ @Ignore
+ public void strokeTest(){
+ Img.from(FileUtil.file("d:/test/公章3.png"))
+ .stroke(null, 2f)
+ .write(FileUtil.file("d:/test/stroke_result.png"));
+ }
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java
new file mode 100644
index 000000000..6cae317a2
--- /dev/null
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java
@@ -0,0 +1,21 @@
+package cn.hutool.core.lang;
+
+import cn.hutool.core.collection.ConcurrentHashSet;
+import cn.hutool.core.thread.ThreadUtil;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Set;
+
+public class UUIDTest {
+
+ /**
+ * 测试UUID是否存在重复问题
+ */
+ @Test
+ public void fastUUIDTest(){
+ Set set = new ConcurrentHashSet<>(100);
+ ThreadUtil.concurrencyTest(100, ()-> set.add(UUID.fastUUID().toString()));
+ Assert.assertEquals(100, set.size());
+ }
+}
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
index 87f019945..a022b28ab 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
@@ -458,4 +458,13 @@ public class StrUtilTest {
String cleanBlank = StrUtil.filter(" 你 好 ", c -> !CharUtil.isBlankChar(c));
Assert.assertEquals("你好", cleanBlank);
}
+
+ @Test
+ public void wrapAllTest(){
+ String[] strings = StrUtil.wrapAll("`", "`", StrUtil.splitToArray("1,2,3,4", ','));
+ Assert.assertEquals("[`1`, `2`, `3`, `4`]", StrUtil.utf8Str(strings));
+
+ strings = StrUtil.wrapAllWithPair("`", StrUtil.splitToArray("1,2,3,4", ','));
+ Assert.assertEquals("[`1`, `2`, `3`, `4`]", StrUtil.utf8Str(strings));
+ }
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java
index 94ef42954..6b7cd97ec 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java
@@ -56,4 +56,5 @@ public class TypeUtilTest {
public void service(String string) {
}
}
+
}
diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml
index d8be510af..4270b6b34 100644
--- a/hutool-cron/pom.xml
+++ b/hutool-cron/pom.xml
@@ -7,7 +7,7 @@
cn.hutool
hutool-parent
- 5.4.1-SNAPSHOT
+ 5.4.2-SNAPSHOT
hutool-cron
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/TaskTable.java b/hutool-cron/src/main/java/cn/hutool/cron/TaskTable.java
index 242c6e075..27daf2948 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/TaskTable.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/TaskTable.java
@@ -52,8 +52,8 @@ public class TaskTable implements Serializable {
*/
public TaskTable add(String id, CronPattern pattern, Task task) {
final Lock writeLock = lock.writeLock();
+ writeLock.lock();
try {
- writeLock.lock();
if (ids.contains(id)) {
throw new CronException("Id [{}] has been existed!", id);
}
@@ -75,8 +75,8 @@ public class TaskTable implements Serializable {
*/
public List getIds() {
final Lock readLock = lock.readLock();
+ readLock.lock();
try {
- readLock.lock();
return Collections.unmodifiableList(this.ids);
} finally {
readLock.unlock();
@@ -91,8 +91,8 @@ public class TaskTable implements Serializable {
*/
public List getPatterns() {
final Lock readLock = lock.readLock();
+ readLock.lock();
try {
- readLock.lock();
return Collections.unmodifiableList(this.patterns);
} finally {
readLock.unlock();
@@ -107,8 +107,8 @@ public class TaskTable implements Serializable {
*/
public List getTasks() {
final Lock readLock = lock.readLock();
+ readLock.lock();
try {
- readLock.lock();
return Collections.unmodifiableList(this.tasks);
} finally {
readLock.unlock();
@@ -122,8 +122,8 @@ public class TaskTable implements Serializable {
*/
public void remove(String id) {
final Lock writeLock = lock.writeLock();
+ writeLock.lock();
try {
- writeLock.lock();
final int index = ids.indexOf(id);
if (index > -1) {
tasks.remove(index);
@@ -146,8 +146,8 @@ public class TaskTable implements Serializable {
*/
public boolean updatePattern(String id, CronPattern pattern) {
final Lock writeLock = lock.writeLock();
+ writeLock.lock();
try {
- writeLock.lock();
final int index = ids.indexOf(id);
if (index > -1) {
patterns.set(index, pattern);
@@ -168,8 +168,8 @@ public class TaskTable implements Serializable {
*/
public Task getTask(int index) {
final Lock readLock = lock.readLock();
+ readLock.lock();
try {
- readLock.lock();
return tasks.get(index);
} finally {
readLock.unlock();
@@ -200,8 +200,8 @@ public class TaskTable implements Serializable {
*/
public CronPattern getPattern(int index) {
final Lock readLock = lock.readLock();
+ readLock.lock();
try {
- readLock.lock();
return patterns.get(index);
} finally {
readLock.unlock();
@@ -250,8 +250,8 @@ public class TaskTable implements Serializable {
*/
public void executeTaskIfMatch(long millis) {
final Lock readLock = lock.readLock();
+ readLock.lock();
try {
- readLock.lock();
executeTaskIfMatchInternal(millis);
} finally {
readLock.unlock();
diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml
index 46f8e5247..f16d74ac6 100644
--- a/hutool-crypto/pom.xml
+++ b/hutool-crypto/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.4.1-SNAPSHOT
+ 5.4.2-SNAPSHOT
hutool-crypto
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java
index 1a3feb214..2cf2e477e 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/RC4.java
@@ -140,8 +140,8 @@ public class RC4 implements Serializable {
*/
public byte[] crypt(final byte[] msg) {
final ReadLock readLock = this.lock.readLock();
- readLock.lock();
byte[] code;
+ readLock.lock();
try {
final int[] sbox = this.sbox.clone();
code = new byte[msg.length];
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java
index 27261779d..fdc994ecb 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/symmetric/SymmetricCrypto.java
@@ -204,7 +204,7 @@ public class SymmetricCrypto implements Serializable {
} else {
cipher.init(Cipher.ENCRYPT_MODE, secretKey, params);
}
- return cipher.doFinal(paddingDataWithZero(data, cipher.getBlockSize()));
+ return cipher.doFinal(paddingDataWithZero(data, cipher.getBlockSize()));
} catch (Exception e) {
throw new CryptoException(e);
} finally {
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/ECIESTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/ECIESTest.java
similarity index 90%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/ECIESTest.java
rename to hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/ECIESTest.java
index ca83c61ad..1b83fe4f0 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/ECIESTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/ECIESTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto.test;
+package cn.hutool.crypto.test.asymmetric;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.asymmetric.ECIES;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/RSATest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java
similarity index 97%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/RSATest.java
rename to hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java
index fcb9faa70..f8c309612 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/RSATest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto.test;
+package cn.hutool.crypto.test.asymmetric;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.ArrayUtil;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/SM2Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java
similarity index 90%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/SM2Test.java
rename to hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java
index a5ed710d8..56abb282d 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/SM2Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto.test;
+package cn.hutool.crypto.test.asymmetric;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.CharsetUtil;
@@ -19,9 +19,8 @@ import java.security.PublicKey;
/**
* SM2算法单元测试
- *
- * @author Looly, Gsealy
*
+ * @author Looly, Gsealy
*/
public class SM2Test {
@@ -71,7 +70,7 @@ public class SM2Test {
byte[] decrypt = sm2.decrypt(encrypt, KeyType.PrivateKey);
Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
}
-
+
@Test
public void sm2BcdTest() {
String text = "我是一段测试aaaa";
@@ -138,6 +137,19 @@ public class SM2Test {
KeyPair pair = SecureUtil.generateKeyPair("SM2");
+ final SM2 sm2 = new SM2(pair.getPrivate(), pair.getPublic());
+
+ byte[] sign = sm2.sign(content.getBytes());
+ boolean verify = sm2.verify(content.getBytes(), sign);
+ Assert.assertTrue(verify);
+ }
+
+ @Test
+ public void sm2SignAndVerifyUseKeyTest2() {
+ String content = "我是Hanley.";
+
+ KeyPair pair = SecureUtil.generateKeyPair("SM2");
+
final SM2 sm2 = new SM2(//
HexUtil.encodeHexStr(pair.getPrivate().getEncoded()), //
HexUtil.encodeHexStr(pair.getPublic().getEncoded())//
@@ -162,7 +174,7 @@ public class SM2Test {
}
@Test
- public void sm2WithPointTest(){
+ public void sm2WithPointTest() {
String d = "FAB8BBE670FAE338C9E9382B9FB6485225C11A3ECB84C938F10F20A93B6215F0";
String x = "9EF573019D9A03B16B0BE44FC8A5B4E8E098F56034C97B312282DD0B4810AFC3";
String y = "CC759673ED0FC9B9DC7E6FA38F0E2B121E02654BF37EA6B63FAF2A0D6013EADF";
@@ -176,7 +188,7 @@ public class SM2Test {
}
@Test
- public void sm2PlainWithPointTest(){
+ public void sm2PlainWithPointTest() {
// 测试地址：https://i.goto327.top/CryptTools/SM2.aspx?tdsourcetag=s_pctim_aiomsg
String d = "FAB8BBE670FAE338C9E9382B9FB6485225C11A3ECB84C938F10F20A93B6215F0";
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/SignTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SignTest.java
similarity index 96%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/SignTest.java
rename to hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SignTest.java
index 33d88203e..a16d4f562 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/SignTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SignTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto.test;
+package cn.hutool.crypto.test.asymmetric;
import cn.hutool.core.map.MapUtil;
import org.junit.Assert;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/HmacTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/HmacTest.java
similarity index 94%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/HmacTest.java
rename to hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/HmacTest.java
index 1fd247926..b29e6d47a 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/HmacTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/HmacTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto.test;
+package cn.hutool.crypto.test.digest;
import org.junit.Assert;
import org.junit.Test;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/AESTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/AESTest.java
similarity index 88%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/AESTest.java
rename to hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/AESTest.java
index 87dd38f2f..f89c9cfc2 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/AESTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/AESTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto.test;
+package cn.hutool.crypto.test.symmetric;
import cn.hutool.crypto.Mode;
import cn.hutool.crypto.Padding;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/DesTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/DesTest.java
similarity index 92%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/DesTest.java
rename to hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/DesTest.java
index 649c35d2c..34554aeda 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/DesTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/DesTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto.test;
+package cn.hutool.crypto.test.symmetric;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.Mode;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/RC4Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/RC4Test.java
similarity index 92%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/RC4Test.java
rename to hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/RC4Test.java
index 5785182af..7869edc6a 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/RC4Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/RC4Test.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto.test;
+package cn.hutool.crypto.test.symmetric;
import org.junit.Assert;
import org.junit.Test;
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/SymmetricTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/SymmetricTest.java
similarity index 95%
rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/SymmetricTest.java
rename to hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/SymmetricTest.java
index 0580ac3fd..7b490c816 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/SymmetricTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/SymmetricTest.java
@@ -1,4 +1,4 @@
-package cn.hutool.crypto.test;
+package cn.hutool.crypto.test.symmetric;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.RandomUtil;
diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml
index 9d59554bc..0c1e421ac 100644
--- a/hutool-db/pom.xml
+++ b/hutool-db/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.4.1-SNAPSHOT
+ 5.4.2-SNAPSHOT
hutool-db
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 382c44ac7..3cf9bdadf 100644
--- a/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java
+++ b/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java
@@ -248,6 +248,25 @@ public abstract class AbstractDb implements Serializable {
}
}
+ /**
+ * 批量执行非查询语句
+ *
+ * @param sql SQL
+ * @param paramsBatch 批量的参数
+ * @return 每个SQL执行影响的行数
+ * @throws SQLException SQL执行异常
+ * @since 5.4.2
+ */
+ public int[] executeBatch(String sql, Iterable paramsBatch) throws SQLException {
+ Connection conn = null;
+ try {
+ conn = this.getConnection();
+ return SqlExecutor.executeBatch(conn, sql, paramsBatch);
+ } finally {
+ this.closeConnection(conn);
+ }
+ }
+
/**
* 批量执行非查询语句
*
@@ -266,6 +285,24 @@ public abstract class AbstractDb implements Serializable {
}
}
+ /**
+ * 批量执行非查询语句
+ *
+ * @param sqls SQL列表
+ * @return 每个SQL执行影响的行数
+ * @throws SQLException SQL执行异常
+ * @since 5.4.2
+ */
+ public int[] executeBatch(Iterable sqls) throws SQLException {
+ Connection conn = null;
+ try {
+ conn = this.getConnection();
+ return SqlExecutor.executeBatch(conn, sqls);
+ } finally {
+ this.closeConnection(conn);
+ }
+ }
+
// ---------------------------------------------------------------------------- CRUD start
/**
diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml
index fa3625e17..4a21e99dc 100644
--- a/hutool-dfa/pom.xml
+++ b/hutool-dfa/pom.xml
@@ -7,7 +7,7 @@
cn.hutool
hutool-parent
- 5.4.1-SNAPSHOT
+ 5.4.2-SNAPSHOT
hutool-dfa
diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index b1363d249..821d1b86d 100644
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.4.1-SNAPSHOT
+ 5.4.2-SNAPSHOT
hutool-extra
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/cglib/BeanCopierCache.java b/hutool-extra/src/main/java/cn/hutool/extra/cglib/BeanCopierCache.java
index 7378b9090..91928c548 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/cglib/BeanCopierCache.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/cglib/BeanCopierCache.java
@@ -1,11 +1,9 @@
package cn.hutool.extra.cglib;
import cn.hutool.core.lang.SimpleCache;
-import cn.hutool.core.lang.func.Func0;
import cn.hutool.core.util.StrUtil;
import net.sf.cglib.beans.BeanCopier;
-
-import java.beans.PropertyDescriptor;
+import net.sf.cglib.core.Converter;
/**
* BeanCopier属性缓存
@@ -15,20 +13,39 @@ import java.beans.PropertyDescriptor;
* @since 5.4.1
*/
public enum BeanCopierCache {
+ /**
+ * BeanCopier属性缓存单例
+ */
INSTANCE;
private final SimpleCache cache = new SimpleCache<>();
/**
- * 获得属性名和{@link PropertyDescriptor}Map映射
+ * 获得类与转换器生成的key在{@link BeanCopier}的Map中对应的元素
*
* @param srcClass 源Bean的类
* @param targetClass 目标Bean的类
- * @param supplier 缓存对象产生函数
- * @return 属性名和{@link PropertyDescriptor}Map映射
- * @since 5.4.1
+ * @param converter 转换器
+ * @return Map中对应的BeanCopier
*/
- public BeanCopier get(Class srcClass, Class targetClass, Func0 supplier) {
- return this.cache.get(StrUtil.format("{}_{}", srcClass.getName(), srcClass.getName()), supplier);
+ public BeanCopier get(Class srcClass, Class targetClass, Converter converter) {
+ final String key = genKey(srcClass, targetClass, converter);
+ return cache.get(key, () -> BeanCopier.create(srcClass, targetClass, converter != null));
+ }
+
+ /**
+ * 获得类与转换器生成的key
+ *
+ * @param srcClass 源Bean的类
+ * @param targetClass 目标Bean的类
+ * @param converter 转换器
+ * @return 属性名和Map映射的key
+ */
+ private String genKey(Class srcClass, Class targetClass, Converter converter) {
+ String key = StrUtil.format("{}#{}", srcClass.getName(), targetClass.getName());
+ if(null != converter){
+ key += "#" + converter.getClass().getName();
+ }
+ return key;
}
}
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/cglib/CglibUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/cglib/CglibUtil.java
index cc0e56b0d..086aa2516 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/cglib/CglibUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/cglib/CglibUtil.java
@@ -6,6 +6,12 @@ import net.sf.cglib.beans.BeanCopier;
import net.sf.cglib.beans.BeanMap;
import net.sf.cglib.core.Converter;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
/**
* Cglib工具类
*
@@ -39,7 +45,7 @@ public class CglibUtil {
*/
public static T copy(Object source, Class targetClass, Converter converter) {
final T target = ReflectUtil.newInstanceIfPossible(targetClass);
- copy(source, target);
+ copy(source, target, converter);
return target;
}
@@ -66,18 +72,82 @@ public class CglibUtil {
final Class sourceClass = source.getClass();
final Class targetClass = target.getClass();
- final BeanCopier beanCopier = BeanCopierCache.INSTANCE.get(
- sourceClass, targetClass,
- () -> BeanCopier.create(sourceClass, targetClass, null != converter));
+ final BeanCopier beanCopier = BeanCopierCache.INSTANCE.get(sourceClass, targetClass, converter);
beanCopier.copy(source, target, converter);
}
+ /**
+ * 拷贝List Bean对象属性
+ *
+ * @param 源bean类型
+ * @param 目标bean类型
+ * @param source 源bean对象list
+ * @param target 目标bean对象
+ * @return 目标bean对象list
+ */
+ public static List copyList(Collection source, Supplier target) {
+ return copyList(source, target, null, null);
+ }
+
+ /**
+ * 拷贝List Bean对象属性
+ *
+ * @param source 源bean对象list
+ * @param target 目标bean对象
+ * @param converter 转换器，无需可传{@code null}
+ * @param 源bean类型
+ * @param 目标bean类型
+ * @return 目标bean对象list
+ * @since 5.4.1
+ */
+ public static List copyList(Collection source, Supplier target, Converter converter) {
+ return copyList(source, target, converter, null);
+ }
+
+ /**
+ * 拷贝List Bean对象属性
+ *
+ * @param source 源bean对象list
+ * @param target 目标bean对象
+ * @param callback 回调对象
+ * @param 源bean类型
+ * @param 目标bean类型
+ * @return 目标bean对象list
+ * @since 5.4.1
+ */
+ public static List copyList(Collection source, Supplier target, BiConsumer callback) {
+ return copyList(source, target, null, callback);
+ }
+
+ /**
+ * 拷贝List Bean对象属性
+ *
+ * @param source 源bean对象list
+ * @param target 目标bean对象
+ * @param converter 转换器，无需可传{@code null}
+ * @param callback 回调对象
+ * @param 源bean类型
+ * @param 目标bean类型
+ * @return 目标bean对象list
+ */
+ public static List copyList(Collection source, Supplier target, Converter converter, BiConsumer callback) {
+ return source.stream().map(s -> {
+ T t = target.get();
+ copy(source, t, converter);
+ if (callback != null) {
+ callback.accept(s, t);
+ }
+ return t;
+ }).collect(Collectors.toList());
+ }
+
/**
* 将Bean转换为Map
*
* @param bean Bean对象
* @return {@link BeanMap}
+ * @since 5.4.1
*/
public static BeanMap toMap(Object bean) {
return BeanMap.create(bean);
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java b/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java
index fa8a40b52..51a875f35 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java
@@ -11,9 +11,11 @@ import javax.activation.DataHandler;
import javax.activation.DataSource;
import javax.activation.FileDataSource;
import javax.activation.FileTypeMap;
+import javax.mail.Address;
import javax.mail.Authenticator;
import javax.mail.MessagingException;
import javax.mail.Multipart;
+import javax.mail.SendFailedException;
import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.internet.MimeBodyPart;
@@ -355,6 +357,12 @@ public class Mail {
try {
return doSend();
} catch (MessagingException e) {
+ if(e instanceof SendFailedException){
+ // 当地址无效时，显示更加详细的无效地址信息
+ final Address[] invalidAddresses = ((SendFailedException) e).getInvalidAddresses();
+ final String msg = StrUtil.format("Invalid Addresses: {}", ArrayUtil.toString(invalidAddresses));
+ throw new MailException(msg, e);
+ }
throw new MailException(e);
}
}
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/spring/EnableSpringUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/spring/EnableSpringUtil.java
new file mode 100644
index 000000000..5710b1c07
--- /dev/null
+++ b/hutool-extra/src/main/java/cn/hutool/extra/spring/EnableSpringUtil.java
@@ -0,0 +1,19 @@
+package cn.hutool.extra.spring;
+
+import org.springframework.context.annotation.Import;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 启用SpringUtil, 即注入SpringUtil到容器中
+ *
+ * @author sidian
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Import(SpringUtil.class)
+public @interface EnableSpringUtil {
+}
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java
index 62211cab1..31d7f309d 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschUtil.java
@@ -6,13 +6,7 @@ import cn.hutool.core.lang.Assert;
import cn.hutool.core.net.LocalPortGenerater;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.StrUtil;
-import com.jcraft.jsch.Channel;
-import com.jcraft.jsch.ChannelExec;
-import com.jcraft.jsch.ChannelSftp;
-import com.jcraft.jsch.ChannelShell;
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Session;
+import com.jcraft.jsch.*;
import java.io.IOException;
import java.io.InputStream;
@@ -232,6 +226,31 @@ public class JschUtil {
return false;
}
+ /**
+ * 绑定ssh服务端的serverPort端口, 到host主机的port端口上.
+ * 即数据从ssh服务端的serverPort端口, 流经ssh客户端, 达到host:port上.
+ *
+ * @param session 与ssh服务端建立的会话
+ * @param bindPort ssh服务端上要被绑定的端口
+ * @param host 转发到的host
+ * @param port host上的端口
+ * @return 成功与否
+ * @throws JschRuntimeException 端口绑定失败异常
+ * @since 5.4.2
+ */
+ public static boolean bindRemotePort(Session session, int bindPort, String host, int port) throws JschRuntimeException {
+ if (session != null && session.isConnected()) {
+ try {
+ session.setPortForwardingR(bindPort, host, port);
+ } catch (JSchException e) {
+ throw new JschRuntimeException(e, "From [{}] mapping to [{}] error！", bindPort, port);
+ }
+ return true;
+ }
+ return false;
+ }
+
+
/**
* 解除端口映射
*
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java
index f4415d789..73a97efb1 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java
@@ -1,11 +1,10 @@
package cn.hutool.extra.template.engine.velocity;
-import org.apache.velocity.app.Velocity;
-
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.template.Template;
import cn.hutool.extra.template.TemplateConfig;
import cn.hutool.extra.template.TemplateEngine;
+import org.apache.velocity.app.Velocity;
/**
* Velocity模板引擎
@@ -16,6 +15,7 @@ import cn.hutool.extra.template.TemplateEngine;
public class VelocityEngine implements TemplateEngine {
private org.apache.velocity.app.VelocityEngine engine;
+ private TemplateConfig config;
// --------------------------------------------------------------------------------- Constructor start
/**
@@ -47,6 +47,7 @@ public class VelocityEngine implements TemplateEngine {
if(null == config){
config = TemplateConfig.DEFAULT;
}
+ this.config = config;
init(createEngine(config));
return this;
}
@@ -74,7 +75,25 @@ public class VelocityEngine implements TemplateEngine {
if(null == this.engine){
init(TemplateConfig.DEFAULT);
}
- return VelocityTemplate.wrap(engine.getTemplate(resource));
+
+ // 目录前缀
+ String root;
+ // 自定义编码
+ String charsetStr = null;
+ if(null != this.config){
+ root = this.config.getPath();
+ charsetStr = this.config.getCharsetStr();
+
+ // 修正template目录，在classpath或者web_root模式下，按照配置添加默认前缀
+ // 如果用户已经自行添加了前缀，则忽略之
+ final TemplateConfig.ResourceMode resourceMode = this.config.getResourceMode();
+ if(TemplateConfig.ResourceMode.CLASSPATH == resourceMode
+ || TemplateConfig.ResourceMode.WEB_ROOT == resourceMode){
+ resource = StrUtil.addPrefixIfNot(resource, StrUtil.addSuffixIfNot(root, "/"));
+ }
+ }
+
+ return VelocityTemplate.wrap(engine.getTemplate(resource, charsetStr));
}
/**
@@ -98,7 +117,9 @@ public class VelocityEngine implements TemplateEngine {
// loader
switch (config.getResourceMode()) {
case CLASSPATH:
- ve.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+ // 新版Velocity弃用
+// ve.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+ ve.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
break;
case FILE:
// path
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/spring/EnableSprintUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/spring/EnableSprintUtilTest.java
new file mode 100644
index 000000000..cf202dc8d
--- /dev/null
+++ b/hutool-extra/src/test/java/cn/hutool/extra/spring/EnableSprintUtilTest.java
@@ -0,0 +1,24 @@
+package cn.hutool.extra.spring;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * @author sidian
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = EnableSprintUtilTest.class)
+@EnableSpringUtil
+public class EnableSprintUtilTest {
+
+ @Test
+ public void test() {
+ // 使用@EnableSpringUtil注解后, 能获取上下文
+ Assert.assertNotNull(SpringUtil.getApplicationContext());
+ // 不使用时, 为null
+// Assert.assertNull(SpringUtil.getApplicationContext());
+ }
+}
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java
index 7d29f1cd7..30cdf0c90 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java
@@ -3,6 +3,7 @@ package cn.hutool.extra.ssh;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Console;
import com.jcraft.jsch.Session;
+import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -13,7 +14,7 @@ import org.junit.Test;
*
*/
public class JschUtilTest {
-
+
@Test
@Ignore
public void bindPortTest() {
@@ -22,7 +23,22 @@ public class JschUtilTest {
// 将堡垒机保护的内网8080端口映射到localhost，我们就可以通过访问http://localhost:8080/访问内网服务了
JschUtil.bindPort(session, "172.20.12.123", 8080, 8080);
}
-
+
+
+ @Test
+ @Ignore
+ public void bindRemotePort() throws InterruptedException {
+ // 建立会话
+ Session session = JschUtil.getSession("looly.centos", 22, "test", "123456");
+ // 绑定ssh服务端8089端口到本机的8000端口上
+ boolean b = JschUtil.bindRemotePort(session, 8089, "localhost", 8000);
+ Assert.assertTrue(b);
+ // 保证一直运行
+// while (true){
+// Thread.sleep(3000);
+// }
+ }
+
@Test
@Ignore
public void sftpTest() {
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java
index b299f5b9b..77a273fe1 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java
@@ -1,13 +1,5 @@
package cn.hutool.extra.template;
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
import cn.hutool.core.lang.Dict;
import cn.hutool.extra.template.TemplateConfig.ResourceMode;
import cn.hutool.extra.template.engine.beetl.BeetlEngine;
@@ -16,6 +8,13 @@ import cn.hutool.extra.template.engine.freemarker.FreemarkerEngine;
import cn.hutool.extra.template.engine.rythm.RythmEngine;
import cn.hutool.extra.template.engine.thymeleaf.ThymeleafEngine;
import cn.hutool.extra.template.engine.velocity.VelocityEngine;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
/**
* 模板引擎单元测试
@@ -99,10 +98,13 @@ public class TemplateUtilTest {
//ClassPath模板
engine = TemplateUtil.createEngine(
new TemplateConfig("templates", ResourceMode.CLASSPATH).setCustomEngine(VelocityEngine.class));
+ template = engine.getTemplate("velocity_test.vtl");
+ result = template.render(Dict.create().set("name", "hutool"));
+ Assert.assertEquals("你好,hutool", result);
+
template = engine.getTemplate("templates/velocity_test.vtl");
result = template.render(Dict.create().set("name", "hutool"));
Assert.assertEquals("你好,hutool", result);
-
}
@Test
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java
new file mode 100644
index 000000000..a042c2775
--- /dev/null
+++ b/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java
@@ -0,0 +1,21 @@
+package cn.hutool.extra.template;
+
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.extra.template.engine.velocity.VelocityEngine;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class VelocityTest {
+
+ @Test
+ public void charsetTest(){
+ final TemplateConfig config = new TemplateConfig("templates", TemplateConfig.ResourceMode.CLASSPATH);
+ config.setCustomEngine(VelocityEngine.class);
+ config.setCharset(CharsetUtil.CHARSET_GBK);
+ final TemplateEngine engine = TemplateUtil.createEngine(config);
+ Template template = engine.getTemplate("velocity_test_gbk.vtl");
+ String result = template.render(Dict.create().set("name", "hutool"));
+ Assert.assertEquals("你好,hutool", result);
+ }
+}
diff --git a/hutool-extra/src/test/resources/templates/velocity_test_gbk.vtl b/hutool-extra/src/test/resources/templates/velocity_test_gbk.vtl
new file mode 100644
index 000000000..491be1b4f
--- /dev/null
+++ b/hutool-extra/src/test/resources/templates/velocity_test_gbk.vtl
@@ -0,0 +1 @@
+,$name
\ No newline at end of file
diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml
index ac70bd00d..4069c806e 100644
--- a/hutool-http/pom.xml
+++ b/hutool-http/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.4.1-SNAPSHOT
+ 5.4.2-SNAPSHOT
hutool-http
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java b/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java
index 2637a30c5..875805e21 100644
--- a/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java
@@ -30,6 +30,7 @@ import java.net.HttpCookie;
import java.net.HttpURLConnection;
import java.net.Proxy;
import java.net.URLStreamHandler;
+import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -413,6 +414,18 @@ public class HttpRequest extends HttpBase {
return this;
}
+ /**
+ * 设置Cookie
+ * 自定义Cookie后会覆盖Hutool的默认Cookie行为
+ *
+ * @param cookies Cookie值数组，如果为{@code null}则设置无效，使用默认Cookie行为
+ * @return this
+ * @since 5.4.1
+ */
+ public HttpRequest cookie(Collection cookies) {
+ return cookie(CollUtil.isEmpty(cookies) ? null : cookies.toArray(new HttpCookie[0]));
+ }
+
/**
* 设置Cookie
* 自定义Cookie后会覆盖Hutool的默认Cookie行为
diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml
index 8525734ed..b865ed759 100644
--- a/hutool-json/pom.xml
+++ b/hutool-json/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.4.1-SNAPSHOT
+ 5.4.2-SNAPSHOT
hutool-json
diff --git a/hutool-json/src/test/java/cn/hutool/json/XMLTest.java b/hutool-json/src/test/java/cn/hutool/json/XMLTest.java
index 8de0efaa1..dfd5e215e 100644
--- a/hutool-json/src/test/java/cn/hutool/json/XMLTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/XMLTest.java
@@ -5,10 +5,11 @@ import org.junit.Test;
public class XMLTest {
- @SuppressWarnings("ConstantConditions")
@Test
public void toXmlTest(){
- final JSONObject put = JSONUtil.createObj().put("aaa", "你好").put("键2", "test");
+ final JSONObject put = JSONUtil.createObj()
+ .set("aaa", "你好")
+ .set("键2", "test");
final String s = JSONUtil.toXmlStr(put);
Assert.assertEquals("你好<键2>test", s);
}
diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml
index 1b69f0cbd..8b550b067 100644
--- a/hutool-log/pom.xml
+++ b/hutool-log/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.4.1-SNAPSHOT
+ 5.4.2-SNAPSHOT
hutool-log
diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml
index 360e90544..09caa0e37 100644
--- a/hutool-poi/pom.xml
+++ b/hutool-poi/pom.xml
@@ -8,7 +8,7 @@
cn.hutool
hutool-parent
- 5.4.1-SNAPSHOT
+ 5.4.2-SNAPSHOT
hutool-poi
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelFileUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelFileUtil.java
index b1b1f6e07..2c04fc90e 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelFileUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelFileUtil.java
@@ -1,14 +1,11 @@
package cn.hutool.poi.excel;
+import cn.hutool.core.io.IORuntimeException;
+import org.apache.poi.poifs.filesystem.FileMagic;
+
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.PushbackInputStream;
-
-import org.apache.poi.poifs.filesystem.FileMagic;
-
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.io.IoUtil;
/**
* Excel文件工具类
@@ -26,9 +23,18 @@ public class ExcelFileUtil {
* @return 是否为XLS格式的Excel文件（HSSF）
*/
public static boolean isXls(InputStream in) {
- final PushbackInputStream pin = IoUtil.toPushbackStream(in, 8);
+ /*
+ * {@link java.io.PushbackInputStream}
+ * PushbackInputStream的markSupported()为false，并不支持mark和reset
+ * 如果强转成PushbackInputStream在调用FileMagic.valueOf(inputStream)时会报错
+ * {@link FileMagic}
+ * 报错内容：getFileMagic() only operates on streams which support mark(int)
+ * 此处修改成 final InputStream inputStream = FileMagic.prepareToCheckMagic(in)
+ * @author kefan.qu
+ */
+ final InputStream inputStream = FileMagic.prepareToCheckMagic(in);
try {
- return FileMagic.valueOf(pin) == FileMagic.OLE2;
+ return FileMagic.valueOf(inputStream) == FileMagic.OLE2;
} catch (IOException e) {
throw new IORuntimeException(e);
}
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java
index 1c8cddd27..3d814749f 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java
@@ -289,7 +289,7 @@ public class ExcelUtil {
*/
public static ExcelReader getReader(InputStream bookStream, int sheetIndex) {
try {
- return new ExcelReader(bookStream, sheetIndex, true);
+ return new ExcelReader(bookStream, sheetIndex);
} catch (NoClassDefFoundError e) {
throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
}
@@ -303,10 +303,12 @@ public class ExcelUtil {
* @param closeAfterRead 读取结束是否关闭流
* @return {@link ExcelReader}
* @since 4.0.3
+ * @deprecated 使用完毕无论是否closeAfterRead，poi会关闭流，此参数无意义。
*/
+ @Deprecated
public static ExcelReader getReader(InputStream bookStream, int sheetIndex, boolean closeAfterRead) {
try {
- return new ExcelReader(bookStream, sheetIndex, closeAfterRead);
+ return new ExcelReader(bookStream, sheetIndex);
} catch (NoClassDefFoundError e) {
throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
}
@@ -322,7 +324,7 @@ public class ExcelUtil {
*/
public static ExcelReader getReader(InputStream bookStream, String sheetName) {
try {
- return new ExcelReader(bookStream, sheetName, true);
+ return new ExcelReader(bookStream, sheetName);
} catch (NoClassDefFoundError e) {
throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
}
@@ -335,10 +337,12 @@ public class ExcelUtil {
* @param sheetName sheet名，第一个默认是sheet1
* @param closeAfterRead 读取结束是否关闭流
* @return {@link ExcelReader}
+ * @deprecated 使用完毕无论是否closeAfterRead，poi会关闭流，此参数无意义。
*/
+ @Deprecated
public static ExcelReader getReader(InputStream bookStream, String sheetName, boolean closeAfterRead) {
try {
- return new ExcelReader(bookStream, sheetName, closeAfterRead);
+ return new ExcelReader(bookStream, sheetName);
} catch (NoClassDefFoundError e) {
throw new DependencyException(ObjectUtil.defaultIfNull(e.getCause(), e), PoiChecker.NO_POI_ERROR_MSG);
}
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java
index cbeb149db..c7a9f0d94 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/RowUtil.java
@@ -7,9 +7,14 @@ import cn.hutool.poi.excel.cell.CellUtil;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellRangeUtil;
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
/**
* Excel中的行{@link Row}封装工具类
@@ -97,4 +102,88 @@ public class RowUtil {
i++;
}
}
+
+ /**
+ * 插入行
+ *
+ * @param sheet 工作表
+ * @param startRow 插入的起始行
+ * @param insertNumber 插入的行数
+ * @since 5.4.2
+ */
+ public static void insertRow(Sheet sheet, int startRow, int insertNumber) {
+ if (insertNumber <= 0) {
+ return;
+ }
+ // 插入位置的行，如果插入的行不存在则创建新行
+ Row sourceRow = Optional.ofNullable(sheet.getRow(startRow)).orElseGet(() -> sheet.createRow(insertNumber));
+ // 从插入行开始到最后一行向下移动
+ sheet.shiftRows(startRow, sheet.getLastRowNum(), insertNumber, true, false);
+
+ // 填充移动后留下的空行
+ IntStream.range(startRow, startRow + insertNumber).forEachOrdered(i -> {
+ Row row = sheet.createRow(i);
+ row.setHeightInPoints(sourceRow.getHeightInPoints());
+ short lastCellNum = sourceRow.getLastCellNum();
+ IntStream.range(0, lastCellNum).forEachOrdered(j -> {
+ Cell cell = row.createCell(j);
+ cell.setCellStyle(sourceRow.getCell(j).getCellStyle());
+ });
+ });
+ }
+
+ /**
+ * 从工作表中删除指定的行，此方法修复sheet.shiftRows删除行时会拆分合并的单元格的问题
+ *
+ * @param row 需要删除的行
+ * @see sheet.shiftRows的bug
+ * @since 5.4.2
+ */
+ public static void removeRow(Row row) {
+ if (row == null) {
+ return;
+ }
+ int rowIndex = row.getRowNum();
+ Sheet sheet = row.getSheet();
+ int lastRow = sheet.getLastRowNum();
+ if (rowIndex >= 0 && rowIndex < lastRow) {
+ List updateMergedRegions = new ArrayList<>();
+ // 找出需要调整的合并单元格
+ IntStream.range(0, sheet.getNumMergedRegions())
+ .forEach(i -> {
+ CellRangeAddress mr = sheet.getMergedRegion(i);
+ if (!mr.containsRow(rowIndex)) {
+ return;
+ }
+ // 缩减以后变成单个单元格则删除合并单元格
+ if (mr.getFirstRow() == mr.getLastRow() - 1 && mr.getFirstColumn() == mr.getLastColumn()) {
+ return;
+ }
+ updateMergedRegions.add(mr);
+ });
+
+ // 将行上移
+ sheet.shiftRows(rowIndex + 1, lastRow, -1);
+
+ // 找出删除行所在的合并单元格
+ List removeMergedRegions = IntStream.range(0, sheet.getNumMergedRegions())
+ .filter(i -> updateMergedRegions.stream().
+ anyMatch(umr -> CellRangeUtil.contains(umr, sheet.getMergedRegion(i))))
+ .boxed()
+ .collect(Collectors.toList());
+
+ sheet.removeMergedRegions(removeMergedRegions);
+ updateMergedRegions.forEach(mr -> {
+ mr.setLastRow(mr.getLastRow() - 1);
+ sheet.addMergedRegion(mr);
+ });
+ sheet.validateMergedRegions();
+ }
+ if (rowIndex == lastRow) {
+ Row removingRow = sheet.getRow(rowIndex);
+ if (removingRow != null) {
+ sheet.removeRow(removingRow);
+ }
+ }
+ }
}
diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml
index eda32f472..57703bb9a 100644
--- a/hutool-script/pom.xml
+++ b/hutool-script/pom.xml
@@ -8,7 +8,7 @@
cn.hutool
hutool-parent
- 5.4.1-SNAPSHOT
+ 5.4.2-SNAPSHOT
hutool-script
diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml
index 5dd97d6ef..6379c76f6 100644
--- a/hutool-setting/pom.xml
+++ b/hutool-setting/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.4.1-SNAPSHOT
+ 5.4.2-SNAPSHOT
hutool-setting
diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml
index 26632051b..42b7fe691 100644
--- a/hutool-socket/pom.xml
+++ b/hutool-socket/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.4.1-SNAPSHOT
+ 5.4.2-SNAPSHOT
hutool-socket
diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml
index c2233b7d6..6683d7789 100644
--- a/hutool-system/pom.xml
+++ b/hutool-system/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.4.1-SNAPSHOT
+ 5.4.2-SNAPSHOT
hutool-system
diff --git a/pom.xml b/pom.xml
index 307d662f6..e39ec8435 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
cn.hutool
hutool-parent
- 5.4.1-SNAPSHOT
+ 5.4.2-SNAPSHOT
hutool
Hutool是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。
https://github.com/looly/hutool