10.6.21

fix: s7多写
fix: opcuaserver写入数组

src/Admin/ThingsGateway.Admin.Application/Aop/OperDescAttribute.cs

@@ -64,24 +64,31 @@ public sealed class OperDescAttribute : MoAttribute
 
     public override void OnException(MethodContext context)
     {
-        //插入异常日志
-        SysOperateLog log = GetOperLog(LocalizerType, context);
+        if (App.HttpContext.Request.Path.StartsWithSegments("/_blazor"))
+        {
+            //插入异常日志
+            SysOperateLog log = GetOperLog(LocalizerType, context);
 
-        log.Category = LogCateGoryEnum.Exception;//操作类型为异常
-        log.ExeStatus = false;//操作状态为失败
-        if (context.Exception is AppFriendlyException exception)
-            log.ExeMessage = exception?.Message;
-        else
-            log.ExeMessage = context.Exception?.ToString();
+            log.Category = LogCateGoryEnum.Exception;//操作类型为异常
+            log.ExeStatus = false;//操作状态为失败
+            if (context.Exception is AppFriendlyException exception)
+                log.ExeMessage = exception?.Message;
+            else
+                log.ExeMessage = context.Exception?.ToString();
 
-        OperDescAttribute.WriteToQueue(log);
+            OperDescAttribute.WriteToQueue(log);
+        }
     }
 
     public override void OnSuccess(MethodContext context)
     {
-        //插入操作日志
-        SysOperateLog log = GetOperLog(LocalizerType, context);
-        OperDescAttribute.WriteToQueue(log);
+        if (App.HttpContext.Request.Path.StartsWithSegments("/_blazor"))
+        {
+
+            //插入操作日志
+            SysOperateLog log = GetOperLog(LocalizerType, context);
+            OperDescAttribute.WriteToQueue(log);
+        }
     }
 
     /// <summary>

src/Admin/ThingsGateway.Admin.Application/Controller/AuthController.cs

@@ -15,7 +15,7 @@ namespace ThingsGateway.Admin.Application;
 
 [ApiDescriptionSettings(false)]
 [Route("api/auth")]
