优化硬件信息曲线数据

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

@@ -115,7 +115,7 @@ public sealed class OperDescAttribute : MoAttribute
     private SysOperateLog GetOperLog(Type? localizerType, MethodContext context)
     {
         var methodBase = context.Method;
-        var clientInfo = AppService.ClientInfo;
+        var userAgent = AppService.UserAgent;
         string? paramJson = null;
         if (IsRecordPar)
         {
@@ -127,10 +127,10 @@ public sealed class OperDescAttribute : MoAttribute
             {
                 parametersDict[parametersInfo[i].Name!] = args[i];
             }
-            paramJson = parametersDict.ToJsonNetString();
+            paramJson = parametersDict.ToSystemTextJsonString();
         }
         var result = context.ReturnValue;
-        var resultJson = IsRecordPar ? result?.ToJsonNetString() : null;
+        var resultJson = IsRecordPar ? result?.ToSystemTextJsonString() : null;
         //操作日志表实体
         var log = new SysOperateLog
         {
@@ -138,8 +138,8 @@ public sealed class OperDescAttribute : MoAttribute
             Category = LogCateGoryEnum.Operate,
             ExeStatus = true,
             OpIp = AppService?.RemoteIpAddress ?? string.Empty,
-            OpBrowser = clientInfo?.UA?.Family + clientInfo?.UA?.Major,
-            OpOs = clientInfo?.OS?.Family + clientInfo?.OS?.Major,
+            OpBrowser = userAgent?.Browser,
+            OpOs = userAgent?.Platform,
             OpTime = DateTime.Now,
             OpAccount = UserManager.UserAccount,
             ReqUrl = null,

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

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

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

@@ -17,6 +17,7 @@ using System.Runtime.InteropServices;
 
 using ThingsGateway.Extension;
 using ThingsGateway.NewLife;
+using ThingsGateway.NewLife.Caching;
 using ThingsGateway.NewLife.Threading;
 using ThingsGateway.Schedule;
 
@@ -51,11 +52,20 @@ public class HardwareJob : IJob, IHardwareJob
 
     #endregion 属性
 
+    private MemoryCache MemoryCache = new() { };
+    private const string CacheKey = "HistoryHardwareInfo";
     /// <inheritdoc/>
     public async Task<List<HistoryHardwareInfo>> GetHistoryHardwareInfos()
     {
-        using var db = DbContext.Db.GetConnectionScopeWithAttr<HistoryHardwareInfo>().CopyNew();
-        return await db.Queryable<HistoryHardwareInfo>().ToListAsync().ConfigureAwait(false);
+        var historyHardwareInfos = MemoryCache.Get<List<HistoryHardwareInfo>>(CacheKey);
+        if (historyHardwareInfos == null)
+        {
+            using var db = DbContext.Db.GetConnectionScopeWithAttr<HistoryHardwareInfo>().CopyNew();
+            historyHardwareInfos = await db.Queryable<HistoryHardwareInfo>().Where(a => a.Date > DateTime.Now.AddDays(-3)).ToListAsync().ConfigureAwait(false);
+
+            MemoryCache.Set(CacheKey, historyHardwareInfos);
+        }
+        return historyHardwareInfos;
     }
 
     private bool error = false;
@@ -94,7 +104,7 @@ public class HardwareJob : IJob, IHardwareJob
             {
                 HardwareInfo.MachineInfo.Refresh();
                 HardwareInfo.UpdateTime = TimerX.Now.ToDefaultDateTimeFormat();
-                HardwareInfo.WorkingSet = (Environment.WorkingSet / 1024.0 / 1024.0).ToString("F2");
+                HardwareInfo.WorkingSet = (Environment.WorkingSet / 1024.0 / 1024.0).ToInt();
                 error = false;
             }
             catch (Exception ex)
@@ -116,17 +126,22 @@ public class HardwareJob : IJob, IHardwareJob
                             var his = new HistoryHardwareInfo()
                             {
                                 Date = TimerX.Now,
-                                DriveUsage = (100 - (HardwareInfo.DriveInfo.TotalFreeSpace * 100.00 / HardwareInfo.DriveInfo.TotalSize)).ToString("F2"),
-                                Battery = (HardwareInfo.MachineInfo.Battery * 100).ToString("F2"),
+                                DriveUsage = (100 - (HardwareInfo.DriveInfo.TotalFreeSpace * 100.00 / HardwareInfo.DriveInfo.TotalSize)).ToInt(),
+                                Battery = (HardwareInfo.MachineInfo.Battery * 100).ToInt(),
                                 MemoryUsage = (HardwareInfo.WorkingSet),
-                                CpuUsage = (HardwareInfo.MachineInfo.CpuRate * 100).ToString("F2"),
-                                Temperature = (HardwareInfo.MachineInfo.Temperature).ToString("F2"),
+                                CpuUsage = (HardwareInfo.MachineInfo.CpuRate * 100).ToInt(),
+                                Temperature = (HardwareInfo.MachineInfo.Temperature).ToInt(),
                             };
                             await db.Insertable(his).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
+                            MemoryCache.Remove(CacheKey);
                         }
                         var sevenDaysAgo = TimerX.Now.AddDays(-HardwareInfoOptions.DaysAgo);
                         //删除特定信息
-                        await db.Deleteable<HistoryHardwareInfo>(a => a.Date <= sevenDaysAgo).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
+                        var result = await db.Deleteable<HistoryHardwareInfo>(a => a.Date <= sevenDaysAgo).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
+                        if (result > 0)
+                        {
+                            MemoryCache.Remove(CacheKey);
+                        }
                     }
                 }
                 error = false;

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

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

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

@@ -18,8 +18,6 @@ using ThingsGateway.Logging;
 using ThingsGateway.NewLife.Json.Extension;
 using ThingsGateway.Razor;
 
