From c52973539c07687e0ed516342ff3e4f44576e0ba Mon Sep 17 00:00:00 2001
From: Fu Diwei <fudiwei@sina.com>
Date: Wed, 29 Mar 2023 20:01:51 +0800
Subject: [PATCH] style: clean code

---
 .../Events/MpReply/ImageMessageReply.cs          |  8 ++++----
 .../Events/MpReply/MusicMessageReply.cs          | 14 +++++++-------
 .../Events/MpReply/NewsMessageReply.cs           | 16 ++++++++--------
 .../Events/MpReply/TextMessageReply.cs           |  6 +++---
 .../MpReply/TransferCustomerServiceReply.cs      |  6 +++---
 .../Events/MpReply/VideoMessageReply.cs          | 12 ++++++------
 .../Events/MpReply/VoiceMessageReply.cs          |  8 ++++----
 .../SubscribeMessageChangeEvent.cs               |  4 ++--
 .../SubscribeMessagePopupEvent.cs                |  4 ++--
 .../SubscribeMessageSentEvent.cs                 |  4 ++--
 .../Events/WxaMiniShop/ComplaintCallbackEvent.cs |  2 +-
 .../PublisherStatAdposGeneralResponse.cs         |  4 ++--
 ...nionPromoterOrderSearchNormalOrderResponse.cs |  2 +-
 .../UnionShopOrderSearchNormalOrderResponse.cs   |  2 +-
 14 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/ImageMessageReply.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/ImageMessageReply.cs
index 9cebd49a..02c4d5c3 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/ImageMessageReply.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/ImageMessageReply.cs
@@ -1,4 +1,4 @@
-namespace SKIT.FlurlHttpClient.Wechat.Api.Events
+namespace SKIT.FlurlHttpClient.Wechat.Api.Events
 {
     /// <summary>
     /// <para>表示被动回复图片消息的数据。</para>
@@ -14,7 +14,7 @@
                 /// 获取或设置图片 MediaId。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("MediaId")]
-                public string MediaId { get; set; } = string.Empty;
+                public string MediaId { get; set; } = default!;
             }
         }
 
@@ -22,12 +22,12 @@
         /// 获取或设置图片信息。
         /// </summary>
         [System.Xml.Serialization.XmlElement("Image")]
-        public Types.Image Image { get; set; } = new Types.Image();
+        public Types.Image Image { get; set; } = default!;
 
         public ImageMessageReply()
         {
-            Event = null;
             MessageType = "image";
+            Event = null;
         }
     }
 }
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/MusicMessageReply.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/MusicMessageReply.cs
index 3d787af2..fe008327 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/MusicMessageReply.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/MusicMessageReply.cs
@@ -1,4 +1,4 @@
-namespace SKIT.FlurlHttpClient.Wechat.Api.Events
+namespace SKIT.FlurlHttpClient.Wechat.Api.Events
 {
     /// <summary>
     /// <para>表示被动回复音乐消息的数据。</para>
@@ -14,7 +14,7 @@
                 /// 获取或设置音乐链接。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("MusicUrl")]
-                public string MusicUrl { get; set; } = string.Empty;
+                public string MusicUrl { get; set; } = default!;
 
                 /// <summary>
                 /// 获取或设置高质量音乐链接。
@@ -26,19 +26,19 @@
                 /// 获取或设置音乐封面图片 MediaId。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("ThumbMediaId")]
-                public string ThumbMediaId { get; set; } = string.Empty;
+                public string ThumbMediaId { get; set; } = default!;
 
                 /// <summary>
                 /// 获取或设置音乐标题。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("Title")]
-                public string Title { get; set; } = string.Empty;
+                public string Title { get; set; } = default!;
 
                 /// <summary>
                 /// 获取或设置音乐描述。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("Description")]
-                public string Description { get; set; } = string.Empty;
+                public string Description { get; set; } = default!;
             }
         }
 
@@ -46,12 +46,12 @@
         /// 获取或设置音乐信息。
         /// </summary>
         [System.Xml.Serialization.XmlElement("Music")]
