lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-05-05 21:27:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
635 Commits 3 Branches 51 Tags 19 MiB
52b2a378aa
Commit Graph

283 Commits

Author SHA1 Message Date
BinaryWang
78f44b2bb0 按照最新微信官方文档对客服会话控制接口进行修正 2016-07-12 18:35:42 +08:00
BinaryWang
3534234d91 按照最新文档对客服管理接口进行修正 2016-07-12 18:00:30 +08:00
BinaryWang
754e09ea02 更新规范单元测试类的命名 2016-07-12 14:46:49 +08:00
BinaryWang
55e0653521 修复更多的warning，尤其是导致打包warning的不规范或不必要的javadoc 2016-07-12 10:02:26 +08:00
BinaryWang
5d957582e3 修复一些warning，尤其是导致打包warning的不规范或不必要的javadoc 2016-07-12 09:33:08 +08:00
BinaryWang
0c2768dfe7 实现多客服会话控制的接口 2016-07-12 09:09:46 +08:00
BinaryWang
065156e81b 换用jdk7自带charset常量类 2016-07-11 18:07:05 +08:00
BinaryWang
3ab7e66b48 微信消息里增加客服会话管理的三个字段 2016-07-08 12:30:48 +08:00
BinaryWang
29cfa7762e 优化客服管理接口的单元测试 2016-07-05 11:45:20 +08:00
BinaryWang
f9022814fd 简化优化客服相关接口代码 2016-07-05 10:55:47 +08:00
BinaryWang
244df15d83 重命名客服接口获取方法名称，保证统一 2016-07-05 10:30:41 +08:00
BinaryWang
e169bcc2e9 添加多客服中客服管理的6个接口 2016-07-04 17:31:45 +08:00
BinaryWang
8b1f026aa7 修复一些warning 2016-07-04 17:21:00 +08:00
BinaryWang
a21f1522a6 单元测试中去掉不必要的组依赖 2016-07-04 13:19:24 +08:00
BinaryWang
6b2e858a62 版本号更新为1.3.6-SNAPSHOT 2016-06-30 20:24:23 +08:00
BinaryWang
7deb25b4bb 单元测试代码优化 2016-06-30 18:52:11 +08:00
BinaryWang
ed80cece22 替换以file.api.weixin.qq.com域名下的api为api.weixin.qq.com，并使用https 2016-06-30 10:22:30 +08:00
BinaryWang
13d76c1c50 修复重构素材上传处理代码 2016-06-24 09:26:47 +08:00
BinaryWang
bc22b03ea3 添加换取二维码图片url地址的重构方法（可以选择是否生成压缩的网址） 2016-06-21 11:46:48 +08:00
BinaryWang
5358d68fff 规范部分javadoc 2016-06-20 13:54:57 +08:00
BinaryWang
e34f6de775 add missing ‘this’ 2016-06-20 11:12:08 +08:00
BinaryWang
d90ef7fb00 add missing ‘this.’ and @Override 2016-06-20 11:10:17 +08:00
BinaryWang
cc300b93d0 qrCodePictureUrl 返回网址过长，使用短网址进行压缩 2016-06-20 11:04:51 +08:00
BinaryWang
7a68fa6853 remove redundant specification of type arguments 2016-06-20 11:03:22 +08:00
BinaryWang
0b2f443505 add missing ‘this’ 2016-06-20 11:02:17 +08:00
BinaryWang
e1ade466c3 add missing @Override 2016-06-20 11:01:02 +08:00
BinaryWang
f631df34fc 修复javadoc格式 2016-06-20 10:42:48 +08:00
miller
af2f12267e 行业相关api 2016-06-19 10:13:31 +08:00
Binary Wang
7a816cf7a9 Merge branch 'fxdfxq-master' into develop 
# Conflicts:
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
 2016-06-18 22:15:53 +08:00
