Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #2

Merged
merged 188 commits into from
Aug 21, 2017
Merged

Develop #2

merged 188 commits into from
Aug 21, 2017

Conversation

Tigerioo
Copy link
Owner

No description provided.

ecoolper and others added 30 commits April 18, 2017 17:29
weixin-java-tools usage jodd-http
7553130
weixin-java-tools pay usage jodd-http
30cdad5
格式化代码
0e6113b
jodd
897e139
mp usage jodd-http
d476047
common usage jodd-http
0b0b5a9
cp usage jodd-http
5726ca9
装饰模式实现
76330ef
装饰模式实现
9ac1aad
添加了注释
b03cb4b
少提交一个
fe61393
gradle配置信息
2019115
weixin-java-parent pom.xml添加jodd-http
dbf0a15
1、提取了公共代码，添加AbstractWxMPService、AbstractWxCPService类
49f9787 
2、实现了okhttp请求方式
3、RequestExecute接口添加executeApache、executeJodd、executeOkhttp方法
1、提取了公共代码，添加AbstractWxMPService、AbstractWxCPService类
ffa3544 
2、实现了okhttp请求方式
3、RequestExecute接口添加executeApache、executeJodd、executeOkhttp方法
@crskyp
Merge branch 'develop' into develop
44cbf65
修改了冲突和错误
d01d372
WxCpService添加getWxMpConfigStorage方法，同时修改相关位置
f42b22f
WxCpService的getWxMpConfigStorage方法修改为getWxCpConfigStorage
57e1f09
添加httpType枚举
4f900f8
Merge branch 'develop' of https://github.com/Wechat-Group/weixin-java…
a8dfccc 
…-tools into develop