-        public Types.Music Music { get; set; } = new Types.Music();
+        public Types.Music Music { get; set; } = default!;
 
         public MusicMessageReply()
         {
-            Event = null;
             MessageType = "music";
+            Event = null;
         }
     }
 }
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/NewsMessageReply.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/NewsMessageReply.cs
index b4db0415..96a6ed14 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/NewsMessageReply.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/NewsMessageReply.cs
@@ -1,4 +1,4 @@
-namespace SKIT.FlurlHttpClient.Wechat.Api.Events
+namespace SKIT.FlurlHttpClient.Wechat.Api.Events
 {
     /// <summary>
     /// <para>表示被动回复图文消息的数据。</para>
@@ -14,25 +14,25 @@
                 /// 获取或设置图文链接。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("Url")]
-                public string Url { get; set; } = string.Empty;
+                public string Url { get; set; } = default!;
 
                 /// <summary>
                 /// 获取或设置图文封面图片链接。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("PicUrl")]
-                public string PictureUrl { get; set; } = string.Empty;
+                public string PictureUrl { get; set; } = default!;
 
                 /// <summary>
                 /// 获取或设置图文标题。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("Title")]
-                public string Title { get; set; } = string.Empty;
+                public string Title { get; set; } = default!;
 
                 /// <summary>
                 /// 获取或设置图文描述。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("Description")]
-                public string Description { get; set; } = string.Empty;
+                public string Description { get; set; } = default!;
             }
 
             public class ArticleList
@@ -41,7 +41,7 @@
                 /// 获取或设置图文列表。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("item", Type = typeof(ArticleItem))]
-                public ArticleItem[] Items { get; set; } = new ArticleItem[0];
+                public ArticleItem[] Items { get; set; } = default!;
             }
         }
 
@@ -55,12 +55,12 @@
         /// 获取或设置图文列表。
         /// </summary>
         [System.Xml.Serialization.XmlElement("Articles")]
-        public Types.ArticleList ArticleList { get; set; } = new Types.ArticleList();
+        public Types.ArticleList ArticleList { get; set; } = default!;
 
         public NewsMessageReply()
         {
-            Event = null;
             MessageType = "news";
+            Event = null;
         }
     }
 }
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/TextMessageReply.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/TextMessageReply.cs
index 3707ce7f..a323be66 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/TextMessageReply.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/TextMessageReply.cs
@@ -1,4 +1,4 @@
-namespace SKIT.FlurlHttpClient.Wechat.Api.Events
+namespace SKIT.FlurlHttpClient.Wechat.Api.Events
 {
     /// <summary>
     /// <para>表示被动回复文本消息的数据。</para>
@@ -10,12 +10,12 @@
         /// 获取或设置消息内容。
         /// </summary>
         [System.Xml.Serialization.XmlElement("Content")]
-        public string Content { get; set; } = string.Empty;
+        public string Content { get; set; } = default!;
 
         public TextMessageReply()
         {
-            Event = null;
             MessageType = "text";
+            Event = null;
         }
     }
 }
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/TransferCustomerServiceReply.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/TransferCustomerServiceReply.cs
index 1be16184..83bd406d 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/TransferCustomerServiceReply.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/TransferCustomerServiceReply.cs
@@ -1,4 +1,4 @@
-namespace SKIT.FlurlHttpClient.Wechat.Api.Events
+namespace SKIT.FlurlHttpClient.Wechat.Api.Events
 {
     /// <summary>
     /// <para>表示被动回复转发消息的数据。</para>
@@ -15,7 +15,7 @@
                 /// 获取或设置客服账号。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("KfAccount")]
-                public string KfAccount { get; set; } = string.Empty;
+                public string KfAccount { get; set; } = default!;
             }
         }
 
@@ -27,8 +27,8 @@
 
         public TransferCustomerServiceReply()
         {
-            Event = null;
             MessageType = "transfer_customer_service";
+            Event = null;
         }
     }
 }
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/VideoMessageReply.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/VideoMessageReply.cs
index 6d6883cc..61456f6e 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/VideoMessageReply.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/VideoMessageReply.cs
@@ -1,4 +1,4 @@
-namespace SKIT.FlurlHttpClient.Wechat.Api.Events
+namespace SKIT.FlurlHttpClient.Wechat.Api.Events
 {
     /// <summary>
     /// <para>表示被动回复视频消息的数据。</para>
@@ -14,19 +14,19 @@
                 /// 获取或设置视频 MediaId。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("MediaId")]
-                public string MediaId { get; set; } = string.Empty;
+                public string MediaId { get; set; } = default!;
 
                 /// <summary>
                 /// 获取或设置视频标题。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("Title")]
-                public string Title { get; set; } = string.Empty;
+                public string Title { get; set; } = default!;
 
                 /// <summary>
                 /// 获取或设置视频描述。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("Description")]
-                public string Description { get; set; } = string.Empty;
+                public string Description { get; set; } = default!;
             }
         }
 
