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 index c1ef414158679faeca3de05cfe2e86850aaf8727..054d46e7af43462efeecdaf3c147ee485185bd1e 100644 --- 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 微信文档 */ - ProfitSharingNotifyResult getProfitSharingNotifyData(String notifyData, SignatureHeader header) throws WxPayException; + ProfitSharingNotifyResult getProfitSharingNotifyResult(String notifyData, SignatureHeader header) throws WxPayException; /** *
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 index b9ca3ff8be43ace2745a5779bf6e525761d0f312..b569536f77f1d05ced93183d4c2e5d866f7c427b 100644 --- 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 class ProfitSharingV3ServiceImpl implements ProfitSharingV3Service { } @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 @@ public class ProfitSharingV3ServiceImpl implements ProfitSharingV3Service { 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 index 0ca7411e6c94cfd9c7931588f72ca81b09e84f56..72314dad736f63a23d745190630b2f7e1373bc0b 100644 --- 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()); } }