diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMaterialExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMaterialExtensions.cs index c9a728eb..0039d3ed 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMaterialExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMaterialExtensions.cs @@ -10,30 +10,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Api { public static class WechatApiClientExecuteCgibinMaterialExtensions { - /// - /// 异步调用 [POST] /cgi-bin/material/add_news 接口。 - /// - /// REF:
- /// - ///
- ///
- /// - /// - /// - /// - [Obsolete("相关接口或字段于 2022-02-25 下线。")] - public static async Task ExecuteCgibinMaterialAddNewsAsync(this WechatApiClient client, Models.CgibinMaterialAddNewsRequest request, CancellationToken cancellationToken = default) - { - if (client is null) throw new ArgumentNullException(nameof(client)); - if (request is null) throw new ArgumentNullException(nameof(request)); - - IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "material", "add_news") - .SetQueryParam("access_token", request.AccessToken); - - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); - } - /// /// 异步调用 [POST] /cgi-bin/material/add_material 接口。 /// @@ -118,30 +94,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Api return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } - /// - /// 异步调用 [POST] /cgi-bin/material/get_material 接口。 - /// - /// REF:
- /// - ///
- ///
- /// - /// - /// - /// - [Obsolete("相关接口或字段于 2022-02-25 下线。")] - public static async Task ExecuteCgibinMaterialGetMaterialAsNewsAsync(this WechatApiClient client, Models.CgibinMaterialGetMaterialAsNewsRequest request, CancellationToken cancellationToken = default) - { - if (client is null) throw new ArgumentNullException(nameof(client)); - if (request is null) throw new ArgumentNullException(nameof(request)); - - IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "material", "get_material") - .SetQueryParam("access_token", request.AccessToken); - - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); - } - /// /// 异步调用 [POST] /cgi-bin/material/get_material 接口。 /// @@ -188,30 +140,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Api return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } - /// - /// 异步调用 [POST] /cgi-bin/material/update_news 接口。 - /// - /// REF:
- /// - ///
- ///
- /// - /// - /// - /// - [Obsolete("相关接口或字段于 2022-02-25 下线。")] - public static async Task ExecuteCgibinMaterialUpdateNewsAsync(this WechatApiClient client, Models.CgibinMaterialUpdateNewsRequest request, CancellationToken cancellationToken = default) - { - if (client is null) throw new ArgumentNullException(nameof(client)); - if (request is null) throw new ArgumentNullException(nameof(request)); - - IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "material", "update_news") - .SetQueryParam("access_token", request.AccessToken); - - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); - } - /// /// 异步调用 [GET] /cgi-bin/material/get_materialcount 接口。 /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialAddNewsRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialAddNewsRequest.cs deleted file mode 100644 index c16d9777..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialAddNewsRequest.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace SKIT.FlurlHttpClient.Wechat.Api.Models -{ - /// - /// 表示 [POST] /cgi-bin/material/add_news 接口的请求。 - /// - [Obsolete("相关接口或字段于 2022-02-25 下线。")] - public class CgibinMaterialAddNewsRequest : WechatApiRequest, IInferable - { - public static class Types - { - public class Article : CgibinMediaUploadNewsRequest.Types.Article - { - } - } - - /// - /// 获取或设置图文消息列表。 - /// - [Newtonsoft.Json.JsonProperty("articles")] - [System.Text.Json.Serialization.JsonPropertyName("articles")] - public IList ArticleList { get; set; } = new List(); - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialAddNewsResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialAddNewsResponse.cs deleted file mode 100644 index 3f79b3a3..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialAddNewsResponse.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; - -namespace SKIT.FlurlHttpClient.Wechat.Api.Models -{ - /// - /// 表示 [POST] /cgi-bin/material/add_news 接口的响应。 - /// - [Obsolete("相关接口或字段于 2022-02-25 下线。")] - public class CgibinMaterialAddNewsResponse : WechatApiResponse - { - /// - /// 获取或设置媒体文件标识。 - /// - [Newtonsoft.Json.JsonProperty("media_id")] - [System.Text.Json.Serialization.JsonPropertyName("media_id")] - public string MediaId { get; set; } = default!; - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialGetMaterialAsNewsRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialGetMaterialAsNewsRequest.cs deleted file mode 100644 index dc12fc5a..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialGetMaterialAsNewsRequest.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace SKIT.FlurlHttpClient.Wechat.Api.Models -{ - /// - /// 表示 [POST] /cgi-bin/material/get_material 接口的请求。 - /// - [Obsolete("相关接口或字段于 2022-02-25 下线。")] - public class CgibinMaterialGetMaterialAsNewsRequest : CgibinMaterialGetMaterialRequest, IInferable - { - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialGetMaterialAsNewsResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialGetMaterialAsNewsResponse.cs deleted file mode 100644 index d7638464..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialGetMaterialAsNewsResponse.cs +++ /dev/null @@ -1,107 +0,0 @@ -using System; - -namespace SKIT.FlurlHttpClient.Wechat.Api.Models -{ - /// - /// 表示 [POST] /cgi-bin/material/get_material 接口的响应。 - /// - [Obsolete("相关接口或字段于 2022-02-25 下线。")] - public class CgibinMaterialGetMaterialAsNewsResponse : CgibinMaterialGetMaterialResponse - { - public static class Types - { - public class Article - { - /// - /// 获取或设置图文消息缩略图媒体文件标识。 - /// - [Newtonsoft.Json.JsonProperty("thumb_media_id")] - [System.Text.Json.Serialization.JsonPropertyName("thumb_media_id")] - public string ThumbnailMediaId { get; set; } = default!; - - /// - /// 获取或设置图文消息缩略图 URL。 - /// - [Newtonsoft.Json.JsonProperty("thumb_url")] - [System.Text.Json.Serialization.JsonPropertyName("thumb_url")] - public string ThumbnailUrl { get; set; } = default!; - - /// - /// 获取或设置图文消息标题。 - /// - [Newtonsoft.Json.JsonProperty("title")] - [System.Text.Json.Serialization.JsonPropertyName("title")] - public string Title { get; set; } = default!; - - /// - /// 获取或设置图文消息作者。 - /// - [Newtonsoft.Json.JsonProperty("author")] - [System.Text.Json.Serialization.JsonPropertyName("author")] - public string Author { get; set; } = default!; - - /// - /// 获取或设置图文消息摘要。 - /// - [Newtonsoft.Json.JsonProperty("digest")] - [System.Text.Json.Serialization.JsonPropertyName("digest")] - public string Digest { get; set; } = default!; - - /// - /// 获取或设置图文消息阅读原文 URL。 - /// - [Newtonsoft.Json.JsonProperty("content_source_url")] - [System.Text.Json.Serialization.JsonPropertyName("content_source_url")] - public string ContentSourceUrl { get; set; } = default!; - - /// - /// 获取或设置图文消息页面的内容。 - /// - [Newtonsoft.Json.JsonProperty("content")] - [System.Text.Json.Serialization.JsonPropertyName("content")] - public string Content { get; set; } = default!; - - /// - /// 获取或设置图文消息页面的 URL。 - /// - [Newtonsoft.Json.JsonProperty("url")] - [System.Text.Json.Serialization.JsonPropertyName("url")] - public string Url { get; set; } = default!; - - /// - /// 获取或设置是否显示封面。 - /// - [Newtonsoft.Json.JsonProperty("show_cover_pic")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] - [System.Text.Json.Serialization.JsonPropertyName("show_cover_pic")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] - public bool IsShowCover { get; set; } - - /// - /// 获取或设置是否打开评论。 - /// - [Newtonsoft.Json.JsonProperty("need_open_comment")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] - [System.Text.Json.Serialization.JsonPropertyName("need_open_comment")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] - public bool? IsOpenComment { get; set; } - - /// - /// 获取或设置是否粉丝才可评论。 - /// - [Newtonsoft.Json.JsonProperty("only_fans_can_comment")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] - [System.Text.Json.Serialization.JsonPropertyName("only_fans_can_comment")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] - public bool? IsOnlyFansCanComment { get; set; } - } - } - - /// - /// 获取或设置图文消息素材列表。 - /// - [Newtonsoft.Json.JsonProperty("news_item")] - [System.Text.Json.Serialization.JsonPropertyName("news_item")] - public Types.Article[] ArticleList { get; set; } = default!; - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialUpdateNewsRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialUpdateNewsRequest.cs deleted file mode 100644 index 56022118..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialUpdateNewsRequest.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; - -namespace SKIT.FlurlHttpClient.Wechat.Api.Models -{ - /// - /// 表示 [POST] /cgi-bin/material/update_news 接口的请求。 - /// - [Obsolete("相关接口或字段于 2022-02-25 下线。")] - public class CgibinMaterialUpdateNewsRequest : WechatApiRequest, IInferable - { - public static class Types - { - public class Article : CgibinMaterialAddNewsRequest.Types.Article - { - } - } - - /// - /// 获取或设置媒体文件标识。 - /// - [Newtonsoft.Json.JsonProperty("media_id")] - [System.Text.Json.Serialization.JsonPropertyName("media_id")] - public string MediaId { get; set; } = string.Empty; - - /// - /// 获取或设置要更新的文章在图文消息中的位置(从 0 开始)。 - /// - [Newtonsoft.Json.JsonProperty("index")] - [System.Text.Json.Serialization.JsonPropertyName("index")] - public int Index { get; set; } - - /// - /// 获取或设置要更新的图文消息。 - /// - [Newtonsoft.Json.JsonProperty("articles")] - [System.Text.Json.Serialization.JsonPropertyName("articles")] - public Types.Article Article { get; set; } = new Types.Article(); - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialUpdateNewsResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialUpdateNewsResponse.cs deleted file mode 100644 index 12683475..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMaterial/CgibinMaterialUpdateNewsResponse.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace SKIT.FlurlHttpClient.Wechat.Api.Models -{ - /// - /// 表示 [POST] /cgi-bin/material/update_news 接口的响应。 - /// - [Obsolete("相关接口或字段于 2022-02-25 下线。")] - public class CgibinMaterialUpdateNewsResponse : WechatApiResponse - { - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMessageCustom/CgibinMessageCustomSendRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMessageCustom/CgibinMessageCustomSendRequest.cs index 4bfc9bf8..11d97075 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMessageCustom/CgibinMessageCustomSendRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMessageCustom/CgibinMessageCustomSendRequest.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; namespace SKIT.FlurlHttpClient.Wechat.Api.Models @@ -30,10 +29,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models public string MediaId { get; set; } = string.Empty; } - public class MpNewsMessage : ImageMessage - { - } - public class NewsMessage { public static class Types @@ -302,14 +297,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models [System.Text.Json.Serialization.JsonPropertyName("text")] public Types.TextMessage? MessageContentForText { get; set; } - /// - /// 获取或设置图文消息内容。 - /// - [Obsolete("相关接口或字段于 2021-12-31 下线。")] - [Newtonsoft.Json.JsonProperty("mpnews")] - [System.Text.Json.Serialization.JsonPropertyName("mpnews")] - public Types.MpNewsMessage? MessageContentForMpNews { get; set; } - /// /// 获取或设置图文链接消息内容。 /// diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialAddNewsRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialAddNewsRequest.json deleted file mode 100644 index a31d18e6..00000000 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialAddNewsRequest.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "articles": [ - { - "title": "TITLE", - "thumb_media_id": "THUMB_MEDIA_ID", - "author": "AUTHOR", - "digest": "DIGEST", - "show_cover_pic": 1, - "content": "CONTENT", - "content_source_url": "CONTENT_SOURCE_URL", - "need_open_comment": 1, - "only_fans_can_comment": 1 - } - ] -} diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialAddNewsResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialAddNewsResponse.json deleted file mode 100644 index 52c7fbde..00000000 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialAddNewsResponse.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "media_id": "MEDIA_ID" -} diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialGetMaterialAsNewsRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialGetMaterialAsNewsRequest.json deleted file mode 100644 index 52c7fbde..00000000 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialGetMaterialAsNewsRequest.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "media_id": "MEDIA_ID" -} diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialGetMaterialAsNewsResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialGetMaterialAsNewsResponse.json deleted file mode 100644 index 61049b89..00000000 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialGetMaterialAsNewsResponse.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "news_item": [ - { - "title": "TITLE", - "thumb_media_id": "THUMB_MEDIA_ID", - "thumb_url": "thumb_url", - "author": "AUTHOR", - "digest": "DIGEST", - "show_cover_pic": 1, - "url": "URL", - "content_source_url": "CONTENT_SOURCE_URL" - } - ] -} diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialUpdateNewsRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialUpdateNewsRequest.json deleted file mode 100644 index b98e76a9..00000000 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMaterial/CgibinMaterialUpdateNewsRequest.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "media_id": "MEDIA_ID", - "index": 0, - "articles": { - "title": "TITLE", - "thumb_media_id": "THUMB_MEDIA_ID", - "author": "AUTHOR", - "digest": "DIGEST", - "show_cover_pic": 1, - "content": "CONTENT", - "content_source_url": "CONTENT_SOURCE_URL" - } -} diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMessageCustom/CgibinMessageCustomSendRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMessageCustom/CgibinMessageCustomSendRequest.json index 189aea70..d158344a 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMessageCustom/CgibinMessageCustomSendRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinMessageCustom/CgibinMessageCustomSendRequest.json @@ -1,4 +1,4 @@ -{ +{ "touser": "OPENID", "msgtype": "type", "text": { @@ -33,9 +33,6 @@ } ] }, - "mpnews": { - "media_id": "MEDIA_ID" - }, "msgmenu": { "head_content": "您对本次服务是否满意呢? ", "list": [