From 76f9cb855b27cbecc36c56b9c66cedc3c35733b7 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Sun, 28 May 2023 20:56:46 +0800 Subject: [PATCH] =?UTF-8?q?chore(wxapi):=20=E8=B0=83=E6=95=B4=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WechatApiClientExecuteWxaExtensions.cs | 145 ---------------- .../WechatApiClientExecuteWxaSecExtensions.cs | 157 ++++++++++++++++++ .../Order}/WxaSecOrderGetOrderListRequest.cs | 0 .../Order}/WxaSecOrderGetOrderListResponse.cs | 0 .../Order}/WxaSecOrderGetOrderRequest.cs | 0 .../Order}/WxaSecOrderGetOrderResponse.cs | 0 .../WxaSecOrderIsTradeManagedRequest.cs | 0 .../WxaSecOrderIsTradeManagedResponse.cs | 0 .../WxaSecOrderNotifyConfirmReceiveRequest.cs | 0 ...WxaSecOrderNotifyConfirmReceiveResponse.cs | 0 .../WxaSecOrderSetMessageJumpPathRequest.cs | 0 .../WxaSecOrderSetMessageJumpPathResponse.cs | 0 ...cOrderUploadCombinedShippingInfoRequest.cs | 0 ...OrderUploadCombinedShippingInfoResponse.cs | 0 .../WxaSecOrderUploadShippingInfoRequest.cs | 0 .../WxaSecOrderUploadShippingInfoResponse.cs | 0 .../WxaSecOrderGetOrderListRequest.json | 0 .../WxaSecOrderGetOrderListResponse.json | 0 .../Order}/WxaSecOrderGetOrderRequest.json | 0 .../Order}/WxaSecOrderGetOrderResponse.json | 0 .../WxaSecOrderIsTradeManagedRequest.json | 0 .../WxaSecOrderIsTradeManagedResponse.json | 0 ...xaSecOrderNotifyConfirmReceiveRequest.json | 0 .../WxaSecOrderSetMessageJumpPathRequest.json | 0 ...rderUploadCombinedShippingInfoRequest.json | 0 .../WxaSecOrderUploadShippingInfoRequest.json | 0 26 files changed, 157 insertions(+), 145 deletions(-) create mode 100644 src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaSecExtensions.cs rename src/SKIT.FlurlHttpClient.Wechat.Api/Models/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderGetOrderListRequest.cs (100%) rename src/SKIT.FlurlHttpClient.Wechat.Api/Models/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderGetOrderListResponse.cs (100%) rename src/SKIT.FlurlHttpClient.Wechat.Api/Models/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderGetOrderRequest.cs (100%) rename src/SKIT.FlurlHttpClient.Wechat.Api/Models/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderGetOrderResponse.cs (100%) rename src/SKIT.FlurlHttpClient.Wechat.Api/Models/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderIsTradeManagedRequest.cs (100%) rename src/SKIT.FlurlHttpClient.Wechat.Api/Models/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderIsTradeManagedResponse.cs (100%) rename src/SKIT.FlurlHttpClient.Wechat.Api/Models/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderNotifyConfirmReceiveRequest.cs (100%) rename src/SKIT.FlurlHttpClient.Wechat.Api/Models/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderNotifyConfirmReceiveResponse.cs (100%) rename src/SKIT.FlurlHttpClient.Wechat.Api/Models/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderSetMessageJumpPathRequest.cs (100%) rename src/SKIT.FlurlHttpClient.Wechat.Api/Models/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderSetMessageJumpPathResponse.cs (100%) rename src/SKIT.FlurlHttpClient.Wechat.Api/Models/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderUploadCombinedShippingInfoRequest.cs (100%) rename src/SKIT.FlurlHttpClient.Wechat.Api/Models/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderUploadCombinedShippingInfoResponse.cs (100%) rename src/SKIT.FlurlHttpClient.Wechat.Api/Models/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderUploadShippingInfoRequest.cs (100%) rename src/SKIT.FlurlHttpClient.Wechat.Api/Models/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderUploadShippingInfoResponse.cs (100%) rename test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderGetOrderListRequest.json (100%) rename test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderGetOrderListResponse.json (100%) rename test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderGetOrderRequest.json (100%) rename test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderGetOrderResponse.json (100%) rename test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderIsTradeManagedRequest.json (100%) rename test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderIsTradeManagedResponse.json (100%) rename test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderNotifyConfirmReceiveRequest.json (100%) rename test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderSetMessageJumpPathRequest.json (100%) rename test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderUploadCombinedShippingInfoRequest.json (100%) rename test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/{Wxa/WxaSecOrder => WxaSec/Order}/WxaSecOrderUploadShippingInfoRequest.json (100%) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaExtensions.cs index cd8ff8a1..0c072c12 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaExtensions.cs @@ -1223,151 +1223,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Api } #endregion - #region WxaSecOrder - /// - /// 异步调用 [POST] /wxa/sec/order/upload_shipping_info 接口。 - /// REF: https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html - /// - /// - /// - /// - /// - public static async Task ExecuteWxaSecOrderUploadShippingInfoAsync(this WechatApiClient client, Models.WxaSecOrderUploadShippingInfoRequest 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 - .CreateRequest(request, HttpMethod.Post, "wxa", "sec", "order", "upload_shipping_info") - .SetQueryParam("access_token", request.AccessToken); - - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); - } - - /// - /// 异步调用 [POST] /wxa/sec/order/upload_combined_shipping_info 接口。 - /// REF: https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html - /// - /// - /// - /// - /// - public static async Task ExecuteWxaSecOrderUploadCombinedShippingInfoAsync(this WechatApiClient client, Models.WxaSecOrderUploadCombinedShippingInfoRequest 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 - .CreateRequest(request, HttpMethod.Post, "wxa", "sec", "order", "upload_combined_shipping_info") - .SetQueryParam("access_token", request.AccessToken); - - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); - } - - /// - /// 异步调用 [POST] /wxa/sec/order/notify_confirm_receive 接口。 - /// REF: https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html - /// - /// - /// - /// - /// - public static async Task ExecuteWxaSecOrderNotifyConfirmReceiveAsync(this WechatApiClient client, Models.WxaSecOrderNotifyConfirmReceiveRequest 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 - .CreateRequest(request, HttpMethod.Post, "wxa", "sec", "order", "notify_confirm_receive") - .SetQueryParam("access_token", request.AccessToken); - - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); - } - - /// - /// 异步调用 [POST] /wxa/sec/order/set_msg_jump_path 接口。 - /// REF: https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html - /// - /// - /// - /// - /// - public static async Task ExecuteWxaSecOrderSetMessageJumpPathAsync(this WechatApiClient client, Models.WxaSecOrderSetMessageJumpPathRequest 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 - .CreateRequest(request, HttpMethod.Post, "wxa", "sec", "order", "set_msg_jump_path") - .SetQueryParam("access_token", request.AccessToken); - - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); - } - - /// - /// 异步调用 [POST] /wxa/sec/order/is_trade_managed 接口。 - /// REF: https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html - /// - /// - /// - /// - /// - public static async Task ExecuteWxaSecOrderIsTradeManagedAsync(this WechatApiClient client, Models.WxaSecOrderIsTradeManagedRequest request, CancellationToken cancellationToken = default) - { - if (client is null) throw new ArgumentNullException(nameof(client)); - if (request is null) throw new ArgumentNullException(nameof(request)); - - if (request.AppId == null) - request.AppId = client.Credentials.AppId; - - IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "wxa", "sec", "order", "is_trade_managed") - .SetQueryParam("access_token", request.AccessToken); - - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); - } - - /// - /// 异步调用 [POST] /wxa/sec/order/get_order_list 接口。 - /// REF: https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html - /// - /// - /// - /// - /// - public static async Task ExecuteWxaSecOrderGetOrderListAsync(this WechatApiClient client, Models.WxaSecOrderGetOrderListRequest 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 - .CreateRequest(request, HttpMethod.Post, "wxa", "sec", "order", "get_order_list") - .SetQueryParam("access_token", request.AccessToken); - - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); - } - - /// - /// 异步调用 [POST] /wxa/sec/order/get_order 接口。 - /// REF: https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html - /// - /// - /// - /// - /// - public static async Task ExecuteWxaSecOrderGetOrderAsync(this WechatApiClient client, Models.WxaSecOrderGetOrderRequest 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 - .CreateRequest(request, HttpMethod.Post, "wxa", "sec", "order", "get_order") - .SetQueryParam("access_token", request.AccessToken); - - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); - } - #endregion - #region HardwareDevice /// /// 异步调用 [POST] /wxa/getsnticket 接口。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaSecExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaSecExtensions.cs new file mode 100644 index 00000000..ccc69de0 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaSecExtensions.cs @@ -0,0 +1,157 @@ +using System; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; +using Flurl; +using Flurl.Http; + +namespace SKIT.FlurlHttpClient.Wechat.Api +{ + public static class WechatApiClientExecuteWxaSecExtensions + { + #region Order + /// + /// 异步调用 [POST] /wxa/sec/order/upload_shipping_info 接口。 + /// REF: https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html + /// + /// + /// + /// + /// + public static async Task ExecuteWxaSecOrderUploadShippingInfoAsync(this WechatApiClient client, Models.WxaSecOrderUploadShippingInfoRequest 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 + .CreateRequest(request, HttpMethod.Post, "wxa", "sec", "order", "upload_shipping_info") + .SetQueryParam("access_token", request.AccessToken); + + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } + + /// + /// 异步调用 [POST] /wxa/sec/order/upload_combined_shipping_info 接口。 + /// REF: https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html + /// + /// + /// + /// + /// + public static async Task ExecuteWxaSecOrderUploadCombinedShippingInfoAsync(this WechatApiClient client, Models.WxaSecOrderUploadCombinedShippingInfoRequest 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 + .CreateRequest(request, HttpMethod.Post, "wxa", "sec", "order", "upload_combined_shipping_info") + .SetQueryParam("access_token", request.AccessToken); + + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } + + /// + /// 异步调用 [POST] /wxa/sec/order/notify_confirm_receive 接口。 + /// REF: https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html + /// + /// + /// + /// + /// + public static async Task ExecuteWxaSecOrderNotifyConfirmReceiveAsync(this WechatApiClient client, Models.WxaSecOrderNotifyConfirmReceiveRequest 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 + .CreateRequest(request, HttpMethod.Post, "wxa", "sec", "order", "notify_confirm_receive") + .SetQueryParam("access_token", request.AccessToken); + + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } + + /// + /// 异步调用 [POST] /wxa/sec/order/set_msg_jump_path 接口。 + /// REF: https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html + /// + /// + /// + /// + /// + public static async Task ExecuteWxaSecOrderSetMessageJumpPathAsync(this WechatApiClient client, Models.WxaSecOrderSetMessageJumpPathRequest 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 + .CreateRequest(request, HttpMethod.Post, "wxa", "sec", "order", "set_msg_jump_path") + .SetQueryParam("access_token", request.AccessToken); + + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } + + /// + /// 异步调用 [POST] /wxa/sec/order/is_trade_managed 接口。 + /// REF: https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html + /// + /// + /// + /// + /// + public static async Task ExecuteWxaSecOrderIsTradeManagedAsync(this WechatApiClient client, Models.WxaSecOrderIsTradeManagedRequest request, CancellationToken cancellationToken = default) + { + if (client is null) throw new ArgumentNullException(nameof(client)); + if (request is null) throw new ArgumentNullException(nameof(request)); + + if (request.AppId == null) + request.AppId = client.Credentials.AppId; + + IFlurlRequest flurlReq = client + .CreateRequest(request, HttpMethod.Post, "wxa", "sec", "order", "is_trade_managed") + .SetQueryParam("access_token", request.AccessToken); + + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } + + /// + /// 异步调用 [POST] /wxa/sec/order/get_order_list 接口。 + /// REF: https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html + /// + /// + /// + /// + /// + public static async Task ExecuteWxaSecOrderGetOrderListAsync(this WechatApiClient client, Models.WxaSecOrderGetOrderListRequest 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 + .CreateRequest(request, HttpMethod.Post, "wxa", "sec", "order", "get_order_list") + .SetQueryParam("access_token", request.AccessToken); + + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } + + /// + /// 异步调用 [POST] /wxa/sec/order/get_order 接口。 + /// REF: https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html + /// + /// + /// + /// + /// + public static async Task ExecuteWxaSecOrderGetOrderAsync(this WechatApiClient client, Models.WxaSecOrderGetOrderRequest 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 + .CreateRequest(request, HttpMethod.Post, "wxa", "sec", "order", "get_order") + .SetQueryParam("access_token", request.AccessToken); + + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } + #endregion + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderGetOrderListRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderGetOrderListRequest.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderGetOrderListRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderGetOrderListRequest.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderGetOrderListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderGetOrderListResponse.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderGetOrderListResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderGetOrderListResponse.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderGetOrderRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderGetOrderRequest.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderGetOrderRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderGetOrderRequest.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderGetOrderResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderGetOrderResponse.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderGetOrderResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderGetOrderResponse.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderIsTradeManagedRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderIsTradeManagedRequest.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderIsTradeManagedRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderIsTradeManagedRequest.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderIsTradeManagedResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderIsTradeManagedResponse.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderIsTradeManagedResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderIsTradeManagedResponse.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderNotifyConfirmReceiveRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderNotifyConfirmReceiveRequest.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderNotifyConfirmReceiveRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderNotifyConfirmReceiveRequest.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderNotifyConfirmReceiveResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderNotifyConfirmReceiveResponse.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderNotifyConfirmReceiveResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderNotifyConfirmReceiveResponse.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderSetMessageJumpPathRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderSetMessageJumpPathRequest.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderSetMessageJumpPathRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderSetMessageJumpPathRequest.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderSetMessageJumpPathResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderSetMessageJumpPathResponse.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderSetMessageJumpPathResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderSetMessageJumpPathResponse.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderUploadCombinedShippingInfoRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderUploadCombinedShippingInfoRequest.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderUploadCombinedShippingInfoRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderUploadCombinedShippingInfoRequest.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderUploadCombinedShippingInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderUploadCombinedShippingInfoResponse.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderUploadCombinedShippingInfoResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderUploadCombinedShippingInfoResponse.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderUploadShippingInfoRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderUploadShippingInfoRequest.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderUploadShippingInfoRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderUploadShippingInfoRequest.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderUploadShippingInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderUploadShippingInfoResponse.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Api/Models/Wxa/WxaSecOrder/WxaSecOrderUploadShippingInfoResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaSec/Order/WxaSecOrderUploadShippingInfoResponse.cs diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderGetOrderListRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderGetOrderListRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderGetOrderListRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderGetOrderListRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderGetOrderListResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderGetOrderListResponse.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderGetOrderListResponse.json rename to test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderGetOrderListResponse.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderGetOrderRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderGetOrderRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderGetOrderRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderGetOrderRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderGetOrderResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderGetOrderResponse.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderGetOrderResponse.json rename to test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderGetOrderResponse.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderIsTradeManagedRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderIsTradeManagedRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderIsTradeManagedRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderIsTradeManagedRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderIsTradeManagedResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderIsTradeManagedResponse.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderIsTradeManagedResponse.json rename to test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderIsTradeManagedResponse.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderNotifyConfirmReceiveRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderNotifyConfirmReceiveRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderNotifyConfirmReceiveRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderNotifyConfirmReceiveRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderSetMessageJumpPathRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderSetMessageJumpPathRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderSetMessageJumpPathRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderSetMessageJumpPathRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderUploadCombinedShippingInfoRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderUploadCombinedShippingInfoRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderUploadCombinedShippingInfoRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderUploadCombinedShippingInfoRequest.json diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderUploadShippingInfoRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderUploadShippingInfoRequest.json similarity index 100% rename from test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Wxa/WxaSecOrder/WxaSecOrderUploadShippingInfoRequest.json rename to test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/WxaSec/Order/WxaSecOrderUploadShippingInfoRequest.json