From 6bf33de791d718ef5eded4e783ace3db982fdef2 Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 16 Sep 2021 16:53:19 +0800 Subject: [PATCH] JSON Numbers can be read from string. --- .../Volo/Abp/AspNetCore/Mvc/Json/AbpJsonOptionsSetup.cs | 2 +- .../ValueConverters/ExtraPropertiesValueConverter.cs | 2 +- .../SystemTextJson/AbpSystemTextJsonSerializerOptionsSetup.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/AbpJsonOptionsSetup.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/AbpJsonOptionsSetup.cs index 3c09cbfd1e..101b369a36 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/AbpJsonOptionsSetup.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/AbpJsonOptionsSetup.cs @@ -33,7 +33,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Json // Remove after this PR. // https://github.com/dotnet/runtime/pull/57525 - options.JsonSerializerOptions.NumberHandling = JsonNumberHandling.Strict; + options.JsonSerializerOptions.NumberHandling = JsonNumberHandling.AllowReadingFromString; } } } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/ExtraPropertiesValueConverter.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/ExtraPropertiesValueConverter.cs index 85af6add3d..f9e70848c8 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/ExtraPropertiesValueConverter.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/ExtraPropertiesValueConverter.cs @@ -53,7 +53,7 @@ namespace Volo.Abp.EntityFrameworkCore.ValueConverters // Remove after this PR. // https://github.com/dotnet/runtime/pull/57525 - deserializeOptions.NumberHandling = JsonNumberHandling.Strict; + deserializeOptions.NumberHandling = JsonNumberHandling.AllowReadingFromString; var dictionary = JsonSerializer.Deserialize(extraPropertiesAsJson, deserializeOptions) ?? new ExtraPropertyDictionary(); diff --git a/framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/AbpSystemTextJsonSerializerOptionsSetup.cs b/framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/AbpSystemTextJsonSerializerOptionsSetup.cs index 61586823cb..8f28f20cc4 100644 --- a/framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/AbpSystemTextJsonSerializerOptionsSetup.cs +++ b/framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/AbpSystemTextJsonSerializerOptionsSetup.cs @@ -32,7 +32,7 @@ namespace Volo.Abp.Json.SystemTextJson // Remove after this PR. // https://github.com/dotnet/runtime/pull/57525 - options.JsonSerializerOptions.NumberHandling = JsonNumberHandling.Strict; + options.JsonSerializerOptions.NumberHandling = JsonNumberHandling.AllowReadingFromString; } } }