-using UAParser;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
@@ -53,7 +51,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
         if (loggingMonitor.Validation == null)
         {
             var operation = logMsg.Context.Get(LoggingConst.Operation).ToString();//获取操作名称
-            var client = (ClientInfo)logMsg.Context.Get(LoggingConst.Client);//获取客户端信息
+            var client = (UserAgent)logMsg.Context.Get(LoggingConst.Client);//获取客户端信息
             var path = logMsg.Context.Get(LoggingConst.Path).ToString();//获取操作名称
             var method = logMsg.Context.Get(LoggingConst.Method).ToString();//获取方法
             //表示访问日志
@@ -92,16 +90,16 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
     /// <param name="operation">操作名称</param>
     /// <param name="path">请求地址</param>
     /// <param name="loggingMonitor">loggingMonitor</param>
-    /// <param name="clientInfo">客户端信息</param>
+    /// <param name="userAgent">客户端信息</param>
     /// <param name="flush"></param>
     /// <returns></returns>
-    private async Task<bool> CreateOperationLog(string operation, string path, LoggingMonitorJson loggingMonitor, ClientInfo clientInfo, bool flush)
+    private async Task<bool> CreateOperationLog(string operation, string path, LoggingMonitorJson loggingMonitor, UserAgent userAgent, bool flush)
     {
         //账号
         var opAccount = loggingMonitor.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.ToJsonNetString();
+        var paramJson = loggingMonitor.Parameters == null || loggingMonitor.Parameters.Count == 0 ? null : loggingMonitor.Parameters[0].Value.ToSystemTextJsonString();
 
         //获取结果json字符串
         var resultJson = string.Empty;
@@ -109,7 +107,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
         {
             if (loggingMonitor.ReturnInformation.Value != null)//如果返回值不为空
             {
-                resultJson = loggingMonitor.ReturnInformation.Value.ToJsonNetString();
+                resultJson = loggingMonitor.ReturnInformation.Value.ToSystemTextJsonString();
             }
         }
 
@@ -120,8 +118,8 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
             Category = LogCateGoryEnum.Operate,
             ExeStatus = true,
             OpIp = loggingMonitor.RemoteIPv4,
-            OpBrowser = clientInfo?.UA?.Family + clientInfo?.UA?.Major,
-            OpOs = clientInfo?.OS?.Family + clientInfo?.OS?.Major,
+            OpBrowser = userAgent?.Browser,
+            OpOs = userAgent?.Platform,
             OpTime = loggingMonitor.LogDateTime.LocalDateTime,
             OpAccount = opAccount,
             ReqMethod = loggingMonitor.HttpMethod,
@@ -161,16 +159,16 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
     /// <param name="operation">访问类型</param>
     /// <param name="path"></param>
     /// <param name="loggingMonitor">loggingMonitor</param>
-    /// <param name="clientInfo">客户端信息</param>
+    /// <param name="userAgent">客户端信息</param>
     /// <param name="flush"></param>
-    private async Task<bool> CreateVisitLog(string operation, string path, LoggingMonitorJson loggingMonitor, ClientInfo clientInfo, bool flush)
+    private async Task<bool> CreateVisitLog(string operation, string path, LoggingMonitorJson loggingMonitor, UserAgent userAgent, bool flush)
     {
         long verificatId = 0;//验证Id
         var opAccount = "";//用户账号
         if (path == "/api/auth/login")
         {
             //如果是登录，用户信息就从返回值里拿
-            var result = loggingMonitor.ReturnInformation?.Value?.ToJsonNetString();//返回值转json
+            var result = loggingMonitor.ReturnInformation?.Value?.ToSystemTextJsonString();//返回值转json
             var userInfo = result.FromJsonNetString<UnifyResult<LoginOutput>>();//格式化成user表
             opAccount = userInfo.Data.Account;//赋值账号
             verificatId = userInfo.Data.VerificatId;
@@ -188,18 +186,18 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
             Category = path == "/api/auth/login" ? LogCateGoryEnum.Login : LogCateGoryEnum.Logout,
             ExeStatus = true,
             OpIp = loggingMonitor.RemoteIPv4,
-            OpBrowser = clientInfo?.UA?.Family + clientInfo?.UA?.Major,
-            OpOs = clientInfo?.OS?.Family + clientInfo?.OS?.Major,
+            OpBrowser = userAgent?.Browser,
+            OpOs = userAgent?.Platform,
             OpTime = loggingMonitor.LogDateTime.LocalDateTime,
             VerificatId = verificatId,
             OpAccount = opAccount,
 
             ReqMethod = loggingMonitor.HttpMethod,
             ReqUrl = path,
-            ResultJson = loggingMonitor.ReturnInformation?.Value?.ToJsonNetString(),
+            ResultJson = loggingMonitor.ReturnInformation?.Value?.ToSystemTextJsonString(),
             ClassName = loggingMonitor.DisplayName,
             MethodName = loggingMonitor.ActionName,
-            ParamJson = loggingMonitor.Parameters?.ToJsonNetString(),
+            ParamJson = loggingMonitor.Parameters?.ToSystemTextJsonString(),
         };
         _operateLogMessageQueue.Enqueue(sysLogVisit);
 

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

@@ -15,12 +15,15 @@ using Microsoft.AspNetCore.WebUtilities;
 
 using System.Security.Claims;
 
-using UAParser;
-
 namespace ThingsGateway.Admin.Application;
 
 public class AppService : IAppService
 {
+    private readonly IUserAgentService UserAgentService;
+    public AppService(IUserAgentService userAgentService)
+    {
+        UserAgentService = userAgentService;
+    }
     public string GetReturnUrl(string returnUrl)
     {
         var url = QueryHelpers.AddQueryString(CookieAuthenticationDefaults.LoginPath, new Dictionary<string, string?>
@@ -41,18 +44,16 @@ public class AppService : IAppService
         {
         }
     }
-    public Parser Parser = Parser.GetDefault();
-    public ClientInfo? ClientInfo
+    public UserAgent? UserAgent
     {
         get
         {
             var str = App.HttpContext?.Request?.Headers?.UserAgent;
-            ClientInfo? clientInfo = null;
             if (!string.IsNullOrEmpty(str))
             {
-                clientInfo = Parser.Parse(str);
+                return UserAgentService.Parse(str);
             }
-            return clientInfo;
+            return null;
         }
     }
 

src/Admin/ThingsGateway.Admin.Application/Services/AppService/HybridAppService.cs

@@ -13,19 +13,17 @@ using Microsoft.Extensions.DependencyInjection;
 
 using System.Security.Claims;
 
-using UAParser;
-
 namespace ThingsGateway.Admin.Application;
 
 public class HybridAppService : IAppService
 {
-    public HybridAppService()
+    public HybridAppService(IUserAgentService userAgentService)
     {
         var str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 Edg/127.0.0.0";
-        ClientInfo = Parser.GetDefault().Parse(str);
+        UserAgent = userAgentService.Parse(str);
         RemoteIpAddress = "127.0.0.1";
     }
-    public ClientInfo? ClientInfo { get; }
+    public UserAgent? UserAgent { get; }
 
     private static BlazorHybridAuthenticationStateProvider _authenticationStateProvider;
     private static BlazorHybridAuthenticationStateProvider AuthenticationStateProvider

src/Admin/ThingsGateway.Admin.Application/Services/AppService/IAppService.cs

@@ -11,8 +11,6 @@
 
 using System.Security.Claims;
 
-using UAParser;
-
 namespace ThingsGateway.Admin.Application;
 
 public interface IAppService
@@ -20,7 +18,7 @@ public interface IAppService
     /// <summary>
     /// ClientInfo
     /// </summary>
-    public ClientInfo? ClientInfo { get; }
+    public UserAgent? UserAgent { get; }
 
     /// <summary>
     /// ClaimsPrincipal

src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthService.cs

@@ -237,7 +237,7 @@ public class AuthService : IAuthService
         var logingEvent = new LoginEvent
         {
             Ip = _appService.RemoteIpAddress,
-            Device = App.GetService<IAppService>().ClientInfo?.OS?.ToString(),
+            Device = App.GetService<IAppService>().UserAgent?.Platform,
             Expire = expire,
             SysUser = sysUser,
             VerificatId = verificatId

src/Admin/ThingsGateway.Admin.Application/Services/Dict/SysDictService.cs

@@ -77,7 +77,7 @@ internal sealed class SysDictService : BaseService<SysDict>, ISysDictService
         //更新数据
         List<SysDict> dicts = new List<SysDict>()
         {
-            new SysDict() { DictType = DictTypeEnum.System, Category = nameof(PagePolicy), Name = nameof(PagePolicy.Shortcuts), Code = input.Shortcuts.ToJsonNetString() },
+            new SysDict() { DictType = DictTypeEnum.System, Category = nameof(PagePolicy), Name = nameof(PagePolicy.Shortcuts), Code = input.Shortcuts.ToSystemTextJsonString() },
     };
         var storageable = await db.Storageable(dicts).WhereColumns(it => new { it.DictType, it.Category, it.Name }).ToStorageAsync().ConfigureAwait(false);
 

src/Admin/ThingsGateway.Admin.Application/Services/Role/SysRoleService.cs

@@ -277,7 +277,7 @@ internal sealed class SysRoleService : BaseService<SysRole>, ISysRoleService
         if (isSuperAdmin)
             throw Oops.Bah(Localizer["CanotGrantAdmin"]);
         var menuIds = input.GrantInfoList.Select(it => it.MenuId).ToList();//菜单ID
-        var extJsons = input.GrantInfoList.Select(it => it.ToJsonNetString()).ToList();//拓展信息
+        var extJsons = input.GrantInfoList.Select(it => it.ToSystemTextJsonString()).ToList();//拓展信息
         var relationRoles = new List<SysRelation>();//要添加的角色资源和授权关系表
         var sysRole = (await GetAllAsync().ConfigureAwait(false)).FirstOrDefault(it => it.Id == input.Id);//获取角色
 
@@ -338,7 +338,7 @@ internal sealed class SysRoleService : BaseService<SysRole>, ISysRoleService
                     ExtJson = new RelationPermission
                     {
                         ApiUrl = it.ApiRoute,
-                    }.ToJsonNetString()
+                    }.ToSystemTextJsonString()
                 });
                 relationRoles.AddRange(relationRolePer);//合并列表
             }
@@ -410,7 +410,7 @@ internal sealed class SysRoleService : BaseService<SysRole>, ISysRoleService
         if (sysRole != null)
         {
             await _relationService.SaveRelationBatchAsync(RelationCategoryEnum.RoleHasOpenApiPermission, input.Id,
-                 input.GrantInfoList.Select(a => (a.ApiUrl, a.ToJsonNetString()))
+                 input.GrantInfoList.Select(a => (a.ApiUrl, a.ToSystemTextJsonString()))
                 , true).ConfigureAwait(false);//添加到数据库
             await ClearTokenUtil.DeleteUserCacheByRoleIds(new List<long> { input.Id }).ConfigureAwait(false);//清除角色下用户缓存
         }

src/Admin/ThingsGateway.Admin.Application/Services/User/SysUserService.cs

@@ -435,7 +435,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
         if (sysUser != null)
         {
             await _relationService.SaveRelationBatchAsync(RelationCategoryEnum.UserHasOpenApiPermission, input.Id,
-                 input.GrantInfoList.Select(a => (a.ApiUrl, a.ToJsonNetString())),
+                 input.GrantInfoList.Select(a => (a.ApiUrl, a.ToSystemTextJsonString())),
                 true).ConfigureAwait(false);//添加到数据库
             DeleteUserFromCache(input.Id);
         }
@@ -557,7 +557,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
     public async Task GrantResourceAsync(GrantResourceData input)
     {
         var menuIds = input.GrantInfoList.Select(it => it.MenuId).ToList();//菜单ID
-        var extJsons = input.GrantInfoList.Select(it => it.ToJsonNetString()).ToList();//拓展信息
+        var extJsons = input.GrantInfoList.Select(it => it.ToSystemTextJsonString()).ToList();//拓展信息
         var relationUsers = new List<SysRelation>();//要添加的用户资源和授权关系表
         var sysUser = await GetUserByIdAsync(input.Id).ConfigureAwait(false);//获取用户
         await CheckApiDataScopeAsync(sysUser.OrgId, sysUser.CreateUserId).ConfigureAwait(false);
@@ -613,7 +613,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
                     TargetId = it.ApiRoute,
                     Category = RelationCategoryEnum.UserHasPermission,
                     ExtJson = new RelationPermission { ApiUrl = it.ApiRoute }
-                            .ToJsonNetString()
+                            .ToSystemTextJsonString()
                 });
                 relationUsers.AddRange(relationUserPer);//合并列表
             }

src/Admin/ThingsGateway.Admin.Application/Services/UserCenter/UserCenterService.cs

@@ -203,7 +203,7 @@ internal sealed class UserCenterService : BaseService<SysUser>, IUserCenterServi
     public async Task UpdateWorkbenchInfoAsync(WorkbenchInfo input)
     {
         //关系表保存个人工作台
-        await _relationService.SaveRelationAsync(RelationCategoryEnum.UserWorkbenchData, input.Id, null, input.Shortcuts.ToJsonNetString(),
+        await _relationService.SaveRelationAsync(RelationCategoryEnum.UserWorkbenchData, input.Id, null, input.Shortcuts.ToSystemTextJsonString(),
             true).ConfigureAwait(false);
     }
 

src/Admin/ThingsGateway.Admin.Application/Services/VerificatInfo/VerificatInfoService.cs

@@ -10,9 +10,6 @@
 
 using SqlSugar;
 
-using ThingsGateway.List;
-using ThingsGateway.NewLife.Json.Extension;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
@@ -169,7 +166,7 @@ internal sealed class VerificatInfoService : BaseService<VerificatInfo>, IVerifi
     public void RemoveAllClientId()
     {
         using var db = GetDB();
-        db.Updateable<VerificatInfo>().SetColumns(a=>a.ClientIds==null).Where(a => a.Id > 0).ExecuteCommand();
+        db.Updateable<VerificatInfo>().SetColumns(a => a.ClientIds == null).Where(a => a.Id > 0).ExecuteCommand();
         VerificatInfoService.RemoveCache();
     }
 

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

@@ -36,6 +36,7 @@ public class Startup : AppStartup
         services.AddSingleton<ISugarAopService, SugarAopService>();
         services.AddSingleton<ISugarConfigAopService, SugarConfigAopService>();
 
+        services.AddSingleton<IUserAgentService, UserAgentService>();
         services.AddSingleton<IAppService, AppService>();
 
         StaticConfig.EnableAllWhereIF = true;

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

@@ -19,7 +19,6 @@
 	
 	<ItemGroup>
 		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.4" />
-		<PackageReference Include="UAParser" Version="3.1.47" />
 		<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
 		<PackageReference Include="SqlSugarCore" Version="5.1.4.193" />
 	</ItemGroup>

src/Admin/ThingsGateway.Admin.Application/UserAgent/IUserAgentService.cs

@@ -0,0 +1,14 @@
+namespace ThingsGateway.Admin.Application
+{
+    /// <summary>Default interface for UserAgentService</summary>
+    public interface IUserAgentService
+    {
+        /// <summary>Gets or sets the settings.</summary>
+        public UserAgentSettings Settings { get; set; }
+
+        /// <summary>Parses the specified user agent string.</summary>
+        /// <param name="userAgentString">The user agent string.</param>
+        /// <returns>An UserAgent object</returns>
+        UserAgent? Parse(string userAgentString);
+    }
+}

src/Admin/ThingsGateway.Admin.Application/UserAgent/UserAgent.cs

@@ -0,0 +1,145 @@
+using System.Text.RegularExpressions;
+
+namespace ThingsGateway.Admin.Application
+{
+    /// <summary>
+    /// Parsed UserAgent object
+    /// </summary>
+    public class UserAgent
+    {
+        private readonly UserAgentSettings settings;
+
+        internal string Agent = "";
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this UserAgent is a browser.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if this UserAgent is a browser; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsBrowser { get; set; } = false;
+        /// <summary>
+        /// Gets or sets a value indicating whether this UserAgent is a robot.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if this UserAgent is a robot; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsRobot { get; set; } = false;
+        /// <summary>
+        /// Gets or sets a value indicating whether this UserAgent is a mobile device.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if this UserAgent is a mobile device; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsMobile { get; set; } = false;
+        /// <summary>
+        /// Gets or sets the platform.
+        /// </summary>
+        /// <value>
+        /// The platform or operating system.
+        /// </value>
+        public string Platform { get; set; } = "";
+        /// <summary>
+        /// Gets or sets the browser.
+        /// </summary>
+        /// <value>
+        /// The browser.
+        /// </value>
+        public string Browser { get; set; } = "";
+        /// <summary>
+        /// Gets or sets the browser version.
+        /// </summary>
+        /// <value>
+        /// The browser version.
+        /// </value>
+        public string BrowserVersion { get; set; } = "";
+        /// <summary>
+        /// Gets or sets the mobile device.
+        /// </summary>
+        /// <value>
+        /// The mobile device.
+        /// </value>
+        public string Mobile { get; set; } = "";
+        /// <summary>
+        /// Gets or sets the robot.
+        /// </summary>
+        /// <value>
+        /// The robot.
+        /// </value>
+        public string Robot { get; set; } = "";
+
+        internal UserAgent(UserAgentSettings settings, string? userAgentString = null)
+        {
+            this.settings = settings;
+
+            if (userAgentString != null)
+            {
+                Agent = userAgentString.Trim();
+                SetPlatform();
+                if (SetRobot()) return;
+                if (SetBrowser()) return;
+                if (SetMobile()) return;
+            }
+        }
+
+        internal bool SetPlatform()
+        {
+            foreach (var item in settings.Platforms)
+            {
+                if (Regex.IsMatch(Agent, $"{Regex.Escape(item.Key)}", RegexOptions.IgnoreCase))
+                {
+                    Platform = item.Value;
+                    return true;
+                }
+            }
+            Platform = "Unknown Platform";
+            return false;
+        }
+
+        internal bool SetBrowser()
+        {
+            foreach (var item in settings.Browsers)
+            {
+                var match = Regex.Match(Agent, $@"{item.Key}.*?([0-9\.]+)", RegexOptions.IgnoreCase);
+                if (match.Success)
+                {
+                    IsBrowser = true;
+                    BrowserVersion = match.Groups[1].Value;
+                    Browser = item.Value;
+                    SetMobile();
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        internal bool SetRobot()
+        {
+            foreach (var item in settings.Robots)
+            {
+                if (Regex.IsMatch(Agent, $"{Regex.Escape(item.Key)}", RegexOptions.IgnoreCase))
+                {
+                    IsRobot = true;
+                    Robot = item.Value;
+                    SetMobile();
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        internal bool SetMobile()
+        {
+            foreach (var item in settings.Mobiles)
+            {
+                if (Agent?.IndexOf(item.Key, StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    IsMobile = true;
+                    Mobile = item.Value;
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}

src/Admin/ThingsGateway.Admin.Application/UserAgent/UserAgentService.cs

@@ -0,0 +1,43 @@
+using ThingsGateway.NewLife.Caching;
+
+namespace ThingsGateway.Admin.Application
+{
+    /// <summary>
+    /// The UserAgent service
+    /// </summary>
+    /// <seealso cref="ThingsGateway.Admin.Application.IUserAgentService" />
+    public class UserAgentService : IUserAgentService
+    {
+        /// <summary>
+        /// Gets or sets the settings.
+        /// </summary>
+        public UserAgentSettings Settings { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserAgentService"/> class.
+        /// </summary>
+        public UserAgentService()
+        {
+            Settings = new UserAgentSettings();
+        }
+
+        private MemoryCache MemoryCache { get; set; } = new();
+
+        /// <summary>
+        /// Parses the specified user agent string.
+        /// </summary>
+        /// <param name="userAgentString">The user agent string.</param>
+        /// <returns>
+        /// An UserAgent object
+        /// </returns>
+        public UserAgent? Parse(string? userAgentString)
+        {
+            userAgentString = ((userAgentString?.Length > Settings.UaStringSizeLimit) ? userAgentString?.Trim().Substring(0, Settings.UaStringSizeLimit) : userAgentString?.Trim()) ?? "";
+            return MemoryCache.GetOrAdd(userAgentString, entry =>
+            {
+                return new UserAgent(Settings, userAgentString);
+            });
+        }
+
+    }
+}

src/Admin/ThingsGateway.Admin.Application/UserAgent/UserAgentSettings.cs

@@ -0,0 +1,214 @@
+namespace ThingsGateway.Admin.Application
+{
+    /// <summary>
+    /// UserAgent settings container.
+    /// </summary>
+    public class UserAgentSettings
+    {
+        /// <summary>
+        /// Gets or sets the maximum size of the useragent string. Limiting the length of the useragent string protects from hackers sending in extremely long user agent strings.
+        /// </summary>
+        public int UaStringSizeLimit { get; set; } = 512;
+
+        /// <summary>
+        /// Gets a dictionary containing mappings for platforms.
+        /// </summary>
+        public Dictionary<string, string> Platforms { get; } = new()
+        {
+            {"windows nt 10.0", "Windows 10"},
+            {"windows nt 6.3", "Windows 8.1"},
+            {"windows nt 6.2", "Windows 8"},
+            {"windows nt 6.1", "Windows 7"},
+            {"windows nt 6.0", "Windows Vista"},
+            {"windows nt 5.2", "Windows 2003"},
+            {"windows nt 5.1", "Windows XP"},
+            {"windows nt 5.0", "Windows 2000"},
+            {"windows nt 4.0", "Windows NT 4.0"},
+            {"winnt4.0", "Windows NT 4.0"},
+            {"winnt 4.0", "Windows NT"},
+            {"winnt", "Windows NT"},
+            {"windows 98", "Windows 98"},
+            {"win98", "Windows 98"},
+            {"windows 95", "Windows 95"},
+            {"win95", "Windows 95"},
+            {"windows phone", "Windows Phone"},
+            {"windows", "Unknown Windows OS"},
+            {"android", "Android"},
+            {"blackberry", "BlackBerry"},
+            {"iphone", "iOS"},
+            {"ipad", "iOS"},
+            {"ipod", "iOS"},
+            {"os x", "Mac OS X"},
+            {"ppc mac", "Power PC Mac"},
+            {"freebsd", "FreeBSD"},
+            {"ppc", "Macintosh"},
+            {"linux", "Linux"},
+            {"debian", "Debian"},
+            {"sunos", "Sun Solaris"},
+            {"beos", "BeOS"},
+            {"apachebench", "ApacheBench"},
+            {"aix", "AIX"},
+            {"irix", "Irix"},
+            {"osf", "DEC OSF"},
+            {"hp-ux", "HP-UX"},
+            {"netbsd", "NetBSD"},
+            {"bsdi", "BSDi"},
+            {"openbsd", "OpenBSD"},
+            {"gnu", "GNU/Linux"},
+            {"unix", "Unknown Unix OS"},
+            {"symbian", "Symbian OS"},
+        };
+
+        /// <summary>
+        /// Gets a dictionary containing mappings for browsers.
+        /// </summary>
+        public Dictionary<string, string> Browsers { get; } = new()
+        {
+            {"Microsoft Outlook", "Microsoft Outlook"},
+            {"OPR", "Opera"},
+            {"Flock", "Flock"},
+            {"Edge", "Edge"},
+            {"Edg", "Edge"},
+            {"Chrome", "Chrome"},
+            {"Opera.*?Version", "Opera"},
+            {"Opera", "Opera"},
+            {"MSIE", "Internet Explorer"},
+            {"Internet Explorer", "Internet Explorer"},
+            {"Trident.* rv" , "Internet Explorer"},
+            {"Shiira", "Shiira"},
+            {"Firefox", "Firefox"},
+            {"Chimera", "Chimera"},
+            {"Phoenix", "Phoenix"},
+            {"Firebird", "Firebird"},
+            {"Camino", "Camino"},
+            {"Netscape", "Netscape"},
+            {"OmniWeb", "OmniWeb"},
+            {"Safari", "Safari"},
+            {"Mozilla", "Mozilla"},
+            {"Konqueror", "Konqueror"},
+            {"icab", "iCab"},
+            {"Lynx", "Lynx"},
+            {"Links", "Links"},
+            {"hotjava", "HotJava"},
+            {"amaya", "Amaya"},
+            {"IBrowse", "IBrowse"},
+            {"Maxthon", "Maxthon"},
+            {"Ubuntu", "Ubuntu Web Browser"},
+            {"Vivaldi", "Vivaldi"},
+        };
+
+        /// <summary>
+        /// Gets a dictionary containing mappings for mobiles.
+        /// </summary>
+        public Dictionary<string, string> Mobiles { get; } = new()
+        {
+            // Legacy
+            {"mobileexplorer", "Mobile Explorer"},
+            {"palmsource", "Palm"},
+            {"palmscape", "Palmscape"},
+            // Phones and Manufacturers
+            {"motorola", "Motorola"},
+            {"nokia", "Nokia"},
+            {"palm", "Palm"},
+            {"iphone", "Apple iPhone"},
+            {"ipad", "iPad"},
+            {"ipod", "Apple iPod Touch"},
+            {"sony", "Sony Ericsson"},
+            {"ericsson", "Sony Ericsson"},
+            {"blackberry", "BlackBerry"},
+            {"cocoon", "O2 Cocoon"},
+            {"blazer", "Treo"},
+            {"lg", "LG"},
+            {"amoi", "Amoi"},
+            {"xda", "XDA"},
+            {"mda", "MDA"},
+            {"vario", "Vario"},
+            {"htc", "HTC"},
+            {"samsung", "Samsung"},
+            {"sharp", "Sharp"},
+            {"sie-", "Siemens"},
+            {"alcatel", "Alcatel"},
+            {"benq", "BenQ"},
+            {"ipaq", "HP iPaq"},
+            {"mot-", "Motorola"},
+            {"playstation portable", "PlayStation Portable"},
+            {"playstation 3", "PlayStation 3"},
+            {"playstation vita", "PlayStation Vita"},
+            {"hiptop", "Danger Hiptop"},
+            {"nec-", "NEC"},
+            {"panasonic", "Panasonic"},
+            {"philips", "Philips"},
+            {"sagem", "Sagem"},
+            {"sanyo", "Sanyo"},
+            {"spv", "SPV"},
+            {"zte", "ZTE"},
+            {"sendo", "Sendo"},
+            {"nintendo dsi", "Nintendo DSi"},
+            {"nintendo ds", "Nintendo DS"},
+            {"nintendo 3ds", "Nintendo 3DS"},
+            {"wii", "Nintendo Wii"},
+            {"open web", "Open Web"},
+            {"openweb", "OpenWeb"},
+            // Operating Systems
+            {"android", "Android"},
+            {"symbian", "Symbian"},
+            {"SymbianOS", "SymbianOS"},
+            {"elaine", "Palm"},
+            {"series60", "Symbian S60"},
+            {"windows ce", "Windows CE"},
+            // Browsers
+            {"obigo", "Obigo"},
+            {"netfront", "Netfront Browser"},
+            {"openwave", "Openwave Browser"},
+            {"mobilexplorer", "Mobile Explorer"},
+            {"operamini", "Opera Mini"},
+            {"opera mini", "Opera Mini"},
+            {"opera mobi", "Opera Mobile"},
+            {"fennec", "Firefox Mobile"},
+            // Other
+            {"digital paths", "Digital Paths"},
+            {"avantgo", "AvantGo"},
+            {"xiino", "Xiino"},
+            {"novarra", "Novarra Transcoder"},
+            {"vodafone", "Vodafone"},
+            {"docomo", "NTT DoCoMo"},
+            {"o2", "O2"},
+            // Fallback
+            {"mobile", "Generic Mobile"},
+            {"wireless", "Generic Mobile"},
+            {"j2me", "Generic Mobile"},
+            {"midp", "Generic Mobile"},
+            {"cldc", "Generic Mobile"},
+            {"up.link", "Generic Mobile"},
+            {"up.browser", "Generic Mobile"},
+            {"smartphone", "Generic Mobile"},
+            {"cellphone", "Generic Mobile"},
+        };
+
+        /// <summary>
+        /// Gets a dictionary containing mappings for robots.
+        /// </summary>
+        public Dictionary<string, string> Robots { get; } = new()
+        {
+            {"googlebot", "Googlebot"},
+            {"msnbot", "MSNBot"},
+            {"baiduspider", "Baiduspider"},
+            {"bingbot", "Bing"},
+            {"slurp", "Inktomi Slurp"},
+            {"yahoo", "Yahoo"},
+            {"ask jeeves", "Ask Jeeves"},
+            {"fastcrawler", "FastCrawler"},
+            {"infoseek", "InfoSeek Robot 1.0"},
+            {"lycos", "Lycos"},
+            {"yandex", "YandexBot"},
+            {"mediapartners-google", "MediaPartners Google"},
+            {"CRAZYWEBCRAWLER", "Crazy Webcrawler"},
+            {"adsbot-google", "AdsBot Google"},
+            {"feedfetcher-google", "Feedfetcher Google"},
+            {"curious george", "Curious George"},
+            {"ia_archiver", "Alexa Crawler"},
+            {"MJ12bot", "Majestic-12"},
+            {"Uptimebot", "Uptimebot"},
+        };
+    }
+}

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

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

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

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

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

@@ -220,7 +220,7 @@ public class Startup : AppStartup
                 var httpContext = context.HttpContext;//获取httpContext
 
                 //获取客户端信息
-                var client = App.GetService<IAppService>().ClientInfo;
+                var client = App.GetService<IAppService>().UserAgent;
                 // 获取控制器/操作描述器
                 var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
                 //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
@@ -302,7 +302,7 @@ public class Startup : AppStartup
         var certificate = new X509Certificate2("ThingsGateway.pfx", "ThingsGateway", X509KeyStorageFlags.EphemeralKeySet);
 #endif
         services.AddDataProtection()
-            .PersistKeysToFileSystem(new DirectoryInfo("../keys"))
+            .PersistKeysToFileSystem(new DirectoryInfo("keys"))
             .ProtectKeysWithCertificate(certificate)
             .UseCryptographicAlgorithms(new AuthenticatedEncryptorConfiguration
             {

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

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

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

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

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

@@ -1,5 +1,4 @@
-using System.Buffers;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using System.Text;
 
 using ThingsGateway.NewLife.Collections;
@@ -242,7 +241,7 @@ public static class SpanHelper
             return;
         }
 
-        var array = ArrayPool<Byte>.Shared.Rent(buffer.Length);
+        var array = Pool.Shared.Rent(buffer.Length);
 
         try
         {
@@ -252,7 +251,7 @@ public static class SpanHelper
         }
         finally
         {
-            ArrayPool<Byte>.Shared.Return(array);
+            Pool.Shared.Return(array);
         }
     }
 
@@ -266,7 +265,7 @@ public static class SpanHelper
         if (MemoryMarshal.TryGetArray(buffer, out var segment))
             return stream.WriteAsync(segment.Array!, segment.Offset, segment.Count, cancellationToken);
 
-        var array = ArrayPool<Byte>.Shared.Rent(buffer.Length);
+        var array = Pool.Shared.Rent(buffer.Length);
         buffer.Span.CopyTo(array);
 
         var writeTask = stream.WriteAsync(array, 0, buffer.Length, cancellationToken);
@@ -278,7 +277,7 @@ public static class SpanHelper
             }
             finally
             {
-                ArrayPool<Byte>.Shared.Return(array);
+                Pool.Shared.Return(array);
             }
         }, cancellationToken);
     }

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

@@ -1,57 +0,0 @@
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://thingsgateway.cn/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-
-using Newtonsoft.Json;
-
-namespace ThingsGateway.NewLife.Extension;
-
-public class ByteArrayToNumberArrayConverter : JsonConverter<byte[]>
-{
-    public override void WriteJson(JsonWriter writer, byte[]? value, JsonSerializer serializer)
-    {
-        if (value == null)
-        {
-            writer.WriteNull();
-            return;
-        }
-        // 将 byte[] 转换为数值数组
-        writer.WriteStartArray();
-        foreach (var b in value)
-        {
-            writer.WriteValue(b);
-        }
-        writer.WriteEndArray();
-    }
-
-    public override byte[] ReadJson(JsonReader reader, Type objectType, byte[]? existingValue, bool hasExistingValue, JsonSerializer serializer)
-    {
-        // 从数值数组读取 byte[]
-        if (reader.TokenType == JsonToken.StartArray)
-        {
-            var byteList = new System.Collections.Generic.List<byte>();
-            while (reader.Read())
-            {
-                if (reader.TokenType == JsonToken.EndArray)
-                {
-                    break;
-                }
-
-                if (reader.TokenType == JsonToken.Integer)
-                {
-                    byteList.Add(Convert.ToByte(reader.Value));
-                }
-            }
-            return byteList.ToArray();
-        }
-        throw new JsonSerializationException("Invalid JSON format for byte array.");
-    }
-
-    public override bool CanRead => true;
-}

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

@@ -15,14 +15,14 @@ namespace ThingsGateway.NewLife.Json.Extension;
 /// <summary>
 /// json扩展
 /// </summary>
-public static class JsonExtensions
+public static class JsonExtension
 {
     /// <summary>
     /// 默认Json规则
     /// </summary>
     public static JsonSerializerSettings IndentedOptions;
     public static JsonSerializerSettings NoneIndentedOptions;
-    static JsonExtensions()
+    static JsonExtension()
     {
         IndentedOptions = new JsonSerializerSettings
         {
@@ -81,4 +81,52 @@ public static class JsonExtensions
     {
         return Newtonsoft.Json.JsonConvert.SerializeObject(item, indented == false ? NoneIndentedOptions : IndentedOptions);
     }
+
+
+
 }
+
+public class ByteArrayToNumberArrayConverter : JsonConverter<byte[]>
+{
+    public override void WriteJson(JsonWriter writer, byte[]? value, JsonSerializer serializer)
+    {
+        if (value == null)
+        {
+            writer.WriteNull();
+            return;
+        }
+        // 将 byte[] 转换为数值数组
+        writer.WriteStartArray();
+        foreach (var b in value)
+        {
+            writer.WriteValue(b);
+        }
+        writer.WriteEndArray();
+    }
+
+    public override byte[] ReadJson(JsonReader reader, Type objectType, byte[]? existingValue, bool hasExistingValue, JsonSerializer serializer)
+    {
+        // 从数值数组读取 byte[]
+        if (reader.TokenType == JsonToken.StartArray)
+        {
+            var byteList = new System.Collections.Generic.List<byte>();
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonToken.EndArray)
+                {
+                    break;
+                }
+
+                if (reader.TokenType == JsonToken.Integer)
+                {
+                    byteList.Add(Convert.ToByte(reader.Value));
+                }
+            }
+            return byteList.ToArray();
+        }
+        throw new JsonSerializationException("Invalid JSON format for byte array.");
+    }
+
+    public override bool CanRead => true;
+}
+

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

@@ -0,0 +1,692 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#if NET6_0_OR_GREATER
+using Newtonsoft.Json.Linq;
+
+using System.Text.Encodings.Web;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace ThingsGateway.NewLife.Json.Extension;
+
+/// <summary>
+/// System.Text.Json 扩展
+/// </summary>
+public static class SystemTextJsonExtension
+{
+    /// <summary>
+    /// 默认Json规则（带缩进）
+    /// </summary>
+    public static JsonSerializerOptions IndentedOptions;
+
+    /// <summary>
+    /// 默认Json规则（无缩进）
+    /// </summary>
+    public static JsonSerializerOptions NoneIndentedOptions;
+
+    static SystemTextJsonExtension()
+    {
+        IndentedOptions = new JsonSerializerOptions
+        {
+            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+            WriteIndented = true, // 缩进
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull // 忽略 null
+        };
+        // 如有自定义Converter，这里添加
+        // IndentedOptions.Converters.Add(new ByteArrayJsonConverter());
+        IndentedOptions.Converters.Add(new ByteArrayToNumberArrayConverterSystemTextJson());
+        IndentedOptions.Converters.Add(new JTokenSystemTextJsonConverter());
+        IndentedOptions.Converters.Add(new JValueSystemTextJsonConverter());
+        IndentedOptions.Converters.Add(new JObjectSystemTextJsonConverter());
+        IndentedOptions.Converters.Add(new JArraySystemTextJsonConverter());
+        NoneIndentedOptions = new JsonSerializerOptions
+        {
+            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+            WriteIndented = false, // 不缩进
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+        };
+        NoneIndentedOptions.Converters.Add(new ByteArrayToNumberArrayConverterSystemTextJson());
+        NoneIndentedOptions.Converters.Add(new JTokenSystemTextJsonConverter());
+        NoneIndentedOptions.Converters.Add(new JValueSystemTextJsonConverter());
+        NoneIndentedOptions.Converters.Add(new JObjectSystemTextJsonConverter());
+        NoneIndentedOptions.Converters.Add(new JArraySystemTextJsonConverter());
+        // NoneIndentedOptions.Converters.Add(new ByteArrayJsonConverter());
+    }
+
+    /// <summary>
+    /// 反序列化
+    /// </summary>
+    /// <param name="json"></param>
+    /// <param name="type"></param>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    public static object? FromSystemTextJsonString(this string json, Type type, JsonSerializerOptions? options = null)
+    {
+        return JsonSerializer.Deserialize(json, type, options ?? IndentedOptions);
+    }
+
+    /// <summary>
+    /// 反序列化
+    /// </summary>
+    public static T? FromSystemTextJsonString<T>(this string json, JsonSerializerOptions? options = null)
+    {
+        return JsonSerializer.Deserialize<T>(json, options ?? IndentedOptions);
+    }
+
+    /// <summary>
+    /// 序列化
+    /// </summary>
+    /// <param name="item"></param>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    public static string ToSystemTextJsonString(this object item, JsonSerializerOptions? options)
+    {
+        return JsonSerializer.Serialize(item, item?.GetType() ?? typeof(object), options ?? IndentedOptions);
+    }
+
+    /// <summary>
+    /// 序列化
+    /// </summary>
+    public static string ToSystemTextJsonString(this object item, bool indented = true)
+    {
+        return JsonSerializer.Serialize(item, item?.GetType() ?? typeof(object), indented ? IndentedOptions : NoneIndentedOptions);
+    }
+
+    /// <summary>
+    /// 序列化
+    /// </summary>
+    public static byte[] ToSystemTextJsonUtf8Bytes(this object item, bool indented = true)
+    {
+        return JsonSerializer.SerializeToUtf8Bytes(item, item.GetType(), indented ? IndentedOptions : NoneIndentedOptions);
+    }
+
+
+}
+
+/// <summary>
+/// 将 byte[] 序列化为数值数组，反序列化数值数组为 byte[]
+/// </summary>
+public class ByteArrayToNumberArrayConverterSystemTextJson : JsonConverter<byte[]>
+{
+    public override byte[]? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType != JsonTokenType.StartArray)
+        {
+            throw new JsonException("Expected StartArray token.");
+        }
+
+        var bytes = new List<byte>();
+        while (reader.Read())
+        {
+            if (reader.TokenType == JsonTokenType.EndArray)
+                break;
+
+            if (reader.TokenType == JsonTokenType.Number)
+            {
+                if (reader.TryGetByte(out byte value))
+                {
+                    bytes.Add(value);
+                }
+                else
+                {
+                    throw new JsonException("Invalid number value for byte array.");
+                }
+            }
+            else
+            {
+                throw new JsonException($"Unexpected token {reader.TokenType} in byte array.");
+            }
+        }
+
+        return bytes.ToArray();
+    }
+
+    public override void Write(Utf8JsonWriter writer, byte[] value, JsonSerializerOptions options)
+    {
+        if (value == null)
+        {
+            writer.WriteNullValue();
+            return;
+        }
+
+        writer.WriteStartArray();
+        foreach (var b in value)
+        {
+            writer.WriteNumberValue(b);
+        }
+        writer.WriteEndArray();
+    }
+}
+
+/// <summary>
+/// System.Text.Json → JToken / JObject / JArray 转换器
+/// </summary>
+public class JTokenSystemTextJsonConverter : JsonConverter<JToken>
+{
+    public override JToken? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        return ReadToken(ref reader);
+    }
+
+    private static JToken ReadToken(ref Utf8JsonReader reader)
+    {
+        switch (reader.TokenType)
+        {
+            case JsonTokenType.StartObject:
+                var obj = new JObject();
+                while (reader.Read())
+                {
+                    if (reader.TokenType == JsonTokenType.EndObject)
+                        return obj;
+
+                    var propertyName = reader.GetString();
+                    reader.Read();
+                    var value = ReadToken(ref reader);
+                    obj[propertyName!] = value;
+                }
+                throw new JsonException();
+
+            case JsonTokenType.StartArray:
+                var array = new JArray();
+                while (reader.Read())
+                {
+                    if (reader.TokenType == JsonTokenType.EndArray)
+                        return array;
+
+                    array.Add(ReadToken(ref reader));
+                }
+                throw new JsonException();
+
+            case JsonTokenType.String:
+                if (reader.TryGetDateTime(out var date))
+                    return new JValue(date);
+                return new JValue(reader.GetString());
+
+            case JsonTokenType.Number:
+                if (reader.TryGetInt64(out var l))
+                    return new JValue(l);
+                return new JValue(reader.GetDouble());
+
+            case JsonTokenType.True:
+                return new JValue(true);
+
+            case JsonTokenType.False:
+                return new JValue(false);
+
+            case JsonTokenType.Null:
+                return JValue.CreateNull();
+
+            default:
+                throw new JsonException($"Unsupported token type {reader.TokenType}");
+        }
+    }
+
+    public override void Write(Utf8JsonWriter writer, JToken value, JsonSerializerOptions options)
+    {
+        switch (value.Type)
+        {
+            case JTokenType.Object:
+                writer.WriteStartObject();
+                foreach (var prop in (JObject)value)
+                {
+                    writer.WritePropertyName(prop.Key);
+                    Write(writer, prop.Value!, options);
+                }
+                writer.WriteEndObject();
+                break;
+
+            case JTokenType.Array:
+                writer.WriteStartArray();
+                foreach (var item in (JArray)value)
+                {
+                    Write(writer, item!, options);
+                }
+                writer.WriteEndArray();
+                break;
+
+            case JTokenType.Null:
+                writer.WriteNullValue();
+                break;
+
+            case JTokenType.Boolean:
+                writer.WriteBooleanValue(value.Value<bool>());
+                break;
+
+            case JTokenType.Integer:
+                writer.WriteNumberValue(value.Value<long>());
+                break;
+
+            case JTokenType.Float:
+                writer.WriteNumberValue(value.Value<double>());
+                break;
+
+            case JTokenType.String:
+                writer.WriteStringValue(value.Value<string>());
+                break;
+
+            case JTokenType.Date:
+                writer.WriteStringValue(value.Value<DateTime>());
+                break;
+
+            case JTokenType.Guid:
+                writer.WriteStringValue(value.Value<Guid>().ToString());
+                break;
+
+            case JTokenType.Uri:
+                writer.WriteStringValue(value.Value<Uri>().ToString());
+                break;
+
+            case JTokenType.TimeSpan:
+                writer.WriteStringValue(value.Value<TimeSpan>().ToString());
+                break;
+
+            default:
+                // fallback — 转字符串
+                writer.WriteStringValue(value.ToString());
+                break;
+        }
+    }
+}
+
+/// <summary>
+/// System.Text.Json → JToken / JObject / JArray 转换器
+/// </summary>
+public class JObjectSystemTextJsonConverter : JsonConverter<JObject>
+{
+    public override JObject? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var obj = new JObject();
+        while (reader.Read())
+        {
+            if (reader.TokenType == JsonTokenType.EndObject)
+                return obj;
+
+            var propertyName = reader.GetString();
+            reader.Read();
+            var value = ReadJToken(ref reader);
+            obj[propertyName!] = value;
+        }
+        throw new JsonException();
+    }
+
+    private static JToken ReadJToken(ref Utf8JsonReader reader)
+    {
+        switch (reader.TokenType)
+        {
+            case JsonTokenType.StartObject:
+                var obj = new JObject();
+                while (reader.Read())
+                {
+                    if (reader.TokenType == JsonTokenType.EndObject)
+                        return obj;
+
+                    var propertyName = reader.GetString();
+                    reader.Read();
+                    var value = ReadJToken(ref reader);
+                    obj[propertyName!] = value;
+                }
+                throw new JsonException();
+
+            case JsonTokenType.StartArray:
+                var array = new JArray();
+                while (reader.Read())
+                {
+                    if (reader.TokenType == JsonTokenType.EndArray)
+                        return array;
+
+                    array.Add(ReadJToken(ref reader));
+                }
+                throw new JsonException();
+
+            case JsonTokenType.String:
+                if (reader.TryGetDateTime(out var date))
+                    return new JValue(date);
+                return new JValue(reader.GetString());
+
+            case JsonTokenType.Number:
+                if (reader.TryGetInt64(out var l))
+                    return new JValue(l);
+                return new JValue(reader.GetDouble());
+
+            case JsonTokenType.True:
+                return new JValue(true);
+
+            case JsonTokenType.False:
+                return new JValue(false);
+
+            case JsonTokenType.Null:
+                return JValue.CreateNull();
+
+            default:
+                throw new JsonException($"Unsupported token type {reader.TokenType}");
+        }
+    }
+
+    public override void Write(Utf8JsonWriter writer, JObject value, JsonSerializerOptions options)
+    {
+
+        writer.WriteStartObject();
+        foreach (var prop in (JObject)value)
+        {
+            writer.WritePropertyName(prop.Key);
+            Write(writer, prop.Value!, options);
+        }
+        writer.WriteEndObject();
+
+    }
+
+
+    private static void Write(Utf8JsonWriter writer, JToken value, JsonSerializerOptions options)
+    {
+        switch (value.Type)
+        {
+            case JTokenType.Object:
+                writer.WriteStartObject();
+                foreach (var prop in (JObject)value)
+                {
+                    writer.WritePropertyName(prop.Key);
+                    Write(writer, prop.Value!, options);
+                }
+                writer.WriteEndObject();
+                break;
+
+            case JTokenType.Array:
+                writer.WriteStartArray();
+                foreach (var item in (JArray)value)
+                {
+                    Write(writer, item!, options);
+                }
+                writer.WriteEndArray();
+                break;
+
+            case JTokenType.Null:
+                writer.WriteNullValue();
+                break;
+
+            case JTokenType.Boolean:
+                writer.WriteBooleanValue(value.Value<bool>());
+                break;
+
+            case JTokenType.Integer:
+                writer.WriteNumberValue(value.Value<long>());
+                break;
+
+            case JTokenType.Float:
+                writer.WriteNumberValue(value.Value<double>());
+                break;
+
+            case JTokenType.String:
+                writer.WriteStringValue(value.Value<string>());
+                break;
+
+            case JTokenType.Date:
+                writer.WriteStringValue(value.Value<DateTime>());
+                break;
+
+            case JTokenType.Guid:
+                writer.WriteStringValue(value.Value<Guid>().ToString());
+                break;
+
+            case JTokenType.Uri:
+                writer.WriteStringValue(value.Value<Uri>().ToString());
+                break;
+
+            case JTokenType.TimeSpan:
+                writer.WriteStringValue(value.Value<TimeSpan>().ToString());
+                break;
+
+            default:
+                // fallback — 转字符串
+                writer.WriteStringValue(value.ToString());
+                break;
+        }
+    }
+
+}
+
+/// <summary>
+/// System.Text.Json → JToken / JObject / JArray 转换器
+/// </summary>
+public class JArraySystemTextJsonConverter : JsonConverter<JArray>
+{
+    public override JArray? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var array = new JArray();
+        while (reader.Read())
+        {
+            if (reader.TokenType == JsonTokenType.EndArray)
+                return array;
+
+            array.Add(ReadToken(ref reader));
+        }
+        throw new JsonException();
+    }
+
+    private static JToken ReadToken(ref Utf8JsonReader reader)
+    {
+        switch (reader.TokenType)
+        {
+            case JsonTokenType.StartObject:
+                var obj = new JObject();
+                while (reader.Read())
+                {
+                    if (reader.TokenType == JsonTokenType.EndObject)
+                        return obj;
+
+                    var propertyName = reader.GetString();
+                    reader.Read();
+                    var value = ReadToken(ref reader);
+                    obj[propertyName!] = value;
+                }
+                throw new JsonException();
+
+            case JsonTokenType.StartArray:
+                var array = new JArray();
+                while (reader.Read())
+                {
+                    if (reader.TokenType == JsonTokenType.EndArray)
+                        return array;
+
+                    array.Add(ReadToken(ref reader));
+                }
+                throw new JsonException();
+
+            case JsonTokenType.String:
+                if (reader.TryGetDateTime(out var date))
+                    return new JValue(date);
+                return new JValue(reader.GetString());
+
+            case JsonTokenType.Number:
+                if (reader.TryGetInt64(out var l))
+                    return new JValue(l);
+                return new JValue(reader.GetDouble());
+
+            case JsonTokenType.True:
+                return new JValue(true);
+
+            case JsonTokenType.False:
+                return new JValue(false);
+
+            case JsonTokenType.Null:
+                return JValue.CreateNull();
+
+            default:
+                throw new JsonException($"Unsupported token type {reader.TokenType}");
+        }
+    }
+
+    public override void Write(Utf8JsonWriter writer, JArray value, JsonSerializerOptions options)
+    {
+
+        writer.WriteStartArray();
+        foreach (var item in (JArray)value)
+        {
+            Write(writer, item!, options);
+        }
+        writer.WriteEndArray();
+
+    }
+
+    private static void Write(Utf8JsonWriter writer, JToken value, JsonSerializerOptions options)
+    {
+        switch (value.Type)
+        {
+            case JTokenType.Object:
+                writer.WriteStartObject();
+                foreach (var prop in (JObject)value)
+                {
+                    writer.WritePropertyName(prop.Key);
+                    Write(writer, prop.Value!, options);
+                }
+                writer.WriteEndObject();
+                break;
+
+            case JTokenType.Array:
+                writer.WriteStartArray();
+                foreach (var item in (JArray)value)
+                {
+                    Write(writer, item!, options);
+                }
+                writer.WriteEndArray();
+                break;
+
+            case JTokenType.Null:
+                writer.WriteNullValue();
+                break;
+
+            case JTokenType.Boolean:
+                writer.WriteBooleanValue(value.Value<bool>());
+                break;
+
+            case JTokenType.Integer:
+                writer.WriteNumberValue(value.Value<long>());
+                break;
+
+            case JTokenType.Float:
+                writer.WriteNumberValue(value.Value<double>());
+                break;
+
+            case JTokenType.String:
+                writer.WriteStringValue(value.Value<string>());
+                break;
+
+            case JTokenType.Date:
+                writer.WriteStringValue(value.Value<DateTime>());
+                break;
+
+            case JTokenType.Guid:
+                writer.WriteStringValue(value.Value<Guid>().ToString());
+                break;
+
+            case JTokenType.Uri:
+                writer.WriteStringValue(value.Value<Uri>().ToString());
+                break;
+
+            case JTokenType.TimeSpan:
+                writer.WriteStringValue(value.Value<TimeSpan>().ToString());
+                break;
+
+            default:
+                // fallback — 转字符串
+                writer.WriteStringValue(value.ToString());
+                break;
+        }
+    }
+}
+
+
+/// <summary>
+/// System.Text.Json → JToken / JObject / JArray 转换器
+/// </summary>
+public class JValueSystemTextJsonConverter : JsonConverter<JValue>
+{
+    public override JValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        return ReadJValue(ref reader);
+    }
+
+    private static JValue ReadJValue(ref Utf8JsonReader reader)
+    {
+        switch (reader.TokenType)
+        {
+
+            case JsonTokenType.String:
+                if (reader.TryGetDateTime(out var date))
+                    return new JValue(date);
+                return new JValue(reader.GetString());
+
+            case JsonTokenType.Number:
+                if (reader.TryGetInt64(out var l))
+                    return new JValue(l);
+                return new JValue(reader.GetDouble());
+
+            case JsonTokenType.True:
+                return new JValue(true);
+
+            case JsonTokenType.False:
+                return new JValue(false);
+
+            case JsonTokenType.Null:
+                return JValue.CreateNull();
+
+            default:
+                throw new JsonException($"Unsupported token type {reader.TokenType}");
+        }
+    }
+
+    public override void Write(Utf8JsonWriter writer, JValue value, JsonSerializerOptions options)
+    {
+        switch (value.Type)
+        {
+
+            case JTokenType.Null:
+                writer.WriteNullValue();
+                break;
+
+            case JTokenType.Boolean:
+                writer.WriteBooleanValue(value.Value<bool>());
+                break;
+
+            case JTokenType.Integer:
+                writer.WriteNumberValue(value.Value<long>());
+                break;
+
+            case JTokenType.Float:
+                writer.WriteNumberValue(value.Value<double>());
+                break;
+
+            case JTokenType.String:
+                writer.WriteStringValue(value.Value<string>());
+                break;
+
+            case JTokenType.Date:
+                writer.WriteStringValue(value.Value<DateTime>());
+                break;
+
+            case JTokenType.Guid:
+                writer.WriteStringValue(value.Value<Guid>().ToString());
+                break;
+
+            case JTokenType.Uri:
+                writer.WriteStringValue(value.Value<Uri>().ToString());
+                break;
+
+            case JTokenType.TimeSpan:
+                writer.WriteStringValue(value.Value<TimeSpan>().ToString());
+                break;
+
+            default:
+                // fallback — 转字符串
+                writer.WriteStringValue(value.ToString());
+                break;
+        }
+    }
+}
+#endif

src/Admin/ThingsGateway.NewLife.X/Reflection/IReflect.cs

@@ -627,6 +627,8 @@ public class DefaultReflect : IReflect
     /// <returns></returns>
     public virtual Type? GetElementType(Type type)
     {
+        if (type == null) return null;
+
         if (type.HasElementType) return type.GetElementType();
 
         if (type.As<IEnumerable>())

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

@@ -1,5 +1,4 @@
-using System.Buffers;
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 using ThingsGateway.NewLife.Collections;
@@ -157,7 +156,7 @@ public class Binary : FormatterBase, IBinary
 #if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
         Stream.Write(buffer);
 #else
-        var array = ArrayPool<Byte>.Shared.Rent(buffer.Length);
+        var array = Pool.Shared.Rent(buffer.Length);
         try
         {
             buffer.CopyTo(array);
@@ -166,7 +165,7 @@ public class Binary : FormatterBase, IBinary
         }
         finally
         {
-            ArrayPool<Byte>.Shared.Return(array);
+            Pool.Shared.Return(array);
         }
 #endif
     }

src/Admin/ThingsGateway.Razor/Components/CultureChooser.razor.cs

@@ -73,7 +73,7 @@ public partial class CultureChooser
     {
         if (_firstRender)
         {
-            if (OperatingSystem.IsBrowser() || !Runtime.IsWeb)
+            if (OperatingSystem.IsBrowser() || !Runtime.IsWeb || App.EffectiveTypes.FirstOrDefault(a => a.Name.Contains("WebView")) != null)
             {
                 var cultureName = item.Value;
                 if (cultureName != CultureInfo.CurrentCulture.Name)

src/Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.6.4</PluginVersion>
-		<ProPluginVersion>10.6.4</ProPluginVersion>
+		<PluginVersion>10.6.16</PluginVersion>
+		<ProPluginVersion>10.6.16</ProPluginVersion>
 		<AuthenticationVersion>2.1.7</AuthenticationVersion>
 	</PropertyGroup>
 

src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/DeviceComponent.razor

@@ -84,7 +84,7 @@
                             </div>
                             <div class="col-12 col-md-4 p-1">
 
-                                <BootstrapLabel Value=@(item.Value?.ToJsonNetString()) title=@(item.LastErrorMessage) class=@(item.IsOnline?"green--text":"red--text")>@(item.Value?.ToJsonNetString())</BootstrapLabel>
+                                <BootstrapLabel Value=@(item.Value?.ToSystemTextJsonString()) title=@(item.LastErrorMessage) class=@(item.IsOnline?"green--text":"red--text")>@(item.Value?.ToSystemTextJsonString())</BootstrapLabel>
 
                             </div>
                         </div>

src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/DeviceComponentBase.cs

@@ -90,7 +90,7 @@ public abstract class DeviceComponentBase : ComponentBase, IDisposable
                 var data = await Plc.ReadAsync(RegisterAddress, ArrayLength, DataType);
                 if (data.IsSuccess)
                 {
-                    Plc.Logger?.LogInformation(data.Content.ToJsonNetString());
+                    Plc.Logger?.LogInformation(data.Content.ToSystemTextJsonString());
                 }
                 else
                 {

src/Foundation/ThingsGateway.Foundation.Variable/VariableObject.cs

@@ -71,8 +71,7 @@ public abstract class VariableObject
         var jToken = JToken.FromObject(value);
         if (!string.IsNullOrEmpty(variableRuntimeProperty.Attribute.WriteExpressions))
         {
-            object rawdata = jToken is JValue jValue ? jValue.Value : jToken is JArray jArray ? jArray : jToken.ToString();
-
+            object rawdata = jToken.GetObjectFromJToken();
             object data = variableRuntimeProperty.Attribute.WriteExpressions.GetExpressionsResult(rawdata, Device?.Logger);
             jToken = JToken.FromObject(data);
         }

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.2" />
-		<PackageReference Include="TouchSocket.SerialPorts" Version="3.1.2" />
+		<PackageReference Include="TouchSocket" Version="3.1.4" />
+		<PackageReference Include="TouchSocket.SerialPorts" Version="3.1.4" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Foundation/ThingsGateway.Foundation/Utils/JTokenUtil.cs

@@ -48,25 +48,88 @@ public static class JTokenUtil
     /// 根据JToken获取Object类型值<br></br>
     /// 对应返回 对象字典 或 类型数组 或 类型值
     /// </summary>
-    public static object? GetObjectFromJToken(this JToken jtoken)
+    public static object? GetObjectFromJToken(this JToken token)
     {
-        if (jtoken == null)
+        if (token == null)
             return null;
-        switch (jtoken.Type)
+
+        switch (token.Type)
         {
             case JTokenType.Object:
-                // 如果是对象类型，递归调用本方法获取嵌套的键值对
-                return jtoken.Children<JProperty>()
-                    .ToDictionary(prop => prop.Name, prop => GetObjectFromJToken(prop.Value));
+                var obj = new Dictionary<string, object>();
+                foreach (var prop in (JObject)token)
+                    obj[prop.Key] = GetObjectFromJToken(prop.Value);
+                return obj;
 
             case JTokenType.Array:
-                // 如果是数组类型，递归调用本方法获取嵌套的元素
-                return jtoken.Select(GetObjectFromJToken).ToArray();
+                var array = (JArray)token;
 
+                if (array.All(x => x.Type == JTokenType.Integer))
+                    return array.Select(x => x.Value<long>()).ToList();
+
+                if (array.All(x => x.Type == JTokenType.Float))
+                    return array.Select(x => x.Value<double>()).ToList();
+
+                if (array.All(x => x.Type == JTokenType.String))
+                    return array.Select(x => x.Value<string>()).ToList();
+
+                if (array.All(x => x.Type == JTokenType.Boolean))
+                    return array.Select(x => x.Value<bool>()).ToList();
+
+                if (array.All(x => x.Type == JTokenType.Date))
+                    return array.Select(x => x.Value<DateTime>()).ToList();
+
+                if (array.All(x => x.Type == JTokenType.TimeSpan))
+                    return array.Select(x => x.Value<TimeSpan>()).ToList();
+
+                if (array.All(x => x.Type == JTokenType.Guid))
+                    return array.Select(x => x.Value<Guid>()).ToList();
+
+                if (array.All(x => x.Type == JTokenType.Uri))
+                    return array.Select(x => x.Value<Uri>()).ToList();
+
+                // 否则递归
+                return array.Select(x => GetObjectFromJToken(x)).ToList();
+
+            case JTokenType.Integer:
+                return token.ToObject<long>();
+
+            case JTokenType.Float:
+                return token.ToObject<double>();
+
+            case JTokenType.String:
+                return token.ToObject<string>();
+
+            case JTokenType.Boolean:
+                return token.ToObject<bool>();
+
+            case JTokenType.Null:
+            case JTokenType.Undefined:
+                return null;
+
+            case JTokenType.Date:
+                return token.ToObject<DateTime>();
+
+            case JTokenType.TimeSpan:
+                return token.ToObject<TimeSpan>();
+
+            case JTokenType.Guid:
+                return token.ToObject<Guid>();
+
+            case JTokenType.Uri:
+                return token.ToObject<Uri>();
+
+            case JTokenType.Bytes:
+                return token.ToObject<byte[]>();
+
+            case JTokenType.Comment:
+            case JTokenType.Raw:
+            case JTokenType.Property:
+            case JTokenType.Constructor:
             default:
-                // 其他类型直接转换为对应的 Object 类型值
-                return (jtoken as JValue)?.Value;
+                return token.ToString();
         }
+
     }
 
     #region json

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

@@ -141,7 +141,7 @@ public class ControlController : ControllerBase
             }
         }
 
-        return await GlobalData.RpcService.InvokeDeviceMethodAsync($"WebApi-{UserManager.UserAccount}-{App.HttpContext?.GetRemoteIpAddressToIPv4()}", deviceDatas).ConfigureAwait(false);
+        return (await GlobalData.RpcService.InvokeDeviceMethodAsync($"WebApi-{UserManager.UserAccount}-{App.HttpContext?.GetRemoteIpAddressToIPv4()}", deviceDatas).ConfigureAwait(false)).ToDictionary(a => a.Key, a => a.Value.ToDictionary(b => b.Key, b => (OperResult)b.Value));
 
     }
 

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/Interval/BusinessBaseWithCacheIntervalScript.cs

@@ -10,8 +10,6 @@
 
 using System.Globalization;
 using System.Text;
-using System.Text.Encodings.Web;
-using System.Text.Json;
 using System.Text.RegularExpressions;
 
 using ThingsGateway.NewLife.Json.Extension;
@@ -92,7 +90,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
 
                         // 如果是报警列表，则将整个分组转换为 JSON 字符串
                         var gList = group.Select(a => a).ToList();
-                        string json = gList.ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                        string json = gList.ToSystemTextJsonString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                         // 将主题和 JSON 内容添加到列表中
                         topicJsonList.Add(new(topic, json, gList.Count));
                     }
@@ -101,7 +99,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         // 如果不是报警列表，则将每个分组元素分别转换为 JSON 字符串
                         foreach (var gro in group)
                         {
-                            string json = JsonExtensions.ToJsonNetString(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                            string json = SystemTextJsonExtension.ToSystemTextJsonString(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
                             topicJsonList.Add(new(topic, json, 1));
                         }
@@ -114,14 +112,14 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
             if (_businessPropertyWithCacheIntervalScript.IsAlarmList)
             {
                 var gList = data.Select(a => a).ToList();
-                string json = gList.ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                string json = gList.ToSystemTextJsonString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                 topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.AlarmTopic, json, gList.Count));
             }
             else
             {
                 foreach (var group in data)
                 {
-                    string json = JsonExtensions.ToJsonNetString(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                    string json = SystemTextJsonExtension.ToSystemTextJsonString(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                     topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.AlarmTopic, json, 1));
                 }
             }
@@ -160,7 +158,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         {
                             // 如果是设备列表，则将整个分组转换为 JSON 字符串
                             var gList = group.Select(a => a).ToList();
-                            string json = gList.ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                            string json = gList.ToSystemTextJsonString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
                             topicJsonList.Add(new(topic, json, gList.Count));
                         }
@@ -169,7 +167,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                             // 如果不是设备列表，则将每个分组元素分别转换为 JSON 字符串
                             foreach (var gro in group)
                             {
-                                string json = JsonExtensions.ToJsonNetString(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                                string json = SystemTextJsonExtension.ToSystemTextJsonString(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                                 // 将主题和 JSON 内容添加到列表中
                                 topicJsonList.Add(new(topic, json, 1));
                             }
@@ -183,14 +181,14 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
             if (_businessPropertyWithCacheIntervalScript.IsDeviceList)
             {
                 var gList = data.Select(a => a).ToList();
-                string json = gList.ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                string json = gList.ToSystemTextJsonString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                 topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.DeviceTopic, json, gList.Count));
             }
             else
             {
                 foreach (var group in data)
                 {
-                    string json = JsonExtensions.ToJsonNetString(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                    string json = SystemTextJsonExtension.ToSystemTextJsonString(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                     topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.DeviceTopic, json, 1));
                 }
             }
@@ -227,7 +225,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         {
                             // 如果是变量列表，则将整个分组转换为 JSON 字符串
                             var gList = group.Select(a => a).ToList();
-                            string json = gList.ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                            string json = gList.ToSystemTextJsonString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
                             topicJsonList.Add(new(topic, json, gList.Count));
                         }
@@ -236,7 +234,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                             // 如果不是变量列表，则将每个分组元素分别转换为 JSON 字符串
                             foreach (var gro in group)
                             {
-                                string json = JsonExtensions.ToJsonNetString(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                                string json = SystemTextJsonExtension.ToSystemTextJsonString(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                                 // 将主题和 JSON 内容添加到列表中
                                 topicJsonList.Add(new(topic, json, 1));
                             }
@@ -250,14 +248,14 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
             if (_businessPropertyWithCacheIntervalScript.IsVariableList)
             {
                 var gList = data.Select(a => a).ToList();
-                string json = gList.ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                string json = gList.ToSystemTextJsonString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                 topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, gList.Count));
             }
             else
             {
                 foreach (var group in data)
                 {
-                    string json = JsonExtensions.ToJsonNetString(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                    string json = SystemTextJsonExtension.ToSystemTextJsonString(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                     topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, 1));
                 }
             }
@@ -303,7 +301,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         {
 
                             // 如果是变量列表，则将整个分组转换为 JSON 字符串
-                            string json = group.Select(a => a).GroupBy(a => a.DeviceName, b => b).ToDictionary(a => a.Key, b => b.ToList()).ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                            string json = group.Select(a => a).GroupBy(a => a.DeviceName, b => b).ToDictionary(a => a.Key, b => b.ToList()).ToSystemTextJsonString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
                             topicJsonList.Add(new(topic, json, group.Count()));
                         }
@@ -312,7 +310,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                             // 如果不是变量列表，则将每个分组元素分别转换为 JSON 字符串
                             foreach (var gro in group)
                             {
-                                string json = JsonExtensions.ToJsonNetString(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                                string json = SystemTextJsonExtension.ToSystemTextJsonString(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                                 // 将主题和 JSON 内容添加到列表中
                                 topicJsonList.Add(new(topic, json, 1));
                             }
@@ -325,14 +323,14 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
         {
             if (_businessPropertyWithCacheIntervalScript.IsVariableList)
             {
-                string json = data.Select(a => a).GroupBy(a => a.DeviceName, b => b).ToDictionary(a => a.Key, b => b.ToList()).ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                string json = data.Select(a => a).GroupBy(a => a.DeviceName, b => b).ToDictionary(a => a.Key, b => b.ToList()).ToSystemTextJsonString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                 topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, data.Count()));
             }
             else
             {
                 foreach (var group in data)
                 {
-                    string json = JsonExtensions.ToJsonNetString(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                    string json = SystemTextJsonExtension.ToSystemTextJsonString(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                     topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, 1));
                 }
             }
@@ -355,23 +353,6 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
     //        block.Dispose();
     //    }
     //}
-    protected static JsonSerializerOptions NoWriteIndentedJsonSerializerOptions = new JsonSerializerOptions
-    {
-        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-        WriteIndented = false
-    };
-    protected static JsonSerializerOptions WriteIndentedJsonSerializerOptions = new JsonSerializerOptions
-    {
-        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-        WriteIndented = true
-    };
-
-    protected static byte[] Serialize(object data, bool writeIndented)
-    {
-        if (data == null) return Array.Empty<byte>();
-        byte[] payload = JsonSerializer.SerializeToUtf8Bytes(data, data.GetType(), writeIndented ? WriteIndentedJsonSerializerOptions : NoWriteIndentedJsonSerializerOptions);
-        return payload;
-    }
 
 
     protected List<TopicArray> GetAlarmTopicArrays(IEnumerable<AlarmModel> item)
@@ -401,7 +382,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                     if (_businessPropertyWithCacheIntervalScript.IsAlarmList)
                     {
                         var gList = group.Select(a => a).ToList();
-                        var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                        var json = gList.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                         // 将主题和 JSON 内容添加到列表中
                         topicArrayList.Add(new(topic, json, gList.Count));
                     }
@@ -410,7 +391,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         // 如果不是报警列表，则将每个分组元素分别转换为 JSON 字符串
                         foreach (var gro in group)
                         {
-                            var json = Serialize(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                            var json = gro.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
                             topicArrayList.Add(new(topic, json, 1));
                         }
@@ -423,14 +404,14 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
             if (_businessPropertyWithCacheIntervalScript.IsAlarmList)
             {
                 var gList = data.Select(a => a).ToList();
-                var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                var json = gList.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                 topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.AlarmTopic, json, gList.Count));
             }
             else
             {
                 foreach (var group in data)
                 {
-                    var json = Serialize(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                    var json = group.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                     topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.AlarmTopic, json, 1));
                 }
             }
@@ -468,7 +449,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         {
                             // 如果是设备列表，则将整个分组转换为 JSON 字符串
                             var gList = group.Select(a => a).ToList();
-                            var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                            var json = gList.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
                             topicArrayList.Add(new(topic, json, gList.Count));
                         }
@@ -477,7 +458,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                             // 如果不是设备列表，则将每个分组元素分别转换为 JSON 字符串
                             foreach (var gro in group)
                             {
-                                var json = Serialize(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                                var json = gro.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                                 // 将主题和 JSON 内容添加到列表中
                                 topicArrayList.Add(new(topic, json, 1));
                             }
@@ -491,14 +472,14 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
             if (_businessPropertyWithCacheIntervalScript.IsDeviceList)
             {
                 var gList = data.Select(a => a).ToList();
-                var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                var json = gList.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                 topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.DeviceTopic, json, gList.Count));
             }
             else
             {
                 foreach (var group in data)
                 {
-                    var json = Serialize(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                    var json = group.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                     topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.DeviceTopic, json, 1));
                 }
             }
@@ -535,7 +516,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         {
                             // 如果是变量列表，则将整个分组转换为 JSON 字符串
                             var gList = group.Select(a => a).ToList();
-                            var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                            var json = gList.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
                             topicArrayList.Add(new(topic, json, gList.Count));
                         }
@@ -544,7 +525,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                             // 如果不是变量列表，则将每个分组元素分别转换为 JSON 字符串
                             foreach (var gro in group)
                             {
-                                var json = Serialize(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                                var json = gro.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                                 // 将主题和 JSON 内容添加到列表中
                                 topicArrayList.Add(new(topic, json, 1));
                             }
@@ -558,14 +539,14 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
             if (_businessPropertyWithCacheIntervalScript.IsVariableList)
             {
                 var gList = data.Select(a => a).ToList();
-                var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                var json = gList.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                 topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, gList.Count));
             }
             else
             {
                 foreach (var group in data)
                 {
-                    var json = Serialize(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                    var json = group.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                     topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, 1));
                 }
             }
