10.6.28

Signed-off-by: Diego <2248356998@qq.com>

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

@@ -64,24 +64,31 @@ public sealed class OperDescAttribute : MoAttribute
 
     public override void OnException(MethodContext context)
     {
-        //插入异常日志
+        if (App.HttpContext.Request.Path.StartsWithSegments("/_blazor"))
-        SysOperateLog log = GetOperLog(LocalizerType, context);
+        {
+            //插入异常日志
+            SysOperateLog log = GetOperLog(LocalizerType, context);
 
-        log.Category = LogCateGoryEnum.Exception;//操作类型为异常
+            log.Category = LogCateGoryEnum.Exception;//操作类型为异常
-        log.ExeStatus = false;//操作状态为失败
+            log.ExeStatus = false;//操作状态为失败
-        if (context.Exception is AppFriendlyException exception)
+            if (context.Exception is AppFriendlyException exception)
-            log.ExeMessage = exception?.Message;
+                log.ExeMessage = exception?.Message;
-        else
+            else
-            log.ExeMessage = context.Exception?.ToString();
+                log.ExeMessage = context.Exception?.ToString();
 
-        OperDescAttribute.WriteToQueue(log);
+            OperDescAttribute.WriteToQueue(log);
+        }
     }
 
     public override void OnSuccess(MethodContext context)
     {
-        //插入操作日志
+        if (App.HttpContext.Request.Path.StartsWithSegments("/_blazor"))
-        SysOperateLog log = GetOperLog(LocalizerType, context);
+        {
-        OperDescAttribute.WriteToQueue(log);
+
+            //插入操作日志
+            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,301 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人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;
+using ThingsGateway.UnifyResult;
+
+namespace ThingsGateway.Admin.Application;
+
+public class RequestAuditFilter : IAsyncActionFilter, IOrderedFilter
+{
+    private const int FilterOrder = -3000;
+    public int Order => FilterOrder;
+
+    public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+    {
+        var timeOperation = Stopwatch.StartNew();
+        var resultContext = await next().ConfigureAwait(false);
+        // 计算接口执行时间
+        timeOperation.Stop();
+
+        var controllerActionDescriptor = (context.ActionDescriptor as ControllerActionDescriptor);
+        // 获取动作方法描述器
+        var actionMethod = controllerActionDescriptor?.MethodInfo;
+
+
+        // 处理 Blazor Server
+        if (actionMethod == null)
+        {
+            return;
+        }
+
+        // 排除 WebSocket 请求处理
+        if (context.HttpContext.IsWebSocketRequest())
+        {
+            return;
+        }
+
+        // 如果贴了 [SuppressMonitor] 特性则跳过
+        if (actionMethod.IsDefined(typeof(SuppressRequestAuditAttribute), true)
+            || actionMethod.DeclaringType.IsDefined(typeof(SuppressRequestAuditAttribute), true))
+        {
+            return;
+        }
+
+
+        // 只有方法贴有特性才进行审计
+        if (
+            !actionMethod.DeclaringType.IsDefined(typeof(RequestAuditAttribute), true)
+            &&
+            !actionMethod.IsDefined(typeof(RequestAuditAttribute), true))
+        {
+            return;
+        }
+
+
+
+
+        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;
+
+        object returnValue = null;
+        Type finalReturnType;
+        var result = resultContext.Result as IActionResult;
+        // 解析返回值
+        if (UnifyContext.CheckVaildResult(result, out var data))
+        {
+            returnValue = data;
+            finalReturnType = data?.GetType();
+        }
+        // 处理文件类型
+        else if (result is FileResult fresult)
+        {
+            returnValue = new
+            {
+                FileName = fresult.FileDownloadName,
+                fresult.ContentType,
+                Length = fresult is FileContentResult cresult ? (object)cresult.FileContents.Length : null
+            };
+            finalReturnType = fresult?.GetType();
+        }
+        else finalReturnType = result?.GetType();
+
+        logData.ReturnInformation = returnValue;
+
+        //获取客户端信息
+        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/Logging/DatabaseLoggingWriter.cs

@@ -16,7 +16,6 @@ using ThingsGateway.Extension;
 using ThingsGateway.FriendlyException;
 using ThingsGateway.Logging;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.Razor;
 
 namespace ThingsGateway.Admin.Application;
 
@@ -39,33 +38,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;
+        requestAuditData.LogDateTime = logMsg.LogDateTime;
-        // loggingMonitor.ReturnInformation.Value
+        // requestAuditData.ReturnInformation.Value
         //验证失败不记录日志
         bool save = false;
-        if (loggingMonitor.Validation == null)
+        if (requestAuditData.Validation == null)
         {
-            var operation = logMsg.Context.Get(LoggingConst.Operation).ToString();//获取操作名称
+            var operation = requestAuditData.Operation;//获取操作名称
-            var client = (UserAgent)logMsg.Context.Get(LoggingConst.Client);//获取客户端信息
+            var client = requestAuditData.Client;//获取客户端信息
-            var path = logMsg.Context.Get(LoggingConst.Path).ToString();//获取操作名称
+            var path = requestAuditData.Path;//获取操作名称
-            var method = logMsg.Context.Get(LoggingConst.Method).ToString();//获取方法
+            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 +71,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 +86,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;
+        var resultJson = requestAuditData.ReturnInformation?.ToSystemTextJsonString();
-        if (loggingMonitor.ReturnInformation != null)//如果有返回值
+
-        {
-            if (loggingMonitor.ReturnInformation.Value != null)//如果返回值不为空
-            {
-                resultJson = loggingMonitor.ReturnInformation.Value.ToSystemTextJsonString();
-            }
-        }
 
         //操作日志表实体
         var sysLogOperate = new SysOperateLog
@@ -117,29 +108,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,
+            ClassName = requestAuditData.ControllerName,
-            MethodName = loggingMonitor.ActionName,
+            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())
+            if (requestAuditData.Exception.Type == typeof(AppFriendlyException).ToString())
-                sysLogOperate.ExeMessage = loggingMonitor?.Exception.Message;
+                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,26 +149,25 @@ 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
+            dynamic userInfo = requestAuditData.ReturnInformation;
-            var userInfo = result.FromJsonNetString<UnifyResult<LoginOutput>>();//格式化成user表
             opAccount = userInfo.Data.Account;//赋值账号
             verificatId = userInfo.Data.VerificatId;
         }
         else
         {
             //如果是登录出，用户信息就从AuthorizationClaims里拿
-            opAccount = loggingMonitor.AuthorizationClaims.Where(it => it.Type == ClaimConst.Account).Select(it => it.Value).FirstOrDefault();
+            opAccount = requestAuditData.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();
+            verificatId = requestAuditData.AuthorizationClaims.Where(it => it.Type == ClaimConst.VerificatId).Select(it => it.Value).FirstOrDefault().ToLong();
         }
         //日志表实体
         var sysLogVisit = new SysOperateLog
@@ -185,19 +175,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(),
+            ResultJson = requestAuditData.ReturnInformation?.ToSystemTextJsonString(),
-            ClassName = loggingMonitor.DisplayName,
+            ClassName = requestAuditData.ControllerName,
-            MethodName = loggingMonitor.ActionName,
+            MethodName = requestAuditData.ActionName,
-            ParamJson = loggingMonitor.Parameters?.ToSystemTextJsonString(),
+            ParamJson = requestAuditData.Parameters?.ToSystemTextJsonString(),
         };
         _operateLogMessageQueue.Enqueue(sysLogVisit);
 

src/Admin/ThingsGateway.Admin.Application/Services/MessageService/SignalR/Provider/UserIdProvider.cs

@@ -28,7 +28,7 @@ public class UserIdProvider : IUserIdProvider
 
         if (UserId > 0)
         {
-            return $"{UserId}{SysHub.Separate}{YitIdHelper.NextId()}";//返回用户ID
+            return $"{UserId}{SysHub.Separate}{CommonUtils.GetSingleId()}";//返回用户ID
         }
 
         return connection.ConnectionId;

src/Admin/ThingsGateway.Admin.Application/Services/SugarAopService/SugarAopService.cs

@@ -117,6 +117,25 @@ public class SugarAopService : ISugarAopService
         db.Aop.DataExecuted = (value, entity) =>
         {
         };
+
+
+        db.Aop.OnLogExecuted = (sql, pars) =>
+        {
+            //执行时间超过1秒
+            if (db.Ado.SqlExecutionTime.TotalSeconds > 1)
+            {
+                //代码CS文件名
+                var fileName = db.Ado.SqlStackTrace.FirstFileName;
+                //代码行数
+                var fileLine = db.Ado.SqlStackTrace.FirstLine;
+                //方法名
+                var FirstMethodName = db.Ado.SqlStackTrace.FirstMethodName;
+
+                DbContext.WriteLog($"{fileName}-{FirstMethodName}-{fileLine} 执行时间超过1秒");
+                DbContext.WriteLogWithSql(UtilMethods.GetNativeSql(sql, pars));
+
+            }
+        };
     }
 
 }

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/SqlSugar/SqlSugarOptions.cs