@@ -34,12 +34,12 @@
         /// 获取或设置视频信息。
         /// </summary>
         [System.Xml.Serialization.XmlElement("Video")]
-        public Types.Video Video { get; set; } = new Types.Video();
+        public Types.Video Video { get; set; } = default!;
 
         public VideoMessageReply()
         {
-            Event = null;
             MessageType = "video";
+            Event = null;
         }
     }
 }
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/VoiceMessageReply.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/VoiceMessageReply.cs
index 393ed7ca..1665434d 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/VoiceMessageReply.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpReply/VoiceMessageReply.cs
@@ -1,4 +1,4 @@
-namespace SKIT.FlurlHttpClient.Wechat.Api.Events
+namespace SKIT.FlurlHttpClient.Wechat.Api.Events
 {
     /// <summary>
     /// <para>表示被动回复语音消息的数据。</para>
@@ -14,7 +14,7 @@
                 /// 获取或设置语音 MediaId。
                 /// </summary>
                 [System.Xml.Serialization.XmlElement("MediaId")]
-                public string MediaId { get; set; } = string.Empty;
+                public string MediaId { get; set; } = default!;
             }
         }
 
@@ -22,12 +22,12 @@
         /// 获取或设置语音信息。
         /// </summary>
         [System.Xml.Serialization.XmlElement("Voice")]
