Skip to content

Commit acdc13a

Browse files
committed
feat(tenpayv3): WechatTenpayGlobalClient 不再继承自 WechatTenpayClient
1 parent 827a32e commit acdc13a

12 files changed

Lines changed: 101 additions & 61 deletions
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
using System.Reflection;
2+
3+
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Constants
4+
{
5+
internal class AssemblyProps
6+
{
7+
public static readonly string VERSION = Assembly.GetAssembly(typeof(AssemblyProps))!.GetName()!.Version!.ToString();
8+
}
9+
}

src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientEventDecryptionExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static WechatTenpayGlobalEvent DeserializeEvent(this WechatTenpayGlobalCl
2828
public static T DecryptEventResource<T>(this WechatTenpayGlobalClient client, WechatTenpayGlobalEvent webhookEvent)
2929
where T : WechatTenpayGlobalEvent.Types.IDecryptedResource, new()
3030
{
31-
return WechatTenpayClientEventDecryptionExtensions.DecryptEventResource<T>(client, webhookEvent.Resource);
31+
return WechatTenpayClientEventDecryptionExtensions.DecryptEventResource<T>(client.ProxyClient, webhookEvent.Resource);
3232
}
3333

3434
/// <summary>
@@ -41,7 +41,7 @@ public static T DecryptEventResource<T>(this WechatTenpayGlobalClient client, We
4141
public static T DecryptEventResource<T>(this WechatTenpayGlobalClient client, WechatTenpayGlobalEvent.Types.Resource webhookEventResource)
4242
where T : WechatTenpayGlobalEvent.Types.IDecryptedResource, new()
4343
{
44-
return WechatTenpayClientEventDecryptionExtensions.DecryptEventResource<T>(client, webhookEventResource);
44+
return WechatTenpayClientEventDecryptionExtensions.DecryptEventResource<T>(client.ProxyClient, webhookEventResource);
4545
}
4646
}
4747
}

src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientEventVerificationExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static class WechatTenpayGlobalClientEventVerificationExtensions
2323
/// <returns></returns>
2424
public static ErroredResult VerifyEventSignature(this WechatTenpayGlobalClient client, string webhookTimestamp, string webhookNonce, string webhookBody, string webhookSignature, string webhookSerialNumber)
2525
{
26-
return WechatTenpayClientEventVerificationExtensions.VerifyEventSignature(client, webhookTimestamp, webhookNonce, webhookBody, webhookSignature, webhookSerialNumber);
26+
return WechatTenpayClientEventVerificationExtensions.VerifyEventSignature(client.ProxyClient, webhookTimestamp, webhookNonce, webhookBody, webhookSignature, webhookSerialNumber);
2727
}
2828

2929
/// <summary>
@@ -43,7 +43,7 @@ public static ErroredResult VerifyEventSignature(this WechatTenpayGlobalClient c
4343
/// <returns></returns>
4444
public static ErroredResult VerifyEventSignature(this WechatTenpayGlobalClient client, string webhookTimestamp, string webhookNonce, string webhookBody, string webhookSignature, string webhookSignatureType, string webhookSerialNumber)
4545
{
46-
return WechatTenpayClientEventVerificationExtensions.VerifyEventSignature(client, webhookTimestamp, webhookNonce, webhookBody, webhookSignature, webhookSignatureType, webhookSerialNumber);
46+
return WechatTenpayClientEventVerificationExtensions.VerifyEventSignature(client.ProxyClient, webhookTimestamp, webhookNonce, webhookBody, webhookSignature, webhookSignatureType, webhookSerialNumber);
4747
}
4848

4949
/// <summary>
@@ -63,7 +63,7 @@ public static ErroredResult VerifyEventSignature(this WechatTenpayGlobalClient c
6363
/// <returns></returns>
6464
public static Task<ErroredResult> VerifyEventSignatureAsync(this WechatTenpayGlobalClient client, string webhookTimestamp, string webhookNonce, string webhookBody, string webhookSignature, string webhookSerialNumber, CancellationToken cancellationToken = default)
6565
{
66-
return WechatTenpayClientEventVerificationExtensions.VerifyEventSignatureAsync(client, webhookTimestamp, webhookNonce, webhookBody, webhookSignature, webhookSerialNumber, cancellationToken);
66+
return WechatTenpayClientEventVerificationExtensions.VerifyEventSignatureAsync(client.ProxyClient, webhookTimestamp, webhookNonce, webhookBody, webhookSignature, webhookSerialNumber, cancellationToken);
6767
}
6868

6969
/// <summary>
@@ -84,7 +84,7 @@ public static Task<ErroredResult> VerifyEventSignatureAsync(this WechatTenpayGlo
8484
/// <returns></returns>
8585
public static Task<ErroredResult> VerifyEventSignatureAsync(this WechatTenpayGlobalClient client, string webhookTimestamp, string webhookNonce, string webhookBody, string webhookSignature, string webhookSignatureType, string webhookSerialNumber, CancellationToken cancellationToken = default)
8686
{
87-
return WechatTenpayClientEventVerificationExtensions.VerifyEventSignatureAsync(client, webhookTimestamp, webhookNonce, webhookBody, webhookSignature, webhookSignatureType, webhookSerialNumber, cancellationToken);
87+
return WechatTenpayClientEventVerificationExtensions.VerifyEventSignatureAsync(client.ProxyClient, webhookTimestamp, webhookNonce, webhookBody, webhookSignature, webhookSignatureType, webhookSerialNumber, cancellationToken);
8888
}
8989
}
9090
}

src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCertificatesExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static class WechatTenpayGlobalClientExecuteCertificatesExtensions
3030
if (client is null) throw new ArgumentNullException(nameof(client));
3131
if (request is null) throw new ArgumentNullException(nameof(request));
3232

33-
IFlurlRequest flurlReq = client
33+
IFlurlRequest flurlReq = client.ProxyClient
3434
.CreateFlurlRequest(request, HttpMethod.Get, "certificates");
3535

3636
return await client.SendFlurlRequestAsJsonAsync<Models.QueryCertificatesResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);

