From 0aed9c9ee65bd8a17837d83ec05e756d11fab297 Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期二, 21 四月 2026 15:29:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/QuartzLogHelper.cs | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/QuartzLogHelper.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/QuartzLogHelper.cs
index 20d43ff..cc0c9a5 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/QuartzLogHelper.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/QuartzLogHelper.cs
@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Logging;
+using Serilog;
using WIDESEAWCS_Core.LogHelper;
namespace WIDESEAWCS_Tasks;
@@ -23,7 +23,7 @@
/// <param name="args">ILogger 缁撴瀯鍖栨棩蹇楃殑鍙傛暟</param>
public static void LogError(ILogger logger, Exception ex, string loggerMessage, string quartzMessage, string deviceCode, params object[] args)
{
- logger.LogError(ex, loggerMessage, args);
+ logger.Error(ex, loggerMessage, args);
QuartzLogger.Error(quartzMessage, deviceCode, ex);
}
@@ -37,7 +37,7 @@
/// <param name="args">ILogger 缁撴瀯鍖栨棩蹇楃殑鍙傛暟</param>
public static void LogError(ILogger logger, string loggerMessage, string quartzMessage, string deviceCode, params object[] args)
{
- logger.LogError(loggerMessage, args);
+ logger.Error(loggerMessage, args);
QuartzLogger.Error(quartzMessage, deviceCode);
}
@@ -51,8 +51,21 @@
/// <param name="args">ILogger 缁撴瀯鍖栨棩蹇楃殑鍙傛暟</param>
public static void LogInfo(ILogger logger, string loggerMessage, string quartzMessage, string deviceCode, params object[] args)
{
- logger.LogInformation(loggerMessage, args);
+ logger.Information(loggerMessage, args);
QuartzLogger.Info(quartzMessage, deviceCode);
+ }
+
+ /// <summary>
+ /// 璁板綍淇℃伅鏃ュ織
+ /// </summary>
+ /// <param name="logger">ILogger 瀹炰緥</param>
+ /// <param name="loggerMessage">ILogger 鐨勭粨鏋勫寲鏃ュ織妯℃澘</param>
+ /// <param name="quartzMessage">QuartzLogger 鐨勬棩蹇楁秷鎭�</param>
+ /// <param name="deviceCode">璁惧缂栫爜</param>
+ public static void LogInfo(ILogger logger, string loggerMessage, string deviceCode)
+ {
+ logger.Information(loggerMessage);
+ QuartzLogger.Info(loggerMessage, deviceCode);
}
/// <summary>
@@ -65,7 +78,7 @@
/// <param name="args">ILogger 缁撴瀯鍖栨棩蹇楃殑鍙傛暟</param>
public static void LogWarn(ILogger logger, string loggerMessage, string quartzMessage, string deviceCode, params object[] args)
{
- logger.LogWarning(loggerMessage, args);
+ logger.Warning(loggerMessage, args);
QuartzLogger.Warn(quartzMessage, deviceCode);
}
@@ -79,7 +92,21 @@
/// <param name="args">ILogger 缁撴瀯鍖栨棩蹇楃殑鍙傛暟</param>
public static void LogDebug(ILogger logger, string loggerMessage, string quartzMessage, string deviceCode, params object[] args)
{
- logger.LogDebug(loggerMessage, args);
+ logger.Debug(loggerMessage, args);
QuartzLogger.Debug(quartzMessage, deviceCode);
}
-}
+
+ /// <summary>
+ /// 璁板綍璋冭瘯鏃ュ織
+ /// </summary>
+ /// <param name="logger">ILogger 瀹炰緥</param>
+ /// <param name="loggerMessage">ILogger 鐨勭粨鏋勫寲鏃ュ織妯℃澘锛堟敮鎸佸崰浣嶇锛�</param>
+ /// <param name="quartzMessage">QuartzLogger 鐨勬棩蹇楁秷鎭�</param>
+ /// <param name="deviceCode">璁惧缂栫爜</param>
+ /// <param name="args">ILogger 缁撴瀯鍖栨棩蹇楃殑鍙傛暟</param>
+ public static void LogDebug(ILogger logger, string loggerMessage, string deviceCode)
+ {
+ logger.Debug(loggerMessage);
+ QuartzLogger.Debug(loggerMessage, deviceCode);
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3