From 62b3bf8205277b9bdceaa83f0d7e5d73312e1780 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 23 八月 2024 14:48:02 +0800
Subject: [PATCH] 解决冲突
---
Wms/Utility/Extension/ServiceCollectionExtensions.cs | 73 ------------------------------------
1 files changed, 0 insertions(+), 73 deletions(-)
diff --git a/Wms/Utility/Extension/ServiceCollectionExtensions.cs b/Wms/Utility/Extension/ServiceCollectionExtensions.cs
index 51e880d..e519884 100644
--- a/Wms/Utility/Extension/ServiceCollectionExtensions.cs
+++ b/Wms/Utility/Extension/ServiceCollectionExtensions.cs
@@ -30,70 +30,6 @@
/// <returns></returns>
public static IServiceCollection AddConfigSerilog(this IServiceCollection services)
{
- // 鍒涘缓Serilog璁板綍鏃ュ織
- //Log.Logger = new LoggerConfiguration()
- // .MinimumLevel.Debug()
- // .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
- // .MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Fatal)
- // .MinimumLevel.Override("Quartz", LogEventLevel.Warning)
- // .MinimumLevel.Override("Serilog", LogEventLevel.Information)
- // // 鍏ㄩ儴鏃ュ織鍐欏叆鍒癈onsole
- // .WriteTo.Console()
- // .WriteTo.Async(c => c.Console(
- // theme: AnsiConsoleTheme.Literate,
- // outputTemplate: template))
- // // Debug鏃ュ織鍐欏叆鍒版枃浠�
- // .WriteTo.Logger(lg => lg.Filter.ByIncludingOnly(p => p.Level == LogEventLevel.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.Logger(lg => lg.Filter.ByIncludingOnly(p => p.Level == LogEventLevel.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.Logger(lg => lg.Filter.ByIncludingOnly(p => p.Level == LogEventLevel.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.Logger(lg => lg.Filter.ByIncludingOnly(p => p.Level == LogEventLevel.Error))
- // .WriteTo.Async(c => c.File(
- // path: "Logs/Error_.txt",
- // rollingInterval: RollingInterval.Day,
- // fileSizeLimitBytes: 1024 * 1024 * 10,
- // retainedFileCountLimit: 1000,
- // outputTemplate: template,
- // restrictedToMinimumLevel: LogEventLevel.Error))
- // .CreateLogger();
-
- //Log.Logger = new LoggerConfiguration()
- // .Enrich.FromLogContext()
- // .WriteTo.Console() // 杈撳嚭鍒版帶鍒跺彴
- // .MinimumLevel.Debug() // 娴嬭瘯鏈�灏忚褰曠骇鍒�
- // .WriteTo.Logger(lg => lg.Filter.ByIncludingOnly(p => {
- // var result = p.Properties.FirstOrDefault(c => c.Key == "SourceContext").Value;
- // if (result != null)
- // {
- // return result.ToString().Contains("妯″潡鍚�");
- // }
- // return false;
- // }).WriteTo
- // .File(LogFilePath("妯″潡鐩綍"), rollingInterval: RollingInterval.Day, outputTemplate: template))
- // .CreateLogger();
Log.Logger = new LoggerConfiguration()
.MinimumLevel.Debug()
.MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
@@ -105,15 +41,6 @@
.WriteTo.Async(c => c.Console(
theme: AnsiConsoleTheme.Literate,
outputTemplate: template))
- // Debug鏃ュ織鍐欏叆鍒版枃浠�
- //.WriteTo.Logger(lg => lg.Filter.ByIncludingOnly(p => p.Level == LogEventLevel.Debug))
- //.WriteTo.Async(c => c.File(
- // path: "Logs/Debug_.txt",
- // rollingInterval: RollingInterval.Day,
- // fileSizeLimitBytes: 1024 * 1024 * 10,
- // retainedFileCountLimit: 100,
- // outputTemplate: template,
- // restrictedToMinimumLevel: LogEventLevel.Debug))
.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))
--
Gitblit v1.8.0