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
|
7 vuotta sitten |
ecoolper
|
adcff4ec7a
|
pom添developer
|
7 vuotta sitten |
Binary Wang
|
a47a0bb580
|
移动两个cp专用的bean到cp里
|
7 vuotta sitten |
ecoolper
|
26d68cd3e8
|
RequestExecutor实例修改为通过create方法构建,解决了必须同时引入apache-http、jodd-http、okhttp jar的问题
|
7 vuotta sitten |
Binary Wang
|
b2a65d5648
|
微信推送用户卡券转赠事件:WxConsts增加缺失的user_gifting_card事件常量 #212
|
7 vuotta sitten |
Binary Wang
|
ee834e2b7d
|
增加微信推送卡券转赠事件中所需两个属性 #211
|
7 vuotta sitten |
Binary Wang
|
ce77578ff6
|
增加微信推送用户领取卡券事件中所需两个属性 #210 并重构提取出部分内部类,避免WxMpXmlMessage类过于庞大
|
7 vuotta sitten |
Binary Wang
|
4958d6d010
|
fix for previous commits
|
7 vuotta sitten |
crskyp
|
734c112e18
|
删除两个类;修改一个类的父类 (#208)
1、删除AbstractWxMpService、AbstractWxCPService类
2、修改apache.WxCpServiceImpl类的父类为AbstractWxCpServiceImpl
|
7 vuotta sitten |
ecoolper
|
aa4c076d36
|
1、删除AbstractWxMpService、AbstractWxCPService类
2、修改apache.WxCpServiceImpl类的父类为AbstractWxCpServiceImpl
|
7 vuotta sitten |
crskyp
|
fbd02a85c9
|
okhttp用法有错误;添加了枚举HttpType (#207)
|
7 vuotta sitten |
ecoolper
|
59fc9134c8
|
okhttp使用方式有错误,body().toString()修改为body().string()
|
7 vuotta sitten |
ecoolper
|
6b7c86da95
|
添加枚举HttpType
|
7 vuotta sitten |
ecoolper
|
2384b4b863
|
添加枚举HttpType
|
7 vuotta sitten |
Binary Wang
|
424337a7a7
|
简化方法名称
|
7 vuotta sitten |
Binary Wang
|
1eb2cc7edd
|
fix javadoc
|
7 vuotta sitten |
Binary Wang
|
49dc14af73
|
发布临时测试版本2.6.1.BETA
|
7 vuotta sitten |
Binary Wang
|
01b5d91416
|
升级qrcode-utils版本,取消对logback的依赖 #204
|
7 vuotta sitten |
DDLeEHi
|
dfed700eb0
|
签名问题修复 (#205)
|
7 vuotta sitten |
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
|
7 vuotta sitten |
ecoolper
|
4f900f8b21
|
添加httpType枚举
|
7 vuotta sitten |
Binary Wang
|
f45ef9a3db
|
抽取客服相关接口请求URL到其接口类中 #195
|
7 vuotta sitten |
Binary Wang
|
879c1f5de1
|
抽取公众号部分微信请求URL到接口类中 #195
|
7 vuotta sitten |
Binary Wang
|
bb83ead12c
|
抽取公众号部分微信请求URL到常量类中 #195
|
7 vuotta sitten |
bobbyguo
|
091e47897d
|
新加不带timeout跟password的构造方法,满足8/2需求。
建议生产环境都使用带poolConfig的构造方法,防止redis出现链接异常,可参考 bug
https://github.com/xetorthio/jedis/issues/848
|
7 vuotta sitten |
蘑菇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>
|
7 vuotta sitten |
Binary Wang
|
cf5c21d9f1
|
fix for test
|
7 vuotta sitten |
Binary Wang
|
67a846b325
|
出现40014的access_token问题时需要自动刷新token #197
|
7 vuotta sitten |
Binary Wang
|
19b3b991f9
|
打印微信请求日志时地址中附带access_token #200
|
7 vuotta sitten |
crskyp
|
48d6f10cb2
|
提取公共代码、实现okhttp请求方式 (#199)
1、提取了公共代码,添加AbstractWxMPService、AbstractWxCPService类
2、实现了okhttp请求方式
|
7 vuotta sitten |
ecoolper
|
57e1f0919b
|
WxCpService的getWxMpConfigStorage方法修改为getWxCpConfigStorage
|
7 vuotta sitten |
ecoolper
|
f42b22f5c1
|
WxCpService添加getWxMpConfigStorage方法,同时修改相关位置
|
7 vuotta sitten |
ecoolper
|
d01d372b65
|
修改了冲突和错误
|
7 vuotta sitten |
crskyp
|
44cbf65f81
|
Merge branch 'develop' into develop
|
7 vuotta sitten |
ecoolper
|
ffa3544579
|
1、提取了公共代码,添加AbstractWxMPService、AbstractWxCPService类
2、实现了okhttp请求方式
3、RequestExecute接口添加executeApache、executeJodd、executeOkhttp方法
|
7 vuotta sitten |
ecoolper
|
49f9787e98
|
1、提取了公共代码,添加AbstractWxMPService、AbstractWxCPService类
2、实现了okhttp请求方式
3、RequestExecute接口添加executeApache、executeJodd、executeOkhttp方法
|
7 vuotta sitten |
Binary Wang
|
2029cd0bb7
|
修复企业号中 WxCpMessage转json时丢失safe属性的问题#196
|
7 vuotta sitten |
crskyp
|
885db18ebc
|
使用装饰模式,支持apache-http和jodd-http (#194)
|
7 vuotta sitten |
ecoolper
|
dbf0a1505b
|
weixin-java-parent pom.xml添加jodd-http
|
7 vuotta sitten |
ecoolper
|
2019115b67
|
gradle配置信息
|
7 vuotta sitten |
ecoolper
|
fe61393e3e
|
少提交一个
|
7 vuotta sitten |
ecoolper
|
b03cb4b783
|
添加了注释
|
7 vuotta sitten |
ecoolper
|
9ac1aad0e4
|
装饰模式实现
|
7 vuotta sitten |
ecoolper
|
76330ef3c6
|
装饰模式实现
|
7 vuotta sitten |
ecoolper
|
5726ca9c04
|
cp usage jodd-http
|
7 vuotta sitten |
ecoolper
|
0b0b5a90fc
|
common usage jodd-http
|
7 vuotta sitten |
ecoolper
|
d476047c4c
|
mp usage jodd-http
|
7 vuotta sitten |
ecoolper
|
897e139587
|
jodd
|
7 vuotta sitten |
crskyp
|
a8d443e13b
|
pay模块使用jodd-http方式,已支持证书方式 (#189)
weixin-java-tools pay use jodd-http
|
7 vuotta sitten |
ecoolper
|
0e6113b765
|
格式化代码
|
7 vuotta sitten |