微信支付修复2.8.2.BETA版本引入的签名问题

binarywang · binarywang · commit 2ab389e84fbd · 2017-10-13T10:47:45.000+08:00
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
@@ -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
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
@@ -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("&");
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -147,10 +147,8 @@ public WxPaySendRedpackResult sendRedpack(WxPaySendRedpackRequest request) throw`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`String responseContent = this.post(url, request.toXML(), true);`
`150`		`- WxPaySendRedpackResult result = WxPayBaseResult.fromXML(responseContent, WxPaySendRedpackResult.class);`
`151`		`- //毋须校验，因为没有返回签名信息`
`152`		`- // this.checkResult(result);`
`153`		`- return result;`
	`150`	`+ //无需校验，因为没有返回签名信息`
	`151`	`+ return WxPayBaseResult.fromXML(responseContent, WxPaySendRedpackResult.class);`
`154`	`152`	`}`
`155`	`153`
`156`	`154`	`@Override`