From 04f67c1c8a2a13addfaf3099dc899340dfe1bfb7 Mon Sep 17 00:00:00 2001
From: Fu Diwei <fudiwei@sina.com>
Date: Mon, 14 Mar 2022 14:29:41 +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=E5=8F=91=E9=80=81=E5=AE=A2=E6=9C=8D=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CgibinKf/CgibinKfSendMessageRequest.cs    | 17 +++++++++++
 .../CgibinKf/CgibinKfSyncMessageResponse.cs   | 28 ++++++++-----------
 .../CgibinKf/CgibinKfSendMessageRequest.json  |  5 +++-
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSendMessageRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSendMessageRequest.cs
index 5f9dafaf..76e71bfc 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSendMessageRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSendMessageRequest.cs
@@ -240,6 +240,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models
                 [System.Text.Json.Serialization.JsonPropertyName("address")]
                 public string? Address { get; set; }
             }
+
+            public class BusinessCardMessage
+            {
+                /// <summary>
+                /// 获取或设置成员账号。
+                /// </summary>
+                [Newtonsoft.Json.JsonProperty("userid")]
+                [System.Text.Json.Serialization.JsonPropertyName("userid")]
+                public string UserId { get; set; } = string.Empty;
+            }
         }
 
         /// <summary>
@@ -332,5 +342,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models
         [Newtonsoft.Json.JsonProperty("location")]
         [System.Text.Json.Serialization.JsonPropertyName("location")]
         public Types.LocationMessage? MessageContentForLocation { get; set; }
+
+        /// <summary>
+        /// 获取或设置名片消息。
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty("business_card")]
+        [System.Text.Json.Serialization.JsonPropertyName("business_card")]
+        public Types.BusinessCardMessage? MessageContentForBusinessCard { get; set; }
     }
 }
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSyncMessageResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSyncMessageResponse.cs
index 0dff199f..7b6c60c1 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSyncMessageResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSyncMessageResponse.cs
@@ -37,16 +37,6 @@
                     {
                     }
 
-                    public class BusinessCardMessage
-                    {
-                        /// <summary>
-                        /// 获取或设置名片的 UserId。
-                        /// </summary>
-                        [Newtonsoft.Json.JsonProperty("userid")]
-                        [System.Text.Json.Serialization.JsonPropertyName("userid")]
-                        public string UserId { get; set; } = default!;
-                    }
-
                     public class LinkMessage : CgibinKfSendMessageRequest.Types.LinkMessage
                     {
                         /// <summary>
@@ -69,6 +59,10 @@
                     {
                     }
 
+                    public class BusinessCardMessage : CgibinKfSendMessageRequest.Types.BusinessCardMessage
+                    {
+                    }
+
                     public class EventMessage
                     {
                         public static class Types
@@ -268,13 +262,6 @@
                 [System.Text.Json.Serialization.JsonPropertyName("file")]
                 public Types.FileMessage? MessageContentForFile { get; set; }
 
-                /// <summary>
-                /// 获取或设置名片消息信息。
-                /// </summary>
-                [Newtonsoft.Json.JsonProperty("business_card")]
-                [System.Text.Json.Serialization.JsonPropertyName("business_card")]
-                public Types.BusinessCardMessage? MessageContentForBusinessCard { get; set; }
-
                 /// <summary>
                 /// 获取或设置图文消息信息。
                 /// </summary>
@@ -303,6 +290,13 @@
                 [System.Text.Json.Serialization.JsonPropertyName("location")]
                 public Types.LocationMessage? MessageContentForLocation { get; set; }
 
+                /// <summary>
+                /// 获取或设置名片消息信息。
+                /// </summary>
+                [Newtonsoft.Json.JsonProperty("business_card")]
+                [System.Text.Json.Serialization.JsonPropertyName("business_card")]
+                public Types.BusinessCardMessage? MessageContentForBusinessCard { get; set; }
+
                 /// <summary>
                 /// 获取或设置事件消息信息。
                 /// </summary>
diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinKf/CgibinKfSendMessageRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinKf/CgibinKfSendMessageRequest.json
index 9691bd9a..f2962b76 100644
--- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinKf/CgibinKfSendMessageRequest.json
+++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinKf/CgibinKfSendMessageRequest.json
@@ -70,5 +70,8 @@
         "address": "实例小区，不真实存在，经纬度无意义",
         "latitude": 0,
         "longitude": 0
+    },
+    "business_card": {
+        "userid": "USERID"
     }
-}
\ No newline at end of file
+}