@@ -37,7 +37,7 @@ public sealed class SqlSugarOption : ConnectionConfig
     /// <summary>
     /// 是否控制台显示Sql语句
     /// </summary>
-    public bool IsShowSql { get; set; }
+    public bool? IsShowSql { get; set; }
 
     /// <summary>
     /// 更新数据

src/Admin/ThingsGateway.Admin.Application/Startup.cs

@@ -98,6 +98,21 @@ public class Startup : AppStartup
         CodeFirstUtils.CodeFirst(fullName!);//CodeFirst
 
 
+        try
+        {
+            using var db = DbContext.GetDB<SysOperateLog>();
+            if (db.CurrentConnectionConfig.DbType == SqlSugar.DbType.Sqlite)
+            {
+                if (!db.DbMaintenance.IsAnyIndex("idx_operatelog_optime_date"))
+                {
+                    var indexsql = "CREATE INDEX idx_operatelog_optime_date ON sys_operatelog(strftime('%Y-%m-%d', OpTime));";
+                    db.Ado.ExecuteCommand(indexsql);
+                }
+            }
+        }
+        catch { }
+
+
         //删除在线用户统计
         var verificatInfoService = App.RootServices.GetService<IVerificatInfoService>();
         verificatInfoService.RemoveAllClientId();

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.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;
 
@@ -89,6 +88,7 @@ public class Startup : AppStartup
         }
         ;
 
+        services.AddMvcFilter<RequestAuditFilter>();
         services.AddControllers()
             .AddNewtonsoftJson(options => SetNewtonsoftJsonSetting(options.SerializerSettings))
             //.AddXmlSerializerFormatters()
