From fcd9609bd06c85b5ffc6115c0cadd81020b34f12 Mon Sep 17 00:00:00 2001
From: Fu Diwei <fudiwei@sina.com>
Date: Sun, 30 May 2021 23:11:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(wxapi):=20=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3=E6=A8=A1=E5=9E=8B=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/Card/Code/CardCodeDecryptResponse.cs             | 2 +-
 .../Models/Card/GiftCard/CardGiftCardPageGetRequest.cs      | 2 +-
 .../Reimburse/CardInvoiceReimburseGetInvoiceInfoResponse.cs | 2 +-
 .../Business/CgibinExpressBusinessTestUpdateOrderRequest.cs | 2 +-
 .../Delivery/CgibinExpressDeliveryPathUpdateRequest.cs      | 2 +-
 .../Delivery/CgibinExpressDeliveryTemplatePreviewRequest.cs | 6 +++---
 .../Config/CgibinGuideGetGuideAccountConfigResponse.cs      | 4 ++--
 .../Models/CgibinMenu/CgibinMenuGetResponse.cs              | 2 +-
 .../CgibinWxaapp/CgibinWxaappCreateWxaQrcodeRequest.cs      | 2 +-
 .../GameAnalysis/DataCubeGetGameAnalysisDataRequest.cs      | 6 +++---
 .../Models/Nontax/NontaxMockNotificationRequest.cs          | 2 +-
 .../Nontax/Vehicle/NontaxVehicleEntranceNotifyRequest.cs    | 2 +-
 .../WxaApiBroadcastRoomModifyAssistantRequest.cs            | 4 ++--
 .../WxaApiBroadcastRoomRemoveAssistantRequest.cs            | 2 +-
 .../WxaApi/Operation/WxaApiLogGetPerformanceResponse.cs     | 2 +-
 .../LiveBroadcast/WxaBusinessGetLiveInfoResponse.cs         | 2 +-
 16 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/Code/CardCodeDecryptResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/Code/CardCodeDecryptResponse.cs
index 48dbcad5..891aae5a 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/Code/CardCodeDecryptResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/Code/CardCodeDecryptResponse.cs
@@ -13,6 +13,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
         /// </summary>
         [Newtonsoft.Json.JsonProperty("code")]
         [System.Text.Json.Serialization.JsonPropertyName("code")]
-        public string CardCode { get; set; } = string.Empty;
+        public string CardCode { get; set; } = default!;
     }
 }
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/GiftCard/CardGiftCardPageGetRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/GiftCard/CardGiftCardPageGetRequest.cs
index 991243dd..1cfd261d 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/GiftCard/CardGiftCardPageGetRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Card/GiftCard/CardGiftCardPageGetRequest.cs
@@ -13,6 +13,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
         /// </summary>
         [Newtonsoft.Json.JsonProperty("page_id")]
         [System.Text.Json.Serialization.JsonPropertyName("page_id")]
-        public string PageId { get; set; } = default!;
+        public string PageId { get; set; } = string.Empty;
     }
 }
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CardInvoice/Reimburse/CardInvoiceReimburseGetInvoiceInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CardInvoice/Reimburse/CardInvoiceReimburseGetInvoiceInfoResponse.cs
index 709161c7..b8e2f9a6 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CardInvoice/Reimburse/CardInvoiceReimburseGetInvoiceInfoResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CardInvoice/Reimburse/CardInvoiceReimburseGetInvoiceInfoResponse.cs
@@ -24,7 +24,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
                 /// </summary>
                 [Newtonsoft.Json.JsonProperty("title")]
                 [System.Text.Json.Serialization.JsonPropertyName("title")]
-                public string Title { get; set; } = string.Empty;
+                public string Title { get; set; } = default!;
 
                 /// <summary>
                 /// 获取或设置不含税金额（单位：分）。
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Business/CgibinExpressBusinessTestUpdateOrderRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Business/CgibinExpressBusinessTestUpdateOrderRequest.cs
index 5654f078..d2592736 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Business/CgibinExpressBusinessTestUpdateOrderRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Business/CgibinExpressBusinessTestUpdateOrderRequest.cs
@@ -55,6 +55,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
         /// </summary>
         [Newtonsoft.Json.JsonProperty("action_msg")]
         [System.Text.Json.Serialization.JsonPropertyName("action_msg")]
-        public string ActionMessage { get; set; } = default!;
+        public string ActionMessage { get; set; } = string.Empty;
     }
 }
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Delivery/CgibinExpressDeliveryPathUpdateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Delivery/CgibinExpressDeliveryPathUpdateRequest.cs
index 47f9a761..fa77be57 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Delivery/CgibinExpressDeliveryPathUpdateRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Delivery/CgibinExpressDeliveryPathUpdateRequest.cs
@@ -41,6 +41,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
         /// </summary>
         [Newtonsoft.Json.JsonProperty("action_msg")]
         [System.Text.Json.Serialization.JsonPropertyName("action_msg")]
