open-source/payment-spring-boot
1
0
Fork 0
mirror of https://github.com/dromara/payment-spring-boot.git synced 2026-03-14 05:43:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
xiafang
2020-10-30 08:53:45 +08:00
parent 8e9c553326
commit 807e01d6b2
10 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/WechatPayConfiguration.java
View File

@@ -1,8 +1,8 @@
package com.enongm.dianji.payment.autoconfigure; package com.enongm.dianji.payment.autoconfigure;
import com.enongm.dianji.payment.wechat.KeyPairFactory; import com.enongm.dianji.payment.wechat.v3.KeyPairFactory;
import com.enongm.dianji.payment.wechat.WechatPayV3Service; import com.enongm.dianji.payment.wechat.v3.WechatPayV3Service;
import com.enongm.dianji.payment.wechat.v2.WechatPayV2Service; import com.enongm.dianji.payment.wechat.v2.WechatPayV2Service;
import com.enongm.dianji.payment.wechat.v3.SignatureProvider; import com.enongm.dianji.payment.wechat.v3.SignatureProvider;
import com.enongm.dianji.payment.wechat.v3.model.WechatMetaBean; import com.enongm.dianji.payment.wechat.v3.model.WechatMetaBean;

4
payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/DefaultPayFilterChain.java → payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/DefaultPayFilterChain.java
View File

@@ -1,9 +1,7 @@
package com.enongm.dianji.payment.wechat; package com.enongm.dianji.payment.wechat.v3;
import com.enongm.dianji.payment.wechat.v3.WechatPayRequest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/KeyPairFactory.java → payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/KeyPairFactory.java
View File

@@ -1,4 +1,4 @@
package com.enongm.dianji.payment.wechat; package com.enongm.dianji.payment.wechat.v3;
import com.enongm.dianji.payment.wechat.v3.model.WechatMetaBean; import com.enongm.dianji.payment.wechat.v3.model.WechatMetaBean;

4
payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/PayFilter.java → payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/PayFilter.java
View File

@@ -1,8 +1,6 @@
package com.enongm.dianji.payment.wechat; package com.enongm.dianji.payment.wechat.v3;
import com.enongm.dianji.payment.wechat.v3.WechatPayRequest;
/** /**
* The interface Pay filter. * The interface Pay filter.
* *

4
payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/PayFilterChain.java → payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/PayFilterChain.java
View File

@@ -1,8 +1,6 @@
package com.enongm.dianji.payment.wechat; package com.enongm.dianji.payment.wechat.v3;
import com.enongm.dianji.payment.wechat.v3.WechatPayRequest;
/** /**
* The interface Pay filter chain. * The interface Pay filter chain.
* *

4
payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/WechatPayV3Service.java → payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatPayV3Service.java
View File

@@ -1,9 +1,7 @@
package com.enongm.dianji.payment.wechat; package com.enongm.dianji.payment.wechat.v3;
import com.enongm.dianji.payment.wechat.v3.SignatureProvider;
import com.enongm.dianji.payment.wechat.v3.WechatPayRequest;
import com.enongm.dianji.payment.wechat.v3.filter.BodyMergeFilter; import com.enongm.dianji.payment.wechat.v3.filter.BodyMergeFilter;
import com.enongm.dianji.payment.wechat.v3.filter.HeaderFilter; import com.enongm.dianji.payment.wechat.v3.filter.HeaderFilter;
import com.enongm.dianji.payment.wechat.v3.filter.HttpRequestFilter; import com.enongm.dianji.payment.wechat.v3.filter.HttpRequestFilter;

4
payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/BodyMergeFilter.java
View File

@@ -2,8 +2,8 @@ package com.enongm.dianji.payment.wechat.v3.filter;
import com.enongm.dianji.payment.autoconfigure.WechatPayProperties; import com.enongm.dianji.payment.autoconfigure.WechatPayProperties;
import com.enongm.dianji.payment.wechat.PayFilter; import com.enongm.dianji.payment.wechat.v3.PayFilter;
import com.enongm.dianji.payment.wechat.PayFilterChain; import com.enongm.dianji.payment.wechat.v3.PayFilterChain;
import com.enongm.dianji.payment.wechat.v3.WechatPayRequest; import com.enongm.dianji.payment.wechat.v3.WechatPayRequest;
import com.enongm.dianji.payment.wechat.v3.model.WechatMetaBean; import com.enongm.dianji.payment.wechat.v3.model.WechatMetaBean;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;

4
payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/HeaderFilter.java
View File

@@ -1,8 +1,8 @@
package com.enongm.dianji.payment.wechat.v3.filter; package com.enongm.dianji.payment.wechat.v3.filter;
import com.enongm.dianji.payment.wechat.PayFilter; import com.enongm.dianji.payment.wechat.v3.PayFilter;
import com.enongm.dianji.payment.wechat.PayFilterChain; import com.enongm.dianji.payment.wechat.v3.PayFilterChain;
import com.enongm.dianji.payment.wechat.v3.SignatureProvider; import com.enongm.dianji.payment.wechat.v3.SignatureProvider;
import com.enongm.dianji.payment.wechat.v3.WechatPayRequest; import com.enongm.dianji.payment.wechat.v3.WechatPayRequest;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;

5
payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/HttpRequestFilter.java
View File

@@ -1,8 +1,8 @@
package com.enongm.dianji.payment.wechat.v3.filter; package com.enongm.dianji.payment.wechat.v3.filter;
import com.enongm.dianji.payment.wechat.PayFilter; import com.enongm.dianji.payment.wechat.v3.PayFilter;
import com.enongm.dianji.payment.wechat.PayFilterChain; import com.enongm.dianji.payment.wechat.v3.PayFilterChain;
import com.enongm.dianji.payment.wechat.v3.SignatureProvider; import com.enongm.dianji.payment.wechat.v3.SignatureProvider;
import com.enongm.dianji.payment.wechat.v3.WechatPayRequest; import com.enongm.dianji.payment.wechat.v3.WechatPayRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -73,7 +73,6 @@ public class HttpRequestFilter implements PayFilter {
// 验证微信服务器签名 // 验证微信服务器签名
if (signatureProvider.responseSignVerify(wechatpaySerial, wechatpaySignature, wechatpayTimestamp, wechatpayNonce, body)) { if (signatureProvider.responseSignVerify(wechatpaySerial, wechatpaySignature, wechatpayTimestamp, wechatpayNonce, body)) {
;
Consumer<String> responseConsumer = request.getResponseBodyConsumer(); Consumer<String> responseConsumer = request.getResponseBodyConsumer();
if (Objects.nonNull(responseConsumer)) { if (Objects.nonNull(responseConsumer)) {
// 验证通过消费 // 验证通过消费

4
payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/WechatServerFilter.java
View File

@@ -1,8 +1,8 @@
package com.enongm.dianji.payment.wechat.v3.filter; package com.enongm.dianji.payment.wechat.v3.filter;
import com.enongm.dianji.payment.wechat.PayFilter; import com.enongm.dianji.payment.wechat.v3.PayFilter;
import com.enongm.dianji.payment.wechat.PayFilterChain; import com.enongm.dianji.payment.wechat.v3.PayFilterChain;
import com.enongm.dianji.payment.wechat.enumeration.V3PayType; import com.enongm.dianji.payment.wechat.enumeration.V3PayType;
import com.enongm.dianji.payment.wechat.enumeration.WeChatServer; import com.enongm.dianji.payment.wechat.enumeration.WeChatServer;
import com.enongm.dianji.payment.wechat.v3.WechatPayRequest; import com.enongm.dianji.payment.wechat.v3.WechatPayRequest;