Skip to content

Commit b13d3c9

Browse files
committed
为新增加的发送红包的接口方法添加单元测试,仅测试接口格式,未测试实际功能
1 parent 7f830e2 commit b13d3c9

6 files changed

Lines changed: 102 additions & 48 deletions

File tree

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,8 @@
1919

2020
import java.io.StringReader;
2121
import java.nio.charset.Charset;
22-
import java.util.ArrayList;
2322
import java.util.Arrays;
24-
import java.util.Collections;
25-
import java.util.List;
26-
import java.util.Map;
2723
import java.util.Random;
28-
import java.util.SortedMap;
29-
import java.util.TreeMap;
3024

3125
import javax.crypto.Cipher;
3226
import javax.crypto.spec.IvParameterSpec;
@@ -36,7 +30,6 @@
3630
import javax.xml.parsers.ParserConfigurationException;
3731

3832
import org.apache.commons.codec.binary.Base64;
39-
import org.apache.commons.codec.digest.DigestUtils;
4033
import org.w3c.dom.Document;
4134
import org.w3c.dom.Element;
4235
import org.xml.sax.InputSource;
@@ -79,32 +72,6 @@ public WxCryptUtil(String token, String encodingAesKey,
7972
this.aesKey = Base64.decodeBase64(encodingAesKey + "=");
8073
}
8174