Binary Wang
e492e5adeb Merge branch 'fix_data_typo' into develop 2016-06-18 22:01:35 +08:00
Binary Wang
d64f5020c4 Merge branch 'tianmu' into develop 2016-06-18 21:56:09 +08:00
Binary Wang
7057b8a960 为WxError加入builder模式支持 2016-06-16 23:03:32 +08:00
tianmu
5349da96f6 修改了部分接口字符串拼接的模式，从 + 改为StringBuffer 2016-06-07 14:32:22 +08:00
Binary Wang
1b4293cc57 Merge pull request #3 from kareanyi/develop 
上传图文消息内的图片获取URL
 2016-06-01 11:43:22 +08:00
miller
ba54ff5004 上传图文消息内的图片获取URL 2016-06-01 11:17:53 +08:00
Binary Wang
c0f163259c Merge pull request #2 from kareanyi/develop 
消息群发的预览接口
 2016-06-01 10:49:17 +08:00
BinaryWang
46b3eba7e6 修改groupId，修复Pom文件，同步README.md文件 2016-06-01 10:41:48 +08:00
miller
83e443b02f 消息群发的预览接口 2016-06-01 10:39:10 +08:00
miller
902b6897a1 群发接口响应 增加msgDataId字段 用于图文分析 2016-06-01 10:07:20 +08:00
YuJian
52e9b67c0f 修复命名错误。data是datum的复数，datas是错误写法 2016-04-24 13:16:10 +08:00
BinaryWang
2ec3c527c2 替换hard code 2016-04-15 14:17:44 +08:00
BinaryWang
cb78119cdd Merge branch 'develop-chan' into develop 2016-04-15 14:02:24 +08:00
BinaryWang
b47c967ee2 增加 换取二维码图片url地址的方法 2016-04-15 13:59:14 +08:00
Daniel Qian
e57eb3f244 Merge pull request #296 from zexpp5/develop 
发送红包接口增加了详细的注释
 2016-04-15 08:31:24 +08:00
Lance7in
cfc15480de 发送红包接口的入参是Map,注释中添加了所需必填参数的列表及描述. 
发送红包接口需要在配置文件test-config.xml中额外设置两个key,已在注释中说明
 2016-04-13 17:37:22 +08:00
YuJian
8e02ea23af 卡券核销的API增加参数重载的方法，增强兼容性 2016-04-10 16:26:28 +08:00
Daniel Qian
3e2ebb06f4 Merge pull request #292 from kareanyi/develop 
增加了获取图文素材中文章的封面图url
 2016-03-30 11:36:17 +08:00
miller
35697dafcf 增加了获取图文素材中文章的封面图url 2016-03-28 14:54:57 +08:00
fxdfxq
ccdbef3963 Update WxMpServiceImpl.java 
1.对应WxMpService类修改getJSSDKPayInfo(Map<String, String> parameters)方法为getPayInfo(Map<String, String> parameters)方法
2.增加，1）扫码支付参数拼装方法：getNativePayInfo(String productId,String outTradeNo, double amt, String body,String ip, String callbackUrl)
2）原来的公众号支付参数拼装方法：getJsapiPayInfo(String openId,String outTradeNo, double amt, String body,String ip, String callbackUrl)
3.在getPayInfo(Map<String, String> parameters)方法中增加codeUrl参数判断，只有在NATIVE方式才返回codeUrl参数。
 2016-03-25 18:38:36 +08:00
fxdfxq
ae50576bf7 Update WxMpService.java 
增加NATIVE扫码支付类型，
1.将原来的getJSSDKPayInfo(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String notifyUrl)方法拆分为两个方法：1）拼装NATIVE发起支付请求需要的参数的方法 Map<String, String> getNativePayInfo(String productId, String outTradeNo, double amt, String body, String ip, String notifyUrl);
2） 拼装JSAPI发起支付请求需要的参数方法 Map<String, String> getJsapiPayInfo(String openId, String outTradeNo, double amt, String body, String ip, String notifyUrl);
2.修改getJSSDKPayInfo(Map<String, String> parameters)方式为getPayInfo(Map<String, String> parameters)，适用上面两个方法调用。
 2016-03-25 18:24:19 +08:00
