From 4f7548262473d9c78fd0c4b44c6b72fe55ea91ea Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Fri, 22 Dec 2023 13:07:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(wxapi):=20=E9=9A=8F=E5=AE=98=E6=96=B9?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B0=8F=E7=A8=8B=E5=BA=8F=20URL=20Scheme=20?= =?UTF-8?q?&=20URL=20Link=20=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Wxa/UrlLink/WxaQueryUrlLinkRequest.cs | 11 ++++++++-- .../Wxa/UrlLink/WxaQueryUrlLinkResponse.cs | 21 +++++++------------ .../Wxa/UrlScheme/WxaQuerySchemeRequest.cs | 11 ++++++++-- .../Wxa/UrlScheme/WxaQuerySchemeResponse.cs | 21 +++++++------------ .../Wxa/UrlLink/WxaQueryUrlLinkRequest.json | 5 +++-- .../Wxa/UrlLink/WxaQueryUrlLinkResponse.json | 7 +++---- .../Wxa/UrlScheme/WxaQuerySchemeRequest.json | 5 +++-- .../Wxa/UrlScheme/WxaQuerySchemeResponse.json | 7 +++---- 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlLink/WxaQueryUrlLinkRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlLink/WxaQueryUrlLinkRequest.cs index 977311e3..be4ebb8b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlLink/WxaQueryUrlLinkRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlLink/WxaQueryUrlLinkRequest.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Api.Models +namespace SKIT.FlurlHttpClient.Wechat.Api.Models { /// /// 表示 [POST] /wxa/query_urllink 接口的请求。 @@ -10,6 +10,13 @@ /// [Newtonsoft.Json.JsonProperty("url_link")] [System.Text.Json.Serialization.JsonPropertyName("url_link")] - public string UrlLink { get; set; } = string.Empty; + public string? UrlLink { get; set; } + + /// + /// 获取或设置查询类型。 + /// + [Newtonsoft.Json.JsonProperty("query_type")] + [System.Text.Json.Serialization.JsonPropertyName("query_type")] + public int? QueryType { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlLink/WxaQueryUrlLinkResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlLink/WxaQueryUrlLinkResponse.cs index 1cb545c6..1446aa5d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlLink/WxaQueryUrlLinkResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlLink/WxaQueryUrlLinkResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Api.Models +namespace SKIT.FlurlHttpClient.Wechat.Api.Models { /// /// 表示 [POST] /wxa/query_urllink 接口的响应。 @@ -103,18 +103,11 @@ public class Quota { /// - /// 获取或设置长期有效的已生成次数。 + /// 获取或设置单天剩余访问次数。 /// - [Newtonsoft.Json.JsonProperty("long_time_used")] - [System.Text.Json.Serialization.JsonPropertyName("long_time_used")] - public int LongTimeUsed { get; set; } - - /// - /// 获取或设置长期有效的次数上限。 - /// - [Newtonsoft.Json.JsonProperty("long_time_limit")] - [System.Text.Json.Serialization.JsonPropertyName("long_time_limit")] - public int LongTimeLimit { get; set; } + [Newtonsoft.Json.JsonProperty("remain_visit_quota")] + [System.Text.Json.Serialization.JsonPropertyName("remain_visit_quota")] + public int RemainVisitQuota { get; set; } } } @@ -128,8 +121,8 @@ /// /// 获取或设置配额信息。 /// - [Newtonsoft.Json.JsonProperty("url_link_quota")] - [System.Text.Json.Serialization.JsonPropertyName("url_link_quota")] + [Newtonsoft.Json.JsonProperty("quota_info")] + [System.Text.Json.Serialization.JsonPropertyName("quota_info")] public Types.Quota Quota { get; set; } = default!; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlScheme/WxaQuerySchemeRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlScheme/WxaQuerySchemeRequest.cs index e31363b3..34fc63e5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlScheme/WxaQuerySchemeRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlScheme/WxaQuerySchemeRequest.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Api.Models +namespace SKIT.FlurlHttpClient.Wechat.Api.Models { /// /// 表示 [POST] /wxa/queryscheme 接口的请求。 @@ -10,6 +10,13 @@ /// [Newtonsoft.Json.JsonProperty("scheme")] [System.Text.Json.Serialization.JsonPropertyName("scheme")] - public string UrlScheme { get; set; } = string.Empty; + public string? UrlScheme { get; set; } + + /// + /// 获取或设置查询类型。 + /// + [Newtonsoft.Json.JsonProperty("query_type")] + [System.Text.Json.Serialization.JsonPropertyName("query_type")] + public int? QueryType { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlScheme/WxaQuerySchemeResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlScheme/WxaQuerySchemeResponse.cs index 5e3b9cec..08a9f8e1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlScheme/WxaQuerySchemeResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/UrlScheme/WxaQuerySchemeResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Api.Models +namespace SKIT.FlurlHttpClient.Wechat.Api.Models { /// /// 表示 [POST] /wxa/queryscheme 接口的响应。 @@ -55,18 +55,11 @@ public class Quota { /// - /// 获取或设置长期有效的已生成次数。 + /// 获取或设置单天剩余访问次数。 /// - [Newtonsoft.Json.JsonProperty("long_time_used")] - [System.Text.Json.Serialization.JsonPropertyName("long_time_used")] - public int LongTimeUsed { get; set; } - - /// - /// 获取或设置长期有效的次数上限。 - /// - [Newtonsoft.Json.JsonProperty("long_time_limit")] - [System.Text.Json.Serialization.JsonPropertyName("long_time_limit")] - public int LongTimeLimit { get; set; } + [Newtonsoft.Json.JsonProperty("remain_visit_quota")] + [System.Text.Json.Serialization.JsonPropertyName("remain_visit_quota")] + public int RemainVisitQuota { get; set; } } } @@ -80,8 +73,8 @@ /// /// 获取或设置配额信息。 /// - [Newtonsoft.Json.JsonProperty("scheme_quota")] - [System.Text.Json.Serialization.JsonPropertyName("scheme_quota")] + [Newtonsoft.Json.JsonProperty("quota_info")] + [System.Text.Json.Serialization.JsonPropertyName("quota_info")] public Types.Quota Quota { get; set; } = default!; } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlLink/WxaQueryUrlLinkRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlLink/WxaQueryUrlLinkRequest.json index 9198dd98..6e3b86b5 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlLink/WxaQueryUrlLinkRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlLink/WxaQueryUrlLinkRequest.json @@ -1,3 +1,4 @@ -{ - "url_link": "https://wxaurl.cn/BQZRrcFCPvg" +{ + "url_link": "https://wxaurl.cn/BQZRrcFCPvg", + "query_type": 0 } diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlLink/WxaQueryUrlLinkResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlLink/WxaQueryUrlLinkResponse.json index 139186e9..c09f47c1 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlLink/WxaQueryUrlLinkResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlLink/WxaQueryUrlLinkResponse.json @@ -1,4 +1,4 @@ -{ +{ "errcode": 0, "errmsg": "ok", "url_link_info": { @@ -16,8 +16,7 @@ "resource_appid": "" } }, - "url_link_quota": { - "long_time_used": 100, - "long_time_limit": 100000 + "quota_info": { + "remain_visit_quota": 1000000 } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlScheme/WxaQuerySchemeRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlScheme/WxaQuerySchemeRequest.json index 4cce70a7..e4235b00 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlScheme/WxaQuerySchemeRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlScheme/WxaQuerySchemeRequest.json @@ -1,3 +1,4 @@ -{ - "scheme": "weixin://dl/business/?t=XTSkBZlzqmn" +{ + "scheme": "weixin://dl/business/?t=XTSkBZlzqmn", + "query_type": 0 } diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlScheme/WxaQuerySchemeResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlScheme/WxaQuerySchemeResponse.json index 6a00b58f..875baeb4 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlScheme/WxaQuerySchemeResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/UrlScheme/WxaQuerySchemeResponse.json @@ -1,4 +1,4 @@ -{ +{ "errcode": 0, "errmsg": "ok", "scheme_info": { @@ -9,8 +9,7 @@ "expire_time": 0, "env_version": "release" }, - "scheme_quota": { - "long_time_used": 100, - "long_time_limit": 100000 + "quota_info": { + "remain_visit_quota": 1000000 } }