@@ -611,7 +592,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         {
                             // 如果是变量列表，则将整个分组转换为 JSON 字符串
                             var gList = group.Select(a => a).ToList();
-                            var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                            var json = gList.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
                             topicArrayList.Add(new(topic, json, gList.Count));
                         }
@@ -620,7 +601,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                             // 如果不是变量列表，则将每个分组元素分别转换为 JSON 字符串
                             foreach (var gro in group)
                             {
-                                var json = Serialize(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                                var json = gro.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                                 // 将主题和 JSON 内容添加到列表中
                                 topicArrayList.Add(new(topic, json, 1));
                             }
@@ -634,14 +615,14 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
             if (_businessPropertyWithCacheIntervalScript.IsVariableList)
             {
                 var gList = data.Select(a => a).ToList();
-                var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                var json = gList.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                 topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, gList.Count));
             }
             else
             {
                 foreach (var group in data)
                 {
-                    var json = Serialize(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                    var json = group.ToSystemTextJsonUtf8Bytes(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                     topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, 1));
                 }
             }
@@ -653,9 +634,9 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
     protected string GetDetailLogString(TopicArray topicArray, int queueCount)
     {
         if (queueCount > 0)
-            return $"Up Topic：{topicArray.Topic}{Environment.NewLine}PayLoad：{Encoding.UTF8.GetString(topicArray.Json)} {Environment.NewLine} VarModelQueue:{queueCount}";
+            return $"Up Topic：{topicArray.Topic}{Environment.NewLine}PayLoad：{Encoding.UTF8.GetString(topicArray.Payload)} {Environment.NewLine} VarModelQueue:{queueCount}";
         else
-            return $"Up Topic：{topicArray.Topic}{Environment.NewLine}PayLoad：{Encoding.UTF8.GetString(topicArray.Json)}";
+            return $"Up Topic：{topicArray.Topic}{Environment.NewLine}PayLoad：{Encoding.UTF8.GetString(topicArray.Payload)}";
     }
 
     protected string GetCountLogString(TopicArray topicArray, int queueCount)

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/Interval/BusinessPropertyWithCacheIntervalScript.cs

