🎨 【微信支付】优化复用订单通知SignatureHeader

linyaqiang · Binary Wang · commit e4b2f94af587 · 2023-07-09T13:21:51.000Z
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/ProfitSharingV3Service.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/ProfitSharingV3Service.java
@@ -1,6 +1,6 @@
 package com.github.binarywang.wxpay.service;
 
-import com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader;
+import com.github.binarywang.wxpay.bean.notify.SignatureHeader;
 import com.github.binarywang.wxpay.bean.profitsharingV3.*;
 import com.github.binarywang.wxpay.exception.WxPayException;
 
@@ -238,7 +238,7 @@ public interface ProfitSharingV3Service {
    * @throws WxPayException the wx pay exception
    * @see <a href="https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter8_1_10.shtml">微信文档</a>
    */
-  ProfitSharingNotifyResult getProfitSharingNotifyData(String notifyData, SignatureHeader header) throws WxPayException;
+  ProfitSharingNotifyResult getProfitSharingNotifyResult(String notifyData, SignatureHeader header) throws WxPayException;
 
   /**
    * <pre>
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/ProfitSharingV3ServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/ProfitSharingV3ServiceImpl.java
@@ -1,6 +1,6 @@
 package com.github.binarywang.wxpay.service.impl;
 
-import com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader;
+import com.github.binarywang.wxpay.bean.notify.SignatureHeader;
 import com.github.binarywang.wxpay.bean.profitsharingV3.*;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.ProfitSharingV3Service;
@@ -120,7 +120,7 @@ public ProfitSharingReceiver deleteProfitSharingReceiver(ProfitSharingReceiver r
   }
 
   @Override
-  public ProfitSharingNotifyResult getProfitSharingNotifyData(String notifyData, SignatureHeader header) throws WxPayException {
+  public ProfitSharingNotifyResult getProfitSharingNotifyResult(String notifyData, SignatureHeader header) throws WxPayException {
     ProfitSharingNotifyData response = parseNotifyData(notifyData, header);
     ProfitSharingNotifyData.Resource resource = response.getResource();
     String cipherText = resource.getCipherText();
@@ -170,7 +170,7 @@ private boolean verifyNotifySign(SignatureHeader header, String data) throws WxP
     if (verifier == null) {
       throw new WxPayException("证书检验对象为空");
     }
-    return verifier.verify(header.getSerialNo(),
-      beforeSign.getBytes(StandardCharsets.UTF_8), header.getSigned());
+    return verifier.verify(header.getSerial(),
+      beforeSign.getBytes(StandardCharsets.UTF_8), header.getSignature());
   }
 }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/ProfitSharingV3ServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/ProfitSharingV3ServiceImplTest.java
@@ -1,13 +1,11 @@
 package com.github.binarywang.wxpay.service.impl;
 
-import com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader;
+import com.github.binarywang.wxpay.bean.notify.SignatureHeader;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.testbase.ApiTestModule;
 import com.google.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
@@ -27,11 +25,11 @@ public class ProfitSharingV3ServiceImplTest {
   @Test
   public void testProfitSharingNotifyData() throws WxPayException {
     SignatureHeader header = new SignatureHeader();
-    header.setSerialNo("Wechatpay-Serial");
+    header.setSerial("Wechatpay-Serial");
     header.setTimeStamp("Wechatpay-Timestamp");
     header.setNonce("Wechatpay-Nonce");
-    header.setSigned("Wechatpay-Signature");
+    header.setSignature("Wechatpay-Signature");
     String data = "body";
-    log.info(this.payService.getProfitSharingV3Service().getProfitSharingNotifyData(data,header).toString());
+    log.info(this.payService.getProfitSharingV3Service().getProfitSharingNotifyResult(data,header).toString());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package com.github.binarywang.wxpay.service.impl;`
`2`	`2`
`3`		`-import com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader;`
	`3`	`+import com.github.binarywang.wxpay.bean.notify.SignatureHeader;`
`4`	`4`	`import com.github.binarywang.wxpay.bean.profitsharingV3.*;`
`5`	`5`	`import com.github.binarywang.wxpay.exception.WxPayException;`
`6`	`6`	`import com.github.binarywang.wxpay.service.ProfitSharingV3Service;`
`@@ -120,7 +120,7 @@ public ProfitSharingReceiver deleteProfitSharingReceiver(ProfitSharingReceiver r`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`@Override`
`123`		`- public ProfitSharingNotifyResult getProfitSharingNotifyData(String notifyData, SignatureHeader header) throws WxPayException {`
	`123`	`+ public ProfitSharingNotifyResult getProfitSharingNotifyResult(String notifyData, SignatureHeader header) throws WxPayException {`
`124`	`124`	`ProfitSharingNotifyData response = parseNotifyData(notifyData, header);`
`125`	`125`	`ProfitSharingNotifyData.Resource resource = response.getResource();`
`126`	`126`	`String cipherText = resource.getCipherText();`
`@@ -170,7 +170,7 @@ private boolean verifyNotifySign(SignatureHeader header, String data) throws WxP`
`170`	`170`	`if (verifier == null) {`
`171`	`171`	`throw new WxPayException("证书检验对象为空");`
`172`	`172`	`}`
`173`		`- return verifier.verify(header.getSerialNo(),`
`174`		`- beforeSign.getBytes(StandardCharsets.UTF_8), header.getSigned());`
	`173`	`+ return verifier.verify(header.getSerial(),`
	`174`	`+ beforeSign.getBytes(StandardCharsets.UTF_8), header.getSignature());`
`175`	`175`	`}`
`176`	`176`	`}`