Visitar URL original
合并Develop,准备发布2.6.0版本 by binarywang · Pull Request #184 · binarywang/WxJava · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
ddd4079
Merge pull request #11 from Wechat-Group/develop
aimilin6688 Dec 23, 2016
e296d23
minor updates
binarywang Feb 13, 2017
b938ef9
Merge branch 'master' into develop
binarywang Feb 13, 2017
b2b0460
update version to 2.6.0-SNAPSHOT
binarywang Feb 13, 2017
e2a1995
修复微信支付企业红包的问题:发送红包的返回结果中,没有签名,不需要进行签名检查。 #140
binarywang Feb 14, 2017
00c2aae
small update for a test method
binarywang Feb 19, 2017
9ac66af
Merge pull request #12 from Wechat-Group/develop
aimilin6688 Feb 21, 2017
29f054a
增加接收会员信息事件的事件类型常量
mgcnrx11 Feb 25, 2017
df59fa4
Merge pull request #145 from mgcnrx11/feat-newEventTypePR
binarywang Feb 25, 2017
70a4512
#123 支持微信支付的服务商功能
binarywang Mar 1, 2017
0f6b246
发布临时版本2.5.1.BETA
binarywang Mar 1, 2017
8a270c8
Merge branch 'master' into develop
binarywang Mar 4, 2017
eee954b
微信支付相关代码独立成一个子模块
binarywang Mar 5, 2017
710b0f6
微信支付相关代码独立成一个子模块
binarywang Mar 5, 2017
d50d58d
发布临时版本2.5.2.BETA
binarywang Mar 5, 2017
f3ac998
update pom
binarywang Mar 5, 2017
7340e03
将部分仅供测试代码使用的常量挪走
binarywang Mar 9, 2017
d9472e4
清理代码
binarywang Mar 10, 2017
4be0299
增加缺少的setter和getter方法
binarywang Mar 10, 2017
7ee9ac0
replace this.wxMpConfigStorage with this.getWxMpConfigStorage() #155
binarywang Mar 13, 2017
db85c19
replace this.wxMpConfigStorage with this.getWxMpConfigStorage() #155
binarywang Mar 13, 2017
edf558a
Merge pull request #14 from Wechat-Group/develop
aimilin6688 Mar 14, 2017
024d830
扫描支付 支持生成二维码URL字符串接口
aimilin6688 Mar 14, 2017
d40309e
Merge pull request #157 from aimilin6688/develop
binarywang Mar 14, 2017
b8c8d10
增加扫码支付回掉结果Bean
aimilin6688 Mar 14, 2017
5e72fb4
Merge pull request #158 from aimilin6688/develop
binarywang Mar 14, 2017
9d5f19c
修复菜单获取接口反序列化时subButtons为空的问题 #142
binarywang Mar 14, 2017
6ad58a8
发布临时测试版本 2.5.3.BETA
binarywang Mar 20, 2017
1649b30
remove junit
binarywang Mar 21, 2017
b4a454d
重构代码,去掉带来过多jar包依赖的xml-path,使用java自带的xpath来实现相应功能。
binarywang Mar 21, 2017
86cdb50
remove junit
binarywang Mar 21, 2017
6847a41
pull request (#163)
Mar 21, 2017
bf2b4ee
字符编码字符串用常量替换
binarywang Mar 21, 2017
9cdfaec
企业付款查询中mchId字段的特殊设置去掉
binarywang Mar 22, 2017
998445e
发布临时测试版本2.5.4.BETA
binarywang Mar 22, 2017
2df0f56
增加默认无参构造方法
binarywang Mar 22, 2017
db6e91a
remove something
binarywang Mar 22, 2017
8ec509a
修复企业付款查询的代码
binarywang Mar 22, 2017
13e4b14
fix some code
binarywang Mar 23, 2017
d35e094
add missing test
binarywang Mar 23, 2017
f63e934
add missing test
binarywang Mar 23, 2017
6945e7e
实现刷卡支付提交API #101
binarywang Mar 23, 2017
3f4cdb7
撤销订单API,并重构相关代码,简化开发 #101
binarywang Mar 24, 2017
9acb01c
add test for reverseOdrer method
binarywang Mar 24, 2017
9f2f2f8
update test
binarywang Mar 24, 2017
612beb2
发布临时测试版本2.5.5.BETA
binarywang Mar 24, 2017
3d3ab2b
修复模板消息的MsgID的问题 #165
binarywang Mar 24, 2017
d7d5b16
Merge branch 'master' into develop
binarywang Mar 24, 2017
96d72fe
增加微信支付转换短链接API #101
binarywang Mar 27, 2017
0418f17
增加微信支付 授权码查询OPENID接口API #101
binarywang Mar 27, 2017
29353ff
access_token缓存增加redis支持 (#169)
lly835 Mar 27, 2017
54ee287
群发预览消息格式中加入对towxname和touser的支持
binarywang Mar 27, 2017
4e05faf
fix
binarywang Mar 27, 2017
76892bd
完善修补javadoc
binarywang Mar 26, 2017
3ead031
支持企业号mpnews消息类型 #143
binarywang Mar 27, 2017
5d92da6
简化test
binarywang Mar 28, 2017
2d5fcb3
自定义菜单加入对小程序的支持 #170
binarywang Mar 28, 2017
60c82e9
去掉一些中文的常量命名
binarywang Mar 28, 2017
a4daf56
自定义菜单加入对小程序的支持 #170
binarywang Mar 28, 2017
aa49f96
adjust pom
binarywang Mar 29, 2017
490ba06
模板消息加入对小程序的支持 #172
binarywang Mar 30, 2017
e45a1ca
发布临时测试版本2.5.6.BETA
binarywang Mar 30, 2017
7ce46ed
fix a typo
binarywang Mar 30, 2017
89870bb
自定义菜单加入对小程序的支持 #170
binarywang Mar 30, 2017
66f04c4
发布临时测试版本2.5.7.BETA
binarywang Mar 31, 2017
bc0fbf7
规范统一openid的问题 #177
binarywang Apr 10, 2017
8947066
WxMpUserList里total类型改为long #176
binarywang Apr 10, 2017
0ff63ba
修复用户标签id类型不一致的问题 #175
binarywang Apr 10, 2017
bc28d0c
Merge branch 'master' into develop
binarywang Apr 12, 2017
68fbb2e
修复基于Redis的微信配置的bug
xusheng1987 Apr 12, 2017
da6cd44
修复支付结果通知缺失CDATA部分,导致微信重复发送通知
xusheng1987 Apr 12, 2017
e9c252a
Merge pull request #183 from xusheng1987/develop
binarywang Apr 12, 2017
c79f77c
更改版本号为2.6.0
binarywang Apr 13, 2017
7c32fcc
Rename CONTRIBUTION.md to contribution.md
binarywang Apr 13, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
增加微信支付转换短链接API #101
  • Loading branch information
binarywang committed Mar 27, 2017
commit 96d72fe5424553141dc65e06d83ce7fa712f6c11
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package com.github.binarywang.wxpay.bean.request;

import com.thoughtworks.xstream.annotations.XStreamAlias;

/**
* <pre>
* 转换短链接请求对象类
* Created by Binary Wang on 2017-3-27.
* @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
* </pre>
*/
@XStreamAlias("xml")
public class WxPayShorturlRequest extends WxPayBaseRequest {
/**
* <pre>
* URL链接
* long_url
* 是
* String(512)
* weixin://wxpay/bizpayurl?sign=XXXXX&appid=XXXXX&mch_id=XXXXX&product_id=XXXXXX&time_stamp=XXXXXX&nonce_str=XXXXX
* 需要转换的URL,签名用原串,传输需URLencode
* </pre>
*/
@XStreamAlias("long_url")
private String longUrl;

public String getLongUrl() {
return this.longUrl;
}

public void setLongUrl(String longUrl) {
this.longUrl = longUrl;
}

public WxPayShorturlRequest() {
}

public WxPayShorturlRequest(String longUrl) {
this.longUrl = longUrl;
}

@Override
protected void checkConstraints() {
//do nothing
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
* </pre>
*/
@XStreamAlias("xml")
public class WxPayOrderReverseResult extends WxPayBaseResult {

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.github.binarywang.wxpay.bean.result;

import com.thoughtworks.xstream.annotations.XStreamAlias;

/**
* <pre>
* 转换短链接结果对象类
* Created by Binary Wang on 2017-3-27.
* @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
* </pre>
*/
@XStreamAlias("xml")
public class WxPayShorturlResult extends WxPayBaseResult {
/**
* <pre>
* URL链接
* short_url
* 是
* String(64)
* weixin://wxpay/s/XXXXXX
* 转换后的URL
* </pre>
*/
@XStreamAlias("short_url")
private String shortUrl;

public String getShortUrl() {
return this.shortUrl;
}

public void setShortUrl(String shortUrl) {
this.shortUrl = shortUrl;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,39 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
* 撤销订单API
* 文档地址:https://pay.weixin.qq.com/wiki/doc/api/micropay.php?chapter=9_11&index=3
* 应用场景:
* 支付交易返回失败或支付系统超时,调用该接口撤销交易。如果此订单用户支付失败,微信支付系统会将此订单关闭;如果用户支付成功,微信支付系统会将此订单资金退还给用户。
* 注意:7天以内的交易单可调用撤销,其他正常支付的单如需实现相同功能请调用申请退款API。提交支付交易后调用【查询订单API】,没有明确的支付结果再调用【撤销订单API】。
* 支付交易返回失败或支付系统超时,调用该接口撤销交易。如果此订单用户支付失败,微信支付系统会将此订单关闭;
* 如果用户支付成功,微信支付系统会将此订单资金退还给用户。
* 注意:7天以内的交易单可调用撤销,其他正常支付的单如需实现相同功能请调用申请退款API。
* 提交支付交易后调用【查询订单API】,没有明确的支付结果再调用【撤销订单API】。
* 调用支付接口后请勿立即调用撤销订单API,建议支付后至少15s后再调用撤销订单接口。
* 接口链接 :https://api.mch.weixin.qq.com/secapi/pay/reverse
* 是否需要证书:请求需要双向证书。
*</pre>
* </pre>
*/
WxPayOrderReverseResult reverseOrder(WxPayOrderReverseRequest request) throws WxErrorException;

/**
* <pre>
* 转换短链接
* 应用场景:
* 该接口主要用于扫码原生支付模式一中的二维码链接转成短链接(weixin://wxpay/s/XXXXXX),减小二维码数据量,提升扫描速度和精确度。
* 接口地址:https://api.mch.weixin.qq.com/tools/shorturl
* 是否需要证书:否
* </pre>
* @param request 请求对象
*/
String shorturl(WxPayShorturlRequest request) throws WxErrorException;

/**
* <pre>
* 转换短链接
* 应用场景:
* 该接口主要用于扫码原生支付模式一中的二维码链接转成短链接(weixin://wxpay/s/XXXXXX),减小二维码数据量,提升扫描速度和精确度。
* 接口地址:https://api.mch.weixin.qq.com/tools/shorturl
* 是否需要证书:否
* </pre>
* @param longUrl 需要被压缩的网址
*/
String shorturl(String longUrl) throws WxErrorException;

}
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,22 @@ public WxPayOrderReverseResult reverseOrder(WxPayOrderReverseRequest request) th
return result;
}

@Override
public String shorturl(WxPayShorturlRequest request) throws WxErrorException {
request.checkAndSign(this.getConfig());

String url = this.getPayBaseUrl() + "/tools/shorturl";
String responseContent = this.post(url, request.toXML());
WxPayShorturlResult result = WxPayBaseResult.fromXML(responseContent, WxPayShorturlResult.class);
result.checkResult(this);
return result.getShortUrl();
}

@Override
public String shorturl(String longUrl) throws WxErrorException {
return this.shorturl(new WxPayShorturlRequest(longUrl));
}

private String post(String url, String xmlParam) {
String requestString = xmlParam;
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@
@Test
@Guice(modules = ApiTestModule.class)
public class WxPayServiceImplTest {

private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Inject
protected WxPayService payService;
private WxPayService payService;

@Test
public void testGetPayInfo() throws Exception {
Expand Down Expand Up @@ -221,10 +222,12 @@ public void testMicropay() throws Exception {

@Test
public void testGetConfig() throws Exception {
// no need to test
}

@Test
public void testSetConfig() throws Exception {
// no need to test
}

@Test
Expand All @@ -236,4 +239,16 @@ public void testReverseOrder() throws Exception {
this.logger.info(result.toString());
}

@Test
public void testShorturl() throws Exception {
String longUrl = "weixin://wxpay/bizpayurl?sign=XXXXX&appid=XXXXX&mch_id=XXXXX&product_id=XXXXXX&time_stamp=XXXXXX&nonce_str=XXXXX";

String result = this.payService.shorturl(new WxPayShorturlRequest(longUrl));
assertNotNull(result);
this.logger.info(result.toString());

result = this.payService.shorturl(longUrl);
assertNotNull(result);
this.logger.info(result.toString());
}
}