@@ -161,7 +161,8 @@ public class Startup : AppStartup
         {
             options.WriteFilter = (logMsg) =>
             {
-                return true;
+                if (logMsg.Message.IsNullOrEmpty()) return false;
+                else return true;
             };
 
             options.MessageFormat = (logMsg) =>
@@ -211,39 +212,39 @@ public class Startup : AppStartup
         #region api日志
 
         //Monitor日志配置
-        services.AddMonitorLogging(options =>
+        //services.AddMonitorLogging(options =>
-        {
+        //{
-            options.JsonIndented = true;// 是否美化 JSON
+        //    options.JsonIndented = true;// 是否美化 JSON
-            options.GlobalEnabled = false;//全局启用
+        //    options.GlobalEnabled = false;//全局启用
-            options.ConfigureLogger((logger, logContext, context) =>
+        //    options.ConfigureLogger((logger, logContext, context) =>
-            {
+        //    {
-                var httpContext = context.HttpContext;//获取httpContext
+        //        var httpContext = context.HttpContext;//获取httpContext
 
-                //获取客户端信息
+        //        //获取客户端信息
-                var client = App.GetService<IAppService>().UserAgent;
+        //        var client = App.GetService<IAppService>().UserAgent;
-                // 获取控制器/操作描述器
+        //        // 获取控制器/操作描述器
-                var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
+        //        var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
-                //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
+        //        //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
-                var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
+        //        var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
 
-                var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
+        //        var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
-                //获取特性
+        //        //获取特性
-                option = desc.Value;//则将操作名称赋值为控制器上写的title
+        //        option = desc.Value;//则将操作名称赋值为控制器上写的title
 
-                logContext.Set(LoggingConst.CateGory, option);//传操作名称
+        //        logContext.Set(LoggingConst.CateGory, option);//传操作名称
-                logContext.Set(LoggingConst.Operation, option);//传操作名称
+        //        logContext.Set(LoggingConst.Operation, option);//传操作名称
-                logContext.Set(LoggingConst.Client, client);//客户端信息
+        //        logContext.Set(LoggingConst.Client, client);//客户端信息
-                logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
+        //        logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
-                logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
+        //        logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
-            });
+        //    });
-        });
+        //});
 
         //日志写入数据库配置
         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/Extensions/ILoggerExtensions.cs

@@ -25,7 +25,7 @@ public static class ILoggerExtensions
     /// <param name="logger"></param>
     /// <param name="properties">建议使用 ConcurrentDictionary 类型</param>
     /// <returns></returns>
-    public static IDisposable ScopeContext(this ILogger logger, IDictionary<object, object> properties)
+    public static IDisposable ScopeContext(this ILogger logger, IDictionary<string, object> properties)
     {
         if (logger == null) throw new ArgumentNullException(nameof(logger));
 

src/Admin/ThingsGateway.Furion/Logging/Extensions/LogContextExtensions.cs

@@ -26,11 +26,11 @@ public static class LogContextExtensions
     /// <param name="key">键</param>
     /// <param name="value">值</param>
     /// <returns></returns>
-    public static LogContext Set(this LogContext logContext, object key, object value)
+    public static LogContext Set(this LogContext logContext, string key, object value)
     {
         if (logContext == null || key == null) return logContext;
 
-        logContext.Properties ??= new Dictionary<object, object>();
+        logContext.Properties ??= new Dictionary<string, object>();
 
         logContext.Properties.Remove(key);
         logContext.Properties.Add(key, value);
@@ -43,7 +43,7 @@ public static class LogContextExtensions
     /// <param name="logContext"></param>
     /// <param name="properties"></param>
     /// <returns></returns>
-    public static LogContext SetRange(this LogContext logContext, IDictionary<object, object> properties)
+    public static LogContext SetRange(this LogContext logContext, IDictionary<string, object> properties)
     {
         if (logContext == null
             || properties == null
@@ -63,7 +63,7 @@ public static class LogContextExtensions
     /// <param name="logContext"></param>
     /// <param name="key">键</param>
     /// <returns></returns>
-    public static object Get(this LogContext logContext, object key)
+    public static object Get(this LogContext logContext, string key)
     {
         if (logContext == null
             || key == null
@@ -80,7 +80,7 @@ public static class LogContextExtensions
     /// <param name="logContext"></param>
     /// <param name="key">键</param>
     /// <returns></returns>
-    public static T Get<T>(this LogContext logContext, object key)
+    public static T Get<T>(this LogContext logContext, string key)
     {
         var value = logContext.Get(key);
         return value.ChangeType<T>();

src/Admin/ThingsGateway.Furion/Logging/Extensions/StringLoggingExtensions.cs

@@ -84,7 +84,7 @@ public static class StringLoggingExtensions
     /// <param name="message"></param>
     /// <param name="properties">建议使用 ConcurrentDictionary 类型</param>
     /// <returns></returns>
-    public static StringLoggingPart ScopeContext(this string message, IDictionary<object, object> properties)
+    public static StringLoggingPart ScopeContext(this string message, IDictionary<string, object> properties)
     {
         return StringLoggingPart.Default().SetMessage(message).ScopeContext(properties);
     }

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,11 +17,10 @@ namespace ThingsGateway.Logging;
 [SuppressSniffer]
 public sealed class LogContext : IDisposable
 {
-
     /// <summary>
     /// 日志上下文数据
     /// </summary>
-    public IDictionary<object, object> Properties { get; set; }
+    public IDictionary<string, object> Properties { get; set; }
 
     /// <summary>
     /// 原生日志上下文数据

src/Admin/ThingsGateway.Furion/Logging/Internal/StringLoggingPartSetters.cs

@@ -96,7 +96,7 @@ public sealed partial class StringLoggingPart
     /// </summary>
     /// <param name="properties">建议使用 ConcurrentDictionary 类型</param>
     /// <returns></returns>
-    public StringLoggingPart ScopeContext(IDictionary<object, object> properties)
+    public StringLoggingPart ScopeContext(IDictionary<string, object> properties)
     {
         if (properties == null) return this;
         LogContext = new LogContext { Properties = properties };

src/Admin/ThingsGateway.Furion/Logging/Log.cs

@@ -59,7 +59,7 @@ public static class Log
     /// </summary>
     /// <param name="properties">建议使用 ConcurrentDictionary 类型</param>
     /// <returns></returns>
-    public static (ILogger logger, IDisposable scope) ScopeContext(IDictionary<object, object> properties)
+    public static (ILogger logger, IDisposable scope) ScopeContext(IDictionary<string, object> properties)
     {
         return GetLogger(StringLoggingPart.Default().ScopeContext(properties));
     }

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.Furion/UnifyResult/UnifyContext.cs

@@ -349,7 +349,7 @@ public static class UnifyContext
     /// <param name="result"></param>
     /// <param name="data"></param>
     /// <returns></returns>
-    internal static bool CheckVaildResult(IActionResult result, out object data)
+    public static bool CheckVaildResult(IActionResult result, out object data)
     {
         data = default;
 

src/Admin/ThingsGateway.NewLife.X/Extension/SystemTextJsonExtension.cs

@@ -37,7 +37,8 @@ public static class SystemTextJsonExtension
         {
             Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
             WriteIndented = true, // 缩进
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull // 忽略 null
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull, // 忽略 null
+            NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals,
         };
         // 如有自定义Converter，这里添加
         // IndentedOptions.Converters.Add(new ByteArrayJsonConverter());
@@ -50,7 +51,8 @@ public static class SystemTextJsonExtension
         {
             Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
             WriteIndented = false, // 不缩进
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+            NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals,
         };
         NoneIndentedOptions.Converters.Add(new ByteArrayToNumberArrayConverterSystemTextJson());
         NoneIndentedOptions.Converters.Add(new JTokenSystemTextJsonConverter());

src/Admin/ThingsGateway.Razor/Startup.cs

@@ -27,6 +27,13 @@ public class Startup : AppStartup
     {
         services.AddBootstrapBlazor(
             option => option.JSModuleVersion = Random.Shared.Next(10000).ToString()
+            , jsonLocalizationOptions =>
+            {
+                jsonLocalizationOptions.DisableGetLocalizerFromResourceManager = true;
+                jsonLocalizationOptions.DisableGetLocalizerFromService = true;
+                jsonLocalizationOptions.IgnoreLocalizerMissing = true;
+                jsonLocalizationOptions.UseKeyWhenValueIsNull = true;
+            }
             );
         services.AddConfigurableOptions<MenuOptions>();
         services.ConfigureIconThemeOptions(options => options.ThemeKey = "fa");

src/Admin/ThingsGateway.Razor/wwwroot/js/downloadFile.js

@@ -1,5 +1,5 @@
 //下载文件
-export function blazor_downloadFile(url, fileName, dtoObject) {
+export async function blazor_downloadFile(url, fileName, dtoObject) {
     const params = new URLSearchParams();
 
     // 将 dtoObject 的属性添加到 URLSearchParams 中
@@ -12,97 +12,92 @@ export function blazor_downloadFile(url, fileName, dtoObject) {
     // 构建完整的 URL
     const fullUrl = `${url}?${params.toString()}`;
 
-    // 发起 fetch 请求
+    try {
-    fetch(fullUrl)
+        // 发起 fetch 请求
-        .then(response => {
+        const response = await fetch(fullUrl);
-            // 获取响应头中的 content-disposition
-            const dispositionHeader = response.headers.get('content-disposition');
-            let resolvedFileName = fileName;
 
-            if (dispositionHeader) {
+        // 获取响应头中的 content-disposition
-                // 解析出文件名
+        const dispositionHeader = response.headers.get('content-disposition');
-                const match = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(dispositionHeader);
+        let resolvedFileName = fileName;
-                const serverFileName = match && match[1] ? match[1].replace(/['"]/g, '') : null;
+
-                if (serverFileName) {
+        if (dispositionHeader) {
-                    resolvedFileName = serverFileName;
+            // 解析出文件名
-                }
+            const match = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(dispositionHeader);
+            const serverFileName = match && match[1] ? match[1].replace(/['"]/g, '') : null;
+            if (serverFileName) {
+                resolvedFileName = serverFileName;
             }
+        }
 
-            // 将响应转换为 blob 对象
+        // 将响应转换为 blob 对象
-            return response.blob().then(blob => {
+        const blob = await response.blob();
-                // 创建临时的文件 URL
-                const fileUrl = window.URL.createObjectURL(blob);
 
-                // 创建一个 <a> 元素并设置下载链接和文件名
+        // 创建临时的文件 URL
-                const anchorElement = document.createElement('a');
+        const fileUrl = window.URL.createObjectURL(blob);
-                anchorElement.href = fileUrl;
-                anchorElement.download = resolvedFileName;
-                anchorElement.style.display = 'none';
 
-                // 将 <a> 元素添加到 body 中并触发下载
+        // 创建一个 <a> 元素并设置下载链接和文件名
-                document.body.appendChild(anchorElement);
+        const anchorElement = document.createElement('a');
-                anchorElement.click();
+        anchorElement.href = fileUrl;
-                document.body.removeChild(anchorElement);
+        anchorElement.download = resolvedFileName;
+        anchorElement.style.display = 'none';
 
-                // 撤销临时的文件 URL
+        // 将 <a> 元素添加到 body 中并触发下载
-                window.URL.revokeObjectURL(fileUrl);
+        document.body.appendChild(anchorElement);
-            });
+        anchorElement.click();
-        })
+        document.body.removeChild(anchorElement);
-        .catch(error => {
+
-            console.error('DownFile error ', error);
+        // 撤销临时的文件 URL
-        });
+        window.URL.revokeObjectURL(fileUrl);
+
+        return true;
+    } catch (error) {
+        console.error('DownFile error ', error);
+        throw error;
+    }
 }
 
 
 
+
 //下载文件
-export function postJson_downloadFile(url, fileName, jsonBody) {
+export async function postJson_downloadFile(url, fileName, jsonBody) {
-    const params = new URLSearchParams();
 
-
+    try {
-    // 发起 fetch 请求
+        const response = await fetch(url, {
-    fetch(url, {
+            method: 'POST',
-        method: 'POST',
+            headers: {
-        headers: {
+                'Content-Type': 'application/json'
-            'Content-Type': 'application/json'
+            },
-        },
+            body: jsonBody
-        body: jsonBody
-    })
-        .then(response => {
-            // 获取响应头中的 content-disposition
-            const dispositionHeader = response.headers.get('content-disposition');
-            let resolvedFileName = fileName;
-
-            if (dispositionHeader) {
-                // 解析出文件名
-                const match = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(dispositionHeader);
-                const serverFileName = match && match[1] ? match[1].replace(/['"]/g, '') : null;
-                if (serverFileName) {
-                    resolvedFileName = serverFileName;
-                }
-            }
-
-            // 将响应转换为 blob 对象
-            return response.blob().then(blob => {
-                // 创建临时的文件 URL
-                const fileUrl = window.URL.createObjectURL(blob);
-
-                // 创建一个 <a> 元素并设置下载链接和文件名
-                const anchorElement = document.createElement('a');
-                anchorElement.href = fileUrl;
-                anchorElement.download = resolvedFileName;
-                anchorElement.style.display = 'none';
-
-                // 将 <a> 元素添加到 body 中并触发下载
-                document.body.appendChild(anchorElement);
-                anchorElement.click();
-                document.body.removeChild(anchorElement);
-
-                // 撤销临时的文件 URL
-                window.URL.revokeObjectURL(fileUrl);
-            });
-        })
-        .catch(error => {
-            console.error('downfile error ', error);
         });
+
+        const dispositionHeader = response.headers.get('content-disposition');
+        let resolvedFileName = fileName;
+
+        if (dispositionHeader) {
+            const match = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(dispositionHeader);
+            const serverFileName = match && match[1] ? match[1].replace(/['"]/g, '') : null;
+            if (serverFileName) {
+                resolvedFileName = serverFileName;
+            }
+        }
+
+        const blob = await response.blob();
+        const fileUrl = window.URL.createObjectURL(blob);
+
+        const anchorElement = document.createElement('a');
+        anchorElement.href = fileUrl;
+        anchorElement.download = resolvedFileName;
+        anchorElement.style.display = 'none';
+
+        document.body.appendChild(anchorElement);
+        anchorElement.click();
+        document.body.removeChild(anchorElement);
+
+        window.URL.revokeObjectURL(fileUrl);
+
+        return true; // 唯一新增的返回值
+    } catch (error) {
+        console.error('downfile error ', error);
+    }
 }

src/Directory.Build.props

@@ -1,9 +1,9 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.6.19</PluginVersion>
+		<PluginVersion>10.6.28</PluginVersion>
-		<ProPluginVersion>10.6.19</ProPluginVersion>
+		<ProPluginVersion>10.6.28</ProPluginVersion>
-		<AuthenticationVersion>2.1.7</AuthenticationVersion>
+		<AuthenticationVersion>2.1.8</AuthenticationVersion>
 	</PropertyGroup>
 
 	<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" Version="3.1.5" />
-		<PackageReference Include="TouchSocket.SerialPorts" Version="3.1.4" />
+		<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/Controller/RuntimeInfoController.cs

@@ -90,6 +90,7 @@ public class RuntimeInfoController : ControllerBase
     /// </summary>
     /// <returns></returns>
     [HttpPost("checkRealAlarm")]
+    [RequestAudit]
     [DisplayName("确认实时报警")]
     public async Task CheckRealAlarm(long variableId)
     {

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/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/Services/GatewayExport/GatewayExportService.cs

@@ -26,28 +26,53 @@ internal sealed class GatewayExportService : IGatewayExportService
 
     private IJSRuntime JSRuntime { get; set; }
 
-    public async Task OnChannelExport(ExportFilter exportFilter)
+    public async Task<bool> OnChannelExport(ExportFilter exportFilter)
     {
-        await using var ajaxJS = await JSRuntime.InvokeAsync<IJSObjectReference>("import", $"/_content/ThingsGateway.Razor/js/downloadFile.js");
+        try
-        string url = "api/gatewayExport/channel";
+        {
-        string fileName = $"{DateTime.Now.ToFileDateTimeFormat()}.xlsx";
+
-        await ajaxJS.InvokeVoidAsync("postJson_downloadFile", url, fileName, exportFilter.ToJsonString());
+            await using var ajaxJS = await JSRuntime.InvokeAsync<IJSObjectReference>("import", $"/_content/ThingsGateway.Razor/js/downloadFile.js");
+            string url = "api/gatewayExport/channel";
+            string fileName = $"{DateTime.Now.ToFileDateTimeFormat()}.xlsx";
+            return await ajaxJS.InvokeAsync<bool>("postJson_downloadFile", url, fileName, exportFilter.ToJsonString());
+
+        }
+        catch
+        {
+            return false;
+        }
     }
 
-    public async Task OnDeviceExport(ExportFilter exportFilter)
+    public async Task<bool> OnDeviceExport(ExportFilter exportFilter)
     {
-        await using var ajaxJS = await JSRuntime.InvokeAsync<IJSObjectReference>("import", $"/_content/ThingsGateway.Razor/js/downloadFile.js");
+        try
-        string url = "api/gatewayExport/device";
+        {
-        string fileName = $"{DateTime.Now.ToFileDateTimeFormat()}.xlsx";
+
-        await ajaxJS.InvokeVoidAsync("postJson_downloadFile", url, fileName, exportFilter.ToJsonString());
+
+            await using var ajaxJS = await JSRuntime.InvokeAsync<IJSObjectReference>("import", $"/_content/ThingsGateway.Razor/js/downloadFile.js");
+            string url = "api/gatewayExport/device";
+            string fileName = $"{DateTime.Now.ToFileDateTimeFormat()}.xlsx";
+            return await ajaxJS.InvokeAsync<bool>("postJson_downloadFile", url, fileName, exportFilter.ToJsonString());
+        }
+        catch
+        {
+            return false;
+        }
     }
 
-    public async Task OnVariableExport(ExportFilter exportFilter)
+    public async Task<bool> OnVariableExport(ExportFilter exportFilter)
     {
-        await using var ajaxJS = await JSRuntime.InvokeAsync<IJSObjectReference>("import", $"/_content/ThingsGateway.Razor/js/downloadFile.js");
+        try
-        string url = "api/gatewayExport/variable";
+        {
-        string fileName = $"{DateTime.Now.ToFileDateTimeFormat()}.xlsx";
+            await using var ajaxJS = await JSRuntime.InvokeAsync<IJSObjectReference>("import", $"/_content/ThingsGateway.Razor/js/downloadFile.js");
-        await ajaxJS.InvokeVoidAsync("postJson_downloadFile", url, fileName, exportFilter.ToJsonString());
+            string url = "api/gatewayExport/variable";
+            string fileName = $"{DateTime.Now.ToFileDateTimeFormat()}.xlsx";
+            return await ajaxJS.InvokeAsync<bool>("postJson_downloadFile", url, fileName, exportFilter.ToJsonString());
+        }
+        catch
+        {
+            return false;
+        }
 
     }
 }

src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayExport/HybridGatewayExportService.cs

@@ -35,18 +35,30 @@ public sealed class HybridGatewayExportService : IGatewayExportService
 
     }
 
-    public async Task OnChannelExport(ExportFilter exportFilter)
+    public async Task<bool> OnChannelExport(ExportFilter exportFilter)
     {
-        exportFilter.QueryPageOptions.IsPage = false;
+        try
-        exportFilter.QueryPageOptions.IsVirtualScroll = false;
+        {
 
-        var sheets = await _channelService.ExportChannelAsync(exportFilter).ConfigureAwait(false);
-        var path = await _importExportService.CreateFileAsync<Device>(sheets, "Channel", false).ConfigureAwait(false);
 
-        Open(path);
+            exportFilter.QueryPageOptions.IsPage = false;
+            exportFilter.QueryPageOptions.IsVirtualScroll = false;
+
+            var sheets = await _channelService.ExportChannelAsync(exportFilter).ConfigureAwait(false);
+            var path = await _importExportService.CreateFileAsync<Device>(sheets, "Channel", false).ConfigureAwait(false);
+
+            Open(path);
+            return true;
+
+        }
+        catch
+        {
+
+            return false;
+        }
     }
 
-    private static void Open(string path)
+    private static bool Open(string path)
     {
         path = System.IO.Path.GetDirectoryName(path); // Ensure the path is absolute
 
@@ -63,25 +75,47 @@ public sealed class HybridGatewayExportService : IGatewayExportService
         {
             System.Diagnostics.Process.Start("open", path);
         }
+
+        return true;
     }
 
-    public async Task OnDeviceExport(ExportFilter exportFilter)
+    public async Task<bool> OnDeviceExport(ExportFilter exportFilter)
     {
-        exportFilter.QueryPageOptions.IsPage = false;
+        try
-        exportFilter.QueryPageOptions.IsVirtualScroll = false;
+        {
-        var sheets = await _deviceService.ExportDeviceAsync(exportFilter).ConfigureAwait(false);
-        var path = await _importExportService.CreateFileAsync<Device>(sheets, "Device", false).ConfigureAwait(false);
-        Open(path);
 
+            exportFilter.QueryPageOptions.IsPage = false;
+            exportFilter.QueryPageOptions.IsVirtualScroll = false;
+            var sheets = await _deviceService.ExportDeviceAsync(exportFilter).ConfigureAwait(false);
+            var path = await _importExportService.CreateFileAsync<Device>(sheets, "Device", false).ConfigureAwait(false);
+            Open(path);
 
+            return true;
+
+        }
+        catch
+        {
+
+            return false;
+        }
     }
 
-    public async Task OnVariableExport(ExportFilter exportFilter)
+    public async Task<bool> OnVariableExport(ExportFilter exportFilter)
     {
-        exportFilter.QueryPageOptions.IsPage = false;
+        try
-        exportFilter.QueryPageOptions.IsVirtualScroll = false;
+        {
-        var sheets = await _variableService.ExportVariableAsync(exportFilter).ConfigureAwait(false);
+
-        var path = await _importExportService.CreateFileAsync<Variable>(sheets, "Variable", false).ConfigureAwait(false);
+            exportFilter.QueryPageOptions.IsPage = false;
-        Open(path);
+            exportFilter.QueryPageOptions.IsVirtualScroll = false;
+            var sheets = await _variableService.ExportVariableAsync(exportFilter).ConfigureAwait(false);
+            var path = await _importExportService.CreateFileAsync<Variable>(sheets, "Variable", false).ConfigureAwait(false);
+            Open(path);
+            return true;
+        }
+        catch
+        {
+
+            return false;
+        }
     }
 }

src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayExport/IGatewayExportService.cs

@@ -12,7 +12,7 @@ namespace ThingsGateway.Gateway.Application;
 
 public interface IGatewayExportService
 {
-    Task OnChannelExport(ExportFilter exportFilter);
+    Task<bool> OnChannelExport(ExportFilter exportFilter);
-    Task OnDeviceExport(ExportFilter exportFilter);
+    Task<bool> OnDeviceExport(ExportFilter exportFilter);
-    Task OnVariableExport(ExportFilter exportFilter);
+    Task<bool> OnVariableExport(ExportFilter exportFilter);
 }

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/Services/Plugin/PluginService.cs

@@ -518,7 +518,7 @@ internal sealed class PluginService : IPluginService
     {
         var fileInfo = new FileInfo(path);
         if (fileInfo.Exists)
-            fileInfo.MoveTo($"{path}{YitIdHelper.NextId()}{DelEx}", true);
+            fileInfo.MoveTo($"{path}{CommonUtils.GetSingleId()}{DelEx}", true);
         else
             return false;
         return true;

src/Gateway/ThingsGateway.Gateway.Application/Startup.cs

@@ -18,6 +18,8 @@ using SqlSugar;
 
 using System.Reflection;
 
+using ThingsGateway.Authentication;
+
 namespace ThingsGateway.Gateway.Application;
 
 [AppStartup(-100)]
@@ -25,6 +27,9 @@ public class Startup : AppStartup
 {
     public void Configure(IServiceCollection services)
     {
+
+        ProAuthentication.TryGetAuthorizeInfo(out var authorizeInfo);
+
         services.AddConfigurableOptions<ChannelThreadOptions>();
         services.AddConfigurableOptions<GatewayLogOptions>();
         services.AddConfigurableOptions<RpcLogOptions>();
@@ -125,8 +130,35 @@ public class Startup : AppStartup
         }
         catch { }
 
+        try
+        {
+            using var db = DbContext.GetDB<BackendLog>();
+            if (db.CurrentConnectionConfig.DbType == SqlSugar.DbType.Sqlite)
+            {
 
+                if (!db.DbMaintenance.IsAnyIndex("idx_backendlog_logtime_date"))
+                {
+                    var indexsql = "CREATE INDEX idx_backendlog_logtime_date ON backend_log(strftime('%Y-%m-%d', LogTime));";
+                    db.Ado.ExecuteCommand(indexsql);
+                }
+            }
+        }
+        catch { }
 
+        try
+        {
+            using var db = DbContext.GetDB<RpcLog>();
+            if (db.CurrentConnectionConfig.DbType == SqlSugar.DbType.Sqlite)
+            {
+
+                if (!db.DbMaintenance.IsAnyIndex("idx_rpclog_logtime_date"))
+                {
+                    var indexsql = "CREATE INDEX idx_rpclog_logtime_date ON rpc_log(strftime('%Y-%m-%d', LogTime));";
+                    db.Ado.ExecuteCommand(indexsql);
+                }
+            }
+        }
+        catch { }
 
         serviceProvider.GetService<IHostApplicationLifetime>().ApplicationStarted.Register(() =>
         {

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<Import Project="$(SolutionDir)Version.props" />
 	<Import Project="$(SolutionDir)PackNuget.props" />
@@ -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.Dmtp" Version="3.1.5" />
-		<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.1.4" />
+		<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.1.5" />
 		<PackageReference Include="ThingsGateway.Authentication" Version="$(AuthenticationVersion)" />
 
 	</ItemGroup>

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelCopyComponent.razor.cs

@@ -10,6 +10,7 @@
 
 using Mapster;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Gateway.Application;
 
 using Yitter.IdGenerator;
@@ -54,14 +55,14 @@ public partial class ChannelCopyComponent
             for (int i = 0; i < CopyCount; i++)
             {
                 Channel channel = Model.Adapt<Channel>();
-                channel.Id = YitIdHelper.NextId();
+                channel.Id = CommonUtils.GetSingleId();
                 channel.Name = $"{CopyChannelNamePrefix}{CopyChannelNameSuffixNumber + i}";
 
                 int index = 0;
                 foreach (var item in Devices)
                 {
                     Device device = item.Key.Adapt<Device>();
-                    device.Id = YitIdHelper.NextId();
+                    device.Id = CommonUtils.GetSingleId();
                     device.Name = $"{channel.Name}_{CopyDeviceNamePrefix}{CopyDeviceNameSuffixNumber + (index++)}";
                     device.ChannelId = channel.Id;
                     List<Variable> variables = new();
@@ -69,7 +70,7 @@ public partial class ChannelCopyComponent
                     foreach (var variable in item.Value)
                     {
                         Variable v = variable.Adapt<Variable>();
-                        v.Id = YitIdHelper.NextId();
+                        v.Id = CommonUtils.GetSingleId();
                         v.DeviceId = device.Id;
                         variables.Add(v);
                     }

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelTable.razor.cs

@@ -220,9 +220,10 @@ public partial class ChannelTable : IDisposable
 
     private async Task ExcelExportAsync(ITableExportContext<ChannelRuntime> tableExportContext, bool all = false)
     {
+        bool ret;
         if (all)
         {
-            await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new() });
+            ret = await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new() });
         }
         else
         {
@@ -230,16 +231,16 @@ public partial class ChannelTable : IDisposable
             {
 
                 case ChannelDevicePluginTypeEnum.PluginName:
-                    await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new(), PluginName = SelectModel.PluginName });
+                    ret = await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new(), PluginName = SelectModel.PluginName });
                     break;
                 case ChannelDevicePluginTypeEnum.Channel:
-                    await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new(), ChannelId = SelectModel.ChannelRuntime.Id });
+                    ret = await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new(), ChannelId = SelectModel.ChannelRuntime.Id });
                     break;
                 case ChannelDevicePluginTypeEnum.Device:
-                    await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new(), DeviceId = SelectModel.DeviceRuntime.Id, PluginType = SelectModel.DeviceRuntime.PluginType });
+                    ret = await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new(), DeviceId = SelectModel.DeviceRuntime.Id, PluginType = SelectModel.DeviceRuntime.PluginType });
                     break;
                 default:
-                    await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new() });
+                    ret = await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new() });
 
                     break;
             }
@@ -247,7 +248,8 @@ public partial class ChannelTable : IDisposable
         }
 
         // 返回 true 时自动弹出提示框
-        await ToastService.Default();
+        if (ret)
+            await ToastService.Default();
     }
 
     async Task ExcelChannelAsync(ITableExportContext<ChannelRuntime> tableExportContext)

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTree.razor.cs

@@ -530,20 +530,21 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
     }
     async Task ExportCurrentChannel(ContextMenuItem item, object value)
     {
+        bool ret;
         if (value is not ChannelDeviceTreeItem channelDeviceTreeItem) return;
 
         if (channelDeviceTreeItem.TryGetChannelRuntime(out var channelRuntime))
         {
-            await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new(), DeviceId = channelRuntime.Id });
+            ret = await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new(), DeviceId = channelRuntime.Id });
         }
         else if (channelDeviceTreeItem.TryGetPluginName(out var pluginName))
         {
             //插件名称
-            await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new(), PluginName = pluginName });
+            ret = await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new(), PluginName = pluginName });
         }
         else if (channelDeviceTreeItem.TryGetPluginType(out var pluginType))
         {
-            await GatewayExportService.OnChannelExport(new ExportFilter() { QueryPageOptions = new(), PluginType = pluginType });
+            ret = await GatewayExportService.OnChannelExport(new ExportFilter() { QueryPageOptions = new(), PluginType = pluginType });
         }
         else
         {
@@ -551,14 +552,17 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
         }
 
         // 返回 true 时自动弹出提示框
-        await ToastService.Default();
+        if (ret)
+            await ToastService.Default();
     }
     async Task ExportAllChannel(ContextMenuItem item, object value)
     {
-        await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new() });
+        bool ret;
+        ret = await GatewayExportService.OnChannelExport(new() { QueryPageOptions = new() });
 
         // 返回 true 时自动弹出提示框
