diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpPush/UnsubscribePushEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpPush/UnsubscribePushEvent.cs
index c397fb22..59d2ec04 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpPush/UnsubscribePushEvent.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpPush/UnsubscribePushEvent.cs
@@ -7,7 +7,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Events
/// 表示 EVENT.unsubscribe 事件的数据。
/// REF: https://developers.weixin.qq.com/doc/offiaccount/Message_Management/Receiving_event_pushes.html#%E5%85%B3%E6%B3%A8-%E5%8F%96%E6%B6%88%E5%85%B3%E6%B3%A8%E4%BA%8B%E4%BB%B6
///
- public class UnsubscribePushEvent : WechatApiEvent, WechatApiEvent.Types.IXmlSerializable
+ public class UnsubscribePushEvent : SubscribePushEvent, WechatApiEvent.Types.IXmlSerializable
{
}
}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinExpressExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinExpressExtensions.cs
index 1a5d08fa..fcdd04b3 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinExpressExtensions.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinExpressExtensions.cs
@@ -25,7 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
if (string.IsNullOrEmpty(request.DeliverySignature))
{
string plainText = $"{request.ShopId}{request.ShopOrderId}{client.ImmeDeliveryAppSecret}";
- request.DeliverySignature = Utilities.Sha1Util.Hash(plainText).ToLower();
+ request.DeliverySignature = Security.SHA1Utility.Hash(plainText).ToLower();
}
return request;
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMidasExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMidasExtensions.cs
index e51f9ee7..28d662cb 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMidasExtensions.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMidasExtensions.cs
@@ -47,7 +47,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
+ $"&org_loc={reqLoc}"
+ $"&method={method.ToUpper()}"
+ $"&secret={client.MidasAppKey}";
- request.Signature = Utilities.HmacSha256Util.Hash(client.MidasAppKey ?? string.Empty, plainText).ToLower();
+ request.Signature = Security.HMACSHA256Utility.Hash(client.MidasAppKey ?? string.Empty, plainText).ToLower();
}
return request;
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientParameterExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientParameterExtensions.cs
index 4a8d7a4a..dc51cee0 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientParameterExtensions.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientParameterExtensions.cs
@@ -18,7 +18,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
public static class WechatApiClientParameterExtensions
{
///
- /// 生成客户端 JS-SDK 初始化所需的参数。
+ /// 生成客户端 JS-SDK `wx.config` 所需的参数。
/// REF: https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html#62
///
///
@@ -33,7 +33,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
string timestamp = DateTimeOffset.Now.ToLocalTime().ToUnixTimeSeconds().ToString();
string nonce = Guid.NewGuid().ToString("N");
- string sign = Utilities.Sha1Util.Hash($"jsapi_ticket={jsapiTicket}&noncestr={nonce}×tamp={timestamp}&url={url.Split('#')[0]}").ToLower();
+ string sign = Security.SHA1Utility.Hash($"jsapi_ticket={jsapiTicket}&noncestr={nonce}×tamp={timestamp}&url={url.Split('#')[0]}").ToLower();
return new ReadOnlyDictionary(new Dictionary()
{
@@ -66,7 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
sortedParams.Add(client.AppId);
sortedParams.Add(nonce);
sortedParams.Add(wxcardTicket);
- string cardSign = Utilities.Sha1Util.Hash(string.Join(string.Empty, sortedParams)).ToLower();
+ string cardSign = Security.SHA1Utility.Hash(string.Join(string.Empty, sortedParams)).ToLower();
return new ReadOnlyDictionary(new Dictionary()
{
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/CardQrcodeCreateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/CardQrcodeCreateRequest.cs
index 285628e1..3bc70176 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/CardQrcodeCreateRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/CardQrcodeCreateRequest.cs
@@ -87,7 +87,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
}
///
- /// 获取或设置二维码有效时间(单位:秒)。
+ /// 获取或设置二维码有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expire_seconds")]
[System.Text.Json.Serialization.JsonPropertyName("expire_seconds")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/CardQrcodeCreateResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/CardQrcodeCreateResponse.cs
index 109ae511..c6242794 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/CardQrcodeCreateResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/CardQrcodeCreateResponse.cs
@@ -9,7 +9,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
public class CardQrcodeCreateResponse : WechatApiResponse
{
///
- /// 获取或设置二维码有效时间(单位:秒)。
+ /// 获取或设置二维码有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expire_seconds")]
[System.Text.Json.Serialization.JsonPropertyName("expire_seconds")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CardInvoice/Platform/CardInvoicePlatformGetPdfResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CardInvoice/Platform/CardInvoicePlatformGetPdfResponse.cs
index 8a25b29b..c0db142d 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CardInvoice/Platform/CardInvoicePlatformGetPdfResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CardInvoice/Platform/CardInvoicePlatformGetPdfResponse.cs
@@ -16,7 +16,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
public string PdfUrl { get; set; } = default!;
///
- /// 获取或设置发票文件 URL 有效时间(单位:秒)。
+ /// 获取或设置发票文件 URL 有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("pdf_url_expire_time")]
[System.Text.Json.Serialization.JsonPropertyName("pdf_url_expire_time")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Cgibin/CgibinTicketGetTicketResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Cgibin/CgibinTicketGetTicketResponse.cs
index d4e9471d..b385a19f 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Cgibin/CgibinTicketGetTicketResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Cgibin/CgibinTicketGetTicketResponse.cs
@@ -9,14 +9,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
public class CgibinTicketGetTicketResponse : WechatApiResponse
{
///
- /// 获取或设置 ApiTicket,即卡券接口中签名所需凭证。
+ /// 获取或设置票据。
///
[Newtonsoft.Json.JsonProperty("ticket")]
[System.Text.Json.Serialization.JsonPropertyName("ticket")]
public string Ticket { get; set; } = default!;
///
- /// 获取或设置凭证有效时间(单位:秒)。
+ /// 获取或设置票据有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expires_in")]
[System.Text.Json.Serialization.JsonPropertyName("expires_in")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Cgibin/CgibinTokenResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Cgibin/CgibinTokenResponse.cs
index b42fe7bc..9f19f51c 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Cgibin/CgibinTokenResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Cgibin/CgibinTokenResponse.cs
@@ -16,7 +16,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
public string AccessToken { get; set; } = default!;
///
- /// 获取或设置凭证有效时间(单位:秒)。
+ /// 获取或设置凭证有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expires_in")]
[System.Text.Json.Serialization.JsonPropertyName("expires_in")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiAuthorizerTokenResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiAuthorizerTokenResponse.cs
index cbc9603b..c1256673 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiAuthorizerTokenResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiAuthorizerTokenResponse.cs
@@ -23,7 +23,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
public string? AuthorizerRefreshToken { get; set; }
///
- /// 获取或设置授权方 AccessToken 有效时间(单位:秒)。
+ /// 获取或设置授权方 AccessToken 有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expires_in")]
[System.Text.Json.Serialization.JsonPropertyName("expires_in")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiComponentTokenResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiComponentTokenResponse.cs
index 0d4e99a3..07b08c78 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiComponentTokenResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiComponentTokenResponse.cs
@@ -16,7 +16,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
public string ComponentAccessToken { get; set; } = default!;
///
- /// 获取或设置第三方平台 AccessToken 有效时间(单位:秒)。
+ /// 获取或设置第三方平台 AccessToken 有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expires_in")]
[System.Text.Json.Serialization.JsonPropertyName("expires_in")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiCreatePreAuthCodeResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiCreatePreAuthCodeResponse.cs
index a9ebc07e..311d932f 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiCreatePreAuthCodeResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiCreatePreAuthCodeResponse.cs
@@ -16,7 +16,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
public string PreAuthCode { get; set; } = default!;
///
- /// 获取或设置预授权码有效时间(单位:秒)。
+ /// 获取或设置预授权码有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expires_in")]
[System.Text.Json.Serialization.JsonPropertyName("expires_in")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiQueryAuthResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiQueryAuthResponse.cs
index a87c7972..2dcf57f6 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiQueryAuthResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiQueryAuthResponse.cs
@@ -60,7 +60,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
public string? AuthorizerRefreshToken { get; set; }
///
- /// 获取或设置授权方 AccessToken 有效时间(单位:秒)。
+ /// 获取或设置授权方 AccessToken 有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expires_in")]
[System.Text.Json.Serialization.JsonPropertyName("expires_in")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinQrcode/CgibinQrcodeCreateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinQrcode/CgibinQrcodeCreateRequest.cs
index d86e4337..6206b383 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinQrcode/CgibinQrcodeCreateRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinQrcode/CgibinQrcodeCreateRequest.cs
@@ -42,7 +42,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
}
///
- /// 获取或设置二维码有效时间(单位:秒)。
+ /// 获取或设置二维码有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expire_seconds")]
[System.Text.Json.Serialization.JsonPropertyName("expire_seconds")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinQrcode/CgibinQrcodeCreateResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinQrcode/CgibinQrcodeCreateResponse.cs
index 71621694..c5c67fb3 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinQrcode/CgibinQrcodeCreateResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinQrcode/CgibinQrcodeCreateResponse.cs
@@ -9,7 +9,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
public class CgibinQrcodeCreateResponse : WechatApiResponse
{
///
- /// 获取或设置二维码有效时间(单位:秒)。
+ /// 获取或设置二维码有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expire_seconds")]
[System.Text.Json.Serialization.JsonPropertyName("expire_seconds")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinShorten/CgibinShortenFetchResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinShorten/CgibinShortenFetchResponse.cs
index af474766..f3f6ff7e 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinShorten/CgibinShortenFetchResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinShorten/CgibinShortenFetchResponse.cs
@@ -9,7 +9,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
public class CgibinShortenFetchResponse : WechatApiResponse
{
///
- /// 获取或设置二维码类型有效时间(单位:秒)。
+ /// 获取或设置二维码类型有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expire_seconds")]
[System.Text.Json.Serialization.JsonPropertyName("expire_seconds")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinShorten/CgibinShortenGenerateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinShorten/CgibinShortenGenerateRequest.cs
index f8b87287..742f1043 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinShorten/CgibinShortenGenerateRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinShorten/CgibinShortenGenerateRequest.cs
@@ -9,7 +9,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
public class CgibinShortenGenerateRequest : WechatApiRequest
{
///
- /// 获取或设置有效时间(单位:秒)。
+ /// 获取或设置有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expire_seconds")]
[System.Text.Json.Serialization.JsonPropertyName("expire_seconds")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/IntpRealName/IntpRealNameGetAuthUrlResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/IntpRealName/IntpRealNameGetAuthUrlResponse.cs
index 682122fb..85398261 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/IntpRealName/IntpRealNameGetAuthUrlResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/IntpRealName/IntpRealNameGetAuthUrlResponse.cs
@@ -16,7 +16,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
public string AuthUrl { get; set; } = default!;
///
- /// 获取或设置授权链接有效时间(单位:秒)。
+ /// 获取或设置授权链接有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expires_in")]
[System.Text.Json.Serialization.JsonPropertyName("expires_in")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Nontax/Bill/NontaxGetBillAuthUrlResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Nontax/Bill/NontaxGetBillAuthUrlResponse.cs
index 96b7c2cd..63a882d6 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Nontax/Bill/NontaxGetBillAuthUrlResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Nontax/Bill/NontaxGetBillAuthUrlResponse.cs
@@ -16,7 +16,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
public string AuthUrl { get; set; } = default!;
///
- /// 获取或设置授权链接有效时间(单位:秒)。
+ /// 获取或设置授权链接有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expire_time")]
[System.Text.Json.Serialization.JsonPropertyName("expire_time")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Sns/SnsOAuth2AccessTokenResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Sns/SnsOAuth2AccessTokenResponse.cs
index 4baabf32..9550e639 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Sns/SnsOAuth2AccessTokenResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Sns/SnsOAuth2AccessTokenResponse.cs
@@ -16,7 +16,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
public string AccessToken { get; set; } = default!;
///
- /// 获取或设置凭证有效时间(单位:秒)。
+ /// 获取或设置凭证有效期(单位:秒)。
///
[Newtonsoft.Json.JsonProperty("expires_in")]
[System.Text.Json.Serialization.JsonPropertyName("expires_in")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiEvent.cs
index 73022f31..f615e54d 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiEvent.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiEvent.cs
@@ -55,7 +55,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api
public string? Event { get; set; }
///
- /// 获取或设置消息创建时间。
+ /// 获取或设置消息创建时间戳。
///
[Newtonsoft.Json.JsonProperty("CreateTime")]
[System.Text.Json.Serialization.JsonPropertyName("CreateTime")]