From ac944d46edd4731cd2ab61fe5e02789417bf4531 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Fri, 21 Dec 2018 20:42:20 +0800 Subject: [PATCH] =?UTF-8?q?#888=20=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E4=B8=AD=E7=AD=BE=E5=90=8D=E6=96=B9=E6=B3=95=E4=B8=8D?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wxpay/service/impl/BaseWxPayServiceImpl.java | 10 +++++----- .../com/github/binarywang/wxpay/util/SignUtils.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java index f7626319..ec57e745 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java @@ -342,7 +342,7 @@ public abstract class BaseWxPayServiceImpl implements WxPayService { configMap.put("appid", appId); final WxPayAppOrderResult result = WxPayAppOrderResult.builder() - .sign(SignUtils.createSign(configMap, null, this.getConfig().getMchKey(), null)) + .sign(SignUtils.createSign(configMap, request.getSignType(), this.getConfig().getMchKey(), null)) .prepayId(prepayId) .partnerId(partnerId) .appId(appId) @@ -419,7 +419,7 @@ public abstract class BaseWxPayServiceImpl implements WxPayService { configMap.put("noncestr", nonceStr); configMap.put("appid", appId); // 此map用于客户端与微信服务器交互 - payInfo.put("sign", SignUtils.createSign(configMap, null, this.getConfig().getMchKey(), null)); + payInfo.put("sign", SignUtils.createSign(configMap, request.getSignType(), this.getConfig().getMchKey(), null)); payInfo.put("prepayId", prepayId); payInfo.put("partnerId", partnerId); payInfo.put("appId", appId); @@ -432,8 +432,8 @@ public abstract class BaseWxPayServiceImpl implements WxPayService { payInfo.put("timeStamp", timestamp); payInfo.put("nonceStr", nonceStr); payInfo.put("package", "prepay_id=" + prepayId); - payInfo.put("signType", SignType.MD5); - payInfo.put("paySign", SignUtils.createSign(payInfo, null, this.getConfig().getMchKey(), null)); + payInfo.put("signType", request.getSignType()); + payInfo.put("paySign", SignUtils.createSign(payInfo, request.getSignType(), this.getConfig().getMchKey(), null)); } return payInfo; @@ -457,7 +457,7 @@ public abstract class BaseWxPayServiceImpl implements WxPayService { params.put("time_stamp", String.valueOf(System.currentTimeMillis() / 1000)); params.put("nonce_str", String.valueOf(System.currentTimeMillis())); - String sign = SignUtils.createSign(params, null, this.getConfig().getMchKey(), null); + String sign = SignUtils.createSign(params, SignType.MD5, this.getConfig().getMchKey(), null); params.put("sign", sign); for (String key : params.keySet()) { diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/SignUtils.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/SignUtils.java index 2883c8b1..47129872 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/SignUtils.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/SignUtils.java @@ -52,7 +52,7 @@ public class SignUtils { */ @Deprecated public static String createSign(Map params, String signKey) { - return createSign(params, null, signKey, new String[0]); + return createSign(params, SignType.MD5, signKey, new String[0]); } /**