feat: 系统总/可用内存读取适配docker容器，硬件信息页面增加GC数据显示

build: 10.12.6
fix: operResult隐式转换递归错误
2025-10-23 03:50:30 +08:00 · 2025-10-22 23:24:28 +08:00 · 2025-10-22 15:30:56 +08:00 · 2025-10-22 13:43:39 +08:00 · 2025-10-22 00:47:33 +08:00 · 2025-10-21 17:40:21 +08:00
56 changed files with 1378 additions and 990 deletions
--- a/README.md
+++ b/README.md
@@ -1,11 +1,18 @@
 # ThingsGateway

-
+[![star](https://gitee.com/ThingsGateway/ThingsGateway/badge/star.svg?theme=gvp)](https://gitee.com/ThingsGateway/ThingsGateway/stargazers) 
+[![star](https://img.shields.io/github/stars/ThingsGateway/ThingsGateway?logo=github)](https://github.com/ThingsGateway/ThingsGateway)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/ThingsGateway/ThingsGateway)
+[![NuGet(ThingsGateway)](https://img.shields.io/nuget/v/ThingsGateway.Foundation.svg?label=ThingsGateway)](https://www.nuget.org/packages/ThingsGateway.Foundation/)
+[![NuGet(ThingsGateway)](https://img.shields.io/nuget/dt/ThingsGateway.Foundation.svg)](https://www.nuget.org/packages/ThingsGateway.Foundation/)
+[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://thingsgateway.cn/docs/1)
+<a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=NnBjPO-8kcNFzo_RzSbdICflb97u2O1i&authKey=V1MI3iJtpDMHc08myszP262kDykbx2Yev6ebE4Me0elTe0P0IFAmtU5l7Sy5w0jx&noverify=0&group_code=605534569">
+<img src="https://img.shields.io/badge/QQ群-605534569-red" alt="QQ">
+</a>

 ## Introduction
-

-A cross-platform, high-performance edge data collection gateway based on net9.
+A cross-platform, high-performance edge data collection gateway based on net8/10.


 ## Documentation
@@ -29,7 +36,6 @@ Account: **SuperAdmin**
 Password: **111111**


-**In the upper-right corner, switch to the IoT Gateway module in the personal popup box**

 ## Docker

--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -1,8 +1,18 @@
 # ThingsGateway

+[![star](https://gitee.com/ThingsGateway/ThingsGateway/badge/star.svg?theme=gvp)](https://gitee.com/ThingsGateway/ThingsGateway/stargazers) 
+[![star](https://img.shields.io/github/stars/ThingsGateway/ThingsGateway?logo=github)](https://github.com/ThingsGateway/ThingsGateway)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/ThingsGateway/ThingsGateway)
+[![NuGet(ThingsGateway)](https://img.shields.io/nuget/v/ThingsGateway.Foundation.svg?label=ThingsGateway)](https://www.nuget.org/packages/ThingsGateway.Foundation/)
+[![NuGet(ThingsGateway)](https://img.shields.io/nuget/dt/ThingsGateway.Foundation.svg)](https://www.nuget.org/packages/ThingsGateway.Foundation/)
+[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://thingsgateway.cn/docs/1)
+<a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=NnBjPO-8kcNFzo_RzSbdICflb97u2O1i&authKey=V1MI3iJtpDMHc08myszP262kDykbx2Yev6ebE4Me0elTe0P0IFAmtU5l7Sy5w0jx&noverify=0&group_code=605534569">
+<img src="https://img.shields.io/badge/QQ群-605534569-red" alt="QQ">
+</a>
+
 ## 介绍

-基于net9的跨平台高性能边缘采集网关
+基于net8/10的跨平台高性能边缘采集网关

 ## 文档

@@ -19,7 +29,6 @@

 密码 : **111111**

-**右上角个人弹出框中，切换到物联网关模块**

 ## Docker

--- a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareInfo.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareInfo.cs
@@ -8,6 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

+using System.ComponentModel;
+using System.Runtime;
+
 using ThingsGateway.NewLife;

 namespace ThingsGateway.Admin.Application;
@@ -19,11 +22,7 @@ public class HardwareInfo
    /// 当前磁盘信息
    /// </summary>
    public DriveInfo DriveInfo { get; set; }
-
-    /// <summary>
-    /// 硬件信息获取
-    /// </summary>
-    public MachineInfo? MachineInfo { get; set; }
+ 

    /// <summary>
    /// 主机环境
@@ -40,19 +39,118 @@ public class HardwareInfo
    /// </summary>
    public string OsArchitecture { get; set; }

-    /// <summary>
-    /// 唯一编码
-    /// </summary>
-    public string UUID { get; set; }

-    /// <summary>
-    /// 进程占用内存
-    /// </summary>
-    [AutoGenerateColumn(Ignore = true)]
-    public int WorkingSet { get; set; }
+    /// <summary>系统名称</summary>
+    public String OSName { get; set; }
+
+    /// <summary>系统版本</summary>
+    public String OSVersion { get; set; }
+    public String UUID { get; set; }
+
+    /// <summary>内存总量。单位MB</summary>
+    public UInt64 Memory { get; set; }
+
+    /// <summary>可用内存。单位MB</summary>
+    public UInt64 AvailableMemory { get; set; }
+
+    /// <summary>CPU占用率</summary>
+    public Double CpuRate { get; set; }
+    public Double Battery { get; set; }
+    public Double Temperature { get; set; }
+
+
+    /// <summary>处理器型号</summary>
+    public String? Processor { get; set; }
+    #region GC与进程内存信息
+
+    /// <summary>GC 认为“内存吃紧”的阈值。单位：MB</summary>
+    [DisplayName("GC高内存阈值")]
+    public UInt64 HighMemoryLoadThreshold { get; set; }
+
+    /// <summary>GC 可用内存上限。单位：MB</summary>
+    [DisplayName("GC可用内存上限")]
+    public UInt64 TotalAvailableMemory { get; set; }
+
+    /// <summary>当前托管堆容量。单位：MB</summary>
+    [DisplayName("托管堆容量")]
+    public UInt64 HeapSize { get; set; }
+
+    /// <summary>托管堆已用内存。单位：MB</summary>
+    [DisplayName("托管堆已用")]
+    public UInt64 TotalMemory { get; set; }
+
+    /// <summary>托管堆碎片大小。单位：MB</summary>
+    [DisplayName("托管堆碎片")]
+    public UInt64 FragmentedBytes { get; set; }
+
+    /// <summary>GC识别可用内存。单位：MB</summary>
+    [DisplayName("GC识别可用内存")]
+    public UInt64 GCAvailableMemory { get; set; }
+
+    /// <summary>GC 已提交的内存。单位：MB</summary>
+    [DisplayName("GC已提交内存")]
+    public UInt64 CommittedBytes { get; set; }
+
+    /// <summary>GC 累计分配的托管内存。单位：MB</summary>
+    [DisplayName("GC累计分配")]
+    public UInt64 TotalAllocatedBytes { get; set; }
+    /// <summary>GC 暂停累计时间。单位：毫秒</summary>
+    [DisplayName("GC累计暂停时间")]
+    public UInt64 TotalPauseDurationMs { get; set; }
+    /// <summary>GC 代0收集次数</summary>
+    [DisplayName("GC Gen0 次数")]
+    public Int32 GcGen0Count { get; set; }
+
+    /// <summary>GC 代1收集次数</summary>
+    [DisplayName("GC Gen1 次数")]
+    public Int32 GcGen1Count { get; set; }
+
+    /// <summary>GC 代2收集次数</summary>
+    [DisplayName("GC Gen2 次数")]
+    public Int32 GcGen2Count { get; set; }
+
+    /// <summary>Server GC 是否启用</summary>
+    [DisplayName("是否使用Server GC")]
+    public Boolean IsServerGC { get; set; }
+
+    /// <summary>GC 延迟模式</summary>
+    [DisplayName("GC延迟模式")]
+    public GCLatencyMode? GCLatencyMode { get; set; }
+
+    /// <summary>GC 固定对象数</summary>
+    [DisplayName("固定对象数")]
+    public Int64 PinnedObjectsCount { get; set; }
+
+    /// <summary>终结队列挂起对象数</summary>
+    [DisplayName("终结挂起数")]
+    public Int64 FinalizationPendingCount { get; set; }
+
+    #endregion
+
+    #region 进程内存信息
+
+    /// <summary>进程虚拟内存使用量。单位：MB</summary>
+    [DisplayName("虚拟内存")]
+    public UInt64 VirtualMemory { get; set; }
+
+    /// <summary>进程私有内存使用量。单位：MB</summary>
+    [DisplayName("私有内存")]
+    public UInt64 PrivateMemory { get; set; }
+
+    /// <summary>进程峰值工作集。单位：MB</summary>
+    [DisplayName("峰值工作集")]
+    public UInt64 PeakWorkingSet { get; set; }
+
+    /// <summary>进程当前工作集。单位：MB</summary>
+    [DisplayName("当前工作集")]
+    public UInt64 WorkingSet { get; set; }
+
+    #endregion

    /// <summary>
    /// 更新时间
    /// </summary>
-    public string UpdateTime { get; set; }
+    public DateTime UpdateTime { get; set; }
+    public ulong AppRunTotalMinute { get;  set; }
+    public ulong SystemRunTotalMinute { get;  set; }
 }
--- a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareJob.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareJob.cs
@@ -8,12 +8,10 @@
 // QQ群：605534569
 // ------------------------------------------------------------------------------

-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;

 using System.Runtime.InteropServices;

-using ThingsGateway.Extension;
 using ThingsGateway.NewLife;
 using ThingsGateway.NewLife.Caching;
 using ThingsGateway.NewLife.Threading;
@@ -43,7 +41,7 @@ public class HardwareJob : IJob, IHardwareJob
    /// <summary>
    /// 运行信息获取
    /// </summary>
-    public HardwareInfo HardwareInfo { get; } = new();
+    public HardwareInfo HardwareInfo { get; private set; }

    /// <inheritdoc/>
    public HardwareInfoOptions HardwareInfoOptions { get; private set; }
@@ -76,9 +74,10 @@ public class HardwareJob : IJob, IHardwareJob
        {
            try
            {
-                if (HardwareInfo.MachineInfo == null)
+                    var machine = MachineInfo.GetCurrent();
+                if (HardwareInfo == null)
                {
-                    HardwareInfo.MachineInfo = MachineInfo.GetCurrent();
+                    HardwareInfo=machine.AdaptHardwareInfo();

                    string currentPath = Directory.GetCurrentDirectory();
                    DriveInfo drive = new(Path.GetPathRoot(currentPath));
@@ -88,10 +87,9 @@ public class HardwareJob : IJob, IHardwareJob
                    HardwareInfo.DriveInfo = drive;
                    HardwareInfo.OsArchitecture = Environment.OSVersion.Platform.ToString() + " " + RuntimeInformation.OSArchitecture.ToString(); // 系统架构
                    HardwareInfo.FrameworkDescription = RuntimeInformation.FrameworkDescription; // NET框架
-                    HardwareInfo.Environment = App.HostEnvironment.IsDevelopment() ? "Development" : "Production";
-                    HardwareInfo.UUID = HardwareInfo.MachineInfo.UUID;
+                    HardwareInfo.Environment = App.HostEnvironment.EnvironmentName;

-                    HardwareInfo.UpdateTime = TimerX.Now.ToDefaultDateTimeFormat();
+                    HardwareInfo.UpdateTime = TimerX.Now;
                }
            }
            catch
@@ -99,9 +97,12 @@ public class HardwareJob : IJob, IHardwareJob
            }
            try
            {
-                HardwareInfo.MachineInfo.Refresh();
-                HardwareInfo.UpdateTime = TimerX.Now.ToDefaultDateTimeFormat();
-                HardwareInfo.WorkingSet = (Environment.WorkingSet / 1024.0 / 1024.0).ToInt();
+                var machine = MachineInfo.GetCurrent();
+                machine.Refresh();
+                machine.AdaptHardwareInfo(HardwareInfo);
+                HardwareInfo.AppRunTotalMinute = (ulong)Runtime.AppTickCount64 / 1000 /60;
+                HardwareInfo.SystemRunTotalMinute = (ulong)Runtime.TickCount64 / 1000 /60;
+                HardwareInfo.UpdateTime = TimerX.Now;
                error = false;
            }
            catch (Exception ex)
@@ -123,10 +124,10 @@ public class HardwareJob : IJob, IHardwareJob
                            {
                                Date = TimerX.Now,
                                DriveUsage = (100 - (HardwareInfo.DriveInfo.TotalFreeSpace * 100.00 / HardwareInfo.DriveInfo.TotalSize)).ToInt(),
-                                Battery = (HardwareInfo.MachineInfo.Battery * 100).ToInt(),
+                                Battery = (HardwareInfo.Battery * 100).ToInt(),
                                MemoryUsage = (HardwareInfo.WorkingSet),
-                                CpuUsage = (HardwareInfo.MachineInfo.CpuRate * 100).ToInt(),
-                                Temperature = (HardwareInfo.MachineInfo.Temperature).ToInt(),
+                                CpuUsage = (HardwareInfo.CpuRate * 100).ToInt(),
+                                Temperature = (HardwareInfo.Temperature).ToInt(),
                            };
                            await _db.InsertableT(his).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
                            MemoryCache.Remove(CacheKey);
--- a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HistoryHardwareInfo.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HistoryHardwareInfo.cs
@@ -21,7 +21,7 @@ public class HistoryHardwareInfo

    /// <inheritdoc/>
    [SugarColumn(ColumnDescription = "内存")]
-    public int MemoryUsage { get; set; }
+    public UInt64 MemoryUsage { get; set; }

    /// <inheritdoc/>
    [SugarColumn(ColumnDescription = "CPU使用率")]
--- a/src/Admin/ThingsGateway.Admin.Application/Locales/en-US.json
+++ b/src/Admin/ThingsGateway.Admin.Application/Locales/en-US.json
@@ -21,7 +21,7 @@
    "UserNoModule": "This account has not been assigned a module. Please contact the administrator",
    "UserNull": "User {0} does not exist"
  },
-  
+
  "ThingsGateway.Admin.Application.BlazorAuthenticationHandler": {
    "UserExpire": "User expired, please login again"
  },
@@ -46,12 +46,44 @@
    "FileTypeError": "Not supported format {0}"
  },
  "ThingsGateway.Admin.Application.HardwareInfo": {
-    "Environment": "HostEnvironment",
-    "FrameworkDescription": ".NETFramework",
-    "OsArchitecture": "System Architecture",
-    "UpdateTime": "UpdateTime",
-    "UUID": "UUID"
+    "DriveInfo": "Current Disk Info",
+    "AppRunTotalMinute": "AppRunTotalMinute(min)",
+    "SystemRunTotalMinute": "SystemRunTotalMinute(min)",
+    "Environment": "Host Environment",
+    "FrameworkDescription": ".NET Framework",
+    "OsArchitecture": "OS Architecture",
+    "OSName": "OS Name",
+    "OSVersion": "OS Version",
+    "UUID": "UUID",
+    "Memory": "Total Memory",
+    "AvailableMemory": "Available Memory",
+    "CpuRate": "CPU Usage",
+    "Battery": "Battery Level",
+    "Temperature": "Temperature",
+    "Processor": "Processor Model",
+    "HighMemoryLoadThreshold": "GC High Memory Threshold",
+    "TotalAvailableMemory": "GC Total Available Memory",
+    "HeapSize": "Managed Heap Size",
+    "TotalMemory": "Managed Heap Used",
+    "FragmentedBytes": "Managed Heap Fragmented",
+    "GCAvailableMemory": "GC Available Memory",
+    "CommittedBytes": "GC Committed Bytes",
+    "TotalAllocatedBytes": "GC Total Allocated (MB)",
+    "TotalPauseDurationMs": "GC Total Pause Duration (ms)",
+    "GcGen0Count": "GC Gen0 Count",
+    "GcGen1Count": "GC Gen1 Count",
+    "GcGen2Count": "GC Gen2 Count",
+    "IsServerGC": "Server GC",
+    "GCLatencyMode": "GC Latency Mode",
+    "PinnedObjectsCount": "Pinned Objects Count",
+    "FinalizationPendingCount": "Finalization Pending Count",
+    "VirtualMemory": "Virtual Memory",
+    "PrivateMemory": "Private Memory",
+    "PeakWorkingSet": "Peak Working Set",
+    "WorkingSet": "Current Working Set",
+    "UpdateTime": "Update Time"
  },
+
  "ThingsGateway.Admin.Application.HardwareJob": {
    "GetHardwareInfoFail": "Get Hardwareinfo Fail"
  },
--- a/src/Admin/ThingsGateway.Admin.Application/Locales/zh-CN.json
+++ b/src/Admin/ThingsGateway.Admin.Application/Locales/zh-CN.json
@@ -46,11 +46,42 @@
    "FileTypeError": "不支持 {0} 格式"
  },
  "ThingsGateway.Admin.Application.HardwareInfo": {
+    "DriveInfo": "当前磁盘信息",
+    "AppRunTotalMinute": "软件运行时长(min)",
+    "SystemRunTotalMinute": "系统运行时长(min)",
    "Environment": "主机环境",
-    "FrameworkDescription": "NET框架",
+    "FrameworkDescription": ".NET 框架",
    "OsArchitecture": "系统架构",
-    "UpdateTime": "更新时间",
-    "UUID": "唯一编码"
+    "OSName": "系统名称",
+    "OSVersion": "系统版本",
+    "UUID": "UUID",
+    "Memory": "系统总内存",
+    "AvailableMemory": "系统可用内存",
+    "CpuRate": "CPU 占用率",
+    "Battery": "电池电量",
+    "Temperature": "温度",
+    "Processor": "处理器型号",
+    "HighMemoryLoadThreshold": "GC 高内存阈值",
+    "TotalAvailableMemory": "GC 总内存阈值",
+    "HeapSize": "托管堆容量",
+    "TotalMemory": "托管对象占用",
+    "FragmentedBytes": "托管堆碎片",
+    "GCAvailableMemory": "GC 可用内存",
+    "CommittedBytes": "GC 提交内存总量",
+    "TotalAllocatedBytes": "GC 累计分配(MB)",
+    "TotalPauseDurationMs": "GC 累计暂停时间(ms)",
+    "GcGen0Count": "GC Gen0 次数",
+    "GcGen1Count": "GC Gen1 次数",
+    "GcGen2Count": "GC Gen2 次数",
+    "IsServerGC": "Server GC",
+    "GCLatencyMode": "GC 延迟模式",
+    "PinnedObjectsCount": "固定对象数",
+    "FinalizationPendingCount": "终结挂起数",
+    "VirtualMemory": "虚拟内存",
+    "PrivateMemory": "私有内存",
+    "PeakWorkingSet": "峰值工作集",
+    "WorkingSet": "当前工作集",
+    "UpdateTime": "更新时间"
  },
  "ThingsGateway.Admin.Application.HardwareJob": {
    "GetHardwareInfoFail": "获取硬件信息出错"
--- a/src/Admin/ThingsGateway.Admin.Application/Mapper/AdminMapper.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Mapper/AdminMapper.cs
@@ -8,13 +8,20 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

+using BootstrapBlazor.Components;
+
 using Riok.Mapperly.Abstractions;

+using ThingsGateway.NewLife;
+
 namespace ThingsGateway.Admin.Application;

 [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, RequiredMappingStrategy = RequiredMappingStrategy.None)]
 public static partial class AdminMapper
 {
+    public static partial HardwareInfo AdaptHardwareInfo(this MachineInfo src);
+        public static partial void AdaptHardwareInfo(this MachineInfo src, HardwareInfo dto);
+
    public static partial LoginInput AdaptLoginInput(this OpenApiLoginInput src);
    public static partial OpenApiLoginOutput AdaptOpenApiLoginOutput(this LoginOutput src);
    public static partial SessionOutput AdaptSessionOutput(this SysUser src);
--- a/src/Admin/ThingsGateway.Admin.Application/ThingsGateway.Admin.Application.csproj
+++ b/src/Admin/ThingsGateway.Admin.Application/ThingsGateway.Admin.Application.csproj
@@ -19,12 +19,14 @@
 	</ItemGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="Riok.Mapperly" Version="4.2.1" ExcludeAssets="runtime" PrivateAssets="all" />
+		<PackageReference Include="Riok.Mapperly" Version="4.3.0" ExcludeAssets="runtime" PrivateAssets="all">
+		  <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="Rougamo.Fody" Version="5.0.2" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
-		<PackageReference Include="System.Formats.Asn1" Version="8.0.2" />
+		<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
 		<PackageReference Include="System.Threading.RateLimiting" Version="8.0.0" />

 	</ItemGroup>
--- a/src/Admin/ThingsGateway.Admin.Razor/Locales/en-US.json
+++ b/src/Admin/ThingsGateway.Admin.Razor/Locales/en-US.json
@@ -22,6 +22,9 @@
    "SetDefaultModule": "Set as default module"
  },
  "ThingsGateway.Admin.Razor.HardwareInfoPage": {
+    "GCMemoryInfoConfig": "GCMemoryInfoConfig(MB)",
+    "GCMemoryInfo": "GCMemoryInfo(MB)",
+    "GCAnalyzeInfo": "GCAnalyzeInfo",
    "AvailableDisk": "Available Disk",
    "AvailableMemory": "Available Memory",
    "CpuUsage": "CPU Usage",
--- a/src/Admin/ThingsGateway.Admin.Razor/Locales/zh-CN.json
+++ b/src/Admin/ThingsGateway.Admin.Razor/Locales/zh-CN.json
@@ -22,6 +22,10 @@
    "SetDefaultModule": "设置为默认模块"
  },
  "ThingsGateway.Admin.Razor.HardwareInfoPage": {
+    "GCMemoryInfoConfig": "GC配置信息(MB)",
+    "GCMemoryInfo": "GC内存信息(MB)",
+    "GCAnalyzeInfo": "GC统计",
+
    "AvailableDisk": "可用磁盘",
    "AvailableMemory": "可用内存",
    "CpuUsage": "CPU使用率",
--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/HardwareInfoPage.razor
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/HardwareInfoPage.razor
@@ -5,131 +5,189 @@
@using ThingsGateway.Admin.Application
@namespace ThingsGateway.Admin.Razor
 <div class="row g-2 mx-1 form-inline">
-
-    <div class="col-12 col-md-4">
+    <div class="col-12 col-md-12">

        <Card IsShadow=true class="m-2 flex-fill" Color="Color.Primary">
            <HeaderTemplate>
-                @Localizer["SystemInfo"]
-            </HeaderTemplate>
-
-            <BodyTemplate>
-                <EditorFormObject IsDisplay Model="HardwareJob.HardwareInfo" ItemsPerRow="1" RowType=RowType.Inline LabelWidth="160">
-                    <FieldItems>
-                        <EditorItem @bind-Field="@context.MachineInfo">
-                            <EditTemplate Context="value">
-                                <div class="col-12  col-md-12">
-                                    <Display @bind-Value="@value.MachineInfo.OSName" DisplayText="@Localizer[nameof(value.MachineInfo.OSName)]" ShowTooltip ShowLabel=true>
-                                    </Display>
-                                </div>
-                                <div class="col-12  col-md-12">
-                                    <Display @bind-Value="@value.MachineInfo.OSVersion" DisplayText="@Localizer[nameof(value.MachineInfo.OSVersion)]" ShowTooltip ShowLabel=true>
-                                    </Display>
-                                </div>
-                            </EditTemplate>
-                        </EditorItem>
-
-                        <EditorItem @bind-Field="@context.UUID">
-                            <EditTemplate Context="value">
-                                <div class="col-12  col-md-12">
-                                    <Display @bind-Value="@value.UUID" ShowTooltip ShowLabel=true>
-                                    </Display>
-                                </div>
-
-                            </EditTemplate>
-                        </EditorItem>
-                        <EditorItem @bind-Field="@context.DriveInfo" Ignore=true>
-                        </EditorItem>
-                    </FieldItems>
-                </EditorFormObject>
-
-            </BodyTemplate>
-        </Card>
-    </div>
-    <div class="col-12 col-md-8">
-        <Card IsShadow=true class="m-2 flex-fill" Color="Color.Primary">
-            <HeaderTemplate>
-                @Localizer["HardwareInfo"]
-            </HeaderTemplate>
-
-            <BodyTemplate>
-                <div class="d-flex align-items-center justify-content-center w-100 h-100" >
-
-                    <div class="row g-2 mx-1 form-inline d-flex justify-content-center w-100">
-                        <div class="col-12 col-md-4  justify-content-center h-100" >
-                            @{
-                                var item = HardwareJob.HardwareInfo.MachineInfo.CpuRate;
-                            }
-                            <div class="d-flex flex-column align-items-center">
-                                <Circle Width="200" class="m-3"
-                                        Value=@((int)(item*100<=100?item*100:100))
-                                        Color=@((item*100>70?Color.Warning:Color.Success))
-                                        StrokeWidth="4" ShowProgress=false>
-                                    <div class="circle-hardware">
-                                        <span>
-                                            @Localizer["CpuUsage"] <i> @((item * 100).ToString("F0") + " %")</i>
-                                        </span>
-                                    </div>
-                                </Circle>
-                                <div class="mt-1">
-                                    <span>@(HardwareJob.HardwareInfo.MachineInfo.Processor)</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-12 col-md-4 justify-content-center h-100">
-                            @{
-                                var availableMemory = HardwareJob.HardwareInfo.MachineInfo.AvailableMemory;
-                                var memory = HardwareJob.HardwareInfo.MachineInfo.Memory;
-                            }
-                            <div class="d-flex flex-column align-items-center ">
-                                <Circle Width="200" class="m-3"
-                                        Value=@((int)(memory>availableMemory?100 - (availableMemory * 100.00 / memory):100))
-                                        Color=@((availableMemory * 100.00 / memory<20?Color.Warning:Color.Success))
-                                        StrokeWidth="4">
-                                    <div class="circle-hardware">
-                                        <h6>   @((100 - (availableMemory * 100.00 / memory)).ToString("F2") + " %")  </h6>
-
-                                        <span>   @Localizer["WorkingSet"] <i> @(HardwareJob.HardwareInfo.WorkingSet + " MB")</i></span>
-                                        <span>   @Localizer["AvailableMemory"] <i> @((availableMemory / 1024.00 / 1024).ToString("F2") + " GB")</i></span>
-                                        <span>   @Localizer["TotalMemory"] <i> @((memory / 1024.00 / 1024).ToString("F2") + " GB")</i></span>
-
-                                    </div>
-                                </Circle>
-                                <div class="mt-1">
-                                    <span>  @Localizer["MemoryUsage"] </span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-12 col-md-4 justify-content-center h-100">
-                            @{
-                                var totalFreeSpace = HardwareJob.HardwareInfo.DriveInfo.TotalFreeSpace;
-                                var totalSize = HardwareJob.HardwareInfo.DriveInfo.TotalSize;
-                            }
-                            <div class="d-flex flex-column align-items-center ">
-                                <Circle Width="200" class="m-3"
-                                        Value=@((int)(totalSize>totalFreeSpace?100 - (totalFreeSpace * 100.00 / totalSize):100))
-                                        Color=@((totalFreeSpace * 100.00 / totalSize<20?Color.Warning:Color.Success))
-                                        StrokeWidth="4">
-                                    <div class="circle-hardware">
-                                        <h6>   @((100 - (totalFreeSpace * 100.00 / totalSize)).ToString("F2") + " %")</h6>
-                                        <span>   @(HardwareJob.HardwareInfo.DriveInfo.VolumeLabel) </span>
-                                        <span>   @Localizer["AvailableDisk"] <i> @((totalFreeSpace / 1024.00 / 1024 / 1024).ToString("F2") + " GB")</i></span>
-                                        <span>   @Localizer["TotalDisk"] <i> @((totalSize / 1024.00 / 1024 / 1024).ToString("F2") + " GB")</i></span>
-                                    </div>
-                                </Circle>
-                                <div class="mt-1">
-                                    <span>  @Localizer["DiskUsage"] </span>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+                <div class="d-flex justify-content-between align-items-center w-100">
+                    <span>@Localizer["SystemInfo"]</span>
+                    <small class="text-muted">
+                        @HardwareJob.HardwareInfo.UpdateTime.ToString("yyyy-MM-dd HH:mm:ss")
+                    </small>
                </div>
+            </HeaderTemplate>
+
+            <BodyTemplate>
+                <EditorForm class="mt-3" AutoGenerateAllItem="false" IsDisplay Model="HardwareJob.HardwareInfo" ItemsPerRow=3 RowType=RowType.Inline LabelWidth=300>
+                    <FieldItems>
+
+                        <EditorItem @bind-Field="@context.OSName" GroupName="@Localizer["SystemInfo"]" />
+                        <EditorItem @bind-Field="@context.OsArchitecture" GroupName="@Localizer["SystemInfo"]" />
+                        <EditorItem @bind-Field="@context.OSVersion" GroupName="@Localizer["SystemInfo"]" />
+                        <EditorItem @bind-Field="@context.Environment" GroupName="@Localizer["SystemInfo"]" />
+                        <EditorItem @bind-Field="@context.FrameworkDescription" GroupName="@Localizer["SystemInfo"]" />
+                        <EditorItem @bind-Field="@context.UUID" GroupName="@Localizer["SystemInfo"]" />
+                        <EditorItem @bind-Field="@context.SystemRunTotalMinute" GroupName="@Localizer["SystemInfo"]" />
+                        <EditorItem @bind-Field="@context.AppRunTotalMinute" GroupName="@Localizer["SystemInfo"]" />
+
+
+                        <EditorItem @bind-Field="@context.Memory" GroupName="@Localizer["GCMemoryInfoConfig"]" GroupOrder=2 />
+                        <EditorItem @bind-Field="@context.TotalAvailableMemory" GroupName="@Localizer["GCMemoryInfoConfig"]" GroupOrder=2 />
+                        <EditorItem @bind-Field="@context.HighMemoryLoadThreshold" GroupName="@Localizer["GCMemoryConfig"]" GroupOrder=2 />
+
+                        <EditorItem TValue="bool" TModel="HardwareInfo" @bind-Field="@context.IsServerGC" GroupName="@Localizer["GCMemoryConfig"]" GroupOrder=2>
+                            <EditTemplate Context="value">
+                                <div class="col-12">
+                                    <h6></h6>
+                                </div>
+                            </EditTemplate>
+                        </EditorItem>
+
+                        <EditorItem @bind-Field="@context.IsServerGC" GroupName="@Localizer["GCMemoryInfoConfig"]" GroupOrder=2 />
+                        <EditorItem @bind-Field="@context.GCLatencyMode" GroupName="@Localizer["GCMemoryInfoConfig"]" GroupOrder=2 />
+
+
+                        <EditorItem @bind-Field="@context.WorkingSet" GroupName="@Localizer["GCMemoryInfo"]" GroupOrder=3 />
+                        <EditorItem @bind-Field="@context.PrivateMemory" GroupName="@Localizer["GCMemoryInfo"]" GroupOrder=3 />
+                        <EditorItem @bind-Field="@context.PeakWorkingSet" GroupName="@Localizer["GCMemoryInfo"]" GroupOrder=3 />
+                        <EditorItem TValue="ulong" TModel="HardwareInfo" @bind-Field="@context.HeapSize" GroupName="@Localizer["GCMemoryInfo"]" GroupOrder=3>
+                            <EditTemplate Context="value">
+                                <div class="col-12">
+                                    <h6></h6>
+                                </div>
+                            </EditTemplate>
+                        </EditorItem>
+                        <EditorItem @bind-Field="@context.HeapSize" GroupName="@Localizer["GCMemoryInfo"]" GroupOrder=3 />
+                        <EditorItem @bind-Field="@context.TotalMemory" GroupName="@Localizer["GCMemoryInfo"]" GroupOrder=3 />
+                        <EditorItem @bind-Field="@context.FragmentedBytes" GroupName="@Localizer["GCMemoryInfo"]" GroupOrder=3 />
+                        <EditorItem @bind-Field="@context.CommittedBytes" GroupName="@Localizer["GCMemoryInfo"]" GroupOrder=3 />
+
+                        <EditorItem TValue="ulong" TModel="HardwareInfo" @bind-Field="@context.AvailableMemory" GroupName="@Localizer["GCMemoryInfo"]" GroupOrder=3>
+                            <EditTemplate Context="value">
+                                <div class="col-12">
+                                    <h6></h6>
+                                </div>
+                            </EditTemplate>
+                        </EditorItem>
+
+                        <EditorItem @bind-Field="@context.AvailableMemory" GroupName="@Localizer["GCMemoryInfo"]" GroupOrder=3 />
+                        <EditorItem @bind-Field="@context.GCAvailableMemory" GroupName="@Localizer["GCMemoryInfo"]" GroupOrder=3 />
+                        <EditorItem @bind-Field="@context.VirtualMemory" GroupName="@Localizer["GCMemoryInfo"]" GroupOrder=3 />
+
+
+                        <EditorItem @bind-Field="@context.GcGen0Count" GroupName="@Localizer["GCAnalyzeInfo"]" GroupOrder=4 />
+                        <EditorItem @bind-Field="@context.GcGen1Count" GroupName="@Localizer["GCAnalyzeInfo"]" GroupOrder=4 />
+                        <EditorItem @bind-Field="@context.GcGen2Count" GroupName="@Localizer["GCAnalyzeInfo"]" GroupOrder=4 />
+                        <EditorItem TValue="ulong" TModel="HardwareInfo" @bind-Field="@context.TotalAllocatedBytes" GroupName="@Localizer["GCAnalyzeInfo"]" GroupOrder=4>
+                            <EditTemplate Context="value">
+                                <div class="col-12">
+                                    <h6></h6>
+                                </div>
+                            </EditTemplate>
+                        </EditorItem>
+
+                        <EditorItem @bind-Field="@context.TotalAllocatedBytes" GroupName="@Localizer["GCAnalyzeInfo"]" GroupOrder=4 />
+                        <EditorItem @bind-Field="@context.TotalPauseDurationMs" GroupName="@Localizer["GCAnalyzeInfo"]" GroupOrder=4 />
+
+                    </FieldItems>
+                </EditorForm>
+
+

            </BodyTemplate>
        </Card>

    </div>
 </div>
+
+<div class="row g-2 mx-1 form-inline mt-2">
+
+    <div class="col-12 col-md-12">
+        <Card IsShadow=true class="m-2 flex-fill" Color="Color.Primary">
+            <HeaderTemplate>
+                @Localizer["HardwareInfo"]
+            </HeaderTemplate>
+
+            <BodyTemplate>
+                <div class="d-flex align-items-center justify-content-center w-100 h-100">
+                    <div class="row g-2 mx-1 form-inline d-flex justify-content-center w-100">
+                        <!-- ✅ CPU 使用率 -->
+                        <div class="col-12 col-md-4 justify-content-center h-100">
+                            @{
+                                var cpuUsage = HardwareJob.HardwareInfo.CpuRate;
+                            }
+                            <div class="d-flex flex-column align-items-center">
+                                <Circle Width="200" class="m-3"
+                                        Value=@((int)(cpuUsage*100<=100?cpuUsage*100:100))
+                                        Color=@((cpuUsage*100>70?Color.Warning:Color.Success))
+                                        StrokeWidth="4" ShowProgress=false>
+                                    <div class="circle-hardware">
+                                        <span>
+                                            @Localizer["CpuUsage"] <i>@((cpuUsage * 100).ToString("F0") + " %")</i>
+                                        </span>
+                                    </div>
+                                </Circle>
+                                <div class="mt-1">
+                                    <span>@(HardwareJob.HardwareInfo.Processor)</span>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- ✅ 内存使用率 -->
+                        <div class="col-12 col-md-4 justify-content-center h-100">
+                            @{
+                                var availableMemory = HardwareJob.HardwareInfo.AvailableMemory;
+                                var memory = HardwareJob.HardwareInfo.Memory;
+                            }
+                            <div class="d-flex flex-column align-items-center">
+                                <Circle Width="200" class="m-3"
+                                        Value=@((int)(memory>availableMemory?100 - (availableMemory * 100.00 / memory):100))
+                                        Color=@((availableMemory * 100.00 / memory<20?Color.Warning:Color.Success))
+                                        StrokeWidth="4">
+                                    <div class="circle-hardware">
+                                        <h6>@((100 - (availableMemory * 100.00 / memory)).ToString("F2") + " %")</h6>
+                                        <span>@Localizer["WorkingSet"] <i>@(HardwareJob.HardwareInfo.WorkingSet + " MB")</i></span>
+                                        <span>@Localizer["AvailableMemory"] <i>@((availableMemory / 1024.00).ToString("F2") + " GB")</i></span>
+                                        <span>@Localizer["TotalMemory"] <i>@((memory / 1024.00).ToString("F2") + " GB")</i></span>
+                                    </div>
+                                </Circle>
+                                <div class="mt-1">
+                                    <span>@Localizer["MemoryUsage"]</span>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- ✅ 磁盘使用率 -->
+                        <div class="col-12 col-md-4 justify-content-center h-100">
+                            @{
+                                var totalFreeSpace = HardwareJob.HardwareInfo.DriveInfo.TotalFreeSpace;
+                                var totalSize = HardwareJob.HardwareInfo.DriveInfo.TotalSize;
+                            }
+                            <div class="d-flex flex-column align-items-center">
+                                <Circle Width="200" class="m-3"
+                                        Value=@((int)(totalSize>totalFreeSpace?100 - (totalFreeSpace * 100.00 / totalSize):100))
+                                        Color=@((totalFreeSpace * 100.00 / totalSize<20?Color.Warning:Color.Success))
+                                        StrokeWidth="4">
+                                    <div class="circle-hardware">
+                                        <h6>@((100 - (totalFreeSpace * 100.00 / totalSize)).ToString("F2") + " %")</h6>
+                                        <span>@(HardwareJob.HardwareInfo.DriveInfo.VolumeLabel)</span>
+                                        <span>@Localizer["AvailableDisk"] <i>@((totalFreeSpace / 1024.00 / 1024 / 1024).ToString("F2") + " GB")</i></span>
+                                        <span>@Localizer["TotalDisk"] <i>@((totalSize / 1024.00 / 1024 / 1024).ToString("F2") + " GB")</i></span>
+                                    </div>
+                                </Circle>
+                                <div class="mt-1">
+                                    <span>@Localizer["DiskUsage"]</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </BodyTemplate>
+        </Card>
+    </div>
+</div>
+
+
 <div class="row g-2 mx-1 form-inline">

    <div class="col-12 col-md-12">
@@ -140,7 +198,7 @@
            </HeaderTemplate>

            <BodyTemplate>
-                <Chart @ref=LineChart OnInitAsync="OnInit" Height="var(--line-chart-height)" Width="100%" OnAfterInitAsync="()=>{chartInit=true;return Task.CompletedTask;}" />
+                <Chart @ref=LineChart OnInitAsync="OnInit" Height="var(--line-chart-height)" Width="100%" OnAfterInitAsync="() => { chartInit = true; return Task.CompletedTask; }" />
            </BodyTemplate>
        </Card>
    </div>
--- a/src/Admin/ThingsGateway.AdminServer/Program/Startup.cs
+++ b/src/Admin/ThingsGateway.AdminServer/Program/Startup.cs
@@ -92,7 +92,8 @@ public class Startup : AppStartup
             options.RootComponents.MaxJSRootComponents = 500;
             options.JSInteropDefaultCallTimeout = TimeSpan.FromMinutes(2);
             options.MaxBufferedUnacknowledgedRenderBatches = 20;
-             options.DisconnectedCircuitRetentionPeriod = TimeSpan.FromMinutes(10);
+             options.DisconnectedCircuitMaxRetained = 1;
+             options.DisconnectedCircuitRetentionPeriod = TimeSpan.FromSeconds(10);
         })
         .AddHubOptions(options =>
         {
@@ -103,6 +104,7 @@ public class Startup : AppStartup
             options.ClientTimeoutInterval = TimeSpan.FromMinutes(2);
             options.KeepAliveInterval = TimeSpan.FromSeconds(15);
             options.HandshakeTimeout = TimeSpan.FromSeconds(30);
+
         });

 #else
@@ -112,7 +114,8 @@ public class Startup : AppStartup
            options.RootComponents.MaxJSRootComponents = 500;
            options.JSInteropDefaultCallTimeout = TimeSpan.FromMinutes(2);
            options.MaxBufferedUnacknowledgedRenderBatches = 20;
-            options.DisconnectedCircuitRetentionPeriod = TimeSpan.FromMinutes(10);
+             options.DisconnectedCircuitMaxRetained = 1;
+             options.DisconnectedCircuitRetentionPeriod = TimeSpan.FromSeconds(10);
        }).AddHubOptions(options =>
        {
            //单个传入集线器消息的最大大小。默认 32 KB
--- a/src/Admin/ThingsGateway.AdminServer/ThingsGateway.AdminServer.csproj
+++ b/src/Admin/ThingsGateway.AdminServer/ThingsGateway.AdminServer.csproj
@@ -15,15 +15,11 @@
 		<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
 		<ApplicationIcon>wwwroot\favicon.ico</ApplicationIcon>

+		<CETCompat>false</CETCompat>
+		<ServerGarbageCollection>true</ServerGarbageCollection>
 		<!--动态适用GC-->
 		<GarbageCollectionAdaptationMode>1</GarbageCollectionAdaptationMode>
-		<CETCompat>false</CETCompat>
-		<!--使用自托管线程池-->
-		<!--<UseWindowsThreadPool>false</UseWindowsThreadPool> -->
-
-		<!--使用工作站GC-->
-		<!--<ServerGarbageCollection>true</ServerGarbageCollection>-->
-
+		
 		<!--<PlatformTarget>x86</PlatformTarget>-->
 	</PropertyGroup>

--- a/src/Admin/ThingsGateway.Common/Localization/Json/CacheManager.cs
+++ b/src/Admin/ThingsGateway.Common/Localization/Json/CacheManager.cs
@@ -27,7 +27,7 @@ internal class CacheManager
 {
    private IMemoryCache Cache { get; set; }

-    private IServiceProvider Provider { get; set; }
+    private static IServiceProvider Provider => App.RootServices;

    [NotNull]
    private static CacheManager? Instance { get; set; }
@@ -40,8 +40,7 @@ internal class CacheManager
    static CacheManager()
    {
        Instance = new();
-        Instance.Provider = App.RootServices;
-        Instance.Cache = Instance.Provider.GetRequiredService<IMemoryCache>();
+        Instance.Cache = Provider.GetRequiredService<IMemoryCache>();
        Options = App.RootServices.GetRequiredService<IOptions<BootstrapBlazorOptions>>().Value;
    }

@@ -105,37 +104,6 @@ internal class CacheManager
        }
    }

-    /// <summary>
-    /// 设置 App 开始时间
-    /// </summary>
-    public void SetStartTime() => SetStartTime(DateTimeOffset.Now);
-
-    /// <summary>
-    /// 设置 App 开始时间
-    /// </summary>
-    private void SetStartTime(DateTimeOffset startDateTimeOffset)
-    {
-        GetOrCreate("BootstrapBlazor_StartTime", entry =>
-        {
-            entry.Priority = CacheItemPriority.NeverRemove;
-            return startDateTimeOffset;
-        });
-    }
-
-    /// <summary>
-    /// 获取 App 开始时间
-    /// </summary>
-    /// <returns></returns>
-    public DateTimeOffset GetStartTime()
-    {
-        var ret = DateTimeOffset.MinValue;
-        if (Cache.TryGetValue("BootstrapBlazor_StartTime", out var v) && v is DateTimeOffset d)
-        {
-            ret = d;
-        }
-        return ret;
-    }
-
    /// <summary>
    /// 获得 缓存数量
    /// </summary>
@@ -236,7 +204,7 @@ internal class CacheManager
    /// <returns></returns>
    public static IStringLocalizer? CreateLocalizerByType(Type resourceSource) => resourceSource.Assembly.IsDynamic
        ? null
-        : Instance.Provider.GetRequiredService<IStringLocalizerFactory>().Create(resourceSource);
+        : Provider.GetRequiredService<IStringLocalizerFactory>().Create(resourceSource);

    /// <summary>
    /// 获得 <see cref="JsonLocalizationOptions"/> 值
@@ -244,7 +212,7 @@ internal class CacheManager
    /// <returns></returns>
    private static JsonLocalizationOptions GetJsonLocalizationOption()
    {
-        var localizationOptions = Instance.Provider.GetRequiredService<IOptions<JsonLocalizationOptions>>();
+        var localizationOptions = Provider.GetRequiredService<IOptions<JsonLocalizationOptions>>();
        return localizationOptions.Value;
    }
    /// <summary>
@@ -253,7 +221,7 @@ internal class CacheManager
    /// <returns></returns>
    private static BootstrapBlazorOptions GetBootstrapBlazorOption()
    {
-        var localizationOptions = Instance.Provider.GetRequiredService<IOptions<BootstrapBlazorOptions>>();
+        var localizationOptions = Provider.GetRequiredService<IOptions<BootstrapBlazorOptions>>();
        return localizationOptions.Value;
    }
    /// <summary>
@@ -269,7 +237,7 @@ internal class CacheManager
            return null;
        }
        IStringLocalizer? ret = null;
-        var factories = Instance.Provider.GetServices<IStringLocalizerFactory>();
+        var factories = Provider.GetServices<IStringLocalizerFactory>();
        var factory = factories.LastOrDefault(a => a is not JsonStringLocalizerFactory);
        if (factory != null)
        {
@@ -345,7 +313,7 @@ internal class CacheManager
    /// <param name="typeName"></param>
    /// <param name="includeParentCultures"></param>
    /// <returns></returns>
-    public static IEnumerable<LocalizedString> GetTypeStringsFromResolve(string typeName, bool includeParentCultures = true) => Instance.Provider.GetRequiredService<ILocalizationResolve>().GetAllStringsByType(typeName, includeParentCultures);
+    public static IEnumerable<LocalizedString> GetTypeStringsFromResolve(string typeName, bool includeParentCultures = true) => Provider.GetRequiredService<ILocalizationResolve>().GetAllStringsByType(typeName, includeParentCultures);
    #endregion

    #region DisplayName
--- a/src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj
+++ b/src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj
@@ -14,7 +14,7 @@
 	<ItemGroup>
 		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.7" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
-		<PackageReference Include="BootstrapBlazor" Version="9.11.2" />
+		<PackageReference Include="BootstrapBlazor" Version="9.11.4" />
 	</ItemGroup>

 	<ItemGroup>
--- a/src/Admin/ThingsGateway.NewLife.X/Collections/ObjectPoolLock.cs
+++ b/src/Admin/ThingsGateway.NewLife.X/Collections/ObjectPoolLock.cs
@@ -25,17 +25,11 @@ public class ObjectPoolLock<T> : DisposeBase, IPool<T> where T : class
    /// <summary>最大个数。默认0，0表示无上限</summary>
    public Int32 Max { get; set; } = 0;

-    /// <summary>最小个数。默认1</summary>
-    public Int32 Min { get; set; } = 1;
-
    private readonly object _syncRoot = new();

    /// <summary>基础空闲集合。只保存最小个数，最热部分</summary>
    private readonly Stack<T> _free = new();

-    /// <summary>扩展空闲集合。保存最小个数以外部分</summary>
-    private readonly Queue<T> _free2 = new();
-
    /// <summary>借出去的放在这</summary>
    private readonly HashSet<T> _busy = new();

@@ -79,7 +73,7 @@ public class ObjectPoolLock<T> : DisposeBase, IPool<T> where T : class
            if (_inited) return;
            _inited = true;

-            WriteLog($"Init {typeof(T).FullName} Min={Min} Max={Max}");
+            WriteLog($"Init {typeof(T).FullName} Max={Max}");
        }
    }
    #endregion
@@ -99,26 +93,20 @@ public class ObjectPoolLock<T> : DisposeBase, IPool<T> where T : class
                    pi = _free.Pop();
                    _FreeCount--;
                }
-                else if (_free2.Count > 0)
-                {
-                    pi = _free2.Dequeue();
-                    _FreeCount--;
-                }
                else
                {
-                    var count = BusyCount;
-                    if (Max > 0 && count >= Max)
+                    if (Max > 0 && BusyCount >= Max)
                    {
-                        var msg = $"申请失败，已有 {count:n0} 达到或超过最大值 {Max:n0}";
+                        var msg = $"申请失败，已有 {BusyCount:n0} 达到或超过最大值 {Max:n0}";
                        WriteLog("Acquire Max " + msg);
                        throw new Exception(Name + " " + msg);
                    }

                    pi = OnCreate();
-                    if (count == 0) Init();
+                    if (BusyCount == 0) Init();

 #if DEBUG
-                    WriteLog("Acquire Create Free={0} Busy={1}", FreeCount, count + 1);
+                    WriteLog("Acquire Create Free={0} Busy={1}", FreeCount, BusyCount + 1);
 #endif
                }
            }
@@ -177,10 +165,7 @@ public class ObjectPoolLock<T> : DisposeBase, IPool<T> where T : class
        }
        lock (_syncRoot)
        {
-            if (_FreeCount < Min)
-                _free.Push(value);
-            else
-                _free2.Enqueue(value);
+            _free.Push(value);
            _FreeCount++;
        }

@@ -214,12 +199,6 @@ public class ObjectPoolLock<T> : DisposeBase, IPool<T> where T : class
                OnDispose(pi);
            }

-            while (_free2.Count > 0)
-            {
-                var pi = _free2.Dequeue();
-                OnDispose(pi);
-            }
-
            _FreeCount = 0;

            foreach (var item in _busy)
--- a/src/Admin/ThingsGateway.NewLife.X/Common/MachineInfo.cs
+++ b/src/Admin/ThingsGateway.NewLife.X/Common/MachineInfo.cs
@@ -14,10 +14,16 @@ using ThingsGateway.NewLife.Reflection;
 using ThingsGateway.NewLife.Serialization;
 using ThingsGateway.NewLife.Windows;

+using System.Diagnostics;
+using System.Runtime;
+
+
 #if NETFRAMEWORK
 using System.Management;

 using Microsoft.VisualBasic.Devices;
+
+
 #endif
 #if NETFRAMEWORK || NET6_0_OR_GREATER
 using Microsoft.Win32;
@@ -42,7 +48,7 @@ public interface IMachineInfo
 /// 
 /// 刷新信息成本较高，建议采用单例模式
 /// </remarks>
-public class MachineInfo : IExtend
+public class MachineInfo
 {
    #region 属性
    /// <summary>系统名称</summary>
@@ -88,11 +94,11 @@ public class MachineInfo : IExtend
    [DisplayName("磁盘序列号")]
    public String? DiskID { get; set; }

-    /// <summary>内存总量。单位KB</summary>
+    /// <summary>内存总量。单位MB</summary>
    [DisplayName("内存总量")]
    public UInt64 Memory { get; set; }

-    /// <summary>可用内存。单位KB</summary>
+    /// <summary>可用内存。单位MB</summary>
    [DisplayName("可用内存")]
    public UInt64 AvailableMemory { get; set; }

@@ -116,13 +122,98 @@ public class MachineInfo : IExtend
    [DisplayName("电池剩余")]
    public Double Battery { get; set; }

-    private readonly Dictionary<String, Object?> _items = [];
-    IDictionary<String, Object?> IExtend.Items => _items;
+#if NET6_0_OR_GREATER
+    #region GC与进程内存信息
+
+    /// <summary>GC 认为“内存吃紧”的阈值。单位：MB</summary>
+    [DisplayName("GC高内存阈值")]
+    public UInt64 HighMemoryLoadThreshold { get; set; }
+
+    /// <summary>GC 可用内存上限。单位：MB</summary>
+    [DisplayName("GC可用内存上限")]
+    public UInt64 TotalAvailableMemory { get; set; }
+
+    /// <summary>当前托管堆容量。单位：MB</summary>
+    [DisplayName("托管堆容量")]
+    public UInt64 HeapSize { get; set; }
+
+    /// <summary>托管堆已用内存。单位：MB</summary>
+    [DisplayName("托管堆已用")]
+    public UInt64 TotalMemory { get; set; }
+
+    /// <summary>托管堆碎片大小。单位：MB</summary>
+    [DisplayName("托管堆碎片")]
+    public UInt64 FragmentedBytes { get; set; }
+
+    /// <summary>GC识别可用内存。单位：MB</summary>
+    [DisplayName("GC识别可用内存")]
+    public UInt64 GCAvailableMemory { get; set; }
+
+    /// <summary>GC 已提交的内存。单位：MB</summary>
+    [DisplayName("GC已提交内存")]
+    public UInt64 CommittedBytes { get; set; }
+
+    /// <summary>GC 累计分配的托管内存。单位：MB</summary>
+    [DisplayName("GC累计分配")]
+    public UInt64 TotalAllocatedBytes { get; set; }
+#if NET8_0_OR_GREATER
+    /// <summary>GC 暂停累计时间。单位：毫秒</summary>
+    [DisplayName("GC累计暂停时间")]
+    public UInt64 TotalPauseDurationMs { get; set; }
+#endif
+    /// <summary>GC 代0收集次数</summary>
+    [DisplayName("GC Gen0 次数")]
+    public Int32 GcGen0Count { get; set; }
+
+    /// <summary>GC 代1收集次数</summary>
+    [DisplayName("GC Gen1 次数")]
+    public Int32 GcGen1Count { get; set; }
+
+    /// <summary>GC 代2收集次数</summary>
+    [DisplayName("GC Gen2 次数")]
+    public Int32 GcGen2Count { get; set; }
+
+    /// <summary>Server GC 是否启用</summary>
+    [DisplayName("是否使用Server GC")]
+    public Boolean IsServerGC { get; set; }
+
+    /// <summary>GC 延迟模式</summary>
+    [DisplayName("GC延迟模式")]
+    public GCLatencyMode? GCLatencyMode { get; set; }
+
+    /// <summary>GC 固定对象数</summary>
+    [DisplayName("固定对象数")]
+    public Int64 PinnedObjectsCount { get; set; }
+
+    /// <summary>终结队列挂起对象数</summary>
+    [DisplayName("终结挂起数")]
+    public Int64 FinalizationPendingCount { get; set; }
+
+    #endregion
+
+    #region 进程内存信息
+
+    /// <summary>进程虚拟内存使用量。单位：MB</summary>
+    [DisplayName("虚拟内存")]
+    public UInt64 VirtualMemory { get; set; }
+
+    /// <summary>进程私有内存使用量。单位：MB</summary>
+    [DisplayName("私有内存")]
+    public UInt64 PrivateMemory { get; set; }
+
+    /// <summary>进程峰值工作集。单位：MB</summary>
+    [DisplayName("峰值工作集")]
+    public UInt64 PeakWorkingSet { get; set; }
+
+    /// <summary>进程当前工作集。单位：MB</summary>
+    [DisplayName("当前工作集")]
+    public UInt64 WorkingSet { get; set; }
+
+    #endregion
+
+#endif
+

-    /// <summary>获取 或 设置 扩展属性数据</summary>
-    /// <param name="key"></param>
-    /// <returns></returns>
-    public Object? this[String key] { get => _items.TryGetValue(key, out var obj) ? obj : null; set => _items[key] = value; }
    #endregion

    #region 全局静态
@@ -569,10 +660,50 @@ public class MachineInfo : IExtend
        else if (Runtime.Linux)
            RefreshLinux();

+        // 刷新 GC 与进程内存信息
+        RefreshMemoryInfo();
+
        RefreshSpeed();

        Provider?.Refresh(this);
    }
+    /// <summary>
+    /// 刷新 GC 与进程内存相关信息
+    /// </summary>
+    private void RefreshMemoryInfo()
+    {
+#if NET6_0_OR_GREATER
+        var info = GC.GetGCMemoryInfo();
+        var proc = Process.GetCurrentProcess();
+
+        // GC 信息（单位：MB）
+        HighMemoryLoadThreshold = (ulong)(info.HighMemoryLoadThresholdBytes / 1024 / 1024);
+        TotalAvailableMemory = (ulong)(info.TotalAvailableMemoryBytes / 1024 / 1024);
+        HeapSize = (ulong)(info.HeapSizeBytes / 1024 / 1024);
+        TotalMemory = (ulong)(GC.GetTotalMemory(false) / 1024 / 1024);
+        FragmentedBytes = (ulong)(info.FragmentedBytes / 1024 / 1024);
+        GCAvailableMemory = (ulong)(info.TotalAvailableMemoryBytes - info.MemoryLoadBytes) / 1024 / 1024;
+        CommittedBytes = (ulong)(info.TotalCommittedBytes / 1024 / 1024);
+        TotalAllocatedBytes = (ulong)(GC.GetTotalAllocatedBytes(false) / 1024 / 1024);
+#if NET8_0_OR_GREATER
+        TotalPauseDurationMs = (ulong)GC.GetTotalPauseDuration().TotalMilliseconds;
+#endif
+        GcGen0Count = GC.CollectionCount(0);
+        GcGen1Count = GC.CollectionCount(1);
+        GcGen2Count = GC.CollectionCount(2);
+        IsServerGC = System.Runtime.GCSettings.IsServerGC;
+        GCLatencyMode = System.Runtime.GCSettings.LatencyMode;
+        PinnedObjectsCount = info.PinnedObjectsCount;
+        FinalizationPendingCount = info.FinalizationPendingCount;
+
+        // 进程信息（单位：MB）
+        VirtualMemory = (ulong)(proc.VirtualMemorySize64 / 1024 / 1024);
+        PrivateMemory = (ulong)(proc.PrivateMemorySize64 / 1024 / 1024);
+        PeakWorkingSet = (ulong)(proc.PeakWorkingSet64 / 1024 / 1024);
+        WorkingSet = (ulong)(proc.WorkingSet64 / 1024 / 1024);
+
+#endif
+    }

    private void RefreshWindows()
    {
@@ -580,8 +711,8 @@ public class MachineInfo : IExtend
        ms.Init();
        if (GlobalMemoryStatusEx(ref ms))
        {
-            Memory = (ulong)(ms.ullTotalPhys / 1024.0);
-            AvailableMemory = (ulong)(ms.ullAvailPhys / 1024.0);
+            Memory = ms.ullTotalPhys / 1024 / 1024;
+            AvailableMemory = ms.ullAvailPhys / 1024 / 1024;
        }

        GetSystemTimes(out var idleTime, out var kernelTime, out var userTime);
@@ -675,28 +806,87 @@ public class MachineInfo : IExtend
 #endif
    }

+
+    /// <summary>
+    /// 🐳 容器内存使用
+    /// </summary>
+    /// <returns></returns>
+    private static (ulong Total, ulong Used) GetCGroupMemoryUsage()
+    {
+        try
+        {
+
+            string[] limitPaths = {
+            "/sys/fs/cgroup/memory/memory.limit_in_bytes", // cgroup v1
+            "/sys/fs/cgroup/memory.max"                    // cgroup v2
+        };
+
+            string[] usagePaths = {
+            "/sys/fs/cgroup/memory/memory.usage_in_bytes",  // cgroup v1
+            "/sys/fs/cgroup/memory.current"                 // cgroup v2
+        };
+
+            ulong total = ReadFirstAvailable(limitPaths);
+            ulong used = ReadFirstAvailable(usagePaths);
+
+            // 容器无内存限制时 total 通常是 2^63-1，忽略
+            if (total > (1UL << 60)) total = 0;
+
+            return (total, used);
+
+
+        }
+        catch (Exception)
+        {
+            return (0, 0);
+        }
+        static ulong ReadFirstAvailable(string[] paths)
+        {
+            foreach (var path in paths)
+            {
+                if (File.Exists(path))
+                {
+                    var content = File.ReadAllText(path).Trim();
+                    if (content == "max") return ulong.MaxValue;
+                    if (ulong.TryParse(content, out var value)) return value;
+                }
+            }
+            return 0;
+        }
+
+    }
+
    private void RefreshLinux()
    {
-        var dic = ReadInfo("/proc/meminfo");
-        if (dic != null)
+        var (totalMemory, usedMemory) = GetCGroupMemoryUsage();
+        if (totalMemory > 0 && usedMemory > 0 && totalMemory < ulong.MaxValue / 2)
        {
-            if (dic.TryGetValue("MemTotal", out var str) && !str.IsNullOrEmpty())
-                Memory = (UInt64)str.TrimEnd(" kB").ToLong();
-
-            ulong ma = 0;
-            if (dic.TryGetValue("MemAvailable", out str) && !str.IsNullOrEmpty())
+            Memory = totalMemory / 1024 / 1024;
+            AvailableMemory = (totalMemory - usedMemory) / 1024 / 1024;
+        }
+        else
+        {
+            var dic = ReadInfo("/proc/meminfo");
+            if (dic != null)
            {
-                ma = (UInt64)(str.TrimEnd(" kB").ToLong());
+                if (dic.TryGetValue("MemTotal", out var str) && !str.IsNullOrEmpty())
+                    Memory = (UInt64)str.TrimEnd(" kB").ToLong();
+
+                ulong ma = 0;
+                if (dic.TryGetValue("MemAvailable", out str) && !str.IsNullOrEmpty())
+                {
+                    ma = (UInt64)(str.TrimEnd(" kB").ToLong() / 1024);
+                }
+
+                //低于3.14内核的版本用 free+cache
+                var mf = (UInt64)(dic["MemFree"]?.TrimEnd(" kB").ToLong() / 1024 ?? 0);
+                var mc = (UInt64)(dic["Cached"]?.TrimEnd(" kB").ToLong() / 1024 ?? 0);
+                var bf = (UInt64)(dic["Buffers"]?.TrimEnd(" kB").ToLong() / 1024 ?? 0);
+
+                var free = mf + mc + bf;
+
+                AvailableMemory = ma > free ? ma : free;
            }
-
-            //低于3.14内核的版本用 free+cache
-            var mf = (UInt64)(dic["MemFree"]?.TrimEnd(" kB").ToLong() ?? 0);
-            var mc = (UInt64)(dic["Cached"]?.TrimEnd(" kB").ToLong() ?? 0);
-            var bf = (UInt64)(dic["Buffers"]?.TrimEnd(" kB").ToLong() ?? 0);
-
-            var free = mf + mc + bf;
-
-            AvailableMemory = ma > free ? ma : free;
        }

        // A2/A4温度获取，Buildroot，CPU温度和主板温度
--- a/src/Admin/ThingsGateway.NewLife.X/Common/Runtime.cs
+++ b/src/Admin/ThingsGateway.NewLife.X/Common/Runtime.cs
@@ -180,6 +180,12 @@ public static class Runtime
    #endregion

    #region 扩展
+
+    public static Int64 AppStartTick = TickCount64;
+
+    /// <summary>软件启动以来的毫秒数</summary>
+    public static Int64 AppTickCount64 => TickCount64-AppStartTick;
+
 #if NETCOREAPP3_1_OR_GREATER
    /// <summary>系统启动以来的毫秒数</summary>
    public static Int64 TickCount64 => Environment.TickCount64;
@@ -196,6 +202,8 @@ public static class Runtime
    }
 #endif

+
+
    /// <summary>获取当前UTC时间。基于全局时间提供者，在星尘应用中会屏蔽服务器时间差</summary>
    /// <returns></returns>
    public static DateTimeOffset UtcNow => TimerScheduler.GlobalTimeProvider.GetUtcNow();
@@ -248,7 +256,7 @@ public static class Runtime

        return dic;
    }
-    #endregion
+#endregion

    #region 设置
    private static Boolean? _createConfigOnMissing;
--- a/src/Admin/ThingsGateway.NewLife.X/Common/WaitLock.cs
+++ b/src/Admin/ThingsGateway.NewLife.X/Common/WaitLock.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using ThingsGateway.NewLife.Collections;
-
 namespace ThingsGateway.NewLife;

 /// <summary>
--- a/src/Admin/ThingsGateway.NewLife.X/Logger/TextFileLog.cs
+++ b/src/Admin/ThingsGateway.NewLife.X/Logger/TextFileLog.cs
@@ -61,7 +61,8 @@ public class TextFileLog : Logger, IDisposable
        MaxBytes = set.LogFileMaxBytes;
        Backups = set.LogFileBackups;

-        _Timer = new TimerX(DoWriteAndClose, null, 0_000, 5_000) { Async = true };
+        _Timer = new TimerX(DoWriteAndClose, null, 0_000, 60_000, nameof(TextFileLog)) { Async = true };
+        _WriteTimer = new TimerX(DoWrite, null, 0_000, 1000, nameof(TextFileLog)) { Async = true };
    }

    private static readonly NonBlockingDictionary<String, TextFileLog> cache = new(StringComparer.OrdinalIgnoreCase);
@@ -96,6 +97,7 @@ public class TextFileLog : Logger, IDisposable
    protected virtual void Dispose(Boolean disposing)
    {
        _Timer.TryDispose();
+        _WriteTimer.TryDispose();

        // 销毁前把队列日志输出
        if (Interlocked.CompareExchange(ref _writing, 1, 0) == 0) WriteAndClose(DateTime.MinValue);
@@ -147,35 +149,72 @@ public class TextFileLog : Logger, IDisposable

    /// <summary>获取日志文件路径</summary>
    /// <returns></returns>
-    private String? GetLogFile()
+    private string? GetLogFile()
    {
        // 单日志文件
        if (_isFile) return LogPath.GetBasePath();
-
+        Directory.CreateDirectory(LogPath);
        // 目录多日志文件
-        var logfile = LogPath.CombinePath(String.Format(FileFormat, TimerX.Now.AddHours(Setting.Current.UtcIntervalHours), Level)).GetBasePath();
+        var baseFile = LogPath.CombinePath(
+            string.Format(FileFormat, TimerX.Now.AddHours(Setting.Current.UtcIntervalHours), Level)
+        ).GetBasePath();

-        // 是否限制文件大小
-        if (MaxBytes == 0) return logfile;
+        // 不限制大小
+        if (MaxBytes == 0) return baseFile;

-        // 找到今天第一个未达到最大上限的文件
        var max = MaxBytes * 1024L * 1024L;
-        var ext = Path.GetExtension(logfile);
-        var name = logfile.TrimEnd(ext);
+        var ext = Path.GetExtension(FileFormat);
+
+        string? latestFile = null;
+        DateTime latestTime = DateTime.MinValue;
+
+        foreach (var path in Directory.EnumerateFiles(LogPath, $"*{ext}", SearchOption.TopDirectoryOnly))
+        {
+            try
+            {
+                var lastWrite = File.GetLastWriteTimeUtc(path);
+                if (lastWrite > latestTime)
+                {
+                    latestTime = lastWrite;
+                    latestFile = path;
+                }
+            }
+            catch { }
+        }
+
+        if (latestFile != null)
+        {
+            try
+            {
+                var len = new FileInfo(latestFile).Length;
+                if (len < max)
+                    return latestFile;
+            }
+            catch { }
+        }
+
+        var fileNameWithoutExt = Path.Combine(
+            Path.GetDirectoryName(baseFile)!,
+            Path.GetFileNameWithoutExtension(baseFile)
+        );
+
+        // 依序找下一个可用文件
        for (var i = 1; i < 1024; i++)
        {
-            if (i > 1) logfile = $"{name}_{i}{ext}";
+            var nextFile = i == 1 ? $"{fileNameWithoutExt}{ext}" : $"{fileNameWithoutExt}_{i}{ext}";
+            if (!File.Exists(nextFile))
+                return nextFile;

-            var fi = logfile.AsFile();
-            if (!fi.Exists || fi.Length < max) return logfile;
        }

        return null;
    }
+
    #endregion

    #region 异步写日志
    private readonly TimerX? _Timer;
+    private readonly TimerX? _WriteTimer;
    private readonly ConcurrentQueue<String> _Logs = new();
    private volatile Int32 _logCount;
    private Int32 _writing;
@@ -186,9 +225,9 @@ public class TextFileLog : Logger, IDisposable
    {
        var writer = LogWriter;

-        var now = TimerX.Now.AddHours(Setting.Current.UtcIntervalHours);
        var logFile = GetLogFile();
        if (logFile.IsNullOrEmpty()) return;
+        var now = TimerX.Now.AddHours(Setting.Current.UtcIntervalHours);

        if (!_isFile && logFile != CurrentLogFile)
        {
@@ -223,7 +262,10 @@ public class TextFileLog : Logger, IDisposable
        // 连续5秒没日志，就关闭
        _NextClose = now.AddSeconds(5);
    }
-
+    private void DoWrite(Object? state)
+    {
+        WriteLog();
+    }
    /// <summary>关闭文件</summary>
    private void DoWriteAndClose(Object? state)
    {
@@ -237,43 +279,36 @@ public class TextFileLog : Logger, IDisposable
            DirectoryInfo? di = new DirectoryInfo(LogPath);
            if (di.Exists)
            {
-                // 删除*.del
+                // 删除 *.del
                try
                {
-                    var dels = di.GetFiles("*.del");
-                    if (dels?.Length > 0)
+                    foreach (var item in di.EnumerateFiles("*.del"))
                    {
-                        foreach (var item in dels)
-                        {
-                            item.Delete();
-                        }
+                        item.Delete();
                    }
                }
                catch { }

                var ext = Path.GetExtension(FileFormat);
-                var fis = di.GetFiles("*" + ext);
-                if (fis != null && fis.Length > Backups)
+                var fis = di.EnumerateFiles($"*{ext}")
+                           .OrderByDescending(e => e.LastWriteTimeUtc)
+                           .Skip(Backups);
+
+                foreach (var item in fis)
                {
-                    // 删除最旧的文件
-                    var retain = fis.Length - Backups;
-                    fis = fis.OrderBy(e => e.LastWriteTimeUtc).Take(retain).ToArray();
-                    foreach (var item in fis)
+                    OnWrite(LogLevel.Info, "The log file has reached the maximum limit of {0}, delete {1}, size {2: n0} Byte", Backups, item.Name, item.Length);
+                    try
+                    {
+                        item.Delete();
+                    }
+                    catch
                    {
-                        OnWrite(LogLevel.Info, "The log file has reached the maximum limit of {0}, delete {1}, size {2: n0} Byte", Backups, item.Name, item.Length);
                        try
                        {
-                            item.Delete();
+                            item.MoveTo(item.FullName + ".del");
                        }
                        catch
                        {
-                            try
-                            {
-                                item.MoveTo(item.FullName + ".del");
-                            }
-                            catch
-                            {
-                            }
                        }
                    }
                }
@@ -323,7 +358,6 @@ public class TextFileLog : Logger, IDisposable
        // 推入队列
        Enqueue($"{e.GetAndReset()}");

-        WriteLog();
    }

    protected bool Check()
@@ -340,35 +374,17 @@ public class TextFileLog : Logger, IDisposable
    }
    protected void WriteLog()
    {
-        // 异步写日志，实时。即使这里错误，定时器那边仍然会补上
+        // 写日志，实时。即使这里错误，定时器那边仍然会补上
        if (Interlocked.CompareExchange(ref _writing, 1, 0) == 0)
        {
            // 调试级别 或 致命错误 同步写日志
-            if (Setting.Current.LogLevel <= LogLevel.Debug || Level >= LogLevel.Error)
+            try
            {
-                try
-                {
-                    WriteFile();
-                }
-                finally
-                {
-                    _writing = 0;
-                }
+                if (!_Logs.IsEmpty) WriteFile();
            }
-            else
+            finally
            {
-                ThreadPool.UnsafeQueueUserWorkItem(s =>
-                {
-                    try
-                    {
-                        WriteFile();
-                    }
-                    catch { }
-                    finally
-                    {
-                        _writing = 0;
-                    }
-                }, null);
+                _writing = 0;
            }
        }
    }
--- a/src/Admin/ThingsGateway.NewLife.X/Logger/XTrace.cs
+++ b/src/Admin/ThingsGateway.NewLife.X/Logger/XTrace.cs
@@ -80,13 +80,21 @@ public static class XTrace

        Log.Error("{0}", ex);
    }
+    public static void WriteException(Exception ex, string message)
+    {
+        if (!InitLog()) return;

+        WriteVersion();
+
+        Log.Error("{0}, {1}", message, ex);
+    }
    #endregion 写日志

    #region 构造

    static XTrace()
    {
+        _ = Runtime.AppTickCount64;
        AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
        TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
        AppDomain.CurrentDomain.ProcessExit += OnProcessExit;
--- a/src/Admin/ThingsGateway.NewLife.X/PooledAwait/PoolT.cs
+++ b/src/Admin/ThingsGateway.NewLife.X/PooledAwait/PoolT.cs
@@ -12,18 +12,13 @@ namespace PooledAwait
    {
        private static ObjectPoolLock<T> pool = new();

-        [ThreadStatic]
-        private static T? ts_local;
-
        /// <summary>
        /// Gets an instance from the pool if possible
        /// </summary>
        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public static T? TryGet()
        {
-            var tmp = ts_local;
-            ts_local = null;
-            return tmp ?? pool.Get();
+            return pool.Get();
        }

        /// <summary>
@@ -34,11 +29,6 @@ namespace PooledAwait
        {
            if (value != null)
            {
-                if (ts_local == null)
-                {
-                    ts_local = value;
-                    return;
-                }
                pool.Return(value);
            }
        }
--- a/src/Admin/ThingsGateway.NewLife.X/Threading/TimerScheduler.cs
+++ b/src/Admin/ThingsGateway.NewLife.X/Threading/TimerScheduler.cs
@@ -65,8 +65,21 @@ public class TimerScheduler : IDisposable, ILogFeature
    public static TimeProvider GlobalTimeProvider { get; set; } = TimeProvider.System;
    #endregion
    #region 构造
-    private TimerScheduler(String name) => Name = name;
-
+    private TimerScheduler(String name)
+    {
+        Name = name;
+        _processCallback = state =>
+        {
+            try
+            {
+                Execute(state);
+            }
+            catch (Exception ex)
+            {
+                XTrace.WriteException(ex, "Timer执行错误");
+            }
+        };
+    }
    /// <summary>销毁</summary>
    public void Dispose()
    {
@@ -258,17 +271,7 @@ public class TimerScheduler : IDisposable, ILogFeature
                        else
                            //Task.Factory.StartNew(() => ProcessItem(timer));
                            // 不需要上下文流动，捕获所有异常
-                            ThreadPool.UnsafeQueueUserWorkItem(s =>
-                            {
-                                try
-                                {
-                                    Execute(s);
-                                }
-                                catch (Exception ex)
-                                {
-                                    XTrace.WriteException(ex);
-                                }
-                            }, timer);
+                            ThreadPool.UnsafeQueueUserWorkItem(_processCallback, timer);
                    }
                }
            }
@@ -283,7 +286,7 @@ public class TimerScheduler : IDisposable, ILogFeature

        WriteLog("调度线程已退出：{0}", Name);
    }
-
+    private readonly WaitCallback _processCallback;
    /// <summary>检查定时器是否到期</summary>
    /// <param name="timer"></param>
    /// <param name="now"></param>
@@ -325,9 +328,9 @@ public class TimerScheduler : IDisposable, ILogFeature

        timer.hasSetNext = false;

-        string tracerName = timer.TracerName ?? "timer:ExecuteAsync";
-        string timerArg = timer.Timers.ToString();
-        using var span = timer.Tracer?.NewSpan(tracerName, timerArg);
+        //string tracerName = timer.TracerName ?? "timer:ExecuteAsync";
+        //string timerArg = timer.Timers.ToString();
+        //using var span = timer.Tracer?.NewSpan(tracerName, timerArg);
        var sw = ValueStopwatch.StartNew();
        try
        {
@@ -351,7 +354,7 @@ public class TimerScheduler : IDisposable, ILogFeature
        // 如果用户代码没有拦截错误，则这里拦截，避免出错了都不知道怎么回事
        catch (Exception ex)
        {
-            span?.SetError(ex, null);
+            //span?.SetError(ex, null);
            XTrace.WriteException(ex);
        }
        finally
@@ -377,9 +380,9 @@ public class TimerScheduler : IDisposable, ILogFeature

            timer.hasSetNext = false;

-            string tracerName = timer.TracerName ?? "timer:ExecuteAsync";
-            string timerArg = timer.Timers.ToString();
-            using var span = timer.Tracer?.NewSpan(tracerName, timerArg);
+            //string tracerName = timer.TracerName ?? "timer:ExecuteAsync";
+            //string timerArg = timer.Timers.ToString();
+            //using var span = timer.Tracer?.NewSpan(tracerName, timerArg);
            var sw = ValueStopwatch.StartNew();
            try
            {
@@ -427,7 +430,7 @@ public class TimerScheduler : IDisposable, ILogFeature
            // 如果用户代码没有拦截错误，则这里拦截，避免出错了都不知道怎么回事
            catch (Exception ex)
            {
-                span?.SetError(ex, null);
+                //span?.SetError(ex, null);
                XTrace.WriteException(ex);
            }
            finally
--- a/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj
+++ b/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj
@@ -37,7 +37,7 @@
 		<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.2" />
 		<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
 		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-		<PackageReference Include="System.Formats.Asn1" Version="8.0.2" />
+		<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
 	</ItemGroup>

 </Project>
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>

 	<PropertyGroup>
-		<PluginVersion>10.11.116</PluginVersion>
-		<ProPluginVersion>10.11.116</ProPluginVersion>
-		<DefaultVersion>10.11.116</DefaultVersion>
+		<PluginVersion>10.12.7</PluginVersion>
+		<ProPluginVersion>10.12.7</ProPluginVersion>
+		<DefaultVersion>10.12.7</DefaultVersion>
 		<AuthenticationVersion>10.11.6</AuthenticationVersion>
 		<SourceGeneratorVersion>10.11.6</SourceGeneratorVersion>
 		<NET8Version>8.0.21</NET8Version>
--- a/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor
+++ b/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor
@@ -10,53 +10,53 @@
 <div class="w-100" style=@($"height:{HeightString}")>

    <Card HeaderText=@HeaderText class=@("w-100 h-100")>
-    <HeaderTemplate>
-        <div class="flex-fill">
-        </div>
+        <HeaderTemplate>
+            <div class="flex-fill">
+            </div>

-        @if (LogLevelChanged.HasDelegate)
-        {
-            <Select Value="@LogLevel" ValueChanged="LogLevelChanged" IsPopover></Select>
-        }
-        <Tooltip class=" col-auto" Title="@RazorLocalizer[Pause?"Play":"Pause"]" Placement="Placement.Bottom">
+            @if (LogLevelChanged.HasDelegate)
+            {
+                <Select Value="@LogLevel" ValueChanged="LogLevelChanged" IsPopover></Select>
+            }
+            <Tooltip class=" col-auto" Title=@(Pause? PlayText:PauseText) Placement="Placement.Bottom">

-            <Button Color="Color.None" style="color: var(--bs-card-title-color);" Icon=@(Pause?"fa fa-play":"fa fa-pause") OnClick="OnPause" />
+                <Button Color="Color.None" style="color: var(--bs-card-title-color);" Icon=@(Pause ? "fa fa-play" : "fa fa-pause") OnClick="OnPause" />

-        </Tooltip>
+            </Tooltip>

-        <Tooltip class=" col-auto" Title="@RazorLocalizer["Export"]" Placement="Placement.Bottom">
+            <Tooltip class=" col-auto" Title="@ExportText" Placement="Placement.Bottom">

-            <Button IsAsync Color="Color.None" style="color: var(--bs-card-title-color);" Icon=@("fa fa-sign-out") OnClick="HandleOnExportClick" />
+                <Button IsAsync Color="Color.None" style="color: var(--bs-card-title-color);" Icon=@("fa fa-sign-out") OnClick="HandleOnExportClick" />

-        </Tooltip>
+            </Tooltip>

-        <Tooltip class=" col-auto" Title="@RazorLocalizer["Delete"]" Placement="Placement.Bottom">
+            <Tooltip class=" col-auto" Title="@DeleteText" Placement="Placement.Bottom">

-            <Button IsAsync Color="Color.None" style="color: var(--bs-card-title-color);" Icon=@("far fa-trash-alt") OnClick="Delete" />
+                <Button IsAsync Color="Color.None" style="color: var(--bs-card-title-color);" Icon=@("far fa-trash-alt") OnClick="Delete" />

-        </Tooltip>
+            </Tooltip>


-    </HeaderTemplate>
-    <BodyTemplate>
-                <div style=@($"height:calc(100% - 50px);overflow-y:scroll;flex-fill;")>
-            <Virtualize Items="CurrentMessages??new  List<LogMessage>()" Context="itemMessage" ItemSize="60" OverscanCount=2>
-                <ItemContent>
-                    @*       <Tooltip Placement="Placement.Bottom" Title=@itemMessage.Message.Substring(0, Math.Min(itemMessage.Message.Length, 500))> *@
-                    <div class=@(itemMessage.Level<(byte)Microsoft.Extensions.Logging.LogLevel.Information?"":
-                         itemMessage.Level>=(byte)Microsoft.Extensions.Logging.LogLevel.Warning? " red--text text-truncate":"green--text text-truncate")
-                         title=@itemMessage.Message.Substring(0, Math.Min(itemMessage.Message.Length, 500))>
+        </HeaderTemplate>
+        <BodyTemplate>
+            <div style=@($"height:calc(100% - 50px);overflow-y:scroll;flex-fill;")>
+                <Virtualize Items="CurrentMessages ?? new List<LogMessage>()" Context="itemMessage" ItemSize="60" OverscanCount=2>
+                    <ItemContent>
+                        @*       <Tooltip Placement="Placement.Bottom" Title=@itemMessage.Message.Substring(0, Math.Min(itemMessage.Message.Length, 500))> *@
+                        <div class=@(itemMessage.Level<(byte)Microsoft.Extensions.Logging.LogLevel.Information?"":
+                                                          itemMessage.Level >= (byte)Microsoft.Extensions.Logging.LogLevel.Warning ? " red--text text-truncate" : "green--text text-truncate")
+                             title=@itemMessage.Message.Substring(0, Math.Min(itemMessage.Message.Length, 500))>

-                        @itemMessage.Message.Substring(0, Math.Min(itemMessage.Message.Length, 150))
+                            @itemMessage.Message.Substring(0, Math.Min(itemMessage.Message.Length, 150))

-                    </div>
-                    @* </Tooltip> *@
-                </ItemContent>
-            </Virtualize>
-        </div>
+                        </div>
+                        @* </Tooltip> *@
+                    </ItemContent>
+                </Virtualize>
+            </div>

-    </BodyTemplate>
-</Card>
+        </BodyTemplate>
+    </Card>


 </div>
--- a/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor.cs
+++ b/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor.cs
@@ -10,12 +10,11 @@

 using Microsoft.AspNetCore.Components.Web;

-using System.Diagnostics;
 using System.Text.RegularExpressions;

 using ThingsGateway.Extension;
 using ThingsGateway.Foundation;
-using ThingsGateway.NewLife;
+using ThingsGateway.NewLife.Threading;

 using TouchSocket.Core;

@@ -23,6 +22,24 @@ namespace ThingsGateway.Debug;

 public partial class LogConsole : IDisposable
 {
+
+    private string PlayText { get; set; }
+    private string PauseText { get; set; }
+    private string ExportText { get; set; }
+    private string DeleteText { get; set; }
+
+    protected override void OnInitialized()
+    {
+        PlayText = RazorLocalizer["Play"];
+        PauseText = RazorLocalizer["Pause"];
+        ExportText = RazorLocalizer["Export"];
+        DeleteText = RazorLocalizer["Delete"];
+
+        _Timer = new TimerX(RunTimerAsync, null, 1_000, 1_000, nameof(LogConsole)) { Async = true };
+        base.OnInitialized();
+    }
+    private TimerX _Timer;
+
    private bool Pause;

    public bool Disposed { get; set; }
@@ -69,7 +86,7 @@ public partial class LogConsole : IDisposable
        {
            logPath = LogPath;
            Messages = new List<LogMessage>();
-            await ExecuteAsync();
+            _Timer?.SetNext(0);
        }

        await base.OnParametersSetAsync();
@@ -82,63 +99,38 @@ public partial class LogConsole : IDisposable
    public void Dispose()
    {
        Disposed = true;
+        _Timer?.SafeDispose();
        GC.SuppressFinalize(this);
    }
-    private WaitLock WaitLock = new(nameof(LogConsole));
-    protected async Task ExecuteAsync()
+    protected async ValueTask ExecuteAsync()
    {
-        if (WaitLock.Waited) return;
-        try
-        {
-            await WaitLock.WaitAsync();
-            await Task.Delay(1000);

-            if (LogPath != null)
+        if (LogPath != null)
+        {
+            var files = await TextFileReadService.GetLogFilesAsync(LogPath);
+            if (!files.IsSuccess)
            {
-                var files = await TextFileReadService.GetLogFilesAsync(LogPath);
-                if (!files.IsSuccess)
+                Messages = new List<LogMessage>();
+                await Task.Delay(1000);
+            }
+            else
+            {
+
+                var result = await TextFileReadService.LastLogDataAsync(files.Content.FirstOrDefault());
+                if (result.IsSuccess)
                {
-                    Messages = new List<LogMessage>();
-                    await Task.Delay(1000);
+                    Messages = result.Content.Where(a => a.LogLevel >= LogLevel).Select(a => new LogMessage((int)a.LogLevel, $"{a.LogTime} - {a.Message}{(a.ExceptionString.IsNullOrWhiteSpace() ? null : $"{Environment.NewLine}{a.ExceptionString}")}")).ToArray();
                }
                else
                {
-                    await Task.Run(async () =>
-                    {
-                        Stopwatch sw = Stopwatch.StartNew();
-                        var result = await TextFileReadService.LastLogDataAsync(files.Content.FirstOrDefault());
-                        if (result.IsSuccess)
-                        {
-                            Messages = result.Content.Where(a => a.LogLevel >= LogLevel).Select(a => new LogMessage((int)a.LogLevel, $"{a.LogTime} - {a.Message}{(a.ExceptionString.IsNullOrWhiteSpace() ? null : $"{Environment.NewLine}{a.ExceptionString}")}")).ToList();
-                        }
-                        else
-                        {
-                            Messages = new List<LogMessage>();
-                        }
-                        sw.Stop();
-                        if (sw.ElapsedMilliseconds > 500)
-                        {
-                            await Task.Delay(1000);
-                        }
-                    });
+                    Messages = Array.Empty<LogMessage>();
                }
+
            }
        }
-        catch (Exception ex)
-        {
-            NewLife.Log.XTrace.WriteException(ex);
-        }
-        finally
-        {
-            WaitLock.Release();
-        }
+
    }

-    protected override void OnInitialized()
-    {
-        _ = RunTimerAsync();
-        base.OnInitialized();
-    }

    private async Task Delete()
    {
@@ -185,19 +177,9 @@ public partial class LogConsole : IDisposable
        return Task.CompletedTask;
    }

-    private async Task RunTimerAsync()
+    private async Task RunTimerAsync(object? state)
    {
-        while (!Disposed)
-        {
-            try
-            {
-                await ExecuteAsync();
-                await InvokeAsync(StateHasChanged);
-            }
-            catch (Exception ex)
-            {
-                NewLife.Log.XTrace.WriteException(ex);
-            }
-        }
+        await ExecuteAsync();
+        await InvokeAsync(StateHasChanged);
    }
 }
--- a/src/Foundation/ThingsGateway.Foundation/Channel/Extension/ChannelOptionsExtensions.cs
+++ b/src/Foundation/ThingsGateway.Foundation/Channel/Extension/ChannelOptionsExtensions.cs
@@ -8,6 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

+using PooledAwait;
+
 using ThingsGateway.Foundation.Extension.String;

 using TouchSocket.SerialPorts;
@@ -26,65 +28,33 @@ public static class ChannelOptionsExtensions
    /// <param name="e">接收数据</param>
    /// <param name="funcs">事件</param>
    /// <returns></returns>
-    internal static ValueTask OnChannelReceivedEvent(
-    this IClientChannel clientChannel,
-    ReceivedDataEventArgs e,
-    ChannelReceivedEventHandler funcs)
+    internal static ValueTask OnChannelReceivedEvent(this IClientChannel clientChannel, ReceivedDataEventArgs e, ChannelReceivedEventHandler funcs)
    {
        clientChannel.ThrowIfNull(nameof(IClientChannel));
        e.ThrowIfNull(nameof(ReceivedDataEventArgs));
        funcs.ThrowIfNull(nameof(ChannelReceivedEventHandler));

-        if (funcs.Count == 0) return EasyValueTask.CompletedTask;
+        return OnChannelReceivedEvent(clientChannel, e, funcs);

-        return InvokeHandlersSequentially(clientChannel, e, funcs);
-    }
-
-    private static ValueTask InvokeHandlersSequentially(
-        IClientChannel clientChannel, ReceivedDataEventArgs e, ChannelReceivedEventHandler funcs)
-    {
-        var enumerator = new HandlerEnumerator(clientChannel, e, funcs);
-        return enumerator.MoveNextAsync();
-    }
-
-    private struct HandlerEnumerator
-    {
-        private readonly IClientChannel _channel;
-        private readonly ReceivedDataEventArgs _e;
-        private readonly ChannelReceivedEventHandler _funcs;
-        private int _index;
-
-        public HandlerEnumerator(IClientChannel channel, ReceivedDataEventArgs e, ChannelReceivedEventHandler funcs)
+        static async PooledValueTask OnChannelReceivedEvent(IClientChannel clientChannel, ReceivedDataEventArgs e, ChannelReceivedEventHandler funcs)
        {
-            _channel = channel;
-            _e = e;
-            _funcs = funcs;
-            _index = -1;
-        }
-
-        public ValueTask MoveNextAsync()
-        {
-            _index++;
-            if (_index >= _funcs.Count) return default;
-
-            var func = _funcs[_index];
-            if (func == null) return MoveNextAsync();
-
-            bool isLast = _index == _funcs.Count - 1;
-            var vt = func.Invoke(_channel, _e, isLast);
-            if (vt.IsCompletedSuccessfully)
+            if (funcs.Count > 0)
            {
-                if (_e.Handled) return default;
-                return MoveNextAsync();
+                for (int i = 0; i < funcs.Count; i++)
+                {
+                    var func = funcs[i];
+                    if (func == null) continue;
+                    var taskResult = func.Invoke(clientChannel, e, i == funcs.Count - 1);
+                    if (!taskResult.IsCompletedSuccessfully)
+                    {
+                        await taskResult.ConfigureAwait(false);
+                    }
+                    if (e.Handled)
+                    {
+                        break;
+                    }
+                }
            }
-            return Awaited(vt);
-        }
-
-        private async ValueTask Awaited(ValueTask vt)
-        {
-            await vt.ConfigureAwait(false);
-            if (!_e.Handled)
-                await MoveNextAsync().ConfigureAwait(false);
        }
    }

--- a/src/Foundation/ThingsGateway.Foundation/Logger/TextFileLogger.cs
+++ b/src/Foundation/ThingsGateway.Foundation/Logger/TextFileLogger.cs
@@ -128,7 +128,6 @@ public class TextFileLogger : ThingsGateway.NewLife.Log.TextFileLog, TouchSocket
        // 推入队列
        Enqueue(stringBuilder.ToString());

-        WriteLog();
    }

    /// <inheritdoc/>
--- a/src/Foundation/ThingsGateway.Foundation/OperResult/OperResult.cs
+++ b/src/Foundation/ThingsGateway.Foundation/OperResult/OperResult.cs
@@ -43,6 +43,16 @@ public struct OperResult<T> : IOperResult<T>
        Exception = operResult.Exception;
        ErrorType = operResult.ErrorType;
    }
+    /// <summary>
+    /// 从另一个操作对象中赋值信息
+    /// </summary>
+    public OperResult(OperResult operResult)
+    {
+        OperCode = operResult.OperCode;
+        ErrorMessage = operResult.ErrorMessage;
+        Exception = operResult.Exception;
+        ErrorType = operResult.ErrorType;
+    }

    /// <summary>
    /// 传入错误信息
@@ -129,8 +139,15 @@ public struct OperResult<T> : IOperResult<T>
    /// <param name="operResult"></param>
    public static implicit operator OperResult(OperResult<T> operResult)
    {
-        return new OperResult(operResult);
+        return new OperResult
+        {
+            OperCode = operResult.OperCode,
+            ErrorMessage = operResult.ErrorMessage,
+            Exception = operResult.Exception,
+            ErrorType = operResult.ErrorType
+        };
    }
+
 }

 /// <inheritdoc/>
@@ -162,7 +179,13 @@ public struct OperResult<T, T2> : IOperResult<T, T2>
        Exception = operResult.Exception;
        ErrorType = operResult.ErrorType;
    }
-
+    public OperResult(OperResult operResult)
+    {
+        OperCode = operResult.OperCode;
+        ErrorMessage = operResult.ErrorMessage;
+        Exception = operResult.Exception;
+        ErrorType = operResult.ErrorType;
+    }
    /// <summary>
    /// 传入错误信息
    /// </summary>
@@ -275,7 +298,13 @@ public struct OperResult<T, T2, T3> : IOperResult<T, T2, T3>
        Exception = operResult.Exception;
        ErrorType = operResult.ErrorType;
    }
-
+    public OperResult(OperResult operResult)
+    {
+        OperCode = operResult.OperCode;
+        ErrorMessage = operResult.ErrorMessage;
+        Exception = operResult.Exception;
+        ErrorType = operResult.ErrorType;
+    }
    /// <summary>
    /// 传入错误信息
    /// </summary>
@@ -389,7 +418,13 @@ public struct OperResult : IOperResult
        Exception = operResult.Exception;
        ErrorType = operResult.ErrorType;
    }
-
+    public OperResult(OperResult operResult)
+    {
+        OperCode = operResult.OperCode;
+        ErrorMessage = operResult.ErrorMessage;
+        Exception = operResult.Exception;
+        ErrorType = operResult.ErrorType;
+    }
    /// <summary>
    /// 传入错误信息
    /// </summary>
--- a/src/Gateway/ThingsGateway.Gateway.Application/Controller/ControlController.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Controller/ControlController.cs
@@ -15,7 +15,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;

 using System.ComponentModel;
-using ThingsGateway.NewLife.DictionaryExtensions;

 using ThingsGateway.FriendlyException;

--- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectBase.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectBase.cs
@@ -380,7 +380,7 @@ public abstract partial class CollectBase : DriverBase
            if (cancellationToken.IsCancellationRequested) return;
            CancellationToken readToken = default;
            var readerLockTask = @this.ReadWriteLock.ReaderLockAsync(cancellationToken);
-            if (!readerLockTask.IsCompleted)
+            if (!readerLockTask.IsCompletedSuccessfully)
            {
                readToken = await readerLockTask.ConfigureAwait(false);
            }
@@ -403,7 +403,7 @@ public abstract partial class CollectBase : DriverBase

            OperResult<ReadOnlyMemory<byte>> readResult = default;
            var readTask = @this.ReadSourceAsync(variableSourceRead, allToken);
-            if (!readTask.IsCompleted)
+            if (!readTask.IsCompletedSuccessfully)
            {
                readResult = await readTask.ConfigureAwait(false);
            }
@@ -435,7 +435,7 @@ public abstract partial class CollectBase : DriverBase
                //if (LogMessage?.LogLevel <= TouchSocket.Core.LogLevel.Trace)
                //    LogMessage?.Trace(string.Format("{0} - Collecting [{1} - {2}]", DeviceName, variableSourceRead?.RegisterAddress, variableSourceRead?.Length));
                var readTask1 = @this.ReadSourceAsync(variableSourceRead, allToken);
-                if (!readTask1.IsCompleted)
+                if (!readTask1.IsCompletedSuccessfully)
                {
                    readResult = await readTask1.ConfigureAwait(false);
                }
@@ -490,195 +490,6 @@ public abstract partial class CollectBase : DriverBase
        }
    }

