lsm/DotNetCore.SKIT.FlurlHttpClient.Wechat
1
0
Fork 0
mirror of https://gitee.com/fudiwei/DotNetCore.SKIT.FlurlHttpClient.Wechat.git synced 2025-09-18 09:44:43 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(work): 修复部分场景下无法反序列化空字符串字段为数值类型的问题

Browse Source
This commit is contained in:
Fu Diwei
2022-03-10 13:33:45 +08:00
parent 07e98d57e3
commit da4c1f15d7
3 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/Long/TextualNullableLongConverter.cs Normal file
View File

@@ -0,0 +1,38 @@
using System.Text.Json.Serialization;
namespace System.Text.Json.Converters
{
internal class TextualNullableLongConverter : JsonConverter<long?>
{
public override long? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
if (reader.TokenType == JsonTokenType.Null)
{
return null;
}
else if (reader.TokenType == JsonTokenType.Number)
{
return reader.GetInt64();
}
else if (reader.TokenType == JsonTokenType.String)
{
string? value = reader.GetString();
if (string.IsNullOrEmpty(value))
return null;
if (long.TryParse(value, out long l))
return l;
}
throw new JsonException();
}
public override void Write(Utf8JsonWriter writer, long? value, JsonSerializerOptions options)
{
if (value.HasValue)
writer.WriteNumberValue(value.Value);
else
writer.WriteNullValue();
}
}
}

11
src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/CgibinOAGetApprovalDetailResponse.cs
View File

@@ -77,6 +77,7 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("sptime")]
[System.Text.Json.Serialization.JsonPropertyName("sptime")]
[System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualNullableLongConverter))]
public long? ApproveTimestamp { get; set; }
/// <summary>
@@ -258,8 +259,8 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("s_timestamp")]
[System.Text.Json.Serialization.JsonPropertyName("s_timestamp")]
[System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)]
public long Timestamp { get; set; }
[System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualNullableLongConverter))]
public long? Timestamp { get; set; }
}
public class SelectorControlValue
@@ -498,7 +499,8 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("time")]
[System.Text.Json.Serialization.JsonPropertyName("time")]
public long Timestamp { get; set; }
[System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualNullableLongConverter))]
public long? Timestamp { get; set; }
}
public class RelatedApprovalControlValue
@@ -594,7 +596,8 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("time")]
[System.Text.Json.Serialization.JsonPropertyName("time")]
public long Timestamp { get; set; }
[System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualNullableLongConverter))]
public long? Timestamp { get; set; }
}
}

4
test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Approval/CgibinOAGetApprovalDetailResponse.json
View File

@@ -22,7 +22,7 @@
},
"speech": "",
"sp_status": 1,
"sptime": 0,
"sptime": 1234567890,
"media_id": []
},
{
@@ -31,7 +31,7 @@
},
"speech": "",
"sp_status": 1,
"sptime": 0,
"sptime": "",
"media_id": []
}
]