diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/Internal/FlurlHttpRequestOptionsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/Internal/FlurlHttpRequestOptionsExtensions.cs deleted file mode 100644 index 86fc8737..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/Internal/FlurlHttpRequestOptionsExtensions.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using Flurl.Http; - -namespace SKIT.FlurlHttpClient.Wechat.Work -{ - internal static class FlurlHttpRequestOptionsExtensions - { - public static IFlurlRequest SetOptions(this IFlurlRequest request, WechatWorkRequest 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.Work/Extensions/WechatWorkClientExecuteCgibinAgentExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAgentExtensions.cs index fd92333b..0d93aac6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAgentExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAgentExtensions.cs @@ -30,12 +30,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.AgentId = client.WechatAgentId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "agent", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "agent", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("agentid", request.AgentId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -54,11 +53,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "agent", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "agent", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -78,8 +76,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.AgentId = client.WechatAgentId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "agent", "set") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "agent", "set") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -103,8 +100,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.AgentId = client.WechatAgentId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "agent", "set_scope") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "agent", "set_scope") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -128,8 +124,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.AgentId = client.WechatAgentId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "agent", "set_workbench_template") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "agent", "set_workbench_template") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -152,8 +147,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.AgentId = client.WechatAgentId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "agent", "get_workbench_template") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "agent", "get_workbench_template") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -176,8 +170,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.AgentId = client.WechatAgentId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "agent", "set_workbench_data") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "agent", "set_workbench_data") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAppChatExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAppChatExtensions.cs index 7e610535..41fc855b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAppChatExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAppChatExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "appchat", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "appchat", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,8 +45,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "appchat", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "appchat", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -67,12 +65,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "appchat", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "appchat", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("chatid", request.ChatId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -89,8 +86,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "appchat", "send") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "appchat", "send") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinBatchExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinBatchExtensions.cs index 985a0d59..68198b34 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinBatchExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinBatchExtensions.cs @@ -27,8 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "batch", "invite") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "batch", "invite") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -50,8 +49,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "batch", "syncuser") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "batch", "syncuser") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -73,8 +71,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "batch", "replaceuser") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "batch", "replaceuser") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -96,8 +93,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "batch", "replaceparty") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "batch", "replaceparty") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -119,12 +115,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "batch", "getresult") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "batch", "getresult") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("jobid", request.JobId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCardInvoiceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCardInvoiceExtensions.cs index 2c4564d1..730c9a6f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCardInvoiceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCardInvoiceExtensions.cs @@ -27,8 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "getinvoiceinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "getinvoiceinfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -50,8 +49,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "updateinvoicestatus") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "updateinvoicestatus") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -73,8 +71,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "updatestatusbatch") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "updatestatusbatch") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -96,8 +93,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "getinvoiceinfobatch") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "getinvoiceinfobatch") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCheckinExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCheckinExtensions.cs index d5d8faa2..46a6e5bf 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCheckinExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCheckinExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "checkin", "getcorpcheckinoption") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcorpcheckinoption") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -47,8 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "checkin", "getcheckinoption") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckinoption") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -69,8 +67,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "checkin", "getcheckindata") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckindata") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -91,8 +88,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "checkin", "getcheckin_daydata") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckin_daydata") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -113,8 +109,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "checkin", "getcheckin_monthdata") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckin_monthdata") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -135,8 +130,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "checkin", "getcheckinschedulist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckinschedulist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -157,8 +151,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "checkin", "setcheckinschedulist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "setcheckinschedulist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -178,8 +171,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "checkin", "addcheckinuserface") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "addcheckinuserface") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpExtensions.cs index c920d7da..8b823ff9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpExtensions.cs @@ -25,14 +25,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "corp", "get_join_qrcode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "corp", "get_join_qrcode") .SetQueryParam("access_token", request.AccessToken); if (request.SizeType.HasValue) flurlReq.SetQueryParam("size_type", request.SizeType.Value); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -51,8 +50,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "corp", "getopenapprovaldata") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corp", "getopenapprovaldata") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpGroupExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpGroupExtensions.cs index a3660fcd..b855c367 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpGroupExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpGroupExtensions.cs @@ -29,8 +29,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.ParentAgentId = client.WechatAgentId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "list_app_share_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "list_app_share_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -50,8 +49,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "gettoken") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "gettoken") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDepartmentExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDepartmentExtensions.cs index ee71d3a9..e1a82b17 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDepartmentExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDepartmentExtensions.cs @@ -27,8 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "department", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "department", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -50,8 +49,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "department", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "department", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -73,12 +71,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "department", "delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "department", "delete") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("id", request.DepartmentId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -97,14 +94,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "department", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "department", "list") .SetQueryParam("access_token", request.AccessToken); if (request.ParentDepartmentId.HasValue) flurlReq.SetQueryParam("id", request.ParentDepartmentId.Value); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDialogExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDialogExtensions.cs index c6225fba..9fb29e84 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDialogExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDialogExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "dial", "get_dial_record") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "dial", "get_dial_record") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExtensions.cs index c078fbbc..50389aa6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExtensions.cs @@ -25,12 +25,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "gettoken") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "gettoken") .SetQueryParam("corpid", client.WechatCorpId) .SetQueryParam("corpsecret", client.WechatAgentSecret); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -49,11 +48,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work 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, cancellationToken: cancellationToken); } /// @@ -70,11 +68,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work 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, cancellationToken: cancellationToken); } /// @@ -92,11 +89,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "get_jsapi_ticket") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "get_jsapi_ticket") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -114,12 +110,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "ticket", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "ticket", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("type", request.Type); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalContactExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalContactExtensions.cs index 9b617633..7c48d71c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalContactExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalContactExtensions.cs @@ -26,11 +26,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "externalcontact", "get_follow_user_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "get_follow_user_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -48,8 +47,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "close_temp_chat") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "close_temp_chat") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -70,12 +68,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "externalcontact", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "list") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("userid", request.UserId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -95,15 +92,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "externalcontact", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("external_userid", request.ExternalUserId); if (!string.IsNullOrEmpty(request.NextCursor)) request.NextCursor = request.NextCursor; - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -121,8 +117,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "batch", "get_by_user") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "batch", "get_by_user") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -143,8 +138,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "remark") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "remark") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -165,8 +159,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "mark_tag") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "mark_tag") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -187,8 +180,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "get_unassigned_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_unassigned_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -209,8 +201,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "get_user_behavior_data") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_user_behavior_data") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -230,8 +221,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "unionid_to_external_userid") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "unionid_to_external_userid") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -252,8 +242,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "convert_to_openid") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "convert_to_openid") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -273,8 +262,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "batch_to_external_userid") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "batch_to_external_userid") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -296,8 +284,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "add_contact_way") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_contact_way") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -318,8 +305,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "get_contact_way") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_contact_way") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -340,8 +326,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "update_contact_way") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "update_contact_way") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -362,8 +347,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "del_contact_way") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "del_contact_way") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -386,8 +370,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "get_corp_tag_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_corp_tag_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -408,8 +391,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "add_corp_tag") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_corp_tag") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -430,8 +412,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "edit_corp_tag") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "edit_corp_tag") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -452,8 +433,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "del_corp_tag") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "del_corp_tag") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -476,8 +456,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "transfer_customer") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "transfer_customer") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -498,8 +477,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "transfer_result") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "transfer_result") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -520,8 +498,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "resigned", "transfer_customer") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "resigned", "transfer_customer") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -542,8 +519,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "resigned", "transfer_result") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "resigned", "transfer_result") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -566,8 +542,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "transfer") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "transfer") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -588,8 +563,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -610,8 +584,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -633,8 +606,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "statistic") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "statistic") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -655,8 +627,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "statistic_group_by_day") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "statistic_group_by_day") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -680,8 +651,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -702,8 +672,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_task") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_task") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -724,8 +693,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_customer_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_customer_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -746,8 +714,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_send_result") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_send_result") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -768,8 +735,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_comments") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_comments") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -792,8 +758,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "add_msg_template") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_msg_template") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -814,8 +779,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "get_groupmsg_list_v2") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_groupmsg_list_v2") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -836,8 +800,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "get_groupmsg_task") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_groupmsg_task") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -858,8 +821,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "get_groupmsg_send_result") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_groupmsg_send_result") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -882,8 +844,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "send_welcome_msg") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "send_welcome_msg") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -904,8 +865,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -926,8 +886,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "edit") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "edit") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -948,8 +907,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -970,8 +928,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "del") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -998,8 +955,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.AgentId = client.WechatAgentId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "message", "send") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "message", "send") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1022,11 +978,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "externalcontact", "get_subscribe_qr_code") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "get_subscribe_qr_code") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -1044,8 +999,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalcontact", "set_subscribe_mode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "set_subscribe_mode") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -1066,11 +1020,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "externalcontact", "get_subscribe_mode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "get_subscribe_mode") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalPayExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalPayExtensions.cs index b6646fcd..ca000826 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalPayExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalPayExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalpay", "addmerchant") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "addmerchant") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -47,8 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalpay", "getmerchant") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "getmerchant") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -68,8 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalpay", "delmerchant") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "delmerchant") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -89,8 +86,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalpay", "set_mch_use_scope") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "set_mch_use_scope") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -113,8 +109,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "externalpay", "get_bill_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "get_bill_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHealthExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHealthExtensions.cs index ece11b31..b675f27f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHealthExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHealthExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "health", "get_health_report_stat") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "health", "get_health_report_stat") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,8 +45,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "health", "get_report_jobids") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "health", "get_report_jobids") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -67,8 +65,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "health", "get_report_job_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "health", "get_report_job_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -88,8 +85,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "health", "get_report_answer") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "health", "get_report_answer") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLinkedCorpExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLinkedCorpExtensions.cs index 748f7bcf..bb106f63 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLinkedCorpExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLinkedCorpExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "linkedcorp", "agent", "get_perm_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "agent", "get_perm_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,8 +45,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "linkedcorp", "user", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "user", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -67,8 +65,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "linkedcorp", "user", "simplelist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "user", "simplelist") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -88,8 +85,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "linkedcorp", "user", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "user", "list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -109,8 +105,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "linkedcorp", "department", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "department", "list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -134,8 +129,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.AgentId = client.WechatAgentId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "linkedcorp", "message", "send") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "message", "send") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLivingExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLivingExtensions.cs index 63b16dc0..304f0562 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLivingExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLivingExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "living", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -48,8 +47,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "living", "modify") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "modify") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -70,8 +68,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "living", "cancel") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "cancel") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -94,8 +91,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "living", "delete_replay_data") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "delete_replay_data") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -116,12 +112,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "living", "get_living_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "living", "get_living_info") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("livingid", request.LivingId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -139,8 +134,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "living", "get_living_code") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "get_living_code") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -161,8 +155,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "living", "get_living_share_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "get_living_share_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -185,8 +178,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "living", "get_user_all_livingid") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "get_user_all_livingid") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -207,8 +199,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "living", "get_watch_stat") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "get_watch_stat") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMediaExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMediaExtensions.cs index 7cb9bc76..43b26551 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMediaExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMediaExtensions.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; @@ -27,14 +28,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Work 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_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 ("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; @@ -42,38 +47,30 @@ namespace SKIT.FlurlHttpClient.Wechat.Work 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)) + 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; 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); } /// @@ -95,28 +92,21 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.FileName = Guid.NewGuid().ToString("N").ToLower() + ".png"; 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; - IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "media", "uploadimg") - .SetOptions(request) - .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, content: httpContent, cancellationToken: cancellationToken); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -135,12 +125,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work 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, cancellationToken: cancellationToken); } /// @@ -159,12 +148,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "media", "get", "jssdk") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "media", "get", "jssdk") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("media_id", request.MediaId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMeetingExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMeetingExtensions.cs index af59bbc2..ab408473 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMeetingExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMeetingExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "meeting", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -48,8 +47,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "meeting", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -70,8 +68,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "meeting", "cancel") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "cancel") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -92,8 +89,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "meeting", "get_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -114,8 +110,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "meeting", "get_user_meetingid") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_user_meetingid") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMenuExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMenuExtensions.cs index 6a359018..8c19d5e6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMenuExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMenuExtensions.cs @@ -28,8 +28,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.AgentId = client.WechatAgentId; 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) .SetQueryParam("agentid", request.AgentId); @@ -53,12 +52,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.AgentId = client.WechatAgentId; 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) .SetQueryParam("agentid", request.AgentId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -78,12 +76,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.AgentId = client.WechatAgentId; 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) .SetQueryParam("agentid", request.AgentId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageAuditExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageAuditExtensions.cs index 4be7b39a..c0cce66b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageAuditExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageAuditExtensions.cs @@ -25,12 +25,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "msgaudit", "get_robot_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "msgaudit", "get_robot_info") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("robot_id", request.RobotId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -47,8 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "msgaudit", "get_permit_user_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "msgaudit", "get_permit_user_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -68,8 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "msgaudit", "check_single_agree") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "msgaudit", "check_single_agree") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -89,8 +86,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "msgaudit", "check_room_agree") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "msgaudit", "check_room_agree") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -110,8 +106,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "msgaudit", "groupchat", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "msgaudit", "groupchat", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageExtensions.cs index d9263a61..52569136 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageExtensions.cs @@ -30,8 +30,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.AgentId = client.WechatAgentId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "send") - .SetOptions(request); + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "send"); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } @@ -54,8 +53,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.AgentId = client.WechatAgentId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "update_taskcard") - .SetOptions(request); + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "update_taskcard"); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } @@ -74,8 +72,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "message", "get_statistics") - .SetOptions(request); + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "get_statistics"); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMiniProgramExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMiniProgramExtensions.cs index 692f284f..8a8b9b6e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMiniProgramExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMiniProgramExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "miniprogram", "transfer_session") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "miniprogram", "transfer_session") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOAExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOAExtensions.cs index 1654ea40..9fa1ca0a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOAExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOAExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "approval", "copytemplate") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "approval", "copytemplate") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -48,8 +47,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "gettemplatedetail") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "gettemplatedetail") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -70,8 +68,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "applyevent") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "applyevent") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -92,8 +89,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "getapprovalinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "getapprovalinfo") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -114,8 +110,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "getapprovaldetail") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "getapprovaldetail") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -138,11 +133,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "oa", "vacation", "getcorpconf") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "oa", "vacation", "getcorpconf") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -160,8 +154,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "vacation", "getuservacationquota") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "vacation", "getuservacationquota") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -182,8 +175,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "vacation", "setoneuserquota") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "vacation", "setoneuserquota") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -205,8 +197,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "journal", "get_record_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "journal", "get_record_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -226,8 +217,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "journal", "get_record_detail") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "journal", "get_record_detail") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -247,8 +237,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "journal", "get_stat_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "journal", "get_stat_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -270,8 +259,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -291,8 +279,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -312,8 +299,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "edit") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "edit") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -333,8 +319,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "del") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -355,8 +340,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "get_booking_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "get_booking_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -376,8 +360,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "book") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "book") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -397,8 +380,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "cancel_book") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "cancel_book") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -422,8 +404,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "calendar", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "calendar", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -444,8 +425,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "calendar", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "calendar", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -466,8 +446,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "calendar", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "calendar", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -488,8 +467,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "calendar", "del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "calendar", "del") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -512,8 +490,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "schedule", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -534,8 +511,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "schedule", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -556,8 +532,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "schedule", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "get") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -578,8 +553,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "schedule", "get_by_calendar") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "get_by_calendar") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -600,8 +574,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "oa", "schedule", "del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "del") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinPSTNCCExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinPSTNCCExtensions.cs index 70fd5bfb..882001c2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinPSTNCCExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinPSTNCCExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "pstncc", "call") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "pstncc", "call") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,8 +45,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "pstncc", "getstates") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "pstncc", "getstates") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinReportExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinReportExtensions.cs index 5a7337f7..c4568ad4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinReportExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinReportExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "grid", "add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -47,8 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "grid", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -68,8 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "grid", "delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "delete") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -89,8 +86,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "grid", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -110,8 +106,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "grid", "get_user_grid_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "get_user_grid_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -133,8 +128,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "grid", "add_cata") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "add_cata") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -154,8 +148,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "grid", "update_cata") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "update_cata") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -175,8 +168,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "grid", "delete_cata") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "delete_cata") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -196,8 +188,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "grid", "list_cata") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "list_cata") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -219,11 +210,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "report", "patrol", "get_grid_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "report", "patrol", "get_grid_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -240,8 +230,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "patrol", "get_corp_status") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "get_corp_status") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -261,8 +250,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "patrol", "get_user_status") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "get_user_status") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -282,8 +270,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "patrol", "category_statistic") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "category_statistic") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -303,8 +290,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "patrol", "get_order_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "get_order_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -324,8 +310,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "patrol", "get_order_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "get_order_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -347,11 +332,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "report", "resident", "get_grid_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "report", "resident", "get_grid_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -368,8 +352,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "resident", "get_corp_status") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "get_corp_status") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -389,8 +372,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "resident", "get_user_status") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "get_user_status") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -410,8 +392,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "resident", "category_statistic") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "category_statistic") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -431,8 +412,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "resident", "get_order_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "get_order_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -452,8 +432,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "report", "resident", "get_order_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "get_order_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSchoolExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSchoolExtensions.cs index 54d8456e..71dd871a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSchoolExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSchoolExtensions.cs @@ -25,8 +25,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "set_teacher_view_mode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "set_teacher_view_mode") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -46,11 +45,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "school", "get_teacher_view_mode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "get_teacher_view_mode") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -68,8 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "set_arch_sync_mode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "set_arch_sync_mode") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -90,8 +87,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "set_upgrade_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "set_upgrade_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -114,12 +110,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "school", "user", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("userid", request.StudentOrParentUserId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -137,15 +132,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "school", "user", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "list") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("department_id", request.DeparmentId); if (request.RequireFetchChild.HasValue) flurlReq.SetQueryParam("fetch_child", request.RequireFetchChild.Value ? 1 : 0); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -162,12 +156,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "school", "user", "list_parent") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "list_parent") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("department_id", request.DeparmentId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } #region UserStudent @@ -186,8 +179,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "user", "create_student") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "create_student") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -208,12 +200,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "school", "user", "delete_student") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "delete_student") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("userid", request.StudentUserId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -231,8 +222,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "user", "update_student") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "update_student") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -253,8 +243,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "user", "batch_create_student") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_create_student") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -275,8 +264,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "user", "batch_delete_student") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_delete_student") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -297,8 +285,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "user", "batch_update_student") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_update_student") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -321,8 +308,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "user", "create_parent") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "create_parent") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -343,12 +329,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "school", "user", "delete_parent") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "delete_parent") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("userid", request.ParentUserId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -366,8 +351,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "user", "update_parent") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "update_parent") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -388,8 +372,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "user", "batch_create_parent") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_create_parent") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -410,8 +393,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "user", "batch_delete_parent") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_delete_parent") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -432,8 +414,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "user", "batch_update_parent") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_update_parent") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -455,8 +436,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "user", "get_teacher_customize_health_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "get_teacher_customize_health_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -476,8 +456,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "user", "get_student_customize_health_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "get_student_customize_health_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -497,8 +476,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "user", "get_health_qrcode") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "get_health_qrcode") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -522,8 +500,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "department", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "department", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -544,8 +521,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "department", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "department", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -566,12 +542,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "school", "department", "delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "department", "delete") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("id", request.DepartmentId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -589,14 +564,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "school", "department", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "department", "list") .SetQueryParam("access_token", request.AccessToken); if (request.ParentDepartmentId.HasValue) flurlReq.SetQueryParam("id", request.ParentDepartmentId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } #endregion @@ -616,12 +590,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "school", "living", "get_living_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "living", "get_living_info") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("livingid", request.LivingId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -639,8 +612,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "living", "get_watch_stat") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "living", "get_watch_stat") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -661,8 +633,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "school", "living", "get_unwatch_stat") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "living", "get_unwatch_stat") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinServiceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinServiceExtensions.cs index 5d888188..27ad30a0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinServiceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinServiceExtensions.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; @@ -27,8 +28,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "get_provider_token") - .SetOptions(request); + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_provider_token"); var requestData = new { corpid = client.WechatCorpId, provider_secret = client.WechatAgentSecret }; return await client.SendRequestWithJsonAsync(flurlReq, data: requestData, cancellationToken: cancellationToken); @@ -55,8 +55,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.SuiteSecret = client.WechatSuiteSecret; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "get_suite_token") - .SetOptions(request); + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_suite_token"); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } @@ -76,11 +75,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "service", "get_pre_auth_code") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "service", "get_pre_auth_code") .SetQueryParam("suite_access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -98,8 +96,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "set_session_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "set_session_info") .SetQueryParam("suite_access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -120,8 +117,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "get_permanent_code") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_permanent_code") .SetQueryParam("suite_access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -142,8 +138,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "get_auth_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_auth_info") .SetQueryParam("suite_access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -164,8 +159,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "get_corp_token") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_corp_token") .SetQueryParam("suite_access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -186,8 +180,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "get_admin_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_admin_list") .SetQueryParam("suite_access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -209,8 +202,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "get_register_code") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_register_code") .SetQueryParam("provider_access_token", request.ProviderAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -231,8 +223,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "get_register_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_register_info") .SetQueryParam("provider_access_token", request.ProviderAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -253,14 +244,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Work 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_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 ("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; @@ -268,38 +263,30 @@ namespace SKIT.FlurlHttpClient.Wechat.Work 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)) + 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; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "media", "upload") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "media", "upload") .SetQueryParam("provider_access_token", request.ProviderAccessToken) .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); } #endregion @@ -319,12 +306,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "service", "getuserinfo3rd") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "service", "getuserinfo3rd") .SetQueryParam("suite_access_token", request.AccessToken) .SetQueryParam("code", request.Code); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -342,8 +328,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "getuserdetail3rd") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "getuserdetail3rd") .SetQueryParam("suite_access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -364,8 +349,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "get_login_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_login_info") .SetQueryParam("access_token", request.ProviderAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -387,8 +371,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "contact", "id_translate") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "contact", "id_translate") .SetQueryParam("provider_access_token", request.ProviderAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -408,8 +391,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "contact", "sort") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "contact", "sort") .SetQueryParam("provider_access_token", request.ProviderAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -431,12 +413,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "service", "batch", "getresult") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "service", "batch", "getresult") .SetQueryParam("provider_access_token", request.ProviderAccessToken) .SetQueryParam("jobid", request.JobId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } #endregion @@ -455,8 +436,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "add_device") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "add_device") .SetQueryParam("provider_access_token", request.ProviderAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -476,8 +456,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "get_device_auth_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_device_auth_info") .SetQueryParam("provider_access_token", request.ProviderAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -497,8 +476,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "reset_secret_no") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "reset_secret_no") .SetQueryParam("provider_access_token", request.ProviderAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -518,8 +496,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "list_device") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "list_device") .SetQueryParam("provider_access_token", request.ProviderAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -539,8 +516,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "fetch_device_log") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "fetch_device_log") .SetQueryParam("provider_access_token", request.ProviderAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -560,8 +536,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "hardware", "get_device_feature") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "hardware", "get_device_feature") .SetQueryParam("provider_access_token", request.ProviderAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -581,8 +556,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "del_device") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "del_device") .SetQueryParam("provider_access_token", request.ProviderAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -602,8 +576,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "service", "set_printer_support_state") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "set_printer_support_state") .SetQueryParam("provider_access_token", request.ProviderAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSyncExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSyncExtensions.cs index 2d34fcf0..7b89092c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSyncExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSyncExtensions.cs @@ -26,11 +26,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "sync", "contact_sync_success") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "sync", "contact_sync_success") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinTagExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinTagExtensions.cs index f0d38c52..419f48d9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinTagExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinTagExtensions.cs @@ -27,8 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "tag", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tag", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -50,8 +49,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "tag", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tag", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -73,12 +71,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "tag", "delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "tag", "delete") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("tagid", request.TagId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -97,11 +94,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "tag", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "tag", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -120,12 +116,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "tag", "get") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "tag", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("tagid", request.TagId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } #region TagUser @@ -145,8 +140,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "tag", "addtagusers") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tag", "addtagusers") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -168,8 +162,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "tag", "deltagusers") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tag", "deltagusers") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinUserExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinUserExtensions.cs index e999340e..9cac3e71 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinUserExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinUserExtensions.cs @@ -27,8 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "user", "create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -50,12 +49,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work 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) .SetQueryParam("userid", request.UserId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -74,8 +72,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "user", "update") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "update") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -97,12 +94,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "user", "delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "delete") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("userid", request.UserId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -121,8 +117,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "user", "batchdelete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "batchdelete") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -144,15 +139,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "user", "simplelist") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "simplelist") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("department_id", request.DepartmentId); if (request.RequireFetchChild.HasValue) flurlReq.SetQueryParam("fetch_child", request.RequireFetchChild.Value ? 1 : 0); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -171,15 +165,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "user", "list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "list") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("department_id", request.DepartmentId); if (request.RequireFetchChild.HasValue) flurlReq.SetQueryParam("fetch_child", request.RequireFetchChild.Value ? 1 : 0); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -198,8 +191,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "user", "convert_to_openid") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "convert_to_openid") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -221,8 +213,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "user", "convert_to_userid") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "convert_to_userid") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -245,12 +236,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "user", "getuserinfo") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "getuserinfo") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("code", request.Code); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -267,8 +257,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "user", "getuserid") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "getuserid") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -288,8 +277,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "user", "get_active_stat") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "get_active_stat") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -312,12 +300,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "user", "authsucc") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "authsucc") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("userid", request.UserId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -334,8 +321,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "user", "list_member_auth") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "list_member_auth") .SetQueryParam("access_token", request.AccessToken); if (!string.IsNullOrEmpty(request.NextCursor)) @@ -344,7 +330,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request.Limit.HasValue) flurlReq.SetQueryParam("limit", request.Limit); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } /// @@ -361,12 +347,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "cgi-bin", "user", "check_member_auth") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "check_member_auth") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("open_userid", request.OpenUserId); - return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinWebDriveExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinWebDriveExtensions.cs index 010ff6f8..08ebacb1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinWebDriveExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinWebDriveExtensions.cs @@ -26,8 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "space_create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -47,8 +46,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "space_rename") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_rename") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -68,8 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "space_dismiss") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_dismiss") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -89,8 +86,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "space_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -110,8 +106,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "space_setting") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_setting") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -131,8 +126,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "space_share") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_share") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -154,8 +148,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "space_acl_add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_acl_add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -175,8 +168,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "space_acl_del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_acl_del") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -198,8 +190,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "file_list") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_list") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -219,8 +210,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "file_upload") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_upload") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -240,8 +230,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "file_download") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_download") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -261,8 +250,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "file_create") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_create") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -282,8 +270,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "file_rename") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_rename") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -303,8 +290,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "file_move") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_move") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -324,8 +310,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "file_delete") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_delete") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -345,8 +330,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "file_info") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_info") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -366,8 +350,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "file_setting") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_setting") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -387,8 +370,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "file_share") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_share") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -410,8 +392,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "file_acl_add") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_acl_add") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -431,8 +412,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "cgi-bin", "wedrive", "file_acl_del") - .SetOptions(request) + .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_acl_del") .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/Internal/FileNameToContentTypeMapper.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/Internal/FileNameToContentTypeMapper.cs new file mode 100644 index 00000000..abc39999 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/Internal/FileNameToContentTypeMapper.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; + +namespace SKIT.FlurlHttpClient.Wechat.Work.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 ".gif": + return "image/gif"; + 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.Work/WechatWorkClient.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs index d61374c3..991ff05e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs @@ -86,20 +86,39 @@ namespace SKIT.FlurlHttpClient.Wechat.Work { } + /// + /// 使用当前客户端生成一个新的 对象。 + /// + /// + /// + /// + /// + public IFlurlRequest CreateRequest(WechatWorkRequest 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 : WechatWorkResponse, 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)