@@ -21,7 +21,7 @@ public class BusinessPropertyWithCacheIntervalScript : BusinessPropertyWithCache
     /// 是否显示详细日志
     /// </summary>
     [DynamicProperty]
-    public bool DetailLog { get; set; } = true;
+    public bool DetailLog { get; set; } = false;
 
     /// <summary>
     /// 缩进格式化

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/TopicArray.cs

@@ -14,11 +14,11 @@ public struct TopicArray
 {
     public TopicArray(string topic, byte[] json, int count)
     {
-        Topic = topic; Json = json; Count = count;
+        Topic = topic; Payload = json; Count = count;
     }
 
     public int Count { get; set; } = 1;
-    public byte[] Json { get; set; }
+    public byte[] Payload { get; set; }
     public string Topic { get; set; }
 
 }

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/VariablePropertyBase.cs

@@ -21,5 +21,5 @@ public abstract class VariablePropertyBase
     /// 启用
     /// </summary>
     [DynamicProperty()]
-    public bool Enable { get; set; } = true;
+    public virtual bool Enable { get; set; } = true;
 }

src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectBase.cs

@@ -31,7 +31,7 @@ namespace ThingsGateway.Gateway.Application;
 /// 采集插件，继承实现不同PLC通讯
 /// <para></para>
 /// </summary>
