From 5d353f32226dedaa0ca74c18e9719457e197d261 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Wed, 24 May 2023 10:27:14 +0800 Subject: [PATCH] =?UTF-8?q?feat(work):=20=E9=9A=8F=E5=AE=98=E6=96=B9?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E5=8E=86=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Events/Service/ApproveSpecialAuthEvent.cs | 12 ++++++++++++ .../CgibinOA/Calendar/CgibinOACalendarAddRequest.cs | 12 +++++------- .../CgibinOA/Calendar/CgibinOACalendarGetResponse.cs | 12 +++++------- .../EventSamples/Service/ApproveSpecialAuthEvent.xml | 2 +- .../Calendar/CgibinOACalendarAddRequest.json | 9 +++++---- .../Calendar/CgibinOACalendarGetResponse.json | 7 ++++--- .../Calendar/CgibinOACalendarUpdateRequest.json | 9 +++++---- 7 files changed, 37 insertions(+), 26 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ApproveSpecialAuthEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ApproveSpecialAuthEvent.cs index 94578396..af5a65d3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ApproveSpecialAuthEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ApproveSpecialAuthEvent.cs @@ -6,6 +6,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// public class ApproveSpecialAuthEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable { + /// + /// 获取或设置第三方应用的 SuiteId。 + /// + [System.Xml.Serialization.XmlElement("SuiteId")] + public string SuiteId { get; set; } = default!; + + /// + /// 获取或设置授权方的 CorpId。 + /// + [System.Xml.Serialization.XmlElement("AuthCorpId")] + public string AuthorizerCorpId { get; set; } = default!; + /// /// 获取或设置权限类型。 /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarAddRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarAddRequest.cs index 880e596b..1dbf075d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarAddRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarAddRequest.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace SKIT.FlurlHttpClient.Wechat.Work.Models { @@ -23,13 +23,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models public string UserId { get; set; } = string.Empty; /// - /// 获取或设置共享者对日历是否只读权限。 + /// 获取或设置日历通知范围成员权限。 /// - [Newtonsoft.Json.JsonProperty("readonly")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] - [System.Text.Json.Serialization.JsonPropertyName("readonly")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] - public bool? IsReadonly { get; set; } + [Newtonsoft.Json.JsonProperty("permission")] + [System.Text.Json.Serialization.JsonPropertyName("permission")] + public int? Permission { get; set; } } public class PublicRange diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarGetResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarGetResponse.cs index ae2cc733..57af6c17 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarGetResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarGetResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Models +namespace SKIT.FlurlHttpClient.Wechat.Work.Models { /// /// 表示 [POST] /cgi-bin/oa/calendar/get 接口的响应。 @@ -21,13 +21,11 @@ public string UserId { get; set; } = default!; /// - /// 获取或设置共享者对日历是否只读权限。 + /// 获取或设置日历通知范围成员权限。 /// - [Newtonsoft.Json.JsonProperty("readonly")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] - [System.Text.Json.Serialization.JsonPropertyName("readonly")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] - public bool IsReadonly { get; set; } + [Newtonsoft.Json.JsonProperty("permission")] + [System.Text.Json.Serialization.JsonPropertyName("permission")] + public int Permission { get; set; } } public class PublicRange diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/EventSamples/Service/ApproveSpecialAuthEvent.xml b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/EventSamples/Service/ApproveSpecialAuthEvent.xml index afc2fab3..32473bd6 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/EventSamples/Service/ApproveSpecialAuthEvent.xml +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/EventSamples/Service/ApproveSpecialAuthEvent.xml @@ -3,5 +3,5 @@ 1403610513 - + diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Calendar/CgibinOACalendarAddRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Calendar/CgibinOACalendarAddRequest.json index 7344defc..08ef905d 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Calendar/CgibinOACalendarAddRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Calendar/CgibinOACalendarAddRequest.json @@ -1,4 +1,4 @@ -{ +{ "calendar": { "admins": ["admin1", "admin2"], "set_as_default": 1, @@ -7,11 +7,12 @@ "description": "test_describe", "shares": [ { - "userid": "userid2" + "userid": "userid2", + "permission": 1 }, { - "userid": "userid3", - "readonly": 1 + "userid": "userid1", + "permission": 3 } ], "is_public": 1, diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Calendar/CgibinOACalendarGetResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Calendar/CgibinOACalendarGetResponse.json index 2ccd2cab..420a0e87 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Calendar/CgibinOACalendarGetResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Calendar/CgibinOACalendarGetResponse.json @@ -1,4 +1,4 @@ -{ +{ "errcode": 0, "errmsg": "ok", "calendar_list": [ @@ -10,11 +10,12 @@ "description": "test_describe_1", "shares": [ { - "userid": "userid2" + "userid": "userid2", + "permission": 1 }, { "userid": "userid1", - "readonly": 1 + "permission": 3 } ], "is_public": 1, diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Calendar/CgibinOACalendarUpdateRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Calendar/CgibinOACalendarUpdateRequest.json index 69b9ff68..3988a45d 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Calendar/CgibinOACalendarUpdateRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Calendar/CgibinOACalendarUpdateRequest.json @@ -1,4 +1,4 @@ -{ +{ "skip_public_range": 0, "calendar": { "cal_id": "wcjgewCwAAqeJcPI1d8Pwbjt7nttzAAA", @@ -8,11 +8,12 @@ "description": "test_describe_1", "shares": [ { - "userid": "userid1" + "userid": "userid2", + "permission": 1 }, { - "userid": "userid2", - "readonly": 1 + "userid": "userid1", + "permission": 3 } ], "public_range": {