fix(work): 修复企业会话存档相关接口模型中 ID 数值溢出的问题

fudiwei · Apr 10, 2024 · 4a689c4 · 4a689c4
1 parent b82a86a
commit 4a689c4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/...lurlHttpClient.Wechat.Work/ExtendedSDK/Finance/InteropServices/FinanceDllLinuxPInvoker.cs b/...lurlHttpClient.Wechat.Work/ExtendedSDK/Finance/InteropServices/FinanceDllLinuxPInvoker.cs
@@ -14,7 +14,7 @@ internal static partial class FinanceDllLinuxPInvoker
         public static extern int Init([In] IntPtr sdk, [In] string corpId, [In] string secret);
 
         [DllImport(DLL_NAME, SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int GetChatData([In] IntPtr sdk, [In] long seq, [In] long limit, [In] string proxy, [In] string passwd, [In] long timeout, [Out] IntPtr chatData);
+        public static extern int GetChatData([In] IntPtr sdk, [In] ulong seq, [In] long limit, [In] string proxy, [In] string passwd, [In] long timeout, [Out] IntPtr chatData);
 
         [DllImport(DLL_NAME, SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern int GetMediaData([In] IntPtr sdk, [In] string indexBuf, [In] string fileId, [In] string proxy, [In] string passwd, [In] long timeout, [Out] IntPtr mediaData);

diff --git a/...rlHttpClient.Wechat.Work/ExtendedSDK/Finance/InteropServices/FinanceDllWindowsPInvoker.cs b/...rlHttpClient.Wechat.Work/ExtendedSDK/Finance/InteropServices/FinanceDllWindowsPInvoker.cs
@@ -18,7 +18,7 @@ internal static partial class FinanceDllWindowsPInvoker
 
         [DllImport(DLL_NAME, SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
         [SuppressUnmanagedCodeSecurity]
-        public static extern int GetChatData([In] IntPtr sdk, [In] long seq, [In] long limit, [In] string proxy, [In] string passwd, [In] long timeout, [Out] IntPtr chatData);
+        public static extern int GetChatData([In] IntPtr sdk, [In] ulong seq, [In] long limit, [In] string proxy, [In] string passwd, [In] long timeout, [Out] IntPtr chatData);
 
         [DllImport(DLL_NAME, SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
         [SuppressUnmanagedCodeSecurity]

diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/ExtendedSDK/Finance/Models/Abstractions/ChatMessage.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/ExtendedSDK/Finance/Models/Abstractions/ChatMessage.cs
@@ -444,8 +444,10 @@ public class Detail
                 /// 获取或设置表项 ID。
                 /// </summary>
                 [Newtonsoft.Json.JsonProperty("id")]
+                [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalStringReadOnlyConverter))]
                 [System.Text.Json.Serialization.JsonPropertyName("id")]
-                public long ID { get; set; }
+                [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringReadOnlyConverter))]
+                public string ID { get; set; } = default!;
 
                 /// <summary>
                 /// 获取或设置表项类型。
@@ -543,9 +545,10 @@ public class MeetingMessage : ChatMessageBase
         /// 获取或设置会议 ID。
         /// </summary>
         [Newtonsoft.Json.JsonProperty("meetingid")]
+        [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalStringReadOnlyConverter))]
         [System.Text.Json.Serialization.JsonPropertyName("meetingid")]
-        [System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)]
-        public long MeetingId { get; set; }
+        [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringReadOnlyConverter))]
+        public string? MeetingId { get; set; }
 
         /// <summary>
         /// 获取或设置会议主题。
@@ -666,12 +669,13 @@ public class InfoMessage : ChatMessageBase
         public string? WedriveFileName { get; set; }
 
         /// <summary>
-        /// 获取或设置会议类型。
+        /// 获取或设置会议 ID。
         /// </summary>
         [Newtonsoft.Json.JsonProperty("meeting_id")]
+        [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalStringReadOnlyConverter))]
         [System.Text.Json.Serialization.JsonPropertyName("meeting_id")]
-        [System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)]
-        public long? MeetingId { get; set; }
+        [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringReadOnlyConverter))]
+        public string? MeetingId { get; set; }
 
         /// <summary>
         /// 获取或设置通知类型。

diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/ExtendedSDK/Finance/Models/GetChatRecordsRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/ExtendedSDK/Finance/Models/GetChatRecordsRequest.cs
@@ -10,7 +10,7 @@ public class GetChatRecordsRequest : WechatWorkFinanceRequest
         /// </summary>
         [Newtonsoft.Json.JsonIgnore]
         [System.Text.Json.Serialization.JsonIgnore]
-        public long LastSequence { get; set; }
+        public ulong LastSequence { get; set; }
 
         /// <summary>
         /// 获取或设置分页每页数量。

diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/ExtendedSDK/Finance/Models/GetChatRecordsResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/ExtendedSDK/Finance/Models/GetChatRecordsResponse.cs
@@ -14,7 +14,7 @@ public class Record
                 /// </summary>
                 [Newtonsoft.Json.JsonProperty("seq")]
                 [System.Text.Json.Serialization.JsonPropertyName("seq")]
-                public long Sequence { get; set; }
+                public ulong Sequence { get; set; }
 
                 /// <summary>
                 /// 获取或设置消息 ID。