-public abstract class CollectBase : DriverBase
+public abstract class CollectBase : DriverBase, IRpcDriver
 {
     /// <summary>
     /// 插件配置项
@@ -356,7 +356,7 @@ public abstract class CollectBase : DriverBase
             {
                 // 方法调用成功时记录日志并增加成功计数器
                 if (LogMessage.LogLevel <= TouchSocket.Core.LogLevel.Trace)
-                    LogMessage?.Trace(string.Format("{0} - Execute method[{1}] - Succeeded {2}", DeviceName, readVariableMethods.MethodInfo.Name, readResult.Content?.ToJsonNetString()));
+                    LogMessage?.Trace(string.Format("{0} - Execute method[{1}] - Succeeded {2}", DeviceName, readVariableMethods.MethodInfo.Name, readResult.Content?.ToSystemTextJsonString()));
                 readResultCount.deviceMethodsVariableSuccessNum++;
                 CurrentDevice.SetDeviceStatus(TimerX.Now, false);
             }
@@ -550,7 +550,7 @@ public abstract class CollectBase : DriverBase
     /// <param name="writeInfoLists">要写入的变量及其对应的数据</param>
     /// <param name="cancellationToken">取消操作的通知</param>
     /// <returns>写入操作的结果字典</returns>
-    internal async ValueTask<Dictionary<string, OperResult<object>>> InvokeMethodAsync(Dictionary<VariableRuntime, JToken> writeInfoLists, CancellationToken cancellationToken)
+    public async ValueTask<Dictionary<string, Dictionary<string, IOperResult>>> InvokeMethodAsync(Dictionary<VariableRuntime, JToken> writeInfoLists, CancellationToken cancellationToken)
     {
         // 初始化结果字典
         Dictionary<string, OperResult<object>> results = new Dictionary<string, OperResult<object>>();
@@ -562,7 +562,7 @@ public abstract class CollectBase : DriverBase
             if (!string.IsNullOrEmpty(deviceVariable.WriteExpressions))
             {
                 // 提取原始数据
-                object rawdata = jToken is JValue jValue ? jValue.Value : jToken is JArray jArray ? jArray : jToken.ToString();
+                object rawdata = jToken.GetObjectFromJToken();
                 try
                 {
                     // 根据写入表达式转换数据
@@ -610,7 +610,13 @@ public abstract class CollectBase : DriverBase
         }
 
         // 将转换失败的变量和写入成功的变量的操作结果合并到结果字典中
-        return results.Concat(operResults).ToDictionary(a => a.Key, a => a.Value);
+        return new Dictionary<string, Dictionary<string, IOperResult>>()
+        {
+            {
+             DeviceName ,
+             results.Concat(operResults).ToDictionary(a => a.Key, a => (IOperResult)a.Value)
+            }
+        };
     }
 
     /// <summary>
@@ -619,7 +625,7 @@ public abstract class CollectBase : DriverBase
     /// <param name="writeInfoLists">要写入的变量及其对应的数据</param>
     /// <param name="cancellationToken">取消操作的通知</param>
     /// <returns>写入操作的结果字典</returns>
-    internal async ValueTask<Dictionary<string, OperResult>> InVokeWriteAsync(Dictionary<VariableRuntime, JToken> writeInfoLists, CancellationToken cancellationToken)
+    public async ValueTask<Dictionary<string, Dictionary<string, IOperResult>>> InVokeWriteAsync(Dictionary<VariableRuntime, JToken> writeInfoLists, CancellationToken cancellationToken)
     {
         // 初始化结果字典
         Dictionary<string, OperResult> results = new Dictionary<string, OperResult>();
@@ -632,7 +638,7 @@ public abstract class CollectBase : DriverBase
             if (!string.IsNullOrEmpty(deviceVariable.WriteExpressions))
             {
                 // 提取原始数据
-                object rawdata = jToken is JValue jValue ? jValue.Value : jToken is JArray jArray ? jArray : jToken.ToString();
+                object rawdata = jToken.GetObjectFromJToken();
                 try
                 {
                     // 根据写入表达式转换数据
@@ -664,7 +670,14 @@ public abstract class CollectBase : DriverBase
             cancellationToken).ConfigureAwait(false);
 
         // 将转换失败的变量和写入成功的变量的操作结果合并到结果字典中
-        return results.Concat(results1).ToDictionary(a => a.Key, a => a.Value);
+
+        return new Dictionary<string, Dictionary<string, IOperResult>>()
+        {
+            {
+                DeviceName ,
+                results.Concat(results1).ToDictionary(a => a.Key, a => (IOperResult)a.Value)
+            }
+        };
     }
 
     /// <summary>

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

@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+
+using Newtonsoft.Json.Linq;
+
+namespace ThingsGateway.Gateway.Application;
+
+public interface IRpcDriver
+{
+
+    ValueTask<Dictionary<string, Dictionary<string, IOperResult>>> InvokeMethodAsync(Dictionary<VariableRuntime, JToken> writeInfoLists, CancellationToken cancellationToken);
+
+    ValueTask<Dictionary<string, Dictionary<string, IOperResult>>> InVokeWriteAsync(Dictionary<VariableRuntime, JToken> writeInfoLists, CancellationToken cancellationToken);
+
+}

src/Gateway/ThingsGateway.Gateway.Application/Entity/Channel.cs

@@ -140,7 +140,7 @@ public class Channel : ChannelOptionsBase, IPrimaryIdEntity, IBaseDataEntity, IB
     /// <summary>
     /// 缓存超时
     /// </summary>
-    [SugarColumn(ColumnDescription = "缓存超时", IsNullable = true, DefaultValue = "500")]
+    [SugarColumn(ColumnDescription = "缓存超时", IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
     [MinValue(100)]
     public override int CacheTimeout { get; set; } = 500;
@@ -148,7 +148,7 @@ public class Channel : ChannelOptionsBase, IPrimaryIdEntity, IBaseDataEntity, IB
     /// <summary>
     /// 连接超时
     /// </summary>
-    [SugarColumn(ColumnDescription = "连接超时", IsNullable = true, DefaultValue = "3000")]
+    [SugarColumn(ColumnDescription = "连接超时", IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
     [MinValue(100)]
     public override int ConnectTimeout { get; set; } = 3000;
@@ -156,26 +156,26 @@ public class Channel : ChannelOptionsBase, IPrimaryIdEntity, IBaseDataEntity, IB
     /// <summary>
     /// 最大并发数
     /// </summary>
-    [SugarColumn(ColumnDescription = "最大并发数", IsNullable = true, DefaultValue = "1")]
+    [SugarColumn(ColumnDescription = "最大并发数", IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
     [MinValue(1)]
     public override int MaxConcurrentCount { get; set; } = 1;
 
-    [SugarColumn(ColumnDescription = "最大连接数", IsNullable = true, DefaultValue = "10000")]
+    [SugarColumn(ColumnDescription = "最大连接数", IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
     public override int MaxClientCount { get; set; } = 10000;
 
-    [SugarColumn(ColumnDescription = "客户端滑动过期时间", IsNullable = true, DefaultValue = "120000")]
+    [SugarColumn(ColumnDescription = "客户端滑动过期时间", IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
     public override int CheckClearTime { get; set; } = 120000;
 
     [SugarColumn(ColumnDescription = "心跳内容", IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
-    public override string Heartbeat { get; set; } = "Heartbeat";
+    public override string Heartbeat { get; set; }
 
     #region dtu终端
 
-    [SugarColumn(ColumnDescription = "心跳间隔", IsNullable = true, DefaultValue = "60000")]
+    [SugarColumn(ColumnDescription = "心跳间隔", IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
     public override int HeartbeatTime { get; set; } = 60000;
 
@@ -185,7 +185,7 @@ public class Channel : ChannelOptionsBase, IPrimaryIdEntity, IBaseDataEntity, IB
 
     #endregion
 
-    [SugarColumn(ColumnDescription = "Dtu类型", IsNullable = true, DefaultValue = "0")]
+    [SugarColumn(ColumnDescription = "Dtu类型", IsNullable = true)]
     [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
     public override DtuSeviceType DtuSeviceType { get; set; }
 

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

@@ -120,10 +120,7 @@ public class ChannelRuntime : Channel, IChannelOptions, IDisposable
         // 通过插件名称获取插件信息
         PluginInfo = GlobalData.PluginService.GetList().FirstOrDefault(A => A.FullName == PluginName);
 
-        if (PluginInfo == null)
-        {
-            //throw new Exception($"Plugin {PluginName} not found");
-        }
+        GlobalData.Channels.TryRemove(Id, out _);
 
         GlobalData.Channels.TryAdd(Id, this);
 

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

@@ -21,7 +21,7 @@ public class DeviceBasicData
 {
     [Newtonsoft.Json.JsonIgnore]
     [System.Text.Json.Serialization.JsonIgnore]
-    public DeviceRuntime DeviceRuntime{ get; set; }
+    public DeviceRuntime DeviceRuntime { get; set; }
 
     /// <inheritdoc cref="PrimaryIdEntity.Id"/>
     public long Id { get; set; }

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

@@ -224,7 +224,16 @@ public class DeviceRuntime : Device, IDisposable
     [AutoGenerateColumn(Ignore = true)]
     public IDriver? Driver { get; internal set; }
 
+    [System.Text.Json.Serialization.JsonIgnore]
+    [Newtonsoft.Json.JsonIgnore]
+    [AdaptIgnore]
+    [AutoGenerateColumn(Ignore = true)]
+    public IRpcDriver? RpcDriver { get; set; }
 
+    [System.Text.Json.Serialization.JsonIgnore]
+    [Newtonsoft.Json.JsonIgnore]
+    [AutoGenerateColumn(Ignore = true)]
+    public string? Tag { get; set; }
 
     public void Init(ChannelRuntime channelRuntime)
     {

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

@@ -87,18 +87,13 @@ public class VariableMethod
             }
 
             dynamic result;
-            switch (MethodInfo.TaskType)
+            switch (MethodInfo.ReturnKind)
             {
-                case TaskReturnType.Task:
-                    await MethodInfo.InvokeAsync(driverBase, os).ConfigureAwait(false);
-                    result = OperResult.Success;
+                case MethodReturnKind.Awaitable:
+                case MethodReturnKind.AwaitableObject:
+                    result = await MethodInfo.InvokeAsync(driverBase, os).ConfigureAwait(false);
                     break;
 
-                case TaskReturnType.TaskObject:
-                    result = await MethodInfo.InvokeObjectAsync(driverBase, os).ConfigureAwait(false);
-                    break;
-
-                case TaskReturnType.None:
                 default:
                     result = MethodInfo.Invoke(driverBase, os);
                     break;

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

@@ -12,6 +12,8 @@ using BootstrapBlazor.Components;
 
 using Mapster;
 
+using Newtonsoft.Json.Linq;
+
 using SqlSugar;
 
 using ThingsGateway.Gateway.Application.Extensions;
@@ -34,7 +36,7 @@ public class VariableRuntime : Variable, IVariable, IDisposable
 
     public VariableRuntime()
     {
-        
+
     }
     /// <summary>
     /// 变化时间
@@ -142,7 +144,7 @@ public class VariableRuntime : Variable, IVariable, IDisposable
     /// 实时值
     /// </summary>
     [AutoGenerateColumn(Visible = true, Order = 6)]
-    public string? RuntimeType => Value?.GetType()?.Name;
+    public string? RuntimeType => Value?.GetType()?.ToString();
 
     /// <summary>
     /// 设置变量值与时间/质量戳
@@ -210,6 +212,11 @@ public class VariableRuntime : Variable, IVariable, IDisposable
         }
         else
         {
+            if (data is JToken jToken)
+            {
+                data = jToken.GetObjectFromJToken();
+            }
+
             //判断变化，插件传入的Value可能是基础类型，也有可能是class，比较器无法识别是否变化，这里json处理序列化比较
             //检查IComparable
             if (!data.Equals(_value))
@@ -221,7 +228,7 @@ public class VariableRuntime : Variable, IVariable, IDisposable
                 else
                 {
                     if (_value != null)
-                        changed = data.ToJsonNetString(false) != _value.ToJsonNetString(false);
+                        changed = data.ToSystemTextJsonString(false) != _value.ToSystemTextJsonString(false);
                     else
                         changed = true;
                 }
@@ -378,7 +385,7 @@ public class VariableRuntime : Variable, IVariable, IDisposable
     }
 
     /// <inheritdoc/>
-    public async ValueTask<OperResult> RpcAsync(string value, string? executive = "brower", CancellationToken cancellationToken = default)
+    public async ValueTask<IOperResult> RpcAsync(string value, string? executive = "brower", CancellationToken cancellationToken = default)
     {
         var data = await GlobalData.RpcService.InvokeDeviceMethodAsync(executive, new Dictionary<string, Dictionary<string, string>>()
         {

src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelService.cs

@@ -386,7 +386,7 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
                     if (channel == null)
                     {
                         importPreviewOutput.HasError = true;
-                        importPreviewOutput.Results.Add((row++, false, Localizer["ImportNullError"]));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["ImportNullError"]));
                         return;
                     }
 
@@ -409,7 +409,7 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
                     if (stringBuilder.Length > 0)
                     {
                         importPreviewOutput.HasError = true;
-                        importPreviewOutput.Results.Add((row++, false, stringBuilder.ToString()));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, stringBuilder.ToString()));
                         return;
                     }
 
@@ -430,19 +430,19 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
 
                     if (channel.IsUp && ((dataScope != null && dataScope?.Count > 0 && !dataScope.Contains(channel.CreateOrgId)) || dataScope?.Count == 0 && channel.CreateUserId != UserManager.UserId))
                     {
-                        importPreviewOutput.Results.Add((row++, false, "Operation not permitted"));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, "Operation not permitted"));
                     }
                     else
                     {
                         channels.Add(channel);
-                        importPreviewOutput.Results.Add((row++, true, null));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), true, null));
                     }
                     return;
                 }
                 catch (Exception ex)
                 {
                     importPreviewOutput.HasError = true;
-                    importPreviewOutput.Results.Add((row++, false, ex.Message));
+                    importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, ex.Message));
                     return;
                 }
             });

src/Gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceService.cs

@@ -432,7 +432,7 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
                     if (device == null)
                     {
                         importPreviewOutput.HasError = true;
-                        importPreviewOutput.Results.Add((row++, false, Localizer["ImportNullError"]));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["ImportNullError"]));
                         return;
                     }
 
@@ -449,7 +449,7 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
                         {
                             // 如果找不到对应的冗余设备，则添加错误信息到导入预览结果并返回
                             importPreviewOutput.HasError = true;
-                            importPreviewOutput.Results.Add((row++, false, Localizer["RedundantDeviceError"]));
+                            importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["RedundantDeviceError"]));
                             return;
                         }
                     }
@@ -459,7 +459,7 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
                         if (device.RedundantEnable)
                         {
                             importPreviewOutput.HasError = true;
-                            importPreviewOutput.Results.Add((row++, false, Localizer["RedundantDeviceError"]));
+                            importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["RedundantDeviceError"]));
                             return;
                         }
                     }
@@ -473,7 +473,7 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
                         {
                             // 如果找不到对应的通道信息，则添加错误信息到导入预览结果并返回
                             importPreviewOutput.HasError = true;
-                            importPreviewOutput.Results.Add((row++, false, Localizer["ChannelError"]));
+                            importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["ChannelError"]));
                             return;
                         }
                     }
@@ -481,7 +481,7 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
                     {
                         // 如果未提供通道信息，则添加错误信息到导入预览结果并返回
                         importPreviewOutput.HasError = true;
-                        importPreviewOutput.Results.Add((row++, false, Localizer["ChannelError"]));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["ChannelError"]));
                         return;
                     }
 
@@ -504,7 +504,7 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
                     if (stringBuilder.Length > 0)
                     {
                         importPreviewOutput.HasError = true;
-                        importPreviewOutput.Results.Add((row++, false, stringBuilder.ToString()));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, stringBuilder.ToString()));
                         return;
                     }
 
@@ -527,12 +527,12 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
                     // 将设备添加到设备列表中，并添加成功信息到导入预览结果
                     if (device.IsUp && ((dataScope != null && dataScope?.Count > 0 && !dataScope.Contains(device.CreateOrgId)) || dataScope?.Count == 0 && device.CreateUserId != UserManager.UserId))
                     {
-                        importPreviewOutput.Results.Add((row++, false, "Operation not permitted"));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, "Operation not permitted"));
                     }
                     else
                     {
                         devices.Add(device);
-                        importPreviewOutput.Results.Add((row++, true, null));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), true, null));
                     }
                     return;
                 }
@@ -540,7 +540,7 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
                 {
                     // 捕获异常并添加错误信息到导入预览结果
                     importPreviewOutput.HasError = true;
-                    importPreviewOutput.Results.Add((row++, false, ex.Message));
+                    importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, ex.Message));
                     return;
                 }
             });
@@ -573,7 +573,7 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
             if (driverPluginType == null)
             {
                 importPreviewOutput.HasError = true;
-                importPreviewOutput.Results.Add((row++, false, Localizer["NotNull", sheetName]));
+                importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["NotNull", sheetName]));
                 return;
             }
 
@@ -617,7 +617,7 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
                     if (propertys.Item1 == null)
                     {
                         importPreviewOutput.HasError = true;
-                        importPreviewOutput.Results.Add((row++, false, Localizer["PluginNotNull"]));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["PluginNotNull"]));
                         continue;
                     }
 
@@ -625,7 +625,7 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
                     if (!item.TryGetValue(ExportString.DeviceName, out var deviceName))
                     {
                         importPreviewOutput.HasError = true;
-                        importPreviewOutput.Results.Add((row++, false, Localizer["DeviceNotNull"]));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["DeviceNotNull"]));
                         continue;
                     }
 
@@ -637,7 +637,7 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
                     if (!hasDevice)
                     {
                         importPreviewOutput.HasError = true;
-                        importPreviewOutput.Results.Add((row++, false, Localizer["NotNull", value]));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["NotNull", value]));
                         continue;
                     }
 
@@ -648,7 +648,7 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
                     if (pluginProp == null)
                     {
                         importPreviewOutput.HasError = true;
-                        importPreviewOutput.Results.Add((row++, false, Localizer["ImportNullError"]));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["ImportNullError"]));
                         return;
                     }
 
@@ -671,7 +671,7 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
                     if (stringBuilder.Length > 0)
                     {
                         importPreviewOutput.HasError = true;
-                        importPreviewOutput.Results.Add((row++, false, stringBuilder.ToString()));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, stringBuilder.ToString()));
                         return;
                     }
 
@@ -687,14 +687,14 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
 
                     // 更新设备导入预览数据中对应设备的属性信息，并添加成功信息到导入预览结果
                     deviceImportPreview.Data[value].DevicePropertys = devices;
-                    importPreviewOutput.Results.Add((row++, true, null));
+                    importPreviewOutput.Results.Add((Interlocked.Increment(ref row), true, null));
                     continue;
                 }
                 catch (Exception ex)
                 {
                     // 捕获异常并添加错误信息到导入预览结果并返回
                     importPreviewOutput.HasError = true;
-                    importPreviewOutput.Results.Add((row++, false, ex.Message));
+                    importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, ex.Message));
                     return;
                 }
             }

src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/ChannelManage/ChannelThreadManage.cs

@@ -21,8 +21,8 @@ namespace ThingsGateway.Gateway.Application;
 internal sealed class ChannelThreadManage : IChannelThreadManage
 {
     private ILogger _logger;
-    private static IDispatchService<ChannelRuntime> channelRuntimeDispatchService;
-    private static IDispatchService<ChannelRuntime> ChannelRuntimeDispatchService
+    private IDispatchService<ChannelRuntime> channelRuntimeDispatchService;
+    private IDispatchService<ChannelRuntime> ChannelRuntimeDispatchService
     {
         get
         {

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

@@ -38,8 +38,8 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
     /// </summary>
     public static volatile int CycleInterval = ManageHelper.ChannelThreadOptions.MaxCycleInterval;
 
-    private static IDispatchService<DeviceRuntime> devicelRuntimeDispatchService;
-    private static IDispatchService<DeviceRuntime> DeviceRuntimeDispatchService
+    private IDispatchService<DeviceRuntime> devicelRuntimeDispatchService;
+    private IDispatchService<DeviceRuntime> DeviceRuntimeDispatchService
     {
         get
         {

src/Gateway/ThingsGateway.Gateway.Application/Services/Rpc/IRpcService.cs

@@ -19,5 +19,5 @@ public interface IRpcService
     /// <param name="deviceDatas">指定键为变量名称，值为附带方法参数或写入值，方法参数会按逗号分割解析</param>
     /// <param name="cancellationToken"><see cref="CancellationToken"/> 取消令箭</param>
     /// <returns></returns>
-    Task<Dictionary<string, Dictionary<string, OperResult>>> InvokeDeviceMethodAsync(string sourceDes, Dictionary<string, Dictionary<string, string>> deviceDatas, CancellationToken cancellationToken = default);
+    Task<Dictionary<string, Dictionary<string, IOperResult>>> InvokeDeviceMethodAsync(string sourceDes, Dictionary<string, Dictionary<string, string>> deviceDatas, CancellationToken cancellationToken = default);
 }

src/Gateway/ThingsGateway.Gateway.Application/Services/Rpc/RpcService.cs

@@ -42,16 +42,15 @@ internal sealed class RpcService : IRpcService
     private IStringLocalizer Localizer { get; }
 
     /// <inheritdoc />
-    public async Task<Dictionary<string, Dictionary<string, OperResult>>> InvokeDeviceMethodAsync(string sourceDes, Dictionary<string, Dictionary<string, string>> deviceDatas, CancellationToken cancellationToken = default)
+    public async Task<Dictionary<string, Dictionary<string, IOperResult>>> InvokeDeviceMethodAsync(string sourceDes, Dictionary<string, Dictionary<string, string>> deviceDatas, CancellationToken cancellationToken = default)
     {
         // 初始化用于存储将要写入的变量和方法的字典
-        Dictionary<CollectBase, Dictionary<VariableRuntime, JToken>> writeVariables = new();
-        Dictionary<CollectBase, Dictionary<VariableRuntime, JToken>> writeMethods = new();
+        Dictionary<IRpcDriver, Dictionary<VariableRuntime, JToken>> writeVariables = new();
+        Dictionary<IRpcDriver, Dictionary<VariableRuntime, JToken>> writeMethods = new();
         // 用于存储结果的并发字典
-        ConcurrentDictionary<string, Dictionary<string, OperResult>> results = new();
+        ConcurrentDictionary<string, Dictionary<string, IOperResult>> results = new();
         deviceDatas.ForEach(a => results.TryAdd(a.Key, new()));
 
-
         var deviceDict = GlobalData.Devices;
 
         // 对每个要操作的变量进行检查和处理
@@ -68,7 +67,8 @@ internal sealed class RpcService : IRpcService
             }
 
             // 查找变量对应的设备
-            var collect = device.Driver as CollectBase;
+            var collect = device.Driver as IRpcDriver;
+            collect ??= device.RpcDriver;
             if (collect == null)
             {
                 // 如果设备不存在，则添加错误信息到结果中并继续下一个设备的处理
@@ -78,7 +78,7 @@ internal sealed class RpcService : IRpcService
                 continue;
             }
             // 检查设备状态，如果设备处于暂停状态，则添加相应的错误信息到结果中并继续下一个变量的处理
-            if (collect.CurrentDevice.DeviceStatus == DeviceStatusEnum.Pause)
+            if (device.DeviceStatus == DeviceStatusEnum.Pause)
             {
                 deviceData.Value.ForEach(a =>
                 results[deviceData.Key].TryAdd(a.Key, new OperResult(Localizer["DevicePause", deviceData.Key]))
@@ -136,46 +136,51 @@ internal sealed class RpcService : IRpcService
                 // 写入日志
                 foreach (var resultItem in result)
                 {
-                    var empty = string.IsNullOrEmpty(resultItem.Key);
-                    string operObj = empty ? deviceDatas[driverData.Key.DeviceName].Select(x => x.Key).ToJsonNetString() : resultItem.Key;
 
-                    string parJson = empty ? deviceDatas.Select(x => x.Value).ToJsonNetString() : deviceDatas[driverData.Key.DeviceName][resultItem.Key];
 
-                    if (!resultItem.Value.IsSuccess || _rpcLogOptions.SuccessLog)
-                        _logQueues.Enqueue(
-                            new RpcLog()
-                            {
-                                LogTime = DateTime.Now,
-                                OperateMessage = resultItem.Value.IsSuccess ? null : resultItem.Value.ToString(),
-                                IsSuccess = resultItem.Value.IsSuccess,
-                                OperateMethod = Localizer["WriteVariable"],
-                                OperateDevice = driverData.Key.DeviceName,
-                                OperateObject = operObj,
-                                OperateSource = sourceDes,
-                                ParamJson = parJson,
-                                ResultJson = null
-                            }
-                        );
-
-                    // 不返回详细错误
-                    if (!resultItem.Value.IsSuccess)
+                    foreach (var variableResult in resultItem.Value)
                     {
-                        OperResult result1 = resultItem.Value;
-                        result1.Exception = null;
-                        result[resultItem.Key] = result1;
-                    }
-                }
 
-                // 将结果添加到结果字典中
-                results[driverData.Key.DeviceName].AddRange(result);
+                        string operObj = variableResult.Key;
+
+                        string parJson = deviceDatas[resultItem.Key][variableResult.Key];
+
+                        if (!variableResult.Value.IsSuccess || _rpcLogOptions.SuccessLog)
+                            _logQueues.Enqueue(
+                                new RpcLog()
+                                {
+                                    LogTime = DateTime.Now,
+                                    OperateMessage = variableResult.Value.IsSuccess ? null : variableResult.Value.ToString(),
+                                    IsSuccess = variableResult.Value.IsSuccess,
+                                    OperateMethod = Localizer["WriteVariable"],
+                                    OperateDevice = resultItem.Key,
+                                    OperateObject = operObj,
+                                    OperateSource = sourceDes,
+                                    ParamJson = parJson,
+                                    ResultJson = null
+                                }
+                            );
+
+                        // 不返回详细错误
+                        if (!variableResult.Value.IsSuccess)
+                        {
+                            var result1 = variableResult.Value;
+                            result1.Exception = null;
+                            resultItem.Value[variableResult.Key] = result1;
+                        }
+                    }
+
+                    // 将结果添加到结果字典中
+                    results[resultItem.Key].AddRange(resultItem.Value);
+                }
             }
             catch (Exception ex)
             {
                 // 将异常信息添加到结果字典中
-                results[driverData.Key.DeviceName].AddRange(driverData.Value.Select((KeyValuePair<VariableRuntime, JToken> a) =>
+                foreach (var item in driverData.Value)
                 {
-                    return new KeyValuePair<string, OperResult>(a.Key.Name, new OperResult(ex));
-                }));
+                    results[item.Key.DeviceName].Add(item.Key.Name, new OperResult(ex));
+                }
             }
         }, cancellationToken).ConfigureAwait(false);
 
@@ -192,42 +197,51 @@ internal sealed class RpcService : IRpcService
                 // 写入日志
                 foreach (var resultItem in result)
                 {
-                    // 写入日志
-                    if (!resultItem.Value.IsSuccess || _rpcLogOptions.SuccessLog)
-                        _logQueues.Enqueue(
-                            new RpcLog()
-                            {
-                                LogTime = DateTime.Now,
-                                OperateMessage = resultItem.Value.IsSuccess ? null : resultItem.Value.ToString(),
-                                IsSuccess = resultItem.Value.IsSuccess,
-                                OperateMethod = operateMethods[resultItem.Key],
-                                OperateDevice = driverData.Key.DeviceName,
-                                OperateObject = resultItem.Key,
-                                OperateSource = sourceDes,
-                                ParamJson = deviceDatas[driverData.Key.DeviceName][resultItem.Key]?.ToString(),
-                                ResultJson = resultItem.Value.Content?.ToJsonNetString()
-                            }
-                        );
 
-                    // 不返回详细错误
-                    if (!resultItem.Value.IsSuccess)
+                    foreach (var variableResult in resultItem.Value)
                     {
-                        OperResult<object> result1 = resultItem.Value;
-                        result1.Exception = null;
-                        result[resultItem.Key] = result1;
-                    }
-                }
+                        string operObj = variableResult.Key;
 
