ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix test

Browse Source
This commit is contained in:
Looly 2021-08-12 00:19:22 +08:00
parent 884ac2e765
commit 05c679bfc5
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hutool-core/src/main/java/cn/hutool/core/io/copy/StreamCopier.java
View File

@ -74,6 +74,7 @@ public class StreamCopier extends IoCopier<InputStream, OutputStream> {
if (null != progress) { if (null != progress) {
progress.finish(); progress.finish();
} }
return size; return size;
} }

3
hutool-http/src/main/java/cn/hutool/http/HttpRequest.java
View File

@ -17,7 +17,6 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.http.body.MultipartBody; import cn.hutool.http.body.MultipartBody;
import cn.hutool.http.cookie.GlobalCookieManager; import cn.hutool.http.cookie.GlobalCookieManager;
import cn.hutool.http.ssl.SSLSocketFactoryBuilder;
import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.SSLSocketFactory;
@ -883,7 +882,7 @@ public class HttpRequest extends HttpBase<HttpRequest> {
* *
* @param protocol 协议 * @param protocol 协议
* @return this * @return this
* @see SSLSocketFactoryBuilder * @see SSLUtil#createSSLContext(String)
* @see #setSSLSocketFactory(SSLSocketFactory) * @see #setSSLSocketFactory(SSLSocketFactory)
*/ */
public HttpRequest setSSLProtocol(String protocol) { public HttpRequest setSSLProtocol(String protocol) {

2
hutool-http/src/main/java/cn/hutool/http/HttpResponse.java
View File

@ -467,7 +467,7 @@ public class HttpResponse extends HttpBase<HttpResponse> implements Closeable {
final FastByteArrayOutputStream out = contentLength > 0 ? final FastByteArrayOutputStream out = contentLength > 0 ?
new FastByteArrayOutputStream(contentLength) : new FastByteArrayOutputStream(); new FastByteArrayOutputStream(contentLength) : new FastByteArrayOutputStream();
try { try {
IoUtil.copy(in, out, -1, -1, null); IoUtil.copy(in, out, -1, contentLength, null);
} catch (IORuntimeException e) { } catch (IORuntimeException e) {
//noinspection StatementWithEmptyBody //noinspection StatementWithEmptyBody
if (e.getCause() instanceof EOFException || StrUtil.containsIgnoreCase(e.getMessage(), "Premature EOF")) { if (e.getCause() instanceof EOFException || StrUtil.containsIgnoreCase(e.getMessage(), "Premature EOF")) {

7
hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
View File

@ -56,7 +56,7 @@ public class HttpUtilTest {
@Ignore @Ignore
public void getTest3() { public void getTest3() {
// 测试url中带有空格的情况 // 测试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); Console.log(result1);
} }
@ -84,8 +84,9 @@ public class HttpUtilTest {
@Test @Test
@Ignore @Ignore
public void get12306Test() { public void get12306Test() {
String result = HttpUtil.get("https://kyfw.12306.cn/otn/"); HttpRequest.get("https://kyfw.12306.cn/otn/")
Console.log(result); .setFollowRedirects(true)
.then(response -> Console.log(response.body()));
} }
@Test @Test