# Conflicts:
#	weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/apache/WxCpServiceImpl.java
#	weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/jodd/WxCpServiceImpl.java
#	weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/okhttp/WxCpServiceImpl.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/apache/WxMpServiceImpl.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
添加枚举HttpType
2384b4b
添加枚举HttpType
6b7c86d
okhttp使用方式有错误，body().toString()修改为body().string()
59fc913
1、删除AbstractWxMpService、AbstractWxCPService类
aa4c076 
2、修改apache.WxCpServiceImpl类的父类为AbstractWxCpServiceImpl
RequestExecutor实例修改为通过create方法构建，解决了必须同时引入apache-http、jodd-http、okhtt…
26d68cd 
…p jar的问题
pom添developer
adcff4e
Merge remote-tracking branch 'wechat/develop' into develop
fcf3dbc 
# 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
@binarywang
Update contribution.md
49d07fc
Merge remote-tracking branch 'remotes/wechat/develop' into develop
3757606 
# Conflicts:
#	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/RequestExecutor.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-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheMediaDownloadRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheMediaUploadRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimpleGetRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimplePostRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddMediaDownloadRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddMediaUploadRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddSimpleGetRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddSimplePostRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkMediaDownloadRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkMediaUploadRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkSimpleGetRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkSimplePostRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.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/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/MaterialVoiceAndImageDownloadRequestExecutor.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
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialDeleteRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialNewsInfoRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialUploadRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialVideoInfoRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialVoiceAndImageDownloadRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMediaImgUploadRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheQrCodeRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialDeleteRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialNewsInfoRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialUploadRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialVideoInfoRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialVoiceAndImageDownloadRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMediaImgUploadRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddQrCodeRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialDeleteRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVideoInfoRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java
mgcnrx11 and others added 29 commits July 15, 2017 16:22
@mgcnrx11 @binarywang
新增会员卡相关接口 (#280)
3a2efdd 
* 新增会员卡相关接口
1. 激活会员卡接口
2. 拉取会员信息接口
@binarywang
#178 实现发送代金券接口
c8c51a9
@binarywang
#281 消息路由器增加对EventKey正则表达式匹配的支持
22287a4
@mgcnrx11 @binarywang
增加会员卡管理服务的更新会员信息接口的实现 (#283)
9368177 
* 修复UserInfo反序列化的bug，补充其单元测试

* 增加`更新会员信息`接口的实现

* 增加会员卡相关接口的测试类  包含下述方法： 1. 会员卡激活接口 2. 会员信息获取接口 3. 更新会员信息接口
@binarywang
#178 实现查询代金券批次和信息的接口
9f669df
@binarywang
发布临时测试版本2.7.6.BETA
66c7ae3
@binarywang
修复上传文件时的乱码问题
2b7dd7a
@binarywang
#284 提取共同代码快，修复签名问题
1886c6b
@lwxian @binarywang
#287 修复对帐单下载bug，返回的对象没有对帐单对象
b9c9b84 
同时修复返回对账单的所有属性的值最后多余的空格；
@binarywang
#289 增加临时二维码的场景值支持字符串的接口
30b5a9a 
* 更新接口：临时二维码的场景值支持字符串

* 新增临时二维码的场景值为字符串的单元测试
@forfuns @binarywang
#292 增加小程序码支持
087f037 
* 更新小程序二维码（小程序码）接口
修复小程序模板推送读取错误字段导致的NullPoint

* 更新小程序二维码（小程序码）接口
修复小程序模板推送读取错误字段导致的NullPoint

* 更正WxMaMsgService接口逻辑

* 使用IDEA对miniapp做了批量格式化
@binarywang
完善优化调试企业付款接口
9455165
@dylanleung @binarywang
#293 重构OkHttp的实现代码，同时修复JSApi的bug
0a06c4d 
* update travis settings

* feat(okhttp): 修改okhttp底层调用方法

直接用OkHttpClient代替connect.使客户端单一化.Okhttp 自动管理连接池优化

* feat(log,jsApi): 添加log debug 标记明确下调用底层效果,修复jsAPI Lock 为null 问题

添加log debug 标记明确下调用底层效果,修复jsAPI Lock 为null 问题

#293
@binarywang
非法参数的异常统一使用WxPayException
70d90c8
@binarywang
发布临时测试版本2.7.7.BETA
2d9d392
@dylanleung @binarywang
#295 修复临时文件关闭
5a2b3b6 
* update travis settings

* feat(okhttp): 修改okhttp底层调用方法

直接用OkHttpClient代替connect.使客户端单一化.Okhttp 自动管理连接池优化

* feat(log,jsApi): 添加log debug 标记明确下调用底层效果,修复jsAPI Lock 为null 问题

添加log debug 标记明确下调用底层效果,修复jsAPI Lock 为null 问题

#293

* fix(File): 修复文件关闭

修复文件关闭

* Update OkHttpMediaDownloadRequestExecutor.java
@rememberber @binarywang
#297 WxMpMenu类增加实现序列化接口
afcd62c
@rememberber @binarywang
#298 WxMpMenu的内部类WxMpConditionalMenu增加实现序列化接口
289405f
@rememberber @binarywang
#302 WxMpXmlOutNewsMessage类中的内部类增加实现序列化接口
9e32f00
@binarywang
DefaultApacheHttpClientBuilder修改为单例模式 (#310)
6ce585f
@binarywang
#300 修复微信多媒体文件没有后缀名时下载失败的问题
69ebad5
@binarywang
#305 修复微信变态的拍照或发图事件的消息格式的处理
67dad47
@binarywang
发布临时测试版本2.7.8.BETA
1d1c4c7
@binarywang
修正不规范的类命名
a8cdb44
@binarywang
添加buttons的getter和setter方法
9140425
@binarywang
修复错误的javadoc
af4bb1d
@binarywang
转移群发消息相关接口到单独接口及其实现类中
92947b3
@forfuns @binarywang
#315 修改messageSend方法，自动从wxCpConfigStorage获取agentId
f0d3a1a
@forfuns @binarywang
#317 修复小程序请求二维码时对错误类型检查（text/plain 改为 app/json）
bf1ce7f 
* 更新messageSend自动向wxCpConfigStorage里获取agentId

* 修复小程序请求二维码时对错误类型检查（text/plain 改为 app/json）

* 修复小程序请求二维码时对错误类型检查（text/plain 改为 app/json）
@Tigerioo Tigerioo merged commit 1bc3d3c into Tigerioo:develop Aug 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@Tigerioo @crskyp @binarywang @DDLeEHi @rememberber @jink2005 @mgcnrx11 @lwxian @forfuns @dylanleung