lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-04-24 18:04:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
447 Commits 3 Branches 51 Tags 19 MiB
f631df34fc
Commit Graph

447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
88a7ac3693 Merge branch 'wxMenuRule' into develop 2016-06-18 22:00:22 +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
BinaryWang
dca8e307a0 add serialVersionUID for the classes which implement Serializable interface 2016-06-02 09:52:58 +08:00
BinaryWang
fb3a093be1 fix weird assignment statement 2016-06-02 09:50:00 +08:00
BinaryWang
14057344a5 remove unused imports 2016-06-02 09:47:49 +08:00
Binary Wang
a6fecf5f1f disable doclint for java8 2016-06-01 21:42:32 +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
Binary Wang
58ad7b7c21 Merge pull request #1 from kareanyi/develop 
群发接口响应 增加msgDataId字段 用于图文分析
 2016-06-01 10:15:15 +08:00
miller
902b6897a1 群发接口响应 增加msgDataId字段 用于图文分析 2016-06-01 10:07:20 +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