升级Furion v4.5.2 增加日志json格式

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

@@ -24,9 +24,9 @@
 
   <ItemGroup>
     <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.5.0" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.5.0" />
-    <PackageReference Include="Furion.Pure" Version="4.5.0" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.5.2" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.5.2" />
+    <PackageReference Include="Furion.Pure" Version="4.5.2" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.4" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.6.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.9" />

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

@@ -3137,46 +3137,6 @@
             ES日志写入器
             </summary>
         </member>
-        <member name="T:Admin.NET.Core.LogContent">
-            <summary>
-            日志内容
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.LogContent.LogName">
-            <summary>
-            记录器类别名称
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.LogContent.LogLevel">
-            <summary>
-            日志级别
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.LogContent.EventId">
-            <summary>
-             事件 Id
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.LogContent.Exception">
-            <summary>
-            异常对象
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.LogContent.Context">
-            <summary>
-            日志上下文
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.LogContent.Message">
-            <summary>
-            日志消息
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.LogContent.Time">
-            <summary>
-            日志时间
-            </summary>
-        </member>
         <member name="T:Admin.NET.Core.ElasticSearchSetup">
             <summary>
             ES服务注册

Admin.NET/Admin.NET.Core/Logging/ElasticSearchLoggingWriter.cs

@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Logging;
-using Nest;
-using LogLevel = Microsoft.Extensions.Logging.LogLevel;
+using Nest;
 
 namespace Admin.NET.Core;
 
@@ -18,55 +16,6 @@ public class ElasticSearchLoggingWriter : IDatabaseLoggingWriter
 
     public void Write(LogMessage logMsg, bool flush)
     {
-        _esClient.IndexDocument(new LogContent
-        {
-            Time = DateTime.Now,
-            LogLevel = logMsg.LogLevel,
-            LogName = logMsg.LogName,
-            EventId = logMsg.EventId,
-            Message = logMsg.Message,
-            Exception = logMsg.Exception
-        });
+        _esClient.IndexDocument(logMsg.Context.Get("loggingMonitor"));
     }
-}
-
-/// <summary>
-/// 日志内容
-/// </summary>
-public class LogContent
-{
-    /// <summary>
-    /// 记录器类别名称
-    /// </summary>
-    public string LogName { get; set; }
-
-    /// <summary>
-    /// 日志级别
-    /// </summary>
-    public LogLevel LogLevel { get; set; }
-
-    /// <summary>
-    ///  事件 Id
-    /// </summary>
-    public EventId EventId { get; set; }
-
-    /// <summary>
-    /// 异常对象
-    /// </summary>
-    public Exception Exception { get; set; }
-
-    /// <summary>
-    /// 日志上下文
-    /// </summary>
-    public LogContext Context { get; set; }
-
-    /// <summary>
-    /// 日志消息
-    /// </summary>
-    public string Message { get; internal set; }
-
-    /// <summary>
-    /// 日志时间
-    /// </summary>
-    public DateTime Time { get; internal set; }
 }

Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -147,7 +147,10 @@ public class Startup : AppStartup
         }
         if (App.GetConfig<bool>("Logging:ElasticSearch:Enabled")) // 日志写入ElasticSearch
         {
-            services.AddDatabaseLogging<ElasticSearchLoggingWriter>();
+            services.AddDatabaseLogging<ElasticSearchLoggingWriter>(options =>
+            {
+                options.MessageFormat = LoggerFormatter.Json;
+            });
         }
 
         // 配置雪花Id算法机器码

Admin.NET/Admin.NET.Web.Entry/appsettings.Development.json

@@ -31,7 +31,8 @@
             "ExcludeOfMethods": [], // 排除特定方法，当GlobalEnabled=true有效
             "BahLogLevel": "Information", // Oops.Oh 和 Oops.Bah 业务日志输出级别
             "WithReturnValue": true, // 配置是否包含返回值，默认true
-            "ReturnValueThreshold": 0 // 配置返回值字符串阈值，默认0全量输出
+            "ReturnValueThreshold": 0, // 配置返回值字符串阈值，默认0全量输出
+            "JsonBehavior": "None" // 配置Json输出行为，默认 None
         }
     },
     "AllowedHosts": "*"

Admin.NET/Admin.NET.Web.Entry/appsettings.json

@@ -31,7 +31,8 @@
             "ExcludeOfMethods": [], // 排除特定方法，当GlobalEnabled=true有效
             "BahLogLevel": "Information", // Oops.Oh 和 Oops.Bah 业务日志输出级别
             "WithReturnValue": true, // 配置是否包含返回值，默认true
-            "ReturnValueThreshold": 0 // 配置返回值字符串阈值，默认0全量输出
+            "ReturnValueThreshold": 0, // 配置返回值字符串阈值，默认0全量输出
+            "JsonBehavior": "None" // 配置Json输出行为，默认 None
         }
     },
     "AllowedHosts": "*"