1、升级Furionv3.8.5 2、优化Json序列化

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -20,17 +20,17 @@
 
   <ItemGroup>
     <PackageReference Include="Caching.CSRedis" Version="3.8.3" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="3.8.4" />
-    <PackageReference Include="Furion.Extras.Logging.Serilog" Version="3.8.4" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="3.8.4" />
-    <PackageReference Include="Furion.Pure" Version="3.8.4" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="3.8.5" />
+    <PackageReference Include="Furion.Extras.Logging.Serilog" Version="3.8.5" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="3.8.5" />
+    <PackageReference Include="Furion.Pure" Version="3.8.5" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.7" />
     <PackageReference Include="MySql.Data" Version="8.0.29" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.6" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.16.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.11.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.0.9.4" />
+    <PackageReference Include="SqlSugarCore" Version="5.0.9.5" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.19" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -1553,7 +1553,7 @@
         </member>
         <member name="P:Admin.NET.Core.WechatPay.Settlement">
             <summary>
-            结算信息。
+            结算信息
             </summary>
         </member>
         <member name="P:Admin.NET.Core.WechatPay.NotifyUrl">
@@ -6712,7 +6712,7 @@
             全局规范化结果
             </summary>
         </member>
-        <member name="M:Admin.NET.Core.AdminResultProvider.OnException(Microsoft.AspNetCore.Mvc.Filters.ExceptionContext,Furion.UnifyResult.Internal.ExceptionMetadata)">
+        <member name="M:Admin.NET.Core.AdminResultProvider.OnException(Microsoft.AspNetCore.Mvc.Filters.ExceptionContext,Furion.FriendlyException.ExceptionMetadata)">
             <summary>
             异常返回值
             </summary>

Admin.NET/Admin.NET.Core/Entity/WechatPay.cs

@@ -15,6 +15,7 @@ public class WechatPay : EntityBase
     /// <summary>
     /// 服务商AppId
     /// </summary>
+    [SugarColumn(ColumnDescription = "服务商AppId")]
     public string AppId { get; set; }
 
     /// <summary>
@@ -102,13 +103,15 @@ public class WechatPay : EntityBase
     public string GoodsTag { get; set; }
 
     /// <summary>
-    /// 结算信息。
+    /// 结算信息
     /// </summary>
+    [SugarColumn(ColumnDescription = "结算信息")]
     public string Settlement { get; set; }
 
     /// <summary>
     /// 回调通知地址
     /// </summary>
+    [SugarColumn(ColumnDescription = "回调通知地址")]
     public string NotifyUrl { get; set; }
 
     /// <summary>
@@ -132,13 +135,13 @@ public class WechatPay : EntityBase
     /// <summary>
     /// 子商户号
     /// </summary>
+    [SugarColumn(ColumnDescription = "子商户号")]
     public string SubMerchantId { get; set; }
 
     /// <summary>
     /// 子商户AppId
     /// </summary>
-    [Newtonsoft.Json.JsonProperty("sub_appid")]
-    [System.Text.Json.Serialization.JsonPropertyName("sub_appid")]
+    [SugarColumn(ColumnDescription = "回调通知地址")]
     public string SubAppId { get; set; }
 
     /// <summary>

Admin.NET/Admin.NET.Core/GlobalUsings.cs

@@ -13,7 +13,6 @@ global using Furion.JsonSerialization;
 global using Furion.RemoteRequest.Extensions;
 global using Furion.TaskScheduler;
 global using Furion.UnifyResult;
-global using Furion.UnifyResult.Internal;
 global using Furion.ViewEngine;
 global using Mapster;
 global using MapsterMapper;
@@ -26,6 +25,7 @@ global using Microsoft.Extensions.Caching.Distributed;
 global using Microsoft.Extensions.Configuration;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Options;
+global using Newtonsoft.Json;
 global using SKIT.FlurlHttpClient;
 global using SKIT.FlurlHttpClient.Wechat.Api;
 global using SKIT.FlurlHttpClient.Wechat.Api.Models;

Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -101,20 +101,20 @@ public static class SqlSugarSetup
                     var LogDiff = new SysLogDiff
                     {
                         // 操作后记录（字段描述、列名、值、表名、表描述）
-                        AfterData = Newtonsoft.Json.JsonConvert.SerializeObject(u.AfterData),
+                        AfterData = JsonConvert.SerializeObject(u.AfterData),
                         // 操作前记录（字段描述、列名、值、表名、表描述）
-                        BeforeData = Newtonsoft.Json.JsonConvert.SerializeObject(u.BeforeData),
+                        BeforeData = JsonConvert.SerializeObject(u.BeforeData),
                         // 传进来的对象
-                        BusinessData = Newtonsoft.Json.JsonConvert.SerializeObject(u.BusinessData),
+                        BusinessData = JsonConvert.SerializeObject(u.BusinessData),
                         // 枚举（insert、update、delete）
                         DiffType = u.DiffType.ToString(),
                         Sql = UtilMethods.GetSqlString(DbType.MySql, u.Sql, u.Parameters),
-                        Parameters = Newtonsoft.Json.JsonConvert.SerializeObject(u.Parameters),
+                        Parameters = JsonConvert.SerializeObject(u.Parameters),
                         Duration = u.Time == null ? 0 : (long)u.Time.Value.TotalMilliseconds
                     };
                     await db.GetConnectionScope(SqlSugarConst.ConfigId).Insertable(LogDiff).ExecuteCommandAsync();
                     Console.ForegroundColor = ConsoleColor.Red;
-                    Console.WriteLine(DateTime.Now + $"\r\n**********差异日志开始**********\r\n{Environment.NewLine}{Newtonsoft.Json.JsonConvert.SerializeObject(LogDiff)}{Environment.NewLine}**********差异日志结束**********\r\n");
+                    Console.WriteLine(DateTime.Now + $"\r\n**********差异日志开始**********\r\n{Environment.NewLine}{JsonConvert.SerializeObject(LogDiff)}{Environment.NewLine}**********差异日志结束**********\r\n");
                 };
 
                 // 配置实体假删除过滤器

Admin.NET/Admin.NET.Core/Util/JsonSerializerProvider.cs

@@ -1,6 +1,4 @@
-using Newtonsoft.Json;
-
-namespace Admin.NET.Core.Util;
+namespace Admin.NET.Core.Util;
 
 /// <summary>
 /// Newtonsoft.Json 实现