diff --git a/CHANGELOG.md b/CHANGELOG.md index b39739c9f..5a9d46793 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,11 @@ ------------------------------------------------------------------------------------------------------------- -# 5.8.4.M1 (2022-06-10) +# 5.8.4.M1 (2022-06-12) ### 🐣新特性 +* 【extra 】 Sftp增加构造重载,支持超时(pr#653@Gitee) +* ### 🐞Bug修复 ------------------------------------------------------------------------------------------------------------- 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 dc71bafa0..1e5daaf1f 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 @@ -127,6 +127,7 @@ public class JschUtil { * @param passphrase 私钥文件的密码,可以为null * @param timeOut 超时时间,单位毫秒 * @return SSH会话 + * @since 5.8.4 */ public static Session openSession(String sshHost, int sshPort, String sshUser, String privateKeyPath, byte[] passphrase, int timeOut) { final Session session = createSession(sshHost, sshPort, sshUser, privateKeyPath, passphrase); diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java index f755d17e0..f66a65ecc 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java @@ -31,7 +31,7 @@ import java.util.Vector; * *

* 此类为基于jsch的SFTP实现
- * 参考:https://www.cnblogs.com/longyg/archive/2012/06/25/2556576.html + * 参考:https://www.cnblogs.com/longyg/archive/2012/06/25/2556576.html *

* * @author looly diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2377Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2377Test.java new file mode 100644 index 000000000..a51ef9d1c --- /dev/null +++ b/hutool-json/src/test/java/cn/hutool/json/Issue2377Test.java @@ -0,0 +1,23 @@ +package cn.hutool.json; + +import cn.hutool.core.convert.Convert; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; + +public class Issue2377Test { + + @Test + public void bytesTest(){ + Object[] paramArray = new Object[]{ 1,new byte[]{10,11}, "报表.xlsx"}; + String paramsStr = JSONUtil.toJsonStr(paramArray); + + List paramList = JSONUtil.toList(paramsStr, Object.class); + + String paramBytesStr = JSONUtil.toJsonStr(paramList.get(1)); + + final byte[] convert = Convert.convert(byte[].class, paramBytesStr); + Assert.assertArrayEquals((byte[])paramArray[1], convert); + } +}