Daniel Qian
defd54b2b1 Merge branch 'develop' of https://github.com/binarywang/weixin-java-tools into binarywang-develop 
Conflicts:
	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java
 2016-03-24 09:08:52 +08:00
fxdfxq
4979a16ae7 Update WxMpServiceImpl.java 
增加getJSSDKPayInfo返回字段code_url，用于微信扫码支付生成二维码图片使用
 2016-03-21 12:53:37 +08:00
Binary Wang
39c2f09008 修复上传永久素材报“Connection reset”错误的问题 2016-02-29 12:44:25 +08:00
ben
c61fcb26c6 替换回httpclient,将httpclient配置独立出来提供更多可配置项目 2016-02-23 18:12:49 +08:00
Liu Kai
5f75a03ede 修复微信退款接口的错误 
1. 修复微信退款接口的错误。
2. 格式化微信退款接口及微信支付JSSDK调用接口失败时抛出异常的msg。

Change-Id: Ib3b14965ea29ee518047535a75b81a4972b91271
Signed-off-by: Liu Kai <liukai@tinkers.com.cn>
 2016-01-30 15:25:02 +08:00
Liu Kai
2a6993713a 微信支付JSSDK及退款接口增加异常处理 
为解决接口调用端无法取到调用微信服务器的返回结果的问题，微信支付JSSDK及退款接口增加了异常处理。

Change-Id: I2fe5255edb416336b64bef84a4bac5ba51231d67
Signed-off-by: Liu Kai <liukai@tinkers.com.cn>
 2016-01-30 12:21:16 +08:00
Liu Kai
852017f7b4 增加微信退款接口以及修改几个卡券相关的接口 
1. 增加微信退款接口
2. 增加取得卡券详情接口
3. 修改取卡券签名接口的说明
4. 将卡券核销接口的返回值由Void改为String

Change-Id: I2bac2d090871a4988f7279a9794eca5722451cdd
Signed-off-by: Liu Kai <liukai@tinkers.com.cn>
 2016-01-29 17:30:14 +08:00
YuJian
54ced62f30 换用JoddGetRequestExecutor 
解决NoHttpResoponseException问题
 2016-01-11 21:17:46 +08:00
YuJian
779e36b1fa 新增卡券相关接口6个 
1. getCardApiTicket获得卡券的api_ticket
2. createCardApiSignature创建调用卡券api时的签名
3. decryptCardCode卡券code解码
4. queryCardCode卡券code查询
5. consumeCardCode卡券核销
6. markCardCode卡券mark接口
 2016-01-11 21:03:21 +08:00
