Просмотр исходного кода

😉日志配置增加WithStackFrame,显示堆栈详情(显示程序集和方法名)

zuohuaijun 3 лет назад
Родитель
Сommit
197277db5d

+ 4 - 4
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -21,11 +21,11 @@
     <PackageReference Include="DotNetCore.Compile.Environment" Version="3.2.0" />
     <PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.1.0" />
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7.15" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7.15" />
-    <PackageReference Include="Furion.Pure" Version="4.8.7.15" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7.16" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7.16" />
+    <PackageReference Include="Furion.Pure" Version="4.8.7.16" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
-    <PackageReference Include="Lazy.Captcha.Core" Version="2.0.2" />
+    <PackageReference Include="Lazy.Captcha.Core" Version="2.0.3" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.3" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.4.3" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.15" />

+ 10 - 0
Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WxOpenInput.cs

@@ -55,6 +55,16 @@ public class SendSubscribeMessageInput
     /// </summary>
     [Required(ErrorMessage = "模板内容不能为空")]
     public Dictionary<string, CgibinMessageSubscribeSendRequest.Types.DataItem> Data { get; set; }
+
+    /// <summary>
+    /// 跳转小程序类型
+    /// </summary>
+    public string MiniprogramState { get; set; }
+
+    /// <summary>
+    /// 语言类型
+    /// </summary>
+    public string Language { get; set; }
 }
 
 public class AddSubscribeMessageTemplateInput

+ 3 - 1
Admin.NET/Admin.NET.Core/Service/Wechat/SysWxOpenService.cs

@@ -136,7 +136,9 @@ public class SysWxOpenService : IDynamicApiController, ITransient
             AccessToken = accessToken,
             TemplateId = input.TemplateId,
             ToUserOpenId = input.ToUserOpenId,
-            Data = input.Data
+            Data = input.Data,
+            MiniProgramState = input.MiniprogramState,
+            Language = input.Language
         };
         var resMessage = await _wechatApiClient.ExecuteCgibinMessageSubscribeSendAsync(reqMessage);
         return resMessage;

+ 9 - 0
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -152,6 +152,7 @@ public class Startup : AppStartup
             {
                 services.AddFileLogging(options =>
                 {
+                    options.WithStackFrame = true; // 显示堆栈信息
                     options.FileNameRule = fileName => string.Format(fileName, DateTime.Now, logLevel.ToString()); // 每天创建一个文件
                     options.WriteFilter = logMsg => logMsg.LogLevel == logLevel; // 日志级别
                     options.HandleWriteError = (writeError) => // 写入失败时启用备用文件
@@ -165,6 +166,7 @@ public class Startup : AppStartup
         {
             services.AddDatabaseLogging<DatabaseLoggingWriter>(options =>
             {
+                options.WithStackFrame = true; // 显示堆栈信息
                 options.WithTraceId = true; // 显示线程Id
                 options.IgnoreReferenceLoop = false; // 忽略循环检测
                 options.WriteFilter = (logMsg) =>
@@ -177,7 +179,14 @@ public class Startup : AppStartup
         {
             services.AddDatabaseLogging<ElasticSearchLoggingWriter>(options =>
             {
+                options.WithStackFrame = true; // 显示堆栈信息
+                options.WithTraceId = true; // 显示线程Id
+                options.IgnoreReferenceLoop = false; // 忽略循环检测
                 options.MessageFormat = LoggerFormatter.Json;
+                options.WriteFilter = (logMsg) =>
+                {
+                    return logMsg.LogName == "System.Logging.LoggingMonitor"; // 只写LoggingMonitor日志
+                };
             });
         }