binarywang#293 重构OkHttp的实现代码，同时修复JSApi的bug

* update travis settings * feat(okhttp): 修改okhttp底层调用方法 直接用OkHttpClient代替connect.使客户端单一化.Okhttp 自动管理连接池优化 * feat(log,jsApi): 添加log debug 标记明确下调用底层效果,修复jsAPI Lock 为null 问题 添加log debug 标记明确下调用底层效果,修复jsAPI Lock 为null 问题 binarywang#293

Author: dylanleung

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java

@@ -6,7 +6,11 @@
 import me.chanjar.weixin.common.util.http.MediaDownloadRequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import okhttp3.*;
+import okio.BufferedSink;
+import okio.Okio;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -18,7 +22,8 @@
 /**
  * Created by ecoolper on 2017/5/5.
  */
-public class OkHttpMediaDownloadRequestExecutor extends MediaDownloadRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkHttpMediaDownloadRequestExecutor extends MediaDownloadRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
 
  public OkHttpMediaDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) {
@@ -27,30 +32,16 @@ public OkHttpMediaDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFi
 
  @Override
  public File execute(String uri, String queryParam) throws WxErrorException, IOException {
+ logger.debug("OkHttpMediaDownloadRequestExecutor is running");
  if (queryParam != null) {
  if (uri.indexOf('?') == -1) {
  uri += '?';
  }
  uri += uri.endsWith("?") ? queryParam : '&' + queryParam;
  }
 
- OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
- //设置代理
- if (requestHttp.getRequestHttpProxy() != null) {
- clientBuilder.proxy(requestHttp.getRequestHttpProxy().getProxy());
- }
- //设置授权
- clientBuilder.authenticator(new Authenticator() {
- @Override
- public Request authenticate(Route route, Response response) throws IOException {
- String credential = Credentials.basic(requestHttp.getRequestHttpProxy().getProxyUsername(), requestHttp.getRequestHttpProxy().getProxyPassword());
- return response.request().newBuilder()
- .header("Authorization", credential)
- .build();
- }
- });
  //得到httpClient
- OkHttpClient client = clientBuilder.build();
+ OkHttpClient client = requestHttp.getRequestHttpClient();
 
  Request request = new Request.Builder().url(uri).get().build();
 
@@ -66,10 +57,12 @@ public Request authenticate(Route route, Response response) throws IOException {
  if (StringUtils.isBlank(fileName)) {
  return null;
  }
-
- InputStream inputStream = new ByteArrayInputStream(response.body().bytes());
  String[] nameAndExt = fileName.split("\\.");
- return FileUtils.createTmpFile(inputStream, nameAndExt[0], nameAndExt[1], super.tmpDirFile);
+ File file = File.createTempFile(nameAndExt[0], nameAndExt[1], super.tmpDirFile);
+ try (BufferedSink sink = Okio.buffer(Okio.sink(file))) {
+ sink.writeAll(response.body().source());
+ }
+ return file;
  }
 
  private String getFileName(Response response) throws WxErrorException {

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaUploadRequestExecutor.java

@@ -6,38 +6,27 @@
 import me.chanjar.weixin.common.util.http.MediaUploadRequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 
 /**
  * Created by ecoolper on 2017/5/5.
  */
-public class OkHttpMediaUploadRequestExecutor extends MediaUploadRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkHttpMediaUploadRequestExecutor extends MediaUploadRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
  public OkHttpMediaUploadRequestExecutor(RequestHttp requestHttp) {
  super(requestHttp);
  }
 
  @Override
  public WxMediaUploadResult execute(String uri, File file) throws WxErrorException, IOException {
- OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
- //设置代理
- if (requestHttp.getRequestHttpProxy() != null) {
- clientBuilder.proxy(requestHttp.getRequestHttpProxy().getProxy());
- }
- //设置授权
- clientBuilder.authenticator(new Authenticator() {
- @Override
- public Request authenticate(Route route, Response response) throws IOException {
- String credential = Credentials.basic(requestHttp.getRequestHttpProxy().getProxyUsername(), requestHttp.getRequestHttpProxy().getProxyPassword());
- return response.request().newBuilder()
- .header("Authorization", credential)
- .build();
- }
- });
+ logger.debug("OkHttpMediaUploadRequestExecutor is running");
  //得到httpClient
- OkHttpClient client = clientBuilder.build();
+ OkHttpClient client = requestHttp.getRequestHttpClient();
 
  RequestBody body = new MultipartBody.Builder()
  .setType(MediaType.parse("multipart/form-data"))

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimpleGetRequestExecutor.java

@@ -5,47 +5,34 @@
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.common.util.http.SimpleGetRequestExecutor;
 import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 /**
  * Created by ecoolper on 2017/5/4.
  */
-public class OkHttpSimpleGetRequestExecutor extends SimpleGetRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkHttpSimpleGetRequestExecutor extends SimpleGetRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
  public OkHttpSimpleGetRequestExecutor(RequestHttp requestHttp) {
  super(requestHttp);
  }
 
  @Override
  public String execute(String uri, String queryParam) throws WxErrorException, IOException {
+ logger.debug("OkHttpSimpleGetRequestExecutor is running");
  if (queryParam != null) {
  if (uri.indexOf('?') == -1) {
  uri += '?';
  }
  uri += uri.endsWith("?") ? queryParam : '&' + queryParam;
  }
 
- OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
- //设置代理
- if (requestHttp.getRequestHttpProxy() != null) {
- clientBuilder.proxy(requestHttp.getRequestHttpProxy().getProxy());
- }
- //设置授权
- clientBuilder.authenticator(new Authenticator() {
- @Override
- public Request authenticate(Route route, Response response) throws IOException {
- String credential = Credentials.basic(requestHttp.getRequestHttpProxy().getProxyUsername(), requestHttp.getRequestHttpProxy().getProxyPassword());
- return response.request().newBuilder()
- .header("Authorization", credential)
- .build();
- }
- });
  //得到httpClient
- OkHttpClient client = clientBuilder.build();
-
+ OkHttpClient client = requestHttp.getRequestHttpClient();
  Request request = new Request.Builder().url(uri).build();
-
  Response response = client.newCall(request).execute();
  String responseContent = response.body().string();
  WxError error = WxError.fromJson(responseContent);

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimplePostRequestExecutor.java

@@ -5,41 +5,26 @@
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
 import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 /**
  * Created by ecoolper on 2017/5/4.
  */
-public class OkHttpSimplePostRequestExecutor extends SimplePostRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkHttpSimplePostRequestExecutor extends SimplePostRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
  public OkHttpSimplePostRequestExecutor(RequestHttp requestHttp) {
  super(requestHttp);
  }
 
  @Override
  public String execute(String uri, String postEntity) throws WxErrorException, IOException {
- ConnectionPool pool = requestHttp.getRequestHttpClient();
- final OkHttpProxyInfo proxyInfo = requestHttp.getRequestHttpProxy();
-
- OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(pool);
- //设置代理
- if (proxyInfo != null) {
- clientBuilder.proxy(proxyInfo.getProxy());
- }
- //设置授权
- clientBuilder.authenticator(new Authenticator() {
- @Override
- public Request authenticate(Route route, Response response) throws IOException {
- String credential = Credentials.basic(proxyInfo.getProxyUsername(), proxyInfo.getProxyPassword());
- return response.request().newBuilder()
- .header("Authorization", credential)
- .build();
- }
- });
+ logger.debug("OkHttpSimplePostRequestExecutor running");
  //得到httpClient
- OkHttpClient client = clientBuilder.build();
-
+ OkHttpClient client = requestHttp.getRequestHttpClient();
 
  MediaType mediaType = MediaType.parse("text/plain; charset=utf-8");
  RequestBody body = RequestBody.create(mediaType, postEntity);

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java

@@ -7,16 +7,20 @@
 import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo;
 import me.chanjar.weixin.cp.config.WxCpConfigStorage;
 import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
-public class WxCpServiceOkHttpImpl extends AbstractWxCpServiceImpl<ConnectionPool, OkHttpProxyInfo> {
- protected ConnectionPool httpClient;
+public class WxCpServiceOkHttpImpl extends AbstractWxCpServiceImpl<OkHttpClient, OkHttpProxyInfo> {
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ protected OkHttpClient httpClient;
  protected OkHttpProxyInfo httpProxy;
 
 
  @Override
- public ConnectionPool getRequestHttpClient() {
+ public OkHttpClient getRequestHttpClient() {
  return httpClient;
  }
 
@@ -32,6 +36,7 @@ public HttpType getRequestType() {
 
  @Override
  public String getAccessToken(boolean forceRefresh) throws WxErrorException {
+ logger.debug("WxCpServiceOkHttpImpl is running");
  if (forceRefresh) {
  this.configStorage.expireAccessToken();
  }
@@ -41,24 +46,8 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
  String url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?"
  + "&corpid=" + this.configStorage.getCorpId()
  + "&corpsecret=" + this.configStorage.getCorpSecret();
-
- OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(httpClient);
- //设置代理
- if (httpProxy != null) {
- clientBuilder.proxy(getRequestHttpProxy().getProxy());
- }
- //设置授权
- clientBuilder.authenticator(new Authenticator() {
- @Override
- public Request authenticate(Route route, Response response) throws IOException {
- String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
- return response.request().newBuilder()
- .header("Authorization", credential)
- .build();
- }
- });
  //得到httpClient
- OkHttpClient client = clientBuilder.build();
+ OkHttpClient client = getRequestHttpClient();
  //请求的request
  Request request = new Request.Builder().url(url).get().build();
  Response response = null;
@@ -88,13 +77,24 @@ public Request authenticate(Route route, Response response) throws IOException {
 
  @Override
  public void initHttp() {
- WxCpConfigStorage configStorage = this.configStorage;
+ logger.debug("WxCpServiceOkHttpImpl initHttp");
+ OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
+ //设置代理
+ if (httpProxy != null) {
+ clientBuilder.proxy(getRequestHttpProxy().getProxy());
 
- if (configStorage.getHttpProxyHost() != null && configStorage.getHttpProxyPort() > 0) {
- httpProxy = new OkHttpProxyInfo(OkHttpProxyInfo.ProxyType.SOCKS5, configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword());
+ //设置授权
+ clientBuilder.authenticator(new Authenticator() {
+ @Override
+ public Request authenticate(Route route, Response response) throws IOException {
+ String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
+ return response.request().newBuilder()
+ .header("Authorization", credential)
+ .build();
+ }
+ });
  }
-
- httpClient = new ConnectionPool();
+ httpClient = clientBuilder.build();
  }
 
  @Override

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java

@@ -66,10 +66,9 @@ public String getJsapiTicket() throws WxErrorException {
 
  @Override
  public String getJsapiTicket(boolean forceRefresh) throws WxErrorException {
- Lock lock = this.getWxMpConfigStorage().getJsapiTicketLock();
+ Lock lock = this.getWxMpConfigStorage().getAccessTokenLock();
  try {
  lock.lock();
-
  if (forceRefresh) {
  this.getWxMpConfigStorage().expireJsapiTicket();
  }