Merge branch 'develop' of https://github.com/Wechat-Group/weixin-java-tools into 007

007gzs · 007gzs · commit 9516193e4be9 · 2017-12-04T16:26:19.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.8.8.BETA</version>
+  <version>2.9.0</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
diff --git a/readme.md b/readme.md
@@ -1,4 +1,4 @@
-微信支付/公众号/企业号/小程序的Java开发工具包（SDK）
+微信支付/开放平台/公众号/企业微信/小程序的Java开发工具包（SDK）
 ---------------------------------
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.binarywang/weixin-java-parent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.binarywang/weixin-java-parent)
 [![Build Status](https://travis-ci.org/Wechat-Group/weixin-java-tools.svg?branch=develop)](https://travis-ci.org/Wechat-Group/weixin-java-tools)
@@ -16,14 +16,15 @@
 * https://github.com/binarywang/weixin-java-mp-demo （公众号Demo，使用Spring MVC实现）
 * https://github.com/binarywang/weixin-java-mp-demo-springboot （公众号Demo，使用Spring Boot实现）
 * https://github.com/binarywang/weixin-java-mp-multi-demo (支持多公众号)
-* https://github.com/wechat-group/weixin-java-tools-springmvc （公众号Demo，内含部分微信支付代码）
+* https://github.com/Wechat-Group/weixin-java-open-demo （开放平台Demo）
+* https://github.com/Wechat-Group/weixin-java-tools-springmvc （公众号Demo，内含部分微信支付代码）
 
 ---------------------------------
 ### 重要提示信息（部分为新手必读）：
 1. 最新更新：**2017-9-3 发布[【2.8.0正式版】](https://github.com/Wechat-Group/weixin-java-tools/releases)**！
 1. 开源中国本项目的首页地址：https://www.oschina.net/p/weixin-java-tools-new （欢迎大家积极留言评分 🙂）
 1. SDK详细开发文档请查阅 [【Wiki】](https://github.com/wechat-group/weixin-java-tools/wiki)，部分文档可能未能及时更新，如有发现，可以及时上报或者自行修改。
-1. 各个模块的Javadoc可以在线查看（有可能是最新的测试版本的，请注意观察版本号）：[weixin-java-miniapp](https://binarywang.github.io/weixin-java-miniapp-javadoc/)、[weixin-java-pay](https://binarywang.github.io/weixin-java-pay-javadoc/)、[weixin-java-mp](https://binarywang.github.io/weixin-java-mp-javadoc/)、[weixin-java-common](https://binarywang.github.io/weixin-java-common-javadoc/)、[weixin-java-cp](https://binarywang.github.io/weixin-java-cp-javadoc/)
+1. 各个模块的Javadoc可以在线查看（有可能是最新的测试版本的，请注意观察版本号）：[weixin-java-miniapp](https://binarywang.github.io/weixin-java-miniapp-javadoc/)、[weixin-java-pay](https://binarywang.github.io/weixin-java-pay-javadoc/)、[weixin-java-mp](https://binarywang.github.io/weixin-java-mp-javadoc/)、[weixin-java-common](https://binarywang.github.io/weixin-java-common-javadoc/)、[weixin-java-cp](https://binarywang.github.io/weixin-java-cp-javadoc/)、[weixin-java-open](https://binarywang.github.io/weixin-java-open-javadoc/)
 1. 本SDK要求的最低JDK版本是7，还在使用JDK6的用户请参考[【此项目】]( https://github.com/binarywang/weixin-java-tools-for-jdk6) ，而其他更早的JDK版本则需要自己改造实现。
 1. 如有新功能需求，发现BUG，或者由于微信官方接口调整导致的代码问题，可以直接在[【Issues】](https://github.com/Wechat-Group/weixin-java-tools/issues)页提出issue，便于讨论追踪问题；
 1. 如果想贡献代码，请阅读[【代码贡献指南】](contribution.md)；
@@ -41,7 +42,7 @@
 ## 版本说明
 1. 本项目定为大约每两个月发布一次正式版，版本号格式为X.X.0（如2.1.0，2.2.0等），遇到重大问题需修复会及时提交新版本，欢迎大家随时提交Pull Request；
 1. BUG修复和新特性一般会先发布成小版本作为临时测试版本（如2.4.5.BETA，2.4.6.BETA等，即尾号不为0，并添加BETA字样，以区别于正式版）；
-1. 目前最新版本号为 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.binarywang/weixin-java-parent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.binarywang/weixin-java-parent) ，也可以通过访问链接 [【微信支付】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-pay%22) 、[【微信小程序】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-miniapp%22) 、[【公众号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-mp%22) 、[【企业号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-cp%22)
+1. 目前最新版本号为 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.binarywang/weixin-java-parent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.binarywang/weixin-java-parent) ，也可以通过访问链接 [【微信支付】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-pay%22) 、[【微信小程序】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-miniapp%22) 、[【公众号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-mp%22) 、[【企业微信】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-cp%22)、[【开放平台】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-open%22)
 分别查看所有最新的版本。 
 
 ---------------------------------
@@ -52,44 +53,16 @@
 * Coding: https://git.coding.net/binarywang/weixin-java-tools.git
 
 ---------------------------------
-## Maven 最新正式版本
-
-* 微信小程序：
-
+## Maven 引用
 ```xml
 <dependency>
   <groupId>com.github.binarywang</groupId>
-  <artifactId>weixin-java-miniapp</artifactId>
+  <artifactId>(按模块不同)</artifactId>
   <version>2.8.0</version>
 </dependency>
 ```
-
-* 微信支付：
-
-```xml
-<dependency>
-  <groupId>com.github.binarywang</groupId>
-  <artifactId>weixin-java-pay</artifactId>
-  <version>2.8.0</version>
-</dependency>
-```
-
-* 公众号（订阅号及服务号）：
-
-```xml
-<dependency>
-  <groupId>com.github.binarywang</groupId>
-  <artifactId>weixin-java-mp</artifactId>
-  <version>2.8.0</version>
-</dependency>
-```
-
-* 企业号：
-
-```xml
-<dependency>
-  <groupId>com.github.binarywang</groupId>
-  <artifactId>weixin-java-cp</artifactId>
-  <version>2.8.0</version>
-</dependency>
-```
+* 各模块的artifactId：
+  - 微信小程序：`weixin-java-miniapp`
+  - 微信支付：`weixin-java-pay`
+  - 公众号（订阅号及服务号）：`weixin-java-mp`
+  - 企业号：`weixin-java-cp`
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.8.8.BETA</version>
+    <version>2.9.0</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.8.8.BETA</version>
+    <version>2.9.0</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceAbstractImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceAbstractImpl.java
@@ -381,7 +381,7 @@ public <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) thro
     throw new RuntimeException("微信服务端异常，超出重试次数");
   }
 
-  protected synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException {
+  protected <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException {
     if (uri.contains("access_token=")) {
       throw new IllegalArgumentException("uri参数中不允许有access_token: " + uri);
     }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpJedisConfigStorage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpJedisConfigStorage.java
@@ -9,7 +9,11 @@
 import java.io.File;
 
 /**
- * Jedis client implementor for wechat config storage
+ * Jedis client implementor for wechat config storage.
+ * <pre>
+ *    使用说明：本实现仅供参考，并不完整，
+ *    比如为减少项目依赖，未加入redis分布式锁的实现，如有需要请自行实现。
+ * </pre>
  *
  * @author gaigeshen
  */
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.8.8.BETA</version>
+    <version>2.9.0</version>
   </parent>
   <artifactId>weixin-java-miniapp</artifactId>
   <name>WeiXin Java Tools - MiniApp</name>
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java
@@ -181,7 +181,7 @@ public <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) thro
     throw new RuntimeException("微信服务端异常，超出重试次数");
   }
 
-  public synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException {
+  public <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException {
     if (uri.contains("access_token=")) {
       throw new IllegalArgumentException("uri参数中不允许有access_token: " + uri);
     }
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.8.8.BETA</version>
+    <version>2.9.0</version>
   </parent>
   <artifactId>weixin-java-mp</artifactId>
   <name>WeiXin Java Tools - MP</name>
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInRedisConfigStorage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInRedisConfigStorage.java
@@ -5,7 +5,10 @@
 
 /**
  * 基于Redis的微信配置provider
- *
+ * <pre>
+ *    使用说明：本实现仅供参考，并不完整，
+ *    比如为减少项目依赖，未加入redis分布式锁的实现，如有需要请自行实现。
+ * </pre>
  * @author nickwong
  */
 @SuppressWarnings("hiding")
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
@@ -5,8 +5,11 @@
 import me.chanjar.weixin.common.util.http.MediaUploadRequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestHttp;
-import me.chanjar.weixin.mp.bean.*;
-import me.chanjar.weixin.mp.bean.result.*;
+import me.chanjar.weixin.mp.bean.WxMpSemanticQuery;
+import me.chanjar.weixin.mp.bean.result.WxMpCurrentAutoReplyInfo;
+import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
+import me.chanjar.weixin.mp.bean.result.WxMpSemanticQueryResult;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
 
 /**
  * 微信API的Service
@@ -62,6 +65,11 @@ public interface WxMpService {
    */
   String GET_CURRENT_AUTOREPLY_INFO_URL = "https://api.weixin.qq.com/cgi-bin/get_current_autoreply_info";
 
+  /**
+   * 公众号调用或第三方平台帮公众号调用对公众号的所有api调用（包括第三方帮其调用）次数进行清零
+   */
+  String CLEAR_QUOTA_URL = "https://api.weixin.qq.com/cgi-bin/clear_quota";
+
   /**
    * <pre>
    * 验证消息的确来自微信服务器
@@ -219,6 +227,18 @@ public interface WxMpService {
    */
   WxMpCurrentAutoReplyInfo getCurrentAutoReplyInfo() throws WxErrorException;
 
+  /**
+   * <pre>
+   *  公众号调用或第三方平台帮公众号调用对公众号的所有api调用（包括第三方帮其调用）次数进行清零：
+   *  HTTP调用：https://api.weixin.qq.com/cgi-bin/clear_quota?access_token=ACCESS_TOKEN
+   *  接口文档地址：https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433744592
+   *
+   * </pre>
+   *
+   * @param appid 公众号的APPID
+   */
+  void clearQuota(String appid) throws WxErrorException;
+
   /**
    * 当本Service没有实现某个API的时候，可以用这个，针对所有微信API中的GET请求
    */
@@ -376,6 +396,7 @@ public interface WxMpService {
 
   /**
    * 返回群发消息相关接口方法的实现类对象，以方便调用其各个接口
+   *
    * @return WxMpMassMessageService
    */
   WxMpMassMessageService getMassMessageService();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceAbstractImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceAbstractImpl.java
@@ -207,6 +207,13 @@ public WxMpCurrentAutoReplyInfo getCurrentAutoReplyInfo() throws WxErrorExceptio
     return WxMpCurrentAutoReplyInfo.fromJson(this.get(GET_CURRENT_AUTOREPLY_INFO_URL, null));
   }
 
+  @Override
+  public void clearQuota(String appid) throws WxErrorException {
+    JsonObject o = new JsonObject();
+    o.addProperty("appid", appid);
+    this.post(CLEAR_QUOTA_URL, o.toString());
+  }
+
   @Override
   public String get(String url, String queryParam) throws WxErrorException {
     return execute(SimpleGetRequestExecutor.create(this), url, queryParam);
@@ -252,7 +259,7 @@ public <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) thro
     throw new RuntimeException("微信服务端异常，超出重试次数");
   }
 
-  public synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException {
+  public <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException {
     if (uri.contains("access_token=")) {
       throw new IllegalArgumentException("uri参数中不允许有access_token: " + uri);
     }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialNewsInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialNewsInfoRequestExecutor.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.mp.util.http.apache;
 
+import com.google.common.collect.ImmutableMap;
 import me.chanjar.weixin.common.bean.result.WxError;
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.util.http.RequestHttp;
@@ -43,9 +44,7 @@ public WxMpMaterialNews execute(String uri, String materialId) throws WxErrorExc
       httpPost.setConfig(config);
     }
 
-    Map<String, String> params = new HashMap<>();
-    params.put("media_id", materialId);
-    httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(params)));
+    httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(ImmutableMap.of("media_id", materialId))));
     try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
       String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
       this.logger.debug("响应原始数据：{}", responseContent);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialNewsInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialNewsInfoRequestExecutor.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.mp.util.http.jodd;
 
+import com.google.common.collect.ImmutableMap;
 import jodd.http.HttpConnectionProvider;
 import jodd.http.HttpRequest;
 import jodd.http.HttpResponse;
@@ -9,6 +10,7 @@
 import me.chanjar.weixin.common.bean.result.WxError;
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.util.http.RequestHttp;
+import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
 import me.chanjar.weixin.mp.util.http.MaterialNewsInfoRequestExecutor;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
@@ -28,13 +30,13 @@ public JoddMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) {
 
   @Override
   public WxMpMaterialNews execute(String uri, String materialId) throws WxErrorException, IOException {
-    HttpRequest request = HttpRequest.post(uri);
     if (requestHttp.getRequestHttpProxy() != null) {
       requestHttp.getRequestHttpClient().useProxy(requestHttp.getRequestHttpProxy());
     }
-    request.withConnectionProvider(requestHttp.getRequestHttpClient());
 
-    request.query("media_id", materialId);
+    HttpRequest request = HttpRequest.post(uri)
+      .withConnectionProvider(requestHttp.getRequestHttpClient())
+      .body(WxGsonBuilder.create().toJson(ImmutableMap.of("media_id", materialId)));
     HttpResponse response = request.send();
     response.charset(StringPool.UTF_8);
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java
@@ -1,9 +1,11 @@
 package me.chanjar.weixin.mp.util.http.okhttp;
 
+import com.google.common.collect.ImmutableMap;
 import me.chanjar.weixin.common.bean.result.WxError;
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo;
+import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
 import me.chanjar.weixin.mp.util.http.MaterialNewsInfoRequestExecutor;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
@@ -28,7 +30,8 @@ public WxMpMaterialNews execute(String uri, String materialId) throws WxErrorExc
     //得到httpClient
     OkHttpClient client = requestHttp.getRequestHttpClient();
 
-    RequestBody requestBody = new FormBody.Builder().add("media_id", materialId).build();
+    RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"),
+      WxGsonBuilder.create().toJson(ImmutableMap.of("media_id", materialId)));
     Request request = new Request.Builder().url(uri).post(requestBody).build();
 
     Response response = client.newCall(request).execute();
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundQueryResult.java
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ public <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) thro`
`381`	`381`	`throw new RuntimeException("微信服务端异常，超出重试次数");`
`382`	`382`	`}`
`383`	`383`
`384`		`- protected synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException {`
	`384`	`+ protected <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException {`
`385`	`385`	`if (uri.contains("access_token=")) {`
`386`	`386`	`throw new IllegalArgumentException("uri参数中不允许有access_token: " + uri);`
`387`	`387`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ public <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) thro`
`181`	`181`	`throw new RuntimeException("微信服务端异常，超出重试次数");`
`182`	`182`	`}`
`183`	`183`
`184`		`- public synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException {`
	`184`	`+ public <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException {`
`185`	`185`	`if (uri.contains("access_token=")) {`
`186`	`186`	`throw new IllegalArgumentException("uri参数中不允许有access_token: " + uri);`
`187`	`187`	`}`