diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/Internal/FlurlHttpRequestOptionsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/Internal/FlurlHttpRequestOptionsExtensions.cs deleted file mode 100644 index 4128b30a..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/Internal/FlurlHttpRequestOptionsExtensions.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using Flurl.Http; - -namespace SKIT.FlurlHttpClient.Wechat.Api -{ - internal static class FlurlHttpRequestOptionsExtensions - { - public static IFlurlRequest SetOptions(this IFlurlRequest request, WechatApiRequest options) - { - if (request == null) throw new ArgumentNullException(nameof(request)); - if (options == null) throw new ArgumentNullException(nameof(options)); - - if (options.Timeout.HasValue) - { - request.WithTimeout(TimeSpan.FromMilliseconds(options.Timeout.Value)); - } - - return request; - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCVExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCVExtensions.cs index b7ce3bdc..9213810f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCVExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCVExtensions.cs @@ -20,9 +20,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (fileBytes != null && fileBytes.Any()) { - string filename = "image.png"; var fileContent = new ByteArrayContent(fileBytes); - httpContent.Add(fileContent, "\"img\"", "\"" + filename + "\""); + httpContent.Add(fileContent, "\"img\"", "\"image.png\""); fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/png"); fileContent.Headers.ContentLength = fileBytes.Length; } @@ -48,15 +47,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cv", "img", "qrcode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cv", "img", "qrcode") .SetQueryParam("access_token", request.AccessToken); if (!string.IsNullOrEmpty(request.ImageUrl)) flurlReq.SetQueryParam("img_url", request.ImageUrl); using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -74,15 +72,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cv", "img", "superresolution") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cv", "img", "superresolution") .SetQueryParam("access_token", request.AccessToken); if (!string.IsNullOrEmpty(request.ImageUrl)) flurlReq.SetQueryParam("img_url", request.ImageUrl); using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -100,15 +97,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cv", "img", "aicrop") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cv", "img", "aicrop") .SetQueryParam("access_token", request.AccessToken); if (!string.IsNullOrEmpty(request.ImageUrl)) flurlReq.SetQueryParam("img_url", request.ImageUrl); using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } #endregion @@ -128,8 +124,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cv", "ocr", "idcard") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cv", "ocr", "idcard") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("type", request.ImageMode); @@ -137,7 +132,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api flurlReq.SetQueryParam("img_url", request.ImageUrl); using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -155,8 +150,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cv", "ocr", "bankcard") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cv", "ocr", "bankcard") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("type", request.ImageMode); @@ -164,7 +158,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api flurlReq.SetQueryParam("img_url", request.ImageUrl); using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -182,8 +176,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cv", "ocr", "driving") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cv", "ocr", "driving") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("type", request.ImageMode); @@ -191,7 +184,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api flurlReq.SetQueryParam("img_url", request.ImageUrl); using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -209,8 +202,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cv", "ocr", "drivinglicense") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cv", "ocr", "drivinglicense") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("type", request.ImageMode); @@ -218,7 +210,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api flurlReq.SetQueryParam("img_url", request.ImageUrl); using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -236,8 +228,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cv", "ocr", "bizlicense") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cv", "ocr", "bizlicense") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("type", request.ImageMode); @@ -245,7 +236,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api flurlReq.SetQueryParam("img_url", request.ImageUrl); using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -263,15 +254,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cv", "ocr", "comm") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cv", "ocr", "comm") .SetQueryParam("access_token", request.AccessToken); if (!string.IsNullOrEmpty(request.ImageUrl)) flurlReq.SetQueryParam("img_url", request.ImageUrl); using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -288,15 +278,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cv", "ocr", "platenum") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cv", "ocr", "platenum") .SetQueryParam("access_token", request.AccessToken); if (!string.IsNullOrEmpty(request.ImageUrl)) flurlReq.SetQueryParam("img_url", request.ImageUrl); using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? new byte[0]); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCardExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCardExtensions.cs index b54f0d52..019367a0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCardExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCardExtensions.cs @@ -33,8 +33,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -54,8 +53,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -75,8 +73,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "batchget") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "batchget") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -99,8 +96,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -120,8 +116,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "modifystock") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "modifystock") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -141,8 +136,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "delete") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -162,8 +156,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "paycell", "set") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "paycell", "set") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -183,8 +176,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "selfconsumecell", "set") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "selfconsumecell", "set") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -204,8 +196,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "qrcode", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "qrcode", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -225,8 +216,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "landingpage", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "landingpage", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -246,8 +236,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "mpnews", "gethtml") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "mpnews", "gethtml") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -267,8 +256,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "testwhitelist", "set") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "testwhitelist", "set") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -289,8 +277,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "code", "deposit") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "code", "deposit") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -310,8 +297,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "code", "getdepositcount") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "code", "getdepositcount") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -331,8 +317,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "code", "checkcode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "code", "checkcode") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -355,8 +340,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "code", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "code", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -377,8 +361,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "code", "consume") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "code", "consume") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -399,8 +382,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "code", "decrypt") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "code", "decrypt") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -420,8 +402,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "code", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "code", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -441,8 +422,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "code", "unavailable") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "code", "unavailable") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -464,8 +444,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "user", "getcardlist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "user", "getcardlist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -487,8 +466,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "membercard", "activate", "geturl") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "membercard", "activate", "geturl") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -508,8 +486,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "membercard", "activatetempinfo", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "membercard", "activatetempinfo", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -530,8 +507,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "membercard", "activate") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "membercard", "activate") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -551,8 +527,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "membercard", "activateuserform", "set") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "membercard", "activateuserform", "set") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -572,8 +547,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "membercard", "updateuser") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "membercard", "updateuser") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -593,8 +567,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "membercard", "userinfo", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "membercard", "userinfo", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -616,8 +589,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "meetingticket", "updateuser") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "meetingticket", "updateuser") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -637,8 +609,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "movieticket", "updateuser") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "movieticket", "updateuser") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -658,8 +629,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "boardingpass", "checkin") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "boardingpass", "checkin") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -681,8 +651,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "giftcard", "page", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "giftcard", "page", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -702,8 +671,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "giftcard", "page", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "giftcard", "page", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -723,8 +691,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "giftcard", "page", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "giftcard", "page", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -744,8 +711,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "giftcard", "page", "batchget") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "giftcard", "page", "batchget") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -765,8 +731,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "giftcard", "maintain", "set") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "giftcard", "maintain", "set") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -786,8 +751,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "giftcard", "pay", "whitelist", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "giftcard", "pay", "whitelist", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -807,8 +771,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "giftcard", "pay", "submch", "bind") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "giftcard", "pay", "submch", "bind") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -828,8 +791,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "giftcard", "wxa", "set") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "giftcard", "wxa", "set") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -849,8 +811,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "generalcard", "updateuser") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "generalcard", "updateuser") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -871,8 +832,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "giftcard", "order", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "giftcard", "order", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -892,8 +852,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "giftcard", "order", "batchget") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "giftcard", "order", "batchget") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -913,8 +872,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "giftcard", "order", "refund") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "giftcard", "order", "refund") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -937,8 +895,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "paygiftcard", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "paygiftcard", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -958,8 +915,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "paygiftcard", "delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "paygiftcard", "delete") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -979,8 +935,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "paygiftcard", "getbyid") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "paygiftcard", "getbyid") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1000,8 +955,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "paygiftcard", "batchget") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "paygiftcard", "batchget") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1023,8 +977,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "submerchant", "submit") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "submerchant", "submit") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1044,11 +997,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "card", "getapplyprotocol") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "card", "getapplyprotocol") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1065,8 +1017,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "submerchant", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "submerchant", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1086,8 +1037,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "submerchant", "batchget") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "submerchant", "batchget") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1109,8 +1059,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "storewxa", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "storewxa", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1130,8 +1079,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "storewxa", "set") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "storewxa", "set") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCardInvoiceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCardInvoiceExtensions.cs index 62484578..46798167 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCardInvoiceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCardInvoiceExtensions.cs @@ -29,8 +29,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.Timestamp = DateTimeOffset.Now.ToLocalTime().ToUnixTimeSeconds(); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "getauthurl") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "getauthurl") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -52,8 +51,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "getauthdata") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "getauthdata") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -74,8 +72,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "rejectinsert") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "rejectinsert") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -95,8 +92,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "makeoutinvoice") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "makeoutinvoice") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -116,8 +112,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "clearoutinvoice") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "clearoutinvoice") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -137,8 +132,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "queryinvoceinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "queryinvoceinfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -159,8 +153,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "seturl") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "seturl") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -186,8 +179,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.CardExtra.Nonce = Guid.NewGuid().ToString("N"); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "insert") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "insert") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -209,8 +201,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "setbizattr") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "setbizattr") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("action", "set_pay_mch"); @@ -232,8 +223,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "setbizattr") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "setbizattr") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("action", "get_pay_mch"); @@ -254,8 +244,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "setbizattr") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "setbizattr") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("action", "set_contact"); @@ -276,8 +265,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "setbizattr") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "setbizattr") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("action", "get_contact"); @@ -299,8 +287,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "setbizattr") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "setbizattr") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("action", "set_auth_field"); @@ -322,8 +309,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "setbizattr") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "setbizattr") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("action", "get_auth_field"); @@ -346,8 +332,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "platform", "createcard") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "platform", "createcard") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -368,19 +353,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "platform", "setpdf") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "platform", "setpdf") .SetQueryParam("access_token", request.AccessToken); string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x"); - string filename = "invoice.pdf"; var httpContent = new MultipartFormDataContent(boundary); var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]); - httpContent.Add(fileContent, "\"pdf\"", "\"" + filename + "\""); + httpContent.Add(fileContent, "\"pdf\"", "\"invoice.pdf\""); + httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary); fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("application/pdf"); fileContent.Headers.ContentLength = request.FileBytes?.Length; - httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -400,8 +384,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.Action = "get_url"; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "platform", "getpdf") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "platform", "getpdf") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -422,8 +405,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "platform", "updatestatus") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "platform", "updatestatus") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -445,8 +427,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "reimburse", "getinvoiceinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "reimburse", "getinvoiceinfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -466,8 +447,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "reimburse", "getinvoicebatch") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "reimburse", "getinvoicebatch") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -487,8 +467,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "reimburse", "updatestatusbatch") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "reimburse", "updatestatusbatch") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -508,8 +487,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "reimburse", "updateinvoicestatus") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "reimburse", "updateinvoicestatus") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -531,8 +509,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "biz", "getusertitleurl") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "biz", "getusertitleurl") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -552,8 +529,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "biz", "getselecttitleurl") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "biz", "getselecttitleurl") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -573,8 +549,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "card", "invoice", "scantitle") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "card", "invoice", "scantitle") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinAccountExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinAccountExtensions.cs index 7b32566e..3e8e6fff 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinAccountExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinAccountExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "account", "fastregister") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "account", "fastregister") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,8 +45,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "account", "componentrebindadmin") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "account", "componentrebindadmin") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -67,11 +65,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "account", "getaccountbasicinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "account", "getaccountbasicinfo") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -88,8 +85,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "account", "modifyheadimage") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "account", "modifyheadimage") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -109,8 +105,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "account", "modifysignature") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "account", "modifysignature") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinCommentExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinCommentExtensions.cs index 29b70f4e..2819111f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinCommentExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinCommentExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "comment", "open") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "comment", "open") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,8 +45,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "comment", "close") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "comment", "close") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -67,8 +65,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "comment", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "comment", "list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -88,8 +85,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "comment", "markelect") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "comment", "markelect") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -109,8 +105,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "comment", "unmarkelect") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "comment", "unmarkelect") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -130,8 +125,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "comment", "delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "comment", "delete") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -152,8 +146,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "comment", "reply", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "comment", "reply", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -173,8 +166,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "comment", "reply", "delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "comment", "reply", "delete") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinComponentExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinComponentExtensions.cs index c3597a3d..42fb87de 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinComponentExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinComponentExtensions.cs @@ -31,8 +31,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.ComponentSecret = client.WechatAppSecret; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "component", "api_start_push_ticket") - .SetOptions(request); + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_start_push_ticket"); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } @@ -57,8 +56,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.ComponentSecret = client.WechatAppSecret; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "component", "api_component_token") - .SetOptions(request); + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_component_token"); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } @@ -80,8 +78,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.ComponentAppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "component", "api_create_preauthcode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_create_preauthcode") .SetQueryParam("component_access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -104,8 +101,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.ComponentAppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "component", "api_query_auth") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_query_auth") .SetQueryParam("component_access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -128,8 +124,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.ComponentAppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "component", "api_authorizer_token") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_authorizer_token") .SetQueryParam("component_access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -152,8 +147,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.ComponentAppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "component", "api_get_authorizer_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_get_authorizer_info") .SetQueryParam("component_access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -176,8 +170,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.ComponentAppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "component", "api_get_authorizer_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_get_authorizer_list") .SetQueryParam("component_access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -200,8 +193,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.ComponentAppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "component", "api_get_authorizer_option") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_get_authorizer_option") .SetQueryParam("component_access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -224,8 +216,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.ComponentAppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "component", "api_set_authorizer_option") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_set_authorizer_option") .SetQueryParam("component_access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -245,8 +236,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "component", "fastregisterweapp") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "fastregisterweapp") .SetQueryParam("action", "create") .SetQueryParam("component_access_token", request.ComponentAccessToken); @@ -267,8 +257,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "component", "fastregisterweapp") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "fastregisterweapp") .SetQueryParam("action", "search") .SetQueryParam("component_access_token", request.ComponentAccessToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinCustomServiceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinCustomServiceExtensions.cs index 12b26d92..7808da63 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinCustomServiceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinCustomServiceExtensions.cs @@ -26,11 +26,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "customservice", "getkflist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "customservice", "getkflist") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -47,11 +46,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "customservice", "getonlinekflist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "customservice", "getonlinekflist") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinExpressExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinExpressExtensions.cs index 22df329a..b942925b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinExpressExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinExpressExtensions.cs @@ -48,8 +48,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "pre_add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "pre_add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -71,8 +70,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -94,8 +92,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "readd") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "readd") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -117,8 +114,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "addtips") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "addtips") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -140,8 +136,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -163,8 +158,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "precancel") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "precancel") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -186,8 +180,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "cancel") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "cancel") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -209,8 +202,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "confirm_return") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "order", "confirm_return") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -230,8 +222,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "delivery", "getall") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "delivery", "getall") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -251,8 +242,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "shop", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "shop", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -272,8 +262,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "shop", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "shop", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -295,8 +284,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "test_update_order") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "test_update_order") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -318,8 +306,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "realmock_update_order") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "realmock_update_order") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -339,8 +326,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "open") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "open") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -362,8 +348,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "local", "business", "update_order") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "local", "business", "update_order") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -385,8 +370,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "business", "order", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "business", "order", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -406,8 +390,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "business", "order", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "business", "order", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -427,8 +410,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "business", "order", "batchget") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "business", "order", "batchget") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -448,8 +430,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "business", "order", "cancel") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "business", "order", "cancel") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -469,8 +450,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "business", "path", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "business", "path", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -490,11 +470,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "express", "business", "delivery", "getall") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "express", "business", "delivery", "getall") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -511,11 +490,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "express", "business", "account", "getall") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "express", "business", "account", "getall") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -532,8 +510,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "business", "account", "bind") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "business", "account", "bind") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -553,11 +530,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "express", "business", "printer", "getall") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "express", "business", "printer", "getall") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -574,8 +550,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "business", "printer", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "business", "printer", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -595,8 +570,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "business", "quota", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "business", "quota", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -616,8 +590,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "business", "test_update_order") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "business", "test_update_order") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -639,8 +612,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "delivery", "contact", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "delivery", "contact", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -660,8 +632,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "delivery", "template", "preview") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "delivery", "template", "preview") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -681,8 +652,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "delivery", "service", "business", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "delivery", "service", "business", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -702,8 +672,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "express", "delivery", "path", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "express", "delivery", "path", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinExtensions.cs index 326f7bab..a7bbd5a3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinExtensions.cs @@ -27,13 +27,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "token") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "token") .SetQueryParam("grant_type", request.GrantType) .SetQueryParam("appid", client.WechatAppId) .SetQueryParam("secret", client.WechatAppSecret); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -52,12 +51,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "ticket", "getticket") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "ticket", "getticket") .SetQueryParam("type", request.Type) .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -74,11 +72,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "getcallbackip") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "getcallbackip") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -95,11 +92,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "get_api_domain_ip") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "get_api_domain_ip") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -119,8 +115,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "clear_quota") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "clear_quota") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinGuideExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinGuideExtensions.cs index ba4d5bb6..d315e00c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinGuideExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinGuideExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "addguideacct") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "addguideacct") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -47,8 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "guide", "getguideacct") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "guide", "getguideacct") .SetQueryParam("access_token", request.AccessToken); if (!string.IsNullOrEmpty(request.GuideAccount)) @@ -56,7 +54,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api else if (!string.IsNullOrEmpty(request.GuideOpenId)) flurlReq.SetQueryParam("guide_openid", request.GuideOpenId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -73,8 +71,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "updateguideacct") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "updateguideacct") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -94,8 +91,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "delguideacct") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "delguideacct") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -117,8 +113,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "guidecreateqrcode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "guidecreateqrcode") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -140,8 +135,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "setguideconfig") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "setguideconfig") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -161,8 +155,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguideconfig") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguideconfig") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -182,8 +175,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "setguideacctconfig") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "setguideacctconfig") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -203,8 +195,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguideacctconfig") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguideacctconfig") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -226,8 +217,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "newguidegroup") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "newguidegroup") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -247,8 +237,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguidegrouplist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguidegrouplist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -268,8 +257,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getgroupinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getgroupinfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -289,8 +277,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "addguide2guidegroup") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "addguide2guidegroup") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -310,8 +297,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "delguide2guidegroup") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "delguide2guidegroup") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -331,8 +317,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getgroupbyguide") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getgroupbyguide") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -352,8 +337,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "delguidegroup") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "delguidegroup") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -375,8 +359,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "addguidebuyerrelation") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "addguidebuyerrelation") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -396,8 +379,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "delguidebuyerrelation") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "delguidebuyerrelation") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -417,8 +399,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguidebuyerrelationlist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguidebuyerrelationlist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -438,8 +419,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "rebindguideacctforbuyer") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "rebindguideacctforbuyer") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -459,8 +439,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "updateguidebuyerrelation") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "updateguidebuyerrelation") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -480,8 +459,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguidebuyerrelationbybuyer") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguidebuyerrelationbybuyer") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -501,8 +479,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguidebuyerrelation") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguidebuyerrelation") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -524,8 +501,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguidebuyerchatrecord") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguidebuyerchatrecord") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -547,8 +523,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "newguidetagoption") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "newguidetagoption") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -568,8 +543,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "delguidetagoption") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "delguidetagoption") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -589,8 +563,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "addguidetagoption") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "addguidetagoption") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -610,8 +583,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguidetagoption") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguidetagoption") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -631,8 +603,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "addguidebuyertag") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "addguidebuyertag") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -652,8 +623,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguidebuyertag") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguidebuyertag") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -673,8 +643,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "queryguidebuyerbytag") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "queryguidebuyerbytag") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -694,8 +663,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "delguidebuyertag") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "delguidebuyertag") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -715,8 +683,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "addguidebuyerdisplaytag") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "addguidebuyerdisplaytag") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -736,8 +703,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguidebuyerdisplaytag") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguidebuyerdisplaytag") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -759,8 +725,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "setguidecardmaterial") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "setguidecardmaterial") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -780,8 +745,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguidecardmaterial") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguidecardmaterial") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -801,8 +765,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "delguidecardmaterial") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "delguidecardmaterial") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -822,8 +785,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "setguideimagematerial") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "setguideimagematerial") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -843,8 +805,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguideimagematerial") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguideimagematerial") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -864,8 +825,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "delguideimagematerial") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "delguideimagematerial") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -885,8 +845,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "setguidewordmaterial") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "setguidewordmaterial") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -906,8 +865,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguidewordmaterial") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguidewordmaterial") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -927,8 +885,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "delguidewordmaterial") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "delguidewordmaterial") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -950,8 +907,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "addguidemassendjob") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "addguidemassendjob") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -971,8 +927,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguidemassendjoblist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguidemassendjoblist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -992,8 +947,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "getguidemassendjob") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "getguidemassendjob") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1013,8 +967,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "updateguidemassendjob") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "updateguidemassendjob") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1034,8 +987,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "guide", "cancelguidemassendjob") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "guide", "cancelguidemassendjob") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMaterialExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMaterialExtensions.cs index b62248f5..d03506ce 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMaterialExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMaterialExtensions.cs @@ -5,6 +5,7 @@ using System.Net.Http.Headers; using System.Text; using System.Threading; using System.Threading.Tasks; +using System.Web; using Flurl; using Flurl.Http; @@ -26,8 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "material", "add_news") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "material", "add_news") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,16 +46,21 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); + const string TYPE_IMAGE = "image"; + const string TYPE_THUMB = "thumb"; + const string TYPE_VOICE = "voice"; + const string TYPE_VIDEO = "video"; + if (string.IsNullOrEmpty(request.FileName)) { string ext = ""; - if ("image".Equals(request.Type)) + if (TYPE_IMAGE.Equals(request.Type)) ext = ".png"; - else if ("thumb".Equals(request.Type)) + else if (TYPE_THUMB.Equals(request.Type)) ext = ".jpg"; - else if ("voice".Equals(request.Type)) + else if (TYPE_VOICE.Equals(request.Type)) ext = ".mp3"; - else if ("video".Equals(request.Type)) + else if (TYPE_VIDEO.Equals(request.Type)) ext = ".mp4"; request.FileName = Guid.NewGuid().ToString("N").ToLower() + ext; @@ -63,45 +68,36 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (string.IsNullOrEmpty(request.FileContentType)) { - if (request.FileName!.EndsWith(".jpg", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "image/jpeg"; - else if (request.FileName!.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "image/jpeg"; - else if (request.FileName!.EndsWith(".png", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "image/png"; - else if (request.FileName!.EndsWith(".gif", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "image/gif"; - else if (request.FileName!.EndsWith(".mp3", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "audio/mpeg"; - else if (request.FileName!.EndsWith(".amr", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "audio/amr"; - else if (request.FileName!.EndsWith(".mp4", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "video/mp4"; + if (TYPE_IMAGE.Equals(request.Type) || TYPE_THUMB.Equals(request.Type)) + request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForImage(request.FileName!) ?? "image/png"; + else if (TYPE_VOICE.Equals(request.Type)) + request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForVoice(request.FileName!) ?? "audio/mp3"; + else if (TYPE_VIDEO.Equals(request.Type)) + request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForVideo(request.FileName!) ?? "video/mp4"; else request.FileContentType = "application/octet-stream"; } + IFlurlRequest flurlReq = client + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "material", "add_material") + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("type", request.Type); + string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x"); using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]); using var descContent = new ByteArrayContent(Encoding.UTF8.GetBytes(client.FlurlJsonSerializer.Serialize(request))); using var httpContent = new MultipartFormDataContent(boundary); - httpContent.Add(fileContent, "\"media\"", "\"" + request.FileName + "\""); + httpContent.Add(fileContent, "\"media\"", $"\"{HttpUtility.UrlEncode(request.FileName)}\""); httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary); fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(request.FileContentType); - fileContent.Headers.ContentLength = request.FileBytes?.Length ?? 0; + fileContent.Headers.ContentLength = request.FileBytes?.Length; - if ("video".Equals(request.Type)) + if (TYPE_VIDEO.Equals(request.Type)) { httpContent.Add(descContent, "\"description\""); } - IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "material", "add_material") - .SetOptions(request) - .SetQueryParam("access_token", request.AccessToken) - .SetQueryParam("type", request.Type); - - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -118,8 +114,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "material", "get_material") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "material", "get_material") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -139,8 +134,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "material", "get_material") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "material", "get_material") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -160,8 +154,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "material", "get_material") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "material", "get_material") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -181,8 +174,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "material", "del_material") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "material", "del_material") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -202,8 +194,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "material", "update_news") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "material", "update_news") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -223,11 +214,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "material", "get_materialcount") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "material", "get_materialcount") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -244,8 +234,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "material", "batchget_material") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "material", "batchget_material") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMediaExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMediaExtensions.cs index 4eba3197..9ad29748 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMediaExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMediaExtensions.cs @@ -5,6 +5,7 @@ using System.Net.Http.Headers; using System.Text; using System.Threading; using System.Threading.Tasks; +using System.Web; using Flurl; using Flurl.Http; @@ -26,16 +27,21 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); + const string TYPE_IMAGE = "image"; + const string TYPE_THUMB = "thumb"; + const string TYPE_VOICE = "voice"; + const string TYPE_VIDEO = "video"; + if (string.IsNullOrEmpty(request.FileName)) { string ext = ""; - if ("image".Equals(request.Type)) + if (TYPE_IMAGE.Equals(request.Type)) ext = ".png"; - else if ("thumb".Equals(request.Type)) + else if (TYPE_THUMB.Equals(request.Type)) ext = ".jpg"; - else if ("voice".Equals(request.Type)) + else if (TYPE_VOICE.Equals(request.Type)) ext = ".mp3"; - else if ("video".Equals(request.Type)) + else if (TYPE_VIDEO.Equals(request.Type)) ext = ".mp4"; request.FileName = Guid.NewGuid().ToString("N").ToLower() + ext; @@ -43,38 +49,30 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (string.IsNullOrEmpty(request.FileContentType)) { - if (request.FileName!.EndsWith(".jpg", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "image/jpeg"; - else if (request.FileName!.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "image/jpeg"; - else if (request.FileName!.EndsWith(".png", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "image/png"; - else if (request.FileName!.EndsWith(".gif", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "image/gif"; - else if (request.FileName!.EndsWith(".mp3", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "audio/mpeg"; - else if (request.FileName!.EndsWith(".amr", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "audio/amr"; - else if (request.FileName!.EndsWith(".mp4", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "video/mp4"; + if (TYPE_IMAGE.Equals(request.Type) || TYPE_THUMB.Equals(request.Type)) + request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForImage(request.FileName!) ?? "image/png"; + else if (TYPE_VOICE.Equals(request.Type)) + request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForVoice(request.FileName!) ?? "audio/mp3"; + else if (TYPE_VIDEO.Equals(request.Type)) + request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForVideo(request.FileName!) ?? "video/mp4"; else request.FileContentType = "application/octet-stream"; } - string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x"); - using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]); - using var httpContent = new MultipartFormDataContent(boundary); - httpContent.Add(fileContent, "\"media\"", "\"" + request.FileName + "\""); - httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary); - fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(request.FileContentType); - fileContent.Headers.ContentLength = request.FileBytes?.Length ?? 0; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "media", "upload") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "media", "upload") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("type", request.Type); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x"); + using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]); + using var httpContent = new MultipartFormDataContent(boundary); + httpContent.Add(fileContent, "\"media\"", $"\"{HttpUtility.UrlEncode(request.FileName)}\""); + httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary); + fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(request.FileContentType); + fileContent.Headers.ContentLength = request.FileBytes?.Length; + + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -92,12 +90,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "media", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "media", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("media_id", request.MediaId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -121,27 +118,22 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (string.IsNullOrEmpty(request.FileContentType)) { - if (request.FileName!.EndsWith(".jpg", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "image/jpeg"; - else if (request.FileName!.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase)) - request.FileContentType = "image/jpeg"; - else - request.FileContentType = "image/png"; + request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForImage(request.FileName!) ?? "image/png"; } + IFlurlRequest flurlReq = client + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "media", "uploadimg") + .SetQueryParam("access_token", request.AccessToken); + string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x"); using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]); using var httpContent = new MultipartFormDataContent(boundary); - httpContent.Add(fileContent, "\"media\"", "\"" + request.FileName + "\""); + httpContent.Add(fileContent, "\"media\"", $"\"{HttpUtility.UrlEncode(request.FileName)}\""); httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary); fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(request.FileContentType); - fileContent.Headers.ContentLength = request.FileBytes?.Length ?? 0; - IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "media", "uploadimg") - .SetOptions(request) - .SetQueryParam("access_token", request.AccessToken); + fileContent.Headers.ContentLength = request.FileBytes?.Length; - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -158,8 +150,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "media", "uploadnews") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "media", "uploadnews") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -179,8 +170,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "media", "uploadvideo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "media", "uploadvideo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -201,8 +191,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "media", "voice", "addvoicetorecofortext") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "media", "voice", "addvoicetorecofortext") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("format", request.Format) .SetQueryParam("voice_id", request.VoiceId) @@ -210,7 +199,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Api using var httpContent = new ByteArrayContent(request.VoiceBytes); httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("audio/mp3"); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -227,8 +217,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "media", "voice", "queryrecoresultfortext") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "media", "voice", "queryrecoresultfortext") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("voice_id", request.VoiceId) .SetQueryParam("lang", request.Language); @@ -250,15 +239,15 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "media", "voice", "translatecontent") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "media", "voice", "translatecontent") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("lfrom", request.FromLanguage) .SetQueryParam("lto", request.ToLanguage); using var httpContent = new ByteArrayContent(request.VoiceBytes); httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("audio/mp3"); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } #endregion @@ -277,13 +266,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "media", "getfeedbackmedia") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "media", "getfeedbackmedia") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("record_id", request.RecordId) .SetQueryParam("media_id", request.MediaId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMenuExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMenuExtensions.cs index 3d573293..048b95e0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMenuExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMenuExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "menu", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "menu", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,11 +45,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "get_current_selfmenu_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "get_current_selfmenu_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -67,11 +65,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "menu", "delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "menu", "delete") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -88,11 +85,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "menu", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "menu", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region Conditional @@ -110,8 +106,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "menu", "addconditional") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "menu", "addconditional") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -131,8 +126,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "menu", "delconditional") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "menu", "delconditional") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -152,8 +146,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "menu", "trymatch") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "menu", "trymatch") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageCustomExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageCustomExtensions.cs index 774f87da..e806b540 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageCustomExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageCustomExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "custom", "send") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "custom", "send") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -48,8 +47,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "custom", "typing") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "custom", "typing") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageMassExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageMassExtensions.cs index 472e452e..6805b850 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageMassExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageMassExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "mass", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "mass", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -47,8 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "mass", "sendall") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "mass", "sendall") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -68,8 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "mass", "send") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "mass", "send") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -89,8 +86,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "mass", "preview") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "mass", "preview") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -110,8 +106,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "mass", "delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "mass", "delete") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -132,11 +127,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "message", "mass", "speed", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "message", "mass", "speed", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -153,8 +147,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "mass", "speed", "set") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "mass", "speed", "set") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageSubscribeExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageSubscribeExtensions.cs index 72cfec09..257b34a4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageSubscribeExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageSubscribeExtensions.cs @@ -27,8 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "subscribe", "bizsend") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "subscribe", "bizsend") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageTemplateExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageTemplateExtensions.cs index e700b6f7..4149d117 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageTemplateExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageTemplateExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "template", "send") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "template", "send") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageTemplateSubscribeExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageTemplateSubscribeExtensions.cs index 36b96e2b..898659de 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageTemplateSubscribeExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageTemplateSubscribeExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "template", "subscribe") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "template", "subscribe") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageWxopenExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageWxopenExtensions.cs index 954facfa..c40c3f5d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageWxopenExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMessageWxopenExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "wxopen", "activityid", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "wxopen", "activityid", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -48,8 +47,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "wxopen", "updatablemsg", "send") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "wxopen", "updatablemsg", "send") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMidasExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMidasExtensions.cs index 4e09a5dd..a15228e3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMidasExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinMidasExtensions.cs @@ -69,8 +69,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, HttpMethod.Post.Method, "/cgi-bin/midas/cancelpay", ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "midas", "cancelpay") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "midas", "cancelpay") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -92,8 +91,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, HttpMethod.Post.Method, "/cgi-bin/midas/getbalance", ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "midas", "getbalance") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "midas", "getbalance") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -115,8 +113,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, HttpMethod.Post.Method, "/cgi-bin/midas/pay", ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "midas", "pay") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "midas", "pay") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -138,8 +135,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, HttpMethod.Post.Method, "/cgi-bin/midas/present", ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "midas", "present") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "midas", "present") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -162,8 +158,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, HttpMethod.Post.Method, "/cgi-bin/midas/sandbox/cancelpay", ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "midas", "sandbox", "cancelpay") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "midas", "sandbox", "cancelpay") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -185,8 +180,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, HttpMethod.Post.Method, "/cgi-bin/midas/sandbox/getbalance", ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "midas", "sandbox", "getbalance") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "midas", "sandbox", "getbalance") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -208,8 +202,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, HttpMethod.Post.Method, "/cgi-bin/midas/sandbox/pay", ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "midas", "sandbox", "pay") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "midas", "sandbox", "pay") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -231,8 +224,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api InitRequest(client, HttpMethod.Post.Method, "/cgi-bin/midas/sandbox/present", ref request); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "midas", "sandbox", "present") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "midas", "sandbox", "present") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinOpenExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinOpenExtensions.cs index b05e019d..55130d8a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinOpenExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinOpenExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "open", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "open", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,8 +45,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "open", "bind") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "open", "bind") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -67,8 +65,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "open", "unbind") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "open", "unbind") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -88,8 +85,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "open", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "open", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinPOIExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinPOIExtensions.cs index 9c056658..4fc0342f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinPOIExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinPOIExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "poi", "addpoi") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "poi", "addpoi") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,8 +45,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "poi", "getpoi") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "poi", "getpoi") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -68,8 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "poi", "getpoilist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "poi", "getpoilist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -89,8 +86,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "poi", "updatepoi") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "poi", "updatepoi") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -110,8 +106,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "poi", "delpoi") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "poi", "delpoi") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinQrcodeExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinQrcodeExtensions.cs index 4c2e142e..7425cc5a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinQrcodeExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinQrcodeExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "qrcode", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "qrcode", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinShortenExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinShortenExtensions.cs index 7d027f40..c0e1abec 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinShortenExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinShortenExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "shorturl") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "shorturl") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -47,8 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "shorten", "gen") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "shorten", "gen") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -68,8 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "shorten", "fetch") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "shorten", "fetch") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinSoterExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinSoterExtensions.cs index e2f0cd5c..5e0c2f90 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinSoterExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinSoterExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "soter", "verify_signature") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "soter", "verify_signature") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinTagsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinTagsExtensions.cs index 54c1a428..96e1eb30 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinTagsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinTagsExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "tags", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tags", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,11 +45,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "tags", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "tags", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -67,8 +65,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "tags", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tags", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -88,8 +85,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "tags", "delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tags", "delete") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -109,8 +105,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "user", "tag", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "tag", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -131,8 +126,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "tags", "members", "batchtagging") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tags", "members", "batchtagging") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -152,8 +146,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "tags", "members", "batchuntagging") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tags", "members", "batchuntagging") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -173,8 +166,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "tags", "getidlist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tags", "getidlist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -196,8 +188,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "tags", "members", "getblacklist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tags", "members", "getblacklist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -217,8 +208,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "tags", "members", "batchblacklist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tags", "members", "batchblacklist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -238,8 +228,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "tags", "members", "batchunblacklist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tags", "members", "batchunblacklist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinTemplateExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinTemplateExtensions.cs index 235486cc..cad3790f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinTemplateExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinTemplateExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "template", "api_set_industry") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "template", "api_set_industry") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,11 +45,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "template", "get_industry") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "template", "get_industry") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -67,8 +65,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "template", "api_add_template") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "template", "api_add_template") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -88,11 +85,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "template", "get_all_private_template") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "template", "get_all_private_template") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -109,8 +105,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "template", "del_private_template") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "template", "del_private_template") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinUserExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinUserExtensions.cs index 438e301b..ee9733fe 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinUserExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinUserExtensions.cs @@ -25,13 +25,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "user", "info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "info") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("openid", request.OpenId) .SetQueryParam("lang", request.Language); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -48,8 +47,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "user", "info", "batchget") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "info", "batchget") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -69,8 +67,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "user", "info", "updateremark") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "info", "updateremark") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -90,14 +87,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "user", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "get") .SetQueryParam("access_token", request.AccessToken); if (!string.IsNullOrEmpty(request.NextOpenId)) flurlReq.SetQueryParam("next_openid", request.NextOpenId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinWxaappExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinWxaappExtensions.cs index 84beb8ae..29f14058 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinWxaappExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinWxaappExtensions.cs @@ -27,8 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxaapp", "createwxaqrcode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxaapp", "createwxaqrcode") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinWxopenExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinWxopenExtensions.cs index 26d2b291..95ae76a2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinWxopenExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinWxopenExtensions.cs @@ -26,11 +26,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "wxopen", "getallcategories") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "wxopen", "getallcategories") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -47,11 +46,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "wxopen", "getcategory") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "wxopen", "getcategory") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -68,8 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxopen", "getcategoriesbytype") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxopen", "getcategoriesbytype") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -89,8 +86,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxopen", "addcategory") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxopen", "addcategory") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -110,8 +106,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxopen", "deletecategory") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxopen", "deletecategory") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -131,8 +126,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxopen", "modifycategory") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxopen", "modifycategory") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -154,8 +148,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxopen", "qrcodejumpget") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxopen", "qrcodejumpget") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -175,8 +168,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxopen", "qrcodejumpdownload") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxopen", "qrcodejumpdownload") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -196,8 +188,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxopen", "qrcodejumpadd") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxopen", "qrcodejumpadd") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -217,8 +208,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxopen", "qrcodejumppublish") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxopen", "qrcodejumppublish") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -238,8 +228,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxopen", "qrcodejumpdelete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxopen", "qrcodejumpdelete") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -261,11 +250,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "wxopen", "getweappsupportversion") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "wxopen", "getweappsupportversion") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -282,8 +270,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxopen", "setweappsupportversion") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxopen", "setweappsupportversion") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -305,8 +292,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxopen", "wxamplinkget") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxopen", "wxamplinkget") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -326,8 +312,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxopen", "wxamplink") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxopen", "wxamplink") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -347,8 +332,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxopen", "wxampunlink") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxopen", "wxampunlink") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinWxverifyExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinWxverifyExtensions.cs index 7fa58c18..06a48a29 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinWxverifyExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinWxverifyExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wxverify", "checkwxverifynickname") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wxverify", "checkwxverifynickname") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCityServiceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCityServiceExtensions.cs index 2fe96f71..3d5f57bd 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCityServiceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCityServiceExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cityservice", "sendmsgdata") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cityservice", "sendmsgdata") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCustomServiceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCustomServiceExtensions.cs index 444840cb..2c15cf93 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCustomServiceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCustomServiceExtensions.cs @@ -28,8 +28,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "customservice", "kfaccount", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "customservice", "kfaccount", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -50,8 +49,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "customservice", "kfaccount", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "customservice", "kfaccount", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -72,8 +70,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "customservice", "kfaccount", "del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "customservice", "kfaccount", "del") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("kf_account", request.KfAccount); @@ -93,22 +90,20 @@ namespace SKIT.FlurlHttpClient.Wechat.Api { if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - - string filename = Guid.NewGuid().ToString("N") + ".jpg"; - string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x"); - using var fileContent = new ByteArrayContent(request.HeadImageFileBytes ?? new byte[0]); - using var httpContent = new MultipartFormDataContent(boundary); - httpContent.Add(fileContent, "\"media\"", "\"" + filename + "\""); - httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary); - fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/jpeg"); - fileContent.Headers.ContentLength = request.HeadImageFileBytes?.Length ?? 0; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "customservice", "kfaccount", "uploadheadimg") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "customservice", "kfaccount", "uploadheadimg") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("kf_account", request.KfAccount); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x"); + using var fileContent = new ByteArrayContent(request.HeadImageFileBytes ?? new byte[0]); + using var httpContent = new MultipartFormDataContent(boundary); + httpContent.Add(fileContent, "\"media\"", "\"image.jpg\""); + httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary); + fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/jpeg"); + fileContent.Headers.ContentLength = request.HeadImageFileBytes?.Length; + + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -125,8 +120,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "customservice", "kfaccount", "inviteworker") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "customservice", "kfaccount", "inviteworker") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -148,8 +142,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "customservice", "kfsession", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "customservice", "kfsession", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -169,8 +162,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "customservice", "kfsession", "close") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "customservice", "kfsession", "close") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -190,12 +182,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "customservice", "kfsession", "getsession") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "customservice", "kfsession", "getsession") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("openid", request.OpenId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -212,12 +203,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "customservice", "kfsession", "getsessionlist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "customservice", "kfsession", "getsessionlist") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("kf_account", request.KfAccount); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -234,11 +224,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "customservice", "kfsession", "getwaitcase") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "customservice", "kfsession", "getwaitcase") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -257,8 +246,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "customservice", "msgrecord", "getmsglist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "customservice", "msgrecord", "getmsglist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteDataCubeExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteDataCubeExtensions.cs index 94185820..f138adfd 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteDataCubeExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteDataCubeExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getusersummary") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getusersummary") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -47,8 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getusercumulate") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getusercumulate") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -68,8 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getarticlesummary") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getarticlesummary") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -89,8 +86,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getarticletotal") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getarticletotal") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -112,8 +108,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getuserread") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getuserread") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -133,8 +128,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getuserreadhour") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getuserreadhour") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -154,8 +148,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getusershare") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getusershare") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -175,8 +168,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getusersharehour") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getusersharehour") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -198,8 +190,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getupstreammsg") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getupstreammsg") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -219,8 +210,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getupstreammsghour") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getupstreammsghour") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -240,8 +230,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getupstreammsgweek") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getupstreammsgweek") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -261,8 +250,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getupstreammsgmonth") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getupstreammsgmonth") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -282,8 +270,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getupstreammsgdist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getupstreammsgdist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -303,8 +290,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getupstreammsgdistweek") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getupstreammsgdistweek") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -324,8 +310,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getupstreammsgdistmonth") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getupstreammsgdistmonth") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -347,8 +332,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getinterfacesummary") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getinterfacesummary") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -368,8 +352,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getinterfacesummaryhour") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getinterfacesummaryhour") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -391,8 +374,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getcardbizuininfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getcardbizuininfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -412,8 +394,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getcardcardinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getcardcardinfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -433,8 +414,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getcardmembercardinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getcardmembercardinfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -454,8 +434,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getcardmembercarddetail") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getcardmembercarddetail") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -477,8 +456,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getweanalysisappiddailyretaininfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getweanalysisappiddailyretaininfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -498,8 +476,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getweanalysisappidmonthlyretaininfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getweanalysisappidmonthlyretaininfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -519,8 +496,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getweanalysisappidweeklyretaininfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getweanalysisappidweeklyretaininfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -540,8 +516,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getweanalysisappiddailysummarytrend") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getweanalysisappiddailysummarytrend") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -561,8 +536,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getweanalysisappiddailyvisittrend") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getweanalysisappiddailyvisittrend") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -582,8 +556,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getweanalysisappidmonthlyvisittrend") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getweanalysisappidmonthlyvisittrend") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -603,8 +576,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getweanalysisappidweeklyvisittrend") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getweanalysisappidweeklyvisittrend") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -624,8 +596,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getweanalysisappiduserportrait") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getweanalysisappiduserportrait") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -645,8 +616,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getweanalysisappidvisitdistribution") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getweanalysisappidvisitdistribution") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -666,8 +636,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getweanalysisappidvisitpage") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getweanalysisappidvisitpage") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -689,8 +658,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "datacube", "getgameanalysisdata") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "datacube", "getgameanalysisdata") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteIntpMarketCodeExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteIntpMarketCodeExtensions.cs index 4ebb68fb..a8986311 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteIntpMarketCodeExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteIntpMarketCodeExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "intp", "marketcode", "applycode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "intp", "marketcode", "applycode") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,8 +45,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "intp", "marketcode", "applycodequery") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "intp", "marketcode", "applycodequery") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -67,8 +65,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "intp", "marketcode", "applycodedownload") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "intp", "marketcode", "applycodedownload") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -88,8 +85,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "intp", "marketcode", "codeactive") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "intp", "marketcode", "codeactive") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -109,8 +105,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "intp", "marketcode", "codeactivequery") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "intp", "marketcode", "codeactivequery") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -130,8 +125,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "intp", "marketcode", "tickettocode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "intp", "marketcode", "tickettocode") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteIntpRealNameExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteIntpRealNameExtensions.cs index 765fa3df..2a7433cb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteIntpRealNameExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteIntpRealNameExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "intp", "realname", "getauthurl") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "intp", "realname", "getauthurl") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,8 +45,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "intp", "realname", "checkrealnameinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "intp", "realname", "checkrealnameinfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteMerchantExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteMerchantExtensions.cs index c562f93b..dea3b891 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteMerchantExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteMerchantExtensions.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Net.Http; +using System.Net.Http.Headers; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -26,8 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -47,8 +47,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "del") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -68,8 +67,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -89,12 +87,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "merchant", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "merchant", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("product_id", request.ProductId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -111,8 +108,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "getbystatus") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "getbystatus") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -132,8 +128,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "modproductstatus") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "modproductstatus") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -155,8 +150,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "category", "getsub") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "category", "getsub") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -176,8 +170,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "category", "getsku") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "category", "getsku") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -197,8 +190,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "category", "getproperty") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "category", "getproperty") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -220,8 +212,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "stock", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "stock", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -241,8 +232,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "stock", "reduce") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "stock", "reduce") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -264,8 +254,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "express", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "express", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -285,8 +274,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "express", "del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "express", "del") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -306,8 +294,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "express", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "express", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -327,8 +314,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "express", "getbyid") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "express", "getbyid") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -348,11 +334,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "merchant", "express", "getall") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "merchant", "express", "getall") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -371,8 +356,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "group", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "group", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -392,8 +376,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "group", "del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "group", "del") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -413,8 +396,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "group", "propertymod") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "group", "propertymod") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -434,8 +416,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "group", "productmod") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "group", "productmod") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -455,8 +436,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "group", "getbyid") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "group", "getbyid") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -476,11 +456,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "merchant", "group", "getall") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "merchant", "group", "getall") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -499,8 +478,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "shelf", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "shelf", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -520,8 +498,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "shelf", "del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "shelf", "del") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -541,8 +518,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "shelf", "mod") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "shelf", "mod") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -562,8 +538,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "shelf", "getbyid") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "shelf", "getbyid") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -583,11 +558,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "merchant", "shelf", "getall") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "merchant", "shelf", "getall") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -606,8 +580,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "order", "getbyid") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "order", "getbyid") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -627,8 +600,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "order", "getbyfilter") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "order", "getbyfilter") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -648,8 +620,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "order", "setdelivery") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "order", "setdelivery") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -669,8 +640,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "order", "close") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "order", "close") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -692,12 +662,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.FileName = Guid.NewGuid().ToString("N").ToLower() + ".png"; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "merchant", "common", "upload_img") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "merchant", "common", "upload_img") .SetQueryParam("access_token", request.AccessToken); using var httpContent = new ByteArrayContent(request.FileBytes ?? new byte[0]); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/png"); + + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteNontaxExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteNontaxExtensions.cs index 7c11ea37..f4ad26d9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteNontaxExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteNontaxExtensions.cs @@ -30,8 +30,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.Timestamp = DateTimeOffset.Now.ToLocalTime().ToUnixTimeSeconds(); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "getbillauthurl") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "getbillauthurl") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -51,8 +50,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "createbillcard") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "createbillcard") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -75,8 +73,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "insertbill") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "insertbill") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -100,8 +97,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "queryfee") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "queryfee") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -124,8 +120,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "unifiedorder") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "unifiedorder") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -148,8 +143,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "getorder") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "getorder") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -172,8 +166,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "refund") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "refund") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -196,8 +189,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "downloadbill") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "downloadbill") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -220,8 +212,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "notifyinconsistentorder") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "notifyinconsistentorder") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -244,8 +235,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "mocknotification") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "mocknotification") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -268,8 +258,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "mockqueryfee") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "mockqueryfee") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -292,8 +281,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "micropay") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "micropay") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -316,8 +304,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "getorderlist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "getorderlist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -337,8 +324,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "getrealname") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "getrealname") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -359,8 +345,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "vehicle", "querystate") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "vehicle", "querystate") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -380,8 +365,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "vehicle", "entrancenotify") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "vehicle", "entrancenotify") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -401,8 +385,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "nontax", "vehicle", "payapply") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "nontax", "vehicle", "payapply") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteProductExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteProductExtensions.cs index 883b626f..eb58af47 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteProductExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteProductExtensions.cs @@ -27,8 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "img", "upload") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "img", "upload") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("resp_type", request.ResponseType); @@ -46,14 +45,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("width", request.Width); string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x"); - string filename = "image.png"; var httpContent = new MultipartFormDataContent(boundary); var fileContent = new ByteArrayContent(request.ImageFileBytes ?? new byte[0]); - httpContent.Add(fileContent, "\"media\"", "\"" + filename + "\""); + httpContent.Add(fileContent, "\"media\"", "\"image.png\""); + httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary); fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/png"); fileContent.Headers.ContentLength = request.ImageFileBytes?.Length; - httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } } @@ -72,8 +71,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "register", "check_audit_status") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "register", "check_audit_status") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -93,8 +91,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "register", "register_shop") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "register", "register_shop") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -117,8 +114,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "register", "submit_merchantinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "register", "submit_merchantinfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -141,8 +137,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "register", "submit_basicinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "register", "submit_basicinfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -164,8 +159,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "service", "check_auth") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "service", "check_auth") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -185,8 +179,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "service", "get_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "service", "get_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -206,8 +199,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "service", "get_order_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "service", "get_order_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -229,8 +221,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "decoration", "decoration_service") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "decoration", "decoration_service") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -250,8 +241,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "decoration", "decoration_service_experience") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "decoration", "decoration_service_experience") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -271,8 +261,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "decoration", "wxaproduct_decoration_check_status") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "decoration", "wxaproduct_decoration_check_status") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -292,8 +281,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "decoration", "wxaproduct_decoration_pressure_test") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "decoration", "wxaproduct_decoration_pressure_test") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -313,8 +301,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "decoration", "wxaproduct_decoration_query_pressure_test_status") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "decoration", "wxaproduct_decoration_query_pressure_test_status") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -334,8 +321,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "decoration", "wxaproduct_decoration_get_pressure_test_report") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "decoration", "wxaproduct_decoration_get_pressure_test_report") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -357,8 +343,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "category", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "category", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -380,8 +365,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "brand", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "brand", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -403,8 +387,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "delivery", "get_company_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "delivery", "get_company_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -424,8 +407,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "delivery", "send") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "delivery", "send") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -447,8 +429,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "delivery", "get_freight_template") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "delivery", "get_freight_template") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -468,8 +449,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "delivery", "insert_freight_template") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "delivery", "insert_freight_template") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -489,8 +469,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "delivery", "update_freight_template") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "delivery", "update_freight_template") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -513,8 +492,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "shipmethods", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "shipmethods", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -534,8 +512,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "shipmethods", "set") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "shipmethods", "set") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -557,8 +534,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "offline", "get_pickup_template") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "offline", "get_pickup_template") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -578,8 +554,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "offline", "update_pickup_template") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "offline", "update_pickup_template") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -599,8 +574,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "offline", "get_same_city_template") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "offline", "get_same_city_template") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -620,8 +594,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "offline", "update_same_city_template") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "offline", "update_same_city_template") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -643,8 +616,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "spu", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "spu", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -664,8 +636,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "spu", "del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "spu", "del") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -685,8 +656,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "spu", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "spu", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -706,8 +676,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "spu", "get_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "spu", "get_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -727,8 +696,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "spu", "search") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "spu", "search") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -748,8 +716,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "spu", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "spu", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -769,8 +736,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "spu", "listing") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "spu", "listing") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -790,8 +756,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "spu", "delisting") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "spu", "delisting") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -813,8 +778,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "sku", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "sku", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -834,8 +798,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "sku", "batch_add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "sku", "batch_add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -855,8 +818,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "sku", "del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "sku", "del") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -876,8 +838,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "sku", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "sku", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -897,8 +858,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "sku", "get_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "sku", "get_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -918,8 +878,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "sku", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "sku", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -939,8 +898,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "sku", "update_price") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "sku", "update_price") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -962,8 +920,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "limiteddiscount", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "limiteddiscount", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -983,8 +940,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "limiteddiscount", "get_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "limiteddiscount", "get_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1004,8 +960,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "limiteddiscount", "update_status") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "limiteddiscount", "update_status") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1027,8 +982,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "stock", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "stock", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1048,8 +1002,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "stock", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "stock", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1071,8 +1024,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "store", "get_shopcat") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "store", "get_shopcat") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1092,8 +1044,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "store", "get_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "store", "get_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1115,8 +1066,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "address", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "address", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1136,8 +1086,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "address", "delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "address", "delete") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1157,8 +1106,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "address", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "address", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1178,8 +1126,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "address", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "address", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1201,8 +1148,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "order", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "order", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1222,8 +1168,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "order", "get_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "order", "get_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1243,8 +1188,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "order", "search") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "order", "search") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1266,8 +1210,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "coupon", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "coupon", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1287,8 +1230,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "coupon", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "coupon", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1308,8 +1250,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "coupon", "update_status") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "coupon", "update_status") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1329,8 +1270,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "coupon", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "coupon", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1350,8 +1290,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "coupon", "get_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "coupon", "get_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1371,8 +1310,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "coupon", "push") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "coupon", "push") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1392,8 +1330,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "product", "coupon", "get_user") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "product", "coupon", "get_user") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecutePublisherStatExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecutePublisherStatExtensions.cs index c399aa78..3a10d523 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecutePublisherStatExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecutePublisherStatExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "publisher", "stat") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "publisher", "stat") .SetQueryParam("action", "publisher_adpos_general") .SetQueryParam("page", request.Page) .SetQueryParam("page_size", request.Limit) @@ -36,7 +35,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (!string.IsNullOrEmpty(request.AdSlotName)) flurlReq.SetQueryParam("ad_slot", request.AdSlotName); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -53,15 +52,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "publisher", "stat") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "publisher", "stat") .SetQueryParam("action", "publisher_cps_general") .SetQueryParam("page", request.Page) .SetQueryParam("page_size", request.Limit) .SetQueryParam("start_date", request.StartDateString) .SetQueryParam("end_date", request.EndDateString); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -78,15 +76,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "publisher", "stat") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "publisher", "stat") .SetQueryParam("action", "publisher_settlement") .SetQueryParam("page", request.Page) .SetQueryParam("page_size", request.Limit) .SetQueryParam("start_date", request.StartDateString) .SetQueryParam("end_date", request.EndDateString); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteScanProductV2Extensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteScanProductV2Extensions.cs index 444334b0..3ed3ec01 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteScanProductV2Extensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteScanProductV2Extensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "scan", "product", "v2", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "scan", "product", "v2", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -47,8 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "scan", "product", "v2", "status") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "scan", "product", "v2", "status") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -68,8 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "scan", "product", "v2", "getinfobypage") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "scan", "product", "v2", "getinfobypage") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteSemanticExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteSemanticExtensions.cs index 27ebd418..de672d67 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteSemanticExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteSemanticExtensions.cs @@ -31,8 +31,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "semantic", "semproxy", "search") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "semantic", "semproxy", "search") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync>(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteShopExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteShopExtensions.cs index de94277f..b77b69e1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteShopExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteShopExtensions.cs @@ -27,19 +27,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "img", "upload") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "img", "upload") .SetQueryParam("access_token", request.AccessToken); string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x"); - string filename = "image.png"; var httpContent = new MultipartFormDataContent(boundary); var fileContent = new ByteArrayContent(request.ImageFileBytes ?? new byte[0]); - httpContent.Add(fileContent, "\"media\"", "\"" + filename + "\""); + httpContent.Add(fileContent, "\"media\"", "\"image.png\""); + httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary); fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/png"); fileContent.Headers.ContentLength = request.ImageFileBytes?.Length; - httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } #region Register @@ -57,8 +56,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "register", "apply") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "register", "apply") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -78,8 +76,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "register", "check") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "register", "check") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -101,8 +98,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "cat", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "cat", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -124,8 +120,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "audit", "audit_brand") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "audit", "audit_brand") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -145,8 +140,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "audit", "audit_category") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "audit", "audit_category") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -166,8 +160,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "audit", "result") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "audit", "result") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -187,8 +180,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "audit", "get_miniapp_certificate") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "audit", "get_miniapp_certificate") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -210,8 +202,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "account", "get_category_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "account", "get_category_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -231,8 +222,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "account", "get_brand_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "account", "get_brand_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -252,8 +242,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "account", "get_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "account", "get_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -273,8 +262,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "account", "update_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "account", "update_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -296,8 +284,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "spu", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "spu", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -317,8 +304,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "spu", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "spu", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -338,8 +324,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "spu", "del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "spu", "del") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -359,8 +344,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "spu", "del_audit") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "spu", "del_audit") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -380,8 +364,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "spu", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "spu", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -401,8 +384,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "spu", "get_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "spu", "get_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -422,8 +404,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "spu", "listing") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "spu", "listing") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -443,8 +424,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "spu", "delisting") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "spu", "delisting") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -466,8 +446,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "scene", "check") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "scene", "check") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -487,8 +466,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "order", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "order", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -508,8 +486,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "order", "pay") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "order", "pay") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -529,8 +506,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "order", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "order", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -552,8 +528,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "delivery", "get_company_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "delivery", "get_company_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -573,8 +548,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "delivery", "send") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "delivery", "send") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -594,8 +568,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "delivery", "recieve") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "delivery", "recieve") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -617,8 +590,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "aftersale", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "aftersale", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -638,8 +610,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "aftersale", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "aftersale", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -659,8 +630,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "shop", "aftersale", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "shop", "aftersale", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteSnsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteSnsExtensions.cs index 1d42d399..6800c3f6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteSnsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteSnsExtensions.cs @@ -27,14 +27,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "sns", "oauth2", "access_token") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "sns", "oauth2", "access_token") .SetQueryParam("grant_type", request.GrantType) .SetQueryParam("appid", client.WechatAppId) .SetQueryParam("secret", client.WechatAppSecret) .SetQueryParam("code", request.Code); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -53,13 +52,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "sns", "oauth2", "refresh_token") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "sns", "oauth2", "refresh_token") .SetQueryParam("grant_type", request.GrantType) .SetQueryParam("appid", client.WechatAppId) .SetQueryParam("refresh_token", request.RefreshToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -78,13 +76,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "sns", "userinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "sns", "userinfo") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("openid", request.OpenId) .SetQueryParam("lang", request.Language); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -103,12 +100,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "sns", "auth") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "sns", "auth") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("openid", request.OpenId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -126,14 +122,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "sns", "jscode2session") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "sns", "jscode2session") .SetQueryParam("grant_type", request.GrantType) .SetQueryParam("appid", client.WechatAppId) .SetQueryParam("secret", client.WechatAppSecret) .SetQueryParam("js_code", request.JsCode); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region Component @@ -154,15 +149,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.ComponentAppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "sns", "component", "jscode2session") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "sns", "component", "jscode2session") .SetQueryParam("grant_type", request.GrantType) .SetQueryParam("appid", request.AppId) .SetQueryParam("component_appid", request.ComponentAppId) .SetQueryParam("component_access_token", request.ComponentAccessToken) .SetQueryParam("js_code", request.JsCode); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteTcbExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteTcbExtensions.cs index 8f7dd81d..ec83724a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteTcbExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteTcbExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "tcb", "adddelayedfunctiontask") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "tcb", "adddelayedfunctiontask") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,8 +45,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "tcb", "createpressuretesttask") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "tcb", "createpressuretesttask") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -68,8 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "tcb", "createsendsmstask") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "tcb", "createsendsmstask") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -90,8 +87,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "tcb", "describeextensionuploadinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "tcb", "describeextensionuploadinfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -112,8 +108,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "tcb", "describesmsrecords") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "tcb", "describesmsrecords") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -133,8 +128,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "tcb", "getopendata") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "tcb", "getopendata") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("openid", request.OpenId); @@ -155,8 +149,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "tcb", "getpressuretestreport") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "tcb", "getpressuretestreport") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -176,8 +169,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "tcb", "getpressureteststatus") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "tcb", "getpressureteststatus") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -198,8 +190,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "tcb", "getstatistics") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "tcb", "getstatistics") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -225,8 +216,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.Timestamp = DateTimeOffset.Now.ToLocalTime().ToUnixTimeSeconds(); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "tcb", "getvoipsign") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "tcb", "getvoipsign") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("openid", request.OpenId); @@ -248,8 +238,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "tcb", "cloudbasereport") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "tcb", "cloudbasereport") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -270,8 +259,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "tcb", "sendsms") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "tcb", "sendsms") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -292,8 +280,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "tcb", "sendsmsv2") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "tcb", "sendsmsv2") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionPromoterExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionPromoterExtensions.cs index fe287aa7..87bed57d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionPromoterExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionPromoterExtensions.cs @@ -27,8 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "union", "promoter", "promotion", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "union", "promoter", "promotion", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -48,8 +47,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "union", "promoter", "promotion", "del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "union", "promoter", "promotion", "del") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -69,8 +67,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "union", "promoter", "promotion", "upd") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "union", "promoter", "promotion", "upd") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -90,13 +87,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "union", "promoter", "promotion", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "union", "promoter", "promotion", "list") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("start", request.Offset) .SetQueryParam("limit", request.Limit); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -115,11 +111,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "union", "promoter", "product", "category") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "union", "promoter", "product", "category") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -136,8 +131,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "union", "promoter", "product", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "union", "promoter", "product", "list") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("from", request.Offset) .SetQueryParam("limit", request.Limit); @@ -181,7 +175,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request.ProductIdList != null && request.ProductIdList.Any()) flurlReq.SetQueryParam("productId", string.Join(",", request.ProductIdList)); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -198,8 +192,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "union", "promoter", "product", "generate") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "union", "promoter", "product", "generate") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -221,8 +214,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "union", "promoter", "order", "info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "union", "promoter", "order", "info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -242,8 +234,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "union", "promoter", "order", "search") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "union", "promoter", "order", "search") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("page", request.Page); @@ -256,7 +247,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (!string.IsNullOrEmpty(request.CommissionStatus)) flurlReq.SetQueryParam("commissionStatus", request.CommissionStatus); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaApiExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaApiExtensions.cs index 97b545a7..2e7d50b5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaApiExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaApiExtensions.cs @@ -27,8 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "newtmpl", "addtemplate") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "newtmpl", "addtemplate") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -49,8 +48,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "newtmpl", "deltemplate") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "newtmpl", "deltemplate") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -71,11 +69,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxaapi", "newtmpl", "getcategory") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxaapi", "newtmpl", "getcategory") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -93,12 +90,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxaapi", "newtmpl", "getpubtemplatekeywords") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxaapi", "newtmpl", "getpubtemplatekeywords") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("tid", request.TemplateTitleId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -116,14 +112,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxaapi", "newtmpl", "getpubtemplatetitles") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxaapi", "newtmpl", "getpubtemplatetitles") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("ids", "\"" + string.Join(",", request.CategoryIdList) + "\"") .SetQueryParam("start", request.Offset) .SetQueryParam("limit", request.Limit); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -141,11 +136,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxaapi", "newtmpl", "gettemplate") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxaapi", "newtmpl", "gettemplate") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -164,8 +158,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxaapi", "feedback", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxaapi", "feedback", "list") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("page", request.Page) .SetQueryParam("num", request.Limit); @@ -173,7 +166,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request.Type.HasValue) flurlReq.SetQueryParam("type", request.Type); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -190,8 +183,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "log", "jserr_detail") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "log", "jserr_detail") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -211,8 +203,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "log", "jserr_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "log", "jserr_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -232,8 +223,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "log", "get_performance") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "log", "get_performance") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -253,11 +243,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxaapi", "log", "get_scene") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxaapi", "log", "get_scene") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -274,11 +263,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxaapi", "log", "get_client_version") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxaapi", "log", "get_client_version") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -295,8 +283,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxaapi", "userlog", "userlog_search") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxaapi", "userlog", "userlog_search") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("date", request.DateString) .SetQueryParam("begintime", request.BeginTimestamp) @@ -323,7 +310,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request.Limit.HasValue) flurlReq.SetQueryParam("limit", request.Limit.Value); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -342,8 +329,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "room", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "room", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -363,8 +349,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "room", "deleteroom") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "room", "deleteroom") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -384,8 +369,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "room", "editroom") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "room", "editroom") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -405,12 +389,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxaapi", "broadcast", "room", "getpushurl") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxaapi", "broadcast", "room", "getpushurl") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("roomId", request.RoomId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -427,15 +410,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxaapi", "broadcast", "room", "getsharedcode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxaapi", "broadcast", "room", "getsharedcode") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("roomId", request.RoomId); if (!string.IsNullOrEmpty(request.CustomParameter)) flurlReq.SetQueryParam("params", request.CustomParameter); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -452,8 +434,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "room", "updatefeedpublic") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "room", "updatefeedpublic") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -473,8 +454,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "room", "updatereplay") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "room", "updatereplay") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -494,8 +474,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "room", "updatekf") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "room", "updatekf") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -515,8 +494,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "room", "updatecomment") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "room", "updatecomment") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -537,8 +515,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "room", "addgoods") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "room", "addgoods") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -558,8 +535,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "goods", "onsale") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "goods", "onsale") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -579,8 +555,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "goods", "deleteInRoom") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "goods", "deleteInRoom") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -600,8 +575,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "goods", "push") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "goods", "push") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -621,8 +595,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "goods", "sort") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "goods", "sort") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -642,8 +615,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "goods", "getVideo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "goods", "getVideo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -665,8 +637,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "room", "addassistant") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "room", "addassistant") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -686,8 +657,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "room", "modifyassistant") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "room", "modifyassistant") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -707,8 +677,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "room", "removeassistant") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "room", "removeassistant") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -728,12 +697,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxaapi", "broadcast", "room", "getassistantlist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxaapi", "broadcast", "room", "getassistantlist") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("roomId", request.RoomId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -752,8 +720,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "room", "addsubanchor") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "room", "addsubanchor") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -773,8 +740,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "room", "modifysubanchor") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "room", "modifysubanchor") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -794,8 +760,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "room", "deletesubanchor") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "room", "deletesubanchor") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -815,12 +780,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxaapi", "broadcast", "room", "getsubanchor") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxaapi", "broadcast", "room", "getsubanchor") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("roomId", request.RoomId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -839,8 +803,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "goods", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "goods", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -860,8 +823,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "goods", "resetaudit") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "goods", "resetaudit") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -881,8 +843,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "goods", "audit") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "goods", "audit") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -902,8 +863,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "goods", "delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "goods", "delete") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -923,8 +883,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "goods", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "goods", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -944,8 +903,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "getgoodswarehouse") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "getgoodswarehouse") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -965,14 +923,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxaapi", "broadcast", "goods", "getapproved") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxaapi", "broadcast", "goods", "getapproved") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("offset", request.Offset) .SetQueryParam("limit", request.Limit) .SetQueryParam("status", request.AuditStatus); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -991,8 +948,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "role", "addrole") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "role", "addrole") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1012,8 +968,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxaapi", "broadcast", "role", "deleterole") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxaapi", "broadcast", "role", "deleterole") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1033,8 +988,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxaapi", "broadcast", "role", "getrolelist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxaapi", "broadcast", "role", "getrolelist") .SetQueryParam("access_token", request.AccessToken); if (!string.IsNullOrEmpty(request.Keyword)) @@ -1049,7 +1003,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request.Limit.HasValue) flurlReq.SetQueryParam("limit", request.Limit.Value); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion #endregion diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaBusinessExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaBusinessExtensions.cs index 48a4d6b3..c9c5b657 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaBusinessExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaBusinessExtensions.cs @@ -29,8 +29,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "business", "getpayfororder") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "business", "getpayfororder") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -51,8 +50,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "business", "gamematch", "creatematchrule") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "business", "gamematch", "creatematchrule") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -72,8 +70,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "business", "gamematch", "deletematchrule") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "business", "gamematch", "deletematchrule") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -93,8 +90,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "business", "gamematch", "getallmatchrule") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "business", "gamematch", "getallmatchrule") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -114,8 +110,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "business", "gamematch", "setmatchopenstate") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "business", "gamematch", "setmatchopenstate") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -135,8 +130,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "business", "gamematch", "updatematchrule") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "business", "gamematch", "updatematchrule") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -158,8 +152,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "business", "getliveinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "business", "getliveinfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -181,8 +174,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.Action = "get_replay"; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "business", "getliveinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "business", "getliveinfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -202,8 +194,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "business", "get_wxa_followers") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "business", "get_wxa_followers") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -225,8 +216,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "business", "runtime", "adddevice") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "business", "runtime", "adddevice") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs index 299160f3..943de63b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "component", "fastregisterbetaweapp") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "component", "fastregisterbetaweapp") .SetQueryParam("access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -47,8 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "verifybetaweapp") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "verifybetaweapp") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -68,8 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "setbetaweappnickname") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "setbetaweappnickname") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -89,8 +86,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "getmpadminauth") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "getmpadminauth") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -110,8 +106,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "mpverifybetaweapp") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "mpverifybetaweapp") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -133,11 +128,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "gettemplatedraftlist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "gettemplatedraftlist") .SetQueryParam("access_token", request.ComponentAccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -154,8 +148,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "addtotemplate") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "addtotemplate") .SetQueryParam("access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -175,11 +168,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "gettemplatelist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "gettemplatelist") .SetQueryParam("access_token", request.ComponentAccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -196,8 +188,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "deletetemplate") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "deletetemplate") .SetQueryParam("access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -219,8 +210,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "modify_domain") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "modify_domain") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -240,8 +230,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "setwebviewdomain") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "setwebviewdomain") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -261,8 +250,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "setnickname") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "setnickname") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -282,8 +270,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "api_wxa_querynickname") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "api_wxa_querynickname") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -303,11 +290,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "getwxasearchstatus") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "getwxasearchstatus") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -324,8 +310,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "changewxasearchstatus") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "changewxasearchstatus") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -347,8 +332,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "fetchdatasetting") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "fetchdatasetting") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -370,11 +354,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "get_category") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "get_category") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -393,8 +376,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "bind_tester") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "bind_tester") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -414,8 +396,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "unbind_tester") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "unbind_tester") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -437,8 +418,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.Action = "get_experiencer"; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "memberauth") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "memberauth") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -460,8 +440,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "commit") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "commit") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -481,11 +460,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "get_page") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "get_page") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -502,14 +480,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "get_qrcode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "get_qrcode") .SetQueryParam("access_token", request.AccessToken); if (!string.IsNullOrEmpty(request.PagePath)) flurlReq.SetQueryParam("path", request.PagePath); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -526,8 +503,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "submit_audit") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "submit_audit") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -547,8 +523,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "get_auditstatus") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "get_auditstatus") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -568,11 +543,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "get_latest_auditstatus") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "get_latest_auditstatus") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -589,11 +563,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "undocodeaudit") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "undocodeaudit") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -610,8 +583,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "release") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "release") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -632,8 +604,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "revertcoderelease") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "revertcoderelease") .SetQueryParam("access_token", request.AccessToken); if (!string.IsNullOrEmpty(request.Action)) @@ -642,7 +613,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request.AppVersion.HasValue) flurlReq.SetQueryParam("app_version", request.AppVersion.Value); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -659,8 +630,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "grayrelease") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "grayrelease") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -680,11 +650,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "getgrayreleaseplan") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "getgrayreleaseplan") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -701,11 +670,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "revertgrayrelease") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "revertgrayrelease") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -722,8 +690,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "change_visitstatus") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "change_visitstatus") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -743,11 +710,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "queryquota") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "queryquota") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -764,8 +730,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "speedupaudit") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "speedupaudit") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -787,8 +752,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "getillegalrecords") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "getillegalrecords") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -808,8 +772,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "getappealrecords") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "getappealrecords") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -831,11 +794,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "getshowwxaitem") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "getshowwxaitem") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -852,13 +814,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "getwxamplinkforshow") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "getwxamplinkforshow") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("page", request.Page) .SetQueryParam("num", request.Limit); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -875,8 +836,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "updateshowwxaitem") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "updateshowwxaitem") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaExtensions.cs index 150485b8..a34e3ed2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaExtensions.cs @@ -26,14 +26,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "checksession") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "checksession") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("openid", request.OpenId) .SetQueryParam("signature", request.Signature) .SetQueryParam("sig_method", request.SignMethod); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -51,8 +50,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "getpaidunionid") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "getpaidunionid") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("openid", request.OpenId); @@ -62,7 +60,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api flurlReq.SetQueryParam("mch_id", request.MerchantId) .SetQueryParam("out_trade_no", request.OutTradeNumber); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region Plugin @@ -82,8 +80,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.Action = "apply"; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "plugin") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "plugin") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -105,8 +102,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.Action = "unbind"; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "plugin") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "plugin") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -128,8 +124,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.Action = "list"; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "plugin") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "plugin") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -151,8 +146,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.Action = "dev_apply_list"; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "devplugin") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "devplugin") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -174,8 +168,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.Action = "dev_agree"; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "devplugin") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "devplugin") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -197,8 +190,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.Action = "dev_refuse"; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "devplugin") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "devplugin") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -220,8 +212,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.Action = "dev_delete"; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "devplugin") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "devplugin") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -245,8 +236,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "getwxacode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "getwxacode") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -268,8 +258,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "getwxacodeunlimit") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "getwxacodeunlimit") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -292,8 +281,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "generatescheme") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "generatescheme") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -316,8 +304,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "generate_urllink") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "generate_urllink") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -339,20 +326,19 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - string filename = Guid.NewGuid().ToString("N").ToLower() + ".png"; + IFlurlRequest flurlReq = client + .CreateRequest(request, HttpMethod.Post, "wxa", "img_sec_check") + .SetQueryParam("access_token", request.AccessToken); + string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x"); using var fileContent = new ByteArrayContent(request.FileBytes ?? new byte[0]); using var httpContent = new MultipartFormDataContent(boundary); - httpContent.Add(fileContent, "\"media\"", "\"" + filename + "\""); + httpContent.Add(fileContent, "\"media\"", "\"image.png\""); httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary); fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/png"); - fileContent.Headers.ContentLength = request.FileBytes?.Length ?? 0; - IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "img_sec_check") - .SetOptions(request) - .SetQueryParam("access_token", request.AccessToken); + fileContent.Headers.ContentLength = request.FileBytes?.Length; - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -370,8 +356,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "media_check_async") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "media_check_async") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -392,8 +377,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "msg_sec_check") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "msg_sec_check") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -419,8 +403,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api request.AppId = client.WechatAppId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "getuserriskrank") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "getuserriskrank") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -442,8 +425,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "business", "performance", "boot") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "business", "performance", "boot") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -465,8 +447,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "remove_user_storage") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "remove_user_storage") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("openid", request.OpenId) .SetQueryParam("signature", request.Signature) @@ -489,8 +470,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "setuserinteractivedata") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "setuserinteractivedata") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("openid", request.OpenId) .SetQueryParam("signature", request.Signature) @@ -513,8 +493,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "set_user_storage") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "set_user_storage") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("openid", request.OpenId) .SetQueryParam("signature", request.Signature) @@ -539,8 +518,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "addnearbypoi") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "addnearbypoi") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -560,8 +538,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "delnearbypoi") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "delnearbypoi") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -581,13 +558,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "getnearbypoilist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "getnearbypoilist") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("page", request.Page) .SetQueryParam("page_rows", request.Limit); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -604,8 +580,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "setnearbypoishowstatus") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "setnearbypoishowstatus") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -627,8 +602,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "createwxagameroom") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "createwxagameroom") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -648,14 +622,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "getwxagameframe") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "getwxagameframe") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("access_info", request.AccessInformation) .SetQueryParam("begin_frame_id", request.BeginFrameId) .SetQueryParam("end_frame_id", request.EndFrameId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -672,12 +645,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "getwxagameidentityinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "getwxagameidentityinfo") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("access_info", request.AccessInformation); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -694,12 +666,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "getwxagameroominfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "getwxagameroominfo") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("access_info", request.AccessInformation); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -718,14 +689,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "getwxadevinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "getwxadevinfo") .SetQueryParam("access_token", request.AccessToken); if (!string.IsNullOrEmpty(request.Action)) flurlReq.SetQueryParam("action", request.Action); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -744,21 +714,19 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "imagesearch") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "imagesearch") .SetQueryParam("access_token", request.AccessToken); string boundary = "--BOUNDARY--" + DateTimeOffset.Now.Ticks.ToString("x"); - string filename = "image.png"; using var httpContent = new MultipartFormDataContent(boundary); using var fileContent = new ByteArrayContent(request.ImageFileBytes ?? new byte[0]); - httpContent.Add(fileContent, "\"img\"", "\"" + filename + "\""); + httpContent.Add(fileContent, "\"img\"", "\"image.png\""); fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/png"); - fileContent.Headers.ContentLength = request.ImageFileBytes?.Length ?? 0; + fileContent.Headers.ContentLength = request.ImageFileBytes?.Length; httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data; boundary=" + boundary); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -775,8 +743,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "sitesearch") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "sitesearch") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -796,8 +763,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "search", "wxaapi_submitpages") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "search", "wxaapi_submitpages") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -820,8 +786,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "servicemarket") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "servicemarket") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -841,8 +806,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "servicemarketretrieve") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "servicemarketretrieve") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -864,11 +828,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "get_merchant_category") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "get_merchant_category") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -885,8 +848,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "apply_merchant") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "apply_merchant") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -906,11 +868,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "get_merchant_audit_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "get_merchant_audit_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -927,8 +888,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "modify_merchant") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "modify_merchant") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -948,11 +908,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "wxa", "get_district") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "wxa", "get_district") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -969,8 +928,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "search_map_poi") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "search_map_poi") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -990,8 +948,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "create_map_poi") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "create_map_poi") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1011,8 +968,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "add_store") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "add_store") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1032,8 +988,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "update_store") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "update_store") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1053,8 +1008,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "get_store_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "get_store_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1074,8 +1028,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "get_store_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "get_store_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1095,8 +1048,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "wxa", "del_store") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "wxa", "del_store") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinTemplate/CgibinTemplateGetIndustryResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinTemplate/CgibinTemplateGetIndustryResponse.cs index 1967289f..e88792b7 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinTemplate/CgibinTemplateGetIndustryResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinTemplate/CgibinTemplateGetIndustryResponse.cs @@ -18,7 +18,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models [Newtonsoft.Json.JsonProperty("first_class")] [System.Text.Json.Serialization.JsonPropertyName("first_class")] public string FirstClass { get; set; } = default!; - /// /// 获取或设置行业二级分类。 /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Utilities/Internal/FileNameToContentTypeMapper.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Utilities/Internal/FileNameToContentTypeMapper.cs new file mode 100644 index 00000000..c9a2c6db --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Utilities/Internal/FileNameToContentTypeMapper.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; + +namespace SKIT.FlurlHttpClient.Wechat.Api.Utilities +{ + internal static class FileNameToContentTypeMapper + { + public static string? GetContentTypeForImage(string fileName) + { + string extension = Path.GetExtension(fileName ?? "/")?.ToLower() ?? string.Empty; + switch (extension) + { + case ".jpg": + case ".jpeg": + return "image/jpeg"; + case ".bmp": + return "image/bmp"; + case ".png": + return "image/bmp"; + } + + return null; + } + + public static string? GetContentTypeForVoice(string fileName) + { + string extension = Path.GetExtension(fileName ?? "/")?.ToLower() ?? string.Empty; + switch (extension) + { + case ".mp3": + return "audio/mpeg"; + case ".amr": + return "audio/amr"; + } + + return null; + } + + public static string? GetContentTypeForVideo(string fileName) + { + string extension = Path.GetExtension(fileName ?? "/")?.ToLower() ?? string.Empty; + switch (extension) + { + case ".mp4": + return "video/mp4"; + } + + return null; + } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs index d117f208..df93e940 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs @@ -79,20 +79,39 @@ namespace SKIT.FlurlHttpClient.Wechat.Api { } + /// + /// 使用当前客户端生成一个新的 对象。 + /// + /// + /// + /// + /// + public IFlurlRequest CreateRequest(WechatApiRequest request, HttpMethod method, params object[] urlSegments) + { + IFlurlRequest flurlRequest = FlurlClient.Request(urlSegments).WithVerb(method); + + if (request.Timeout.HasValue) + { + flurlRequest.WithTimeout(TimeSpan.FromMilliseconds(request.Timeout.Value)); + } + + return flurlRequest; + } + /// /// 异步发起请求。 /// /// /// - /// + /// /// /// - public async Task SendRequestAsync(IFlurlRequest flurlRequest, HttpContent? content = null, CancellationToken cancellationToken = default) + public async Task SendRequestAsync(IFlurlRequest flurlRequest, HttpContent? httpContent = null, CancellationToken cancellationToken = default) where T : WechatApiResponse, new() { try { - using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, content, cancellationToken).ConfigureAwait(false); + using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken).ConfigureAwait(false); return await GetResposneAsync(flurlResponse).ConfigureAwait(false); } catch (FlurlHttpException ex)