ecoolper fcf3dbc12d Merge remote-tracking branch 'wechat/develop' into develop ... # Conflicts: # weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/AbstractRequestExecutor.java # weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java # weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaUploadRequestExecutor.java # weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java # weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/jodd/WxMpServiceImpl.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/okhttp/WxMpServiceImpl.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialNewsInfoRequestExecutor.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVideoInfoRequestExecutor.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java		2017-05-08 21:36:07 +08:00
..
src	Merge remote-tracking branch 'wechat/develop' into develop	2017-05-08 21:36:07 +08:00
build.gradle	同步更新gradle相关配置	2016-11-01 19:16:17 +08:00
LICENSE	整理及重构	2014-10-22 12:15:02 +08:00
pom.xml	发布临时测试版本2.6.1.BETA	2017-05-03 17:05:59 +08:00