From 62b425eca13fb03acb859104e02fa4b9dcbbd23f Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 11 Nov 2021 10:44:27 +0800 Subject: [PATCH] =?UTF-8?q?refactor(tenpayv3):=20=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E9=83=A8=E5=88=86=E5=86=85=E9=83=A8=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nverter.cs => TextualStringIListWithCommaConverter.cs} | 4 ++-- ...onverter.cs => TextualStringIListWithJsonConverter.cs} | 4 ++-- ...onverter.cs => TextualStringListWithCommaConverter.cs} | 2 +- ...Converter.cs => TextualStringListWithJsonConverter.cs} | 2 +- ...nverter.cs => TextualStringIListWithCommaConverter.cs} | 2 +- ...onverter.cs => TextualStringIListWithJsonConverter.cs} | 4 ++-- ...onverter.cs => TextualStringListWithCommaConverter.cs} | 4 ++-- ...Converter.cs => TextualStringListWithJsonConverter.cs} | 2 +- .../CreateEcommerceApplymentRequest.cs | 8 ++++---- 9 files changed, 16 insertions(+), 16 deletions(-) rename src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/{StringTypedStringIListConverter.cs => TextualStringIListWithCommaConverter.cs} (90%) rename src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/{JsonTypedStringIListConverter.cs => TextualStringIListWithJsonConverter.cs} (90%) rename src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/{StringTypedStringListConverter.cs => TextualStringListWithCommaConverter.cs} (93%) rename src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/{JsonTypedStringListConverter.cs => TextualStringListWithJsonConverter.cs} (93%) rename src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/{StringTypedStringListConverter.cs => TextualStringIListWithCommaConverter.cs} (92%) rename src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/{JsonTypedStringIListConverter.cs => TextualStringIListWithJsonConverter.cs} (87%) rename src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/{StringTypedStringIListConverter.cs => TextualStringListWithCommaConverter.cs} (87%) rename src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/{JsonTypedStringListConverter.cs => TextualStringListWithJsonConverter.cs} (92%) diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/StringTypedStringIListConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/TextualStringIListWithCommaConverter.cs similarity index 90% rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/StringTypedStringIListConverter.cs rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/TextualStringIListWithCommaConverter.cs index 760601f1..9a9701c7 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/StringTypedStringIListConverter.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/TextualStringIListWithCommaConverter.cs @@ -5,9 +5,9 @@ using Newtonsoft.Json.Converters; namespace Newtonsoft.Json.Converters { - internal class StringTypedStringIListConverter : JsonConverter?> + internal class TextualStringIListWithCommaConverter : JsonConverter?> { - private readonly JsonConverter?> _converter = new StringTypedStringListConverter(); + private readonly JsonConverter?> _converter = new TextualStringListWithCommaConverter(); public override bool CanRead { diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/JsonTypedStringIListConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/TextualStringIListWithJsonConverter.cs similarity index 90% rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/JsonTypedStringIListConverter.cs rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/TextualStringIListWithJsonConverter.cs index 86f78dc9..cb24b8b6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/JsonTypedStringIListConverter.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/TextualStringIListWithJsonConverter.cs @@ -5,9 +5,9 @@ using Newtonsoft.Json.Converters; namespace Newtonsoft.Json.Converters { - internal class JsonTypedStringIListConverter : JsonConverter?> + internal class TextualStringIListWithJsonConverter : JsonConverter?> { - private readonly JsonConverter?> _converter = new JsonTypedStringListConverter(); + private readonly JsonConverter?> _converter = new TextualStringListWithJsonConverter(); public override bool CanRead { diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/StringTypedStringListConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/TextualStringListWithCommaConverter.cs similarity index 93% rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/StringTypedStringListConverter.cs rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/TextualStringListWithCommaConverter.cs index dcc15735..fce14760 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/StringTypedStringListConverter.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/TextualStringListWithCommaConverter.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json.Converters; namespace Newtonsoft.Json.Converters { - internal class StringTypedStringListConverter : JsonConverter?> + internal class TextualStringListWithCommaConverter : JsonConverter?> { public override bool CanRead { diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/JsonTypedStringListConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/TextualStringListWithJsonConverter.cs similarity index 93% rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/JsonTypedStringListConverter.cs rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/TextualStringListWithJsonConverter.cs index 704cd313..d9e1116c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/JsonTypedStringListConverter.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/Newtonsoft.Json/List[string]/TextualStringListWithJsonConverter.cs @@ -5,7 +5,7 @@ using Newtonsoft.Json.Converters; namespace Newtonsoft.Json.Converters { - internal class JsonTypedStringListConverter : JsonConverter?> + internal class TextualStringListWithJsonConverter : JsonConverter?> { public override bool CanRead { diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/StringTypedStringListConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/TextualStringIListWithCommaConverter.cs similarity index 92% rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/StringTypedStringListConverter.cs rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/TextualStringIListWithCommaConverter.cs index ae3850c2..2e4307c1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/StringTypedStringListConverter.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/TextualStringIListWithCommaConverter.cs @@ -6,7 +6,7 @@ using System.Text.Json.Serialization; namespace System.Text.Json.Converters { - internal class StringTypedStringListConverter : JsonConverter?> + internal class TextualStringIListWithCommaConverter : JsonConverter?> { public override List? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/JsonTypedStringIListConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/TextualStringIListWithJsonConverter.cs similarity index 87% rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/JsonTypedStringIListConverter.cs rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/TextualStringIListWithJsonConverter.cs index 8e52725f..9c983ddb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/JsonTypedStringIListConverter.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/TextualStringIListWithJsonConverter.cs @@ -5,9 +5,9 @@ using System.Text.Json.Serialization; namespace System.Text.Json.Converters { - internal class JsonTypedStringIListConverter : JsonConverter?> + internal class TextualStringIListWithJsonConverter : JsonConverter?> { - private readonly JsonConverter?> _converter = new JsonTypedStringListConverter(); + private readonly JsonConverter?> _converter = new TextualStringListWithJsonConverter(); public override IList? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/StringTypedStringIListConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/TextualStringListWithCommaConverter.cs similarity index 87% rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/StringTypedStringIListConverter.cs rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/TextualStringListWithCommaConverter.cs index cedfa38d..367f0cac 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/StringTypedStringIListConverter.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/TextualStringListWithCommaConverter.cs @@ -5,9 +5,9 @@ using System.Text.Json.Serialization; namespace System.Text.Json.Converters { - internal class StringTypedStringIListConverter : JsonConverter?> + internal class TextualStringListWithCommaConverter : JsonConverter?> { - private readonly JsonConverter?> _converter = new StringTypedStringListConverter(); + private readonly JsonConverter?> _converter = new TextualStringIListWithCommaConverter(); public override IList? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/JsonTypedStringListConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/TextualStringListWithJsonConverter.cs similarity index 92% rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/JsonTypedStringListConverter.cs rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/TextualStringListWithJsonConverter.cs index 540afea1..f80931a9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/JsonTypedStringListConverter.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Converters/System.Text.Json/List[string]/TextualStringListWithJsonConverter.cs @@ -5,7 +5,7 @@ using System.Text.Json.Serialization; namespace System.Text.Json.Converters { - internal class JsonTypedStringListConverter : JsonConverter?> + internal class TextualStringListWithJsonConverter : JsonConverter?> { public override List? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/EcommerceApplyments/CreateEcommerceApplymentRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/EcommerceApplyments/CreateEcommerceApplymentRequest.cs index 226d0150..52a77e23 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/EcommerceApplyments/CreateEcommerceApplymentRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/EcommerceApplyments/CreateEcommerceApplymentRequest.cs @@ -357,18 +357,18 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// 获取或设置特殊资质图片媒体文件标识 ID 列表。 /// [Newtonsoft.Json.JsonProperty("qualifications")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.JsonTypedStringIListConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.TextualStringIListWithJsonConverter))] [System.Text.Json.Serialization.JsonPropertyName("qualifications")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.JsonTypedStringIListConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualStringIListWithJsonConverter))] public IList? QualificationPictureMediaIdList { get; set; } /// /// 获取或设置补充材料媒体文件标识 ID 列表。 /// [Newtonsoft.Json.JsonProperty("business_addition_pics")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.JsonTypedStringIListConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.TextualStringIListWithJsonConverter))] [System.Text.Json.Serialization.JsonPropertyName("business_addition_pics")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.JsonTypedStringIListConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualStringIListWithJsonConverter))] public IList? BusinessAdditionPictureMediaIdList { get; set; } ///