Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #1

Merged
merged 25 commits into from
Nov 6, 2017
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2ab389e
微信支付修复2.8.2.BETA版本引入的签名问题
binarywang Oct 13, 2017
24e80a9
发布临时测试版本2.8.3.BETA
binarywang Oct 13, 2017
4f1c66e
优化统一下单时参数校验逻辑
binarywang Oct 13, 2017
c65cd34
WxMpSelfMenuInfo的几个内部静态类增加Serializable接口实现
binarywang Oct 13, 2017
447c73e
规范化小程序模块的部分代码
binarywang Oct 16, 2017
64f0e7c
#355 修复为支持拉取订单评价数据接口而引入的签名bug
binarywang Oct 17, 2017
0f007d9
#356 修复QrCodeRequestExecutor类MimeType比较的bug
binarywang Oct 18, 2017
afb5e61
#352 修复XStreamTransformer由于classloader原因导致的ClassCastException问题
binarywang Oct 18, 2017
8d6cfce
优化部分代码
binarywang Oct 20, 2017
91838b9
发布临时测试版本2.8.4.BETA
binarywang Oct 23, 2017
460dc11
修复WxPayMpOrderResult
binarywang Oct 25, 2017
d282bc0
WxCpDepart的order类型更改为Long
binarywang Oct 25, 2017
58348ee
WxCpDepart的order类型更改为Long
binarywang Oct 25, 2017
590b8c4
修复单元测试
binarywang Oct 25, 2017
4c79eec
使用lombok的@Data注解简化mp模块的所有bean类
binarywang Oct 25, 2017
5db9725
使用lombok的@Data注解简化mp模块的所有bean类
binarywang Oct 25, 2017
e98c5e4
Update readme.md
binarywang Oct 26, 2017
8a31c18
修复单元测试
binarywang Oct 26, 2017
b39380f
为兼容之前版本代码,引入两个方法
binarywang Oct 26, 2017
305c2aa
Merge branch 'master' into develop
binarywang Oct 26, 2017
c7cfc9a
完善修复xmlBean2Map方法
binarywang Oct 27, 2017
05a680c
发布临时测试版本2.8.5.BETA
binarywang Oct 27, 2017
5231f8c
优化代码
binarywang Oct 30, 2017
8a58717
#361 WxMpKefuMessage类的内部类实现序列化接口
rememberber Nov 2, 2017
2914942
#362 修复okhttp实现的qrcode二维码图片下载代码
binarywang Nov 3, 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
Next Next commit
微信支付修复2.8.2.BETA版本引入的签名问题
binarywang committed Oct 13, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 2ab389e84fbd1e33e2fc84ab18c26f3d57174ffc
Original file line number Diff line number Diff line change
@@ -147,10 +147,8 @@ public WxPaySendRedpackResult sendRedpack(WxPaySendRedpackRequest request) throw
}

String responseContent = this.post(url, request.toXML(), true);
WxPaySendRedpackResult result = WxPayBaseResult.fromXML(responseContent, WxPaySendRedpackResult.class);
//毋须校验,因为没有返回签名信息
// this.checkResult(result);
return result;
//无需校验,因为没有返回签名信息
return WxPayBaseResult.fromXML(responseContent, WxPaySendRedpackResult.class);
}

@Override
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
import me.chanjar.weixin.common.util.BeanUtils;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;

import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
@@ -44,19 +45,13 @@ public static String createSign(Object xmlBean, String signKey, String signType)
* @return 签名字符串
*/
public static String createSign(Map<String, String> params, String signKey, String signType) {
// if (this.getConfig().useSandbox()) {
// //使用仿真测试环境
// //TODO 目前测试发现,以下两行代码都会出问题,所以暂不建议使用仿真测试环境
// signKey = "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456";
// //return "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456";
// }

SortedMap<String, String> sortedMap = new TreeMap<>(params);

StringBuilder toSign = new StringBuilder();
for (String key : sortedMap.keySet()) {
String value = params.get(key);
if (!Lists.newArrayList("sign", "key", "sign_type").contains(key)) {
if (StringUtils.isNotEmpty(value) &&
!Lists.newArrayList("sign", "key", "sign_type").contains(key)) {
toSign.append(key).append("=").append(value).append("&");
}
}