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

md

Browse Source
This commit is contained in:
jinyu 2015-12-28 15:16:33 +08:00
parent 7b99f8cbfb
commit d8ca042894
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_1.java
View File

@ -75,9 +75,11 @@ public class HttpComponent4_1 extends HttpComponent4 {
uriRequest.getParams().setParameter(HttpHeaders.ACCEPT_CHARSET, uriRequest.getParams().setParameter(HttpHeaders.ACCEPT_CHARSET,
Consts.UTF_8); Consts.UTF_8);
sslContext = params.getSSLContext(); sslContext = params.getSSLContext();
if (params.getHostnameVerifier() != null) {
hostnameVerifier = new CustomHostnameVerifier( hostnameVerifier = new CustomHostnameVerifier(
params.getHostnameVerifier()); params.getHostnameVerifier());
} }
}
if (useSSL) { if (useSSL) {
if (sslContext == null) { if (sslContext == null) {
sslContext = HttpClientFactory.allowSSLContext(); sslContext = HttpClientFactory.allowSSLContext();

16
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_2.java
View File

@ -3,7 +3,6 @@ package com.foxinmy.weixin4j.http.factory;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import org.apache.http.HttpHost; import org.apache.http.HttpHost;
@ -46,7 +45,7 @@ public class HttpComponent4_2 extends HttpComponent4 {
request.getURI()); request.getURI());
boolean useSSL = "https".equals(request.getURI().getScheme()); boolean useSSL = "https".equals(request.getURI().getScheme());
SSLContext sslContext = null; SSLContext sslContext = null;
HostnameVerifier hostnameVerifier = null; X509HostnameVerifier hostnameVerifier = null;
HttpParams params = request.getParams(); HttpParams params = request.getParams();
if (params != null) { if (params != null) {
Builder requestConfig = RequestConfig.custom() Builder requestConfig = RequestConfig.custom()
@ -63,21 +62,20 @@ public class HttpComponent4_2 extends HttpComponent4 {
} }
uriRequest.setConfig(requestConfig.build()); uriRequest.setConfig(requestConfig.build());
sslContext = params.getSSLContext(); sslContext = params.getSSLContext();
hostnameVerifier = params.getHostnameVerifier(); if (params.getHostnameVerifier() != null) {
hostnameVerifier = new CustomHostnameVerifier(
params.getHostnameVerifier());
}
} }
if (useSSL) { if (useSSL) {
if (sslContext == null) { if (sslContext == null) {
sslContext = HttpClientFactory.allowSSLContext(); sslContext = HttpClientFactory.allowSSLContext();
} }
X509HostnameVerifier x509HostnameVerifier = null;
if (hostnameVerifier == null) { if (hostnameVerifier == null) {
x509HostnameVerifier = SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER; hostnameVerifier = SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER;
} else {
x509HostnameVerifier = new CustomHostnameVerifier(
hostnameVerifier);
} }
httpClient = HttpClients.custom() httpClient = HttpClients.custom()
.setHostnameVerifier(x509HostnameVerifier) .setHostnameVerifier(hostnameVerifier)
.setSslcontext(sslContext).build(); .setSslcontext(sslContext).build();
} }
addHeaders(request.getHeaders(), uriRequest); addHeaders(request.getHeaders(), uriRequest);