From 8bb2acf6322c9d8e36ce2b1c9bf5df4c5ce390c7 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 9 Jul 2023 21:25:20 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E9=87=8D=E6=9E=84=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java | 2 ++ .../github/binarywang/wxpay/bean/notify/SignatureHeader.java | 2 ++ .../v3}/ProfitSharingBillRequest.java | 2 +- .../v3}/ProfitSharingBillResult.java | 2 +- .../v3}/ProfitSharingMerchantMaxRatioQueryResult.java | 2 +- .../v3}/ProfitSharingNotifyData.java | 2 +- .../v3}/ProfitSharingNotifyResult.java | 2 +- .../v3}/ProfitSharingReceiver.java | 2 +- .../v3}/ProfitSharingRequest.java | 2 +- .../v3}/ProfitSharingResult.java | 2 +- .../v3}/ProfitSharingReturnRequest.java | 2 +- .../v3}/ProfitSharingReturnResult.java | 2 +- .../v3}/ProfitSharingUnfreezeRequest.java | 2 +- .../v3}/ProfitSharingUnfreezeResult.java | 2 +- .../v3}/ProfitSharingUnsplitResult.java | 2 +- .../github/binarywang/wxpay/service/ProfitSharingV3Service.java | 2 +- .../wxpay/service/impl/ProfitSharingV3ServiceImpl.java | 2 +- 17 files changed, 19 insertions(+), 15 deletions(-) rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{profitsharingV3 => profitsharing/v3}/ProfitSharingBillRequest.java (95%) rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{profitsharingV3 => profitsharing/v3}/ProfitSharingBillResult.java (96%) rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{profitsharingV3 => profitsharing/v3}/ProfitSharingMerchantMaxRatioQueryResult.java (91%) rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{profitsharingV3 => profitsharing/v3}/ProfitSharingNotifyData.java (97%) rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{profitsharingV3 => profitsharing/v3}/ProfitSharingNotifyResult.java (97%) rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{profitsharingV3 => profitsharing/v3}/ProfitSharingReceiver.java (98%) rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{profitsharingV3 => profitsharing/v3}/ProfitSharingRequest.java (97%) rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{profitsharingV3 => profitsharing/v3}/ProfitSharingResult.java (98%) rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{profitsharingV3 => profitsharing/v3}/ProfitSharingReturnRequest.java (97%) rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{profitsharingV3 => profitsharing/v3}/ProfitSharingReturnResult.java (98%) rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{profitsharingV3 => profitsharing/v3}/ProfitSharingUnfreezeRequest.java (96%) rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{profitsharingV3 => profitsharing/v3}/ProfitSharingUnfreezeResult.java (98%) rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{profitsharingV3 => profitsharing/v3}/ProfitSharingUnsplitResult.java (93%) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java index 7d894fcd8..498a788c0 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java @@ -10,6 +10,8 @@ import java.io.Serializable; /** * 微信通知接口头部信息，需要做签名验证 * 文档地址: https://wechatpay-api.gitbook.io/wechatpay-api-v3/qian-ming-zhi-nan-1/qian-ming-yan-zheng + * + * @author cloudX */ @Data @Builder diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/SignatureHeader.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/SignatureHeader.java index daa6d6e72..cd1fbc42d 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/SignatureHeader.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/SignatureHeader.java @@ -10,6 +10,8 @@ import java.io.Serializable; /** * 微信通知接口头部信息，需要做签名验证 * 文档地址: https://pay.weixin.qq.com/wiki/doc/apiv3/wechatpay/wechatpay4_1.shtml + * + * @author thinstar */ @Data @Builder diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingBillRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingBillRequest.java similarity index 95% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingBillRequest.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingBillRequest.java index 143c55b69..1eaebbacb 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingBillRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingBillRequest.java @@ -1,4 +1,4 @@ -package com.github.binarywang.wxpay.bean.profitsharingV3; +package com.github.binarywang.wxpay.bean.profitsharing.v3; import java.io.Serializable; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingBillResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingBillResult.java similarity index 96% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingBillResult.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingBillResult.java index 7388868bd..d9d9ca824 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingBillResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingBillResult.java @@ -1,4 +1,4 @@ -package com.github.binarywang.wxpay.bean.profitsharingV3; +package com.github.binarywang.wxpay.bean.profitsharing.v3; import java.io.Serializable; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingMerchantMaxRatioQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingMerchantMaxRatioQueryResult.java similarity index 91% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingMerchantMaxRatioQueryResult.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingMerchantMaxRatioQueryResult.java index ec5ed92d5..8772d3cd1 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingMerchantMaxRatioQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingMerchantMaxRatioQueryResult.java @@ -1,4 +1,4 @@ -package com.github.binarywang.wxpay.bean.profitsharingV3; +package com.github.binarywang.wxpay.bean.profitsharing.v3; import java.io.Serializable; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingNotifyData.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingNotifyData.java similarity index 97% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingNotifyData.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingNotifyData.java index 7e67120e3..8e3dec271 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingNotifyData.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingNotifyData.java @@ -1,4 +1,4 @@ -package com.github.binarywang.wxpay.bean.profitsharingV3; +package com.github.binarywang.wxpay.bean.profitsharing.v3; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingNotifyResult.java similarity index 97% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingNotifyResult.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingNotifyResult.java index d72c1277b..238561a7a 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingNotifyResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingNotifyResult.java @@ -1,4 +1,4 @@ -package com.github.binarywang.wxpay.bean.profitsharingV3; +package com.github.binarywang.wxpay.bean.profitsharing.v3; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingReceiver.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingReceiver.java similarity index 98% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingReceiver.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingReceiver.java index 941785842..0ed3c4ecf 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingReceiver.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingReceiver.java @@ -1,4 +1,4 @@ -package com.github.binarywang.wxpay.bean.profitsharingV3; +package com.github.binarywang.wxpay.bean.profitsharing.v3; import com.github.binarywang.wxpay.v3.SpecEncrypt; import com.google.gson.annotations.SerializedName; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingRequest.java similarity index 97% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingRequest.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingRequest.java index 1d502749e..5bcf30f8b 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingRequest.java @@ -1,4 +1,4 @@ -package com.github.binarywang.wxpay.bean.profitsharingV3; +package com.github.binarywang.wxpay.bean.profitsharing.v3; import com.github.binarywang.wxpay.v3.SpecEncrypt; import com.google.gson.annotations.SerializedName; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingResult.java similarity index 98% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingResult.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingResult.java index 05ad9c25b..1891e692f 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingResult.java @@ -1,4 +1,4 @@ -package com.github.binarywang.wxpay.bean.profitsharingV3; +package com.github.binarywang.wxpay.bean.profitsharing.v3; import com.google.gson.annotations.SerializedName; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingReturnRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingReturnRequest.java similarity index 97% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingReturnRequest.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingReturnRequest.java index a35a08964..6cbeed241 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingReturnRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingReturnRequest.java @@ -1,4 +1,4 @@ -package com.github.binarywang.wxpay.bean.profitsharingV3; +package com.github.binarywang.wxpay.bean.profitsharing.v3; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingReturnResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingReturnResult.java similarity index 98% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingReturnResult.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingReturnResult.java index a6e43d4f3..d862454ab 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingReturnResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingReturnResult.java @@ -1,4 +1,4 @@ -package com.github.binarywang.wxpay.bean.profitsharingV3; +package com.github.binarywang.wxpay.bean.profitsharing.v3; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingUnfreezeRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingUnfreezeRequest.java similarity index 96% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingUnfreezeRequest.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingUnfreezeRequest.java index 6167c8a3e..946919c22 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingUnfreezeRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingUnfreezeRequest.java @@ -1,4 +1,4 @@ -package com.github.binarywang.wxpay.bean.profitsharingV3; +package com.github.binarywang.wxpay.bean.profitsharing.v3; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingUnfreezeResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingUnfreezeResult.java similarity index 98% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingUnfreezeResult.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingUnfreezeResult.java index d79573c83..7e48859f7 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingUnfreezeResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingUnfreezeResult.java @@ -1,4 +1,4 @@ -package com.github.binarywang.wxpay.bean.profitsharingV3; +package com.github.binarywang.wxpay.bean.profitsharing.v3; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingUnsplitResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingUnsplitResult.java similarity index 93% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingUnsplitResult.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingUnsplitResult.java index 1e50a87b4..49474bd14 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharingV3/ProfitSharingUnsplitResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/v3/ProfitSharingUnsplitResult.java @@ -1,4 +1,4 @@ -package com.github.binarywang.wxpay.bean.profitsharingV3; +package com.github.binarywang.wxpay.bean.profitsharing.v3; import com.google.gson.annotations.SerializedName; import lombok.Data; 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 054d46e7a..af0276d92 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,7 +1,7 @@ package com.github.binarywang.wxpay.service; import com.github.binarywang.wxpay.bean.notify.SignatureHeader; -import com.github.binarywang.wxpay.bean.profitsharingV3.*; +import com.github.binarywang.wxpay.bean.profitsharing.v3.*; import com.github.binarywang.wxpay.exception.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 b569536f7..e64559980 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,7 +1,7 @@ package com.github.binarywang.wxpay.service.impl; import com.github.binarywang.wxpay.bean.notify.SignatureHeader; -import com.github.binarywang.wxpay.bean.profitsharingV3.*; +import com.github.binarywang.wxpay.bean.profitsharing.v3.*; import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.ProfitSharingV3Service; import com.github.binarywang.wxpay.service.WxPayService;