From 9bcaa20d1aae703827009718990504f8a985ba72 Mon Sep 17 00:00:00 2001 From: Looly Date: Sun, 23 Apr 2023 00:34:14 +0800 Subject: [PATCH] fix code --- .../http/client/engine/httpclient4/HttpClient4Engine.java | 6 ++++++ .../http/client/engine/httpclient5/HttpClient5Engine.java | 6 ++++++ .../hutool/http/client/engine/okhttp/OkHttpEngine.java | 3 +++ 3 files changed, 15 insertions(+) diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java index 37defbbe4..faedc87a0 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient4/HttpClient4Engine.java @@ -114,6 +114,9 @@ public class HttpClient4Engine implements ClientEngine { if (null != sslInfo) { clientBuilder.setSSLSocketFactory(buildSocketFactory(sslInfo)); } + if(config.isDisableCache()){ + clientBuilder.disableAuthCaching(); + } clientBuilder.setDefaultRequestConfig(buildRequestConfig(config)); } @@ -121,6 +124,9 @@ public class HttpClient4Engine implements ClientEngine { // 设置默认头信息 clientBuilder.setDefaultHeaders(toHeaderList(GlobalHeaders.INSTANCE.headers())); + // 默认关闭自动重定向 + clientBuilder.disableRedirectHandling(); + // 设置代理 setProxy(clientBuilder, config); diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java index df3eb206f..904823e18 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Engine.java @@ -117,11 +117,17 @@ public class HttpClient5Engine implements ClientEngine { if (null != config) { clientBuilder.setConnectionManager(buildConnectionManager(config)); clientBuilder.setDefaultRequestConfig(buildRequestConfig(config)); + if(config.isDisableCache()){ + clientBuilder.disableAuthCaching(); + } } // 设置默认头信息 clientBuilder.setDefaultHeaders(toHeaderList(GlobalHeaders.INSTANCE.headers())); + // 默认关闭自动重定向 + clientBuilder.disableRedirectHandling(); + // 设置代理 setProxy(clientBuilder, config); diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpEngine.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpEngine.java index 1850ccc83..592518484 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpEngine.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpEngine.java @@ -111,6 +111,9 @@ public class OkHttpEngine implements ClientEngine { setProxy(builder, config); } + // 默认关闭自动跳转 + builder.followRedirects(false); + this.client = builder.build(); }