Commit Graph

1308 Commits

Author SHA1 Message Date
Binary Wang
8ed0e786db #246 修复企业号用户信息相关属性,对比实际接口返回内容,移除已失效属性(weixinid、tel),添加缺失的属性(telephone, english_name, hide_mobile) 2017-06-10 15:50:08 +08:00
Binary Wang
228b3791ae #247 统一下单接口支持H5支付,并去掉交易类型trade_type的校验 2017-06-10 13:08:44 +08:00
Hyseen
563302eef6 消息路由器路由时可以传入context (#245) 2017-06-08 00:14:32 +08:00
Binary Wang
cc33de3de9 update some files 2017-06-06 18:59:48 +08:00
Binary Wang
92c8a86199 引入WxPayException,替代原有的异常处理类,并做相应的优化 2017-06-06 18:57:52 +08:00
Bob
ea13197844 新增接口:摇一摇周边获取设备及用户信息 (#243)
#240
2017-06-06 16:36:18 +08:00
Binary Wang
ff2caf76db WxPayUnifiedOrderRequest里的builder类添加新增加的两个子服务商的属性 2017-06-05 17:06:01 +08:00
crskyp
3b7c0a7064 Merge pull request #241 from crskyp/develop
jodd response 编码设置为UTF-8,解决response乱码问题
2017-06-03 23:47:22 +08:00
ecoolper
7f91ba2372 jodd response 编码设置为UTF-8 2017-06-03 23:10:30 +08:00
Binary Wang
69ca699829 加强检查支付配置 2017-05-30 10:35:42 +08:00
Binary Wang
4cf3f5c363 remove useless gradle files 2017-05-29 15:27:57 +08:00
Binary Wang
355f64c2e5 发布临时测试版本2.6.2.BETA 2017-05-29 15:13:33 +08:00
Binary Wang
931533c13a 抽取数据统计相关接口请求URL到其接口类中,并重构重复代码 #195 2017-05-29 15:07:23 +08:00
Binary Wang
a436e62103 抽取卡券相关接口请求URL到其接口类中 #195 2017-05-29 14:39:25 +08:00
Binary Wang
ac257dd31c 修复调用【上传临时素材文件】接口返回 44001 多媒体文件为空的问题 #209 2017-05-29 14:23:09 +08:00
Binary Wang
c80621cf16 WxMpXmlMessage微信推送用户卡券买单事件增加缺失的消息数据 #214 2017-05-29 14:19:34 +08:00
Binary Wang
e186cd9ea1 调整注释内容 #215 2017-05-29 14:15:57 +08:00
Binary Wang
290bed1343 WxMpXmlMessage微信推送会员卡内容更新事件增加缺失的消息数据 #216 2017-05-29 14:13:06 +08:00
Binary Wang
00825724f3 WxMpXmlMessage微信推送卡券库存报警事件增加缺失的消息数据 #218 2017-05-29 14:09:28 +08:00
Binary Wang
0ba2684f47 修复WxMpInRedisConfigStorage在极端情况下的问题 #229 2017-05-29 14:03:06 +08:00
Binary Wang
ae8b2effb9 refactor code 2017-05-29 13:43:22 +08:00
Binary Wang
8d5b41ced0 refactor code 2017-05-29 13:40:35 +08:00
Binary Wang
46d94db6da 修复单元测试代码中对junit的依赖 2017-05-27 11:54:35 +08:00
Binary Wang
a96e6f35b0 调整部分依赖版本,修复编译失败问题 2017-05-27 11:46:23 +08:00
Binary Wang
4f41aa7b37 调整部分依赖版本,修复编译失败问题 2017-05-27 11:43:58 +08:00
Binary Wang
7f08a9ef46 优化pom,尽量减少不必要的依赖 2017-05-27 11:29:20 +08:00
Binary Wang
c0172785a7 增加默认接口实现类,兼容之前版本 2017-05-27 10:21:58 +08:00
Binary Wang
d961047c24 修复企业号菜单创建接口方法的bug 2017-05-27 10:12:27 +08:00
Binary Wang
655b2c3201 格式化代码 2017-05-26 14:30:16 +08:00
Binary Wang
3661018f4e 修复代码 2017-05-24 10:49:50 +08:00
Binary Wang
d108366736 修复代码 2017-05-24 10:46:04 +08:00
DDLeEHi
9d2fb9fe3d 完善微信支付 下载对账单 的接口 #65 2017-05-24 10:40:32 +08:00
ecoolper
16dea387f2 修改两个文件 2017-05-19 23:48:47 +08:00
ecoolper
3757606589 Merge remote-tracking branch 'remotes/wechat/develop' into develop
# 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
2017-05-19 10:06:33 +08:00
Binary Wang
1806389a4d 批量格式化代码 2017-05-11 17:07:32 +08:00
Binary Wang
8982cf8471 批量格式化代码 2017-05-11 17:07:08 +08:00
Binary Wang
5f887739a3 事件常量根据分类创建静态内部类进行管理 2017-05-10 14:49:42 +08:00
Binary Wang
25cf3705aa 将公众号相关的事件常量抽取出来,单独放于WxMpEventConstants类中 2017-05-10 12:15:26 +08:00
Binary Wang
951913b493 WxConsts增加微信推送摇一摇事件通知ShakearoundUserShake事件常量 #220 2017-05-10 12:07:21 +08:00
Binary Wang
ba87eebf65 WxConsts增加微信推送券点流水详情card_pay_order事件常量 #219 2017-05-10 12:05:00 +08:00
Binary Wang
f216167541 WxConsts增加微信推送会员卡内容更新事件update_member_card常量 #217 2017-05-10 12:02:48 +08:00
Binary Wang
c21bad9e1d 增加设置方法,方便设置是否使用微信支付仿真测试环境 #224 2017-05-10 11:55:39 +08:00
Binary Wang
a6d29d9c30 添加DNS解析器支持 (#171) fix 2017-05-10 11:28:35 +08:00
Binary Wang
b2c4160e37 添加DNS解析器支持 (#171) fix 2017-05-10 11:28:04 +08:00
Andy Huo
ae4cbf98b8 添加DNS解析器支持 (#171)
支持api.weixin.qq.com域名绑定指定的IP
防止域名对应的IP跳跃,导致防火墙策略失效!
2017-05-10 11:23:03 +08:00
Binary Wang
5234459733 WxMpXmlMessage中增加微信推送用户核销卡券事件时所需的几个属性 #213 2017-05-09 15:27:51 +08:00
crskyp
54639826dd RequestExecutor实例修改为通过create方法构建,解决了必须同时引入apache-http、jodd-http、okhttp jar的问题 (#223) 2017-05-09 10:29:57 +08:00
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
ecoolper
adcff4ec7a pom添developer 2017-05-08 18:35:54 +08:00
Binary Wang
a47a0bb580 移动两个cp专用的bean到cp里 2017-05-08 14:08:02 +08:00