-        await ToastService.Default();
+        if (ret)
+            await ToastService.Default();
     }
 
 
@@ -1065,25 +1069,26 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
 
     async Task ExportCurrentDevice(ContextMenuItem item, object value)
     {
+        bool ret;
         if (value is not ChannelDeviceTreeItem channelDeviceTreeItem) return;
 
         if (channelDeviceTreeItem.TryGetDeviceRuntime(out var deviceRuntime))
         {
-            await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new(), DeviceId = deviceRuntime.Id });
+            ret = await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new(), DeviceId = deviceRuntime.Id });
         }
         else if (channelDeviceTreeItem.TryGetChannelRuntime(out var channelRuntime))
         {
-            await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new(), ChannelId = channelRuntime.Id });
+            ret = await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new(), ChannelId = channelRuntime.Id });
         }
         else if (channelDeviceTreeItem.TryGetPluginName(out var pluginName))
         {
             //插件名称
-            await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new(), PluginName = pluginName });
+            ret = await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new(), PluginName = pluginName });
         }
         else if (channelDeviceTreeItem.TryGetPluginType(out var pluginType))
         {
             //采集
-            await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new(), PluginType = pluginType });
+            ret = await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new(), PluginType = pluginType });
         }
         else
         {
@@ -1091,14 +1096,17 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
         }
 
         // 返回 true 时自动弹出提示框