src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePartnerTransactionsExtensions.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static class WechatTenpayGlobalClientExecutePartnerTransactionsExtensions
3030
IFlurlRequest flurlReq = client
3131
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "app");
3232

33-
return await ((WechatTenpayClient)client).SendFlurlRequestAsJsonAsync<Models.CreatePartnerTransactionAppResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
33+
return await client.ProxyClient.SendFlurlRequestAsJsonAsync<Models.CreatePartnerTransactionAppResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
3434
}
3535

3636
/// <summary>
@@ -81,7 +81,7 @@ public static class WechatTenpayGlobalClientExecutePartnerTransactionsExtensions
8181
IFlurlRequest flurlReq = client
8282
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "jsapi");
8383

84-
return await ((WechatTenpayClient)client).SendFlurlRequestAsJsonAsync<Models.CreatePartnerTransactionJsapiResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
84+
return await client.ProxyClient.SendFlurlRequestAsJsonAsync<Models.CreatePartnerTransactionJsapiResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
8585
}
8686

8787
/// <summary>
@@ -106,7 +106,7 @@ public static class WechatTenpayGlobalClientExecutePartnerTransactionsExtensions
106106
IFlurlRequest flurlReq = client
107107
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "native");
108108

109-
return await ((WechatTenpayClient)client).SendFlurlRequestAsJsonAsync<Models.CreatePartnerTransactionNativeResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
109+
return await client.ProxyClient.SendFlurlRequestAsJsonAsync<Models.CreatePartnerTransactionNativeResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
110110
}
111111

112112
/// <summary>
@@ -158,7 +158,7 @@ public static class WechatTenpayGlobalClientExecutePartnerTransactionsExtensions
158158
if (request.MerchantId is null)
159159
request.MerchantId = client.Credentials.MerchantId;
160160

161-
IFlurlRequest flurlReq = client
161+
IFlurlRequest flurlReq = client.ProxyClient
162162
.CreateFlurlRequest(request, HttpMethod.Get, "transactions", "out-trade-no", request.OutTradeNumber)
163163
.SetQueryParam("sp_mchid", request.MerchantId)
164164
.SetQueryParam("sub_mchid", request.SubMerchantId);
@@ -190,7 +190,7 @@ public static class WechatTenpayGlobalClientExecutePartnerTransactionsExtensions
190190
if (request.MerchantId is null)
191191
request.MerchantId = client.Credentials.MerchantId;
192192

193-
IFlurlRequest flurlReq = client
193+
IFlurlRequest flurlReq = client.ProxyClient
194194
.CreateFlurlRequest(request, HttpMethod.Get, "transactions", "id", request.TransactionId)
195195
.SetQueryParam("sp_mchid", request.MerchantId)
196196
.SetQueryParam("sub_mchid", request.SubMerchantId);
@@ -221,7 +221,7 @@ public static class WechatTenpayGlobalClientExecutePartnerTransactionsExtensions
221221
if (request.MerchantId is null)
222222
request.MerchantId = client.Credentials.MerchantId;
223223

