From a8a97749324bfed3593a55626b469b866c94ff88 Mon Sep 17 00:00:00 2001 From: "2248356998 qq.com" <2248356998@qq.com> Date: Fri, 10 Oct 2025 12:26:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20orm=20=E5=BA=8F=E5=88=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sugar/IntegrationServices/SerializeService.cs | 9 +++++++++ src/Directory.Build.props | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Admin/ThingsGateway.SqlSugar/Sugar/IntegrationServices/SerializeService.cs b/src/Admin/ThingsGateway.SqlSugar/Sugar/IntegrationServices/SerializeService.cs index 0599bdfc0..aefe76dae 100644 --- a/src/Admin/ThingsGateway.SqlSugar/Sugar/IntegrationServices/SerializeService.cs +++ b/src/Admin/ThingsGateway.SqlSugar/Sugar/IntegrationServices/SerializeService.cs @@ -8,6 +8,8 @@ using System.Text.Json; using System.Text.Json.Serialization; using System.Text.Json.Serialization.Metadata; +using ThingsGateway.NewLife.Json.Extension; + using JsonProperty = Newtonsoft.Json.Serialization.JsonProperty; namespace ThingsGateway.SqlSugar @@ -23,8 +25,10 @@ namespace ThingsGateway.SqlSugar private static readonly JsonSerializerOptions _systemTextJsonSettings = new() { + Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping, PropertyNamingPolicy = JsonNamingPolicy.CamelCase, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull, + NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals, }; private static readonly ConcurrentDictionary _typeInfoCache = new(); @@ -52,6 +56,11 @@ namespace ThingsGateway.SqlSugar } }); + + _systemTextJsonSettings.Converters.Add(new JTokenSystemTextJsonConverter()); + _systemTextJsonSettings.Converters.Add(new JValueSystemTextJsonConverter()); + _systemTextJsonSettings.Converters.Add(new JObjectSystemTextJsonConverter()); + _systemTextJsonSettings.Converters.Add(new JArraySystemTextJsonConverter()); _systemTextJsonSettings.TypeInfoResolver = resolver; } public static bool UseNewtonsoftJson = false; diff --git a/src/Directory.Build.props b/src/Directory.Build.props index c70ae8281..00eb74656 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,9 +1,9 @@ - 10.11.90 - 10.11.90 - 10.11.90 + 10.11.92 + 10.11.92 + 10.11.92 10.11.6 10.11.6 8.0.20