YuJian
980ad0b7bf WxMpInMemoryConfigStorage新增cardApiTicket的存储 2016-01-11 20:46:35 +08:00
YuJian
65c532e45b 增加卡券的FriendUserName字段 2016-01-11 20:46:35 +08:00
YuJian
89e092b04d 添加关于卡券事件推送的常量、XML消息字段 2016-01-11 20:46:35 +08:00
Daniel Qian
25eb592f26 fix: #172 based on PR #259 2016-01-10 10:34:25 +08:00
Daniel Qian
d759e6935e fix: #256, #172 CloseableHttpResponse 使用外没有关闭的问题 2016-01-07 18:07:31 +08:00
Daniel Qian
06e4dda310 微信支付计算精度问题 #248 2016-01-07 18:02:20 +08:00
ben
0619c3f01e 修改me.chanjar.weixin.mp.bean.WxMpXmlOutTransferCustomerServiceMessage 支持将消息转发到多客服(https://mp.weixin.qq.com/wiki/5/ae230189c9bd07a6b221f48619aeef35.html)中的两种方式 2015-12-29 10:10:45 +08:00
ben
c901067509 Merge branch 'develop' of https://github.com/chanjarster/weixin-java-tools into develop 2015-12-28 12:36:22 +08:00
ben
5778b42e1e XStreamTransformer 增加注册方法,来注册自定义的消息类型 2015-12-25 14:40:18 +08:00
Daniel Qian
72aab0d7b8 upgrade to 1.3.4-SNAPSHOT 2015-12-25 09:35:17 +08:00
Daniel Qian
03406f128f upgrade to 1.3.3 2015-12-25 09:27:35 +08:00
Daniel Qian
097fc091b1 Merge pull request #242 from videome/pay-result-bug 
Fix the bug that fails to query order due to sign error.
 2015-12-25 09:15:24 +08:00
Daniel Qian
1e67c3f47b Merge pull request #252 from SimonDolph/unionid 
add unionid
 2015-12-25 09:14:12 +08:00
SimonDolph
ed84f511c7 add unionid 2015-12-24 17:44:48 +08:00
Daniel Qian
05777c664a Merge pull request #249 from tianmu/master 
add conditional menu method
 2015-12-23 08:46:56 +08:00
Tianmu
6b522da559 change name: matchrule to matchRule 2015-12-22 10:45:15 +08:00
tianmu
b2e1cca6c2 change tab space 
change tab space 1 time
 2015-12-21 19:41:42 +08:00
Tianmu
34fda26e02 add conditional menu method 2015-12-21 16:00:18 +08:00
Daniel Qian
0388c8d9dc upgrade to 1.3.3-SNAPSHOT 2015-12-05 15:37:25 +08:00
Daniel Qian
780074f219 upgrade version 2015-12-03 12:47:38 +08:00
Daniel Qian
59bdad92f6 fix: java doc incorrectness 2015-12-03 12:45:52 +08:00
Kane Zhu
5594c8852d Fix the bug that fails to query order due to sign error. 2015-12-01 11:18:39 +08:00
Kane Zhu
b19dc7b0fb Improve error message of the failure of getting prepayid. 2015-11-28 21:49:32 +08:00
Daniel Qian
379aae95f1 issue #209 2015-11-25 08:46:59 +08:00
Daniel Qian
5f456eb521 issue #236 2015-11-24 13:10:47 +08:00
Kane Zhu
30f22896b1 Support sending redpack. 2015-11-17 19:39:59 +08:00
Daniel Qian
d0a452904a Merge pull request #216 from videome/develop 
Improve 'templateSend' method to check the response code to see if it…
 2015-10-23 15:16:37 +08:00
ukid
123e5ef973 票据验证方法 2015-10-23 14:33:32 +08:00
Kane Zhu
23c96d9076 Improve 'templateSend' method to check the response code to see if it's successful or not. 2015-10-22 18:51:31 +08:00
Daniel Qian
9363a67538 upgrade to 1.3.2-SNAPSHOT 2015-10-16 10:13:37 +08:00
Daniel Qian
5e7d1ebbbd upgrade to 1.3.1 2015-10-16 10:07:40 +08:00
Kane Zhu
cc3714c599 Improve prepay API to support all parameters. 2015-10-14 16:36:55 +08:00
Daniel Qian
fe8c70849a fix #211 上传素材时如果文件名是中文会乱码 2015-10-03 10:46:27 +08:00
Daniel Qian
c722496167 #204 2015-09-14 12:35:39 +08:00
Daniel Qian
a6db21fbc8 fix #207 2015-09-11 14:04:34 +08:00
Daniel Qian
9bbdc3b2a0 promote to 1.3.1-SNAPSHOT 2015-09-11 09:10:43 +08:00
Daniel Qian
8485af028a upgrade to 1.3.0 2015-09-11 09:05:15 +08:00
Daniel Qian
8935048040 Merge pull request #202 from alanchenup/f-url 
增加点击图文消息跳转链接
 2015-09-04 13:10:47 +08:00
alanchen
a645a28267 增加点击图文消息跳转链接 2015-09-03 17:54:51 +08:00
Daniel Qian
5630b865c2 issue #200 2015-08-26 08:42:00 +08:00
ukid
6ede883f71 format with spaces 2015-08-19 18:36:06 +08:00