224-
IFlurlRequest flurlReq = client
224+
IFlurlRequest flurlReq = client.ProxyClient
225225
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "out-trade-no", request.OutTradeNumber, "close");
226226

227227
return await client.SendFlurlRequestAsJsonAsync<Models.ClosePartnerTransactionResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
@@ -246,7 +246,7 @@ public static class WechatTenpayGlobalClientExecutePartnerTransactionsExtensions
246246
if (request.MerchantId is null)
247247
request.MerchantId = client.Credentials.MerchantId;
248248

249-
IFlurlRequest flurlReq = client
249+
IFlurlRequest flurlReq = client.ProxyClient
250250
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "out-trade-no", request.OutTradeNumber, "reverse")
251251
.SetQueryParam("sp_mchid", request.MerchantId)
252252
.SetQueryParam("sub_mchid", request.SubMerchantId);

src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteTransactionsExtensions.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static class WechatTenpayGlobalClientExecuteTransactionsExtensions
3030
IFlurlRequest flurlReq = client
3131
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "app");
3232

33-
return await ((WechatTenpayClient)client).SendFlurlRequestAsJsonAsync<Models.CreateTransactionAppResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
33+
return await client.ProxyClient.SendFlurlRequestAsJsonAsync<Models.CreateTransactionAppResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
3434
}
3535

3636
/// <summary>
@@ -55,7 +55,7 @@ public static class WechatTenpayGlobalClientExecuteTransactionsExtensions
5555
IFlurlRequest flurlReq = client
5656
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "mweb");
5757

58-
return await ((WechatTenpayClient)client).SendFlurlRequestAsJsonAsync<Models.CreateTransactionMWebResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
58+
return await client.ProxyClient.SendFlurlRequestAsJsonAsync<Models.CreateTransactionMWebResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
5959
}
6060

6161
/// <summary>
@@ -81,7 +81,7 @@ public static class WechatTenpayGlobalClientExecuteTransactionsExtensions
8181
IFlurlRequest flurlReq = client
8282
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "jsapi");
8383

84-
return await ((WechatTenpayClient)client).SendFlurlRequestAsJsonAsync<Models.CreateTransactionJsapiResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
84+
return await client.ProxyClient.SendFlurlRequestAsJsonAsync<Models.CreateTransactionJsapiResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
8585
}
8686

8787
/// <summary>
@@ -106,7 +106,7 @@ public static class WechatTenpayGlobalClientExecuteTransactionsExtensions
106106
IFlurlRequest flurlReq = client
107107
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "native");
108108

109-
return await ((WechatTenpayClient)client).SendFlurlRequestAsJsonAsync<Models.CreateTransactionNativeResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
109+
return await client.ProxyClient.SendFlurlRequestAsJsonAsync<Models.CreateTransactionNativeResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
110110
}
111111

112112
/// <summary>
@@ -158,7 +158,7 @@ public static class WechatTenpayGlobalClientExecuteTransactionsExtensions
158158
if (request.MerchantId is null)
159159
request.MerchantId = client.Credentials.MerchantId;
160160

161-
IFlurlRequest flurlReq = client
161+
IFlurlRequest flurlReq = client.ProxyClient
162162
.CreateFlurlRequest(request, HttpMethod.Get, "transactions", "out-trade-no", request.OutTradeNumber)
163163
.SetQueryParam("mchid", request.MerchantId);
164164

@@ -189,7 +189,7 @@ public static class WechatTenpayGlobalClientExecuteTransactionsExtensions
189189
if (request.MerchantId is null)
190190
request.MerchantId = client.Credentials.MerchantId;
191191

192-
IFlurlRequest flurlReq = client
192+
IFlurlRequest flurlReq = client.ProxyClient
193193
.CreateFlurlRequest(request, HttpMethod.Get, "transactions", "id", request.TransactionId)
194194
.SetQueryParam("mchid", request.MerchantId);
195195

@@ -219,7 +219,7 @@ public static class WechatTenpayGlobalClientExecuteTransactionsExtensions
219219
if (request.MerchantId is null)
220220
request.MerchantId = client.Credentials.MerchantId;
221221

222-
IFlurlRequest flurlReq = client
222+
IFlurlRequest flurlReq = client.ProxyClient
223223
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "out-trade-no", request.OutTradeNumber, "close");
224224