-
-    //    private ValueTask ReadVariableSource(object? state, CancellationToken cancellationToken)
-    //    {
-    //        var enumerator = new ReadVariableSourceEnumerator(this, state, cancellationToken);
-    //        return enumerator.MoveNextAsync();
-    //    }
-
-    //    private struct ReadVariableSourceEnumerator
-    //    {
-    //        private readonly CollectBase _owner;
-    //        private readonly object? _state;
-    //        private readonly CancellationToken _cancellationToken;
-
-    //        private VariableSourceRead _variableSourceRead;
-    //        private CancellationToken _readToken;
-    //        private CancellationToken _allToken;
-    //        private OperResult<ReadOnlyMemory<byte>> _readResult;
-    //        private int _readErrorCount;
-    //        private ValueTask<CancellationToken> _readerLockTask;
-    //        private ValueTask<OperResult<ReadOnlyMemory<byte>>> _readTask;
-    //        private int _step;
-
-    //        public ReadVariableSourceEnumerator(CollectBase owner, object? state, CancellationToken cancellationToken)
-    //        {
-    //            _owner = owner;
-    //            _state = state;
-    //            _cancellationToken = cancellationToken;
-
-    //            _variableSourceRead = default!;
-    //            _readToken = default;
-    //            _allToken = default;
-    //            _readResult = default;
-    //            _readErrorCount = 0;
-    //            _readerLockTask = default;
-    //            _readTask = default;
-    //            _step = 0;
-    //        }
-
-    //        public ValueTask MoveNextAsync()
-    //        {
-    //            switch (_step)
-    //            {
-    //                case 0:
-    //                    if (_state is not VariableSourceRead vsr) return default;
-    //                    _variableSourceRead = vsr;
-
-    //                    if (_owner.Pause) return default;
-    //                    if (_cancellationToken.IsCancellationRequested) return default;
-
-    //#pragma warning disable CA2012 // 正确使用 ValueTask
-    //                    _readerLockTask = _owner.ReadWriteLock.ReaderLockAsync(_cancellationToken);
-    //#pragma warning restore CA2012 // 正确使用 ValueTask
-    //                    if (!_readerLockTask.IsCompleted)
-    //                    {
-    //                        _step = 1;
-    //                        return AwaitReaderLock();
-    //                    }
-    //                    _readToken = _readerLockTask.Result;
-    //                    goto case 2;
-
-    //                case 1:
-    //                    _readToken = _readerLockTask.Result;
-    //                    goto case 2;
-
-    //                case 2:
-    //                    if (_readToken.IsCancellationRequested)
-    //                    {
-    //                        return _owner.ReadVariableSource(_state, _cancellationToken);
-    //                    }
-
-    //                    var allTokenSource = _owner._linkedCtsCache.GetLinkedTokenSource(_cancellationToken, _readToken);
-    //                    _allToken = allTokenSource.Token;
-
-    //#pragma warning disable CA2012 // 正确使用 ValueTask
-    //                    _readTask = _owner.ReadSourceAsync(_variableSourceRead, _allToken);
-    //#pragma warning restore CA2012 // 正确使用 ValueTask
-    //                    if (!_readTask.IsCompleted)
-    //                    {
-    //                        _step = 3;
-    //                        return AwaitRead();
-    //                    }
-    //                    _readResult = _readTask.Result;
-    //                    goto case 4;
-
-    //                case 3:
-    //                    _readResult = _readTask.Result;
-    //                    goto case 4;
-
-    //                case 4:
-    //                    while (!_readResult.IsSuccess && _readErrorCount < _owner.CollectProperties.RetryCount)
-    //                    {
-    //                        if (_owner.Pause) return default;
-    //                        if (_cancellationToken.IsCancellationRequested) return default;
-
-    //                        if (_readToken.IsCancellationRequested)
-    //                        {
-    //                            return _owner.ReadVariableSource(_state, _cancellationToken);
-    //                        }
-
-    //                        _readErrorCount++;
-    //                        if (_owner.LogMessage?.LogLevel <= TouchSocket.Core.LogLevel.Trace)
-    //                            _owner.LogMessage?.Trace(string.Format("{0} - Collection [{1} - {2}] failed - {3}",
-    //                                _owner.DeviceName, _variableSourceRead?.RegisterAddress, _variableSourceRead?.Length, _readResult.ErrorMessage));
-
-    //#pragma warning disable CA2012 // 正确使用 ValueTask
-    //                        _readTask = _owner.ReadSourceAsync(_variableSourceRead, _allToken);
-    //#pragma warning restore CA2012 // 正确使用 ValueTask
-    //                        if (!_readTask.IsCompleted)
-    //                        {
-    //                            _step = 5;
-    //                            return AwaitReadRetry();
-    //                        }
-    //                        _readResult = _readTask.Result;
-    //                    }
-
-    //                    goto case 6;
-
-    //                case 5:
-    //                    _readResult = _readTask.Result;
-    //                    _step = 4;
-    //                    return MoveNextAsync();
-
-    //                case 6:
-    //                    if (_readResult.IsSuccess)
-    //                    {
-    //                        if (_owner.LogMessage?.LogLevel <= TouchSocket.Core.LogLevel.Trace)
-    //                            _owner.LogMessage?.Trace(string.Format("{0} - Collection [{1} - {2}] data succeeded {3}",
-    //                                _owner.DeviceName, _variableSourceRead?.RegisterAddress, _variableSourceRead?.Length, _readResult.Content.Span.ToHexString(' ')));
-
-    //                        _owner.CurrentDevice.SetDeviceStatus(TimerX.Now, null);
-    //                    }
-    //                    else
-    //                    {
-    //                        if (_cancellationToken.IsCancellationRequested) return default;
-    //                        if (_readToken.IsCancellationRequested)
-    //                        {
-    //                            return _owner.ReadVariableSource(_state, _cancellationToken);
-    //                        }
-
-    //                        if (_variableSourceRead.LastErrorMessage != _readResult.ErrorMessage)
-    //                        {
-    //                            if (!_cancellationToken.IsCancellationRequested)
-    //                                _owner.LogMessage?.LogWarning(_readResult.Exception, string.Format(AppResource.CollectFail, _owner.DeviceName,
-    //                                    _variableSourceRead?.RegisterAddress, _variableSourceRead?.Length, _readResult.ErrorMessage));
-    //                        }
-    //                        else
-    //                        {
-    //                            if (!_cancellationToken.IsCancellationRequested && _owner.LogMessage?.LogLevel <= TouchSocket.Core.LogLevel.Trace)
-    //                                _owner.LogMessage?.Trace(string.Format("{0} - Collection [{1} - {2}] data failed - {3}",
-    //                                    _owner.DeviceName, _variableSourceRead?.RegisterAddress, _variableSourceRead?.Length, _readResult.ErrorMessage));
-    //                        }
-
-    //                        _variableSourceRead.LastErrorMessage = _readResult.ErrorMessage;
-    //                        _owner.CurrentDevice.SetDeviceStatus(TimerX.Now, null, _readResult.ErrorMessage);
-    //                        var time = DateTime.Now;
-    //                        foreach (var item in _variableSourceRead.VariableRuntimes)
-    //                        {
-    //                            item.SetValue(null, time, isOnline: false);
-    //                        }
-    //                    }
-    //                    break;
-    //            }
-
-    //            return default;
-    //        }
-
-    //        private async ValueTask AwaitReaderLock()
-    //        {
-    //            await _readerLockTask.ConfigureAwait(false);
-    //            _step = 1;
-    //            await MoveNextAsync().ConfigureAwait(false);
-    //        }
-
-    //        private async ValueTask AwaitRead()
-    //        {
-    //            await _readTask.ConfigureAwait(false);
-    //            _step = 3;
-    //            await MoveNextAsync().ConfigureAwait(false);
-    //        }
-
-    //        private async ValueTask AwaitReadRetry()
-    //        {
-    //            await _readTask.ConfigureAwait(false);
-    //            _step = 5;
-    //            await MoveNextAsync().ConfigureAwait(false);
-    //        }
-    //    }
-
-
    #endregion


--- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectFoundationBase.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectFoundationBase.cs
@@ -172,7 +172,7 @@ public abstract class CollectFoundationBase : CollectBase
                // 从协议读取数据
                OperResult<ReadOnlyMemory<byte>> read = default;
                var readTask = @this.FoundationDevice.ReadAsync(variableSourceRead.AddressObject, cancellationToken);
-                if (!readTask.IsCompleted)
+                if (!readTask.IsCompletedSuccessfully)
                {
                    read = await readTask.ConfigureAwait(false);
                }
@@ -200,116 +200,6 @@ public abstract class CollectFoundationBase : CollectBase

    }

-    ///// <summary>
-    ///// 采集驱动读取，读取成功后直接赋值变量，失败不做处理，注意非通用设备需重写
-    ///// </summary>
-    //    protected override ValueTask<OperResult<ReadOnlyMemory<byte>>> ReadSourceAsync(VariableSourceRead variableSourceRead, CancellationToken cancellationToken)
-    //    {
-    //        if (cancellationToken.IsCancellationRequested)
-    //            return new ValueTask<OperResult<ReadOnlyMemory<byte>>>( new OperResult<ReadOnlyMemory<byte>>(new OperationCanceledException()));
-
-    //        // 值类型状态机
-    //        var stateMachine = new ReadSourceStateMachine(this, variableSourceRead, cancellationToken);
-    //        return stateMachine.MoveNextAsync();
-    //    }
-
-    //    private struct ReadSourceStateMachine
-    //    {
-    //        private readonly VariableSourceRead _variableSourceRead;
-    //        private readonly CancellationToken _cancellationToken;
-    //        private readonly CollectFoundationBase _owner;
-    //        private OperResult<ReadOnlyMemory<byte>> _result;
-    //        private ValueTask<OperResult<ReadOnlyMemory<byte>>> _readTask;
-
-    //        public ReadSourceStateMachine(CollectFoundationBase owner, VariableSourceRead variableSourceRead, CancellationToken cancellationToken)
-    //        {
-    //            _owner = owner;
-    //            _variableSourceRead = variableSourceRead;
-    //            _cancellationToken = cancellationToken;
-    //            _result = default;
-    //            State = 0;
-    //        }
-
-    //        public int State { get; private set; }
-
-    //        public ValueTask<OperResult<ReadOnlyMemory<byte>>> MoveNextAsync()
-    //        {
-    //            try
-    //            {
-    //                switch (State)
-    //                {
-    //                    case 0:
-    //                        // 异步读取
-    //                        if (_cancellationToken.IsCancellationRequested)
-    //                        {
-    //                            _result = new OperResult<ReadOnlyMemory<byte>>(new OperationCanceledException());
-    //                            return new ValueTask<OperResult<ReadOnlyMemory<byte>>>(_result);
-    //                        }
-
-    //#pragma warning disable CA2012 // 正确使用 ValueTask
-    //                        _readTask = _owner.FoundationDevice.ReadAsync(_variableSourceRead.AddressObject, _cancellationToken);
-    //#pragma warning restore CA2012 // 正确使用 ValueTask
-
-    //                        // 检查是否任务已完成
-    //                        if (_readTask.IsCompleted)
-    //                        {
-    //                            _result = _readTask.Result;
-    //                            State = 1;
-    //                            return MoveNextAsync();
-    //                        }
-
-    //                        // 如果任务尚未完成，继续等待
-    //                        State = 2;
-    //                        return Awaited(_readTask);
-
-    //                    case 1:
-    //                        // 解析结构化内容
-    //                        if (_result.IsSuccess)
-    //                        {
-    //                            var parsedResult = _variableSourceRead.VariableRuntimes.PraseStructContent(_owner.FoundationDevice, _result.Content.Span, false);
-    //                            return new ValueTask<OperResult<ReadOnlyMemory<byte>>>(new OperResult<ReadOnlyMemory<byte>>(parsedResult));
-    //                        }
-
-    //                        return new ValueTask<OperResult<ReadOnlyMemory<byte>>>(_result);
-
-    //                    case 2:
-    //                        // 完成任务后，解析内容
-    //                        _result = _readTask.Result;
-
-    //                        if (_result.IsSuccess)
-    //                        {
-    //                            var parsedResult = _variableSourceRead.VariableRuntimes.PraseStructContent(_owner.FoundationDevice, _result.Content.Span, false);
-    //                            return new ValueTask<OperResult<ReadOnlyMemory<byte>>>(new OperResult<ReadOnlyMemory<byte>>(parsedResult));
-    //                        }
-
-    //                        return new ValueTask<OperResult<ReadOnlyMemory<byte>>>(_result);
-
-    //                    default:
-    //                        throw new InvalidOperationException("Unexpected state.");
-    //                }
-    //            }
-    //            catch (Exception ex)
-    //            {
-    //                return new ValueTask<OperResult<ReadOnlyMemory<byte>>>(new OperResult<ReadOnlyMemory<byte>>(ex));
-    //            }
-    //        }
-
-    //        private async ValueTask<OperResult<ReadOnlyMemory<byte>>> Awaited(ValueTask<OperResult<ReadOnlyMemory<byte>>> vt)
-    //        {
-    //            try
-    //            {
-
-
-    //                await vt.ConfigureAwait(false);
-    //                return await MoveNextAsync().ConfigureAwait(false);
-    //            }
-    //            catch (Exception ex)
-    //            {
-    //                return new OperResult<ReadOnlyMemory<byte>>(ex);
-    //            }
-    //        }
-    //    }
-
    /// <summary>
    /// 批量写入变量值,需返回变量名称/结果，注意非通用设备需重写
    /// </summary>
