From f187a420dbb7310afc58b0beb7e4fca21d65c1d5 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Sun, 12 Mar 2023 08:05:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E5=91=BD=E5=90=8D=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9=E5=8F=82=E6=95=B0=20"Endpoints"=20=E2=86=92?= =?UTF-8?q?=20"Endpoint"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WechatAdsClient.cs | 2 +- .../WechatAdsClientOptions.cs | 6 +++--- .../WechatApiClient.cs | 2 +- .../WechatApiClientOptions.cs | 4 ++-- .../WechatOpenAIClient.cs | 2 +- .../WechatOpenAIClientOptions.cs | 6 +++--- ...ssClientExecuteMSEPayAccountsExtensions.cs | 3 ++- .../WechatTenpayBusinessClient.cs | 2 +- .../WechatTenpayBusinessClientOptions.cs | 4 ++-- ...echatTenpayClientExecuteFraudExtensions.cs | 3 ++- .../WechatTenpayClient.cs | 2 +- .../WechatTenpayClientOptions.cs | 4 ++-- ...WechatTenpayClientExecuteBillExtensions.cs | 3 ++- ...tTenpayClientExecuteHKCustomsExtensions.cs | 10 +++++----- ...enpayClientExecuteHKMerchantsExtensions.cs | 8 ++++---- ...yClientExecuteHKPartnerRefundExtensions.cs | 6 +++--- ...tExecuteHKPartnerTransactionsExtensions.cs | 20 +++++++++---------- ...atTenpayClientExecuteHKRefundExtensions.cs | 6 +++--- ...ayClientExecuteHKTransactionsExtensions.cs | 16 +++++++-------- ...yClientExecuteMerchantServiceExtensions.cs | 1 + .../WechatTenpayClient.cs | 2 +- .../WechatTenpayClientOptions.cs | 4 ++-- .../WechatWorkClient.cs | 2 +- .../WechatWorkClientOptions.cs | 6 +++--- 24 files changed, 64 insertions(+), 60 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClient.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClient.cs index bfba543a..405a3d4b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClient.cs @@ -27,7 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads Credentials = new Settings.Credentials(options); - FlurlClient.BaseUrl = options.Endpoints ?? WechatAdsEndpoints.DEFAULT; + FlurlClient.BaseUrl = options.Endpoint ?? WechatAdsEndpoints.DEFAULT; FlurlClient.WithTimeout(TimeSpan.FromMilliseconds(options.Timeout)); Interceptors.Add(new Interceptors.WechatAdsRequestAgencyTokenInterceptor( diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClientOptions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClientOptions.cs index 68779540..2a63ba51 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClientOptions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClientOptions.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Ads +namespace SKIT.FlurlHttpClient.Wechat.Ads { /// /// 一个用于构造 时使用的配置项。 @@ -12,10 +12,10 @@ public int Timeout { get; set; } = 30 * 1000; /// - /// 获取或设置微信广告平台 API 域名。 + /// 获取或设置微信广告平台 API 入口点。 /// 默认值： /// - public string Endpoints { get; set; } = WechatAdsEndpoints.DEFAULT; + public string Endpoint { get; set; } = WechatAdsEndpoints.DEFAULT; /// /// 获取或设置微信广告平台服务商 ID。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs index d07c8d9e..bb4a6de2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs @@ -27,7 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api Credentials = new Settings.Credentials(options); - FlurlClient.BaseUrl = options.Endpoints ?? WechatApiEndpoints.DEFAULT; + FlurlClient.BaseUrl = options.Endpoint ?? WechatApiEndpoints.DEFAULT; FlurlClient.WithTimeout(TimeSpan.FromMilliseconds(options.Timeout)); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClientOptions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClientOptions.cs index 1d944a03..8ea76b11 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClientOptions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClientOptions.cs @@ -12,10 +12,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api public int Timeout { get; set; } = 30 * 1000; /// - /// 获取或设置微信 API 域名。 + /// 获取或设置微信 API 入口点。 /// 默认值： /// - public string Endpoints { get; set; } = WechatApiEndpoints.DEFAULT; + public string Endpoint { get; set; } = WechatApiEndpoints.DEFAULT; /// /// 获取或设置微信 AppId。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClient.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClient.cs index 83e69373..b341a84b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClient.cs @@ -27,7 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI Credentials = new Settings.Credentials(options); - FlurlClient.BaseUrl = options.Endpoints ?? WechatOpenAIEndpoints.DEFAULT; + FlurlClient.BaseUrl = options.Endpoint ?? WechatOpenAIEndpoints.DEFAULT; FlurlClient.WithTimeout(TimeSpan.FromMilliseconds(options.Timeout)); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClientOptions.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClientOptions.cs index 6bbde543..e16c921f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClientOptions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClientOptions.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.OpenAI +namespace SKIT.FlurlHttpClient.Wechat.OpenAI { /// /// 一个用于构造 时使用的配置项。 @@ -12,10 +12,10 @@ public int Timeout { get; set; } = 30 * 1000; /// - /// 获取或设置微信智能对话 API 域名。 + /// 获取或设置微信智能对话 API 入口点。 /// 默认值： /// - public string Endpoints { get; set; } = WechatOpenAIEndpoints.DEFAULT; + public string Endpoint { get; set; } = WechatOpenAIEndpoints.DEFAULT; /// /// 获取或设置微信智能对话 AppId。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientExecuteMSEPayAccountsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientExecuteMSEPayAccountsExtensions.cs index d97dc2f6..c729559e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientExecuteMSEPayAccountsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientExecuteMSEPayAccountsExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net.Http; using System.Threading; using System.Threading.Tasks; @@ -28,6 +28,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness /// /// 异步调用 [GET] /{download_url} 接口。 + /// （请注意此接口不受构造 时指定的 参数控制。） /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessClient.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessClient.cs index 006845d0..967f7974 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessClient.cs @@ -42,7 +42,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness AutoEncryptRequestSensitiveProperty = options.AutoEncryptRequestSensitiveProperty; AutoDecryptResponseSensitiveProperty = options.AutoDecryptResponseSensitiveProperty; - FlurlClient.BaseUrl = options.Endpoints ?? WechatTenpayBusinessEndpoints.DEFAULT; + FlurlClient.BaseUrl = options.Endpoint ?? WechatTenpayBusinessEndpoints.DEFAULT; FlurlClient.Headers.Remove(FlurlHttpClient.Constants.HttpHeaders.Accept); FlurlClient.Headers.Remove(FlurlHttpClient.Constants.HttpHeaders.AcceptLanguage); FlurlClient.WithHeader(FlurlHttpClient.Constants.HttpHeaders.Accept, "application/json"); diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessClientOptions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessClientOptions.cs index 87414abc..050b1a8e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessClientOptions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessClientOptions.cs @@ -12,10 +12,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness public int Timeout { get; set; } = 30 * 1000; /// - /// 获取或设置腾讯微企付 API 域名。 + /// 获取或设置腾讯微企付 API 入口点。 /// 默认值： /// - public string Endpoints { get; set; } = WechatTenpayBusinessEndpoints.DEFAULT; + public string Endpoint { get; set; } = WechatTenpayBusinessEndpoints.DEFAULT; /// /// 获取或设置腾讯微企付 API 签名认证方式。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFraudExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFraudExtensions.cs index cf1beff0..c10a5190 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFraudExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFraudExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net.Http; using System.Threading; using System.Threading.Tasks; @@ -11,6 +11,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// /// 异步调用 [POST] /risk/getpublickey 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/tools/mch_pay_yhk.php?chapter=24_7&index=4 + /// （请注意此接口不受构造 时指定的 参数控制。） /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayClient.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayClient.cs index 5cf5accf..3d339768 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayClient.cs @@ -28,7 +28,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 Credentials = new Settings.Credentials(options); - FlurlClient.BaseUrl = options.Endpoints ?? WechatTenpayEndpoints.DEFAULT; + FlurlClient.BaseUrl = options.Endpoint ?? WechatTenpayEndpoints.DEFAULT; FlurlClient.WithTimeout(TimeSpan.FromMilliseconds(options.Timeout)); FlurlClient.Configure((settings) => settings.HttpClientFactory = new Settings.HttpClientFactory( diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayClientOptions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayClientOptions.cs index c2410798..455097bc 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayClientOptions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayClientOptions.cs @@ -12,10 +12,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 public int Timeout { get; set; } = 30 * 1000; /// - /// 获取或设置微信支付 API 域名。 + /// 获取或设置微信支付 API 入口点。 /// 默认值： /// - public string Endpoints { get; set; } = WechatTenpayEndpoints.DEFAULT; + public string Endpoint { get; set; } = WechatTenpayEndpoints.DEFAULT; /// /// 获取或设置微信商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBillExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBillExtensions.cs index 8fd0c123..3a1f034c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBillExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBillExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net.Http; using System.Threading; using System.Threading.Tasks; @@ -143,6 +143,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter8_1_12.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pay/transfer/chapter4_3.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pay/transfer_partner/chapter4_3.shtml + /// （请注意此接口不受构造 时指定的 参数控制。） /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKCustomsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKCustomsExtensions.cs index a52db062..02108180 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKCustomsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKCustomsExtensions.cs @@ -14,7 +14,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [POST] /customs/orders 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/declarecustom/chapter3_1.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -37,7 +37,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [GET] /customs/orders 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/declarecustom/chapter3_1.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -71,7 +71,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [POST] /customs/redeclare 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/declarecustom/chapter3_4.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -94,7 +94,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [PATCH] /customs/orders 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/declarecustom/chapter3_5.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -117,7 +117,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [POST] /customs/verify-certificate 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/declarecustom/chapter3_2.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKMerchantsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKMerchantsExtensions.cs index 298e2669..85e84cb1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKMerchantsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKMerchantsExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net.Http; using System.Threading; using System.Threading.Tasks; @@ -14,7 +14,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [POST] /merchants 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/Onborading_Sub_Merchant/chapter3_1.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -38,7 +38,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [GET] /merchants/{sub_mchid} 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/Onborading%20Sub%20Merchant/chapter3_2.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -63,7 +63,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [PUT] /merchants 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/Onborading_Sub_Merchant/chapter3_3.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerRefundExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerRefundExtensions.cs index d353440f..dad0b37b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerRefundExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerRefundExtensions.cs @@ -20,7 +20,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter8_2.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter8_2.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/QuickPay/chapter8_2.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -48,7 +48,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter8_3.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter8_3.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/QuickPay/chapter8_3.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -78,7 +78,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter8_3.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter8_3.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/QuickPay/chapter8_3.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerTransactionsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerTransactionsExtensions.cs index e02af792..70ef0d7e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerTransactionsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerTransactionsExtensions.cs @@ -14,7 +14,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [POST] /transactions/app 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/In-AppPay/chapter6_3.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -37,7 +37,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [POST] /transactions/mweb 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/H5Payment/chapter3_3.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -61,7 +61,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// 异步调用 [POST] /transactions/jsapi 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/OfficialPayMent/chapter5_4.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter7_3.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -84,7 +84,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [POST] /transactions/native 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter4_3.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -112,7 +112,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter8_1.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter8_1.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/QuickPay/chapter8_1.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -142,7 +142,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter8_1.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter8_1.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/QuickPay/chapter8_1.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -171,7 +171,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/OfficialPayMent/chapter8_6.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter8_6.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter8_6.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -196,7 +196,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [POST] /transactions/out-trade-no/{out_trade_no}/reverse 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/QuickPay/chapter3_4.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -226,7 +226,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter8_5.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter8_5.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/QuickPay/chapter8_5.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -255,7 +255,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter8_12.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter8_12.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/QuickPay/chapter8_12.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKRefundExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKRefundExtensions.cs index f7fc3691..a8866503 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKRefundExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKRefundExtensions.cs @@ -20,7 +20,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter8_2.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter8_2.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/QuickPay/chapter8_2.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -48,7 +48,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter8_3.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter8_3.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/QuickPay/chapter8_3.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -77,7 +77,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter8_3.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter8_3.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/QuickPay/chapter8_3.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKTransactionsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKTransactionsExtensions.cs index 62b7620e..d0b43da6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKTransactionsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKTransactionsExtensions.cs @@ -14,7 +14,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [POST] /transactions/app 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/In-AppPay/chapter6_3.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -37,7 +37,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [POST] /transactions/mweb 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/H5Payment/chapter3_3.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -61,7 +61,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// 异步调用 [POST] /transactions/jsapi 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/OfficialPayMent/chapter5_4.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter7_3.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -84,7 +84,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [POST] /transactions/native 接口。 /// REF: https://https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter4_3.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -112,7 +112,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter8_1.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter8_1.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/QuickPay/chapter8_1.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -141,7 +141,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter8_1.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter8_1.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/QuickPay/chapter8_1.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -169,7 +169,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/OfficialPayMent/chapter8_6.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/MiniProgramPay/chapter8_6.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/NativePay/chapter8_6.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// @@ -193,7 +193,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// /// 异步调用 [POST] /transactions/out-trade-no/{out_trade_no}/reverse 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/wxpay/en/fusion_wallet/QuickPay/chapter3_4.shtml - /// （请注意调用此接口需在构造 时指定特殊的 。） + /// （请注意调用此接口需在构造 时指定单独的 。） /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs index d886b6b9..572a5dda 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs @@ -269,6 +269,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// 异步调用 [GET] /{download_url} 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter10_2_18.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter10_2_18.shtml + /// （请注意此接口不受构造 时指定的 参数控制。） /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClient.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClient.cs index 50805660..5655e756 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClient.cs @@ -46,7 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 AutoEncryptRequestSensitiveProperty = options.AutoEncryptRequestSensitiveProperty; AutoDecryptResponseSensitiveProperty = options.AutoDecryptResponseSensitiveProperty; - FlurlClient.BaseUrl = options.Endpoints ?? WechatTenpayEndpoints.DEFAULT; + FlurlClient.BaseUrl = options.Endpoint ?? WechatTenpayEndpoints.DEFAULT; FlurlClient.Headers.Remove(FlurlHttpClient.Constants.HttpHeaders.Accept); FlurlClient.Headers.Remove(FlurlHttpClient.Constants.HttpHeaders.AcceptLanguage); FlurlClient.Headers.Remove(FlurlHttpClient.Constants.HttpHeaders.UserAgent); diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClientOptions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClientOptions.cs index 929a2aeb..95d877e1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClientOptions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClientOptions.cs @@ -15,10 +15,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 public int Timeout { get; set; } = 30 * 1000; /// - /// 获取或设置微信支付 API 域名。 + /// 获取或设置微信支付 API 入口点。 /// 默认值： /// - public string Endpoints { get; set; } = WechatTenpayEndpoints.DEFAULT; + public string Endpoint { get; set; } = WechatTenpayEndpoints.DEFAULT; /// /// 获取或设置客户端用户代理。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs index db27c871..f31a75fc 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs @@ -27,7 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work Credentials = new Settings.Credentials(options); - FlurlClient.BaseUrl = options.Endpoints ?? WechatWorkEndpoints.DEFAULT; + FlurlClient.BaseUrl = options.Endpoint ?? WechatWorkEndpoints.DEFAULT; FlurlClient.WithTimeout(TimeSpan.FromMilliseconds(options.Timeout)); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClientOptions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClientOptions.cs index 385bdcca..808c292f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClientOptions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClientOptions.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work +namespace SKIT.FlurlHttpClient.Wechat.Work { /// /// 一个用于构造 时使用的配置项。 @@ -12,10 +12,10 @@ public int Timeout { get; set; } = 30 * 1000; /// - /// 获取或设置企业微信 API 域名。 + /// 获取或设置企业微信 API 入口点。 /// 默认值： /// - public string Endpoints { get; set; } = WechatWorkEndpoints.DEFAULT; + public string Endpoint { get; set; } = WechatWorkEndpoints.DEFAULT; /// /// 获取或设置企业微信 CorpId。