82-
/**
83-
* 微信公众号支付签名算法(详见:http://pay.weixin.qq.com/wiki/doc/api/index.php?chapter=4_3)
84-
* @param packageParams 原始参数
85-
* @param signKey 加密Key(即 商户Key)
86-
* @return 签名字符串
87-
*/
88-
public static String createSignForPay(Map<String, String> packageParams, String signKey) {
89-
SortedMap<String, String> sortedMap = new TreeMap<>();
90-
sortedMap.putAll(packageParams);
91-
92-
List<String> keys = new ArrayList<>(packageParams.keySet());
93-
Collections.sort(keys);
94-
95-
StringBuffer toSign = new StringBuffer();
96-
for (String key : keys) {
97-
String value = packageParams.get(key);
98-
if (null != value && !"".equals(value) && !"sign".equals(key)
99-
&& !"key".equals(key)) {
100-
toSign.append(key + "=" + value + "&");
101-
}
102-
}
103-
toSign.append("key=" + signKey);
104-
String sign = DigestUtils.md5Hex(toSign.toString()).toUpperCase();
105-
return sign;
106-
}
107-
10875
static String extractEncryptPart(String xml) {
10976
try {
11077
DocumentBuilder db = builderLocal.get();

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.chanjar.weixin.common.util.http;
22

3-
import me.chanjar.weixin.common.bean.result.WxError;
4-
import me.chanjar.weixin.common.exception.WxErrorException;
3+
import java.io.IOException;
4+
55
import org.apache.http.Consts;
66
import org.apache.http.HttpHost;
77
import org.apache.http.client.config.RequestConfig;
@@ -10,7 +10,8 @@
1010
import org.apache.http.entity.StringEntity;
1111
import org.apache.http.impl.client.CloseableHttpClient;
1212

13-
import java.io.IOException;
13+
import me.chanjar.weixin.common.bean.result.WxError;
14+
import me.chanjar.weixin.common.exception.WxErrorException;
1415

1516
/**
1617
* 简单的POST请求执行器,请求的参数是String, 返回的结果也是String
@@ -34,6 +35,11 @@ public String execute(CloseableHttpClient httpclient, HttpHost httpProxy, String
3435

3536
try (CloseableHttpResponse response = httpclient.execute(httpPost)) {
3637
String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
38+
if (responseContent.startsWith("<xml>")) {
39+
//xml格式输出直接返回
40+
return responseContent;
41+
}
42+
3743
WxError error = WxError.fromJson(responseContent);
3844
if (error.getErrorCode() != 0) {
3945
throw new WxErrorException(error);

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package me.chanjar.weixin.common.util.xml;
22

3+
import java.io.Writer;
4+
35
import com.thoughtworks.xstream.XStream;
46
import com.thoughtworks.xstream.core.util.QuickWriter;
57
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
@@ -8,8 +10,6 @@
810
import com.thoughtworks.xstream.security.NullPermission;
911
import com.thoughtworks.xstream.security.PrimitiveTypePermission;
1012

11-
import java.io.Writer;
12-
1313
public class XStreamInitializer {
1414

1515
public static XStream getInstance() {
@@ -34,6 +34,11 @@ protected void writeText(QuickWriter writer, String text) {
3434
}
3535

3636
}
37+
38+
@Override
39+
public String encodeNode(String name) {
40+
return name;//防止将_转换成__
41+
}
3742
};
3843
}
3944
});

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.SortedMap;
99
import java.util.TreeMap;
1010

11+
import org.apache.commons.codec.digest.DigestUtils;
1112
import org.apache.http.Consts;
1213
import org.apache.http.HttpHost;
1314
import org.apache.http.client.config.RequestConfig;
@@ -25,7 +26,6 @@
2526

2627
import me.chanjar.weixin.common.bean.result.WxError;
2728
import me.chanjar.weixin.common.exception.WxErrorException;
28-
import me.chanjar.weixin.common.util.crypto.WxCryptUtil;
2929
import me.chanjar.weixin.common.util.http.Utf8ResponseHandler;
3030
import me.chanjar.weixin.common.util.xml.XStreamInitializer;
3131
import me.chanjar.weixin.mp.api.WxMpPayService;
@@ -85,7 +85,7 @@ public WxMpPrepayIdResult getPrepayId(final Map<String, String> parameters) {
8585
packageParams.put("nonce_str", System.currentTimeMillis() + "");
8686
checkParameters(packageParams);
8787

88-
String sign = WxCryptUtil.createSignForPay(packageParams,
88+
String sign = this.createSign(packageParams,
8989
this.wxMpService.getWxMpConfigStorage().getPartnerKey());
9090
packageParams.put("sign", sign);
9191

@@ -219,7 +219,7 @@ public Map<String, String> getPayInfo(Map<String, String> parameters)
219219
payInfo.put("codeUrl", wxMpPrepayIdResult.getCode_url());
220220
}
221221

222-
String finalSign = WxCryptUtil.createSignForPay(payInfo,
222+
String finalSign = this.createSign(payInfo,
223223
this.wxMpService.getWxMpConfigStorage().getPartnerKey());
224224
payInfo.put("paySign", finalSign);
225225
return payInfo;
@@ -246,7 +246,7 @@ public WxMpPayResult getJSSDKPayResult(String transactionId,
246246
}
247247

248248
packageParams.put("nonce_str", nonce_str);
249-
packageParams.put("sign", WxCryptUtil.createSignForPay(packageParams,
249+
packageParams.put("sign", this.createSign(packageParams,
250250
this.wxMpService.getWxMpConfigStorage().getPartnerKey()));
251251

252252
StringBuilder request = new StringBuilder("<xml>");
@@ -303,7 +303,7 @@ public WxMpPayRefundResult refundPay(Map<String, String> parameters)
303303
refundParams.put("nonce_str", System.currentTimeMillis() + "");
304304
refundParams.put("op_user_id",
305305
this.wxMpService.getWxMpConfigStorage().getPartnerId());
306-
String sign = WxCryptUtil.createSignForPay(refundParams,
306+
String sign = this.createSign(refundParams,
307307
this.wxMpService.getWxMpConfigStorage().getPartnerKey());
308308
refundParams.put("sign", sign);
309309

@@ -362,7 +362,7 @@ public WxMpPayRefundResult refundPay(Map<String, String> parameters)
362362
@Override
363363
public boolean checkJSSDKCallbackDataSignature(Map<String, String> kvm,
364364
String signature) {
365-
return signature.equals(WxCryptUtil.createSignForPay(kvm,
365+
return signature.equals(this.createSign(kvm,
366366
this.wxMpService.getWxMpConfigStorage().getPartnerKey()));
367367
}
368368

@@ -377,7 +377,7 @@ public WxRedpackResult sendRedpack(Map<String, String> parameters)
377377
this.wxMpService.getWxMpConfigStorage().getPartnerId());
378378
packageParams.put("nonce_str", System.currentTimeMillis() + "");
379379

380-
String sign = WxCryptUtil.createSignForPay(packageParams,
380+
String sign = this.createSign(packageParams,
381381
this.wxMpService.getWxMpConfigStorage().getPartnerKey());
382382
packageParams.put("sign", sign);
383383

@@ -428,7 +428,7 @@ public WxRedpackResult sendRedpack(WxSendRedpackRequest request) throws WxErrorE
428428
request.setMchId(this.wxMpService.getWxMpConfigStorage().getPartnerId());
429429
request.setNonceStr(System.currentTimeMillis() + "");
430430

431-
String sign = WxCryptUtil.createSignForPay(xmlBean2Map(request),
431+
String sign = this.createSign(xmlBean2Map(request),
432432
this.wxMpService.getWxMpConfigStorage().getPartnerKey());
433433
request.setSign(sign);
434434

@@ -453,7 +453,7 @@ private Map<String, String> xmlBean2Map(Object bean) {
453453
try {
454454
Field field = WxSendRedpackRequest.class.getDeclaredField(entry.getKey());
455455
if (field.isAnnotationPresent(XStreamAlias.class)) {
456-
result.put(reflect.get().toString(), field.getAnnotation(XStreamAlias.class).value());
456+
result.put(field.getAnnotation(XStreamAlias.class).value(), reflect.get().toString());
457457
}
458458
} catch (NoSuchFieldException | SecurityException e) {
459459
e.printStackTrace();
@@ -464,4 +464,26 @@ private Map<String, String> xmlBean2Map(Object bean) {
464464
return result;
465465
}
466466

467+
/**
468+
* 微信公众号支付签名算法(详见:http://pay.weixin.qq.com/wiki/doc/api/index.php?chapter=4_3)
469+
* @param packageParams 原始参数
470+
* @param signKey 加密Key(即 商户Key)
471+
* @return 签名字符串
472+
*/
473+
private String createSign(Map<String, String> packageParams, String signKey) {
474+
SortedMap<String, String> sortedMap = new TreeMap<>(packageParams);
475+
476+
StringBuffer toSign = new StringBuffer();
477+
for (String key : sortedMap.keySet()) {
478+
String value = packageParams.get(key);
479+
if (null != value && !"".equals(value) && !"sign".equals(key) && !"key".equals(key)) {
480+
toSign.append(key + "=" + value + "&");
481+
}
482+
}
483+
484+
toSign.append("key=" + signKey);
485+
486+
return DigestUtils.md5Hex(toSign.toString()).toUpperCase();
487+
}
488+
467489
}

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,26 @@
11
package me.chanjar.weixin.mp.api.impl;
22

3+
import org.testng.annotations.Guice;
34
import org.testng.annotations.Test;
45

6+
import com.google.inject.Inject;
7+
8+
import me.chanjar.weixin.mp.api.ApiTestModule;
9+
import me.chanjar.weixin.mp.bean.pay.WxRedpackResult;
10+
import me.chanjar.weixin.mp.bean.pay.WxSendRedpackRequest;
11+
512
/**
13+
* 测试支付相关接口
614
* Created by Binary Wang on 2016/7/28.
715
* @author binarywang (https://github.com/binarywang)
816
*/
17+
@Test
18+
@Guice(modules = ApiTestModule.class)
919
public class WxMpPayServiceImplTest {
20+
21+
@Inject
22+
protected WxMpServiceImpl wxService;
23+
1024
@Test
1125
public void testGetPrepayId() throws Exception {
1226

@@ -54,7 +68,14 @@ public void testCheckJSSDKCallbackDataSignature() throws Exception {
5468

5569
@Test
5670
public void testSendRedpack() throws Exception {
57-
71+
WxSendRedpackRequest request = new WxSendRedpackRequest();
72+
request.setActName("abc");
73+
request.setClientIp("aaa");
74+
request.setMchBillno("aaaa");
75+
request
76+
.setReOpenid(((ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid());
77+
WxRedpackResult redpackResult = this.wxService.getPayService().sendRedpack(request);
78+
System.err.println(redpackResult);
5879
}
5980

6081
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package me.chanjar.weixin.mp.bean.pay;
2+
3+
import java.lang.reflect.Field;
4+
import java.util.Map.Entry;
5+
6+
import org.joor.Reflect;
7+
import org.testng.annotations.Test;
8+
9+
import com.thoughtworks.xstream.annotations.XStreamAlias;
10+
11+
@Test
12+
public class WxSendRedpackRequestTest {
13+
14+
public void test() throws NoSuchFieldException, SecurityException {
15+
16+
WxSendRedpackRequest request = new WxSendRedpackRequest();
17+
request.setMchBillno("123");
18+
request.setActName("ab");
19+
for (Entry<String, Reflect> entry : Reflect.on(request).fields().entrySet()) {
20+
Reflect reflect = entry.getValue();
21+
if (reflect.get() == null) {
22+
continue;
23+
}
24+
25+
Field field = WxSendRedpackRequest.class.getDeclaredField(entry.getKey());
26+
if (field.isAnnotationPresent(XStreamAlias.class)) {
27+
System.err.println(reflect.get() + " = " + field.getAnnotation(XStreamAlias.class).value());
28+
}
29+
}
30+
31+
}
32+
33+
}

0 commit comments

Comments
 (0)