From 0c4060335e5baa452f510f3d7973c8cb995aa97d Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 12 七月 2024 08:16:31 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/Utility/Extension/ServiceCollectionExtensions.cs | 73 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/Wms/Utility/Extension/ServiceCollectionExtensions.cs b/Wms/Utility/Extension/ServiceCollectionExtensions.cs
index 0abe4ed..e519884 100644
--- a/Wms/Utility/Extension/ServiceCollectionExtensions.cs
+++ b/Wms/Utility/Extension/ServiceCollectionExtensions.cs
@@ -7,11 +7,20 @@
using System.Text;
using Serilog.Sinks.SystemConsole.Themes;
using Serilog.Filters;
+using Autofac.Core;
+using Serilog.Formatting.Json;
+using System.Linq;
+using ZXing;
+using SqlSugar.Extensions;
namespace Utility
{
public static class ServiceCollectionExtensions
{
+ internal static string LogFilePath(string fileName) => $@"Logs/{fileName}/{DateTime.Now.Year}.{DateTime.Now.Month}/log_.log";
+ internal static readonly string seriCustomProperty = "seriPos";
+ internal static readonly string logOutputTemplate = "鏃堕棿: {Timestamp:yyyy-MM-dd HH:mm:ss}{NewLine}鏉ユ簮: {SourceContext}{NewLine}鍐呭: [{Level:u3}] {Message}{NewLine}{Exception}{NewLine}";
+ internal static readonly long? fileSize = 31457280L;
const string template = "鏃堕棿: {Timestamp:yyyy-MM-dd HH:mm:ss}{NewLine}鏉ユ簮: {SourceContext}{NewLine}鍐呭: [{Level:u3}] {Message}{NewLine}{Exception}{NewLine}";
/// <summary>
/// 娣诲姞閰嶇疆Serilog
@@ -21,9 +30,8 @@
/// <returns></returns>
public static IServiceCollection AddConfigSerilog(this IServiceCollection services)
{
- // 鍒涘缓Serilog璁板綍鏃ュ織
Log.Logger = new LoggerConfiguration()
- .MinimumLevel.Information()
+ .MinimumLevel.Debug()
.MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
.MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Fatal)
.MinimumLevel.Override("Quartz", LogEventLevel.Warning)
@@ -33,42 +41,35 @@
.WriteTo.Async(c => c.Console(
theme: AnsiConsoleTheme.Literate,
outputTemplate: template))
- // Debug鏃ュ織鍐欏叆鍒版枃浠�
- //.WriteTo.Async(c => c.File(
- // path: "Logs/Debug_.txt",
- // rollingInterval: RollingInterval.Day,
- // fileSizeLimitBytes: 1024 * 1024 * 10,
- // retainedFileCountLimit: 100,
- // outputTemplate: template,
- // restrictedToMinimumLevel: LogEventLevel.Debug))
- // Information鏃ュ織鍐欏叆鍒版枃浠�
- .WriteTo.Async(c => c.File(
- path: "Logs/Information_.txt",
- rollingInterval: RollingInterval.Day,
- fileSizeLimitBytes: 1024 * 1024 * 10,
- retainedFileCountLimit: 100,
- outputTemplate: template,
- restrictedToMinimumLevel: LogEventLevel.Information))
- // Warning鏃ュ織鍐欏叆鍒版枃浠�
- .WriteTo.Async(c => c.File(
- path: "Logs/Warning_.txt",
- rollingInterval: RollingInterval.Day,
- fileSizeLimitBytes: 1024 * 1024 * 10,
- retainedFileCountLimit: 100,
- outputTemplate: template,
- restrictedToMinimumLevel: LogEventLevel.Warning))
- // Error鏃ュ織鍐欏叆鍒版枃浠�
- .WriteTo.Async(c => c.File(
- path: "Logs/Error_.txt",
- rollingInterval: RollingInterval.Day,
- fileSizeLimitBytes: 1024 * 1024 * 10,
- retainedFileCountLimit: 1000,
- outputTemplate: template,
- restrictedToMinimumLevel: LogEventLevel.Error))
+ .WriteTo.Logger(lc => lc
+ .Filter.ByIncludingOnly((e) => e.Level == Serilog.Events.LogEventLevel.Information)
+ .WriteTo.File("Logs/info/.log", rollingInterval: RollingInterval.Day, rollOnFileSizeLimit: true, fileSizeLimitBytes: 1024 * 1024 * 10))
+ .WriteTo.Logger(lc => lc
+ .Filter.ByIncludingOnly((e) => e.Level == Serilog.Events.LogEventLevel.Debug)
+ .WriteTo.File("Logs/debug/.log", rollingInterval: RollingInterval.Day, rollOnFileSizeLimit: true, fileSizeLimitBytes: 1024 * 1024 * 10))
+ .WriteTo.Logger(lc => lc
+ .Filter.ByIncludingOnly((e) => e.Level == Serilog.Events.LogEventLevel.Error)
+ .WriteTo.File("Logs/error/.log", rollingInterval: RollingInterval.Day, rollOnFileSizeLimit: true, fileSizeLimitBytes: 1024 * 1024 * 10))
+ .WriteTo.Logger(lc => lc
+ .Filter.ByIncludingOnly((e) => e.Level == Serilog.Events.LogEventLevel.Verbose)
+ .WriteTo.File("Logs/verbose/.log", rollingInterval: RollingInterval.Day, rollOnFileSizeLimit: true, fileSizeLimitBytes: 1024 * 1024 * 10))
+ .WriteTo.Logger(lc => lc
+ .Filter.ByIncludingOnly((e) => e.Level == Serilog.Events.LogEventLevel.Warning)
+ .WriteTo.File("Logs/warning/.log", rollingInterval: RollingInterval.Day, rollOnFileSizeLimit: true, fileSizeLimitBytes: 1024 * 1024 * 10))
+ .WriteTo.Logger(lc => lc
+ .Filter.ByIncludingOnly((e) =>
+ {
+ var result = e.Properties.FirstOrDefault(c => c.Key == "ExternalSystems").Value;
+ if (result != null)
+ {
+ return result.ObjToBool();
+ }
+ return false;
+ })
+ .WriteTo.File("Logs/api/.log", rollingInterval: RollingInterval.Day, rollOnFileSizeLimit: true, fileSizeLimitBytes: 1024 * 1024 * 10))
.CreateLogger();
- services.AddSerilog();
-
+ services.AddSerilog(Log.Logger);
return services;
}
}
--
Gitblit v1.8.0