Commit Graph

105 Commits

Author SHA1 Message Date
Binary Wang
d7b32d24f9 fix time 2017-07-03 15:49:18 +08:00
Binary Wang
eaad6367de #252 原有图文素材管理接口增加留言管理所需两个参数:need_open_comment 和 only_fans_can_comment 2017-07-02 18:23:21 +08:00
Binary Wang
26272bb7e5 refactor some packages and class files name 2017-06-10 17:02:14 +08:00
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
crskyp
54639826dd RequestExecutor实例修改为通过create方法构建,解决了必须同时引入apache-http、jodd-http、okhttp jar的问题 (#223) 2017-05-09 10:29:57 +08:00
ecoolper
26d68cd3e8 RequestExecutor实例修改为通过create方法构建,解决了必须同时引入apache-http、jodd-http、okhttp jar的问题 2017-05-06 19:05:01 +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
crskyp
48d6f10cb2 提取公共代码、实现okhttp请求方式 (#199)
1、提取了公共代码,添加AbstractWxMPService、AbstractWxCPService类
2、实现了okhttp请求方式
2017-04-27 23:16:10 +08:00
crskyp
44cbf65f81 Merge branch 'develop' into develop 2017-04-27 19:22:57 +08:00
ecoolper
ffa3544579 1、提取了公共代码,添加AbstractWxMPService、AbstractWxCPService类
2、实现了okhttp请求方式
3、RequestExecute接口添加executeApache、executeJodd、executeOkhttp方法
2017-04-27 18:38:14 +08:00
crskyp
885db18ebc 使用装饰模式,支持apache-http和jodd-http (#194) 2017-04-25 10:14:33 +08:00
ecoolper
9ac1aad0e4 装饰模式实现 2017-04-22 15:06:12 +08:00
ecoolper
d476047c4c mp usage jodd-http 2017-04-21 21:55:02 +08:00
Binary Wang
0ff63ba3cb 修复用户标签id类型不一致的问题 #175 2017-04-10 11:14:20 +08:00
Binary Wang
89470660ef WxMpUserList里total类型改为long #176 2017-04-10 10:53:58 +08:00
Binary Wang
bc0fbf76a5 规范统一openid的问题 #177 2017-04-10 10:24:32 +08:00
Binary Wang
490ba068c5 模板消息加入对小程序的支持 #172 2017-03-30 17:59:25 +08:00
Binary Wang
4e05faf5e0 fix 2017-03-27 17:19:17 +08:00
Binary Wang
54ee287c11 群发预览消息格式中加入对towxname和touser的支持 2017-03-27 17:15:24 +08:00
Binary Wang
3d3ab2b5a9 修复模板消息的MsgID的问题 #165 2017-03-24 17:23:08 +08:00
Binary Wang
8e831ac961 群发消息增加isSendAll属性及相关方法,用于显式指定是否群发消息至所有用户 2017-01-11 17:52:48 +08:00
Binary Wang
dc33436d51 reformat some code 2016-12-20 16:48:26 +08:00
Binary Wang
f221ea3487 公众平台增加群发接口对原创校验逻辑的支持 2016-12-20 16:48:07 +08:00
aimilin
41da9e15a6 微信订单支付回掉功能完善 2016-12-08 20:44:03 +08:00
Binary Wang
a8871984e1 补充public方法的注释 2016-11-10 11:21:18 +08:00
Binary Wang
e4df6c8a30 重构优化XStreamTransformer代码 2016-11-10 11:21:18 +08:00
Binary Wang
6cf7b08897 去掉模版消息里无用的topcolor参数 2016-11-04 16:58:39 +08:00
Binary Wang
44a1dfaf63 重构bean和builder的包结构 2016-10-26 15:29:57 +08:00
Binary Wang
ba6b7dafec 素材相关代码补充完善javadoc注释,并重构包结构 2016-10-26 15:13:55 +08:00
Binary Wang
b23b76457c 添加对客服消息发送(点击跳转到图文消息页面) 图文消息的支持 #67 2016-10-25 15:04:58 +08:00
Binary Wang
912ef62841 重构客服消息相关命名,替换不合理的命名:CustomMessage -> KefuMessage 2016-10-25 12:05:50 +08:00
Binary Wang
6dc0481d1d 添加获得模板列表的接口方法,并重构模板消息相关类包结构 for issue #63 2016-10-18 00:07:14 +08:00
Binary Wang
77db3c2dae 将模板消息相关接口代码移到单独的service,并作相应重构调整,增加单元测试 for issue #63 2016-10-14 19:33:34 +08:00
BinaryWang
d7e35a1c56 修复一个属性错误 2016-09-28 19:01:28 +08:00
BinaryWang
f2a858db7a 调整移除group相关接口后的代码 2016-09-28 19:00:46 +08:00
BinaryWang
742c74d850 用户信息添加新增的tagid_list属性 2016-09-28 13:19:36 +08:00
BinaryWang
95aa369058 优化调整代码 2016-09-22 15:11:52 +08:00
Binary Wang
54ab159371 Merge pull request #41 from mgcnrx11/feat-custom-msg-wxcard
新增卡券的客服消息类型
2016-09-21 14:45:50 +08:00
miller
63c41d44ab 1.rename openId to openid 2.rename blackList to blacklist 3.refine blacklist test 2016-09-20 15:22:59 +08:00
miller
b941a57ccd add user black list api and impl 2016-09-20 14:39:39 +08:00
YuJian
ad71e3c0f3 新增卡券的客服消息类型
1. WxCardBuilder用于构建卡券的客服消息;
2. WxMpCustomMessage新作cardId字段及卡券builder;
3. CustomMessageGsonAdapter处理cardId序列化名字;
4. WxConsts新作WXCARD卡券类型。
2016-09-18 21:30:39 +08:00
BinaryWang
ede249643c parameterized some generic types 2016-09-12 17:51:17 +08:00
BinaryWang
ea35246d76 暂时去掉jackson代码,用于展示数据的代码放在客户端比较好些 2016-09-09 14:03:18 +08:00
BinaryWang
82d71ea418 修复对应常量名 2016-09-09 09:51:18 +08:00
BinaryWang
f66c0b02e2 修复由于静态引用SimpleDateFormat导致线程不安全的代码 2016-09-09 09:43:01 +08:00