-        public string ActionMessage { get; set; } = default!;
+        public string ActionMessage { get; set; } = string.Empty;
     }
 }
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Delivery/CgibinExpressDeliveryTemplatePreviewRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Delivery/CgibinExpressDeliveryTemplatePreviewRequest.cs
index b949132c..9eb9f81c 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Delivery/CgibinExpressDeliveryTemplatePreviewRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Delivery/CgibinExpressDeliveryTemplatePreviewRequest.cs
@@ -18,14 +18,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
                 /// </summary>
                 [Newtonsoft.Json.JsonProperty("key")]
                 [System.Text.Json.Serialization.JsonPropertyName("key")]
-                public string Key { get; set; } = default!;
+                public string Key { get; set; } = string.Empty;
 
                 /// <summary>
                 /// 获取或设置运单信息 Value。
                 /// </summary>
                 [Newtonsoft.Json.JsonProperty("value")]
                 [System.Text.Json.Serialization.JsonPropertyName("value")]
-                public string Value { get; set; } = default!;
+                public string Value { get; set; } = string.Empty;
             }
 
             public class CustomData
@@ -143,7 +143,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
             }
         }
 
-        public static class Converters
+        internal static class Converters
         {
             internal class NewtonsoftJsonWaybillDataListConverter : Newtonsoft.Json.JsonConverter<IList<Types.WaybillData>?>
             {
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinGuide/Config/CgibinGuideGetGuideAccountConfigResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinGuide/Config/CgibinGuideGetGuideAccountConfigResponse.cs
index 96cceb05..d8116966 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinGuide/Config/CgibinGuideGetGuideAccountConfigResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinGuide/Config/CgibinGuideGetGuideAccountConfigResponse.cs
@@ -17,7 +17,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
                 /// </summary>
                 [Newtonsoft.Json.JsonProperty("values")]
                 [System.Text.Json.Serialization.JsonPropertyName("values")]
-                public IList<string> Values { get; set; } = new List<string>();
+                public string[] Values { get; set; } = default!;
 
                 /// <summary>
                 /// 获取或设置更新时间戳。
@@ -34,7 +34,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
                 /// </summary>
                 [Newtonsoft.Json.JsonProperty("content")]
                 [System.Text.Json.Serialization.JsonPropertyName("content")]
-                public string Content { get; set; } = string.Empty;
+                public string Content { get; set; } = default!;
 
                 /// <summary>
                 /// 获取或设置更新时间戳。
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMenu/CgibinMenuGetResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMenu/CgibinMenuGetResponse.cs
index 85386ed8..850f60bc 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMenu/CgibinMenuGetResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinMenu/CgibinMenuGetResponse.cs
@@ -70,7 +70,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
                         /// </summary>
                         [Newtonsoft.Json.JsonProperty("sub_button")]
                         [System.Text.Json.Serialization.JsonPropertyName("sub_button")]
-                        public IList<Button>? SubButtonList { get; set; }
+                        public Button[]? SubButtonList { get; set; }
                     }
                 }
 
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinWxaapp/CgibinWxaappCreateWxaQrcodeRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinWxaapp/CgibinWxaappCreateWxaQrcodeRequest.cs
index ce3a73d9..ecd4c937 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinWxaapp/CgibinWxaappCreateWxaQrcodeRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinWxaapp/CgibinWxaappCreateWxaQrcodeRequest.cs
@@ -13,7 +13,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
         /// </summary>
         [Newtonsoft.Json.JsonProperty("path")]
         [System.Text.Json.Serialization.JsonPropertyName("path")]
-        public string Path { get; set; } = default!;
+        public string Path { get; set; } = string.Empty;
 
         /// <summary>
         /// 获取或设置二维码的宽度（单位：像素）。
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/DataCube/GameAnalysis/DataCubeGetGameAnalysisDataRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/DataCube/GameAnalysis/DataCubeGetGameAnalysisDataRequest.cs
index 9a52afe1..cf366818 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/DataCube/GameAnalysis/DataCubeGetGameAnalysisDataRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/DataCube/GameAnalysis/DataCubeGetGameAnalysisDataRequest.cs
@@ -17,14 +17,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
                 /// </summary>
                 [Newtonsoft.Json.JsonProperty("dimension")]
                 [System.Text.Json.Serialization.JsonPropertyName("dimension")]
-                public string Dimension { get; set; } = default!;
+                public string Dimension { get; set; } = string.Empty;
 
                 /// <summary>
                 /// 获取或设置维度的取值。
                 /// </summary>
                 [Newtonsoft.Json.JsonProperty("value")]
                 [System.Text.Json.Serialization.JsonPropertyName("value")]
-                public string Value { get; set; } = default!;
+                public string Value { get; set; } = string.Empty;
             }
         }
 