-        await ToastService.Default();
+        if (ret)
+            await ToastService.Default();
     }
     async Task ExportAllDevice(ContextMenuItem item, object value)
     {
-        await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new() });
+        bool ret;
+        ret = await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new() });
 
         // 返回 true 时自动弹出提示框
-        await ToastService.Default();
+        if (ret)
+            await ToastService.Default();
     }
 
     async Task ImportDevice(ContextMenuItem item, object value)
@@ -1299,7 +1307,6 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
             try
             {
                 if (Disposed) return;
-                await Task.Delay(1000);
                 await OnClickSearch(SearchText);
 
                 Value = GetValue(Value);
@@ -1311,6 +1318,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
             }
             finally
             {
+                await Task.Delay(1000);
                 _isExecuting = false;
             }
         }

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceCopyComponent.razor.cs

@@ -10,6 +10,7 @@
 
 using Mapster;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Gateway.Application;
 
 using Yitter.IdGenerator;
@@ -50,14 +51,14 @@ public partial class DeviceCopyComponent
             for (int i = 0; i < CopyCount; i++)
             {
                 Device device = Model.Adapt<Device>();
-                device.Id = YitIdHelper.NextId();
+                device.Id = CommonUtils.GetSingleId();
                 device.Name = $"{CopyDeviceNamePrefix}{CopyDeviceNameSuffixNumber + i}";
                 List<Variable> variables = new();
 
                 foreach (var item in Variables)
                 {
                     Variable v = item.Adapt<Variable>();
-                    v.Id = YitIdHelper.NextId();
+                    v.Id = CommonUtils.GetSingleId();
                     v.DeviceId = device.Id;
                     variables.Add(v);
                 }

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceTable.razor.cs

@@ -221,9 +221,10 @@ public partial class DeviceTable : IDisposable
 
     private async Task ExcelExportAsync(ITableExportContext<DeviceRuntime> tableExportContext, bool all = false)
     {
+        bool ret;
         if (all)
         {
-            await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new() });
+            ret = await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new() });
         }
         else
         {
@@ -231,16 +232,16 @@ public partial class DeviceTable : IDisposable
             {
 
                 case ChannelDevicePluginTypeEnum.PluginName:
-                    await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new(), PluginName = SelectModel.PluginName });
+                    ret = await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new(), PluginName = SelectModel.PluginName });
                     break;
                 case ChannelDevicePluginTypeEnum.Channel:
-                    await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new(), ChannelId = SelectModel.ChannelRuntime.Id });
+                    ret = await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new(), ChannelId = SelectModel.ChannelRuntime.Id });
                     break;
                 case ChannelDevicePluginTypeEnum.Device:
-                    await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new(), DeviceId = SelectModel.DeviceRuntime.Id, PluginType = SelectModel.DeviceRuntime.PluginType });
+                    ret = await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new(), DeviceId = SelectModel.DeviceRuntime.Id, PluginType = SelectModel.DeviceRuntime.PluginType });
                     break;
                 default:
-                    await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new() });
+                    ret = await GatewayExportService.OnDeviceExport(new() { QueryPageOptions = new() });
 
                     break;
             }
@@ -248,7 +249,8 @@ public partial class DeviceTable : IDisposable
         }
 
         // 返回 true 时自动弹出提示框
-        await ToastService.Default();
+        if (ret)
+            await ToastService.Default();
     }
 
     async Task ExcelDeviceAsync(ITableExportContext<DeviceRuntime> tableExportContext)

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableCopyComponent.razor.cs

@@ -10,6 +10,7 @@
 
 using Mapster;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Gateway.Application;
 
 using Yitter.IdGenerator;
@@ -47,7 +48,7 @@ public partial class VariableCopyComponent
                 var variable = Model.Adapt<List<Variable>>();
                 foreach (var item in variable)
                 {
-                    item.Id = YitIdHelper.NextId();
+                    item.Id = CommonUtils.GetSingleId();
                     item.Name = $"{CopyVariableNamePrefix}{CopyVariableNameSuffixNumber + i}";
                     variables.Add(item);
                 }

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRuntimeInfo.razor.cs