-[LoggingMonitor]
+[RequestAudit]
 public class AuthController : ControllerBase
 {
     private readonly IAuthService _authService;

src/Admin/ThingsGateway.Admin.Application/Controller/OpenApiController.cs

@@ -25,7 +25,7 @@ namespace ThingsGateway.Admin.Application;
 [Description("登录")]
 [Route("openapi/auth")]
 [Authorize(AuthenticationSchemes = "Bearer")]
-[LoggingMonitor]
+[RequestAudit]
 [ApiController]
 public class OpenApiController : ControllerBase
 {

src/Admin/ThingsGateway.Admin.Application/Filter/RequestAudit.cs

@@ -0,0 +1,15 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace System.Logging;
+
+public class RequestAudit
+{
+}

src/Admin/ThingsGateway.Admin.Application/Filter/RequestAuditAttribute.cs

@@ -0,0 +1,20 @@
+// ------------------------------------------------------------------------
+// 版权信息
+// 版权归百小僧及百签科技（广东）有限公司所有。
+// 所有权利保留。
+// 官方网站：https://baiqian.com
+//
+// 许可证信息
+// 项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。
+// 许可证的完整文本可以在源代码树根目录中的 LICENSE-APACHE 和 LICENSE-MIT 文件中找到。
+// ------------------------------------------------------------------------
+
+using ThingsGateway.DependencyInjection;
+
+namespace System;
+
+[SuppressSniffer, AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
+public sealed class RequestAuditAttribute : Attribute
+{
+
+}

src/Admin/ThingsGateway.Admin.Application/Filter/RequestAuditData.cs

@@ -0,0 +1,98 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public class RequestAuditData
+{
+    /// <summary>
+    /// 分类
+    /// </summary>
+    public string CateGory { get; set; }
+
+    /// <summary>
+    /// 客户端信息
+    /// </summary>
+    public UserAgent Client { get; set; }
+
+    /// <summary>
+    /// 请求方法：POST/GET
+    /// </summary>
+    public string Method { get; set; }
+
+    /// <summary>
+    /// 操作名称
+    /// </summary>
+    public string Operation { get; set; }
+
+    /// <summary>
+    /// 请求地址
+    /// </summary>
+    public string Path { get; set; }
+
+    /// <summary>
+    /// 方法名称
+    /// </summary>
+    public string ActionName { get; set; }
+
+    /// <summary>
+    /// 认证信息
+    /// </summary>
+    public List<AuthorizationClaims> AuthorizationClaims { get; set; }
+
+    /// <summary>
+    /// 控制器名
+    /// </summary>
+    public string ControllerName { get; set; }
+
+    /// <summary>
+    /// 异常信息
+    /// </summary>
+    public LogException Exception { get; set; }
+
+    public long TimeOperationElapsedMilliseconds { get; set; }
+
+
+    /// <summary>
+    /// 服务端
+    /// </summary>
+    public string LocalIPv4 { get; set; }
+
+    /// <summary>
+    /// 日志时间
+    /// </summary>
+    public DateTimeOffset LogDateTime { get; set; }
+
+    /// <summary>
+    /// 参数列表
+    /// </summary>
+    public List<Parameters> Parameters { get; set; }
+
+    /// <summary>
+    /// 客户端IPV4地址
+    /// </summary>
+    public string RemoteIPv4 { get; set; }
+
+    /// <summary>
+    /// 请求地址
+    /// </summary>
+    public string RequestUrl { get; set; }
+
+    /// <summary>
+    /// 返回信息
+    /// </summary>
+    public object ReturnInformation { get; set; }
+
+    /// <summary>
+    /// 验证错误信息
+    /// </summary>
+    public Validation Validation { get; set; }
+}
+

src/Admin/ThingsGateway.Admin.Application/Filter/RequestAuditFilter.cs

@@ -0,0 +1,290 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+using System.Diagnostics;
+using System.Logging;
+
+using ThingsGateway.FriendlyException;
+using ThingsGateway.Logging;
+using ThingsGateway.NewLife.Json.Extension;
+
+namespace ThingsGateway.Admin.Application;
+
+public class RequestAuditFilter : IAsyncActionFilter
+{
+    public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+    {
+
+        var controllerActionDescriptor = (context.ActionDescriptor as ControllerActionDescriptor);
+        // 获取动作方法描述器
+        var actionMethod = controllerActionDescriptor?.MethodInfo;
+
+        // 处理 Blazor Server
+        if (actionMethod == null)
+        {
+            _ = await next.Invoke().ConfigureAwait(false);
+            return;
+        }
+
+        // 排除 WebSocket 请求处理
+        if (context.HttpContext.IsWebSocketRequest())
+        {
+            _ = await next().ConfigureAwait(false);
+            return;
+        }
+
+        // 如果贴了 [SuppressMonitor] 特性则跳过
+        if (actionMethod.IsDefined(typeof(SuppressRequestAuditAttribute), true)
+            || actionMethod.DeclaringType.IsDefined(typeof(SuppressRequestAuditAttribute), true))
+        {
+            _ = await next().ConfigureAwait(false);
+            return;
+        }
+
+
+        // 只有方法贴有特性才进行审计
+        if (
+            !actionMethod.DeclaringType.IsDefined(typeof(RequestAuditAttribute), true)
+            &&
+            !actionMethod.IsDefined(typeof(RequestAuditAttribute), true))
+        {
+            return;
+        }
+
+        // 计算接口执行时间
+        var timeOperation = Stopwatch.StartNew();
+        var resultContext = await next().ConfigureAwait(false);
+        timeOperation.Stop();
+
+
+        var logData = new RequestAuditData();
+
+
+        logData.TimeOperationElapsedMilliseconds = timeOperation.ElapsedMilliseconds;
+
+        var resultHttpContext = (resultContext as FilterContext).HttpContext;
+
+        // 获取 HttpContext 和 HttpRequest 对象
+        var httpContext = context.HttpContext;
+        var httpRequest = httpContext.Request;
+
+        // 获取客户端 Ipv4 地址
+        var remoteIPv4 = httpContext.GetRemoteIpAddressToIPv4();
+        logData.RemoteIPv4 = remoteIPv4;
+        var requestUrl = Uri.UnescapeDataString(httpRequest.GetRequestUrlAddress());
+        logData.RequestUrl = requestUrl;
+
+
+        var result = resultContext.Result as IActionResult;
+        var data = result switch
+        {
+            // 处理内容结果
+            ContentResult content => content.Content,
+            // 处理对象结果
+            ObjectResult obj => obj.Value,
+            // 处理 JSON 对象
+            JsonResult json => json.Value,
+            _ => null,
+        };
+        logData.ReturnInformation = data;
+
+
+
+        //获取客户端信息
+        var client = App.GetService<IAppService>().UserAgent;
+        //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
+        var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
+
+        var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[actionMethod.Name];
+        //获取特性
+
+
+        logData.CateGory = desc.Value;//传操作名称
+        logData.Operation = desc.Value;//传操作名称
+        logData.Client = client;
+        logData.Path = httpContext.Request.Path.Value;//请求地址
+        logData.Method = httpContext.Request.Method;//请求方法
+
+        logData.ControllerName = controllerActionDescriptor.ControllerName;
+        logData.ActionName = controllerActionDescriptor.ActionName;
+
+        logData.AuthorizationClaims = new();
+        // 获取授权用户
+        var user = httpContext.User;
+        foreach (var claim in user.Claims)
+        {
+            logData.AuthorizationClaims.Add(new AuthorizationClaims
+            {
+                Type = claim.Type,
+                Value = claim.Value,
+            });
+        }
+
+
+
+        logData.LocalIPv4 = httpContext.GetLocalIpAddressToIPv4();
+        logData.LogDateTime = DateTimeOffset.Now;
+        var parameterValues = context.ActionArguments;
+
+        logData.Parameters = new();
+        var parameters = actionMethod.GetParameters();
+
+        foreach (var parameter in parameters)
+        {
+            // 判断是否禁用记录特定参数
+            if (parameter.IsDefined(typeof(SuppressRequestAuditAttribute), false)) continue;
+
+            // 排除标记 [FromServices] 的解析
+            if (parameter.IsDefined(typeof(FromServicesAttribute), false)) continue;
+
+            var name = parameter.Name;
+            var parameterType = parameter.ParameterType;
+
+            _ = parameterValues.TryGetValue(name, out var value);
+
+
+            var par = new Parameters()
+            {
+                Name = name,
+            };
+            logData.Parameters.Add(par);
+
+            object rawValue = default;
+
+            // 文件类型参数
+            if (value is IFormFile || value is List<IFormFile>)
+            {
+                // 单文件
+                if (value is IFormFile formFile)
+                {
+                    var fileSize = Math.Round(formFile.Length / 1024D);
+                    rawValue = new
+                    {
+                        name = formFile.Name,
+                        fileName = formFile.FileName,
+                        length = formFile.Length,
+                        contentType = formFile.ContentType
+                    };
+                }
+                // 多文件
+                else if (value is List<IFormFile> formFiles)
+                {
+                    var rawValues1 = new List<object>();
+                    for (var i = 0; i < formFiles.Count; i++)
+                    {
+                        var file = formFiles[i];
+                        var size = Math.Round(file.Length / 1024D);
+                        var rawValue1 = new
+                        {
+                            name = file.Name,
+                            fileName = file.FileName,
+                            length = file.Length,
+                            contentType = file.ContentType
+                        };
+                        rawValues1.Add(rawValue1);
+                    }
+                    rawValue = rawValues1;
+                }
+            }
+            // 处理 byte[] 参数类型
+            else if (value is byte[] byteArray)
+            {
+                rawValue = new
+                {
+                    length = byteArray.Length,
+                };
+            }
+            // 处理基元类型，字符串类型和空值
+            else if (parameterType.IsPrimitive || value is string || value == null)
+            {
+                rawValue = value;
+            }
+            // 其他类型统一进行序列化
+            else
+            {
+                rawValue = value;
+            }
+
+            par.Value = rawValue;
+        }
+
+
+        // 获取异常对象情况
+        Exception exception = resultContext.Exception;
+        if (exception is AppFriendlyException friendlyException)
+        {
+            logData.Validation = new();
+            logData.Validation.Message = friendlyException.Message;
+        }
+        else if (exception != null)
+        {
+            logData.Exception = new();
+            logData.Exception.Message = exception.Message;
+            logData.Exception.StackTrace = exception.StackTrace;
+            logData.Exception.Type = HandleGenericType(exception.GetType());
+        }
+
+
+
+        // 创建日志记录器
+        var logger = httpContext.RequestServices.GetRequiredService<ILogger<RequestAudit>>();
+
+        var logContext = new LogContext();
+
+        logContext.Set(nameof(RequestAuditData), logData);
+
+        // 设置日志上下文
+        using var scope = logger.ScopeContext(logContext);
+
+        if (exception == null)
+        {
+            logger.Log(LogLevel.Information, $"{logData.Method}:{logData.Path}-{logData.Operation}");
+        }
+        else
+        {
+            logger.Log(LogLevel.Warning, $"{logData.Method}:{logData.Path}-{logData.Operation}{Environment.NewLine}{logData.Exception.ToSystemTextJsonString()}");
+        }
+    }
+
+    /// <summary>
+    /// 处理泛型类型转字符串打印问题
+    /// </summary>
+    /// <param name="type"></param>
+    /// <returns></returns>
+    private static string HandleGenericType(Type type)
+    {
+        if (type == null) return string.Empty;
+
+        var typeName = type.FullName ?? (!string.IsNullOrEmpty(type.Namespace) ? type.Namespace + "." : string.Empty) + type.Name;
+
+        // 处理泛型类型问题
+        if (type.IsConstructedGenericType)
+        {
+            var prefix = type.GetGenericArguments()
+                .Select(genericArg => HandleGenericType(genericArg))
+                .Aggregate((previous, current) => previous + ", " + current);
+
+            typeName = typeName.Split('`').First() + "<" + prefix + ">";
+        }
+
+        return typeName;
+    }
+
+
+
+
+}

src/Admin/ThingsGateway.Admin.Application/Filter/SuppressRequestAuditAttribute.cs

@@ -0,0 +1,20 @@
+// ------------------------------------------------------------------------
+// 版权信息
+// 版权归百小僧及百签科技（广东）有限公司所有。
+// 所有权利保留。
+// 官方网站：https://baiqian.com
+//
+// 许可证信息
+// 项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。
+// 许可证的完整文本可以在源代码树根目录中的 LICENSE-APACHE 和 LICENSE-MIT 文件中找到。
+// ------------------------------------------------------------------------
+
+using ThingsGateway.DependencyInjection;
+
+namespace System;
+
+[SuppressSniffer, AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
+public sealed class SuppressRequestAuditAttribute : Attribute
+{
+
+}

src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareInfo.cs

@@ -51,7 +51,7 @@ public class HardwareInfo
     /// 进程占用内存
     /// </summary>
     [AutoGenerateColumn(Ignore = true)]
-    public string WorkingSet { get; set; }
+    public int WorkingSet { get; set; }
 
     /// <summary>
     /// 更新时间

src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareJob.cs

@@ -104,7 +104,7 @@ public class HardwareJob : IJob, IHardwareJob
             {
                 HardwareInfo.MachineInfo.Refresh();
                 HardwareInfo.UpdateTime = TimerX.Now.ToDefaultDateTimeFormat();
-                HardwareInfo.WorkingSet = (Environment.WorkingSet / 1024.0 / 1024.0).ToString("F2");
+                HardwareInfo.WorkingSet = (Environment.WorkingSet / 1024.0 / 1024.0).ToInt();
                 error = false;
             }
             catch (Exception ex)
@@ -126,11 +126,11 @@ public class HardwareJob : IJob, IHardwareJob
                             var his = new HistoryHardwareInfo()
                             {
                                 Date = TimerX.Now,
-                                DriveUsage = (100 - (HardwareInfo.DriveInfo.TotalFreeSpace * 100.00 / HardwareInfo.DriveInfo.TotalSize)).ToString("F2"),
-                                Battery = (HardwareInfo.MachineInfo.Battery * 100).ToString("F2"),
+                                DriveUsage = (100 - (HardwareInfo.DriveInfo.TotalFreeSpace * 100.00 / HardwareInfo.DriveInfo.TotalSize)).ToInt(),
+                                Battery = (HardwareInfo.MachineInfo.Battery * 100).ToInt(),
                                 MemoryUsage = (HardwareInfo.WorkingSet),
-                                CpuUsage = (HardwareInfo.MachineInfo.CpuRate * 100).ToString("F2"),
-                                Temperature = (HardwareInfo.MachineInfo.Temperature).ToString("F2"),
+                                CpuUsage = (HardwareInfo.MachineInfo.CpuRate * 100).ToInt(),
+                                Temperature = (HardwareInfo.MachineInfo.Temperature).ToInt(),
                             };
                             await db.Insertable(his).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
                             MemoryCache.Remove(CacheKey);

src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HistoryHardwareInfo.cs

@@ -19,23 +19,23 @@ public class HistoryHardwareInfo
 {
     /// <inheritdoc/>
     [SugarColumn(ColumnDescription = "磁盘使用率")]
-    public string DriveUsage { get; set; }
+    public int DriveUsage { get; set; }
 
     /// <inheritdoc/>
     [SugarColumn(ColumnDescription = "内存")]
-    public string MemoryUsage { get; set; }
+    public int MemoryUsage { get; set; }
 
     /// <inheritdoc/>
     [SugarColumn(ColumnDescription = "CPU使用率")]
-    public string CpuUsage { get; set; }
+    public int CpuUsage { get; set; }
 
     /// <inheritdoc/>
     [SugarColumn(ColumnDescription = "温度")]
-    public string Temperature { get; set; }
+    public int Temperature { get; set; }
 
     /// <inheritdoc/>
     [SugarColumn(ColumnDescription = "电池")]
-    public string Battery { get; set; }
+    public int Battery { get; set; }
 
     /// <inheritdoc/>
     [SugarColumn(ColumnDescription = "时间")]

src/Admin/ThingsGateway.Admin.Application/Logging/DatabaseLoggingWriter.cs

@@ -39,33 +39,31 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
     /// <param name="flush"></param>
     public async Task WriteAsync(LogMessage logMsg, bool flush)
     {
-        //获取请求json字符串
-        var jsonString = logMsg.Context.Get("loggingMonitor").ToString();
         //转成实体
-        var loggingMonitor = jsonString.FromJsonNetString<LoggingMonitorJson>();
+        var requestAuditData = logMsg.Context.Get(nameof(RequestAuditData)) as RequestAuditData;
         //日志时间赋值
-        loggingMonitor.LogDateTime = logMsg.LogDateTime;
-        // loggingMonitor.ReturnInformation.Value
+        requestAuditData.LogDateTime = logMsg.LogDateTime;
+        // requestAuditData.ReturnInformation.Value
         //验证失败不记录日志
         bool save = false;
-        if (loggingMonitor.Validation == null)
+        if (requestAuditData.Validation == null)
         {
-            var operation = logMsg.Context.Get(LoggingConst.Operation).ToString();//获取操作名称
-            var client = (UserAgent)logMsg.Context.Get(LoggingConst.Client);//获取客户端信息
-            var path = logMsg.Context.Get(LoggingConst.Path).ToString();//获取操作名称
-            var method = logMsg.Context.Get(LoggingConst.Method).ToString();//获取方法
+            var operation = requestAuditData.Operation;//获取操作名称
+            var client = requestAuditData.Client;//获取客户端信息
+            var path = requestAuditData.Path;//获取操作名称
+            var method = requestAuditData.Method;//获取方法
             //表示访问日志
             if (path == "/api/auth/login" || path == "/api/auth/logout")
             {
                 //如果没有异常信息
-                if (loggingMonitor.Exception == null)
+                if (requestAuditData.Exception == null)
                 {
-                    save = await CreateVisitLog(operation, path, loggingMonitor, client, flush).ConfigureAwait(false);//添加到访问日志
+                    save = await CreateVisitLog(operation, path, requestAuditData, client, flush).ConfigureAwait(false);//添加到访问日志
                 }
                 else
                 {
                     //添加到异常日志
-                    save = await CreateOperationLog(operation, path, loggingMonitor, client, flush).ConfigureAwait(false);
+                    save = await CreateOperationLog(operation, path, requestAuditData, client, flush).ConfigureAwait(false);
                 }
             }
             else
@@ -74,7 +72,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
                 if (!operation.IsNullOrWhiteSpace() && method == "POST")
                 {
                     //添加到操作日志
-                    save = await CreateOperationLog(operation, path, loggingMonitor, client, flush).ConfigureAwait(false);
+                    save = await CreateOperationLog(operation, path, requestAuditData, client, flush).ConfigureAwait(false);
                 }
             }
         }
@@ -89,27 +87,21 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
     /// </summary>
     /// <param name="operation">操作名称</param>
     /// <param name="path">请求地址</param>
-    /// <param name="loggingMonitor">loggingMonitor</param>
+    /// <param name="requestAuditData">requestAuditData</param>
     /// <param name="userAgent">客户端信息</param>
     /// <param name="flush"></param>
     /// <returns></returns>
-    private async Task<bool> CreateOperationLog(string operation, string path, LoggingMonitorJson loggingMonitor, UserAgent userAgent, bool flush)
+    private async Task<bool> CreateOperationLog(string operation, string path, RequestAuditData requestAuditData, UserAgent userAgent, bool flush)
     {
         //账号
-        var opAccount = loggingMonitor.AuthorizationClaims?.Where(it => it.Type == ClaimConst.Account).Select(it => it.Value).FirstOrDefault();
+        var opAccount = requestAuditData.AuthorizationClaims?.Where(it => it.Type == ClaimConst.Account).Select(it => it.Value).FirstOrDefault();
 
         //获取参数json字符串，
-        var paramJson = loggingMonitor.Parameters == null || loggingMonitor.Parameters.Count == 0 ? null : loggingMonitor.Parameters[0].Value.ToSystemTextJsonString();
+        var paramJson = requestAuditData.Parameters == null || requestAuditData.Parameters.Count == 0 ? null : requestAuditData.Parameters.ToSystemTextJsonString();
 
         //获取结果json字符串
-        var resultJson = string.Empty;
-        if (loggingMonitor.ReturnInformation != null)//如果有返回值
-        {
-            if (loggingMonitor.ReturnInformation.Value != null)//如果返回值不为空
-            {
-                resultJson = loggingMonitor.ReturnInformation.Value.ToSystemTextJsonString();
-            }
-        }
+        var resultJson = requestAuditData.ReturnInformation?.ToSystemTextJsonString();
+
 
         //操作日志表实体
         var sysLogOperate = new SysOperateLog
@@ -117,29 +109,29 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
             Name = operation,
             Category = LogCateGoryEnum.Operate,
             ExeStatus = true,
-            OpIp = loggingMonitor.RemoteIPv4,
+            OpIp = requestAuditData.RemoteIPv4,
             OpBrowser = userAgent?.Browser,
             OpOs = userAgent?.Platform,
-            OpTime = loggingMonitor.LogDateTime.LocalDateTime,
+            OpTime = requestAuditData.LogDateTime.LocalDateTime,
             OpAccount = opAccount,
-            ReqMethod = loggingMonitor.HttpMethod,
+            ReqMethod = requestAuditData.Method,
             ReqUrl = path,
             ResultJson = resultJson,
-            ClassName = loggingMonitor.DisplayName,
-            MethodName = loggingMonitor.ActionName,
+            ClassName = requestAuditData.ControllerName,
+            MethodName = requestAuditData.ActionName,
             ParamJson = paramJson,
             VerificatId = UserManager.VerificatId,
         };
         //如果异常不为空
-        if (loggingMonitor.Exception != null)
+        if (requestAuditData.Exception != null)
         {
             sysLogOperate.Category = LogCateGoryEnum.Exception;//操作类型为异常
             sysLogOperate.ExeStatus = false;//操作状态为失败
 
-            if (loggingMonitor.Exception.Type == typeof(AppFriendlyException).ToString())
-                sysLogOperate.ExeMessage = loggingMonitor?.Exception.Message;
+            if (requestAuditData.Exception.Type == typeof(AppFriendlyException).ToString())
+                sysLogOperate.ExeMessage = requestAuditData?.Exception.Message;
             else
-                sysLogOperate.ExeMessage = $"{loggingMonitor.Exception.Type}:{loggingMonitor.Exception.Message}{Environment.NewLine}{loggingMonitor.Exception.StackTrace}";
+                sysLogOperate.ExeMessage = $"{requestAuditData.Exception.Type}:{requestAuditData.Exception.Message}{Environment.NewLine}{requestAuditData.Exception.StackTrace}";
         }
 
         _operateLogMessageQueue.Enqueue(sysLogOperate);
@@ -158,17 +150,17 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
     /// </summary>
     /// <param name="operation">访问类型</param>
     /// <param name="path"></param>
-    /// <param name="loggingMonitor">loggingMonitor</param>
+    /// <param name="requestAuditData">requestAuditData</param>
     /// <param name="userAgent">客户端信息</param>
     /// <param name="flush"></param>
-    private async Task<bool> CreateVisitLog(string operation, string path, LoggingMonitorJson loggingMonitor, UserAgent userAgent, bool flush)
+    private async Task<bool> CreateVisitLog(string operation, string path, RequestAuditData requestAuditData, UserAgent userAgent, bool flush)
     {
         long verificatId = 0;//验证Id
         var opAccount = "";//用户账号
         if (path == "/api/auth/login")
         {
             //如果是登录，用户信息就从返回值里拿
-            var result = loggingMonitor.ReturnInformation?.Value?.ToSystemTextJsonString();//返回值转json
+            var result = requestAuditData.ReturnInformation?.ToSystemTextJsonString();//返回值转json
             var userInfo = result.FromJsonNetString<UnifyResult<LoginOutput>>();//格式化成user表
             opAccount = userInfo.Data.Account;//赋值账号
             verificatId = userInfo.Data.VerificatId;
@@ -176,8 +168,8 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
         else
         {
             //如果是登录出，用户信息就从AuthorizationClaims里拿
-            opAccount = loggingMonitor.AuthorizationClaims.Where(it => it.Type == ClaimConst.Account).Select(it => it.Value).FirstOrDefault();
-            verificatId = loggingMonitor.AuthorizationClaims.Where(it => it.Type == ClaimConst.VerificatId).Select(it => it.Value).FirstOrDefault().ToLong();
+            opAccount = requestAuditData.AuthorizationClaims.Where(it => it.Type == ClaimConst.Account).Select(it => it.Value).FirstOrDefault();
+            verificatId = requestAuditData.AuthorizationClaims.Where(it => it.Type == ClaimConst.VerificatId).Select(it => it.Value).FirstOrDefault().ToLong();
         }
         //日志表实体
         var sysLogVisit = new SysOperateLog
@@ -185,19 +177,19 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
             Name = operation,
             Category = path == "/api/auth/login" ? LogCateGoryEnum.Login : LogCateGoryEnum.Logout,
             ExeStatus = true,
-            OpIp = loggingMonitor.RemoteIPv4,
+            OpIp = requestAuditData.RemoteIPv4,
             OpBrowser = userAgent?.Browser,
             OpOs = userAgent?.Platform,
-            OpTime = loggingMonitor.LogDateTime.LocalDateTime,
+            OpTime = requestAuditData.LogDateTime.LocalDateTime,
             VerificatId = verificatId,
             OpAccount = opAccount,
 
-            ReqMethod = loggingMonitor.HttpMethod,
+            ReqMethod = requestAuditData.Method,
             ReqUrl = path,
-            ResultJson = loggingMonitor.ReturnInformation?.Value?.ToSystemTextJsonString(),
-            ClassName = loggingMonitor.DisplayName,
-            MethodName = loggingMonitor.ActionName,
-            ParamJson = loggingMonitor.Parameters?.ToSystemTextJsonString(),
+            ResultJson = requestAuditData.ReturnInformation?.ToSystemTextJsonString(),
+            ClassName = requestAuditData.ControllerName,
+            MethodName = requestAuditData.ActionName,
+            ParamJson = requestAuditData.Parameters?.ToSystemTextJsonString(),
         };
         _operateLogMessageQueue.Enqueue(sysLogVisit);
 

src/Admin/ThingsGateway.Admin.Application/Services/Event/EventService.cs

@@ -16,9 +16,9 @@ namespace ThingsGateway.Admin.Application;
 /// 内存推送事件服务
 /// </summary>
 /// <typeparam name="TEntry"></typeparam>
-public class EventService<TEntry> : IEventService<TEntry>
+public class EventService<TEntry> : IEventService<TEntry>, IDisposable
 {
-    private ConcurrentDictionary<string, Func<TEntry, Task>> Cache { get; } = new();
+    private ConcurrentDictionary<string, Func<TEntry, Task>> Cache = new();
 
     public void Dispose()
     {

src/Admin/ThingsGateway.Admin.Application/SqlSugar/DbContext.cs

@@ -80,7 +80,9 @@ public static class DbContext
     {
         db.CurrentConnectionConfig.MoreSettings = new ConnMoreSettings
         {
-            SqlServerCodeFirstNvarchar = true//设置默认nvarchar
+            SqlServerCodeFirstNvarchar = true, //设置默认nvarchar
+
+            IsNoReadXmlDescription = true
         };
     }
 

src/Admin/ThingsGateway.Admin.Application/ThingsGateway.Admin.Application.csproj

@@ -18,7 +18,7 @@
 	</ItemGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.4" />
+		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.5" />
 		<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
 		<PackageReference Include="SqlSugarCore" Version="5.1.4.193" />
 	</ItemGroup>

src/Admin/ThingsGateway.Admin.Razor/Context/BlazorAppContext.cs

@@ -97,7 +97,7 @@ public class BlazorAppContext
             AllResource = sysResources;
             var ids = CurrentUser.ModuleList.Select(a => a.Id).ToHashSet();
             CurrentUser.ModuleList = AllResource.Where(a => ids.Contains(a.Id)).OrderBy(a => a.SortCode).ToList();
-            AllMenus = sysResources.Where(a => a.Category == ResourceCategoryEnum.Menu);
+            AllMenus = AllResource.Where(a => a.Category == ResourceCategoryEnum.Menu);
 
             if (moduleId == null)
             {

src/Admin/ThingsGateway.AdminServer/Index/AdminIndex.razor.cs

@@ -18,8 +18,6 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 
-using System.Diagnostics.CodeAnalysis;
-
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Extension;

src/Admin/ThingsGateway.AdminServer/Program/Startup.cs

@@ -14,7 +14,6 @@ using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.HttpOverrides;
-using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
@@ -29,8 +28,8 @@ using System.Text.Unicode;
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Extension;
-using ThingsGateway.Logging;
 using ThingsGateway.NewLife.Caching;
+using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.AdminServer;
 
@@ -161,7 +160,8 @@ public class Startup : AppStartup
         {
             options.WriteFilter = (logMsg) =>
             {
-                return true;
+                if (logMsg.Message.IsNullOrEmpty()) return false;
+                else return true;
             };
 
             options.MessageFormat = (logMsg) =>
@@ -211,39 +211,40 @@ public class Startup : AppStartup
         #region api日志
 
         //Monitor日志配置
-        services.AddMonitorLogging(options =>
-        {
-            options.JsonIndented = true;// 是否美化 JSON
-            options.GlobalEnabled = false;//全局启用
-            options.ConfigureLogger((logger, logContext, context) =>
-            {
-                var httpContext = context.HttpContext;//获取httpContext
+        //services.AddMonitorLogging(options =>
+        //{
+        //    options.JsonIndented = true;// 是否美化 JSON
+        //    options.GlobalEnabled = false;//全局启用
+        //    options.ConfigureLogger((logger, logContext, context) =>
+        //    {
+        //        var httpContext = context.HttpContext;//获取httpContext
 
-                //获取客户端信息
-                var client = App.GetService<IAppService>().UserAgent;
-                // 获取控制器/操作描述器
-                var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
-                //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
-                var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
+        //        //获取客户端信息
+        //        var client = App.GetService<IAppService>().UserAgent;
+        //        // 获取控制器/操作描述器
+        //        var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
+        //        //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
+        //        var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
 
-                var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
-                //获取特性
-                option = desc.Value;//则将操作名称赋值为控制器上写的title
+        //        var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
+        //        //获取特性
+        //        option = desc.Value;//则将操作名称赋值为控制器上写的title
 
-                logContext.Set(LoggingConst.CateGory, option);//传操作名称
-                logContext.Set(LoggingConst.Operation, option);//传操作名称
-                logContext.Set(LoggingConst.Client, client);//客户端信息
-                logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
-                logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
-            });
-        });
+        //        logContext.Set(LoggingConst.CateGory, option);//传操作名称
+        //        logContext.Set(LoggingConst.Operation, option);//传操作名称
+        //        logContext.Set(LoggingConst.Client, client);//客户端信息
+        //        logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
+        //        logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
+        //    });
+        //});
+        services.AddMvcFilter<RequestAuditFilter>();
 
         //日志写入数据库配置
         services.AddDatabaseLogging<DatabaseLoggingWriter>(options =>
         {
             options.WriteFilter = (logMsg) =>
             {
-                return logMsg.LogName == "System.Logging.LoggingMonitor";//只写入LoggingMonitor日志
+                return logMsg.LogName == "System.Logging.RequestAudit";
             };
         });
 

src/Admin/ThingsGateway.Furion/Logging/Implantations/Database/DatabaseLogger.cs

@@ -20,7 +20,7 @@ namespace ThingsGateway.Logging;
 /// </summary>
 /// <remarks>https://docs.microsoft.com/zh-cn/dotnet/core/extensions/custom-logging-provider</remarks>
 [SuppressSniffer]
-public sealed class DatabaseLogger : ILogger
+public sealed class DatabaseLogger : ILogger, IDisposable
 {
     /// <summary>
     /// 记录器类别名称
@@ -60,6 +60,11 @@ public sealed class DatabaseLogger : ILogger
         return _databaseLoggerProvider.ScopeProvider?.Push(state);
     }
 
+    public void Dispose()
+    {
+        _databaseLoggerProvider.RemoveCache(_logName);
+    }
+
     /// <summary>
     /// 检查是否已启用给定日志级别
     /// </summary>

src/Admin/ThingsGateway.Furion/Logging/Implantations/Database/DatabaseLoggerProvider.cs

@@ -14,6 +14,8 @@ using Microsoft.Extensions.Logging;
 
 using System.Collections.Concurrent;
 
+using ThingsGateway.Extension.Generic;
+
 namespace ThingsGateway.Logging;
 
 /// <summary>
@@ -54,6 +56,8 @@ public sealed class DatabaseLoggerProvider : ILoggerProvider, ISupportExternalSc
     /// <remarks>实现不间断写入</remarks>
     private Task _processQueueTask;
 
+
+
     /// <summary>
     /// 构造函数
     /// </summary>
@@ -82,7 +86,10 @@ public sealed class DatabaseLoggerProvider : ILoggerProvider, ISupportExternalSc
     {
         return _databaseLoggers.GetOrAdd(categoryName, name => new DatabaseLogger(name, this));
     }
-
+    public void RemoveCache(string categoryName)
+    {
+        _databaseLoggers.Remove(categoryName);
+    }
     /// <summary>
     /// 设置作用域提供器
     /// </summary>

src/Admin/ThingsGateway.Furion/Logging/Implantations/Empty/EmptyLogger.cs

@@ -18,8 +18,17 @@ namespace ThingsGateway.Logging;
 /// </summary>
 /// <remarks>https://docs.microsoft.com/zh-cn/dotnet/core/extensions/custom-logging-provider</remarks>
 [SuppressSniffer]
-public sealed class EmptyLogger : ILogger
+public sealed class EmptyLogger : ILogger, IDisposable
 {
+    public EmptyLogger(string categoryName, EmptyLoggerProvider emptyLoggerProvider)
+    {
+        _logName = categoryName;
+        _emptyLoggerProvider = emptyLoggerProvider;
+    }
+
+    private string _logName { get; }
+    private EmptyLoggerProvider _emptyLoggerProvider { get; }
+
     /// <summary>
     /// 开始逻辑操作范围
     /// </summary>
@@ -31,6 +40,11 @@ public sealed class EmptyLogger : ILogger
         return default;
     }
 
+    public void Dispose()
+    {
+        _emptyLoggerProvider.RemoveCache(_logName);
+    }
+
     /// <summary>
     /// 检查是否已启用给定日志级别
     /// </summary>

src/Admin/ThingsGateway.Furion/Logging/Implantations/Empty/EmptyLoggerProvider.cs

@@ -13,6 +13,8 @@ using Microsoft.Extensions.Logging;
 
 using System.Collections.Concurrent;
 
+using ThingsGateway.Extension.Generic;
+
 namespace ThingsGateway.Logging;
 
 /// <summary>
@@ -34,9 +36,12 @@ public sealed class EmptyLoggerProvider : ILoggerProvider
     /// <returns><see cref="ILogger"/></returns>
     public ILogger CreateLogger(string categoryName)
     {
-        return _emptyLoggers.GetOrAdd(categoryName, name => new EmptyLogger());
+        return _emptyLoggers.GetOrAdd(categoryName, name => new EmptyLogger(categoryName, this));
+    }
+    public void RemoveCache(string categoryName)
+    {
+        _emptyLoggers.Remove(categoryName);
     }
-
     /// <summary>
     /// 释放非托管资源
     /// </summary>

src/Admin/ThingsGateway.Furion/Logging/Implantations/File/FileLogger.cs

@@ -18,7 +18,7 @@ namespace ThingsGateway.Logging;
 /// </summary>
 /// <remarks>https://docs.microsoft.com/zh-cn/dotnet/core/extensions/custom-logging-provider</remarks>
 [SuppressSniffer]
-public sealed class FileLogger : ILogger
+public sealed class FileLogger : ILogger, IDisposable
 {
     /// <summary>
     /// 记录器类别名称
@@ -58,6 +58,11 @@ public sealed class FileLogger : ILogger
         return _fileLoggerProvider.ScopeProvider?.Push(state);
     }
 
+    public void Dispose()
+    {
+        _fileLoggerProvider.RemoveCache(_logName);
+    }
+
     /// <summary>
     /// 检查是否已启用给定日志级别
     /// </summary>

src/Admin/ThingsGateway.Furion/Logging/Implantations/File/FileLoggerProvider.cs

@@ -13,6 +13,8 @@ using Microsoft.Extensions.Logging;
 
 using System.Collections.Concurrent;
 
+using ThingsGateway.Extension.Generic;
+
 namespace ThingsGateway.Logging;
 
 /// <summary>
@@ -116,6 +118,10 @@ public sealed class FileLoggerProvider : ILoggerProvider, ISupportExternalScope
     {
         return _fileLoggers.GetOrAdd(categoryName, name => new FileLogger(name, this));
     }
+    public void RemoveCache(string categoryName)
+    {
+        _fileLoggers.Remove(categoryName);
+    }
 
     /// <summary>
     /// 设置作用域提供器

src/Admin/ThingsGateway.Furion/Logging/Implantations/LogContext.cs

@@ -17,7 +17,6 @@ namespace ThingsGateway.Logging;
 [SuppressSniffer]
 public sealed class LogContext : IDisposable
 {
-
     /// <summary>
     /// 日志上下文数据
     /// </summary>

src/Admin/ThingsGateway.Furion/ThingsGateway.Furion.csproj

@@ -39,7 +39,7 @@
 		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 		<PackageReference Include="Mapster" Version="7.4.0" />
 		<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.5.4" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.2" />
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">

src/Admin/ThingsGateway.NewLife.X/Buffers/BufferSegment.cs

@@ -1,7 +1,4 @@
-using System.Buffers;
-using System.Runtime.CompilerServices;
-
-using ThingsGateway.NewLife.Collections;
+using System.Runtime.CompilerServices;
 
 namespace ThingsGateway.NewLife.Buffers;
 
@@ -83,7 +80,7 @@ internal sealed class BufferSegment : ReadOnlySequenceSegment<Byte>
         }
         else if (_array != null)
         {
-            Pool.Shared.Return(_array);
+            ArrayPool<Byte>.Shared.Return(_array);
             _array = null;
         }
         base.Memory = default;

src/Admin/ThingsGateway.NewLife.X/Buffers/PooledByteBufferWriter.cs

@@ -1,9 +1,4 @@
-using System.Buffers;
-
-using ThingsGateway.NewLife.Collections;
-
-
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if NETFRAMEWORK || NETSTANDARD2_0
 using ValueTask = System.Threading.Tasks.Task;
 #endif
 
@@ -28,7 +23,7 @@ public sealed class PooledByteBufferWriter : IBufferWriter<Byte>, IDisposable
     /// <param name="initialCapacity"></param>
     public PooledByteBufferWriter(Int32 initialCapacity)
     {
-        _rentedBuffer = Pool.Shared.Rent(initialCapacity);
+        _rentedBuffer = ArrayPool<Byte>.Shared.Rent(initialCapacity);
         _index = 0;
     }
 
@@ -45,7 +40,7 @@ public sealed class PooledByteBufferWriter : IBufferWriter<Byte>, IDisposable
     /// <param name="initialCapacity"></param>
     public void InitializeEmptyInstance(Int32 initialCapacity)
     {
-        _rentedBuffer = Pool.Shared.Rent(initialCapacity);
+        _rentedBuffer = ArrayPool<Byte>.Shared.Rent(initialCapacity);
         _index = 0;
     }
 
@@ -63,7 +58,7 @@ public sealed class PooledByteBufferWriter : IBufferWriter<Byte>, IDisposable
 
         var rentedBuffer = _rentedBuffer;
         _rentedBuffer = null!;
-        Pool.Shared.Return(rentedBuffer);
+        ArrayPool<Byte>.Shared.Return(rentedBuffer);
     }
 
     /// <summary>通知 IBufferWriter，已向输出写入 count 数据项。</summary>
@@ -119,11 +114,11 @@ public sealed class PooledByteBufferWriter : IBufferWriter<Byte>, IDisposable
             }
         }
         var rentedBuffer = _rentedBuffer;
-        _rentedBuffer = Pool.Shared.Rent(num4);
+        _rentedBuffer = ArrayPool<Byte>.Shared.Rent(num4);
         var span = rentedBuffer.AsSpan(0, _index);
         span.CopyTo(_rentedBuffer);
         span.Clear();
-        Pool.Shared.Return(rentedBuffer);
+        ArrayPool<Byte>.Shared.Return(rentedBuffer);
     }
     #endregion
 }

src/Admin/ThingsGateway.NewLife.X/Buffers/SpanHelper.cs

@@ -241,7 +241,7 @@ public static class SpanHelper
             return;
         }
 
-        var array = Pool.Shared.Rent(buffer.Length);
+        var array = ArrayPool<Byte>.Shared.Rent(buffer.Length);
 
         try
         {
@@ -251,7 +251,7 @@ public static class SpanHelper
         }
         finally
         {
-            Pool.Shared.Return(array);
+            ArrayPool<Byte>.Shared.Return(array);
         }
     }
 
@@ -265,7 +265,7 @@ public static class SpanHelper
         if (MemoryMarshal.TryGetArray(buffer, out var segment))
             return stream.WriteAsync(segment.Array!, segment.Offset, segment.Count, cancellationToken);
 
-        var array = Pool.Shared.Rent(buffer.Length);
+        var array = ArrayPool<Byte>.Shared.Rent(buffer.Length);
         buffer.Span.CopyTo(array);
 
         var writeTask = stream.WriteAsync(array, 0, buffer.Length, cancellationToken);
@@ -277,7 +277,7 @@ public static class SpanHelper
             }
             finally
             {
-                Pool.Shared.Return(array);
+                ArrayPool<Byte>.Shared.Return(array);
             }
         }, cancellationToken);
     }