--- a/src/Gateway/ThingsGateway.Gateway.Application/GlobalData/GlobalData.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/GlobalData/GlobalData.cs
@@ -327,9 +327,12 @@ public static class GlobalData
        {
            if (deviceRuntime.RedundantEnable && deviceRuntime.RedundantDeviceId != null)
                return true;
-            else if (GlobalData.IdDevices.Any(a => a.Value.RedundantDeviceId == deviceRuntime.Id))
+
+            var id = deviceRuntime.Id;
+            foreach (var kv in GlobalData.IdDevices)
            {
-                return true;
+                if (kv.Value.RedundantDeviceId == id)
+                    return true;
            }
        }
        return false;
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelService.cs
@@ -386,7 +386,7 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
        ManageHelper.CheckChannelCount(insertData.Count);

        using var db = GetDB();
-        if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory < 2 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
+        if (GlobalData.HardwareJob.HardwareInfo.AvailableMemory < 2 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
        {
            await db.BulkCopyAsync(insertData, 10000).ConfigureAwait(false);
            await db.BulkUpdateAsync(upData, 10000).ConfigureAwait(false);
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceService.cs
@@ -387,7 +387,7 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
        ManageHelper.CheckDeviceCount(insertData.Count);

        using var db = GetDB();
-        if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory < 2 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
+        if (GlobalData.HardwareJob.HardwareInfo.AvailableMemory < 2 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
        {
            await db.BulkCopyAsync(insertData, 10000).ConfigureAwait(false);
            await db.BulkUpdateAsync(upData, 10000).ConfigureAwait(false);
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Management/Redundant/RedundancyTask.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Management/Redundant/RedundancyTask.cs
@@ -63,7 +63,7 @@ internal sealed class RedundancyTask : IRpcDriver, IAsyncDisposable
        const int highMemorySize = 100000;
        const long memoryThreshold = 2L * 1024 * 1024; // 2GB，单位KB

-        return (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory > memoryThreshold && WebEnableVariable.WebEnable == true)
+        return (GlobalData.HardwareJob.HardwareInfo.AvailableMemory > memoryThreshold && WebEnableVariable.WebEnable == true)
            ? highMemorySize
            : defaultSize;
    }
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableService.cs
@@ -207,7 +207,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService

        var result = await db.UseTranAsync(async () =>
        {
-            if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory < 2 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
+            if (GlobalData.HardwareJob.HardwareInfo.AvailableMemory < 2 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
            {
                await db.BulkCopyAsync(newChannels, 10000).ConfigureAwait(false);
                await db.BulkCopyAsync(newDevices, 10000).ConfigureAwait(false);
@@ -342,7 +342,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService

        var result = await db.UseTranAsync(async () =>
        {
-            if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory < 2 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
+            if (GlobalData.HardwareJob.HardwareInfo.AvailableMemory < 2 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
            {
                await db.BulkCopyAsync(newChannels, 10000).ConfigureAwait(false);
                await db.BulkCopyAsync(newDevices, 10000).ConfigureAwait(false);
@@ -424,7 +424,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
        if (differences?.Count > 0)
        {
            var data = models.ToList();
-            await  GlobalData.CheckByDeviceIds(data.Select(a => a.DeviceId)).ConfigureAwait(false);
+            await GlobalData.CheckByDeviceIds(data.Select(a => a.DeviceId)).ConfigureAwait(false);
            using var db = GetDB();

            var result = (await db.Updateable(data).UpdateColumns(differences.Select(a => a.Key).ToArray()).ExecuteCommandAsync().ConfigureAwait(false)) > 0;
@@ -493,10 +493,10 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
    private async Task<Func<ISugarQueryable<Variable>, ISugarQueryable<Variable>>> GetWhereQueryFunc(GatewayExportFilter exportFilter)
    {
        var dataScope = await GlobalData.SysUserService.GetCurrentUserDataScopeAsync().ConfigureAwait(false);
-        List<long>? filterDeviceIds= null;
-        if(dataScope!=null)
+        List<long>? filterDeviceIds = null;
+        if (dataScope != null)
        {
-            filterDeviceIds= GlobalData.GetCurrentUserDeviceIds(dataScope).ToList();
+            filterDeviceIds = GlobalData.GetCurrentUserDeviceIds(dataScope).ToList();
        }
        HashSet<long>? deviceId = null;
        if (!exportFilter.PluginName.IsNullOrWhiteSpace())
@@ -513,7 +513,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
        .WhereIF(exportFilter.PluginType == PluginTypeEnum.Collect, a => a.DeviceId == exportFilter.DeviceId)
        .WhereIF(deviceId != null, a => deviceId.Contains(a.DeviceId))

-        .WhereIF(filterDeviceIds != null , u => filterDeviceIds.Contains(u.DeviceId))//在指定机构列表查询
+        .WhereIF(filterDeviceIds != null, u => filterDeviceIds.Contains(u.DeviceId))//在指定机构列表查询

        .WhereIF(exportFilter.PluginType == PluginTypeEnum.Business, u => SqlFunc.JsonLike(u.VariablePropertys, exportFilter.DeviceId.ToString()));
        return whereQuery;
@@ -527,8 +527,8 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
        {
            filterDeviceIds = GlobalData.GetCurrentUserDeviceIds(dataScope).ToList();
        }
-        
-        
+
+
        HashSet<long>? deviceId = null;
        if (!exportFilter.PluginName.IsNullOrWhiteSpace())
        {
@@ -620,7 +620,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
    [OperDesc("ExportVariable", isRecordPar: false, localizerType: typeof(Variable))]
    public async Task<Dictionary<string, object>> ExportVariableAsync(GatewayExportFilter exportFilter)
    {
-        if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory < 4 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
+        if (GlobalData.HardwareJob.HardwareInfo.AvailableMemory < 4 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
        {
            var whereQuery = await GetWhereEnumerableFunc(exportFilter).ConfigureAwait(false);
            //导出
@@ -694,7 +694,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
    {
        ManageHelper.CheckVariableCount(insertData.Count);
        using var db = GetDB();
-        if (GlobalData.HardwareJob.HardwareInfo.MachineInfo.AvailableMemory < 2 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
+        if (GlobalData.HardwareJob.HardwareInfo.AvailableMemory < 2 * 1024 * 1024 || WebEnableVariable.WebEnable == false)
        {
            await db.BulkCopyAsync(insertData, 10000).ConfigureAwait(false);
            await db.BulkUpdateAsync(upData, 10000).ConfigureAwait(false);
@@ -850,7 +850,7 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
                    {
                        variable.IsUp = false;
                    }
-           
+
                    if (device.IsUp && (filterDeviceIds?.Contains(variable.DeviceId) != false))
                    {
                        importPreviewOutput.Results.Add(new(Interlocked.Increment(ref row), false, "Operation not permitted"));
--- a/src/Gateway/ThingsGateway.Gateway.Application/ThingsGateway.Gateway.Application.csproj
+++ b/src/Gateway/ThingsGateway.Gateway.Application/ThingsGateway.Gateway.Application.csproj
@@ -8,7 +8,9 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
-		<PackageReference Include="Riok.Mapperly" Version="4.2.1" ExcludeAssets="runtime" PrivateAssets="all" />
+		<PackageReference Include="Riok.Mapperly" Version="4.3.0" ExcludeAssets="runtime" PrivateAssets="all">
+		  <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="Rougamo.Fody" Version="5.0.2" />
 		<PackageReference Include="TouchSocket.Dmtp" Version="$(TSVersion)" />
 		<!--<PackageReference Include="TouchSocket.WebApi.Swagger" Version="$(TSVersion)" />-->
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTree.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTree.razor.cs
@@ -1347,27 +1347,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
    private TreeViewItem<ChannelDeviceTreeItem> UnknownTreeViewItem;

    SmartTriggerScheduler? scheduler;
-    private bool _initialized;
-    public override async Task SetParametersAsync(ParameterView parameters)
-    {
-        parameters.SetParameterProperties(this);
-        if (!_initialized)
-        {
-            _initialized = true;

-            OnInitialized();
-            await OnInitializedAsync();
-            OnParametersSet();
-            StateHasChanged();
-            await OnParametersSetAsync();
-        }
-        else
-        {
-            OnParametersSet();
-            StateHasChanged();
-            await OnParametersSetAsync();
-        }
-    }

    protected override async Task OnInitializedAsync()
    {
--- a/src/Gateway/ThingsGateway.Gateway.Razor/ThingsGateway.Gateway.Razor.csproj
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/ThingsGateway.Gateway.Razor.csproj
@@ -10,7 +10,9 @@
 	<ItemGroup>
 		<ProjectReference Include="..\ThingsGateway.Blazor.Diagrams\ThingsGateway.Blazor.Diagrams.csproj" />
 		<ProjectReference Include="..\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj" />
-		<PackageReference Include="Riok.Mapperly" Version="4.2.1" ExcludeAssets="runtime" PrivateAssets="all" />
+		<PackageReference Include="Riok.Mapperly" Version="4.3.0" ExcludeAssets="runtime" PrivateAssets="all">
+		  <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<ProjectReference Include="..\..\Admin\ThingsGateway.Admin.Razor\ThingsGateway.Admin.Razor.csproj" />
 		<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj" />
 	</ItemGroup>
--- a/src/Plugin/ThingsGateway.Debug.Photino/ThingsGateway.Debug.Photino.csproj
+++ b/src/Plugin/ThingsGateway.Debug.Photino/ThingsGateway.Debug.Photino.csproj
@@ -7,15 +7,13 @@
 		<OutputType>WinExe</OutputType>
 		<ApplicationIcon>favicon.ico</ApplicationIcon>
 		<TargetFrameworks>net8.0;$(OtherTargetFrameworks);</TargetFrameworks>
-
-		<!--动态适用GC-->
-		<GarbageCollectionAdaptationMode>true</GarbageCollectionAdaptationMode>
 		
-		<!--使用自托管线程池-->
-		<!--<UseWindowsThreadPool>false</UseWindowsThreadPool> -->
+		
+		<CETCompat>false</CETCompat>
+		<ServerGarbageCollection>true</ServerGarbageCollection>
+		<!--动态适用GC-->
+		<GarbageCollectionAdaptationMode>1</GarbageCollectionAdaptationMode>

-		<!--使用工作站GC-->
-		<!--<ServerGarbageCollection>true</ServerGarbageCollection>-->
 	</PropertyGroup>

 	<ItemGroup>
--- a/src/Plugin/ThingsGateway.Foundation.Modbus/Master/Core/ModbusTcpMessage.cs
+++ b/src/Plugin/ThingsGateway.Foundation.Modbus/Master/Core/ModbusTcpMessage.cs
@@ -1,14 +1,4 @@
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://thingsgateway.cn/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-
-namespace ThingsGateway.Foundation.Modbus;
+namespace ThingsGateway.Foundation.Modbus;

 /// <summary>
 /// <inheritdoc/>
--- a/src/Plugin/ThingsGateway.Foundation.Modbus/Slave/ModbusSlave.cs
+++ b/src/Plugin/ThingsGateway.Foundation.Modbus/Slave/ModbusSlave.cs
@@ -225,97 +225,97 @@ public class ModbusSlave : DeviceBase, IModbusAddress
            return;
        else
            ModbusServer02ByteBlocks.GetOrAdd(mAddress.Station, a =>
-        {
-            var bytes = new ByteBlock(256,
-            (c) =>
            {
-                var data = ArrayPool<byte>.Shared.Rent(c);
-                for (int i = 0; i < data.Length; i++)
+                var bytes = new ByteBlock(256,
+                (c) =>
                {
-                    data[i] = 0;
-                }
-                return data;
-            },
-            (m) =>
-            {
-                if (MemoryMarshal.TryGetArray((ReadOnlyMemory<byte>)m, out var result))
+                    var data = ArrayPool<byte>.Shared.Rent(c);
+                    for (int i = 0; i < data.Length; i++)
+                    {
+                        data[i] = 0;
+                    }
+                    return data;
+                },
+                (m) =>
                {
-                    ArrayPool<byte>.Shared.Return(result.Array);
+                    if (MemoryMarshal.TryGetArray((ReadOnlyMemory<byte>)m, out var result))
+                    {
+                        ArrayPool<byte>.Shared.Return(result.Array);
+                    }
                }
-            }
-            );
-            bytes.SetLength(256);
-            for (int i = 0; i < bytes.Length; i++)
-            {
-                bytes.WriteByte(0);
-            }
-            bytes.Position = 0;
-            return bytes;
-        });
+                );
+                bytes.SetLength(256);
+                for (int i = 0; i < bytes.Length; i++)
+                {
+                    bytes.WriteByte(0);
+                }
+                bytes.Position = 0;
+                return bytes;
+            });

        if (ModbusServer03ByteBlocks.ContainsKey(mAddress.Station))
            return;
        else
            ModbusServer03ByteBlocks.GetOrAdd(mAddress.Station, a =>
-        {
-            var bytes = new ByteBlock(256,
-            (c) =>
            {
-                var data = ArrayPool<byte>.Shared.Rent(c);
-                for (int i = 0; i < data.Length; i++)
+                var bytes = new ByteBlock(256,
+                (c) =>
                {
-                    data[i] = 0;
-                }
-                return data;
-            },
-            (m) =>
-            {
-                if (MemoryMarshal.TryGetArray((ReadOnlyMemory<byte>)m, out var result))
+                    var data = ArrayPool<byte>.Shared.Rent(c);
+                    for (int i = 0; i < data.Length; i++)
+                    {
+                        data[i] = 0;
+                    }
+                    return data;
+                },
+                (m) =>
                {
-                    ArrayPool<byte>.Shared.Return(result.Array);
+                    if (MemoryMarshal.TryGetArray((ReadOnlyMemory<byte>)m, out var result))
+                    {
+                        ArrayPool<byte>.Shared.Return(result.Array);
+                    }
                }
-            }
-            );
-            bytes.SetLength(256);
-            for (int i = 0; i < bytes.Length; i++)
-            {
-                bytes.WriteByte(0);
-            }
-            bytes.Position = 0;
-            return bytes;
-        });
+                );
+                bytes.SetLength(256);
+                for (int i = 0; i < bytes.Length; i++)
+                {
+                    bytes.WriteByte(0);
+                }
+                bytes.Position = 0;
+                return bytes;
+            });

        if (ModbusServer04ByteBlocks.ContainsKey(mAddress.Station))
            return;
        else
            ModbusServer04ByteBlocks.GetOrAdd(mAddress.Station, a =>
-        {
-            var bytes = new ByteBlock(256,
-            (c) =>
            {
-                var data = ArrayPool<byte>.Shared.Rent(c);
-                for (int i = 0; i < data.Length; i++)
+                var bytes = new ByteBlock(256,
+                (c) =>
                {
-                    data[i] = 0;
-                }
-                return data;
-            },
-            (m) =>
-            {
-                if (MemoryMarshal.TryGetArray((ReadOnlyMemory<byte>)m, out var result))
+                    var data = ArrayPool<byte>.Shared.Rent(c);
+                    for (int i = 0; i < data.Length; i++)
+                    {
+                        data[i] = 0;
+                    }
+                    return data;
+                },
+                (m) =>
                {
-                    ArrayPool<byte>.Shared.Return(result.Array);
+                    if (MemoryMarshal.TryGetArray((ReadOnlyMemory<byte>)m, out var result))
+                    {
+                        ArrayPool<byte>.Shared.Return(result.Array);
+                    }
                }
-            }
-            );
-            bytes.SetLength(256);
-            for (int i = 0; i < bytes.Length; i++)
-            {
-                bytes.WriteByte(0);
-            }
-            bytes.Position = 0;
-            return bytes;
-        });
+                );
+                bytes.SetLength(256);
+                for (int i = 0; i < bytes.Length; i++)
+                {
+                    bytes.WriteByte(0);
+                }
+                bytes.Position = 0;
+                return bytes;
+            });
    }

    public override Action<IPluginManager> ConfigurePlugins(TouchSocketConfig config)
@@ -558,7 +558,7 @@ public class ModbusSlave : DeviceBase, IModbusAddress
        }
    }

-    private static bool TryParseRequest(object requestInfo, out ModbusRequest modbusRequest, out ReadOnlySequence<byte> sequences, out bool modbusRtu)
+    private static bool TryParseRequest(IRequestInfo requestInfo, out ModbusRequest modbusRequest, out ReadOnlySequence<byte> sequences, out bool modbusRtu)
    {
        modbusRequest = default;
        sequences = default;
--- a/src/Plugin/ThingsGateway.Plugin.DB/ThingsGateway.Plugin.DB.csproj
+++ b/src/Plugin/ThingsGateway.Plugin.DB/ThingsGateway.Plugin.DB.csproj
@@ -15,7 +15,9 @@
 		<ProjectReference Include="..\..\Gateway\ThingsGateway.Gateway.Razor\ThingsGateway.Gateway.Razor.csproj">
 		</ProjectReference>
 		
-		<PackageReference Include="Riok.Mapperly" Version="4.2.1" ExcludeAssets="runtime" PrivateAssets="all" />
+		<PackageReference Include="Riok.Mapperly" Version="4.3.0" ExcludeAssets="runtime" PrivateAssets="all">
+		  <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>

 	</ItemGroup>

--- a/src/ThingsGateway.Photino/Program.cs
+++ b/src/ThingsGateway.Photino/Program.cs
@@ -17,6 +17,8 @@ using Photino.Blazor;

 using System.Text;

+using ThingsGateway.NewLife;
+using ThingsGateway.NewLife.Json.Extension;
 using ThingsGateway.NewLife.Log;

 namespace ThingsGateway.Server;
@@ -28,6 +30,23 @@ internal sealed class Program
    [STAThread]
    private static void Main(string[] args)
    {
+        AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
+        {
+            if (e.ExceptionObject is OutOfMemoryException)
+            {
+                try
+                {
+                    XTrace.WriteLine($"[OOM DETECTED]");
+                    XTrace.WriteLine(MachineInfo.GetCurrent().ToJsonNetString());
+                }
+                catch
+                {
+
+                }
+
+            }
+        };
+
        //当前工作目录设为程序集的基目录
        System.IO.Directory.SetCurrentDirectory(AppContext.BaseDirectory);
        // 增加中文编码支持
--- a/src/ThingsGateway.Photino/ThingsGateway.Photino.csproj
+++ b/src/ThingsGateway.Photino/ThingsGateway.Photino.csproj
@@ -64,12 +64,10 @@
 		<ApplicationIcon>favicon.ico</ApplicationIcon>
 		<!--<PublishAot>true</PublishAot>-->
 		<CETCompat>false</CETCompat>
-
+		<ServerGarbageCollection>true</ServerGarbageCollection>
 		<!--动态适用GC-->
 		<GarbageCollectionAdaptationMode>1</GarbageCollectionAdaptationMode>

-		<!--使用工作站GC-->
-		<!--<ServerGarbageCollection>true</ServerGarbageCollection>-->
 		<!--<PlatformTarget>x86</PlatformTarget>-->
 	</PropertyGroup>

--- a/src/ThingsGateway.RemoteWebApp/ThingsGateway.RemoteWebApp.csproj
+++ b/src/ThingsGateway.RemoteWebApp/ThingsGateway.RemoteWebApp.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">

 	<Import Project="..\Version.props" />
 	
@@ -37,17 +37,15 @@
 		<ApplicationIcon>favicon.ico</ApplicationIcon>
 		<!--<PublishAot>true</PublishAot>-->
 		<CETCompat>false</CETCompat>
+		<ServerGarbageCollection>true</ServerGarbageCollection>
+		<!--动态适用GC-->
+		<GarbageCollectionAdaptationMode>1</GarbageCollectionAdaptationMode>

 		<PublishAot>true</PublishAot>
 		<DebugType>none</DebugType>
 		<EmbedAllSources>false</EmbedAllSources>
 		<EmitDebugInformation>false</EmitDebugInformation>
 		
-		<!--动态适用GC-->
-		<GarbageCollectionAdaptationMode>1</GarbageCollectionAdaptationMode>
-		
-		<!--使用工作站GC-->
-		<!--<ServerGarbageCollection>true</ServerGarbageCollection>-->
 		<!--<PlatformTarget>x86</PlatformTarget>-->
 	</PropertyGroup>

--- a/src/ThingsGateway.ScriptDebug/ThingsGateway.ScriptDebug.csproj
+++ b/src/ThingsGateway.ScriptDebug/ThingsGateway.ScriptDebug.csproj
@@ -32,26 +32,14 @@
 		<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
 		<ApplicationIcon>favicon.ico</ApplicationIcon>

+		<CETCompat>false</CETCompat>
+		<ServerGarbageCollection>true</ServerGarbageCollection>
 		<!--动态适用GC-->
 		<GarbageCollectionAdaptationMode>1</GarbageCollectionAdaptationMode>


-		<CETCompat>false</CETCompat>


-
-
-		<!--<TieredCompilation>false</TieredCompilation>-->
-
-		<!--使用自托管线程池-->
-		<!--<UseWindowsThreadPool>false</UseWindowsThreadPool> -->
-
-		<!--使用工作站GC-->
-		<!--<ServerGarbageCollection>true</ServerGarbageCollection>-->
-
-		<!--<PlatformTarget>x86</PlatformTarget>-->
-		<!--editbin /LARGEADDRESSAWARE:NO ThingsGateway.Server.exe-->
-
 	</PropertyGroup>


--- a/src/ThingsGateway.Server/Configuration/Management.json
+++ b/src/ThingsGateway.Server/Configuration/Management.json
@@ -10,7 +10,7 @@
  },

  "RemoteServerManagement": {
-    "Enable": true,
+    "Enable": false,
    "Name": "ThingsGateway",
    "ServerUri": "0.0.0.0:8399",
    "VerifyToken": "ThingsGateway",
--- a/src/ThingsGateway.Server/Program/Program.cs
+++ b/src/ThingsGateway.Server/Program/Program.cs
@@ -16,6 +16,7 @@ using System.Text;
 using ThingsGateway.Admin.Application;
 using ThingsGateway.DB;
 using ThingsGateway.NewLife;
+using ThingsGateway.NewLife.Json.Extension;
 using ThingsGateway.NewLife.Log;
 using ThingsGateway.SqlSugar;

@@ -27,6 +28,24 @@ public class Program

    public static async Task Main(string[] args)
    {
+        AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
+        {
+            if (e.ExceptionObject is OutOfMemoryException)
+            {
+                try
+                {
+                    XTrace.WriteLine($"[OOM DETECTED]");
+                    XTrace.WriteLine(MachineInfo.GetCurrent().ToJsonNetString());
+                }
+                catch
+                {
+
+                }
+                
+            }
+        };
+
+
        await Task.Delay(2000).ConfigureAwait(false);
        //当前工作目录设为程序集的基目录
        System.IO.Directory.SetCurrentDirectory(AppContext.BaseDirectory);
--- a/src/ThingsGateway.Server/Program/Startup.cs
+++ b/src/ThingsGateway.Server/Program/Startup.cs
@@ -111,7 +111,8 @@ public class Startup : AppStartup
                 options.RootComponents.MaxJSRootComponents = 500;
                 options.JSInteropDefaultCallTimeout = TimeSpan.FromMinutes(2);
                 options.MaxBufferedUnacknowledgedRenderBatches = 20;
-                 options.DisconnectedCircuitRetentionPeriod = TimeSpan.FromMinutes(10);
+                 options.DisconnectedCircuitMaxRetained = 1;
+                 options.DisconnectedCircuitRetentionPeriod = TimeSpan.FromSeconds(10);
             })
             .AddHubOptions(options =>
             {
@@ -131,7 +132,8 @@ public class Startup : AppStartup
                        options.RootComponents.MaxJSRootComponents = 500;
                        options.JSInteropDefaultCallTimeout = TimeSpan.FromMinutes(2);
                        options.MaxBufferedUnacknowledgedRenderBatches = 20;
-                        options.DisconnectedCircuitRetentionPeriod = TimeSpan.FromMinutes(10);
+                        options.DisconnectedCircuitMaxRetained = 1;
+                        options.DisconnectedCircuitRetentionPeriod = TimeSpan.FromSeconds(10);
                    }).AddHubOptions(options =>
                    {
                        //单个传入集线器消息的最大大小。默认 32 KB
--- a/src/ThingsGateway.Server/ThingsGateway.Server.csproj
+++ b/src/ThingsGateway.Server/ThingsGateway.Server.csproj
@@ -51,26 +51,11 @@
 		<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
 		<ApplicationIcon>favicon.ico</ApplicationIcon>

+		<CETCompat>false</CETCompat>
+		<ServerGarbageCollection>true</ServerGarbageCollection>
 		<!--动态适用GC-->
 		<GarbageCollectionAdaptationMode>1</GarbageCollectionAdaptationMode>

-
-		<CETCompat>false</CETCompat>
-
-
-
-
-		<!--<TieredCompilation>false</TieredCompilation>-->
-
-		<!--使用自托管线程池-->
-		<!--<UseWindowsThreadPool>false</UseWindowsThreadPool> -->
-
-		<!--使用工作站GC-->
-		<!--<ServerGarbageCollection>true</ServerGarbageCollection>-->
-
-		<!--<PlatformTarget>x86</PlatformTarget>-->
-		<!--editbin /LARGEADDRESSAWARE:NO ThingsGateway.Server.exe-->
-
 	</PropertyGroup>


--- a/src/ThingsGateway.Server/runtimeconfig.template.json
+++ b/src/ThingsGateway.Server/runtimeconfig.template.json
@@ -1,5 +1,9 @@
 {
  "configProperties": {
-    "System.Runtime.EnableWriteXorExecute": false
+    "System.Runtime.EnableWriteXorExecute": false,
+    "System.GC.HeapHardLimitPercent": 95, //堆限制百分比
+    "System.GC.HighMemoryPercent": 90, //高内存百分比
+    "System.GC.DynamicAdaptationMode": 1 //动态适应模式
+    //"System.GC.RegionRange": 549755813888 //8GB, 区域范围，保留的虚拟内存，如DOCKER内出现OOM，可以调大，一般是进程内存限制的2倍
  }
 }
--- a/wiki.json
+++ b/wiki.json
@@ -0,0 +1,302 @@
+{
+  "repo_notes": [
+    {
+      "content": ""
+    }
+  ],
+  "pages": [
+    {
+      "title": "Overview",
+      "purpose": "Introduce ThingsGateway, explaining what it is, its core purpose as an industrial IoT gateway, and the high-level architecture",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Key Features",
+      "purpose": "List and describe the main features including multi-protocol support, plugin architecture, data persistence options, and deployment models",
+      "parent": "Overview",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "System Requirements and Dependencies",
+      "purpose": "Document the .NET versions, target frameworks, required NuGet packages, and system requirements",
+      "parent": "Overview",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Getting Started",
+      "purpose": "Provide quick-start guide for installing and running ThingsGateway",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Installation and Deployment",
+      "purpose": "Explain deployment options including Docker (x64/ARM64), web server, desktop application, and configuration basics",
+      "parent": "Getting Started",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Initial Configuration",
+      "purpose": "Guide users through initial setup including appsettings.json, environment variables, logging configuration, and first channel/device setup",
+      "parent": "Getting Started",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Architecture Overview",
+      "purpose": "Explain the overall system architecture including layered design, separation of concerns, and component relationships",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Layered Architecture",
+      "purpose": "Describe the Foundation, Gateway Application, and UI/Admin layers and their responsibilities",
+      "parent": "Architecture Overview",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Plugin System Architecture",
+      "purpose": "Explain the plugin architecture including Foundation vs Plugin layer separation, dynamic loading with AssemblyLoadContext, and plugin types",
+      "parent": "Architecture Overview",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Build System and Conditional Compilation",
+      "purpose": "Document the MSBuild-based build system including Directory.Build.props, conditional plugin loading, multi-targeting, and NuGet package generation",
+      "parent": "Architecture Overview",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Foundation Layer",
+      "purpose": "Document the core foundation libraries that provide protocol implementations and communication primitives",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Device Communication",
+      "purpose": "Explain DeviceBase abstraction, IDevice interface, protocol implementations, read/write operations, and data parsing",
+      "parent": "Foundation Layer",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Channel Architecture",
+      "purpose": "Document IChannel interface, channel implementations (TCP/UDP/Serial), channel options, and connection lifecycle",
+      "parent": "Foundation Layer",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Data Handling and Transformation",
+      "purpose": "Describe DataHandlingAdapter, message parsing, ThingsGatewayBitConverter for endianness/format conversion, and WaitHandlePool for request-response correlation",
+      "parent": "Foundation Layer",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Core Utilities",
+      "purpose": "Document TimerX scheduling, ExpiringDictionary caching, WaitLock concurrency primitives, and Reflect utilities",
+      "parent": "Foundation Layer",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Gateway Application",
+      "purpose": "Explain the main gateway application layer that orchestrates device communication and data flow",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Runtime Management System",
+      "purpose": "Document the entity-to-runtime conversion, GlobalData static registry, RuntimeServiceHelper, and runtime synchronization",
+      "parent": "Gateway Application",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Device Lifecycle Management",
+      "purpose": "Explain DeviceThreadManage, driver initialization, StartAsync/StopAsync lifecycle, TaskSchedulerLoop, and thread management",
+      "parent": "Gateway Application",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Variable Management",
+      "purpose": "Document VariableRuntime, VariableSourceRead, variable packing optimization, and data collection workflow",
+      "parent": "Gateway Application",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Concurrency and Read/Write Coordination",
+      "purpose": "Explain AsyncReadWriteLock, reader/writer priority, duty cycle control, and concurrent operation management",
+      "parent": "Gateway Application",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Event System",
+      "purpose": "Document GlobalData event dispatchers, VariableValueChangeEvent, DeviceStatusChangeEvent, AlarmChangedEvent, and event flow",
+      "parent": "Gateway Application",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Redundancy and Failover",
+      "purpose": "Explain device redundancy system, master/slave configuration, failover triggers, and variable state transfer",
+      "parent": "Gateway Application",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Plugin Development",
+      "purpose": "Guide for developing custom plugins for data collection and business logic integration",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Collection Plugins (CollectBase)",
+      "purpose": "Document how to create data collection plugins including protocol implementation, variable loading, and scheduled tasks",
+      "parent": "Plugin Development",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Business Plugins (BusinessBase)",
+      "purpose": "Explain business plugin development for data persistence, distribution, and serving protocols",
+      "parent": "Plugin Development",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Plugin Service and Dynamic Loading",
+      "purpose": "Document PluginService, AssemblyLoadContext usage, plugin discovery, driver instantiation, and property configuration",
+      "parent": "Plugin Development",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Plugin Packaging and Distribution",
+      "purpose": "Explain how to package plugins as NuGet packages, versioning, and deployment via Directory.build.targets",
+      "parent": "Plugin Development",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Built-in Protocols",
+      "purpose": "Document the built-in protocol implementations including Modbus, Siemens S7, OPC UA, OPC DA, and Dlt645",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Modbus Protocol",
+      "purpose": "Document Modbus Master/Slave implementations, RTU/TCP/UDP support, function codes, and address parsing",
+      "parent": "Built-in Protocols",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Siemens S7 Protocol",
+      "purpose": "Explain S7 Master implementation, PLC types, area addressing, and data block access",
+      "parent": "Built-in Protocols",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    }
+  ]
+}
Author	SHA1	Message	Date
2248356998 qq.com	0e44bc67cd	feat: 系统总/可用内存读取适配docker容器，硬件信息页面增加GC数据显示	2025-10-22 23:24:28 +08:00
2248356998 qq.com	12dfbba42c	build: 10.12.6	2025-10-22 15:30:56 +08:00
2248356998 qq.com	96b4287f3a	fix: operResult隐式转换递归错误	2025-10-22 13:43:39 +08:00
2248356998 qq.com	7d406de29f	调整 runtimeconfig.template.json 文件	2025-10-22 00:47:33 +08:00
2248356998 qq.com	81f0ef466a	perf: 优化文本日志性能	2025-10-21 17:40:21 +08:00
2248356998 qq.com	3f2d6b133c	更新依赖包	2025-10-21 17:26:46 +08:00
Diego	e776dc67eb	Remove language support from wiki.json Removed supported languages and default language settings.	2025-10-21 15:58:01 +08:00
devin-ai-integration[bot]	bc5827d140	Update wiki.json (#26 ) Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>	2025-10-21 15:54:04 +08:00
2248356998 qq.com	21838bf4af	perf: 异步池化性能	2025-10-21 10:56:11 +08:00
2248356998 qq.com	6090108597	build: 10.11.118	2025-10-20 22:15:24 +08:00
2248356998 qq.com	b47b9e6f43	build: 10.11.118	2025-10-20 22:15:10 +08:00
2248356998 qq.com	18d1cffb2d	perf: 异步池化性能	2025-10-20 20:32:31 +08:00