225225
return await client.SendFlurlRequestAsJsonAsync<Models.CloseTransactionResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
@@ -244,7 +244,7 @@ public static class WechatTenpayGlobalClientExecuteTransactionsExtensions
244244
if (request.MerchantId is null)
245245
request.MerchantId = client.Credentials.MerchantId;
246246

247-
IFlurlRequest flurlReq = client
247+
IFlurlRequest flurlReq = client.ProxyClient
248248
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "out-trade-no", request.OutTradeNumber, "reverse")
249249
.SetQueryParam("mchid", request.MerchantId);
250250

src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientParameterExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static class WechatTenpayGlobalClientParameterExtensions
1818
/// <returns></returns>
1919
public static IDictionary<string, string> GenerateParametersForJsapiPayRequest(this WechatTenpayGlobalClient client, string appId, string prepayId)
2020
{
21-
return WechatTenpayClientParameterExtensions.GenerateParametersForJsapiPayRequest(client, appId, prepayId);
21+
return WechatTenpayClientParameterExtensions.GenerateParametersForJsapiPayRequest(client.ProxyClient, appId, prepayId);
2222
}
2323

2424
/// <summary>
@@ -34,7 +34,7 @@ public static IDictionary<string, string> GenerateParametersForJsapiPayRequest(t
3434
/// <returns></returns>
3535
public static IDictionary<string, string> GenerateParametersForAppPayRequest(this WechatTenpayGlobalClient client, string appId, string prepayId)
3636
{
37-
return WechatTenpayClientParameterExtensions.GenerateParametersForAppPayRequest(client, appId, prepayId);
37+
return WechatTenpayClientParameterExtensions.GenerateParametersForAppPayRequest(client.ProxyClient, appId, prepayId);
3838
}
3939

4040
/// <summary>
@@ -51,7 +51,7 @@ public static IDictionary<string, string> GenerateParametersForAppPayRequest(thi
5151
/// <returns></returns>
5252
public static IDictionary<string, string> GenerateParametersForAppPayRequest(this WechatTenpayGlobalClient client, string merchantId, string appId, string prepayId)
5353
{
54-
return WechatTenpayClientParameterExtensions.GenerateParametersForAppPayRequest(client, merchantId, appId, prepayId);
54+
return WechatTenpayClientParameterExtensions.GenerateParametersForAppPayRequest(client.ProxyClient, merchantId, appId, prepayId);
5555
}
5656
}
5757
}

src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientRequestEncryptionExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static class WechatTenpayGlobalClientRequestEncryptionExtensions
1414
public static TRequest EncryptRequestSensitiveProperty<TRequest>(this WechatTenpayGlobalClient client, TRequest request)
1515
where TRequest : WechatTenpayGlobalRequest
1616
{
17-
return WechatTenpayClientRequestEncryptionExtensions.EncryptRequestSensitiveProperty<TRequest>(client, request);
17+
return WechatTenpayClientRequestEncryptionExtensions.EncryptRequestSensitiveProperty<TRequest>(client.ProxyClient, request);
1818
}
1919

2020
/// <summary>
@@ -27,7 +27,7 @@ public static TRequest EncryptRequestSensitiveProperty<TRequest>(this WechatTenp
2727
public static Task<TRequest> EncryptRequestSensitivePropertyAsync<TRequest>(this WechatTenpayGlobalClient client, TRequest request, CancellationToken cancellationToken = default)
2828
where TRequest : WechatTenpayGlobalRequest
2929
{
30-
return WechatTenpayClientRequestEncryptionExtensions.EncryptRequestSensitivePropertyAsync<TRequest>(client, request, cancellationToken);
30+
return WechatTenpayClientRequestEncryptionExtensions.EncryptRequestSensitivePropertyAsync<TRequest>(client.ProxyClient, request, cancellationToken);
3131
}
3232
}
3333
}

src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientResponseDecryptionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static TResponse DecryptResponseSensitiveProperty<TResponse>(this WechatT
6969
return (DecryptResponseSensitiveProperty(client, queryCertificatesResponse) as TResponse)!;
7070
}
7171

72-
return WechatTenpayClientResponseDecryptionExtensions.DecryptResponseSensitiveProperty(client, response);
72+
return WechatTenpayClientResponseDecryptionExtensions.DecryptResponseSensitiveProperty(client.ProxyClient, response);
7373
}
7474
}
7575
}

0 commit comments

Comments
 (0)