src/Admin/ThingsGateway.NewLife.X/Collections/IPool.cs

@@ -1,5 +1,4 @@
-using System.Buffers;
-using System.Text;
+using System.Text;
 
 namespace ThingsGateway.NewLife.Collections;
 
@@ -95,7 +94,7 @@ public static class Pool
     {
         //if (ms == null) return null;
 
-        var buf = returnResult ? ms.ToArray() : Empty;
+        var buf = returnResult ? ms.ToArray() : Array.Empty<byte>();
 
         Pool.MemoryStream.Return(ms);
 
@@ -133,11 +132,5 @@ public static class Pool
     }
     #endregion
 
-    #region ByteArray
-    /// <summary>字节数组共享存储</summary>
-    public static ArrayPool<Byte> Shared { get; set; } = ArrayPool<Byte>.Shared;
 
-    /// <summary>空数组</summary>
-    public static Byte[] Empty { get; } = [];
-    #endregion
 }

src/Admin/ThingsGateway.NewLife.X/Common/ConvertUtility.cs

@@ -2,8 +2,6 @@
 using System.Globalization;
 using System.Reflection;
 
-using ThingsGateway.NewLife.Collections;
-
 namespace ThingsGateway.NewLife.Extension;
 
 /// <summary>工具类</summary>
