wechat/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-10-31 10:38:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,530 Commits 3 Branches 55 Tags
Commit Graph

3530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Binary Wang
2c2130282d update groupId for upload to maven central 2016-05-31 22:56:51 +08:00
Binary Wang
ad054115f5 Merge branch 'develop' 2016-05-31 22:41:41 +08:00
tianmu
a6b8c4099e Merge pull request #2 from chanjarster/develop 
Develop
 2016-05-25 16:27:20 +08:00
YuJian
f6c24ace0e 微信个性化菜单接口group_id改为tag_id 
详细参见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1455782296&token=&lang=zh_CN
 2016-05-14 14:26:28 +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
Daniel Qian
0efab24bc9 Merge pull request #295 from mgcnrx11/feat_consumeCardCode 
卡券核销的API增加参数重载的方法，增强兼容性
 2016-04-15 08:31:11 +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
d08174991e 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:40:10 +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
BinaryWang
bb905f6c6c Merge remote-tracking branch 'chan/develop' into develop 2016-03-24 09:53:20 +08:00
BinaryWang
dc913813cc Merge branch 'develop-chan' into develop 2016-03-24 09:40:43 +08:00
Daniel Qian
b56973f290 Merge branch 'binarywang-develop' into develop 2016-03-24 09:09:42 +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
Daniel Qian
b403551a8e Merge pull request #286 from fxdfxq/patch-1 
Update WxMpServiceImpl.java
 2016-03-24 08:52:48 +08:00
fxdfxq
b77e771bb0 Merge pull request #1 from fxdfxq/patch-1 
Update WxMpServiceImpl.java
 2016-03-21 12:57:59 +08:00
fxdfxq
4979a16ae7 Update WxMpServiceImpl.java 
增加getJSSDKPayInfo返回字段code_url，用于微信扫码支付生成二维码图片使用
 2016-03-21 12:53:37 +08:00
Daniel Qian
ce554bfeb4 Merge pull request #284 from JefferyWong/develop 
修改设置代理的Bug。
 2016-03-14 09:14:26 +08:00
Wang Zhengjie
d756702bd8 修改设置代理的Bug。 
修改设置代理的Bug。

Signed-off-by: Wang Zhengjie <wangzhengjie@tinkers.com.cn>
 2016-03-11 17:57:51 +08:00
Daniel Qian
2c82ff416c Merge pull request #277 from kakotor/develop 
替换回httpclient,将httpclient配置独立出来提供更多可配置项目
 2016-03-01 17:44:25 +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
Daniel Qian
f45562d9b0 Merge pull request #271 from kareanyi/develop 
修复微信个性化菜单的问题
 2016-02-16 09:04:09 +08:00
miller
b805a9967c 1.WxMenuRule增加language字段 
2.更改了WxMenu的toJson方法使menurule转换成正确的字符串
3.WxMenuTest中增加了相应的测试用例
 2016-02-15 16:57:27 +08:00
Daniel Qian
d253bdeba4 Merge pull request #269 from liukaitj/develop 
Develop
 2016-01-30 17:00:01 +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
Daniel Qian
b5986cfd4f Merge pull request #263 from mgcnrx11/feat_card_coupon 
Feature card coupon
 2016-01-12 15:22:41 +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
c8ed7738ab issue #172 jodd HttpResponse add charset("UTF-8") 2016-01-11 09:01:48 +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
Daniel Qian
00a197a130 Merge pull request #254 from kakotor/develop 
XStreamTransformer 增加注册方法,来注册自定义的消息类型
 2015-12-30 08:43:03 +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
Tianmu
fa55bf67eb Merge remote-tracking branch 'upstream/develop' into develop 
update from upstream
 2015-12-25 10:54:07 +08:00