From f33588da0d1d4420ed7d590bc3c1c71f42b2e747 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 26 Apr 2021 09:59:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E5=95=A5=E4=BD=9C=E7=94=A8=20?= =?UTF-8?q?=E5=85=88=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/utils/HttpClientManager.java | 1 + .../main/java/com/epmet/commons/tools/utils/net/OkHttpUtil.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java index 74809f9d30..eeac282cd8 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java @@ -101,6 +101,7 @@ public class HttpClientManager { private static RequestConfig requestConfig = RequestConfig.custom() .setSocketTimeout(soTimeout) .setConnectTimeout(connectionTimeout) + .setConnectionRequestTimeout(soTimeout) .build();//设置请求和传输超时时间 public static HttpClientManager getInstance() { diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/net/OkHttpUtil.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/net/OkHttpUtil.java index 1f100ae18a..78edc6c5f1 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/net/OkHttpUtil.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/net/OkHttpUtil.java @@ -48,7 +48,7 @@ public class OkHttpUtil { //支持HTTPS请求，跳过证书验证 clientBuilder.sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getX509TrustManager()) .hostnameVerifier(SSLSocketClient.getHostnameVerifier()); - clientBuilder.followRedirects(false).followSslRedirects(false); + //clientBuilder.followRedirects(false).followSslRedirects(false); //clientBuilder.sslSocketFactory(createSSLSocketFactory()); /*clientBuilder.hostnameVerifier(new HostnameVerifier() { @Override