ecoolper
|
7f91ba2372
|
jodd response 编码设置为UTF-8
|
2017-06-03 23:10:30 +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 |
|
ecoolper
|
26d68cd3e8
|
RequestExecutor实例修改为通过create方法构建，解决了必须同时引入apache-http、jodd-http、okhttp jar的问题
|
2017-05-06 19:05:01 +08:00 |
|
Binary Wang
|
b2a65d5648
|
微信推送用户卡券转赠事件：WxConsts增加缺失的user_gifting_card事件常量 #212
|
2017-05-04 23:09:49 +08:00 |
|
Binary Wang
|
ee834e2b7d
|
增加微信推送卡券转赠事件中所需两个属性 #211
|
2017-05-04 23:05:17 +08:00 |
|
Binary Wang
|
ce77578ff6
|
增加微信推送用户领取卡券事件中所需两个属性 #210 并重构提取出部分内部类，避免WxMpXmlMessage类过于庞大
|
2017-05-04 23:00:35 +08:00 |
|
Binary Wang
|
4958d6d010
|
fix for previous commits
|
2017-05-04 22:48:55 +08:00 |
|
crskyp
|
734c112e18
|
删除两个类；修改一个类的父类 (#208)
1、删除AbstractWxMpService、AbstractWxCPService类
2、修改apache.WxCpServiceImpl类的父类为AbstractWxCpServiceImpl
|
2017-05-04 14:07:41 +08:00 |
|
ecoolper
|
aa4c076d36
|
1、删除AbstractWxMpService、AbstractWxCPService类
2、修改apache.WxCpServiceImpl类的父类为AbstractWxCpServiceImpl
|
2017-05-04 13:57:48 +08:00 |
|
crskyp
|
fbd02a85c9
|
okhttp用法有错误；添加了枚举HttpType (#207)
|
2017-05-04 11:13:02 +08:00 |
|
ecoolper
|
59fc9134c8
|
okhttp使用方式有错误，body().toString()修改为body().string()
|
2017-05-04 11:02:24 +08:00 |
|
ecoolper
|
6b7c86da95
|
添加枚举HttpType
|
2017-05-03 21:11:56 +08:00 |
|
ecoolper
|
2384b4b863
|
添加枚举HttpType
|
2017-05-03 20:55:49 +08:00 |
|
Binary Wang
|
424337a7a7
|
简化方法名称
|
2017-05-03 17:45:37 +08:00 |
|
Binary Wang
|
1eb2cc7edd
|
fix javadoc
|
2017-05-03 17:44:23 +08:00 |
|
Binary Wang
|
49dc14af73
|
发布临时测试版本2.6.1.BETA
|
2017-05-03 17:05:59 +08:00 |
|
Binary Wang
|
01b5d91416
|
升级qrcode-utils版本，取消对logback的依赖 #204
|
2017-05-03 17:05:42 +08:00 |
|
DDLeEHi
|
dfed700eb0
|
签名问题修复 (#205)
|
2017-05-03 17:05:15 +08:00 |
|
ecoolper
|
a8dfccc210
|
Merge branch 'develop' of https://github.com/Wechat-Group/weixin-java-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
|
2017-04-29 14:12:03 +08:00 |
|
ecoolper
|
4f900f8b21
|
添加httpType枚举
|
2017-04-29 13:40:53 +08:00 |
|
Binary Wang
|
f45ef9a3db
|
抽取客服相关接口请求URL到其接口类中 #195
|
2017-04-28 15:48:38 +08:00 |
|
Binary Wang
|
879c1f5de1
|
抽取公众号部分微信请求URL到接口类中 #195
|
2017-04-28 14:57:36 +08:00 |
|
Binary Wang
|
bb83ead12c
|
抽取公众号部分微信请求URL到常量类中 #195
|
2017-04-28 14:28:20 +08:00 |
|
bobbyguo
|
091e47897d
|
新加不带timeout跟password的构造方法，满足8/2需求。
建议生产环境都使用带poolConfig的构造方法，防止redis出现链接异常，可参考 bug
https://github.com/xetorthio/jedis/issues/848
|
2017-04-28 11:38:49 +08:00 |
|
蘑菇0202
|
a1faf8d2a2
|
update WxCpJedisConfigStorage, connect a redis with password and pool config (#202)
Change-Id: I3f5de67f148e599a1040239f71c9697e956c6873
Signed-off-by: zhangxintao <zhang.xintao@trans-cosmos.com.cn>
|
2017-04-28 11:13:49 +08:00 |
|
Binary Wang
|
cf5c21d9f1
|
fix for test
|
2017-04-28 10:49:28 +08:00 |
|
Binary Wang
|
67a846b325
|
出现40014的access_token问题时需要自动刷新token #197
|
2017-04-28 10:46:26 +08:00 |
|
Binary Wang
|
19b3b991f9
|
打印微信请求日志时地址中附带access_token #200
|
2017-04-28 10:35:16 +08:00 |
|
crskyp
|
48d6f10cb2
|
提取公共代码、实现okhttp请求方式 (#199)
1、提取了公共代码，添加AbstractWxMPService、AbstractWxCPService类
2、实现了okhttp请求方式
|
2017-04-27 23:16:10 +08:00 |
|
ecoolper
|
57e1f0919b
|
WxCpService的getWxMpConfigStorage方法修改为getWxCpConfigStorage
|
2017-04-27 20:32:05 +08:00 |
|
ecoolper
|
f42b22f5c1
|
WxCpService添加getWxMpConfigStorage方法，同时修改相关位置
|
2017-04-27 20:24:42 +08:00 |
|
ecoolper
|
d01d372b65
|
修改了冲突和错误
|
2017-04-27 20:14:52 +08:00 |
|
crskyp
|
44cbf65f81
|
Merge branch 'develop' into develop
|
2017-04-27 19:22:57 +08:00 |
|