-        public Types.Voice Voice { get; set; } = new Types.Voice();
+        public Types.Voice Voice { get; set; } = default!;
 
         public VoiceMessageReply()
         {
-            Event = null;
             MessageType = "voice";
+            Event = null;
         }
     }
 }
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpSubscribeMessage/SubscribeMessageChangeEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpSubscribeMessage/SubscribeMessageChangeEvent.cs
index 03de8c5d..e7862d48 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpSubscribeMessage/SubscribeMessageChangeEvent.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpSubscribeMessage/SubscribeMessageChangeEvent.cs
@@ -1,4 +1,4 @@
-namespace SKIT.FlurlHttpClient.Wechat.Api.Events
+namespace SKIT.FlurlHttpClient.Wechat.Api.Events
 {
     /// <summary>
     /// <para>表示 EVENT.subscribe_msg_change_event 事件的数据。</para>
@@ -54,7 +54,7 @@
 
         /// <summary>
         /// 获取或设置用户管理订阅通知数据列表。
-        /// <para>等效于 <see cref="EventData.List"/> </para>
+        /// <para>等效于 <see cref="Types.EventData.EventList"/> </para>
         /// </summary>
         [Newtonsoft.Json.JsonProperty("List")]
         [System.Text.Json.Serialization.JsonPropertyName("List")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpSubscribeMessage/SubscribeMessagePopupEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpSubscribeMessage/SubscribeMessagePopupEvent.cs
index b8a66a4c..7198776d 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpSubscribeMessage/SubscribeMessagePopupEvent.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpSubscribeMessage/SubscribeMessagePopupEvent.cs
@@ -1,4 +1,4 @@
-namespace SKIT.FlurlHttpClient.Wechat.Api.Events
+namespace SKIT.FlurlHttpClient.Wechat.Api.Events
 {
     /// <summary>
     /// <para>表示 EVENT.subscribe_msg_popup_event 事件的数据。</para>
@@ -62,7 +62,7 @@
 
         /// <summary>
         /// 获取或设置用户订阅通知弹窗数据列表。
-        /// <para>等效于 <see cref="EventData.List"/> </para>
+        /// <para>等效于 <see cref="Types.EventData.EventList"/> </para>
         /// </summary>
         [Newtonsoft.Json.JsonProperty("List")]
         [System.Text.Json.Serialization.JsonPropertyName("List")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpSubscribeMessage/SubscribeMessageSentEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpSubscribeMessage/SubscribeMessageSentEvent.cs
index 05945bb9..1090d317 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpSubscribeMessage/SubscribeMessageSentEvent.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/MpSubscribeMessage/SubscribeMessageSentEvent.cs
@@ -1,4 +1,4 @@
-namespace SKIT.FlurlHttpClient.Wechat.Api.Events
+namespace SKIT.FlurlHttpClient.Wechat.Api.Events
 {
     /// <summary>
     /// <para>表示 EVENT.subscribe_msg_sent_event 事件的数据。</para>
@@ -70,7 +70,7 @@
 
         /// <summary>
         /// 获取或设置发送订阅通知数据列表。
-        /// <para>等效于 <see cref="EventData.List"/> </para>
+        /// <para>等效于 <see cref="Types.EventData.EventList"/> </para>
         /// </summary>
         [Newtonsoft.Json.JsonProperty("List")]
         [System.Text.Json.Serialization.JsonPropertyName("List")]
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/WxaMiniShop/ComplaintCallbackEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/WxaMiniShop/ComplaintCallbackEvent.cs
index 1517e5f2..3122396a 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Events/WxaMiniShop/ComplaintCallbackEvent.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Events/WxaMiniShop/ComplaintCallbackEvent.cs
@@ -37,7 +37,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Events
                         [Newtonsoft.Json.JsonProperty("media_id_list")]
                         [System.Text.Json.Serialization.JsonPropertyName("media_id_list")]
                         [System.Xml.Serialization.XmlElement("media_id_list", Type = typeof(string), IsNullable = true)]
-                        public string[] MediaIdListString { get; set; }
+                        public string[]? MediaIdListString { get; set; }
                     }
                 }
 
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/PublisherStat/PublisherStatAdposGeneralResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/PublisherStat/PublisherStatAdposGeneralResponse.cs
index 4a6acd3f..39343235 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/PublisherStat/PublisherStatAdposGeneralResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/PublisherStat/PublisherStatAdposGeneralResponse.cs
@@ -1,4 +1,4 @@
-namespace SKIT.FlurlHttpClient.Wechat.Api.Models
+namespace SKIT.FlurlHttpClient.Wechat.Api.Models
 {
     /// <summary>
     /// <para>表示 [GET] /publisher/stat?action=publisher_adpos_general 接口的响应。</para>
@@ -60,7 +60,7 @@
                 /// </summary>
                 [Newtonsoft.Json.JsonProperty("ecpm")]
                 [System.Text.Json.Serialization.JsonPropertyName("ecpm")]
-                public double eCPM { get; set; }
+                public double ECPM { get; set; }
             }
 
             public class Data : Summary
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/UnionPromoter/Order/UnionPromoterOrderSearchNormalOrderResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/UnionPromoter/Order/UnionPromoterOrderSearchNormalOrderResponse.cs
index ac69307f..0ca35a66 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/UnionPromoter/Order/UnionPromoterOrderSearchNormalOrderResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/UnionPromoter/Order/UnionPromoterOrderSearchNormalOrderResponse.cs
@@ -109,7 +109,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
                         /// </summary>
                         [Newtonsoft.Json.JsonProperty("additionalRemarks")]
                         [System.Text.Json.Serialization.JsonPropertyName("additionalRemarks")]
-                        public string? additionalRemarks { get; set; }
+                        public string? AdditionalRemarks { get; set; }
 
                         /// <summary>
                         /// 获取或设置订单状态。
diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/UnionShop/Order/UnionShopOrderSearchNormalOrderResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/UnionShop/Order/UnionShopOrderSearchNormalOrderResponse.cs
index 8d0314eb..50a2100e 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/UnionShop/Order/UnionShopOrderSearchNormalOrderResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/UnionShop/Order/UnionShopOrderSearchNormalOrderResponse.cs
@@ -82,7 +82,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models
                         /// </summary>
                         [Newtonsoft.Json.JsonProperty("additionalRemarks")]
                         [System.Text.Json.Serialization.JsonPropertyName("additionalRemarks")]
-                        public string? additionalRemarks { get; set; }
+                        public string? AdditionalRemarks { get; set; }
 
                         /// <summary>
                         /// 获取或设置订单状态。