-                results[driverData.Key.DeviceName].AddRange(result.ToDictionary(a => a.Key, a => (OperResult)a.Value));
+                        string parJson = deviceDatas[resultItem.Key][variableResult.Key];
+
+                        // 写入日志
+                        if (!variableResult.Value.IsSuccess || _rpcLogOptions.SuccessLog)
+                            _logQueues.Enqueue(
+                                new RpcLog()
+                                {
+                                    LogTime = DateTime.Now,
+                                    OperateMessage = variableResult.Value.IsSuccess ? null : variableResult.Value.ToString(),
+                                    IsSuccess = variableResult.Value.IsSuccess,
+                                    OperateMethod = operateMethods[variableResult.Key],
+                                    OperateDevice = resultItem.Key,
+                                    OperateObject = operObj,
+                                    OperateSource = sourceDes,
+                                    ParamJson = parJson?.ToString(),
+                                    ResultJson = variableResult.Value is IOperResult<object> operResult ? operResult.Content?.ToSystemTextJsonString() : string.Empty
+                                }
+                            );
+
+                        // 不返回详细错误
+                        if (!variableResult.Value.IsSuccess)
+                        {
+                            var result1 = variableResult.Value;
+                            result1.Exception = null;
+                            resultItem.Value[variableResult.Key] = result1;
+                        }
+                    }
+
+
+                    results[resultItem.Key].AddRange(resultItem.Value.ToDictionary(a => a.Key, a => a.Value));
+                }
 
             }
             catch (Exception ex)
             {
                 // 将异常信息添加到结果字典中
-                results[driverData.Key.DeviceName].AddRange(driverData.Value.Select((KeyValuePair<VariableRuntime, JToken> a) =>
+                foreach (var item in driverData.Value)
                 {
-                    return new KeyValuePair<string, OperResult>(a.Key.Name, new OperResult(ex));
-                }));
+                    results[item.Key.DeviceName].Add(item.Key.Name, new OperResult(ex));
+                }
             }
         }, cancellationToken).ConfigureAwait(false);
 

src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableService.cs

@@ -619,7 +619,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
                     if (deviceId == null)
                     {
                         importPreviewOutput.HasError = true;
-                        importPreviewOutput.Results.Add((Interlocked.Add(ref row, 1), false, Localizer["NotNull", deviceName]));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["NotNull", deviceName]));
                         return;
                     }
                     // 手动补录变量ID和设备ID
@@ -642,7 +642,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
                     if (stringBuilder.Length > 0)
                     {
                         importPreviewOutput.HasError = true;
-                        importPreviewOutput.Results.Add((Interlocked.Add(ref row, 1), false, stringBuilder.ToString()));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, stringBuilder.ToString()));
                         return;
                     }
 
@@ -661,19 +661,19 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
                     }
                     if (device.IsUp && ((dataScope != null && dataScope?.Count > 0 && !dataScope.Contains(variable.CreateOrgId)) || dataScope?.Count == 0 && variable.CreateUserId != UserManager.UserId))
                     {
-                        importPreviewOutput.Results.Add((row++, false, "Operation not permitted"));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, "Operation not permitted"));
                     }
                     else
                     {
                         variables.Add(variable);
-                        importPreviewOutput.Results.Add((Interlocked.Add(ref row, 1), true, null));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), true, null));
                     }
                 }
                 catch (Exception ex)
                 {
                     // 捕获异常并添加错误信息到导入预览结果
                     importPreviewOutput.HasError = true;
-                    importPreviewOutput.Results.Add((Interlocked.Add(ref row, 1), false, ex.Message));
+                    importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, ex.Message));
                 }
             });
 
@@ -702,7 +702,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
                 if (driverPluginType == null)
                 {
                     importPreviewOutput.HasError = true;
-                    importPreviewOutput.Results.Add((Interlocked.Add(ref row, 1), false, Localizer["NotNull", sheetName]));
+                    importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["NotNull", sheetName]));
                     return deviceImportPreview;
                 }
 
@@ -742,7 +742,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
                         if (propertys.Item3?.Count == null || propertys.Item1 == null)
                         {
                             importPreviewOutput.HasError = true;
-                            importPreviewOutput.Results.Add((Interlocked.Add(ref row, 1), false, Localizer["ImportNullError"]));
+                            importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["ImportNullError"]));
                             return;
                         }
 
@@ -753,7 +753,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
                         if (pluginProp == null)
                         {
                             importPreviewOutput.HasError = true;
-                            importPreviewOutput.Results.Add((Interlocked.Add(ref row, 1), false, Localizer["ImportNullError"]));
+                            importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["ImportNullError"]));
                             return;
                         }
 
@@ -768,13 +768,13 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
                         if (businessDevName == null || businessDevice == null || collectDevName == null || collectDevice == null)
                         {
                             importPreviewOutput.HasError = true;
-                            importPreviewOutput.Results.Add((Interlocked.Add(ref row, 1), false, Localizer["DeviceNotNull"]));
+                            importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["DeviceNotNull"]));
                             return;
                         }
                         if (variableNameObj == null)
                         {
                             importPreviewOutput.HasError = true;
-                            importPreviewOutput.Results.Add((Interlocked.Add(ref row, 1), false, Localizer["VariableNotNull"]));
+                            importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["VariableNotNull"]));
                             return;
                         }
 
@@ -797,7 +797,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
                         if (stringBuilder.Length > 0)
                         {
                             importPreviewOutput.HasError = true;
-                            importPreviewOutput.Results.Add((Interlocked.Add(ref row, 1), false, stringBuilder.ToString()));
+                            importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, stringBuilder.ToString()));
                             return;
                         }
 
@@ -818,12 +818,12 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
                         {
                             deviceVariable.VariablePropertys ??= new();
                             deviceVariable.VariablePropertys?.AddOrUpdate(businessDevice.Id, dependencyProperties);
-                            importPreviewOutput.Results.Add((Interlocked.Add(ref row, 1), true, null));
+                            importPreviewOutput.Results.Add((Interlocked.Increment(ref row), true, null));
                         }
                         else
                         {
                             importPreviewOutput.HasError = true;
-                            importPreviewOutput.Results.Add((Interlocked.Add(ref row, 1), false, Localizer["VariableNotNull"]));
+                            importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, Localizer["VariableNotNull"]));
                             return;
                         }
                     }
@@ -831,7 +831,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
                     {
                         // 捕获异常并添加错误信息到导入预览结果
                         importPreviewOutput.HasError = true;
-                        importPreviewOutput.Results.Add((Interlocked.Add(ref row, 1), false, ex.Message));
+                        importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, ex.Message));
                     }
                 });
             }
@@ -839,7 +839,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
             {
                 // 捕获异常并添加错误信息到导入预览结果
                 importPreviewOutput.HasError = true;
-                importPreviewOutput.Results.Add((Interlocked.Add(ref row, 1), false, ex.Message));
+                importPreviewOutput.Results.Add((Interlocked.Increment(ref row), false, ex.Message));
             }
         }
 

src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableServiceHelpers.cs

@@ -187,7 +187,7 @@ public static class VariableServiceHelpers
 
 
 
-        variableExports = new(variableExports.OrderBy(a => a[ExportString.DeviceName]).ThenBy(a => a[varName]));
+        //variableExports = new(variableExports.OrderBy(a => a[ExportString.DeviceName]).ThenBy(a => a[varName]));
 
         //添加设备页
         sheets.Add(ExportString.VariableName, variableExports);

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

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

src/Gateway/ThingsGateway.Gateway.Razor/Components/TcpServiceComponent.razor.cs

@@ -74,7 +74,7 @@ public partial class TcpServiceComponent : IDriverUIBase
                     }
                     return data;
                 }).ToList();
-                data[i].PluginInfos = pluginInfos.ToJsonNetString();
+                data[i].PluginInfos = pluginInfos.ToSystemTextJsonString();
             }
 
             var query = data.GetQueryData(options);

src/Gateway/ThingsGateway.Gateway.Razor/Components/USheet.razor.cs

@@ -34,7 +34,7 @@ public partial class USheet
             await _sheetExcel.PushDataAsync(new UniverSheetData()
             {
                 CommandName = "SetWorkbook",
-                WorkbookData = Model.ToJsonNetString(),
+                WorkbookData = Model.ToSystemTextJsonString(),
             });
         });
     }

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

@@ -403,7 +403,7 @@ finally
                 Title = GatewayLocalizer["DeleteConfirmTitle"],
                 BodyTemplate = (__builder) =>
                 {
-                    var data = modelIds.Select(a => a.Name).ToJsonNetString();
+                    var data = modelIds.Select(a => a.Name).ToSystemTextJsonString();
                     __builder.OpenElement(0, "div");
                     __builder.AddAttribute(1, "class", "w-100 ");
                     __builder.OpenElement(2, "span");
@@ -932,7 +932,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
                 Title = GatewayLocalizer["DeleteConfirmTitle"],
                 BodyTemplate = (__builder) =>
                 {
-                    var data = modelIds.Select(a => a.Name).ToJsonNetString();
+                    var data = modelIds.Select(a => a.Name).ToSystemTextJsonString();
                     __builder.OpenElement(0, "div");
                     __builder.AddAttribute(1, "class", "w-100 ");
                     __builder.OpenElement(2, "span");

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

@@ -34,7 +34,7 @@ public partial class ScriptCheck
     private Type type;
     protected override void OnInitialized()
     {
-        Input = Data.ToJsonNetString();
+        Input = Data.ToSystemTextJsonString();
         type = Data.GetType();
         base.OnInitialized();
     }
@@ -45,7 +45,7 @@ public partial class ScriptCheck
         {
             Data = (IEnumerable<object>)Newtonsoft.Json.JsonConvert.DeserializeObject(Input, type);
             var value = Data.GetDynamicModel(Script);
-            Output = value.ToJsonNetString();
+            Output = value.ToSystemTextJsonString();
         }
 
         catch (Exception ex)

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

@@ -34,7 +34,7 @@ public partial class VariableEditComponent
         var ret = "";
         if (d != null)
         {
-            ret = d.ToJsonNetString();
+            ret = d.ToSystemTextJsonString();
         }
         return ret;
     }

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

@@ -58,7 +58,7 @@ public partial class VariableRuntimeInfo : IDisposable
         var ret = "";
         if (d is TableColumnContext<VariableRuntime, object?> data && data?.Value != null)
         {
-            ret = data.Value.ToJsonNetString();
+            ret = data.Value.ToSystemTextJsonString();
         }
         return Task.FromResult(ret);
     }

src/Gateway/ThingsGateway.Management/Helper/DeviceDataWithValue.cs

@@ -16,7 +16,6 @@ namespace ThingsGateway.Management;
 
 public class DeviceDataWithValue
 {
-    public long Id { get; set; }
     /// <inheritdoc cref="Device.Name"/>
     public string Name { get; set; }
 
@@ -34,3 +33,17 @@ public class DeviceDataWithValue
     /// <inheritdoc cref="DeviceRuntime.ReadOnlyVariableRuntimes"/>
     public Dictionary<string, VariableDataWithValue> ReadOnlyVariableRuntimes { get; set; }
 }
+
+
+
+public class DataWithDatabase
+{
+    public Channel Channel { get; set; }
+    public List<DeviceDataWithDatabase> DeviceVariables { get; set; }
+}
+
+public class DeviceDataWithDatabase
+{
+    public Device Device { get; set; }
+    public List<Variable> Variables { get; set; }
+}

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

@@ -44,6 +44,7 @@
     "RedundancyDisable": "Redundant gateway site not enabled"
   },
   "ThingsGateway.Management.RedundancyOptions": {
+    "ForcedSync": "Forced Synchronous",
     "Enable": "Enable Dual-Machine Redundancy",
     "MasterUri": "Master Node URL",
     "IsMaster": "IsMaster",
@@ -59,8 +60,9 @@
     "Switch": "Switch",
 
     "Restart": "The redundant service will be restarted soon",
-    "Confirm": "Confirm switching to redundant state"
+    "Confirm": "Confirm switching to redundant state",
 
+    "ForcedSyncWarning": "Forcing synchronization will generate database configuration information.Are you sure you want to continue?"
 
   },
 

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

@@ -46,7 +46,7 @@
   },
 
   "ThingsGateway.Management.RedundancyOptions": {
-
+    "ForcedSync": "强制同步",
     "Enable": "启用双机冗余",
     "MasterUri": "主站Url",
     "IsMaster": "是否为主站",
@@ -62,7 +62,8 @@
     "Switch": "切换",
 
     "Restart": "即将重新启动冗余服务",
-    "Confirm": "确认切换冗余状态"
+    "Confirm": "确认切换冗余状态",
+    "ForcedSyncWarning": "强制同步会生成数据库配置信息，是否继续?"
   },
 
   "ThingsGateway.Management._Imports": {

src/Gateway/ThingsGateway.Management/Management/IRedundancyHostedService.cs

@@ -17,6 +17,8 @@ internal interface IRedundancyHostedService : IHostedService
 {
     Task<OperResult> StartRedundancyTaskAsync();
     Task StopRedundancyTaskAsync();
+    ValueTask ForcedSync(CancellationToken cancellationToken = default);
+
     public TextFileLogger TextLogger { get; }
     public string LogPath { get; }
 }

src/Gateway/ThingsGateway.Management/Management/RedundancyHostedService.cs

@@ -13,6 +13,9 @@ using Mapster;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
+using Newtonsoft.Json.Linq;
+
+using ThingsGateway.Extension.Generic;
 using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife;
 
@@ -24,7 +27,7 @@ using TouchSocket.Sockets;
 
 namespace ThingsGateway.Management;
 
-internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHostedService
+internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHostedService, IRpcDriver
 {
     private readonly ILogger _logger;
     private readonly IRedundancyService _redundancyService;
@@ -50,16 +53,17 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
     private IStringLocalizer Localizer { get; }
     private DoTask RedundancyTask { get; set; }
     private WaitLock RedundancyRestartLock { get; } = new();
-    private LoggerGroup _log { get; set; }
+    public ILog LogMessage { get; set; }
     public TextFileLogger TextLogger { get; }
     public string LogPath { get; }
     private TcpDmtpClient TcpDmtpClient;
     private TcpDmtpService TcpDmtpService;
     private async Task<TcpDmtpClient> GetTcpDmtpClient(RedundancyOptions redundancy)
     {
-        _log = new LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
-        _log?.AddLogger(new EasyLogger(Log_Out) { LogLevel = TouchSocket.Core.LogLevel.Trace });
-        _log?.AddLogger(TextLogger);
+        var log = new LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
+        log?.AddLogger(new EasyLogger(Log_Out) { LogLevel = TouchSocket.Core.LogLevel.Trace });
+        log?.AddLogger(TextLogger);
+        LogMessage = log;
         var tcpDmtpClient = new TcpDmtpClient();
         var config = new TouchSocketConfig()
                .SetRemoteIPHost(redundancy.MasterUri)
@@ -67,10 +71,10 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
                .SetDmtpOption(new DmtpOption() { VerifyToken = redundancy.VerifyToken })
                .ConfigureContainer(a =>
                {
-                   a.AddLogger(_log);
+                   a.AddLogger(LogMessage);
                    a.AddRpcStore(store =>
                    {
-                       store.RegisterServer(new ReverseCallbackServer());
+                       store.RegisterServer(new ReverseCallbackServer(this));
                    });
                })
                .ConfigurePlugins(a =>
@@ -87,9 +91,10 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
 
     private async Task<TcpDmtpService> GetTcpDmtpService(RedundancyOptions redundancy)
     {
-        _log = new LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
-        _log?.AddLogger(new EasyLogger(Log_Out) { LogLevel = TouchSocket.Core.LogLevel.Trace });
-        _log?.AddLogger(TextLogger);
+        var log = new LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
+        log?.AddLogger(new EasyLogger(Log_Out) { LogLevel = TouchSocket.Core.LogLevel.Trace });
+        log?.AddLogger(TextLogger);
+        LogMessage = log;
         var tcpDmtpService = new TcpDmtpService();
         var config = new TouchSocketConfig()
                .SetListenIPHosts(redundancy.MasterUri)
@@ -97,10 +102,10 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
                .SetDmtpOption(new DmtpOption() { VerifyToken = redundancy.VerifyToken })
                .ConfigureContainer(a =>
                {
-                   a.AddLogger(_log);
+                   a.AddLogger(LogMessage);
                    a.AddRpcStore(store =>
                    {
-                       store.RegisterServer(new ReverseCallbackServer());
+                       store.RegisterServer(new ReverseCallbackServer(this));
                    });
                })
                .ConfigurePlugins(a =>
@@ -161,8 +166,8 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
                     {
                         // 将 GlobalData.CollectDevices 和 GlobalData.Variables 同步到从站
                         await item.GetDmtpRpcActor().InvokeAsync(
-                                         nameof(ReverseCallbackServer.UpdateGatewayData), null, waitInvoke, deviceRunTimes).ConfigureAwait(false);
-                        _log?.LogTrace($"{item.GetIPPort()} Update StandbyStation data success");
+                                         nameof(ReverseCallbackServer.UpData), null, waitInvoke, deviceRunTimes).ConfigureAwait(false);
+                        LogMessage?.LogTrace($"{item.GetIPPort()} Update StandbyStation data success");
                     }
 
                 }
@@ -170,7 +175,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
             catch (Exception ex)
             {
                 // 输出警告日志，指示同步数据到从站时发生错误
-                _log?.LogWarning(ex, Localizer["ErrorSynchronizingData"]);
+                LogMessage?.LogWarning(ex, Localizer["ErrorSynchronizingData"]);
             }
             await Task.Delay(syncInterval, stoppingToken).ConfigureAwait(false);
         }
@@ -182,7 +187,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
         }
         catch (Exception ex)
         {
-            _log?.LogWarning(ex, "Execute");
+            LogMessage?.LogWarning(ex, "Execute");
         }
     }
 
@@ -248,7 +253,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
                 else
                 {
                     // 如果设备在线
-                    _log?.LogTrace($"Ping ActiveStation {redundancy.MasterUri} success");
+                    LogMessage?.LogTrace($"Ping ActiveStation {redundancy.MasterUri} success");
                     await StandbyAsync().ConfigureAwait(false);
                 }
             }
@@ -264,10 +269,61 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
         }
         catch (Exception ex)
         {
-            _log?.LogWarning(ex, "Execute");
+            LogMessage?.LogWarning(ex, "Execute");
         }
     }
 
+    public async ValueTask ForcedSync(CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            bool online = false;
+            var waitInvoke = new DmtpInvokeOption()
+            {
+                FeedbackType = FeedbackType.WaitInvoke,
+                Token = cancellationToken,
+                Timeout = 30000,
+                SerializationType = SerializationType.Json,
+            };
+
+            try
+            {
+                online = (await TcpDmtpClient.TryConnectAsync().ConfigureAwait(false)).ResultCode == ResultCode.Success;
+
+                // 如果 online 为 true，表示设备在线
+                if (online)
+                {
+
+
+                    // 将 GlobalData.CollectDevices 和 GlobalData.Variables 同步到从站
+                    var data = await TcpDmtpClient.GetDmtpRpcActor().InvokeTAsync<List<DataWithDatabase>>(
+                                       nameof(ReverseCallbackServer.GetData), waitInvoke).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");
+
+                }
+            }
+            catch (Exception ex)
+            {
+                // 输出警告日志，指示同步数据到从站时发生错误
+                LogMessage?.LogWarning(ex, "ForcedSync data error");
+            }
+        }
+        catch (OperationCanceledException)
+        {
+        }
+        catch (ObjectDisposedException)
+        {
+        }
+        catch (Exception ex)
+        {
+            LogMessage?.LogWarning(ex, "Execute");
+        }
+    }
+
+
     private WaitLock _switchLock = new();
 
     /// <inheritdoc/>
@@ -291,12 +347,12 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
             {
                 if (RedundancyOptions.IsMaster)
                 {
-                    RedundancyTask = new DoTask(a => DoMasterWork(TcpDmtpService, RedundancyOptions.SyncInterval, a), _log); // 创建新的任务
+                    RedundancyTask = new DoTask(a => DoMasterWork(TcpDmtpService, RedundancyOptions.SyncInterval, a), LogMessage); // 创建新的任务
                 }
                 else
                 {
 
-                    RedundancyTask = new DoTask(a => DoSlaveWork(TcpDmtpClient, RedundancyOptions, a), _log); // 创建新的任务
+                    RedundancyTask = new DoTask(a => DoSlaveWork(TcpDmtpClient, RedundancyOptions, a), LogMessage); // 创建新的任务
                 }
 
                 RedundancyTask?.Start(default); // 启动任务
@@ -306,7 +362,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
         }
         catch (Exception ex)
         {
-            _log?.LogError(ex, "Start"); // 记录错误日志
+            LogMessage?.LogError(ex, "Start"); // 记录错误日志
             return new(ex);
         }
         finally
@@ -326,6 +382,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
             if (RedundancyOptions.IsMaster)
             {
                 TcpDmtpService = await GetTcpDmtpService(RedundancyOptions).ConfigureAwait(false);
+
                 await TcpDmtpService.StartAsync().ConfigureAwait(false);//启动
                 await ActiveAsync().ConfigureAwait(false);
             }
