From e14d0dfe83d50f40afecab14f40c458d9f6e9759 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Mon, 25 Dec 2023 13:51:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(wxapi):=20=E9=9A=8F=E5=AE=98=E6=96=B9?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E8=B4=A6=E5=8F=B7=E7=AE=A1=E7=90=86=E3=80=81?= =?UTF-8?q?=E4=BB=A3=E5=95=86=E5=AE=B6=E6=B3=A8=E5=86=8C=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=AD=89=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...iClientExecuteCgibinComponentExtensions.cs | 28 ++++++++----------- ...tApiClientExecuteWxaComponentExtensions.cs | 4 +-- ...nComponentApiGetAuthorizerOptionRequest.cs | 23 +-------------- ...nComponentApiSetAuthorizerOptionRequest.cs | 23 +-------------- ...omponentApiGetAuthorizerOptionRequest.json | 4 +-- ...omponentApiSetAuthorizerOptionRequest.json | 4 +-- 6 files changed, 17 insertions(+), 69 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinComponentExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinComponentExtensions.cs index 9c5a940e..5046e25a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinComponentExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinComponentExtensions.cs @@ -77,7 +77,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_create_preauthcode") - .SetQueryParam("component_access_token", request.ComponentAccessToken); + .SetQueryParam("access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } @@ -100,7 +100,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_query_auth") - .SetQueryParam("component_access_token", request.ComponentAccessToken); + .SetQueryParam("access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } @@ -123,7 +123,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_authorizer_token") - .SetQueryParam("component_access_token", request.ComponentAccessToken); + .SetQueryParam("access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } @@ -146,7 +146,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_get_authorizer_info") - .SetQueryParam("component_access_token", request.ComponentAccessToken); + .SetQueryParam("access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } @@ -169,14 +169,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_get_authorizer_list") - .SetQueryParam("component_access_token", request.ComponentAccessToken); + .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// /// 异步调用 [POST] /cgi-bin/component/api_get_authorizer_option 接口。 - /// REF: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/authorization-management/getAuthorizerOption.html + /// REF: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/authorization-management/getAuthorizerOptionInfo.html /// /// /// @@ -187,19 +187,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.ComponentAppId == null) - request.ComponentAppId = client.Credentials.AppId; - IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_get_authorizer_option") - .SetQueryParam("component_access_token", request.ComponentAccessToken); + .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// /// 异步调用 [POST] /cgi-bin/component/api_set_authorizer_option 接口。 - /// REF: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/authorization-management/setAuthorizerOption.html + /// REF: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/authorization-management/setAuthorizerOptionInfo.html /// /// /// @@ -210,12 +207,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.ComponentAppId == null) - request.ComponentAppId = client.Credentials.AppId; - IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "api_set_authorizer_option") - .SetQueryParam("component_access_token", request.ComponentAccessToken); + .SetQueryParam("access_token", request.AccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } @@ -236,7 +230,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "fastregisterweapp") .SetQueryParam("action", "create") - .SetQueryParam("component_access_token", request.ComponentAccessToken); + .SetQueryParam("access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } @@ -257,7 +251,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Post, "cgi-bin", "component", "fastregisterweapp") .SetQueryParam("action", "search") - .SetQueryParam("component_access_token", request.ComponentAccessToken); + .SetQueryParam("access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs index 68ec4a20..a1a00f78 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs @@ -1619,7 +1619,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Post, "wxa", "component", "fastregisterpersonalweapp") .SetQueryParam("action", "create") - .SetQueryParam("component_access_token", request.ComponentAccessToken); + .SetQueryParam("access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } @@ -1640,7 +1640,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Post, "wxa", "component", "fastregisterpersonalweapp") .SetQueryParam("action", "query") - .SetQueryParam("component_access_token", request.ComponentAccessToken); + .SetQueryParam("access_token", request.ComponentAccessToken); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiGetAuthorizerOptionRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiGetAuthorizerOptionRequest.cs index b3b03c1c..42e34c96 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiGetAuthorizerOptionRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiGetAuthorizerOptionRequest.cs @@ -1,31 +1,10 @@ -namespace SKIT.FlurlHttpClient.Wechat.Api.Models +namespace SKIT.FlurlHttpClient.Wechat.Api.Models { /// /// 表示 [POST] /cgi-bin/component/api_get_authorizer_option 接口的请求。 /// public class CgibinComponentApiGetAuthorizerOptionRequest : WechatApiRequest, IInferable { - /// - /// 获取或设置第三方平台 AccessToken。 - /// - [Newtonsoft.Json.JsonIgnore] - [System.Text.Json.Serialization.JsonIgnore] - public string ComponentAccessToken { get; set; } = string.Empty; - - /// - /// 获取或设置第三方平台 AppId。如果不指定将使用构造 时的 参数。 - /// - [Newtonsoft.Json.JsonProperty("component_appid")] - [System.Text.Json.Serialization.JsonPropertyName("component_appid")] - public string? ComponentAppId { get; set; } - - /// - /// 获取或设置授权方 AppId。 - /// - [Newtonsoft.Json.JsonProperty("authorizer_appid")] - [System.Text.Json.Serialization.JsonPropertyName("authorizer_appid")] - public string AuthorizerAppId { get; set; } = string.Empty; - /// /// 获取或设置选项名称。 /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiSetAuthorizerOptionRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiSetAuthorizerOptionRequest.cs index bb47204d..c049f83c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiSetAuthorizerOptionRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinComponent/CgibinComponentApiSetAuthorizerOptionRequest.cs @@ -1,31 +1,10 @@ -namespace SKIT.FlurlHttpClient.Wechat.Api.Models +namespace SKIT.FlurlHttpClient.Wechat.Api.Models { /// /// 表示 [POST] /cgi-bin/component/api_set_authorizer_option 接口的请求。 /// public class CgibinComponentApiSetAuthorizerOptionRequest : WechatApiRequest, IInferable { - /// - /// 获取或设置第三方平台 AccessToken。 - /// - [Newtonsoft.Json.JsonIgnore] - [System.Text.Json.Serialization.JsonIgnore] - public string ComponentAccessToken { get; set; } = string.Empty; - - /// - /// 获取或设置第三方平台 AppId。如果不指定将使用构造 时的 参数。 - /// - [Newtonsoft.Json.JsonProperty("component_appid")] - [System.Text.Json.Serialization.JsonPropertyName("component_appid")] - public string? ComponentAppId { get; set; } - - /// - /// 获取或设置授权方 AppId。 - /// - [Newtonsoft.Json.JsonProperty("authorizer_appid")] - [System.Text.Json.Serialization.JsonPropertyName("authorizer_appid")] - public string AuthorizerAppId { get; set; } = string.Empty; - /// /// 获取或设置选项名称。 /// diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinComponent/CgibinComponentApiGetAuthorizerOptionRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinComponent/CgibinComponentApiGetAuthorizerOptionRequest.json index 396a3afa..fb273237 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinComponent/CgibinComponentApiGetAuthorizerOptionRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinComponent/CgibinComponentApiGetAuthorizerOptionRequest.json @@ -1,5 +1,3 @@ -{ - "component_appid": "appid_value", - "authorizer_appid": "auth_appid_value ", +{ "option_name": "option_name_value" } diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinComponent/CgibinComponentApiSetAuthorizerOptionRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinComponent/CgibinComponentApiSetAuthorizerOptionRequest.json index 381c2609..eac4c223 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinComponent/CgibinComponentApiSetAuthorizerOptionRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinComponent/CgibinComponentApiSetAuthorizerOptionRequest.json @@ -1,6 +1,4 @@ -{ - "component_appid": "appid_value", - "authorizer_appid": "auth_appid_value ", +{ "option_name": "option_name_value", "option_value": "option_value_value" }