@@ -268,9 +268,10 @@ public partial class VariableRuntimeInfo : IDisposable
 
     private async Task ExcelExportAsync(ITableExportContext<VariableRuntime> tableExportContext, bool all = false)
     {
+        bool ret;
         if (all)
         {
-            await GatewayExportService.OnVariableExport(new() { QueryPageOptions = new() });
+            ret = await GatewayExportService.OnVariableExport(new() { QueryPageOptions = new() });
         }
         else
         {
@@ -278,16 +279,16 @@ public partial class VariableRuntimeInfo : IDisposable
             {
 
                 case ChannelDevicePluginTypeEnum.PluginName:
-                    await GatewayExportService.OnVariableExport(new() { QueryPageOptions = new(), PluginName = SelectModel.PluginName });
+                    ret = await GatewayExportService.OnVariableExport(new() { QueryPageOptions = new(), PluginName = SelectModel.PluginName });
                     break;
                 case ChannelDevicePluginTypeEnum.Channel:
-                    await GatewayExportService.OnVariableExport(new() { QueryPageOptions = new(), ChannelId = SelectModel.ChannelRuntime.Id });
+                    ret = await GatewayExportService.OnVariableExport(new() { QueryPageOptions = new(), ChannelId = SelectModel.ChannelRuntime.Id });
                     break;
                 case ChannelDevicePluginTypeEnum.Device:
-                    await GatewayExportService.OnVariableExport(new() { QueryPageOptions = new(), DeviceId = SelectModel.DeviceRuntime.Id, PluginType = SelectModel.DeviceRuntime.PluginType });
+                    ret = await GatewayExportService.OnVariableExport(new() { QueryPageOptions = new(), DeviceId = SelectModel.DeviceRuntime.Id, PluginType = SelectModel.DeviceRuntime.PluginType });
                     break;
                 default:
-                    await GatewayExportService.OnVariableExport(new() { QueryPageOptions = new() });
+                    ret = await GatewayExportService.OnVariableExport(new() { QueryPageOptions = new() });
 
                     break;
             }
@@ -295,7 +296,8 @@ public partial class VariableRuntimeInfo : IDisposable
         }
 
         // 返回 true 时自动弹出提示框
-        await ToastService.Default();
+        if (ret)
+            await ToastService.Default();
     }
 
     async Task ExcelVariableAsync(ITableExportContext<VariableRuntime> tableExportContext)

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/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.32" 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/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/OpcUaServer.cs

@@ -357,7 +357,7 @@ public partial class OpcUaServer : BusinessBase
             {
                 StoreType = CertificateStoreType.X509Store,
                 StorePath = "CurrentUser\\UAServer_ThingsGateway",
-                SubjectName = _driverPropertys.BigTextSubjectName,
+                SubjectName = $"{_driverPropertys.BigTextSubjectName}{_driverPropertys.OpcUaStringUrl}",
                 //ValidationOptions = CertificateValidationOptions.SuppressHostNameInvalid,
             },
 

src/Plugin/ThingsGateway.Plugin.Synchronization/Synchronization/Synchronization.cs

@@ -12,6 +12,7 @@ using Mapster;
 
 using Newtonsoft.Json.Linq;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.Foundation;
 
@@ -21,6 +22,8 @@ using TouchSocket.Dmtp.Rpc;
 using TouchSocket.Rpc;
 using TouchSocket.Sockets;
 
+using Yitter.IdGenerator;
+
 namespace ThingsGateway.Plugin.Synchronization;
 
 
@@ -258,10 +261,7 @@ public partial class Synchronization : BusinessBase, IRpcDriver
                     var data = await _tcpDmtpClient.GetDmtpRpcActor().InvokeTAsync<List<DataWithDatabase>>(
                                        nameof(ReverseCallbackServer.GetData), waitInvoke).ConfigureAwait(false);
 
-                    data.ForEach(a => a.Channel.Enable = false);
+                    await Add(data, cancellationToken).ConfigureAwait(false);
-                    await GlobalData.ChannelRuntimeService.CopyAsync(data.Select(a => a.Channel).ToList(), data.SelectMany(a => a.DeviceVariables).ToDictionary(a => a.Device, a => a.Variables), true, cancellationToken).ConfigureAwait(false);
-
-                    LogMessage?.LogTrace($"ForcedSync data success");
 
                 }
             }
@@ -277,10 +277,10 @@ public partial class Synchronization : BusinessBase, IRpcDriver
                     foreach (var item in _tcpDmtpService.Clients)
                     {
                         var data = await item.GetDmtpRpcActor().InvokeTAsync<List<DataWithDatabase>>(nameof(ReverseCallbackServer.GetData), waitInvoke).ConfigureAwait(false);
-                        data.ForEach(a => a.Channel.Enable = false);
 
-                        await GlobalData.ChannelRuntimeService.CopyAsync(data.Select(a => a.Channel).ToList(), data.SelectMany(a => a.DeviceVariables).ToDictionary(a => a.Device, a => a.Variables), true, cancellationToken).ConfigureAwait(false);
+
-                        LogMessage?.LogTrace($"{item.GetIPPort()}: ForcedSync data success");
+                        await Add(data, cancellationToken).ConfigureAwait(false);
+
                     }
 
                 }
@@ -300,6 +300,25 @@ public partial class Synchronization : BusinessBase, IRpcDriver
         }
 
     }
+    private async Task Add(List<DataWithDatabase> data, CancellationToken cancellationToken)
+    {
+        data.ForEach(a =>
+        {
+            a.Channel.Enable = false;
+            a.Channel.Id = CommonUtils.GetSingleId();
+            a.DeviceVariables.ForEach(b =>
+            {
+                b.Device.Id = 0;
+                b.Variables.ForEach(c =>
+                {
+                    c.Id = 0;
+                });
+            });
+        });
+        await GlobalData.ChannelRuntimeService.CopyAsync(data.Select(a => a.Channel).ToList(), data.SelectMany(a => a.DeviceVariables).ToDictionary(a => a.Device, a => a.Variables), true, cancellationToken).ConfigureAwait(false);
+
+        LogMessage?.LogTrace($"ForcedSync data success");
+    }
 
     /// <summary>
     /// 异步写入方法

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;
 
@@ -110,6 +109,7 @@ public class Startup : AppStartup
             // setting.Converters.Add(new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }); // 解决DateTimeOffset异常
         }
         ;
+        services.AddMvcFilter<RequestAuditFilter>();
 
         services.AddControllers()
             .AddNewtonsoftJson(options => SetNewtonsoftJsonSetting(options.SerializerSettings))
