niko/weixin4j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化异常信息&修复httpclient重定向错误

Browse Source
This commit is contained in:
jinyu
2017-01-22 16:14:10 +08:00
parent 45b9c75e1a
commit 37f15409ea
10 changed files with 94 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/SimpleHttpClient.java
+1 -1
View File
@@ -148,7 +148,7 @@ public class SimpleHttpClient extends AbstractHttpClient {
} catch (IOException e) {
throw new HttpClientException("I/O error on "
+ request.getMethod().name() + " request for \""
+ request.getURI().toString() + "\":" + e.getMessage(), e);
+ request.getURI().toString(), e);
} finally {
if (response != null) {
response.close();
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/support/apache3/HttpComponent3.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class HttpComponent3 extends AbstractHttpClient {
} catch (IOException e) {
throw new HttpClientException("I/O error on "
+ request.getMethod().name() + " request for \""
+ request.getURI().toString() + "\":" + e.getMessage(), e);
+ request.getURI().toString(), e);
} finally {
if (response != null) {
response.close();
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/support/apache4/HttpComponent4_1.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class HttpComponent4_1 extends HttpComponent4 {
} catch (IOException e) {
throw new HttpClientException("I/O error on "
+ request.getMethod().name() + " request for \""
+ request.getURI().toString() + "\":" + e.getMessage(), e);
+ request.getURI().toString(), e);
} finally {
if (response != null) {
response.close();
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/support/apache4/HttpComponent4_1Factory.java
+11 -1
View File
@@ -3,11 +3,13 @@ package com.foxinmy.weixin4j.http.support.apache4;
import java.net.InetSocketAddress;
import org.apache.http.HttpHost;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.params.ConnRoutePNames;
import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.ssl.SSLSocketFactory;
import org.apache.http.conn.ssl.X509HostnameVerifier;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.PoolingClientConnectionManager;
import org.apache.http.params.CoreConnectionPNames;
import org.apache.http.params.CoreProtocolPNames;
@@ -30,8 +32,16 @@ public class HttpComponent4_1Factory extends HttpClientFactory {
private final org.apache.http.client.HttpClient httpClient;
/**
* 默认httpclient
* @see <a href="https://issues.apache.org/jira/browse/HTTPCLIENT-1193">HTTPCLIENT-1193</a>
* @param clientConnectionManager
*/
public HttpComponent4_1Factory() {
this(new DefaultHttpClient());
PoolingClientConnectionManager clientConnectionManager = new PoolingClientConnectionManager();
clientConnectionManager.setMaxTotal(30);
clientConnectionManager.setDefaultMaxPerRoute(clientConnectionManager.getMaxTotal());
this.httpClient = new DefaultHttpClient(clientConnectionManager);
}
public HttpComponent4_1Factory(org.apache.http.client.HttpClient httpClient) {
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/support/apache4/HttpComponent4_2.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class HttpComponent4_2 extends HttpComponent4 {
} catch (IOException e) {
throw new HttpClientException("I/O error on "
+ request.getMethod().name() + " request for \""
+ request.getURI().toString() + "\":" + e.getMessage(), e);
+ request.getURI().toString(), e);
} finally {
if (response != null) {
response.close();
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/support/netty/Netty4HttpClient.java
+3 -3
View File
@@ -103,15 +103,15 @@ public class Netty4HttpClient extends AbstractHttpClient {
} catch (IOException e) {
throw new HttpClientException("I/O error on "
+ request.getMethod().name() + " request for \""
+ request.getURI().toString() + "\":" + e.getMessage(), e);
+ request.getURI().toString(), e);
} catch (InterruptedException e) {
throw new HttpClientException("Execute error on "
+ request.getMethod().name() + " request for \""
+ request.getURI().toString() + "\":" + e.getMessage(), e);
+ request.getURI().toString(), e);
} catch (ExecutionException e) {
throw new HttpClientException("Execute error on "
+ request.getMethod().name() + " request for \""
+ request.getURI().toString() + "\":" + e.getMessage(), e);
+ request.getURI().toString(), e);
} finally {
if (response != null) {
response.close();
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/support/okhttp/OkHttpClient2.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class OkHttpClient2 extends AbstractHttpClient {
} catch (IOException e) {
throw new HttpClientException("I/O error on "
+ request.getMethod().name() + " request for \""
+ request.getURI().toString() + "\":" + e.getMessage(), e);
+ request.getURI().toString(), e);
} finally {
if (response != null) {
response.close();
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/support/okhttp/OkHttpClient3.java
+2 -3
View File
@@ -39,15 +39,14 @@ public class OkHttpClient3 extends AbstractHttpClient {
HttpResponse response = null;
try {
okhttp3.Request okRequest = createRequest(request);
okhttp3.Response okResponse = okClient.newCall(okRequest)
.execute();
okhttp3.Response okResponse = okClient.newCall(okRequest).execute();
response = new OkHttpResponse3(okResponse, okResponse.body()
.bytes());
handleResponse(response);
} catch (IOException e) {
throw new HttpClientException("I/O error on "
+ request.getMethod().name() + " request for \""
+ request.getURI().toString() + "\":" + e.getMessage(), e);
+ request.getURI().toString(), e);
} finally {
if (response != null) {
response.close();