diff --git a/docs/WechatOpenAI/README.md b/docs/WechatOpenAI/README.md index 4e6ec75f..cd521ba2 100644 --- a/docs/WechatOpenAI/README.md +++ b/docs/WechatOpenAI/README.md @@ -35,13 +35,13 @@ using SKIT.FlurlHttpClient.Wechat; using SKIT.FlurlHttpClient.Wechat.OpenAI; -var options = new WechatOpenAIClientOptions() +var options = new WechatChatbotClientOptions() { AppId = "微信智能对话 AppId", Token = "微信智能对话 Token", EncodingAESKey = "微信智能对话 EncodingAESKey" }; -var client = WechatOpenAIClientBuilder.Create(options).Build(); +var client = WechatChatbotClientBuilder.Create(options).Build(); ``` ### 请求 & 响应： @@ -66,6 +66,7 @@ if (response.IsSuccessful()) else { Console.WriteLine("错误代码：" + response.ErrorCode); + Console.WriteLine("错误描述：" + response.ErrorMessage); Console.WriteLine("返回代码：" + response.ReturnCode); Console.WriteLine("返回错误：" + response.ReturnError); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Events/ThirdKf/UserEnterEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Events/Chatbot/ThirdKf/UserEnterEvent.cs similarity index 97% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Events/ThirdKf/UserEnterEvent.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Events/Chatbot/ThirdKf/UserEnterEvent.cs index f5ea8882..ad05f73b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Events/ThirdKf/UserEnterEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Events/Chatbot/ThirdKf/UserEnterEvent.cs @@ -7,7 +7,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Events /// /// /// - public class UserEnterEvent : WechatOpenAIEvent + public class UserEnterEvent : WechatChatbotEvent { public static class Types { diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Events/ThirdKf/UserQuitEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Events/Chatbot/ThirdKf/UserQuitEvent.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Events/ThirdKf/UserQuitEvent.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Events/Chatbot/ThirdKf/UserQuitEvent.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientEventExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientEventExtensions.cs similarity index 58% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientEventExtensions.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientEventExtensions.cs index f6f2c3aa..053c73f4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientEventExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientEventExtensions.cs @@ -3,43 +3,43 @@ using System; namespace SKIT.FlurlHttpClient.Wechat.OpenAI { /// - /// 为 提供回调通知事件的扩展方法。 + /// 为 提供回调通知事件的扩展方法。 /// - public static partial class WechatOpenAIClientEventExtensions + public static partial class WechatChatbotClientEventExtensions { /// - /// 从 XML 反序列化得到 对象。 + /// 从 XML 反序列化得到 对象。 /// /// /// /// /// - public static TEvent DeserializeEventFromXml(this WechatOpenAIClient client, string webhookXml) - where TEvent : WechatOpenAIEvent, new() + public static TEvent DeserializeEventFromXml(this WechatChatbotClient client, string webhookXml) + where TEvent : WechatChatbotEvent, new() { return InnerDeserializeEventFromXml(client, webhookXml); } /// - /// 从 XML 反序列化得到 对象。 + /// 从 XML 反序列化得到 对象。 /// /// /// /// - public static WechatOpenAIEvent DeserializeEventFromXml(this WechatOpenAIClient client, string webhookXml) + public static WechatChatbotEvent DeserializeEventFromXml(this WechatChatbotClient client, string webhookXml) { - return InnerDeserializeEventFromXml(client, webhookXml); + return InnerDeserializeEventFromXml(client, webhookXml); } /// - /// 将 对象序列化成 XML。 + /// 将 对象序列化成 XML。 /// /// /// /// /// - public static string SerializeEventToXml(this WechatOpenAIClient client, TEvent webhookEvent) - where TEvent : WechatOpenAIEvent, new() + public static string SerializeEventToXml(this WechatChatbotClient client, TEvent webhookEvent) + where TEvent : WechatChatbotEvent, new() { string xml; @@ -49,13 +49,13 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI } catch (Exception ex) { - throw new WechatOpenAIException("Failed to serialize event data. Please see the inner exception for more details.", ex); + throw new WechatChatbotException("Failed to serialize event data. Please see the inner exception for more details.", ex); } if (string.IsNullOrEmpty(client.Credentials.EncodingAESKey)) - throw new WechatOpenAIException("Failed to encrypt event data, because the push encoding AES key is not set."); + throw new WechatChatbotException("Failed to encrypt event data, because the push encoding AES key is not set."); if (string.IsNullOrEmpty(client.Credentials.Token)) - throw new WechatOpenAIException("Failed to encrypt event data, because the push token is not set."); + throw new WechatChatbotException("Failed to encrypt event data, because the push token is not set."); try { @@ -69,17 +69,17 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI } catch (Exception ex) { - throw new WechatOpenAIException("Failed to encrypt event data. Please see the inner exception for more details.", ex); + throw new WechatChatbotException("Failed to encrypt event data. Please see the inner exception for more details.", ex); } return xml; } } - partial class WechatOpenAIClientEventExtensions + partial class WechatChatbotClientEventExtensions { - private static TEvent InnerDeserializeEventFromXml(this WechatOpenAIClient client, string webhookXml) - where TEvent : WechatOpenAIEvent + private static TEvent InnerDeserializeEventFromXml(this WechatChatbotClient client, string webhookXml) + where TEvent : WechatChatbotEvent { if (client is null) throw new ArgumentNullException(nameof(client)); if (webhookXml is null) throw new ArgumentNullException(webhookXml); @@ -87,18 +87,18 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI try { if (!Utilities.WxMsgCryptor.TryParseXml(webhookXml, out string? encryptedXml)) - throw new WechatOpenAIException("Failed to decrypt event data, because of the encrypted data is empty."); + throw new WechatChatbotException("Failed to decrypt event data, because of the encrypted data is empty."); webhookXml = Utilities.WxMsgCryptor.AESDecrypt(cipherText: encryptedXml!, encodingAESKey: client.Credentials.EncodingAESKey!, out _); return Utilities.XmlHelper.Deserialize(webhookXml); } - catch (WechatOpenAIException) + catch (WechatChatbotException) { throw; } catch (Exception ex) { - throw new WechatOpenAIException("Failed to deserialize event data. Please see the inner exception for more details.", ex); + throw new WechatChatbotException("Failed to deserialize event data. Please see the inner exception for more details.", ex); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientExecuteBotExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientExecuteBotExtensions.cs similarity index 83% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientExecuteBotExtensions.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientExecuteBotExtensions.cs index 04441b0d..1c58bf58 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientExecuteBotExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientExecuteBotExtensions.cs @@ -6,7 +6,7 @@ using Flurl.Http; namespace SKIT.FlurlHttpClient.Wechat.OpenAI { - public static class WechatOpenAIClientExecuteBotExtensions + public static class WechatChatbotClientExecuteBotExtensions { /// /// 异步调用 [POST] /batchimportskill/{TOKEN} 接口。 @@ -19,8 +19,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public static async Task ExecuteBatchImportSkillAsync(this WechatOpenAIClient client, Models.BatchImportSkillRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteBatchImportSkillAsync(this WechatChatbotClient client, Models.BatchImportSkillRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); @@ -42,8 +41,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public static async Task ExecutePublishAsync(this WechatOpenAIClient client, Models.PublishRequest request, CancellationToken cancellationToken = default) + public static async Task ExecutePublishAsync(this WechatChatbotClient client, Models.PublishRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); @@ -65,8 +63,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public static async Task ExecutePublishProgressAsync(this WechatOpenAIClient client, Models.PublishProgressRequest request, CancellationToken cancellationToken = default) + public static async Task ExecutePublishProgressAsync(this WechatChatbotClient client, Models.PublishProgressRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); @@ -88,8 +85,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public static async Task ExecuteSetAutoReplyAsync(this WechatOpenAIClient client, Models.SetAutoReplyRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteSetAutoReplyAsync(this WechatChatbotClient client, Models.SetAutoReplyRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); @@ -111,8 +107,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public static async Task ExecuteLabelBatchSetAsync(this WechatOpenAIClient client, Models.LabelBatchSetRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteLabelBatchSetAsync(this WechatChatbotClient client, Models.LabelBatchSetRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientExecuteDialogExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientExecuteDialogExtensions.cs similarity index 86% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientExecuteDialogExtensions.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientExecuteDialogExtensions.cs index 9b102f25..f7ea6a93 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientExecuteDialogExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientExecuteDialogExtensions.cs @@ -6,7 +6,7 @@ using Flurl.Http; namespace SKIT.FlurlHttpClient.Wechat.OpenAI { - public static class WechatOpenAIClientExecuteDialogExtensions + public static class WechatChatbotClientExecuteDialogExtensions { /// /// 异步调用 [POST] /sign/{TOKEN} 接口。 @@ -19,8 +19,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public static async Task ExecuteSignAsync(this WechatOpenAIClient client, Models.SignRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteSignAsync(this WechatChatbotClient client, Models.SignRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); @@ -42,8 +41,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public static async Task ExecuteAIBotAsync(this WechatOpenAIClient client, Models.AIBotRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteAIBotAsync(this WechatChatbotClient client, Models.AIBotRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); @@ -66,7 +64,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public static async Task ExecuteFeedbackAsync(this WechatOpenAIClient client, Models.FeedbackRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteFeedbackAsync(this WechatChatbotClient client, Models.FeedbackRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); @@ -89,7 +87,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public static async Task ExecuteGetHotQueryListAsync(this WechatOpenAIClient client, Models.GetHotQueryListRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteGetHotQueryListAsync(this WechatChatbotClient client, Models.GetHotQueryListRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); @@ -112,7 +110,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public static async Task ExecuteGetHotQueryDetailAsync(this WechatOpenAIClient client, Models.GetHotQueryDetailRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteGetHotQueryDetailAsync(this WechatChatbotClient client, Models.GetHotQueryDetailRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientExecuteMpExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientExecuteMpExtensions.cs similarity index 90% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientExecuteMpExtensions.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientExecuteMpExtensions.cs index 390982b1..b6e6213d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientExecuteMpExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientExecuteMpExtensions.cs @@ -9,7 +9,7 @@ using Flurl.Http; namespace SKIT.FlurlHttpClient.Wechat.OpenAI { - public static class WechatOpenAIClientExecuteMpExtensions + public static class WechatChatbotClientExecuteMpExtensions { /// /// 异步调用 [POST] /getbindlink/{TOKEN} 接口。 @@ -23,7 +23,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public static async Task ExecuteGetBindLinkAsync(this WechatOpenAIClient client, Models.GetBindLinkRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteGetBindLinkAsync(this WechatChatbotClient client, Models.GetBindLinkRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); @@ -46,7 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public static async Task ExecuteGetBindListAsync(this WechatOpenAIClient client, Models.GetBindListRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteGetBindListAsync(this WechatChatbotClient client, Models.GetBindListRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); @@ -69,7 +69,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public static async Task ExecuteUnbindMpAsync(this WechatOpenAIClient client, Models.UnbindMpRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteUnbindMpAsync(this WechatChatbotClient client, Models.UnbindMpRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); @@ -92,7 +92,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public static async Task ExecuteGetH5LinkAsync(this WechatOpenAIClient client, Models.GetH5LinkRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteGetH5LinkAsync(this WechatChatbotClient client, Models.GetH5LinkRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); @@ -115,7 +115,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public static async Task ExecuteAssetsUploadAsync(this WechatOpenAIClient client, Models.AssetsUploadRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteAssetsUploadAsync(this WechatChatbotClient client, Models.AssetsUploadRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientExecuteThirdKefuExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientExecuteThirdKefuExtensions.cs similarity index 87% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientExecuteThirdKefuExtensions.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientExecuteThirdKefuExtensions.cs index 61ff291f..a0ce525e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientExecuteThirdKefuExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientExecuteThirdKefuExtensions.cs @@ -6,7 +6,7 @@ using Flurl.Http; namespace SKIT.FlurlHttpClient.Wechat.OpenAI { - public static class WechatOpenAIClientExecuteThirdKefuExtensions + public static class WechatChatbotClientExecuteThirdKefuExtensions { /// /// 异步调用 [POST] /sendmsg/{TOKEN} 接口。 @@ -19,7 +19,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// /// - public static async Task ExecuteSendMessageAsync(this WechatOpenAIClient client, Models.SendMessageRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteSendMessageAsync(this WechatChatbotClient client, Models.SendMessageRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); @@ -44,7 +44,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// /// - public static async Task ExecuteKefuStateGetAsync(this WechatOpenAIClient client, Models.KefuStateGetRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteKefuStateGetAsync(this WechatChatbotClient client, Models.KefuStateGetRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); @@ -69,7 +69,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// /// - public static async Task ExecuteKefuStateChangeAsync(this WechatOpenAIClient client, Models.KefuStateChangeRequest request, CancellationToken cancellationToken = default) + public static async Task ExecuteKefuStateChangeAsync(this WechatChatbotClient client, Models.KefuStateChangeRequest request, CancellationToken cancellationToken = default) { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/BatchImportSkillRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/BatchImportSkillRequest.cs similarity index 91% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/BatchImportSkillRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/BatchImportSkillRequest.cs index f7ed8474..9a124439 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/BatchImportSkillRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/BatchImportSkillRequest.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models @@ -6,8 +5,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// /// 表示 [POST] /batchimportskill/{TOKEN} 接口的请求。 /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public class BatchImportSkillRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class BatchImportSkillRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { public static class Types { diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/BatchImportSkillResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/BatchImportSkillResponse.cs similarity index 82% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/BatchImportSkillResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/BatchImportSkillResponse.cs index e1a95366..9459a794 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/BatchImportSkillResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/BatchImportSkillResponse.cs @@ -1,12 +1,9 @@ -using System; - namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models { /// /// 表示 [POST] /batchimportskill/{TOKEN} 接口的响应。 /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public class BatchImportSkillResponse : WechatOpenAIResponse + public class BatchImportSkillResponse : WechatChatbotResponse { /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/LabelBatchSetRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/LabelBatchSetRequest.cs similarity index 90% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/LabelBatchSetRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/LabelBatchSetRequest.cs index 4277adce..acd5d490 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/LabelBatchSetRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/LabelBatchSetRequest.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models @@ -6,8 +5,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// /// 表示 [POST] /label/batchset/{TOKEN} 接口的请求。 /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public class LabelBatchSetRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class LabelBatchSetRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { public static class Types { diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/LabelBatchSetResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/LabelBatchSetResponse.cs similarity index 83% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/LabelBatchSetResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/LabelBatchSetResponse.cs index d3a50c58..1310255d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/LabelBatchSetResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/LabelBatchSetResponse.cs @@ -1,12 +1,9 @@ -using System; - namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models { /// /// 表示 [POST] /label/batchset/{TOKEN} 接口的响应。 /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public class LabelBatchSetResponse : WechatOpenAIResponse + public class LabelBatchSetResponse : WechatChatbotResponse { /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/PublishProgressRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/PublishProgressRequest.cs similarity index 70% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/PublishProgressRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/PublishProgressRequest.cs index d950a18d..b2c9da20 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/PublishProgressRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/PublishProgressRequest.cs @@ -1,12 +1,9 @@ -using System; - namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models { /// /// 表示 [POST] /publish_progress/{TOKEN} 接口的请求。 /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public class PublishProgressRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class PublishProgressRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { /// /// 获取或设置管理员 ID。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/PublishProgressResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/PublishProgressResponse.cs similarity index 88% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/PublishProgressResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/PublishProgressResponse.cs index e1d89795..ef76d71d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/PublishProgressResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/PublishProgressResponse.cs @@ -1,12 +1,9 @@ -using System; - namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models { /// /// 表示 [POST] /publish_progress/{TOKEN} 接口的响应。 /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public class PublishProgressResponse : WechatOpenAIResponse + public class PublishProgressResponse : WechatChatbotResponse { public static class Types { diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/PublishRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/PublishRequest.cs similarity index 70% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/PublishRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/PublishRequest.cs index ec9ab195..465e2a4d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/PublishRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/PublishRequest.cs @@ -1,12 +1,9 @@ -using System; - namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models { /// /// 表示 [POST] /publish/{TOKEN} 接口的请求。 /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public class PublishRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class PublishRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { /// /// 获取或设置管理员 ID。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/PublishResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/PublishResponse.cs similarity index 83% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/PublishResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/PublishResponse.cs index 5a56c88f..77c063a1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/PublishResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/PublishResponse.cs @@ -1,12 +1,9 @@ -using System; - namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models { /// /// 表示 [POST] /publish/{TOKEN} 接口的响应。 /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public class PublishResponse : WechatOpenAIResponse + public class PublishResponse : WechatChatbotResponse { /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/SetAutoReplyRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/SetAutoReplyRequest.cs similarity index 91% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/SetAutoReplyRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/SetAutoReplyRequest.cs index b16516d5..3971eb55 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/SetAutoReplyRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/SetAutoReplyRequest.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models @@ -6,8 +5,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// /// 表示 [POST] /setautoreply/{TOKEN} 接口的请求。 /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public class SetAutoReplyRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class SetAutoReplyRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { public static class Types { diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/SetAutoReplyResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/SetAutoReplyResponse.cs similarity index 83% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/SetAutoReplyResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/SetAutoReplyResponse.cs index 85be209b..7409db94 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Bot/SetAutoReplyResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Bot/SetAutoReplyResponse.cs @@ -1,12 +1,9 @@ -using System; - namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models { /// /// 表示 [POST] /setautoreply/{TOKEN} 接口的响应。 /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public class SetAutoReplyResponse : WechatOpenAIResponse + public class SetAutoReplyResponse : WechatChatbotResponse { /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/AIBotRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/AIBotRequest.cs similarity index 92% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/AIBotRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/AIBotRequest.cs index cb00c60d..f9865e9d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/AIBotRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/AIBotRequest.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models @@ -6,8 +5,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// /// 表示 [POST] /aibot/{TOKEN} 接口的请求。 /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public class AIBotRequest : WechatOpenAIRequest + public class AIBotRequest : WechatChatbotRequest { /// /// 获取或设置请求签名。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/AIBotResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/AIBotResponse.cs similarity index 99% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/AIBotResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/AIBotResponse.cs index 98589dff..a9f2302d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/AIBotResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/AIBotResponse.cs @@ -5,8 +5,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// /// 表示 [POST] /aibot/{TOKEN} 接口的响应。 /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public class AIBotResponse : WechatOpenAIResponse + public class AIBotResponse : WechatChatbotResponse { public static class Types { diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/FeedbackRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/FeedbackRequest.cs similarity index 90% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/FeedbackRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/FeedbackRequest.cs index d2e05b23..9c6781de 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/FeedbackRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/FeedbackRequest.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /feedback/{TOKEN} 接口的请求。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class FeedbackRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class FeedbackRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { /// /// 获取或设置消息 ID。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/FeedbackResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/FeedbackResponse.cs similarity index 92% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/FeedbackResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/FeedbackResponse.cs index 353fa830..427367aa 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/FeedbackResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/FeedbackResponse.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /feedback/{TOKEN} 接口的响应。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class FeedbackResponse : WechatOpenAIResponse + public class FeedbackResponse : WechatChatbotResponse { /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/GetHotQueryDetailRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/GetHotQueryDetailRequest.cs similarity index 95% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/GetHotQueryDetailRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/GetHotQueryDetailRequest.cs index 5329eb9b..52fd9668 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/GetHotQueryDetailRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/GetHotQueryDetailRequest.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /gethotquerydetail/{TOKEN} 接口的请求。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class GetHotQueryDetailRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class GetHotQueryDetailRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { /// /// 获取或设置分页页数。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/GetHotQueryDetailResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/GetHotQueryDetailResponse.cs similarity index 97% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/GetHotQueryDetailResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/GetHotQueryDetailResponse.cs index 4941e104..afc5bf80 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/GetHotQueryDetailResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/GetHotQueryDetailResponse.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /gethotquerydetail/{TOKEN} 接口的响应。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class GetHotQueryDetailResponse : WechatOpenAIResponse + public class GetHotQueryDetailResponse : WechatChatbotResponse { public static class Types { diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/GetHotQueryListRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/GetHotQueryListRequest.cs similarity index 94% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/GetHotQueryListRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/GetHotQueryListRequest.cs index 7f226650..61e46af8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/GetHotQueryListRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/GetHotQueryListRequest.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /gethotquerylist/{TOKEN} 接口的请求。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class GetHotQueryListRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class GetHotQueryListRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { /// /// 获取或设置分页页数。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/GetHotQueryListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/GetHotQueryListResponse.cs similarity index 98% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/GetHotQueryListResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/GetHotQueryListResponse.cs index 22c4c7ad..7b776929 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/GetHotQueryListResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/GetHotQueryListResponse.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /gethotquerylist/{TOKEN} 接口的响应。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class GetHotQueryListResponse : WechatOpenAIResponse + public class GetHotQueryListResponse : WechatChatbotResponse { public static class Types { diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/SignRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/SignRequest.cs similarity index 87% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/SignRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/SignRequest.cs index f3d793a8..71eae312 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/SignRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/SignRequest.cs @@ -1,12 +1,9 @@ -using System; - namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models { /// /// 表示 [POST] /sign/{TOKEN} 接口的请求。 /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public class SignRequest : WechatOpenAIRequest + public class SignRequest : WechatChatbotRequest { /// /// 获取或设置用户 ID。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/SignResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/SignResponse.cs similarity index 84% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/SignResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/SignResponse.cs index 7465b2f4..8d0a0da1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Dialog/SignResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Dialog/SignResponse.cs @@ -1,12 +1,9 @@ -using System; - namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models { /// /// 表示 [POST] /sign/{TOKEN} 接口的响应。 /// - [Obsolete("相关接口或字段于 2023-04-10 下线。")] - public class SignResponse : WechatOpenAIResponse + public class SignResponse : WechatChatbotResponse { /// /// 获取或设置请求签名。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/AssetsUploadRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/AssetsUploadRequest.cs similarity index 92% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/AssetsUploadRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/AssetsUploadRequest.cs index 7f522aa7..e6f8078c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/AssetsUploadRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/AssetsUploadRequest.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /assetsupload/{TOKEN} 接口的请求。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class AssetsUploadRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class AssetsUploadRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { /// /// 获取或设置用户 ID。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/AssetsUploadResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/AssetsUploadResponse.cs similarity index 95% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/AssetsUploadResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/AssetsUploadResponse.cs index 76b57cf3..38430786 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/AssetsUploadResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/AssetsUploadResponse.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /assetsupload/{TOKEN} 接口的响应。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class AssetsUploadResponse : WechatOpenAIResponse + public class AssetsUploadResponse : WechatChatbotResponse { /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetBindLinkRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetBindLinkRequest.cs similarity index 82% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetBindLinkRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetBindLinkRequest.cs index 0e25d217..cbb20f60 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetBindLinkRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetBindLinkRequest.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /getbindlink/{TOKEN} 接口的请求。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class GetBindLinkRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class GetBindLinkRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { /// /// 获取或设置直播 ID。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetBindLinkResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetBindLinkResponse.cs similarity index 94% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetBindLinkResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetBindLinkResponse.cs index a7ee4be0..65cee511 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetBindLinkResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetBindLinkResponse.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /getbindlink/{TOKEN} 接口的响应。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class GetBindLinkResponse : WechatOpenAIResponse + public class GetBindLinkResponse : WechatChatbotResponse { /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetBindListRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetBindListRequest.cs similarity index 81% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetBindListRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetBindListRequest.cs index f7d77341..4a45a335 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetBindListRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetBindListRequest.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /getbindlist/{TOKEN} 接口的请求。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class GetBindListRequest : WechatOpenAIRequest + public class GetBindListRequest : WechatChatbotRequest { } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetBindListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetBindListResponse.cs similarity index 99% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetBindListResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetBindListResponse.cs index 99a8d691..cf01d586 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetBindListResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetBindListResponse.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /getbindlist/{TOKEN} 接口的响应。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class GetBindListResponse : WechatOpenAIResponse + public class GetBindListResponse : WechatChatbotResponse { public static class Types { diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetH5LinkRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetH5LinkRequest.cs similarity index 81% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetH5LinkRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetH5LinkRequest.cs index 075e48cd..3b7407a6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetH5LinkRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetH5LinkRequest.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /geth5link/{TOKEN} 接口的请求。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class GetH5LinkRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class GetH5LinkRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { /// /// 获取或设置页面标题。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetH5LinkResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetH5LinkResponse.cs similarity index 94% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetH5LinkResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetH5LinkResponse.cs index d64ee938..068a52c4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/GetH5LinkResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/GetH5LinkResponse.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /geth5link/{TOKEN} 接口的响应。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class GetH5LinkResponse : WechatOpenAIResponse + public class GetH5LinkResponse : WechatChatbotResponse { /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/UnbindMpRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/UnbindMpRequest.cs similarity index 83% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/UnbindMpRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/UnbindMpRequest.cs index 69aee400..f571815e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/UnbindMpRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/UnbindMpRequest.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /unbindmp/{TOKEN} 接口的请求。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class UnbindMpRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class UnbindMpRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { /// /// 获取或设置微信 AppId。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/UnbindMpResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/UnbindMpResponse.cs similarity index 92% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/UnbindMpResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/UnbindMpResponse.cs index 102cecf3..30b0b067 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Mp/UnbindMpResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/Mp/UnbindMpResponse.cs @@ -6,7 +6,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// 表示 [POST] /unbindmp/{TOKEN} 接口的响应。 /// [Obsolete("相关接口或字段于 2023-04-07 下线。")] - public class UnbindMpResponse : WechatOpenAIResponse + public class UnbindMpResponse : WechatChatbotResponse { /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/KefuStateChangeRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/KefuStateChangeRequest.cs similarity index 84% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/KefuStateChangeRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/KefuStateChangeRequest.cs index caef27d4..ad30db44 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/KefuStateChangeRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/KefuStateChangeRequest.cs @@ -3,10 +3,10 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// /// 表示 [POST] /kefustate/change/{TOKEN} 接口的请求。 /// - public class KefuStateChangeRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class KefuStateChangeRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { /// - /// 获取或设置微信 AppId。如果不指定将使用构造 时的 参数。 + /// 获取或设置微信 AppId。如果不指定将使用构造 时的 参数。 /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/KefuStateChangeResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/KefuStateChangeResponse.cs similarity index 74% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/KefuStateChangeResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/KefuStateChangeResponse.cs index b39a7ab0..99c2f92d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/KefuStateChangeResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/KefuStateChangeResponse.cs @@ -3,7 +3,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// /// 表示 [POST] /kefustate/change/{TOKEN} 接口的响应。 /// - public class KefuStateChangeResponse : WechatOpenAIResponse + public class KefuStateChangeResponse : WechatChatbotResponse { } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/KefuStateGetRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/KefuStateGetRequest.cs similarity index 81% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/KefuStateGetRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/KefuStateGetRequest.cs index 97555d80..7e9b578b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/KefuStateGetRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/KefuStateGetRequest.cs @@ -3,10 +3,10 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// /// 表示 [POST] /kefustate/get/{TOKEN} 接口的请求。 /// - public class KefuStateGetRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class KefuStateGetRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { /// - /// 获取或设置微信 AppId。如果不指定将使用构造 时的 参数。 + /// 获取或设置微信 AppId。如果不指定将使用构造 时的 参数。 /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/KefuStateGetResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/KefuStateGetResponse.cs similarity index 92% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/KefuStateGetResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/KefuStateGetResponse.cs index 44b9fccc..2dcfa8d4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/KefuStateGetResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/KefuStateGetResponse.cs @@ -3,7 +3,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// /// 表示 [POST] /kefustate/get/{TOKEN} 接口的响应。 /// - public class KefuStateGetResponse : WechatOpenAIResponse + public class KefuStateGetResponse : WechatChatbotResponse { /// /// 获取或设置客服接入状态。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/SendMessageRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/SendMessageRequest.cs similarity index 91% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/SendMessageRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/SendMessageRequest.cs index cfb2da92..213cee25 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/SendMessageRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/SendMessageRequest.cs @@ -3,10 +3,10 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Models /// /// 表示 [POST] /sendmsg/{TOKEN} 接口的请求。 /// - public class SendMessageRequest : WechatOpenAIRequest, WechatOpenAIRequest.Serialization.IEncryptedXmlable + public class SendMessageRequest : WechatChatbotRequest, WechatChatbotRequest.Serialization.IEncryptedXmlable { /// - /// 获取或设置微信 AppId。如果不指定将使用构造 时的 参数。 + /// 获取或设置微信 AppId。如果不指定将使用构造 时的 参数。 /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/SendMessageResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/SendMessageResponse.cs similarity index 74% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/SendMessageResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/SendMessageResponse.cs index 728a4205..f72b124d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/ThirdKf/SendMessageResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Models/Chatbot/ThirdKf/SendMessageResponse.cs @@ -3,7 +3,7 @@ /// /// 表示 [POST] /sendmsg/{TOKEN} 接口的响应。 /// - public class SendMessageResponse : WechatOpenAIResponse + public class SendMessageResponse : WechatChatbotResponse { } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Settings/Credentials.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Settings/Credentials.cs index e0ff3a0c..90368e8f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Settings/Credentials.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/Settings/Credentials.cs @@ -5,21 +5,21 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Settings public sealed class Credentials { /// - /// 初始化客户端时 的副本。 + /// 初始化客户端时 的副本。 /// public string AppId { get; } /// - /// 初始化客户端时 的副本。 + /// 初始化客户端时 的副本。 /// public string Token { get; } /// - /// 初始化客户端时 的副本。 + /// 初始化客户端时 的副本。 /// public string EncodingAESKey { get; } - internal Credentials(WechatOpenAIClientOptions options) + internal Credentials(WechatChatbotClientOptions options) { if (options is null) throw new ArgumentNullException(nameof(options)); diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClient.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotClient.cs similarity index 83% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClient.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotClient.cs index a74cdf3c..739e0c5c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotClient.cs @@ -9,7 +9,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// 一个微信智能对话 API HTTP 客户端。 /// - public class WechatOpenAIClient : CommonClientBase, ICommonClient + public class WechatChatbotClient : CommonClientBase, ICommonClient { /// /// 获取当前客户端使用的微信智能对话平台凭证。 @@ -17,10 +17,10 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI public Settings.Credentials Credentials { get; } /// - /// 用指定的配置项初始化 类的新实例。 + /// 用指定的配置项初始化 类的新实例。 /// /// 配置项。 - public WechatOpenAIClient(WechatOpenAIClientOptions options) + public WechatChatbotClient(WechatChatbotClientOptions options) : this(options, null) { } @@ -31,14 +31,14 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// /// - internal protected WechatOpenAIClient(WechatOpenAIClientOptions options, HttpClient? httpClient, bool disposeClient = true) + internal protected WechatChatbotClient(WechatChatbotClientOptions options, HttpClient? httpClient, bool disposeClient = true) : base(httpClient, disposeClient) { if (options is null) throw new ArgumentNullException(nameof(options)); Credentials = new Settings.Credentials(options); - FlurlClient.BaseUrl = options.Endpoint ?? WechatOpenAIEndpoints.DEFAULT; + FlurlClient.BaseUrl = options.Endpoint ?? WechatChatbotEndpoints.DEFAULT; FlurlClient.WithTimeout(options.Timeout <= 0 ? Timeout.InfiniteTimeSpan : TimeSpan.FromMilliseconds(options.Timeout)); } @@ -49,7 +49,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// /// - public IFlurlRequest CreateFlurlRequest(WechatOpenAIRequest request, HttpMethod httpMethod, params object[] urlSegments) + public IFlurlRequest CreateFlurlRequest(WechatChatbotRequest request, HttpMethod httpMethod, params object[] urlSegments) { IFlurlRequest flurlRequest = base.CreateFlurlRequest(request, httpMethod, urlSegments); @@ -65,7 +65,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// public async Task SendFlurlRequestAsync(IFlurlRequest flurlRequest, HttpContent? httpContent = null, CancellationToken cancellationToken = default) - where T : WechatOpenAIResponse, new() + where T : WechatChatbotResponse, new() { if (flurlRequest is null) throw new ArgumentNullException(nameof(flurlRequest)); @@ -82,11 +82,11 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// public async Task SendFlurlRequestAsJsonAsync(IFlurlRequest flurlRequest, object? data = null, CancellationToken cancellationToken = default) - where T : WechatOpenAIResponse, new() + where T : WechatChatbotResponse, new() { if (flurlRequest is null) throw new ArgumentNullException(nameof(flurlRequest)); - if (data is WechatOpenAIRequest.Serialization.IEncryptedXmlable) + if (data is WechatChatbotRequest.Serialization.IEncryptedXmlable) { string plainXml = Utilities.XmlHelper.ConvertFromJson(JsonSerializer.Serialize(data)); string encryptedXml = Utilities.WxMsgCryptor.AESEncrypt(plainText: plainXml, encodingAESKey: Credentials.EncodingAESKey!, appId: Credentials.AppId!); diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClientBuilder.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotClientBuilder.cs similarity index 54% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClientBuilder.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotClientBuilder.cs index 130b6cb8..b865e1e0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClientBuilder.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotClientBuilder.cs @@ -5,39 +5,39 @@ using System.Net.Http; namespace SKIT.FlurlHttpClient.Wechat.OpenAI { /// - /// 用于构造 实例的构造器。 + /// 用于构造 实例的构造器。 /// - public partial class WechatOpenAIClientBuilder : ICommonClientBuilder + public partial class WechatChatbotClientBuilder : ICommonClientBuilder { - private readonly WechatOpenAIClientOptions _options; + private readonly WechatChatbotClientOptions _options; private readonly IList> _configures; private readonly IList _interceptors; private HttpClient? _httpClient; private bool? _disposeClient; - private WechatOpenAIClientBuilder(WechatOpenAIClientOptions options) + private WechatChatbotClientBuilder(WechatChatbotClientOptions options) { _options = options; _configures = new List>(); _interceptors = new List(); } - ICommonClientBuilder ICommonClientBuilder.ConfigureSettings(Action configure) + ICommonClientBuilder ICommonClientBuilder.ConfigureSettings(Action configure) { return ConfigureSettings(configure); } - ICommonClientBuilder ICommonClientBuilder.UseInterceptor(HttpInterceptor interceptor) + ICommonClientBuilder ICommonClientBuilder.UseInterceptor(HttpInterceptor interceptor) { return UseInterceptor(interceptor); } - ICommonClientBuilder ICommonClientBuilder.UseHttpClient(HttpClient httpClient, bool disposeClient) + ICommonClientBuilder ICommonClientBuilder.UseHttpClient(HttpClient httpClient, bool disposeClient) { return UseHttpClient(httpClient, disposeClient); } - public WechatOpenAIClientBuilder ConfigureSettings(Action configure) + public WechatChatbotClientBuilder ConfigureSettings(Action configure) { if (configure is null) throw new ArgumentNullException(nameof(configure)); @@ -45,7 +45,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI return this; } - public WechatOpenAIClientBuilder UseInterceptor(HttpInterceptor interceptor) + public WechatChatbotClientBuilder UseInterceptor(HttpInterceptor interceptor) { if (interceptor is null) throw new ArgumentNullException(nameof(interceptor)); @@ -53,7 +53,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI return this; } - public WechatOpenAIClientBuilder UseHttpClient(HttpClient httpClient, bool disposeClient = true) + public WechatChatbotClientBuilder UseHttpClient(HttpClient httpClient, bool disposeClient = true) { if (httpClient is null) throw new ArgumentNullException(nameof(httpClient)); @@ -62,11 +62,11 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI return this; } - public WechatOpenAIClient Build() + public WechatChatbotClient Build() { - WechatOpenAIClient client = _disposeClient.HasValue - ? new WechatOpenAIClient(_options, _httpClient, _disposeClient.Value) - : new WechatOpenAIClient(_options, _httpClient); + WechatChatbotClient client = _disposeClient.HasValue + ? new WechatChatbotClient(_options, _httpClient, _disposeClient.Value) + : new WechatChatbotClient(_options, _httpClient); foreach (Action configure in _configures) { @@ -82,13 +82,13 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI } } - partial class WechatOpenAIClientBuilder + partial class WechatChatbotClientBuilder { - public static WechatOpenAIClientBuilder Create(WechatOpenAIClientOptions options) + public static WechatChatbotClientBuilder Create(WechatChatbotClientOptions options) { if (options is null) throw new ArgumentNullException(nameof(options)); - return new WechatOpenAIClientBuilder(options); + return new WechatChatbotClientBuilder(options); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClientOptions.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotClientOptions.cs similarity index 75% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClientOptions.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotClientOptions.cs index e16c921f..06fc665d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIClientOptions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotClientOptions.cs @@ -1,9 +1,9 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI { /// - /// 一个用于构造 时使用的配置项。 + /// 一个用于构造 时使用的配置项。 /// - public class WechatOpenAIClientOptions + public class WechatChatbotClientOptions { /// /// 获取或设置请求超时时间（单位：毫秒）。 @@ -13,9 +13,9 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// 获取或设置微信智能对话 API 入口点。 - /// 默认值： + /// 默认值： /// - public string Endpoint { get; set; } = WechatOpenAIEndpoints.DEFAULT; + public string Endpoint { get; set; } = WechatChatbotEndpoints.DEFAULT; /// /// 获取或设置微信智能对话 AppId。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIEndpoints.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotEndpoints.cs similarity index 90% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIEndpoints.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotEndpoints.cs index b32baf08..81be8b4a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIEndpoints.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotEndpoints.cs @@ -3,7 +3,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// 微信智能对话 API 接口域名。 /// - public static class WechatOpenAIEndpoints + public static class WechatChatbotEndpoints { /// /// 主域名（默认）。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotEvent.cs similarity index 93% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIEvent.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotEvent.cs index bd66cbf5..fe7feb34 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotEvent.cs @@ -4,7 +4,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// 表示微信智能对话 API 回调通知事件的基类。 /// [System.Xml.Serialization.XmlRoot("xml")] - public class WechatOpenAIEvent : ICommonWebhookEvent + public class WechatChatbotEvent : ICommonWebhookEvent { /// /// 获取或设置 AppId。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIException.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotException.cs similarity index 62% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIException.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotException.cs index 58ce6382..2d3712f8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIException.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotException.cs @@ -5,21 +5,21 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// 当调用微信智能对话 API 出错时引发的异常。 /// - public class WechatOpenAIException : CommonException + public class WechatChatbotException : CommonException { /// - public WechatOpenAIException() + public WechatChatbotException() { } /// - public WechatOpenAIException(string message) + public WechatChatbotException(string message) : base(message) { } /// - public WechatOpenAIException(string message, Exception innerException) + public WechatChatbotException(string message, Exception innerException) : base(message, innerException) { } diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotRequest.cs similarity index 77% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotRequest.cs index 0564272e..745f24f2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotRequest.cs @@ -3,7 +3,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// 表示微信智能对话 API 请求的基类。 /// - public abstract class WechatOpenAIRequest : CommonRequestBase, ICommonRequest + public abstract class WechatChatbotRequest : CommonRequestBase, ICommonRequest { public static class Serialization { diff --git a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotResponse.cs similarity index 93% rename from src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotResponse.cs index 98940077..8af99ba9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatOpenAIResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.OpenAI/WechatChatbotResponse.cs @@ -3,7 +3,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// 表示微信智能对话 API 响应的基类。 /// - public abstract class WechatOpenAIResponse : CommonResponseBase, ICommonResponse + public abstract class WechatChatbotResponse : CommonResponseBase, ICommonResponse { /// /// 获取微信智能对话 API 返回的错误码。 @@ -49,7 +49,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI /// /// 表示微信智能对话 API 响应的泛型基类。 /// - public abstract class WechatOpenAIResponse : WechatOpenAIResponse + public abstract class WechatChatbotResponse : WechatChatbotResponse where TData : class { /// diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/EventSamples/ThirdKf/UserEnterEvent.xml b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/EventSamples/Chatbot/ThirdKf/UserEnterEvent.xml similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/EventSamples/ThirdKf/UserEnterEvent.xml rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/EventSamples/Chatbot/ThirdKf/UserEnterEvent.xml diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/EventSamples/ThirdKf/UserQuitEvent.xml b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/EventSamples/Chatbot/ThirdKf/UserQuitEvent.xml similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/EventSamples/ThirdKf/UserQuitEvent.xml rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/EventSamples/Chatbot/ThirdKf/UserQuitEvent.xml diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/IMPORTANT_CodeAnalyzeTests.cs b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/IMPORTANT_CodeAnalyzeTests.cs index a4870f0e..3e79d5f0 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/IMPORTANT_CodeAnalyzeTests.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/IMPORTANT_CodeAnalyzeTests.cs @@ -19,11 +19,15 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests { var options = new TypeDeclarationAnalyzerOptions() { - SdkAssembly = Assembly.GetAssembly(typeof(WechatOpenAIClient))!, + SdkAssembly = Assembly.GetAssembly(typeof(WechatChatbotClient))!, SdkRequestModelDeclarationNamespace = "SKIT.FlurlHttpClient.Wechat.OpenAI.Models", SdkResponseModelDeclarationNamespace = "SKIT.FlurlHttpClient.Wechat.OpenAI.Models", SdkExecutingExtensionDeclarationNamespace = "SKIT.FlurlHttpClient.Wechat.OpenAI", SdkWebhookEventDeclarationNamespace = "SKIT.FlurlHttpClient.Wechat.OpenAI.Events", + IgnoreRequestModelTypes = (type) => !typeof(WechatChatbotRequest).IsAssignableFrom(type), + IgnoreResponseModelTypes = (type) => !typeof(WechatChatbotResponse).IsAssignableFrom(type), + IgnoreExecutingExtensionTypes = (type) => !type.Name.StartsWith(nameof(WechatChatbotClient)), + IgnoreWebhookEventTypes = (type) => !typeof(WechatChatbotEvent).IsAssignableFrom(type), ThrowOnNotFoundRequestModelTypes = true, ThrowOnNotFoundResponseModelTypes = true, ThrowOnNotFoundExecutingExtensionTypes = true, @@ -39,12 +43,18 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests var options = new SourceFileAnalyzerOptions() { - SdkAssembly = Assembly.GetAssembly(typeof(WechatOpenAIClient))!, + SdkAssembly = Assembly.GetAssembly(typeof(WechatChatbotClient))!, SdkRequestModelDeclarationNamespace = "SKIT.FlurlHttpClient.Wechat.OpenAI.Models", SdkResponseModelDeclarationNamespace = "SKIT.FlurlHttpClient.Wechat.OpenAI.Models", SdkWebhookEventDeclarationNamespace = "SKIT.FlurlHttpClient.Wechat.OpenAI.Events", ProjectSourceRootDirectory = Path.Combine(projdir, "./src/SKIT.FlurlHttpClient.Wechat.OpenAI/"), ProjectTestRootDirectory = Path.Combine(projdir, "./test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/"), + ProjectSourceRequestModelClassCodeSubDirectory = "Models/Chatbot/", + ProjectSourceResponseModelClassCodeSubDirectory = "Models/Chatbot/", + ProjectSourceWebhookEventClassCodeSubDirectory = "Events/Chatbot/", + ProjectTestRequestModelSerializationSampleSubDirectory = "ModelSamples/Chatbot/", + ProjectTestResponseModelSerializationSampleSubDirectory = "ModelSamples/Chatbot/", + ProjectTestWebhookEventSerializationSampleSubDirectory = "EventSamples/Chatbot/", ThrowOnNotFoundRequestModelClassCodeFiles = true, ThrowOnNotFoundResponseModelClassCodeFiles = true, ThrowOnNotFoundExecutingExtensionClassCodeFiles = true, diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Bot/BatchImportSkillRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Bot/BatchImportSkillRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Bot/BatchImportSkillRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Bot/BatchImportSkillRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Bot/LabelBatchSetRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Bot/LabelBatchSetRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Bot/LabelBatchSetRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Bot/LabelBatchSetRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Bot/PublishProgressRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Bot/PublishProgressRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Bot/PublishProgressRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Bot/PublishProgressRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Bot/PublishProgressResponse.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Bot/PublishProgressResponse.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Bot/PublishProgressResponse.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Bot/PublishProgressResponse.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Bot/PublishRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Bot/PublishRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Bot/PublishRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Bot/PublishRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Bot/SetAutoReplyRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Bot/SetAutoReplyRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Bot/SetAutoReplyRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Bot/SetAutoReplyRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/AIBotRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/AIBotRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/AIBotRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/AIBotRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/AIBotResponse.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/AIBotResponse.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/AIBotResponse.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/AIBotResponse.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/FeedbackRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/FeedbackRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/FeedbackRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/FeedbackRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/GetHotQueryDetailRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/GetHotQueryDetailRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/GetHotQueryDetailRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/GetHotQueryDetailRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/GetHotQueryDetailResponse.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/GetHotQueryDetailResponse.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/GetHotQueryDetailResponse.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/GetHotQueryDetailResponse.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/GetHotQueryListRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/GetHotQueryListRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/GetHotQueryListRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/GetHotQueryListRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/GetHotQueryListResponse.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/GetHotQueryListResponse.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/GetHotQueryListResponse.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/GetHotQueryListResponse.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/SignRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/SignRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/SignRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/SignRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/SignResponse.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/SignResponse.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Dialog/SignResponse.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Dialog/SignResponse.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Mp/AssetsUploadRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Mp/AssetsUploadRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Mp/AssetsUploadRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Mp/AssetsUploadRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Mp/GetBindLinkRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Mp/GetBindLinkRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Mp/GetBindLinkRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Mp/GetBindLinkRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Mp/GetBindListResponse.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Mp/GetBindListResponse.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Mp/GetBindListResponse.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Mp/GetBindListResponse.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Mp/GetH5LinkRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Mp/GetH5LinkRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Mp/GetH5LinkRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Mp/GetH5LinkRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Mp/UnbindMpRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Mp/UnbindMpRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Mp/UnbindMpRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/Mp/UnbindMpRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/ThirdKf/KefuStateChangeRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/ThirdKf/KefuStateChangeRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/ThirdKf/KefuStateChangeRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/ThirdKf/KefuStateChangeRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/ThirdKf/KefuStateGetRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/ThirdKf/KefuStateGetRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/ThirdKf/KefuStateGetRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/ThirdKf/KefuStateGetRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/ThirdKf/SendMessageRequest.json b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/ThirdKf/SendMessageRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/ThirdKf/SendMessageRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/ModelSamples/Chatbot/ThirdKf/SendMessageRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/TestCase_ApiExecuteMpTests.cs b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/TestCase_ApiExecuteMpTests.cs deleted file mode 100644 index 8ba72381..00000000 --- a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/TestCase_ApiExecuteMpTests.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Threading.Tasks; -using Xunit; - -namespace SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests -{ - public class TestCase_ApiExecuteMpTests - { - [Fact(DisplayName = "测试用例：调用 API [POST] /getbindlink/{TOKEN}")] - public async Task TestExecuteSign() - { - var request = new Models.GetBindLinkRequest() { RedirectUrl = "https://example.com" }; - var response = await TestClients.Instance.ExecuteGetBindLinkAsync(request); - - Assert.NotNull(response.LinkUrl); - } - } -} diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/TestCase_ToolsAESUtilityTests.cs b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/TestCase_ToolsAESUtilityTests.cs index 4b71f4a7..e708ba8e 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/TestCase_ToolsAESUtilityTests.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/TestCase_ToolsAESUtilityTests.cs @@ -1,5 +1,3 @@ -using System; -using System.Text; using Xunit; namespace SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests diff --git a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/TestClients.cs b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/TestClients.cs index b6820f6f..d559dafa 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/TestClients.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests/TestClients.cs @@ -4,7 +4,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests { static TestClients() { - Instance = new WechatOpenAIClient(new WechatOpenAIClientOptions() + Instance = new WechatChatbotClient(new WechatChatbotClientOptions() { AppId = TestConfigs.WechatAppId, Token = TestConfigs.WechatToken, @@ -12,6 +12,6 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.UnitTests }); } - public static readonly WechatOpenAIClient Instance; + public static readonly WechatChatbotClient Instance; } }