From 05c679bfc5750c4a9c32f5f89f0cd13c591778d0 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 12 Aug 2021 00:19:22 +0800 Subject: [PATCH] fix test --- .../src/main/java/cn/hutool/core/io/copy/StreamCopier.java | 1 + hutool-http/src/main/java/cn/hutool/http/HttpRequest.java | 3 +-- hutool-http/src/main/java/cn/hutool/http/HttpResponse.java | 2 +- hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java | 7 ++++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/io/copy/StreamCopier.java b/hutool-core/src/main/java/cn/hutool/core/io/copy/StreamCopier.java index 35a3a53a7..170771483 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/copy/StreamCopier.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/copy/StreamCopier.java @@ -74,6 +74,7 @@ public class StreamCopier extends IoCopier { if (null != progress) { progress.finish(); } + return size; } 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 20946d124..f3517829e 100644 --- a/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java +++ b/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java @@ -17,7 +17,6 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.body.MultipartBody; import cn.hutool.http.cookie.GlobalCookieManager; -import cn.hutool.http.ssl.SSLSocketFactoryBuilder; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSocketFactory; @@ -883,7 +882,7 @@ public class HttpRequest extends HttpBase { * * @param protocol 协议 * @return this - * @see SSLSocketFactoryBuilder + * @see SSLUtil#createSSLContext(String) * @see #setSSLSocketFactory(SSLSocketFactory) */ public HttpRequest setSSLProtocol(String protocol) { 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 80f2f62fd..752f712e9 100644 --- a/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java +++ b/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java @@ -467,7 +467,7 @@ public class HttpResponse extends HttpBase implements Closeable { final FastByteArrayOutputStream out = contentLength > 0 ? new FastByteArrayOutputStream(contentLength) : new FastByteArrayOutputStream(); try { - IoUtil.copy(in, out, -1, -1, null); + IoUtil.copy(in, out, -1, contentLength, null); } catch (IORuntimeException e) { //noinspection StatementWithEmptyBody if (e.getCause() instanceof EOFException || StrUtil.containsIgnoreCase(e.getMessage(), "Premature EOF")) { 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 19626c123..70da72bfc 100644 --- a/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java +++ b/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java @@ -56,7 +56,7 @@ public class HttpUtilTest { @Ignore public void getTest3() { // 测试url中带有空格的情况 - String result1 = HttpUtil.get("http://122.152.198.206:5000/kf?abc= d"); + String result1 = HttpUtil.get("http://hutool.cn:5000/kf?abc= d"); Console.log(result1); } @@ -84,8 +84,9 @@ public class HttpUtilTest { @Test @Ignore public void get12306Test() { - String result = HttpUtil.get("https://kyfw.12306.cn/otn/"); - Console.log(result); + HttpRequest.get("https://kyfw.12306.cn/otn/") + .setFollowRedirects(true) + .then(response -> Console.log(response.body())); } @Test