#752 修复微信支付拉取支付评价的接口（limit不参与签名）

binarywang · binarywang · commit df8dcb003c8d · 2018-09-09T12:10:15.000+08:00
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankRequest.java
@@ -117,8 +117,8 @@ protected void checkConstraints() throws WxPayException {
   }
 
   @Override
-  protected boolean ignoreSignType() {
-    return true;
+  protected String[] getIgnoredParamsForSign() {
+    return new String[]{"sign_type"};
   }
 
   @Override
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayQueryRequest.java
@@ -54,7 +54,7 @@ public String toString() {
   }
 
   @Override
-  protected boolean ignoreSignType() {
-    return true;
+  protected String[] getIgnoredParamsForSign() {
+    return new String[]{"sign_type"};
   }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRequest.java
@@ -198,7 +198,7 @@ public String toString() {
   }
 
   @Override
-  protected boolean ignoreSignType() {
-    return true;
+  protected String[] getIgnoredParamsForSign() {
+    return new String[]{"sign_type"};
   }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java
@@ -188,17 +188,17 @@ public String toXML() {
   }
 
   /**
-   * 签名时，是否忽略signType.
+   * 签名时，是否忽略appid.
    */
-  protected boolean ignoreSignType() {
+  protected boolean ignoreAppid() {
     return false;
   }
 
   /**
-   * 签名时，是否忽略appid.
+   * 签名时，忽略的参数.
    */
-  protected boolean ignoreAppid() {
-    return false;
+  protected String[] getIgnoredParamsForSign() {
+    return new String[0];
   }
 
   /**
@@ -248,7 +248,6 @@ public void checkAndSign(WxPayConfig config) throws WxPayException {
     }
 
     //设置签名字段的值
-    this.setSign(SignUtils.createSign(this, this.getSignType(), config.getMchKey(),
-      this.ignoreSignType()));
+    this.setSign(SignUtils.createSign(this, this.getSignType(), config.getMchKey(), this.getIgnoredParamsForSign()));
   }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDefaultRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDefaultRequest.java
@@ -16,4 +16,9 @@ public class WxPayDefaultRequest extends BaseWxPayRequest {
   protected void checkConstraints() {
     //do nothing
   }
+
+  @Override
+  protected boolean ignoreAppid() {
+    return true;
+  }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayQueryCommentRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayQueryCommentRequest.java
@@ -7,7 +7,7 @@
 
 /**
  * <pre>
- *  拉取订单评价数据接口的请求参数封装类
+ *  拉取订单评价数据接口的请求参数封装类.
  *  Created by BinaryWang on 2017/9/2.
  * </pre>
  *
@@ -20,14 +20,11 @@
 @AllArgsConstructor
 @XStreamAlias("xml")
 public class WxPayQueryCommentRequest extends BaseWxPayRequest {
-  @Override
-  protected boolean ignoreSignType() {
-    return true;
-  }
+  private static final long serialVersionUID = 2633600418272768186L;
 
   /**
    * <pre>
-   * 字段名：开始时间
+   * 字段名：开始时间.
    * 变量名：begin_time
    * 是否必填：是
    * 类型：String(19)
@@ -41,7 +38,7 @@ protected boolean ignoreSignType() {
 
   /**
    * <pre>
-   * 字段名：结束时间
+   * 字段名：结束时间.
    * 变量名：end_time
    * 是否必填：是
    * 类型：String(19)
@@ -55,7 +52,7 @@ protected boolean ignoreSignType() {
 
   /**
    * <pre>
-   * 字段名：位移
+   * 字段名：位移.
    * 变量名：offset
    * 是否必填：是
    * 类型：uint(64)
@@ -69,7 +66,7 @@ protected boolean ignoreSignType() {
 
   /**
    * <pre>
-   * 字段名：条数
+   * 字段名：条数.
    * 变量名：limit
    * 是否必填：否
    * 类型：uint(32)
@@ -81,11 +78,14 @@ protected boolean ignoreSignType() {
   private Integer limit;
 
   /**
-   * 检查约束情况
+   * 检查约束情况.
    */
   @Override
   protected void checkConstraints() throws WxPayException {
-
   }
 
+  @Override
+  protected String[] getIgnoredParamsForSign() {
+    return new String[]{"limit","sign_type"};
+  }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPaySendRedpackRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPaySendRedpackRequest.java
@@ -21,8 +21,8 @@
 @XStreamAlias("xml")
 public class WxPaySendRedpackRequest extends BaseWxPayRequest {
   @Override
-  protected boolean ignoreSignType() {
-    return true;
+  protected String[] getIgnoredParamsForSign() {
+    return new String[]{"sign_type"};
   }
 
   /**
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
@@ -1,19 +1,46 @@
 package com.github.binarywang.wxpay.service;
 
+import java.io.File;
+import java.util.Date;
+import java.util.Map;
+
 import com.github.binarywang.wxpay.bean.WxPayApiData;
-import com.github.binarywang.wxpay.bean.coupon.*;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponInfoQueryRequest;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponInfoQueryResult;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendRequest;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendResult;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponStockQueryRequest;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponStockQueryResult;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
 import com.github.binarywang.wxpay.bean.notify.WxScanPayNotifyResult;
-import com.github.binarywang.wxpay.bean.request.*;
-import com.github.binarywang.wxpay.bean.result.*;
+import com.github.binarywang.wxpay.bean.request.WxPayAuthcode2OpenidRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayDownloadBillRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayDownloadFundFlowRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayMicropayRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayOrderCloseRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayOrderQueryRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayOrderReverseRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayRefundQueryRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayReportRequest;
+import com.github.binarywang.wxpay.bean.request.WxPaySendRedpackRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayShorturlRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
+import com.github.binarywang.wxpay.bean.result.WxPayBillResult;
+import com.github.binarywang.wxpay.bean.result.WxPayFundFlowResult;
+import com.github.binarywang.wxpay.bean.result.WxPayMicropayResult;
+import com.github.binarywang.wxpay.bean.result.WxPayOrderCloseResult;
+import com.github.binarywang.wxpay.bean.result.WxPayOrderQueryResult;
+import com.github.binarywang.wxpay.bean.result.WxPayOrderReverseResult;
+import com.github.binarywang.wxpay.bean.result.WxPayRedpackQueryResult;
+import com.github.binarywang.wxpay.bean.result.WxPayRefundQueryResult;
+import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
+import com.github.binarywang.wxpay.bean.result.WxPaySendRedpackResult;
+import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult;
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.exception.WxPayException;
 
-import java.io.File;
-import java.util.Date;
-import java.util.Map;
-
 /**
  * <pre>
  * 微信支付相关接口.
@@ -530,7 +557,7 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
    * @param beginDate 开始时间
    * @param endDate   结束时间
    * @param offset    位移
-   * @param limit     条数
+   * @param limit     条数，建议填null，否则接口会报签名错误
    */
   String queryComment(Date beginDate, Date endDate, Integer offset, Integer limit) throws WxPayException;
 }
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
@@ -1,17 +1,70 @@
 package com.github.binarywang.wxpay.service.impl;
 
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.github.binarywang.utils.qrcode.QrcodeUtils;
 import com.github.binarywang.wxpay.bean.WxPayApiData;
-import com.github.binarywang.wxpay.bean.coupon.*;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponInfoQueryRequest;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponInfoQueryResult;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendRequest;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendResult;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponStockQueryRequest;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponStockQueryResult;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
 import com.github.binarywang.wxpay.bean.notify.WxScanPayNotifyResult;
 import com.github.binarywang.wxpay.bean.order.WxPayAppOrderResult;
 import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 import com.github.binarywang.wxpay.bean.order.WxPayMwebOrderResult;
 import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult;
-import com.github.binarywang.wxpay.bean.request.*;
-import com.github.binarywang.wxpay.bean.result.*;
+import com.github.binarywang.wxpay.bean.request.WxPayAuthcode2OpenidRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayDefaultRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayDownloadBillRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayDownloadFundFlowRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayMicropayRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayOrderCloseRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayOrderQueryRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayOrderReverseRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayQueryCommentRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayRedpackQueryRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayRefundQueryRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayReportRequest;
+import com.github.binarywang.wxpay.bean.request.WxPaySendRedpackRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayShorturlRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
+import com.github.binarywang.wxpay.bean.result.BaseWxPayResult;
+import com.github.binarywang.wxpay.bean.result.WxPayAuthcode2OpenidResult;
+import com.github.binarywang.wxpay.bean.result.WxPayBillBaseResult;
+import com.github.binarywang.wxpay.bean.result.WxPayBillResult;
+import com.github.binarywang.wxpay.bean.result.WxPayCommonResult;
+import com.github.binarywang.wxpay.bean.result.WxPayFundFlowBaseResult;
+import com.github.binarywang.wxpay.bean.result.WxPayFundFlowResult;
+import com.github.binarywang.wxpay.bean.result.WxPayMicropayResult;
+import com.github.binarywang.wxpay.bean.result.WxPayOrderCloseResult;
+import com.github.binarywang.wxpay.bean.result.WxPayOrderQueryResult;
+import com.github.binarywang.wxpay.bean.result.WxPayOrderReverseResult;
+import com.github.binarywang.wxpay.bean.result.WxPayRedpackQueryResult;
+import com.github.binarywang.wxpay.bean.result.WxPayRefundQueryResult;
+import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
+import com.github.binarywang.wxpay.bean.result.WxPaySandboxSignKeyResult;
+import com.github.binarywang.wxpay.bean.result.WxPaySendRedpackResult;
+import com.github.binarywang.wxpay.bean.result.WxPayShorturlResult;
+import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult;
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.constant.WxPayConstants.BillType;
 import com.github.binarywang.wxpay.constant.WxPayConstants.SignType;
@@ -23,17 +76,6 @@
 import com.google.common.base.Joiner;
 import com.google.common.collect.Maps;
 import jodd.io.ZipUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.zip.ZipException;
 
 import static com.github.binarywang.wxpay.constant.WxPayConstants.QUERY_COMMENT_DATE_FORMAT;
 import static com.github.binarywang.wxpay.constant.WxPayConstants.TarType;
@@ -291,7 +333,7 @@ public <T> T createOrder(WxPayUnifiedOrderRequest request) throws WxPayException
         configMap.put("appid", appId);
 
         final WxPayAppOrderResult result = WxPayAppOrderResult.builder()
-          .sign(SignUtils.createSign(configMap, null, this.getConfig().getMchKey(), false))
+          .sign(SignUtils.createSign(configMap, null, this.getConfig().getMchKey(), null))
           .prepayId(prepayId)
           .partnerId(partnerId)
           .appId(appId)
@@ -317,7 +359,7 @@ public <T> T createOrder(WxPayUnifiedOrderRequest request) throws WxPayException
           .signType(signType)
           .build();
 
-        payResult.setPaySign(SignUtils.createSign(payResult, signType, this.getConfig().getMchKey(), false));
+        payResult.setPaySign(SignUtils.createSign(payResult, signType, this.getConfig().getMchKey(), null));
         return (T) payResult;
       }
 
@@ -368,7 +410,7 @@ public Map<String, String> getPayInfo(WxPayUnifiedOrderRequest request) throws W
       configMap.put("noncestr", nonceStr);
       configMap.put("appid", appId);
       // 此map用于客户端与微信服务器交互
-      payInfo.put("sign", SignUtils.createSign(configMap, null, this.getConfig().getMchKey(), false));
+      payInfo.put("sign", SignUtils.createSign(configMap, null, this.getConfig().getMchKey(), null));
       payInfo.put("prepayId", prepayId);
       payInfo.put("partnerId", partnerId);
       payInfo.put("appId", appId);
@@ -382,7 +424,7 @@ public Map<String, String> getPayInfo(WxPayUnifiedOrderRequest request) throws W
       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(), false));
+      payInfo.put("paySign", SignUtils.createSign(payInfo, null, this.getConfig().getMchKey(), null));
     }
 
     return payInfo;
@@ -406,7 +448,7 @@ public String createScanPayQrcodeMode1(String productId) {
     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(), false);
+    String sign = SignUtils.createSign(params, null, this.getConfig().getMchKey(), null);
     params.put("sign", sign);
 
     for (String key : params.keySet()) {
@@ -632,7 +674,7 @@ private String handleGzipFundFlow(String url, String requestStr) throws WxPayExc
       }
     } catch (WxPayException wxPayException) {
       throw wxPayException;
-    } catch (Exception e){
+    } catch (Exception e) {
       this.log.error("解析对账单文件时出错", e);
       throw new WxPayException("解压zip文件出错");
     }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EntPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EntPayServiceImpl.java
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
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/util/SignUtilsTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/util/SignUtilsTest.java

Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,8 @@ protected void checkConstraints() throws WxPayException {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`@Override`
`120`		`- protected boolean ignoreSignType() {`
`121`		`- return true;`
	`120`	`+ protected String[] getIgnoredParamsForSign() {`
	`121`	`+ return new String[]{"sign_type"};`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public String toString() {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Override`
`57`		`- protected boolean ignoreSignType() {`
`58`		`- return true;`
	`57`	`+ protected String[] getIgnoredParamsForSign() {`
	`58`	`+ return new String[]{"sign_type"};`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public String toString() {`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`@Override`
`201`		`- protected boolean ignoreSignType() {`
`202`		`- return true;`
	`201`	`+ protected String[] getIgnoredParamsForSign() {`
	`202`	`+ return new String[]{"sign_type"};`
`203`	`203`	`}`
`204`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,17 +188,17 @@ public String toXML() {`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`/**`
`191`		`- * 签名时，是否忽略signType.`
	`191`	`+ * 签名时，是否忽略appid.`
`192`	`192`	`*/`
`193`		`- protected boolean ignoreSignType() {`
	`193`	`+ protected boolean ignoreAppid() {`
`194`	`194`	`return false;`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`/**`
`198`		`- * 签名时，是否忽略appid.`
	`198`	`+ * 签名时，忽略的参数.`
`199`	`199`	`*/`
`200`		`- protected boolean ignoreAppid() {`
`201`		`- return false;`
	`200`	`+ protected String[] getIgnoredParamsForSign() {`
	`201`	`+ return new String[0];`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`/**`
`@@ -248,7 +248,6 @@ public void checkAndSign(WxPayConfig config) throws WxPayException {`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`//设置签名字段的值`
`251`		`- this.setSign(SignUtils.createSign(this, this.getSignType(), config.getMchKey(),`
`252`		`- this.ignoreSignType()));`
	`251`	`+ this.setSign(SignUtils.createSign(this, this.getSignType(), config.getMchKey(), this.getIgnoredParamsForSign()));`
`253`	`252`	`}`
`254`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,9 @@ public class WxPayDefaultRequest extends BaseWxPayRequest {`
`16`	`16`	`protected void checkConstraints() {`
`17`	`17`	`//do nothing`
`18`	`18`	`}`
	`19`	`+`
	`20`	`+ @Override`
	`21`	`+ protected boolean ignoreAppid() {`
	`22`	`+ return true;`
	`23`	`+ }`
`19`	`24`	`}`