@@ -350,7 +407,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
             {
                 // 输出日志，指示主站已恢复，从站将切换到备用状态
                 if (first)
-                    _log?.Warning(Localizer["SwitchSlaveState"]);
+                    LogMessage?.Warning(Localizer["SwitchSlaveState"]);
 
                 // 将 IsStart 设置为 false，表示当前设备为从站，切换到备用状态
                 _gatewayRedundantSerivce.StartCollectChannelEnable = false;
@@ -376,7 +433,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
             {
                 // 输出日志，指示无法连接冗余站点，本机将切换到正常状态
                 if (first)
-                    _log?.Warning(Localizer["SwitchMasterState"]);
+                    LogMessage?.Warning(Localizer["SwitchMasterState"]);
                 _gatewayRedundantSerivce.StartCollectChannelEnable = true;
                 await RestartAsync().ConfigureAwait(false);
             }
@@ -426,7 +483,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
         }
         catch (Exception ex)
         {
-            _log?.LogError(ex, "Stop"); // 记录错误日志
+            LogMessage?.LogError(ex, "Stop"); // 记录错误日志
         }
         finally
         {
@@ -435,4 +492,164 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
         }
     }
 
+
+
+    /// <summary>
+    /// 异步写入方法
+    /// </summary>
+    /// <param name="writeInfoLists">要写入的变量及其对应的数据</param>
+    /// <param name="cancellationToken">取消操作的通知</param>
+    /// <returns>写入操作的结果字典</returns>
+    public async ValueTask<Dictionary<string, Dictionary<string, IOperResult>>> InvokeMethodAsync(Dictionary<VariableRuntime, JToken> writeInfoLists, CancellationToken cancellationToken)
+    {
+        return (await Rpc(writeInfoLists, cancellationToken).ConfigureAwait(false)).ToDictionary(a => a.Key, a => a.Value.ToDictionary(b => b.Key, b => (IOperResult)b.Value));
+    }
+
+    private async ValueTask<Dictionary<string, Dictionary<string, OperResult<object>>>> Rpc(Dictionary<VariableRuntime, JToken> writeInfoLists, CancellationToken cancellationToken)
+    {
+        Dictionary<string, Dictionary<string, OperResult<object>>> dataResult = new();
+
+        Dictionary<string, Dictionary<string, string>> deviceDatas = new();
+        foreach (var item in writeInfoLists)
+        {
+            if (deviceDatas.TryGetValue(item.Key.DeviceName ?? string.Empty, out var variableDatas))
+            {
+                variableDatas.Add(item.Key.Name, item.Value?.ToString() ?? string.Empty);
+            }
+            else
+            {
+                deviceDatas.Add(item.Key.DeviceName ?? string.Empty, new());
+                deviceDatas[item.Key.DeviceName ?? string.Empty].Add(item.Key.Name, item.Value?.ToString() ?? string.Empty);
+            }
+        }
+
+        if (RedundancyOptions.IsMaster)
+        {
+            return NoOnline(dataResult, deviceDatas);
+        }
+        bool online = false;
+        var waitInvoke = new DmtpInvokeOption()
+        {
+            FeedbackType = FeedbackType.WaitInvoke,
+            Token = cancellationToken,
+            Timeout = 30000,
+            SerializationType = SerializationType.Json,
+        };
+
+        try
+        {
+            if (!RedundancyOptions.IsMaster)
+            {
+                online = (await TcpDmtpClient.TryConnectAsync().ConfigureAwait(false)).ResultCode == ResultCode.Success;
+
+                // 如果 online 为 true，表示设备在线
+                if (online)
+                {
+                    // 将 GlobalData.CollectDevices 和 GlobalData.Variables 同步到从站
+                    dataResult = await TcpDmtpClient.GetDmtpRpcActor().InvokeTAsync<Dictionary<string, Dictionary<string, OperResult<object>>>>(
+                                       nameof(ReverseCallbackServer.Rpc), waitInvoke, deviceDatas).ConfigureAwait(false);
+
+                    LogMessage?.LogTrace($"Rpc success");
+
+                    return dataResult;
+                }
+            }
+            else
+            {
+                if (TcpDmtpService.Clients.Count != 0)
+                {
+                    online = true;
+                }
+                // 如果 online 为 true，表示设备在线
+                if (online)
+                {
+                    foreach (var item in deviceDatas)
+                    {
+
+                        if (GlobalData.ReadOnlyDevices.TryGetValue(item.Key, out var device))
+                        {
+                            var key = device.Tag;
+
+                            if (TcpDmtpService.TryGetClient(key, out var client))
+                            {
+                                try
+                                {
+
+                                    var data = await TcpDmtpClient.GetDmtpRpcActor().InvokeTAsync<Dictionary<string, Dictionary<string, OperResult<object>>>>(
+                                                         nameof(ReverseCallbackServer.Rpc), waitInvoke, new Dictionary<string, Dictionary<string, string>>() { { item.Key, item.Value } }).ConfigureAwait(false);
+
+                                    dataResult.AddRange(data);
+
+                                    continue;
+                                }
+                                catch (Exception ex)
+                                {
+                                    dataResult.TryAdd(item.Key, new Dictionary<string, OperResult<object>>());
+
+                                    foreach (var vItem in item.Value)
+                                    {
+                                        dataResult[item.Key].Add(vItem.Key, new OperResult<object>(ex));
+                                    }
+                                }
+                            }
+
+                        }
+
+                        dataResult.TryAdd(item.Key, new Dictionary<string, OperResult<object>>());
+
+                        foreach (var vItem in item.Value)
+                        {
+                            dataResult[item.Key].Add(vItem.Key, new OperResult<object>("No online"));
+                        }
+                    }
+
+                    LogMessage?.LogTrace($"Rpc success");
+                    return dataResult;
+                }
+                else
+                {
+                    LogMessage?.LogWarning("Rpc error, no client online");
+                }
+            }
+
+            return NoOnline(dataResult, deviceDatas);
+
+        }
+        catch (OperationCanceledException)
+        {
+
+            return NoOnline(dataResult, deviceDatas);
+        }
+        catch (Exception ex)
+        {
+            // 输出警告日志，指示同步数据到从站时发生错误
+            LogMessage?.LogWarning(ex, "Rpc error");
+            return NoOnline(dataResult, deviceDatas);
+        }
+    }
+
+    private static Dictionary<string, Dictionary<string, OperResult<object>>> NoOnline(Dictionary<string, Dictionary<string, OperResult<object>>> dataResult, Dictionary<string, Dictionary<string, string>> deviceDatas)
+    {
+        foreach (var item in deviceDatas)
+        {
+            dataResult.TryAdd(item.Key, new Dictionary<string, OperResult<object>>());
+
+            foreach (var vItem in item.Value)
+            {
+                dataResult[item.Key].TryAdd(vItem.Key, new OperResult<object>("No online"));
+            }
+        }
+        return dataResult;
+
+    }
+    /// <summary>
+    /// 异步写入方法
+    /// </summary>
+    /// <param name="writeInfoLists">要写入的变量及其对应的数据</param>
+    /// <param name="cancellationToken">取消操作的通知</param>
+    /// <returns>写入操作的结果字典</returns>
+    public async ValueTask<Dictionary<string, Dictionary<string, IOperResult>>> InVokeWriteAsync(Dictionary<VariableRuntime, JToken> writeInfoLists, CancellationToken cancellationToken)
+    {
+        return (await Rpc(writeInfoLists, cancellationToken).ConfigureAwait(false)).ToDictionary(a => a.Key, a => a.Value.ToDictionary(b => b.Key, b => (IOperResult)b.Value));
+    }
 }

src/Gateway/ThingsGateway.Management/Management/ReverseCallbackServer.cs

@@ -10,21 +10,33 @@
 
 using ThingsGateway.Gateway.Application;
 
+using TouchSocket.Core;
 using TouchSocket.Dmtp.Rpc;
 using TouchSocket.Rpc;
+using TouchSocket.Sockets;
 
 namespace ThingsGateway.Management;
 
-public partial class ReverseCallbackServer : SingletonRpcServer
+internal sealed partial class ReverseCallbackServer : SingletonRpcServer
 {
+    RedundancyHostedService RedundancyHostedService;
+    public ReverseCallbackServer(RedundancyHostedService redundancyHostedService)
+    {
+        RedundancyHostedService = redundancyHostedService;
+    }
+
     [DmtpRpc(MethodInvoke = true)]
-    public void UpdateGatewayData(List<DeviceDataWithValue> deviceDatas)
+    public void UpData(ICallContext callContext, List<DeviceDataWithValue> deviceDatas)
     {
 
         foreach (var deviceData in deviceDatas)
         {
             if (GlobalData.ReadOnlyDevices.TryGetValue(deviceData.Name, out var device))
             {
+                device.RpcDriver = RedundancyHostedService;
+                device.Tag = callContext.Caller is IIdClient idClient ? idClient.Id : string.Empty;
+
+
                 device.SetDeviceStatus(deviceData.ActiveTime, deviceData.DeviceStatus == DeviceStatusEnum.OnLine ? false : true, lastErrorMessage: deviceData.LastErrorMessage);
 
                 foreach (var variableData in deviceData.ReadOnlyVariableRuntimes)
@@ -38,5 +50,41 @@ public partial class ReverseCallbackServer : SingletonRpcServer
 
             }
         }
+        RedundancyHostedService.LogMessage?.Trace("Update data success");
+    }
+
+
+
+    [DmtpRpc(MethodInvoke = true)]
+    public List<DataWithDatabase> GetData()
+    {
+        List<DataWithDatabase> dataWithDatabases = new();
+        foreach (var channels in GlobalData.ReadOnlyChannels)
+        {
+            DataWithDatabase dataWithDatabase = new();
+            dataWithDatabase.Channel = channels.Value;
+            dataWithDatabase.DeviceVariables = new();
+            foreach (var devices in channels.Value.ReadDeviceRuntimes)
+            {
+                DeviceDataWithDatabase deviceDataWithDatabase = new();
+
+                deviceDataWithDatabase.Device = devices.Value;
+                deviceDataWithDatabase.Variables = devices.Value.ReadOnlyVariableRuntimes.Select(a => a.Value).Cast<Variable>().ToList();
+
+
+                dataWithDatabase.DeviceVariables.Add(deviceDataWithDatabase);
+            }
+
+            dataWithDatabases.Add(dataWithDatabase);
+        }
+        return dataWithDatabases;
+
+
+    }
+
+    [DmtpRpc(MethodInvoke = true)]
+    public Task<Dictionary<string, Dictionary<string, IOperResult>>> Rpc(Dictionary<string, Dictionary<string, string>> deviceDatas, CancellationToken cancellationToken)
+    {
+        return GlobalData.RpcService.InvokeDeviceMethodAsync("Management", deviceDatas, cancellationToken);
     }
 }

src/Gateway/ThingsGateway.Management/Pages/RedundancyOptionsPage.razor

@@ -15,6 +15,7 @@
 
         <EditComponent ItemsPerRow=1 Model="Model" OnSave="OnSaveRedundancy" />
 
+        <Button IsDisabled=@(Model.IsMaster) OnClick="ForcedSync">@RedundancyLocalizer["ForcedSync"]</Button>
     </div>
     <div class="col-12 col-md-6 h-100">
 

src/Gateway/ThingsGateway.Management/Pages/RedundancyOptionsPage.razor.cs

@@ -12,6 +12,7 @@
 using Mapster;
 
 using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.Web;
 
 using TouchSocket.Core;
 
@@ -82,6 +83,8 @@ public partial class RedundancyOptionsPage
                 else
                     await ToastService.Warning(RedundancyLocalizer[nameof(RedundancyOptions)], $"{RazorLocalizer["Fail", result.ToString()]}");
 
+
+                await InvokeAsync(StateHasChanged);
             }
 
         }
@@ -92,4 +95,16 @@ public partial class RedundancyOptionsPage
     }
 
 
+    private async Task ForcedSync(MouseEventArgs args)
+    {
+        var ret = await SwalService.ShowModal(new SwalOption()
+        {
+            Category = SwalCategory.Warning,
+            Title = RedundancyLocalizer["ForcedSyncWarning"]
+        });
+        if (ret)
+        {
+            await RedundancyHostedService.ForcedSync();
+        }
+    }
 }

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

@@ -115,7 +115,7 @@ public partial class DragAndDrop
         {
 
             var data = RuleHelpers.Save(_blazorDiagram);
-            await DownloadService.DownloadFromStreamAsync("RulesJson.json", new MemoryStream(Encoding.UTF8.GetBytes(data.ToJsonNetString())));
+            await DownloadService.DownloadFromStreamAsync("RulesJson.json", new MemoryStream(Encoding.UTF8.GetBytes(data.ToSystemTextJsonString())));
 
         }
         catch (Exception ex)

src/Plugin/ThingsGateway.Foundation.Modbus/Slave/ModbusSlave.cs

@@ -18,7 +18,7 @@ namespace ThingsGateway.Foundation.Modbus;
 /// <summary>
 /// ChannelEventHandler
 /// </summary>
-public delegate ValueTask<OperResult> ModbusServerWriteEventHandler(ModbusAddress modbusAddress, IThingsGatewayBitConverter bitConverter, IClientChannel channel);
+public delegate ValueTask<IOperResult> ModbusServerWriteEventHandler(ModbusAddress modbusAddress, IThingsGatewayBitConverter bitConverter, IClientChannel channel);
 
 /// <inheritdoc/>
 public class ModbusSlave : DeviceBase, IModbusAddress

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

@@ -401,7 +401,7 @@ public partial class SiemensS7Master : DeviceBase
                 var result2 = await SendThenReturnMessageBaseAsync(new S7Send(ISO_CR), channel).ConfigureAwait(false);
                 if (!result2.IsSuccess)
                 {
-                    if(result2.Exception is OperationCanceledException)
+                    if (result2.Exception is OperationCanceledException)
                         return true;
 
                     Logger?.LogWarning(SiemensS7Resource.Localizer["HandshakeError1", channel.ToString(), result2]);

src/Plugin/ThingsGateway.Foundation.Test/ThingsGateway.Foundation.Test.csproj

@@ -10,7 +10,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>

src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBProducer.cs

@@ -101,7 +101,7 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
     internal ISugarQueryable<TDengineDBHistoryValue> Query(DBHistoryValuePageInput input)
     {
         var db = TDengineDBUtil.GetDb(_driverPropertys.DbType, _driverPropertys.BigTextConnectStr, _driverPropertys.TableNameLow);
-        var query = db.Queryable<TDengineDBHistoryValue>()
+        var query = db.Queryable<TDengineDBHistoryValue>().AsTDengineSTable()
                              .WhereIF(input.StartTime != null, a => a.CreateTime >= input.StartTime)
                            .WhereIF(input.EndTime != null, a => a.CreateTime <= input.EndTime)
                            .WhereIF(!string.IsNullOrEmpty(input.VariableName), it => it.Name.Contains(input.VariableName))

src/Plugin/ThingsGateway.Plugin.Http/Webhook/Webhook.other.cs

@@ -140,7 +140,7 @@ public partial class Webhook : BusinessBaseWithCacheIntervalScript<VariableBasic
 
         // 设置请求内容
         //var content = new StringContent(json, Encoding.UTF8, "application/json");
-        using var content = new ByteArrayContent(topicArray.Json);
+        using var content = new ByteArrayContent(topicArray.Payload);
         content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
 
         try

src/Plugin/ThingsGateway.Plugin.Kafka/Kafka/KafkaProducer.other.cs

@@ -210,7 +210,7 @@ public partial class KafkaProducer : BusinessBaseWithCacheIntervalScript<Variabl
         {
             using CancellationTokenSource cancellationTokenSource = new(_driverPropertys.Timeout);
             using CancellationTokenSource stoppingToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationTokenSource.Token, cancellationToken);
-            var result = await _producer.ProduceAsync(topicArray.Topic, new Message<Null, byte[]> { Value = topicArray.Json }, stoppingToken.Token).ConfigureAwait(false);
+            var result = await _producer.ProduceAsync(topicArray.Topic, new Message<Null, byte[]> { Value = topicArray.Payload }, stoppingToken.Token).ConfigureAwait(false);
             if (result.Status != PersistenceStatus.Persisted)
             {
                 return new OperResult("Upload fail");

src/Plugin/ThingsGateway.Plugin.Modbus/ModbusSlave/ModbusSlave.cs

@@ -201,7 +201,7 @@ public class ModbusSlave : BusinessBase
     /// <summary>
     /// RPC写入
     /// </summary>
-    private async ValueTask<OperResult> OnWriteData(ModbusRequest modbusRequest, IThingsGatewayBitConverter bitConverter, IChannel channel)
+    private async ValueTask<IOperResult> OnWriteData(ModbusRequest modbusRequest, IThingsGatewayBitConverter bitConverter, IChannel channel)
     {
         try
         {
@@ -227,7 +227,7 @@ public class ModbusSlave : BusinessBase
                     var int16Data = thingsGatewayBitConverter.ToUInt16(writeData, 0);
                     var wData = BitHelper.GetBit(int16Data, bitIndex.Value);
 
-                    var result = await item.Value.RpcAsync(wData.ToJsonNetString(), $"{nameof(ModbusSlave)}-{CurrentDevice.Name}-{$"{channel}"}").ConfigureAwait(false);
+                    var result = await item.Value.RpcAsync(wData.ToSystemTextJsonString(), $"{nameof(ModbusSlave)}-{CurrentDevice.Name}-{$"{channel}"}").ConfigureAwait(false);
 
                     if (!result.IsSuccess)
                         return result;
@@ -237,7 +237,7 @@ public class ModbusSlave : BusinessBase
                 {
                     var data = thingsGatewayBitConverter.GetDataFormBytes(_plc, addressStr, writeData, 0, dType, item.Value.ArrayLength ?? 1);
 
-                    var result = await item.Value.RpcAsync(data.ToJsonNetString(), $"{nameof(ModbusSlave)}-{CurrentDevice.Name}-{$"{channel}"}").ConfigureAwait(false);
+                    var result = await item.Value.RpcAsync(data.ToSystemTextJsonString(), $"{nameof(ModbusSlave)}-{CurrentDevice.Name}-{$"{channel}"}").ConfigureAwait(false);
 
                     if (!result.IsSuccess)
                         return result;

src/Plugin/ThingsGateway.Plugin.Mqtt/Locales/en-US.json

@@ -50,8 +50,9 @@
     "UserName": "UserName",
     "Password": "Password",
     "ConnectId": "ConnectId",
-    "ConnectTimeout": "ConnectTimeout"
-   
+    "ConnectTimeout": "ConnectTimeout",
+    "CheckClearTime": "VariableCheckClearTime(s)"
+
   }
 
 }

src/Plugin/ThingsGateway.Plugin.Mqtt/Locales/zh-CN.json

@@ -51,7 +51,8 @@
     "UserName": "用户名",
     "Password": "密码",
     "ConnectId": "连接ID",
-    "ConnectTimeout": "连接超时时间"
+    "ConnectTimeout": "连接超时时间",
+    "CheckClearTime": "变量过期时间(s)"
 
 
 

src/Plugin/ThingsGateway.Plugin.Mqtt/MqttClient/MqttClient.other.cs

@@ -73,7 +73,7 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableBa
                 var topicArray = new TopicArray()
                 {
                     Topic = "v1/gateway/connect",
-                    Json = Serialize(json, _driverPropertys.JsonFormattingIndented)
+                    Payload = json.ToSystemTextJsonUtf8Bytes(_driverPropertys.JsonFormattingIndented)
                 };
 
                 topicJsonTBList.Add(topicArray);
@@ -87,7 +87,7 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableBa
                 var topicArray = new TopicArray()
                 {
                     Topic = "v1/gateway/disconnect",
-                    Json = Serialize(json, _driverPropertys.JsonFormattingIndented)
+                    Payload = json.ToSystemTextJsonUtf8Bytes(_driverPropertys.JsonFormattingIndented)
                 };
 
                 topicJsonTBList.Add(topicArray);
@@ -282,9 +282,9 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableBa
         }
     }
 
-    private async ValueTask<Dictionary<string, Dictionary<string, OperResult>>> GetResult(MqttApplicationMessageReceivedEventArgs args, Dictionary<string, Dictionary<string, JToken>> rpcDatas)
+    private async ValueTask<Dictionary<string, Dictionary<string, IOperResult>>> GetResult(MqttApplicationMessageReceivedEventArgs args, Dictionary<string, Dictionary<string, JToken>> rpcDatas)
     {
-        var mqttRpcResult = new Dictionary<string, Dictionary<string, OperResult>>();
+        var mqttRpcResult = new Dictionary<string, Dictionary<string, IOperResult>>();
         rpcDatas.ForEach(a => mqttRpcResult.Add(a.Key, new()));
         try
         {
@@ -393,11 +393,11 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableBa
                     thingsBoardRpcResponseData.device = thingsBoardRpcData.device;
                     thingsBoardRpcResponseData.id = thingsBoardRpcData.data.id;
                     thingsBoardRpcResponseData.data.success = mqttRpcResult[thingsBoardRpcResponseData.device].All(b => b.Value.IsSuccess);
-                    thingsBoardRpcResponseData.data.message = mqttRpcResult[thingsBoardRpcResponseData.device].Select(a => a.Value.ErrorMessage).ToJsonNetString(_driverPropertys.JsonFormattingIndented);
+                    thingsBoardRpcResponseData.data.message = mqttRpcResult[thingsBoardRpcResponseData.device].Select(a => a.Value.ErrorMessage).ToSystemTextJsonString(_driverPropertys.JsonFormattingIndented);
 
                     var variableMessage = new MqttApplicationMessageBuilder()
 .WithTopic($"{args.ApplicationMessage.Topic}")
-.WithPayload(thingsBoardRpcResponseData.ToJsonNetString(_driverPropertys.JsonFormattingIndented)).Build();
+.WithPayload(thingsBoardRpcResponseData.ToSystemTextJsonString(_driverPropertys.JsonFormattingIndented)).Build();
                     await _mqttClient.PublishAsync(variableMessage).ConfigureAwait(false);
 
 
@@ -425,7 +425,7 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableBa
 
                     var variableMessage = new MqttApplicationMessageBuilder()
 .WithTopic($"{args.ApplicationMessage.Topic}/Response")
-.WithPayload(mqttRpcResult.ToJsonNetString(_driverPropertys.JsonFormattingIndented)).Build();
+.WithPayload(mqttRpcResult.ToSystemTextJsonString(_driverPropertys.JsonFormattingIndented)).Build();
                     await _mqttClient.PublishAsync(variableMessage).ConfigureAwait(false);
 
 
@@ -456,7 +456,7 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableBa
                         ResultCode = a.ResultCode.ToString()
                     }
                     )
-                    .ToJsonNetString(_driverPropertys.JsonFormattingIndented)}");
+                    .ToSystemTextJsonString(_driverPropertys.JsonFormattingIndented)}");
             }
         }
     }