@@ -33,7 +33,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
         /// </summary>
         [Newtonsoft.Json.JsonProperty("metric")]
         [System.Text.Json.Serialization.JsonPropertyName("metric")]
-        public string Metric { get; set; } = default!;
+        public string Metric { get; set; } = string.Empty;
 
         /// <summary>
         /// 获取或设置时间粒度。
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Nontax/NontaxMockNotificationRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Nontax/NontaxMockNotificationRequest.cs
index 424b6c66..8660dc72 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Nontax/NontaxMockNotificationRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Nontax/NontaxMockNotificationRequest.cs
@@ -16,7 +16,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
         public string? AppId { get; set; }
 
         /// <summary>
-        /// 获取或设置回调通知 URL。
+        /// 获取或设置回调通知地址。
         /// </summary>
         [Newtonsoft.Json.JsonProperty("url")]
         [System.Text.Json.Serialization.JsonPropertyName("url")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Nontax/Vehicle/NontaxVehicleEntranceNotifyRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Nontax/Vehicle/NontaxVehicleEntranceNotifyRequest.cs
index 085eeccd..462f4407 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Nontax/Vehicle/NontaxVehicleEntranceNotifyRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Nontax/Vehicle/NontaxVehicleEntranceNotifyRequest.cs
@@ -34,7 +34,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
                 public string? CarType { get; set; }
 
                 /// <summary>
-                /// 获取或设置回调通知 URL。
+                /// 获取或设置回调通知地址。
                 /// </summary>
                 [Newtonsoft.Json.JsonProperty("notify_url")]
                 [System.Text.Json.Serialization.JsonPropertyName("notify_url")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaApi/LiveBroadcast/RoomAssistant/WxaApiBroadcastRoomModifyAssistantRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaApi/LiveBroadcast/RoomAssistant/WxaApiBroadcastRoomModifyAssistantRequest.cs
index ec142eac..90c97322 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaApi/LiveBroadcast/RoomAssistant/WxaApiBroadcastRoomModifyAssistantRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaApi/LiveBroadcast/RoomAssistant/WxaApiBroadcastRoomModifyAssistantRequest.cs
@@ -20,13 +20,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
         /// </summary>
         [Newtonsoft.Json.JsonProperty("username")]
         [System.Text.Json.Serialization.JsonPropertyName("username")]
-        public string Username { get; set; } = default!;
+        public string Username { get; set; } = string.Empty;
 
         /// <summary>
         /// 获取或设置用户昵称。
         /// </summary>
         [Newtonsoft.Json.JsonProperty("nickname")]
         [System.Text.Json.Serialization.JsonPropertyName("nickname")]
-        public string Nickname { get; set; } = default!;
+        public string Nickname { get; set; } = string.Empty;
     }
 }
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaApi/LiveBroadcast/RoomAssistant/WxaApiBroadcastRoomRemoveAssistantRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaApi/LiveBroadcast/RoomAssistant/WxaApiBroadcastRoomRemoveAssistantRequest.cs
index d440f62e..9fbfbb1c 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaApi/LiveBroadcast/RoomAssistant/WxaApiBroadcastRoomRemoveAssistantRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaApi/LiveBroadcast/RoomAssistant/WxaApiBroadcastRoomRemoveAssistantRequest.cs
@@ -20,6 +20,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
         /// </summary>
         [Newtonsoft.Json.JsonProperty("username")]
         [System.Text.Json.Serialization.JsonPropertyName("username")]
-        public string Username { get; set; } = default!;
+        public string Username { get; set; } = string.Empty;
     }
 }
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaApi/Operation/WxaApiLogGetPerformanceResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaApi/Operation/WxaApiLogGetPerformanceResponse.cs
index ce8bd69c..99dd272f 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaApi/Operation/WxaApiLogGetPerformanceResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaApi/Operation/WxaApiLogGetPerformanceResponse.cs
@@ -48,7 +48,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
             }
         }
 
-        public static class Converters
+        internal static class Converters
         {
             internal class NewtonsoftJsonDefaultTimeDataConverter : Newtonsoft.Json.JsonConverter<Types.DefaultTimeData?>
             {
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaBusiness/LiveBroadcast/WxaBusinessGetLiveInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaBusiness/LiveBroadcast/WxaBusinessGetLiveInfoResponse.cs
index e7fc47d1..fc99cbbd 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaBusiness/LiveBroadcast/WxaBusinessGetLiveInfoResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/WxaBusiness/LiveBroadcast/WxaBusinessGetLiveInfoResponse.cs
@@ -149,7 +149,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
                 /// </summary>
                 [Newtonsoft.Json.JsonProperty("feeds_img")]
                 [System.Text.Json.Serialization.JsonPropertyName("feeds_img")]
-                public string FeedsImageUrl { get; set; } = string.Empty;
+                public string FeedsImageUrl { get; set; } = default!;
 
                 /// <summary>
                 /// 获取或设置是否开启官方收录。