@@ -452,12 +450,12 @@ public class DefaultConvert
                     // 凑够8字节
                     if (buf.Length < 8)
                     {
-                        var bts = Pool.Shared.Rent(8);
+                        var bts = ArrayPool<Byte>.Shared.Rent(8);
                         Buffer.BlockCopy(buf, 0, bts, 0, buf.Length);
 
                         var dec = BitConverter.ToDouble(bts, 0).ToDecimal();
 
-                        Pool.Shared.Return(bts);
+                        ArrayPool<Byte>.Shared.Return(bts);
 
                         return dec;
                     }

src/Admin/ThingsGateway.NewLife.X/GlobalUsings.cs

@@ -8,4 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+global using System.Buffers;
+
 global using ThingsGateway.NewLife.Extension;

src/Admin/ThingsGateway.NewLife.X/Net/NetHelper.cs

@@ -5,7 +5,6 @@ using System.Net.Sockets;
 using System.Runtime.InteropServices;
 
 using ThingsGateway.NewLife.Caching;
-using ThingsGateway.NewLife.Collections;
 using ThingsGateway.NewLife.Net;
 
 namespace ThingsGateway.NewLife;
@@ -52,7 +51,7 @@ public static class NetHelper
 #endif
         {
             UInt32 dummy = 0;
-            var inOptionValues = Pool.Shared.Rent(Marshal.SizeOf(dummy) * 3);
+            var inOptionValues = ArrayPool<Byte>.Shared.Rent(Marshal.SizeOf(dummy) * 3);
 
             // 是否启用Keep-Alive
             BitConverter.GetBytes((UInt32)(isKeepAlive ? 1 : 0)).CopyTo(inOptionValues, 0);
@@ -63,7 +62,7 @@ public static class NetHelper
 
             socket.IOControl(IOControlCode.KeepAliveValues, inOptionValues, null);
 
-            Pool.Shared.Return(inOptionValues);
+            ArrayPool<Byte>.Shared.Return(inOptionValues);
 
             return;
         }
@@ -538,11 +537,11 @@ public static class NetHelper
     private static void Wake(String mac)
     {
         mac = mac.Replace("-", null).Replace(":", null);
-        var buffer = Pool.Shared.Rent(mac.Length / 2);
+        var buffer = ArrayPool<Byte>.Shared.Rent(mac.Length / 2);
         for (var i = 0; i < buffer.Length; i++)
             buffer[i] = Byte.Parse(mac.Substring(i * 2, 2), NumberStyles.HexNumber);
 
-        var bts = Pool.Shared.Rent(6 + 16 * buffer.Length);
+        var bts = ArrayPool<Byte>.Shared.Rent(6 + 16 * buffer.Length);
         for (var i = 0; i < 6; i++)
             bts[i] = 0xFF;
         for (Int32 i = 6, k = 0; i < bts.Length; i++, k++)
@@ -560,8 +559,8 @@ public static class NetHelper
         client.Close();
         //client.SendAsync(bts, bts.Length, new IPEndPoint(IPAddress.Broadcast, 7));
 
-        Pool.Shared.Return(bts);
-        Pool.Shared.Return(buffer);
+        ArrayPool<Byte>.Shared.Return(bts);
+        ArrayPool<Byte>.Shared.Return(buffer);
     }
     #endregion
 

src/Admin/ThingsGateway.NewLife.X/Serialization/Binary/Binary.cs

@@ -1,7 +1,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-using ThingsGateway.NewLife.Collections;
 using ThingsGateway.NewLife.Reflection;
 
 namespace ThingsGateway.NewLife.Serialization;
@@ -156,7 +155,7 @@ public class Binary : FormatterBase, IBinary
 #if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
         Stream.Write(buffer);
 #else