@@ -472,8 +472,8 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableBa
             if (isConnect.IsSuccess)
             {
                 var variableMessage = new MqttApplicationMessageBuilder()
-    .WithTopic(topicArray.Topic).WithQualityOfServiceLevel(_driverPropertys.MqttQualityOfServiceLevel)
-    .WithPayload(topicArray.Json).Build();
+    .WithTopic(topicArray.Topic).WithQualityOfServiceLevel(_driverPropertys.MqttQualityOfServiceLevel).WithRetainFlag()
+    .WithPayload(topicArray.Payload).Build();
                 var result = await _mqttClient.PublishAsync(variableMessage, cancellationToken).ConfigureAwait(false);
                 if (result.IsSuccess)
                 {

src/Plugin/ThingsGateway.Plugin.Mqtt/MqttCollect/MqttCollect.cs

@@ -181,6 +181,7 @@ public partial class MqttCollect : CollectBase
 
     protected override async Task InitChannelAsync(IChannel? channel, CancellationToken cancellationToken)
     {
+        ETime = TimeSpan.FromSeconds(_driverPropertys.CheckClearTime);
 
         #region 初始化
 
@@ -216,10 +217,34 @@ public partial class MqttCollect : CollectBase
         _mqttClient.ApplicationMessageReceivedAsync += MqttClient_ApplicationMessageReceivedAsync;
 
         #endregion 初始化
+
         await base.InitChannelAsync(channel, cancellationToken).ConfigureAwait(false);
     }
+
+    private TimeSpan ETime = TimeSpan.FromSeconds(60000);
     protected override async Task ProtectedStartAsync(CancellationToken cancellationToken)
     {
+        _ = Task.Run(async () =>
+        {
+            while (!cancellationToken.IsCancellationRequested && !DisposedValue)
+            {
+                try
+                {
+                    foreach (var item in IdVariableRuntimes)
+                    {
+                        if (DateTime.Now - item.Value.CollectTime > ETime)
+                        {
+                            item.Value.SetValue(null, DateTime.Now, false);
+                        }
+                    }
+                }
+                finally
+                {
+                    await Task.Delay(200).ConfigureAwait(false);
+                }
+            }
+        }, cancellationToken);
+
         await base.ProtectedStartAsync(cancellationToken).ConfigureAwait(false);
         if (_mqttClient != null)
         {

src/Plugin/ThingsGateway.Plugin.Mqtt/MqttCollect/MqttCollect.other.cs

@@ -128,7 +128,7 @@ public partial class MqttCollect : CollectBase
                         ResultCode = a.ResultCode.ToString()
                     }
                     )
-                    .ToJsonNetString()}");
+                    .ToSystemTextJsonString()}");
             }
         }
     }

src/Plugin/ThingsGateway.Plugin.Mqtt/MqttCollect/MqttCollectProperty.cs

@@ -27,7 +27,7 @@ public class MqttCollectProperty : CollectPropertyBase
     /// 是否显示详细日志
     /// </summary>
     [DynamicProperty]
-    public bool DetailLog { get; set; } = true;
+    public bool DetailLog { get; set; } = false;
 
     /// <summary>
     /// 端口
@@ -74,6 +74,7 @@ public class MqttCollectProperty : CollectPropertyBase
     [DynamicProperty]
     public int ConnectTimeout { get; set; } = 3000;
 
-    public override int ReIntervalTime { get; set; } = 30;
-    public override int RetryCount { get; set; } = 3;
+    [DynamicProperty]
+    public int CheckClearTime { get; set; } = 60000;
+
 }

src/Plugin/ThingsGateway.Plugin.Mqtt/MqttServer/MqttServer.other.cs

@@ -184,9 +184,9 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableBa
 
     #endregion private
 
-    private async ValueTask<Dictionary<string, Dictionary<string, OperResult>>> GetResult(InterceptingPublishEventArgs args, Dictionary<string, Dictionary<string, JToken>> rpcDatas)
+    private async ValueTask<Dictionary<string, Dictionary<string, IOperResult>>> GetResult(InterceptingPublishEventArgs args, Dictionary<string, Dictionary<string, JToken>> rpcDatas)
     {
-        var mqttRpcResult = new Dictionary<string, Dictionary<string, OperResult>>();
+        var mqttRpcResult = new Dictionary<string, Dictionary<string, IOperResult>>();
         rpcDatas.ForEach(a => mqttRpcResult.Add(a.Key, new()));
         try
         {
@@ -267,7 +267,7 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableBa
                 {
                     Messages.Add(new MqttApplicationMessageBuilder()
     .WithTopic(topicArray.Topic)
-    .WithPayload(topicArray.Json).Build());
+    .WithPayload(topicArray.Payload).Build());
                 }
             }
         }
@@ -282,7 +282,7 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableBa
                     {
                         Messages.Add(new MqttApplicationMessageBuilder()
         .WithTopic(topicArray.Topic)
-        .WithPayload(topicArray.Json).Build());
+        .WithPayload(topicArray.Payload).Build());
                     }
                 }
             }
@@ -296,7 +296,7 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableBa
                 {
                     Messages.Add(new MqttApplicationMessageBuilder()
     .WithTopic(topicArray.Topic)
-    .WithPayload(topicArray.Json).Build());
+    .WithPayload(topicArray.Payload).Build());
                 }
             }
         }
@@ -336,7 +336,7 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableBa
         {
             var variableMessage = new MqttApplicationMessageBuilder()
 .WithTopic($"{args.ApplicationMessage.Topic}/Response")
-.WithPayload(mqttRpcResult.ToJsonNetString(_driverPropertys.JsonFormattingIndented)).Build();
+.WithPayload(mqttRpcResult.ToSystemTextJsonString(_driverPropertys.JsonFormattingIndented)).Build();
             await _mqttServer.InjectApplicationMessage(
                      new InjectedMqttApplicationMessage(variableMessage)).ConfigureAwait(false);
         }
@@ -400,8 +400,8 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableBa
         try
         {
             var message = new MqttApplicationMessageBuilder()
-.WithTopic(topicArray.Topic).WithQualityOfServiceLevel(_driverPropertys.MqttQualityOfServiceLevel)
-.WithPayload(topicArray.Json).Build();
+.WithTopic(topicArray.Topic).WithQualityOfServiceLevel(_driverPropertys.MqttQualityOfServiceLevel).WithRetainFlag()
+.WithPayload(topicArray.Payload).Build();
             await _mqttServer.InjectApplicationMessage(
                     new InjectedMqttApplicationMessage(message), cancellationToken).ConfigureAwait(false);
 

src/Plugin/ThingsGateway.Plugin.OpcDa/OpcDaMaster/OpcDaMaster.cs

@@ -226,7 +226,7 @@ public class OpcDaMaster : CollectBase
                 return;
             if (DisposedValue)
                 return;
-            LogMessage.Trace($"{ToString()} Change:{Environment.NewLine} {values?.ToJsonNetString()}");
+            LogMessage.Trace($"{ToString()} Change:{Environment.NewLine} {values?.ToSystemTextJsonString()}");
 
             foreach (var data in values)
             {
@@ -255,26 +255,7 @@ public class OpcDaMaster : CollectBase
                     }
                     if (quality == 192)
                     {
-                        if (item.DataType == DataTypeEnum.Object)
-                            if (type.Namespace.StartsWith("System"))
-                            {
-                                var enumValues = Enum.GetValues<DataTypeEnum>();
-                                var stringList = enumValues.Select(e => e.ToString());
-                                if (stringList.Contains(type.Name))
-                                    try { item.DataType = Enum.Parse<DataTypeEnum>(type.Name); } catch { }
-                            }
-
-                        var jToken = JToken.FromObject(value);
-                        object newValue;
-                        if (jToken is JValue jValue)
-                        {
-                            newValue = jValue.Value;
-                        }
-                        else
-                        {
-                            newValue = jToken;
-                        }
-                        item.SetValue(newValue, time);
+                        item.SetValue(value, time);
                     }
                     else
                     {

src/Plugin/ThingsGateway.Plugin.OpcDa/Pages/OpcDaMaster.razor.cs

@@ -67,7 +67,7 @@ public partial class OpcDaMaster : IDisposable
         LogMessage.AddLogger(logger);
 
         _plc.LogEvent = (a, b, c, d) => LogMessage.Log((LogLevel)a, b, c, d);
-        _plc.DataChangedHandler += (a, b, c) => LogMessage.Trace(c.ToJsonNetString());
+        _plc.DataChangedHandler += (a, b, c) => LogMessage.Trace(c.ToSystemTextJsonString());
         base.OnInitialized();
     }
 
@@ -173,9 +173,9 @@ public partial class OpcDaMaster : IDisposable
                 foreach (var item in data)
                 {
                     if (item.Value.Item1)
-                        LogMessage?.LogInformation(item.ToJsonNetString());
+                        LogMessage?.LogInformation(item.ToSystemTextJsonString());
                     else
-                        LogMessage?.LogWarning(item.ToJsonNetString());
+                        LogMessage?.LogWarning(item.ToSystemTextJsonString());
                 }
             }
         }

src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaMaster/OpcUaMaster.cs

@@ -42,9 +42,7 @@ public class OpcUaMaster : CollectBase
     /// <inheritdoc/>
     public override Type DriverDebugUIType => typeof(ThingsGateway.Debug.OpcUaMaster);
 
-    public override Type DriverPropertyUIType => typeof(OpcUaMasterPropertyRazor);
-
-
+    public override Type DriverUIType => typeof(OpcUaMasterRuntimeRazor);
 
     protected override async Task InitChannelAsync(IChannel? channel, CancellationToken cancellationToken)
     {
@@ -234,15 +232,7 @@ public class OpcUaMaster : CollectBase
 
                     foreach (var item in data1)
                     {
-                        object value;
-                        if (data.Item3 is JValue jValue)
-                        {
-                            value = jValue.Value;
-                        }
-                        else
-                        {
-                            value = data.Item3;
-                        }
+                        object value = data.Item3.GetObjectFromJToken();
 
                         var isGood = StatusCode.IsGood(data.Item2.StatusCode);
                         if (_driverProperties.SourceTimestampEnable)
@@ -271,7 +261,7 @@ public class OpcUaMaster : CollectBase
         }
         catch (Exception ex)
         {
-            return new OperResult<byte[]>($"ReadSourceAsync {addresss.ToJsonNetString()}：{Environment.NewLine}{ex}");
+            return new OperResult<byte[]>($"ReadSourceAsync {addresss.ToSystemTextJsonString()}：{Environment.NewLine}{ex}");
         }
         finally
         {
@@ -354,15 +344,8 @@ public class OpcUaMaster : CollectBase
 
             if (!VariableAddresDicts.TryGetValue(data.monitoredItem.StartNodeId.ToString(), out var itemReads)) return;
 
-            object value;
-            if (data.jToken is JValue jValue)
-            {
-                value = jValue.Value;
-            }
-            else
-            {
-                value = data.jToken;
-            }
+            object value = data.jToken.GetObjectFromJToken();
+
             var isGood = StatusCode.IsGood(data.dataValue.StatusCode);
             if (_driverProperties.SourceTimestampEnable)
             {
@@ -374,14 +357,7 @@ public class OpcUaMaster : CollectBase
                     return;
                 if (DisposedValue)
                     return;
-                if (item.DataType == DataTypeEnum.Object)
-                    if (type.Namespace.StartsWith("System"))
-                    {
-                        var enumValues = Enum.GetValues<DataTypeEnum>();
-                        var stringList = enumValues.Select(e => e.ToString());
-                        if (stringList.Contains(type.Name))
-                            try { item.DataType = Enum.Parse<DataTypeEnum>(type.Name); } catch { }
-                    }
+
                 if (isGood)
                 {
                     item.SetValue(value, time);
@@ -405,4 +381,5 @@ public class OpcUaMaster : CollectBase
             success = false;
         }
     }
+
 }

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

@@ -19,6 +19,7 @@ using System.Globalization;
 
 using ThingsGateway.Foundation.OpcUa;
 using ThingsGateway.Gateway.Application;
+using ThingsGateway.NewLife.Reflection;
 
 using TouchSocket.Core;
 
@@ -65,7 +66,7 @@ public class ThingsGatewayNodeManager : CustomNodeManager2
             rootFolder = null;
             rootFolder = CreateFolder(null, "ThingsGateway", "ThingsGateway");
             rootFolder.EventNotifier = EventNotifiers.SubscribeToEvents;
-            
+
             rootFolder.ClearChangeMasks(SystemContext, true);
 
             rootFolder.RemoveReferences(ReferenceTypes.Organizes, true);
@@ -288,12 +289,13 @@ public class ThingsGatewayNodeManager : CustomNodeManager2
         object newValue;
         try
         {
+            if (value is JToken token) value = token.GetObjectFromJToken();
+
             if (!tag.IsDataTypeInit && value != null)
             {
                 SetDataType(tag, value);
-                SetRank(tag, value);
             }
-            var jToken = JToken.FromObject(value is JToken jToken1 ? jToken1.ToString() : value);
+            var jToken = JToken.FromObject(value);
             var dataValue = JsonUtils.DecoderObject(
                Server.MessageContext,
            tag.DataType,
@@ -317,44 +319,20 @@ public class ThingsGatewayNodeManager : CustomNodeManager2
         void SetDataType(OpcUaTag tag, object value)
         {
             tag.IsDataTypeInit = true;
-            var tp = value.GetType();
-            if (tp == typeof(JArray))
-            {
-                try
-                {
-                    tp = ((JValue)((JArray)value).FirstOrDefault()).Value.GetType();
-                    tag.ValueRank = ValueRanks.OneOrMoreDimensions;
-                }
-                catch
-                {
-                }
-            }
-            if (tp == typeof(JValue))
-            {
-                tp = ((JValue)value).Value.GetType();
+
+            var elementType = value?.GetType()?.GetElementTypeEx();
+            if (elementType != null)
+                tag.ValueRank = ValueRanks.OneOrMoreDimensions;
+            else
                 tag.ValueRank = ValueRanks.Scalar;
-            }
+
+
+            var tp = elementType ?? value?.GetType() ?? typeof(string);
+
             tag.DataType = DataNodeType(tp);
             tag.ClearChangeMasks(SystemContext, false);
         }
 
-        void SetRank(OpcUaTag tag, object value)
-        {
-            tag.IsDataTypeInit = true;
-            var tp = value.GetType();
-            if (tp == typeof(JArray))
-            {
-                try
-                {
-                    tp = ((JValue)((JArray)value).FirstOrDefault()).Value.GetType();
-                    tag.ValueRank = ValueRanks.OneOrMoreDimensions;
-                }
-                catch
-                {
-                }
-            }
-            tag.ClearChangeMasks(SystemContext, false);
-        }
     }
 
     /// <summary>

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

@@ -59,7 +59,7 @@ public partial class OpcUaServer : BusinessBase
         {
             _ = Task.Run(async () =>
             {
-                await this.DeviceThreadManage.RestartDeviceAsync(this.CurrentDevice, false).ConfigureAwait(false);
+                await DeviceThreadManage.RestartDeviceAsync(CurrentDevice, false).ConfigureAwait(false);
             }
             , cancellationToken);
             return;

src/Plugin/ThingsGateway.Plugin.OpcUa/Pages/OpcUaMaster.razor.cs

@@ -100,7 +100,7 @@ public partial class OpcUaMaster : IDisposable
         LogMessage.AddLogger(logger);
 
         _plc.LogEvent = (a, b, c, d) => LogMessage.Log((LogLevel)a, b, c, d);
-        _plc.DataChangedHandler += (a) => LogMessage.Trace(a.ToJsonNetString());
+        _plc.DataChangedHandler += (a) => LogMessage.Trace(a.ToSystemTextJsonString());
         base.OnInitialized();
     }
 
@@ -205,9 +205,9 @@ public partial class OpcUaMaster : IDisposable
             foreach (var item in data)
             {
                 if (item.Value.Item1)
-                    LogMessage?.LogInformation(item.ToJsonNetString());
+                    LogMessage?.LogInformation(item.ToSystemTextJsonString());
                 else
-                    LogMessage?.LogWarning(item.ToJsonNetString());
+                    LogMessage?.LogWarning(item.ToSystemTextJsonString());
             }
         }
     }

src/Plugin/ThingsGateway.Plugin.OpcUa/Pages/OpcUaMasterPropertyRazor.razor

@@ -1,25 +0,0 @@
-@using BootstrapBlazor.Components
-@using Microsoft.Extensions.Localization
-@using ThingsGateway.Extension
-@using ThingsGateway.Foundation
-@using ThingsGateway.Admin.Application
-@using ThingsGateway.Admin.Razor
-@using ThingsGateway.Gateway.Application
-@using ThingsGateway.Plugin.OpcUa
-@namespace ThingsGateway.Plugin.OpcUa
-
-
-<ValidateForm Model="Model.Value"
-              @key=@($"DeviceEditValidateForm{Id}{Model.Value.GetType().TypeHandle.Value}")
-              @ref=Model.ValidateForm
-              Id=@($"DeviceEditValidateForm{Id}{Model.Value.GetType().TypeHandle.Value}")>
-
-    <EditorFormObject class="p-2" Items=PluginPropertyEditorItems IsDisplay="!CanWrite" AutoGenerateAllItem="false" RowType=RowType.Inline ItemsPerRow=@(CanWrite?2:3) ShowLabelTooltip=true LabelWidth=@(CanWrite?240:120) Model="Model.Value" ShowLabel="true" @key=@($"DeviceEditEditorFormObject{Id}{Model.Value.GetType().TypeHandle.Value}")>
-
-        <Buttons>
-            <Button IsAsync class="mx-2" Color=Color.Primary OnClick="Export">@Localizer["ExportC"]</Button>
-        </Buttons>
-    </EditorFormObject>
-</ValidateForm>
-
-

src/Plugin/ThingsGateway.Plugin.OpcUa/Pages/OpcUaMasterRuntimeRazor.razor

@@ -0,0 +1,16 @@
+@using BootstrapBlazor.Components
+@using Microsoft.Extensions.Localization
+@using ThingsGateway.Extension
+@using ThingsGateway.Foundation
+@using ThingsGateway.Admin.Application
+@using ThingsGateway.Admin.Razor
+@using ThingsGateway.Gateway.Application
+@using ThingsGateway.Plugin.OpcUa
+@namespace ThingsGateway.Plugin.OpcUa
+
+
+
+<Button IsAsync class="mx-2" Color=Color.Primary OnClick="Export">@OpcUaMasterPropertyLocalizer["ExportC"]</Button>
+
+
+

src/Plugin/ThingsGateway.Plugin.OpcUa/Pages/OpcUaMasterRuntimeRazor.razor.cs

@@ -18,32 +18,19 @@ using ThingsGateway.Razor;
 
 namespace ThingsGateway.Plugin.OpcUa
 {
-    public partial class OpcUaMasterPropertyRazor : IPropertyUIBase
+    public partial class OpcUaMasterRuntimeRazor : IDriverUIBase
     {
         [Parameter, EditorRequired]
-        public string Id { get; set; }
-        [Parameter, EditorRequired]
-        public bool CanWrite { get; set; }
-        [Parameter, EditorRequired]
-        public ModelValueValidateForm Model { get; set; }
-
-        [Parameter, EditorRequired]
-        public IEnumerable<IEditorItem> PluginPropertyEditorItems { get; set; }
-
-        IStringLocalizer Localizer { get; set; }
-
-        protected override Task OnParametersSetAsync()
-        {
-            Localizer = App.CreateLocalizerByType(Model.Value.GetType());
-
-            return base.OnParametersSetAsync();
-        }
+        public object Driver { get; set; }
 
         [Inject]
         private DownloadService DownloadService { get; set; }
         [Inject]
         private ToastService ToastService { get; set; }
 
+        [Inject]
+        IStringLocalizer<OpcUaMasterProperty> OpcUaMasterPropertyLocalizer { get; set; }
+
 
         private async Task Export()
         {

src/Plugin/ThingsGateway.Plugin.RabbitMQ/RabbitMQ/RabbitMQProducer.other.cs

@@ -213,7 +213,7 @@ public partial class RabbitMQProducer : BusinessBaseWithCacheIntervalScript<Vari
         {
             if (_channel != null)
             {
-                await _channel.BasicPublishAsync(_driverPropertys.ExchangeName, topicArray.Topic, topicArray.Json, cancellationToken).ConfigureAwait(false);
+                await _channel.BasicPublishAsync(_driverPropertys.ExchangeName, topicArray.Topic, topicArray.Payload, cancellationToken).ConfigureAwait(false);
 
                 if (_driverPropertys.DetailLog)
                 {

src/Plugin/ThingsGateway.Plugin.Synchronization/Directory.build.targets

@@ -0,0 +1,18 @@
+<Project>
+
+
+
+
+
+
+	<!--在构建后触发的。它通过在 Nuget 包的 Content 文件夹中包含目标目录中的所有文件和子文件夹来创建 nuget 包-->
+	<Target Name="IncludeAllFilesInTargetDir" AfterTargets="Build">
+		<ItemGroup>
+			<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*Synchronization*.dll">
+				<Pack>true</Pack>
+				<PackagePath>Content</PackagePath>
+			</Content>
+		</ItemGroup>
+	</Target>
+
+</Project>