From 807e01d6b2483054a7160941c98e7dd0395a49c7 Mon Sep 17 00:00:00 2001 From: xiafang Date: Fri, 30 Oct 2020 08:53:45 +0800 Subject: [PATCH] bugfix --- .../dianji/payment/autoconfigure/WechatPayConfiguration.java | 4 ++-- .../payment/wechat/{ => v3}/DefaultPayFilterChain.java | 4 +--- .../dianji/payment/wechat/{ => v3}/KeyPairFactory.java | 2 +- .../com/enongm/dianji/payment/wechat/{ => v3}/PayFilter.java | 4 +--- .../dianji/payment/wechat/{ => v3}/PayFilterChain.java | 4 +--- .../dianji/payment/wechat/{ => v3}/WechatPayV3Service.java | 4 +--- .../dianji/payment/wechat/v3/filter/BodyMergeFilter.java | 4 ++-- .../enongm/dianji/payment/wechat/v3/filter/HeaderFilter.java | 4 ++-- .../dianji/payment/wechat/v3/filter/HttpRequestFilter.java | 5 ++--- .../dianji/payment/wechat/v3/filter/WechatServerFilter.java | 4 ++-- 10 files changed, 15 insertions(+), 24 deletions(-) rename payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/{ => v3}/DefaultPayFilterChain.java (84%) rename payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/{ => v3}/KeyPairFactory.java (97%) rename payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/{ => v3}/PayFilter.java (73%) rename payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/{ => v3}/PayFilterChain.java (76%) rename payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/{ => v3}/WechatPayV3Service.java (94%) diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/WechatPayConfiguration.java b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/WechatPayConfiguration.java index de428bd..f2871b1 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/WechatPayConfiguration.java +++ b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/WechatPayConfiguration.java @@ -1,8 +1,8 @@ package com.enongm.dianji.payment.autoconfigure; -import com.enongm.dianji.payment.wechat.KeyPairFactory; -import com.enongm.dianji.payment.wechat.WechatPayV3Service; +import com.enongm.dianji.payment.wechat.v3.KeyPairFactory; +import com.enongm.dianji.payment.wechat.v3.WechatPayV3Service; import com.enongm.dianji.payment.wechat.v2.WechatPayV2Service; import com.enongm.dianji.payment.wechat.v3.SignatureProvider; import com.enongm.dianji.payment.wechat.v3.model.WechatMetaBean; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/DefaultPayFilterChain.java b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/DefaultPayFilterChain.java similarity index 84% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/DefaultPayFilterChain.java rename to payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/DefaultPayFilterChain.java index f4d111c..e20cb20 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/DefaultPayFilterChain.java +++ b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/DefaultPayFilterChain.java @@ -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.List; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/KeyPairFactory.java b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/KeyPairFactory.java similarity index 97% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/KeyPairFactory.java rename to payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/KeyPairFactory.java index 7c16173..a9c729a 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/KeyPairFactory.java +++ b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/KeyPairFactory.java @@ -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; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/PayFilter.java b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/PayFilter.java similarity index 73% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/PayFilter.java rename to payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/PayFilter.java index 2989fa5..072aef9 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/PayFilter.java +++ b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/PayFilter.java @@ -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. * diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/PayFilterChain.java b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/PayFilterChain.java similarity index 76% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/PayFilterChain.java rename to payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/PayFilterChain.java index d3a4e0f..f685e50 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/PayFilterChain.java +++ b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/PayFilterChain.java @@ -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. * diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/WechatPayV3Service.java b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatPayV3Service.java similarity index 94% rename from payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/WechatPayV3Service.java rename to payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatPayV3Service.java index 6fa834a..b12d934 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/WechatPayV3Service.java +++ b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/WechatPayV3Service.java @@ -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.HeaderFilter; import com.enongm.dianji.payment.wechat.v3.filter.HttpRequestFilter; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/BodyMergeFilter.java b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/BodyMergeFilter.java index 28f612d..f4c2256 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/BodyMergeFilter.java +++ b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/BodyMergeFilter.java @@ -2,8 +2,8 @@ package com.enongm.dianji.payment.wechat.v3.filter; import com.enongm.dianji.payment.autoconfigure.WechatPayProperties; -import com.enongm.dianji.payment.wechat.PayFilter; -import com.enongm.dianji.payment.wechat.PayFilterChain; +import com.enongm.dianji.payment.wechat.v3.PayFilter; +import com.enongm.dianji.payment.wechat.v3.PayFilterChain; import com.enongm.dianji.payment.wechat.v3.WechatPayRequest; import com.enongm.dianji.payment.wechat.v3.model.WechatMetaBean; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/HeaderFilter.java b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/HeaderFilter.java index e208c8d..4aef6bc 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/HeaderFilter.java +++ b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/HeaderFilter.java @@ -1,8 +1,8 @@ package com.enongm.dianji.payment.wechat.v3.filter; -import com.enongm.dianji.payment.wechat.PayFilter; -import com.enongm.dianji.payment.wechat.PayFilterChain; +import com.enongm.dianji.payment.wechat.v3.PayFilter; +import com.enongm.dianji.payment.wechat.v3.PayFilterChain; import com.enongm.dianji.payment.wechat.v3.SignatureProvider; import com.enongm.dianji.payment.wechat.v3.WechatPayRequest; import okhttp3.HttpUrl; diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/HttpRequestFilter.java b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/HttpRequestFilter.java index 07f9f04..df04463 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/HttpRequestFilter.java +++ b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/HttpRequestFilter.java @@ -1,8 +1,8 @@ package com.enongm.dianji.payment.wechat.v3.filter; -import com.enongm.dianji.payment.wechat.PayFilter; -import com.enongm.dianji.payment.wechat.PayFilterChain; +import com.enongm.dianji.payment.wechat.v3.PayFilter; +import com.enongm.dianji.payment.wechat.v3.PayFilterChain; import com.enongm.dianji.payment.wechat.v3.SignatureProvider; import com.enongm.dianji.payment.wechat.v3.WechatPayRequest; import lombok.extern.slf4j.Slf4j; @@ -73,7 +73,6 @@ public class HttpRequestFilter implements PayFilter { // 验证微信服务器签名 if (signatureProvider.responseSignVerify(wechatpaySerial, wechatpaySignature, wechatpayTimestamp, wechatpayNonce, body)) { - ; Consumer responseConsumer = request.getResponseBodyConsumer(); if (Objects.nonNull(responseConsumer)) { // 验证通过消费 diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/WechatServerFilter.java b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/WechatServerFilter.java index efacc9a..a6e96fc 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/WechatServerFilter.java +++ b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/wechat/v3/filter/WechatServerFilter.java @@ -1,8 +1,8 @@ package com.enongm.dianji.payment.wechat.v3.filter; -import com.enongm.dianji.payment.wechat.PayFilter; -import com.enongm.dianji.payment.wechat.PayFilterChain; +import com.enongm.dianji.payment.wechat.v3.PayFilter; +import com.enongm.dianji.payment.wechat.v3.PayFilterChain; import com.enongm.dianji.payment.wechat.enumeration.V3PayType; import com.enongm.dianji.payment.wechat.enumeration.WeChatServer; import com.enongm.dianji.payment.wechat.v3.WechatPayRequest;