-        var array = Pool.Shared.Rent(buffer.Length);
+        var array = ArrayPool<Byte>.Shared.Rent(buffer.Length);
         try
         {
             buffer.CopyTo(array);
@@ -165,7 +164,7 @@ public class Binary : FormatterBase, IBinary
         }
         finally
         {
-            Pool.Shared.Return(array);
+            ArrayPool<Byte>.Shared.Return(array);
         }
 #endif
     }
@@ -494,7 +493,7 @@ public class Binary : FormatterBase, IBinary
     /// <param name="max"></param>
     public void WriteBCD(String value, Int32 max)
     {
-        var buf = Pool.Shared.Rent(max);
+        var buf = ArrayPool<Byte>.Shared.Rent(max);
         for (Int32 i = 0, j = 0; i < max && j + 1 < value.Length; i++, j += 2)
         {
             var a = (Byte)(value[j] - '0');
@@ -503,7 +502,7 @@ public class Binary : FormatterBase, IBinary
         }
 
         Write(buf, 0, max);
-        Pool.Shared.Return(buf);
+        ArrayPool<Byte>.Shared.Return(buf);
     }
 
     /// <summary>写入定长字符串。多余截取，少则补零</summary>
@@ -511,11 +510,11 @@ public class Binary : FormatterBase, IBinary
     /// <param name="max"></param>
     public void WriteFixedString(String? value, Int32 max)
     {
-        var buf = Pool.Shared.Rent(max);
+        var buf = ArrayPool<Byte>.Shared.Rent(max);
         if (!value.IsNullOrEmpty()) Encoding.GetBytes(value, 0, value.Length, buf, 0);
 
         Write(buf, 0, max);
-        Pool.Shared.Return(buf);
+        ArrayPool<Byte>.Shared.Return(buf);
     }
 
     /// <summary>读取定长字符串。多余截取，少则补零</summary>

src/Admin/ThingsGateway.NewLife.X/Serialization/Xml/XmlGeneral.cs

@@ -1,7 +1,6 @@
 using System.Globalization;
 using System.Xml;
 
-using ThingsGateway.NewLife.Collections;
 using ThingsGateway.NewLife.Reflection;
 
 namespace ThingsGateway.NewLife.Serialization;
@@ -144,10 +143,10 @@ public class XmlGeneral : XmlHandlerBase
         else if (type == typeof(Byte[]))
         {
             // 用字符串长度作为预设缓冲区的长度
-            var buf = Pool.Shared.Rent(reader.Value.Length);
+            var buf = ArrayPool<Byte>.Shared.Rent(reader.Value.Length);
             var count = reader.ReadContentAsBase64(buf, 0, buf.Length);
             value = buf.ReadBytes(0, count);
-            Pool.Shared.Return(buf);
+            ArrayPool<Byte>.Shared.Return(buf);
 
             return true;
         }

src/Admin/ThingsGateway.Razor/Extensions/ParallelExtensions.cs