@@ -138,7 +138,8 @@ public class Startup : AppStartup
         {
             options.WriteFilter = (logMsg) =>
             {
-                return true;
+                if (logMsg.Message.IsNullOrEmpty()) return false;
+                else return true;
             };
 
             options.MessageFormat = (logMsg) =>
@@ -188,39 +189,40 @@ public class Startup : AppStartup
         #region api日志
 
         //Monitor日志配置
-        services.AddMonitorLogging(options =>
+        //services.AddMonitorLogging(options =>
-        {
+        //{
-            options.JsonIndented = true;// 是否美化 JSON
+        //    options.JsonIndented = true;// 是否美化 JSON
-            options.GlobalEnabled = false;//全局启用
+        //    options.GlobalEnabled = false;//全局启用
-            options.ConfigureLogger((logger, logContext, context) =>
+        //    options.ConfigureLogger((logger, logContext, context) =>
-            {
+        //    {
-                var httpContext = context.HttpContext;//获取httpContext
+        //        var httpContext = context.HttpContext;//获取httpContext
 
-                //获取客户端信息
+        //        //获取客户端信息
-                var client = App.GetService<IAppService>().UserAgent;
+        //        var client = App.GetService<IAppService>().UserAgent;
-                // 获取控制器/操作描述器
+        //        // 获取控制器/操作描述器
-                var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
+        //        var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
-                //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
+        //        //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
-                var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
+        //        var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
 
-                var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
+        //        var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
-                //获取特性
+        //        //获取特性
-                option = desc.Value;//则将操作名称赋值为控制器上写的title
+        //        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.AddDatabaseLogging<DatabaseLoggingWriter>(options =>
         {
             options.WriteFilter = (logMsg) =>
             {
-                return logMsg.LogName == "System.Logging.LoggingMonitor";//只写入LoggingMonitor日志
+                return logMsg.LogName == "System.Logging.RequestAudit";
             };
         });
 

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;
 
@@ -89,6 +88,8 @@ public class Startup : AppStartup
         }
         ;
 
+        services.AddMvcFilter<RequestAuditFilter>();
+
         services.AddControllers()
             .AddNewtonsoftJson(options => SetNewtonsoftJsonSetting(options.SerializerSettings))
             //.AddXmlSerializerFormatters()
@@ -161,7 +162,8 @@ public class Startup : AppStartup
         {
             options.WriteFilter = (logMsg) =>
             {
-                return true;
+                if (logMsg.Message.IsNullOrEmpty()) return false;
+                else return true;
             };
 
             options.MessageFormat = (logMsg) =>
@@ -211,39 +213,39 @@ public class Startup : AppStartup
         #region api日志
 
         //Monitor日志配置
-        services.AddMonitorLogging(options =>
+        //services.AddMonitorLogging(options =>
-        {
+        //{
-            options.JsonIndented = true;// 是否美化 JSON
+        //    options.JsonIndented = true;// 是否美化 JSON
-            options.GlobalEnabled = false;//全局启用
+        //    options.GlobalEnabled = false;//全局启用
-            options.ConfigureLogger((logger, logContext, context) =>
+        //    options.ConfigureLogger((logger, logContext, context) =>
-            {
+        //    {
-                var httpContext = context.HttpContext;//获取httpContext
+        //        var httpContext = context.HttpContext;//获取httpContext
 
-                //获取客户端信息
+        //        //获取客户端信息
-                var userAgent = App.GetService<IAppService>().UserAgent;
+        //        var userAgent = App.GetService<IAppService>().UserAgent;
-                // 获取控制器/操作描述器
+        //        // 获取控制器/操作描述器
-                var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
+        //        var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
-                //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
+        //        //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
-                var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
+        //        var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
 
-                var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
+        //        var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
-                //获取特性
+        //        //获取特性
-                option = desc.Value;//则将操作名称赋值为控制器上写的title
+        //        option = desc.Value;//则将操作名称赋值为控制器上写的title
 
-                logContext.Set(LoggingConst.CateGory, option);//传操作名称
+        //        logContext.Set(LoggingConst.CateGory, option);//传操作名称
-                logContext.Set(LoggingConst.Operation, option);//传操作名称
+        //        logContext.Set(LoggingConst.Operation, option);//传操作名称
-                logContext.Set(LoggingConst.Client, userAgent);//客户端信息
+        //        logContext.Set(LoggingConst.Client, userAgent);//客户端信息
-                logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
+        //        logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
-                logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
+        //        logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
-            });
+        //    });
-        });
+        //});
 
         //日志写入数据库配置
         services.AddDatabaseLogging<DatabaseLoggingWriter>(options =>
         {
             options.WriteFilter = (logMsg) =>
             {
-                return logMsg.LogName == "System.Logging.LoggingMonitor";//只写入LoggingMonitor日志
+                return logMsg.LogName == "System.Logging.RequestAudit";
             };
         });
 

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/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;
 
@@ -85,6 +83,7 @@ public class Startup : AppStartup
             // setting.Converters.Add(new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }); // 解决DateTimeOffset异常
         }
         ;
+        services.AddMvcFilter<RequestAuditFilter>();
 
         services.AddControllers()
             .AddNewtonsoftJson(options => SetNewtonsoftJsonSetting(options.SerializerSettings))
@@ -158,16 +157,8 @@ public class Startup : AppStartup
         {
             options.WriteFilter = (logMsg) =>
             {
-                return true;
+                if (string.IsNullOrEmpty(logMsg.Message)) return false;
-                ////如果不是LoggingMonitor日志才格式化
+                else return true;
-                //if (logMsg.LogName != "System.Logging.LoggingMonitor")
-                //{
-                //    return true;
-                //}
-                //else
-                //{
-                //    return false;
-                //}
             };
 
             options.MessageFormat = (logMsg) =>
@@ -217,39 +208,39 @@ public class Startup : AppStartup
         #region api日志
 
         //Monitor日志配置
-        services.AddMonitorLogging(options =>
+        //services.AddMonitorLogging(options =>
-        {
+        //{
-            options.JsonIndented = true;// 是否美化 JSON
+        //    options.JsonIndented = true;// 是否美化 JSON
-            options.GlobalEnabled = false;//全局启用
+        //    options.GlobalEnabled = false;//全局启用
-            options.ConfigureLogger((logger, logContext, context) =>
+        //    options.ConfigureLogger((logger, logContext, context) =>
-            {
+        //    {
-                var httpContext = context.HttpContext;//获取httpContext
+        //        var httpContext = context.HttpContext;//获取httpContext
 
-                //获取客户端信息
+        //        //获取客户端信息
-                var client = App.GetService<IAppService>().UserAgent;
+        //        var client = App.GetService<IAppService>().UserAgent;
-                // 获取控制器/操作描述器
+        //        // 获取控制器/操作描述器
-                var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
+        //        var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
-                //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
+        //        //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
-                var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
+        //        var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
 
-                var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
+        //        var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
-                //获取特性
+        //        //获取特性
-                option = desc.Value;//则将操作名称赋值为控制器上写的title
+        //        option = desc.Value;//则将操作名称赋值为控制器上写的title
 
-                logContext.Set(LoggingConst.CateGory, option);//传操作名称
+        //        logContext.Set(LoggingConst.CateGory, option);//传操作名称
-                logContext.Set(LoggingConst.Operation, option);//传操作名称
+        //        logContext.Set(LoggingConst.Operation, option);//传操作名称
-                logContext.Set(LoggingConst.Client, client);//客户端信息
+        //        logContext.Set(LoggingConst.Client, client);//客户端信息
-                logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
+        //        logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
-                logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
+        //        logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
-            });
+        //    });
-        });
+        //});
 
         //日志写入数据库配置
         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.19</Version>
+    <Version>10.6.28</Version>
   </PropertyGroup>
 
   <ItemGroup>