@@ -24,9 +24,8 @@ public static class ParallelExtensions
     /// <param name="body">要执行的操作</param>
     public static void ParallelForEach<T>(this IEnumerable<T> source, Action<T> body)
     {
-        // 创建并行操作的选项对象，设置最大并行度为当前处理器数量的一半
         ParallelOptions options = new();
-        options.MaxDegreeOfParallelism = Environment.ProcessorCount / 2 == 0 ? 1 : Environment.ProcessorCount / 2;
+        options.MaxDegreeOfParallelism = Environment.ProcessorCount;
         // 使用 Parallel.ForEach 执行指定的操作
         Parallel.ForEach(source, options, (variable) =>
         {
@@ -42,9 +41,8 @@ public static class ParallelExtensions
     /// <param name="body">要执行的操作</param>
     public static void ParallelForEach<T>(this IEnumerable<T> source, Action<T, ParallelLoopState, long> body)
     {
-        // 创建并行操作的选项对象，设置最大并行度为当前处理器数量的一半
         ParallelOptions options = new();
-        options.MaxDegreeOfParallelism = Environment.ProcessorCount / 2 == 0 ? 1 : Environment.ProcessorCount / 2;
+        options.MaxDegreeOfParallelism = Environment.ProcessorCount;
         // 使用 Parallel.ForEach 执行指定的操作
         Parallel.ForEach(source, options, (variable, state, index) =>
         {

src/Admin/ThingsGateway.Razor/ThingsGateway.Razor.csproj

@@ -7,7 +7,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.0.2" />
-		<PackageReference Include="BootstrapBlazor" Version="9.6.3" />
+		<PackageReference Include="BootstrapBlazor" Version="9.6.4" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
 	</ItemGroup>
 

src/Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.6.15</PluginVersion>
-		<ProPluginVersion>10.6.15</ProPluginVersion>
+		<PluginVersion>10.6.21</PluginVersion>
+		<ProPluginVersion>10.6.21</ProPluginVersion>
 		<AuthenticationVersion>2.1.7</AuthenticationVersion>
 	</PropertyGroup>
 

src/Foundation/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj

@@ -10,8 +10,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.5" />
-		<PackageReference Include="TouchSocket" Version="3.1.4" />
-		<PackageReference Include="TouchSocket.SerialPorts" Version="3.1.4" />
+		<PackageReference Include="TouchSocket" Version="3.1.5" />
+		<PackageReference Include="TouchSocket.SerialPorts" Version="3.1.5" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Gateway/ThingsGateway.Gateway.Application/Controller/ControlController.cs

@@ -35,12 +35,14 @@ namespace ThingsGateway.Gateway.Application;
 [ApiDescriptionSettings("ThingsGateway.OpenApi", Order = 200)]
 [Route("openApi/control")]
 [RolePermission]
-[LoggingMonitor]
+[RequestAudit]
 [ApiController]
 [Authorize(AuthenticationSchemes = "Bearer")]
 public class ControlController : ControllerBase
 {
 
+
+
     /// <summary>
     /// 清空全部缓存
     /// </summary>
@@ -175,8 +177,50 @@ public class ControlController : ControllerBase
         return GlobalData.VariableRuntimeService.BatchSaveVariableAsync(variables.Adapt<List<Variable>>(), type, restart, default);
     }
 
+    /// <summary>
+    /// 删除通道
+    /// </summary>
+    [HttpPost("deleteChannel")]
+    [DisplayName("删除通道")]
+    public Task<bool> DeleteChannelAsync([FromBody] List<long> ids, bool restart)
+    {
+        if (ids == null || ids.Count == 0) ids = GlobalData.Channels.Keys.ToList();
+        return GlobalData.ChannelRuntimeService.DeleteChannelAsync(ids, restart, default);
+    }
 
 
+    /// <summary>
+    /// 删除设备
+    /// </summary>
+    [HttpPost("deleteDevice")]
+    [DisplayName("删除设备")]
+    public Task<bool> DeleteDeviceAsync([FromBody] List<long> ids, bool restart)
+    {
+        if (ids == null || ids.Count == 0) ids = GlobalData.IdDevices.Keys.ToList();
+        return GlobalData.DeviceRuntimeService.DeleteDeviceAsync(ids, restart, default);
+    }
+
+    /// <summary>
+    /// 删除变量
+    /// </summary>
+    [HttpPost("deleteVariable")]
+    [DisplayName("删除变量")]
+    public Task<bool> DeleteVariableAsync([FromBody] List<long> ids, bool restart)
+    {
+        if (ids == null || ids.Count == 0) ids = GlobalData.IdVariables.Keys.ToList();
+        return GlobalData.VariableRuntimeService.DeleteVariableAsync(ids, restart, default);
+    }
+
+
+    /// <summary>
+    /// 增加测试数据
+    /// </summary>
+    [HttpPost("insertTestData")]
+    [DisplayName("增加测试数据")]
+    public Task InsertTestDataAsync(int testVariableCount, int testDeviceCount, string slaveUrl, bool businessEnable, bool restart)
+    {
+        return GlobalData.VariableRuntimeService.InsertTestDataAsync(testVariableCount, testDeviceCount, slaveUrl, businessEnable, restart, default);
+    }
 }
 public class ChannelInput
 {

src/Gateway/ThingsGateway.Gateway.Application/Driver/DriverBase.cs

@@ -326,11 +326,14 @@ public abstract class DriverBase : DisposableObject, IDriver
 
     protected override void Dispose(bool disposing)
     {
+        TextLogger?.Dispose();
+        _logger?.TryDispose();
         IdVariableRuntimes?.Clear();
         IdVariableRuntimes = null;
         var device = CurrentDevice;
         if (device != null)
             device.Driver = null;
+
         LogMessage?.Logs?.ForEach(a => a.TryDispose());
         LogMessage = null;
         pluginPropertyEditorItems?.Clear();

src/Gateway/ThingsGateway.Gateway.Application/GlobalData/ThreadSafeDictionary.cs

@@ -0,0 +1,464 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using System.Collections;
+
+namespace ThingsGateway.Gateway.Application;
+
+public class ThreadSafeStringDictionary<T> : IDictionary<string, T>, IReadOnlyDictionary<string, T>
+{
+    private const int DEFAULT_PARTITIONS = 128;
+    private readonly Dictionary<string, T>[] _partitions;
+    private readonly object[] _partitionLocks;
+    private readonly IEqualityComparer<string> _comparer;
+
+    public ThreadSafeStringDictionary() : this(DEFAULT_PARTITIONS, null) { }
+
+    public ThreadSafeStringDictionary(int partitionCount, IEqualityComparer<string> comparer)
+    {
+        if (partitionCount < 1)
+            throw new ArgumentOutOfRangeException(nameof(partitionCount));
+
+        _partitions = new Dictionary<string, T>[partitionCount];
+        _partitionLocks = new object[partitionCount];
+        _comparer = comparer ?? StringComparer.Ordinal;
+
+        for (int i = 0; i < partitionCount; i++)
+        {
+            _partitions[i] = new Dictionary<string, T>(_comparer);
+            _partitionLocks[i] = new object();
+        }
+    }
+
+    private int GetPartitionIndex(string key)
+    {
+        if (key == null) throw new ArgumentNullException(nameof(key));
+        return Math.Abs(_comparer.GetHashCode(key)) % _partitions.Length;
+    }
+
+    // 基本操作
+    public T this[string key]
+    {
+        get
+        {
+            int index = GetPartitionIndex(key);
+            lock (_partitionLocks[index])
+            {
+                return _partitions[index][key];
+            }
+        }
+        set
+        {
+            int index = GetPartitionIndex(key);
+            lock (_partitionLocks[index])
+            {
+                _partitions[index][key] = value;
+            }
+        }
+    }
+
+    public ICollection<string> Keys => GetAllItems().Select(kv => kv.Key).ToList();
+    public ICollection<T> Values => GetAllItems().Select(kv => kv.Value).ToList();
+
+    public int Count
+    {
+        get
+        {
+            int count = 0;
+            for (int i = 0; i < _partitions.Length; i++)
+            {
+                lock (_partitionLocks[i])
+                {
+                    count += _partitions[i].Count;
+                }
+            }
+            return count;
+        }
+    }
+
+    public bool IsReadOnly => false;
+
+    IEnumerable<string> IReadOnlyDictionary<string, T>.Keys => Keys;
+
+    IEnumerable<T> IReadOnlyDictionary<string, T>.Values => Values;
+
+    public void Add(string key, T value)
+    {
+        int index = GetPartitionIndex(key);
+        lock (_partitionLocks[index])
+        {
+            _partitions[index].Add(key, value);
+        }
+    }
+
+    public void Add(KeyValuePair<string, T> item) => Add(item.Key, item.Value);
+
+    public void Clear()
+    {
+        for (int i = 0; i < _partitions.Length; i++)
+        {
+            lock (_partitionLocks[i])
+            {
+                _partitions[i].Clear();
+            }
+        }
+    }
+
+    public bool Contains(KeyValuePair<string, T> item)
+    {
+        int index = GetPartitionIndex(item.Key);
+        lock (_partitionLocks[index])
+        {
+            return _partitions[index].TryGetValue(item.Key, out var value) &&
+                   EqualityComparer<T>.Default.Equals(value, item.Value);
+        }
+    }
+
+    public bool ContainsKey(string key)
+    {
+        int index = GetPartitionIndex(key);
+        lock (_partitionLocks[index])
+        {
+            return _partitions[index].ContainsKey(key);
+        }
+    }
+
+    public bool Remove(string key)
+    {
+        int index = GetPartitionIndex(key);
+        lock (_partitionLocks[index])
+        {
+            return _partitions[index].Remove(key);
+        }
+    }
+
+    public bool Remove(KeyValuePair<string, T> item)
+    {
+        int index = GetPartitionIndex(item.Key);
+        lock (_partitionLocks[index])
+        {
+            if (_partitions[index].TryGetValue(item.Key, out var value) &&
+                EqualityComparer<T>.Default.Equals(value, item.Value))
+            {
+                return _partitions[index].Remove(item.Key);
+            }
+            return false;
+        }
+    }
+
+    public bool TryGetValue(string key, out T value)
+    {
+        int index = GetPartitionIndex(key);
+        lock (_partitionLocks[index])
+        {
+            return _partitions[index].TryGetValue(key, out value);
+        }
+    }
+
+    public void CopyTo(KeyValuePair<string, T>[] array, int arrayIndex)
+    {
+        if (array == null) throw new ArgumentNullException(nameof(array));
+        if (arrayIndex < 0) throw new ArgumentOutOfRangeException(nameof(arrayIndex));
+        if (array.Length - arrayIndex < Count) throw new ArgumentException("Target array too small");
+
+        foreach (var item in GetAllItems())
+        {
+            array[arrayIndex++] = item;
+        }
+    }
+
+    // 枚举器实现
+    public IEnumerator<KeyValuePair<string, T>> GetEnumerator()
+    {
+        return GetAllItems().GetEnumerator();
+    }
+
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+    public void AddRange(IEnumerable<KeyValuePair<string, T>> items)
+    {
+        var grouped = items.GroupBy(item => GetPartitionIndex(item.Key));
+
+        foreach (var group in grouped)
+        {
+            lock (_partitionLocks[group.Key])
+            {
+                foreach (var item in group)
+                {
+                    _partitions[group.Key][item.Key] = item.Value;
+                }
+            }
+        }
+    }
+
+    public Dictionary<string, T> GetSnapshot()
+    {
+        var snapshot = new Dictionary<string, T>(_comparer);
+
+        for (int i = 0; i < _partitions.Length; i++)
+        {
+            lock (_partitionLocks[i])
+            {
+                foreach (var kvp in _partitions[i])
+                {
+                    snapshot[kvp.Key] = kvp.Value;
+                }
+            }
+        }
+
+        return snapshot;
+    }
+
+    private IEnumerable<KeyValuePair<string, T>> GetAllItems()
+    {
+        for (int i = 0; i < _partitions.Length; i++)
+        {
+            lock (_partitionLocks[i])
+            {
+                foreach (var item in _partitions[i]) // 直接枚举原字典
+                {
+                    yield return item;
+                }
+            }
+        }
+    }
+}
+
+public class ThreadSafeLongDictionary<T> : IDictionary<long, T>, IReadOnlyDictionary<long, T>
+{
+    private const int DEFAULT_PARTITIONS = 128;
+    private readonly Dictionary<long, T>[] _partitions;
+    private readonly object[] _partitionLocks;
+
+    public ThreadSafeLongDictionary() : this(DEFAULT_PARTITIONS) { }
+
+    public ThreadSafeLongDictionary(int partitionCount)
+    {
+        if (partitionCount < 1)
+            throw new ArgumentOutOfRangeException(nameof(partitionCount));
+
+        _partitions = new Dictionary<long, T>[partitionCount];
+        _partitionLocks = new object[partitionCount];
+
+        for (int i = 0; i < partitionCount; i++)
+        {
+            _partitions[i] = new Dictionary<long, T>();
+            _partitionLocks[i] = new object();
+        }
+    }
+
+    private int GetPartitionIndex(long key)
+    {
+        // 使用混合哈希算法减少碰撞
+        uint hash = (uint)key;
+        hash = ((hash >> 16) ^ hash) * 0x45d9f3b;
+        hash = ((hash >> 16) ^ hash) * 0x45d9f3b;
+        hash = (hash >> 16) ^ hash;
+        return (int)(hash % _partitions.Length);
+    }
+
+    public T this[long key]
+    {
+        get
+        {
+            int index = GetPartitionIndex(key);
+            lock (_partitionLocks[index])
+            {
+                return _partitions[index][key];
+            }
+        }
+        set
+        {
+            int index = GetPartitionIndex(key);
+            lock (_partitionLocks[index])
+            {
+                _partitions[index][key] = value;
+            }
+        }
+    }
+
+    public ICollection<long> Keys => GetAllItems().Select(kv => kv.Key).ToList();
+    public ICollection<T> Values => GetAllItems().Select(kv => kv.Value).ToList();
+
+    public int Count
+    {
+        get
+        {
+            int count = 0;
+            for (int i = 0; i < _partitions.Length; i++)
+            {
+                lock (_partitionLocks[i])
+                {
+                    count += _partitions[i].Count;
+                }
+            }
+            return count;
+        }
+    }
+
+    public bool IsReadOnly => false;
+
+    IEnumerable<long> IReadOnlyDictionary<long, T>.Keys => Keys;
+
+    IEnumerable<T> IReadOnlyDictionary<long, T>.Values => Values;
+
+    public void Add(long key, T value)
+    {
+        int index = GetPartitionIndex(key);
+        lock (_partitionLocks[index])
+        {
+            _partitions[index].Add(key, value);
+        }
+    }
+
+    public void Add(KeyValuePair<long, T> item) => Add(item.Key, item.Value);
+
+    public void Clear()
+    {
+        for (int i = 0; i < _partitions.Length; i++)
+        {
+            lock (_partitionLocks[i])
+            {
+                _partitions[i].Clear();
+            }
+        }
+    }
+
+    public bool Contains(KeyValuePair<long, T> item)
+    {
+        int index = GetPartitionIndex(item.Key);
+        lock (_partitionLocks[index])
+        {
+            return _partitions[index].TryGetValue(item.Key, out var value) &&
+                   EqualityComparer<T>.Default.Equals(value, item.Value);
+        }
+    }
+
+    public bool ContainsKey(long key)
+    {
+        int index = GetPartitionIndex(key);
+        lock (_partitionLocks[index])
+        {
+            return _partitions[index].ContainsKey(key);
+        }
+    }
+
+    public bool Remove(long key)
+    {
+        int index = GetPartitionIndex(key);
+        lock (_partitionLocks[index])
+        {
+            return _partitions[index].Remove(key);
+        }
+    }
+
+    public bool Remove(KeyValuePair<long, T> item)
+    {
+        int index = GetPartitionIndex(item.Key);
+        lock (_partitionLocks[index])
+        {
+            if (_partitions[index].TryGetValue(item.Key, out var value) &&
+                EqualityComparer<T>.Default.Equals(value, item.Value))
+            {
+                return _partitions[index].Remove(item.Key);
+            }
+            return false;
+        }
+    }
+
+    public bool TryGetValue(long key, out T value)
+    {
+        int index = GetPartitionIndex(key);
+        lock (_partitionLocks[index])
+        {
+            return _partitions[index].TryGetValue(key, out value);
+        }
+    }
+
+    public void CopyTo(KeyValuePair<long, T>[] array, int arrayIndex)
+    {
+        if (array == null) throw new ArgumentNullException(nameof(array));
+        if (arrayIndex < 0) throw new ArgumentOutOfRangeException(nameof(arrayIndex));
+        if (array.Length - arrayIndex < Count) throw new ArgumentException("Target array too small");
+
+        foreach (var item in GetAllItems())
+        {
+            array[arrayIndex++] = item;
+        }
+    }
+
+    public IEnumerator<KeyValuePair<long, T>> GetEnumerator()
+    {
+        return GetAllItems().GetEnumerator();
+    }
+
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+    public void AddRange(IEnumerable<KeyValuePair<long, T>> items)
+    {
+        var grouped = items.GroupBy(item => GetPartitionIndex(item.Key));
+
+        foreach (var group in grouped)
+        {
+            lock (_partitionLocks[group.Key])
+            {
+                foreach (var item in group)
+                {
+                    _partitions[group.Key][item.Key] = item.Value;
+                }
+            }
+        }
+    }
+
+    public Dictionary<long, T> GetSnapshot()
+    {
+        var snapshot = new Dictionary<long, T>();
+
+        for (int i = 0; i < _partitions.Length; i++)
+        {
+            lock (_partitionLocks[i])
+            {
+                foreach (var kvp in _partitions[i])
+                {
+                    snapshot[kvp.Key] = kvp.Value;
+                }
+            }
+        }
+
+        return snapshot;
+    }
+
+    private IEnumerable<KeyValuePair<long, T>> GetAllItems()
+    {
+        for (int i = 0; i < _partitions.Length; i++)
+        {
+            lock (_partitionLocks[i])
+            {
+                foreach (var item in _partitions[i])
+                {
+                    yield return item;
+                }
+            }
+        }
+    }
+
+    public string GetPartitionStats()
+    {
+        var stats = new System.Text.StringBuilder();
+        for (int i = 0; i < _partitions.Length; i++)
+        {
+            lock (_partitionLocks[i])
+            {
+                stats.AppendLine($"Partition {i}: {_partitions[i].Count} items");
+            }
+        }
+        return stats.ToString();
+    }
+}

src/Gateway/ThingsGateway.Gateway.Application/Locales/en-US.json

@@ -80,7 +80,14 @@
     "WriteVariablesAsync": "Write variables",
     "RemoveAllCache": "Remove all cache",
     "RemoveCache": "Remove device/channel Cache",
-    "RestartAllThread": "Restart all thread"
+    "RestartAllThread": "Restart all thread",
+    "BatchSaveChannelAsync": "BatchSaveChannel",
+    "BatchSaveDeviceAsync": "BatchSaveDevice",
+    "BatchSaveVariableAsync": "BatchSaveVariable",
+    "DeleteChannelAsync": "DeleteChannel",
+    "DeleteDeviceAsync": "DeleteDevice",
+    "DeleteVariableAsync": "DeleteVariable",
+    "InsertTestDataAsync": "InsertTestData"
   },
   "ThingsGateway.Gateway.Application.RuntimeInfoController": {
     "RuntimeInfoController": "Get runtime information",

src/Gateway/ThingsGateway.Gateway.Application/Locales/zh-CN.json

@@ -78,7 +78,14 @@
     "PauseDeviceThreadAsync": "控制设备线程启停",
     "RestartAllThread": "重启全部线程",
     "RestartDeviceThreadAsync": "重启设备线程",
-    "WriteVariablesAsync": "写入变量"
+    "WriteVariablesAsync": "写入变量",
+    "BatchSaveChannelAsync": "保存通道",
+    "BatchSaveDeviceAsync": "保存设备",
+    "BatchSaveVariableAsync": "保存变量",
+    "DeleteChannelAsync": "删除通道",
+    "DeleteDeviceAsync": "删除设备",
+    "DeleteVariableAsync": "删除变量",
+    "InsertTestDataAsync": "增加测试数据"
   },
   "ThingsGateway.Gateway.Application.RuntimeInfoController": {
     "RuntimeInfoController": "获取运行态信息",

src/Gateway/ThingsGateway.Gateway.Application/Model/VariableRunTime.cs

@@ -17,6 +17,7 @@ using Newtonsoft.Json.Linq;
 using SqlSugar;
 
 using ThingsGateway.Gateway.Application.Extensions;
+using ThingsGateway.NewLife.Extension;
 using ThingsGateway.NewLife.Json.Extension;
 
 namespace ThingsGateway.Gateway.Application;
@@ -34,10 +35,6 @@ public class VariableRuntime : Variable, IVariable, IDisposable
     private bool? _isOnlineChanged;
     protected object? _value;
 
-    public VariableRuntime()
-    {
-
-    }
     /// <summary>
     /// 变化时间
     /// </summary>
@@ -343,7 +340,7 @@ public class VariableRuntime : Variable, IVariable, IDisposable
     public void Init(DeviceRuntime deviceRuntime)
     {
 
-        GlobalData.AlarmEnableIdVariables.TryRemove(Id, out _);
+        GlobalData.AlarmEnableIdVariables.Remove(Id);
         if (GlobalData.RealAlarmIdVariables.TryRemove(Id, out var oldAlarm))
         {
             oldAlarm.EventType = EventTypeEnum.Finish;
@@ -352,12 +349,12 @@ public class VariableRuntime : Variable, IVariable, IDisposable
         }
 
 
-        DeviceRuntime?.VariableRuntimes?.TryRemove(Name, out _);
+        DeviceRuntime?.VariableRuntimes?.Remove(Name);
 
         DeviceRuntime = deviceRuntime;
 
         DeviceRuntime?.VariableRuntimes?.TryAdd(Name, this);
-        GlobalData.IdVariables.TryRemove(Id, out _);
+        GlobalData.IdVariables.Remove(Id);
         GlobalData.IdVariables.TryAdd(Id, this);
         if (AlarmEnable)
         {
@@ -369,11 +366,11 @@ public class VariableRuntime : Variable, IVariable, IDisposable
     public void Dispose()
     {
 
-        DeviceRuntime?.VariableRuntimes?.TryRemove(Name, out _);
+        DeviceRuntime?.VariableRuntimes?.Remove(Name);
 
-        GlobalData.IdVariables.TryRemove(Id, out _);
+        GlobalData.IdVariables.Remove(Id);
 
-        GlobalData.AlarmEnableIdVariables.TryRemove(Id, out _);
+        GlobalData.AlarmEnableIdVariables.Remove(Id);
         if (GlobalData.RealAlarmIdVariables.TryRemove(Id, out var oldAlarm))
         {
             oldAlarm.EventType = EventTypeEnum.Finish;

src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/DeviceManage/DeviceThreadManage.cs

@@ -96,6 +96,7 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
     }
 
     #endregion 动态配置
+    Microsoft.Extensions.Logging.ILogger? _logger;
 
     /// <summary>
     /// 通道线程构造函数，用于初始化通道线程实例。
@@ -113,9 +114,9 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
         // 设置通道信息
         CurrentChannel = channelRuntime;
 
-        var logger = App.RootServices.GetService<Microsoft.Extensions.Logging.ILoggerFactory>().CreateLogger($"DeviceThreadManage[{channelRuntime.Name}]");
+        _logger = App.RootServices.GetService<Microsoft.Extensions.Logging.ILoggerFactory>().CreateLogger($"DeviceThreadManage[{channelRuntime.Name}]");
         // 添加默认日志记录器
-        LogMessage.AddLogger(new EasyLogger(logger.Log_Out) { LogLevel = TouchSocket.Core.LogLevel.Trace });
+        LogMessage.AddLogger(new EasyLogger(_logger.Log_Out) { LogLevel = TouchSocket.Core.LogLevel.Trace });
 
         // 根据配置获取通道实例
         Channel = channelRuntime.GetChannel(config);
@@ -898,7 +899,7 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
         try
         {
             await NewDeviceLock.WaitAsync().ConfigureAwait(false);
-
+            _logger?.TryDispose();
             await PrivateRemoveDevicesAsync(Drivers.Keys).ConfigureAwait(false);
             if (Channel?.Collects.Count == 0)
                 Channel?.SafeDispose();

src/Gateway/ThingsGateway.Gateway.Application/ThingsGateway.Gateway.Application.csproj

@@ -8,8 +8,8 @@
 	<ItemGroup>
 		<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
 		<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
-		<PackageReference Include="TouchSocket.Dmtp" Version="3.1.4" />
-		<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.1.4" />
+		<PackageReference Include="TouchSocket.Dmtp" Version="3.1.5" />
+		<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.1.5" />
 		<PackageReference Include="ThingsGateway.Authentication" Version="$(AuthenticationVersion)" />
 
 	</ItemGroup>

src/Gateway/ThingsGateway.Gateway.Razor/ThingsGateway.Gateway.Razor.csproj

@@ -7,7 +7,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj" />
-		<PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.4" />
+		<PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.5" />
 		<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.7" />
 		<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.1" />
 		<ProjectReference Include="..\..\Admin\ThingsGateway.Admin.Razor\ThingsGateway.Admin.Razor.csproj" />

src/Gateway/ThingsGateway.Management/Controler/AutoUpdateController.cs

@@ -18,7 +18,7 @@ namespace ThingsGateway.Management;
 [ApiDescriptionSettings("ThingsGateway.OpenApi", Order = 200)]
 [Route("openApi/autoUpdate")]
 [RolePermission]
-[LoggingMonitor]
+[RequestAudit]
 [ApiController]
 [Authorize(AuthenticationSchemes = "Bearer")]
 public class AutoUpdateController : ControllerBase

src/Gateway/ThingsGateway.RulesEngine/Page/RulesPage.razor.cs

@@ -30,6 +30,7 @@ public partial class RulesPage
     }
     protected override async ValueTask DisposeAsync(bool disposing)
     {
+        RulesDispatchService.UnSubscribe(Notify);
         if (Module != null)
         {
             await Module.InvokeVoidAsync("disposeJS", DiagramsJS);
@@ -155,10 +156,6 @@ public partial class RulesPage
     [NotNull]
     private IDispatchService<Rules>? RulesDispatchService { get; set; }
 
-    public void Dispose()
-    {
-        RulesDispatchService.UnSubscribe(Notify);
-    }
     private ExecutionContext? context;
 
     protected override async Task OnInitializedAsync()

src/Plugin/ThingsGateway.Foundation.SiemensS7/S7/SiemensS7Master.cs

@@ -223,17 +223,21 @@ public partial class SiemensS7Master : DeviceBase
                 ushort dataLen = 0;
                 ushort itemLen = 1;
                 List<SiemensS7Address> addresses = new();
-                foreach (var item in sAddresss)
+                for (int i = 0; i < sAddresss.Length; i++)
                 {
+                    var item = sAddresss[i];
                     dataLen = (ushort)(dataLen + item.Data.Length + 4);
                     ushort telegramLen = (ushort)(itemLen * 12 + 19 + dataLen);
                     if (telegramLen < PduLength)
                     {
                         addresses.Add(item);
                         itemLen++;
+                        if (i == sAddresss.Length - 1)
+                            siemensS7Addresses.Add(addresses);
                     }
                     else
                     {
+                        siemensS7Addresses.Add(addresses);
                         addresses = new();
                         dataLen = 0;
                         itemLen = 1;
@@ -243,6 +247,8 @@ public partial class SiemensS7Master : DeviceBase
                         {
                             addresses.Add(item);
                             itemLen++;
+                            if (i == sAddresss.Length - 1)
+                                siemensS7Addresses.Add(addresses);
                         }
                         else
                         {
@@ -250,7 +256,6 @@ public partial class SiemensS7Master : DeviceBase
                             return dictOperResult;
                         }
                     }
-                    siemensS7Addresses.Add(addresses);
 
                 }
 
@@ -278,6 +283,7 @@ public partial class SiemensS7Master : DeviceBase
             }
         }
     }
+
     #region 读写
 
     /// <inheritdoc/>

src/Plugin/ThingsGateway.Plugin.DB/ThingsGateway.Plugin.DB.csproj

@@ -19,7 +19,7 @@
 		
 		
 		
-		<PackageReference Include="SqlSugar.TDengineCore" Version="4.18.31" GeneratePathProperty="true">
+		<PackageReference Include="SqlSugar.TDengineCore" Version="4.18.33" GeneratePathProperty="true">
 			<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
 		</PackageReference>
 

src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/Core/ThingsGatewayNodeManager.cs

@@ -510,7 +510,7 @@ public class ThingsGatewayNodeManager : CustomNodeManager2
             {
                 if (GlobalData.ReadOnlyIdVariables.TryGetValue(item.Value.Id, out var variableRuntime))
                 {
-                    writeInfos.Add((variableRuntime, hashSetNodeId[item.Key].Value.Value?.ToString()));
+                    writeInfos.Add((variableRuntime, hashSetNodeId[item.Key].Value.Value?.ToJsonString()));
                 }
             }
 
@@ -635,7 +635,7 @@ public class ThingsGatewayNodeManager : CustomNodeManager2
                             new()
                             {
                                 {
-                                    variableRuntime.DeviceName,   new Dictionary<string, string>() { {opcuaTag.SymbolicName, value?.ToString() } }
+                                    variableRuntime.DeviceName,   new Dictionary<string, string>() { {opcuaTag.SymbolicName, value?.ToJsonString() } }
                                 }
                             }
                             ).GetAwaiter().GetResult();

src/ThingsGateway.Photino/Startup.cs

@@ -17,7 +17,6 @@ using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationM
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.HttpOverrides;
-using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -37,8 +36,8 @@ using ThingsGateway.Admin.Razor;
 using ThingsGateway.Debug;
 using ThingsGateway.Extension;
 using ThingsGateway.Gateway.Application;
-using ThingsGateway.Logging;
 using ThingsGateway.NewLife.Caching;
+using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Server;
 
@@ -138,7 +137,8 @@ public class Startup : AppStartup
         {
             options.WriteFilter = (logMsg) =>
             {
-                return true;
+                if (logMsg.Message.IsNullOrEmpty()) return false;
+                else return true;
             };
 
             options.MessageFormat = (logMsg) =>
@@ -188,39 +188,41 @@ public class Startup : AppStartup
         #region api日志
 
         //Monitor日志配置
-        services.AddMonitorLogging(options =>
-        {
-            options.JsonIndented = true;// 是否美化 JSON
-            options.GlobalEnabled = false;//全局启用
-            options.ConfigureLogger((logger, logContext, context) =>
-            {
-                var httpContext = context.HttpContext;//获取httpContext
+        //services.AddMonitorLogging(options =>
+        //{
+        //    options.JsonIndented = true;// 是否美化 JSON
+        //    options.GlobalEnabled = false;//全局启用
+        //    options.ConfigureLogger((logger, logContext, context) =>
+        //    {
+        //        var httpContext = context.HttpContext;//获取httpContext
 
-                //获取客户端信息
-                var client = App.GetService<IAppService>().UserAgent;
-                // 获取控制器/操作描述器
-                var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
-                //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
-                var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
+        //        //获取客户端信息
+        //        var client = App.GetService<IAppService>().UserAgent;
+        //        // 获取控制器/操作描述器
+        //        var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
+        //        //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
+        //        var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
 
-                var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
-                //获取特性
-                option = desc.Value;//则将操作名称赋值为控制器上写的title
+        //        var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
+        //        //获取特性
+        //        option = desc.Value;//则将操作名称赋值为控制器上写的title
 
-                logContext.Set(LoggingConst.CateGory, option);//传操作名称
-                logContext.Set(LoggingConst.Operation, option);//传操作名称
-                logContext.Set(LoggingConst.Client, client);//客户端信息
-                logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
-                logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
-            });
-        });
+        //        logContext.Set(LoggingConst.CateGory, option);//传操作名称
+        //        logContext.Set(LoggingConst.Operation, option);//传操作名称
+        //        logContext.Set(LoggingConst.Client, client);//客户端信息
+        //        logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
+        //        logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
+        //    });
+        //});
+
+        services.AddMvcFilter<RequestAuditFilter>();
 
         //日志写入数据库配置
         services.AddDatabaseLogging<DatabaseLoggingWriter>(options =>
         {
             options.WriteFilter = (logMsg) =>
             {
-                return logMsg.LogName == "System.Logging.LoggingMonitor";//只写入LoggingMonitor日志
+                return logMsg.LogName == "System.Logging.RequestAudit";
             };
         });
 

src/ThingsGateway.Server/Index/GatewayIndex.razor.cs

@@ -19,8 +19,6 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 
-using System.Diagnostics.CodeAnalysis;
-
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Extension;

src/ThingsGateway.Server/Program/Startup.cs

@@ -14,7 +14,6 @@ using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.HttpOverrides;
-using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
@@ -29,8 +28,8 @@ using System.Text.Unicode;
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Extension;
-using ThingsGateway.Logging;
 using ThingsGateway.NewLife.Caching;
+using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Server;
 
@@ -161,7 +160,8 @@ public class Startup : AppStartup
         {
             options.WriteFilter = (logMsg) =>
             {
-                return true;
+                if (logMsg.Message.IsNullOrEmpty()) return false;
+                else return true;
             };
 
             options.MessageFormat = (logMsg) =>
@@ -211,39 +211,40 @@ public class Startup : AppStartup
         #region api日志
 
         //Monitor日志配置
-        services.AddMonitorLogging(options =>
-        {
-            options.JsonIndented = true;// 是否美化 JSON
-            options.GlobalEnabled = false;//全局启用
-            options.ConfigureLogger((logger, logContext, context) =>
-            {
-                var httpContext = context.HttpContext;//获取httpContext
+        //services.AddMonitorLogging(options =>
+        //{
+        //    options.JsonIndented = true;// 是否美化 JSON
+        //    options.GlobalEnabled = false;//全局启用
+        //    options.ConfigureLogger((logger, logContext, context) =>
+        //    {
+        //        var httpContext = context.HttpContext;//获取httpContext
 
-                //获取客户端信息
-                var userAgent = App.GetService<IAppService>().UserAgent;
-                // 获取控制器/操作描述器
-                var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
-                //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
-                var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
+        //        //获取客户端信息
+        //        var userAgent = App.GetService<IAppService>().UserAgent;
+        //        // 获取控制器/操作描述器
+        //        var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
+        //        //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
+        //        var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
 
-                var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
-                //获取特性
-                option = desc.Value;//则将操作名称赋值为控制器上写的title
+        //        var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
+        //        //获取特性
+        //        option = desc.Value;//则将操作名称赋值为控制器上写的title
 
-                logContext.Set(LoggingConst.CateGory, option);//传操作名称
-                logContext.Set(LoggingConst.Operation, option);//传操作名称
-                logContext.Set(LoggingConst.Client, userAgent);//客户端信息
-                logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
-                logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
-            });
-        });
+        //        logContext.Set(LoggingConst.CateGory, option);//传操作名称
+        //        logContext.Set(LoggingConst.Operation, option);//传操作名称
+        //        logContext.Set(LoggingConst.Client, userAgent);//客户端信息
+        //        logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
+        //        logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
+        //    });
+        //});
+        services.AddMvcFilter<RequestAuditFilter>();
 
         //日志写入数据库配置
         services.AddDatabaseLogging<DatabaseLoggingWriter>(options =>
         {
             options.WriteFilter = (logMsg) =>
             {
-                return logMsg.LogName == "System.Logging.LoggingMonitor";//只写入LoggingMonitor日志
+                return logMsg.LogName == "System.Logging.RequestAudit";
             };
         });
 

src/ThingsGateway.Server/ThingsGateway.Server.csproj

@@ -51,6 +51,9 @@
 
 		<!--动态适用GC-->
 		<GarbageCollectionAdaptationMode>1</GarbageCollectionAdaptationMode>
+
+		<!--<TieredCompilation>false</TieredCompilation>-->
+		
 		<!--使用自托管线程池-->
 		<!--<UseWindowsThreadPool>false</UseWindowsThreadPool> -->
 

src/Upgrade/ThingsGateway.Upgrade/ThingsGateway.Upgrade.csproj

@@ -16,7 +16,7 @@
 
 
 	<ItemGroup>
-	  <PackageReference Include="TouchSocket.Dmtp" Version="3.1.4" />
+	  <PackageReference Include="TouchSocket.Dmtp" Version="3.1.5" />
 	</ItemGroup>
 
 

src/Upgrade/ThingsGateway.UpgradeServer/Controler/AutoUpdateControler.cs

@@ -21,7 +21,7 @@ namespace ThingsGateway.Upgrade;
 [ApiDescriptionSettings("ThingsGateway.OpenApi", Order = 200)]
 [Route("openApi/autoUpdate")]
 [RolePermission]
-[LoggingMonitor]
+[RequestAudit]
 [Authorize(AuthenticationSchemes = "Bearer")]
 public class AutoUpdateController : ControllerBase
 {

src/Upgrade/ThingsGateway.UpgradeServer/Index/AdminIndex.razor

@@ -38,20 +38,3 @@
 
     </div>
 </div>
-
-<div class="row g-2 mx-1 form-inline">
-    <div class="col-12  col-md-12">
-        <Card IsShadow=true class="m-2 flex-fill" Color="Color.Primary">
-            <HeaderTemplate>
-                @Localizer["HardwareInfoChart"]
-            </HeaderTemplate>
-
-            <BodyTemplate>
-                <Chart @ref=CPULineChart OnInitAsync="OnCPUInit" Height="var(--line-chart-height)" Width="100%" OnAfterInitAsync="()=>{chartInit=true;return Task.CompletedTask;}" />
-            </BodyTemplate>
-        </Card>
-    </div>
-</div>
-
-
-

src/Upgrade/ThingsGateway.UpgradeServer/Index/AdminIndex.razor.cs

@@ -18,8 +18,6 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 
-using System.Diagnostics.CodeAnalysis;
-
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Extension;
@@ -31,118 +29,8 @@ namespace ThingsGateway.UpgradeServer;
 [IgnoreRolePermission]
 [Route("/")]
 [TabItemOption(Text = "Home", Icon = "fas fa-house")]
-public partial class AdminIndex : IDisposable
+public partial class AdminIndex
 {
-    [Inject]
-    private IHardwareJob HardwareJob { get; set; }
-
-    protected override void OnInitialized()
-    {
-        _ = RunTimerAsync();
-        base.OnInitialized();
-    }
-
-    public bool Disposed { get; set; }
-
-    public void Dispose()
-    {
-        Disposed = true;
-        GC.SuppressFinalize(this);
-    }
-
-    private async Task RunTimerAsync()
-    {
-        while (!Disposed)
-        {
-            try
-            {
-                if (chartInit)
-                    await CPULineChart.Update(ChartAction.Update);
-
-                await InvokeAsync(StateHasChanged);
-                await Task.Delay(30000);
-            }
-            catch (Exception ex)
-            {
-                NewLife.Log.XTrace.WriteException(ex);
-            }
-        }
-    }
-
-    #region 曲线
-
-    private bool chartInit { get; set; }
-    private Chart CPULineChart { get; set; }
-    private ChartDataSource? ChartDataSource { get; set; }
-
-    [Inject]
-    [NotNull]
-    private IStringLocalizer<HistoryHardwareInfo> HistoryHardwareInfoLocalizer { get; set; }
-
-    private async Task<ChartDataSource> OnCPUInit()
-    {
-        if (ChartDataSource == null)
-        {
-            var hisHardwareInfos = await HardwareJob.GetHistoryHardwareInfos();
-            ChartDataSource = new ChartDataSource();
-            ChartDataSource.Options.Title = Localizer[nameof(HistoryHardwareInfo)];
-            ChartDataSource.Options.X.Title = Localizer["DateTime"];
-            ChartDataSource.Options.Y.Title = Localizer["Data"];
-            ChartDataSource.Labels = hisHardwareInfos.Select(a => a.Date.ToString("dd HH:mm zz"));
-            ChartDataSource.Data.Add(new ChartDataset()
-            {
-                Tension = 0.4f,
-                PointRadius = 1,
-                Label = HistoryHardwareInfoLocalizer[nameof(HistoryHardwareInfo.CpuUsage)],
-                Data = hisHardwareInfos.Select(a => (object)a.CpuUsage),
-            });
-            ChartDataSource.Data.Add(new ChartDataset()
-            {
-                Tension = 0.4f,
-                PointRadius = 1,
-                Label = HistoryHardwareInfoLocalizer[nameof(HistoryHardwareInfo.MemoryUsage)],
-                Data = hisHardwareInfos.Select(a => (object)a.MemoryUsage),
-            });
-
-            ChartDataSource.Data.Add(new ChartDataset()
-            {
-                Tension = 0.4f,
-                PointRadius = 1,
-                Label = HistoryHardwareInfoLocalizer[nameof(HistoryHardwareInfo.DriveUsage)],
-                Data = hisHardwareInfos.Select(a => (object)a.DriveUsage),
-            });
-
-            ChartDataSource.Data.Add(new ChartDataset()
-            {
-                ShowPointStyle = false,
-                Tension = 0.4f,
-                PointRadius = 1,
-                Label = HistoryHardwareInfoLocalizer[nameof(HistoryHardwareInfo.Temperature)],
-                Data = hisHardwareInfos.Select(a => (object)a.Temperature),
-            });
-
-            ChartDataSource.Data.Add(new ChartDataset()
-            {
-                Tension = 0.4f,
-                PointRadius = 1,
-                Label = HistoryHardwareInfoLocalizer[nameof(HistoryHardwareInfo.Battery)],
-                Data = hisHardwareInfos.Select(a => (object)a.Battery),
-            });
-        }
-        else
-        {
-            var hisHardwareInfos = await HardwareJob.GetHistoryHardwareInfos();
-            ChartDataSource.Labels = hisHardwareInfos.Select(a => a.Date.ToString("dd HH:mm zz"));
-            ChartDataSource.Data[0].Data = hisHardwareInfos.Select(a => (object)a.CpuUsage);
-            ChartDataSource.Data[1].Data = hisHardwareInfos.Select(a => (object)a.MemoryUsage);
-            ChartDataSource.Data[2].Data = hisHardwareInfos.Select(a => (object)a.DriveUsage);
-            ChartDataSource.Data[3].Data = hisHardwareInfos.Select(a => (object)a.Temperature);
-            ChartDataSource.Data[4].Data = hisHardwareInfos.Select(a => (object)a.Battery);
-        }
-        return ChartDataSource;
-    }
-
-    #endregion 曲线
 
     [Inject]
     private BlazorAppContext AppContext { get; set; }

src/Upgrade/ThingsGateway.UpgradeServer/Program/Startup.cs

@@ -14,7 +14,6 @@ using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.HttpOverrides;
-using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
@@ -29,7 +28,6 @@ using System.Text.Unicode;
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Extension;
-using ThingsGateway.Logging;
 
 namespace ThingsGateway.UpgradeServer;
 
@@ -158,16 +156,8 @@ public class Startup : AppStartup
         {
             options.WriteFilter = (logMsg) =>
             {
-                return true;
-                ////如果不是LoggingMonitor日志才格式化
-                //if (logMsg.LogName != "System.Logging.LoggingMonitor")
-                //{
-                //    return true;
-                //}
-                //else
-                //{
-                //    return false;
-                //}
+                if (string.IsNullOrEmpty(logMsg.Message)) return false;
+                else return true;
             };
 
             options.MessageFormat = (logMsg) =>
@@ -217,39 +207,40 @@ public class Startup : AppStartup
         #region api日志
 
         //Monitor日志配置
-        services.AddMonitorLogging(options =>
-        {
-            options.JsonIndented = true;// 是否美化 JSON
-            options.GlobalEnabled = false;//全局启用
-            options.ConfigureLogger((logger, logContext, context) =>
-            {
-                var httpContext = context.HttpContext;//获取httpContext
+        //services.AddMonitorLogging(options =>
+        //{
+        //    options.JsonIndented = true;// 是否美化 JSON
+        //    options.GlobalEnabled = false;//全局启用
+        //    options.ConfigureLogger((logger, logContext, context) =>
+        //    {
+        //        var httpContext = context.HttpContext;//获取httpContext
 
-                //获取客户端信息
-                var client = App.GetService<IAppService>().UserAgent;
-                // 获取控制器/操作描述器
-                var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
-                //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
-                var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
+        //        //获取客户端信息
+        //        var client = App.GetService<IAppService>().UserAgent;
+        //        // 获取控制器/操作描述器
+        //        var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
+        //        //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
+        //        var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
 
-                var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
-                //获取特性
-                option = desc.Value;//则将操作名称赋值为控制器上写的title
+        //        var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
+        //        //获取特性
+        //        option = desc.Value;//则将操作名称赋值为控制器上写的title
 
-                logContext.Set(LoggingConst.CateGory, option);//传操作名称
-                logContext.Set(LoggingConst.Operation, option);//传操作名称
-                logContext.Set(LoggingConst.Client, client);//客户端信息
-                logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
-                logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
-            });
-        });
+        //        logContext.Set(LoggingConst.CateGory, option);//传操作名称
+        //        logContext.Set(LoggingConst.Operation, option);//传操作名称
+        //        logContext.Set(LoggingConst.Client, client);//客户端信息
+        //        logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
+        //        logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
+        //    });
+        //});
+        services.AddMvcFilter<RequestAuditFilter>();
 
         //日志写入数据库配置
         services.AddDatabaseLogging<DatabaseLoggingWriter>(options =>
         {
             options.WriteFilter = (logMsg) =>
             {
-                return logMsg.LogName == "System.Logging.LoggingMonitor";//只写入LoggingMonitor日志
+                return logMsg.LogName == "System.Logging.RequestAudit";
             };
         });
 

src/Version.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>10.6.15</Version>
+    <Version>10.6.21</Version>
   </PropertyGroup>
 
   <ItemGroup>