增加业务设备日志

优化opcua变量缓存
修复cron表达式间隔

README.md

@@ -20,11 +20,14 @@ A cross-platform, high-performance edge data collection gateway based on net9.
 ## Demo
 
 
-[Demo](http://47.119.161.158:5000/)
+[Demo](https://demo.thingsgateway.cn/)
+
 
 Account: **SuperAdmin**
+
 
 Password: **111111**
+
 
 **In the upper-right corner, switch to the IoT Gateway module in the personal popup box**
 

README.zh-CN.md

@@ -13,7 +13,7 @@
 
 ## 演示
 
-[ThingsGateway演示地址](http://47.119.161.158:5000/)
+[ThingsGateway演示地址](https://demo.thingsgateway.cn/)
 
 账户	:  **SuperAdmin**
 

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

@@ -137,7 +137,7 @@ public sealed class OperDescAttribute : MoAttribute
             Name = (localizerType == null ? App.CreateLocalizerByType(typeof(OperDescAttribute)) : App.CreateLocalizerByType(localizerType))![Description],
             Category = LogCateGoryEnum.Operate,
             ExeStatus = true,
-            OpIp = AppService?.RemoteIpAddress?.MapToIPv4()?.ToString() ?? string.Empty,
+            OpIp = AppService?.RemoteIpAddress ?? string.Empty,
             OpBrowser = clientInfo?.UA?.Family + clientInfo?.UA?.Major,
             OpOs = clientInfo?.OS?.Family + clientInfo?.OS?.Major,
             OpTime = DateTime.Now,

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

@@ -26,6 +26,7 @@ namespace ThingsGateway.Admin.Application;
 [Route("openapi/auth")]
 [Authorize(AuthenticationSchemes = "Bearer")]
 [LoggingMonitor]
+[ApiController]
 public class OpenApiController : ControllerBase
 {
     private readonly IAuthService _authService;

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

@@ -15,16 +15,13 @@ namespace ThingsGateway.Admin.Application;
 
 [Route("api/[controller]/[action]")]
 [AllowAnonymous]
+[ApiController]
 public class TestController : ControllerBase
 {
-    [HttpPost]
-    public Task Test(string data)
+    [HttpGet]
+    public void Test()
     {
-        for (int i = 0; i < 3; i++)
-        {
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
-        }
-        return Task.CompletedTask;
+        GC.Collect();
+        GC.WaitForPendingFinalizers();
     }
 }

src/Admin/ThingsGateway.Admin.Application/Entity/SysDict.cs

@@ -23,7 +23,7 @@ public class SysDict : BaseEntity
     /// <summary>
     /// 类型
     ///</summary>
-    [SugarColumn(ColumnDescription = "类型", Length = 200)]
+    [SugarColumn(ColumnDescription = "类型")]
     [AutoGenerateColumn(Ignore = true, Filterable = true, Sortable = true)]
     public virtual DictTypeEnum DictType { get; set; }
 

src/Admin/ThingsGateway.Admin.Application/Entity/SysOperateLog.cs

@@ -24,7 +24,7 @@ public class SysOperateLog
     /// <summary>
     /// 日志分类
     ///</summary>
-    [SugarColumn(ColumnDescription = "日志分类", Length = 200)]
+    [SugarColumn(ColumnDescription = "日志分类")]
     [AutoGenerateColumn(Order = 1, Filterable = true, Sortable = true)]
     public LogCateGoryEnum Category { get; set; }
 

src/Admin/ThingsGateway.Admin.Application/Entity/SysPosition.cs

@@ -54,7 +54,7 @@ public class SysPosition : BaseEntity
     /// <summary>
     /// 分类
     ///</summary>
-    [SugarColumn(ColumnName = "Category", ColumnDescription = "分类", Length = 200)]
+    [SugarColumn(ColumnName = "Category", ColumnDescription = "分类")]
     [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
     public virtual PositionCategoryEnum Category { get; set; }
 

src/Admin/ThingsGateway.Admin.Application/Entity/SysRelation.cs

@@ -22,7 +22,7 @@ public class SysRelation : PrimaryKeyEntity
     /// <summary>
     /// 分类
     ///</summary>
-    [SugarColumn(ColumnDescription = "分类", Length = 200)]
+    [SugarColumn(ColumnDescription = "分类")]
     public RelationCategoryEnum Category { get; set; }
 
     /// <summary>

src/Admin/ThingsGateway.Admin.Application/Entity/SysRole.cs

@@ -41,7 +41,7 @@ public class SysRole : BaseEntity
     /// <summary>
     /// 分类
     ///</summary>
-    [SugarColumn(ColumnDescription = "分类", Length = 200, IsNullable = false)]
+    [SugarColumn(ColumnDescription = "分类", IsNullable = false)]
     [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
     public virtual RoleCategoryEnum Category { get; set; }
 

src/Admin/ThingsGateway.Admin.Application/Services/ApiPermission/ApiPermissionService.cs

@@ -22,26 +22,19 @@ using System.Globalization;
 using System.Reflection;
 
 using ThingsGateway.Extension;
-using ThingsGateway.SpecificationDocument;
 
 namespace ThingsGateway.Admin.Application;
 
 internal sealed class ApiPermissionService : IApiPermissionService
 {
     private readonly IApiDescriptionGroupCollectionProvider _apiDescriptionGroupCollectionProvider;
-    private readonly SwaggerGeneratorOptions _generatorOptions;
 
     public ApiPermissionService(
         IOptions<SwaggerGeneratorOptions> generatorOptions,
         IApiDescriptionGroupCollectionProvider apiDescriptionGroupCollectionProvider)
     {
-        _generatorOptions = generatorOptions.Value;
         _apiDescriptionGroupCollectionProvider = apiDescriptionGroupCollectionProvider;
     }
-    private IEnumerable<string> GetDocumentNames()
-    {
-        return _generatorOptions.SwaggerDocs.Keys;
-    }
 
     /// <inheritdoc />
     public List<OpenApiPermissionTreeSelector> ApiPermissionTreeSelector()
@@ -53,37 +46,37 @@ internal sealed class ApiPermissionService : IApiPermissionService
             permissions = new();
 
             Dictionary<string, OpenApiPermissionTreeSelector> groupOpenApis = new();
-            foreach (var item in GetDocumentNames())
-            {
-                OpenApiPermissionTreeSelector openApiPermissionTreeSelector = new() { ApiName = item ?? "Default" };
-                groupOpenApis.TryAdd(openApiPermissionTreeSelector.ApiName, openApiPermissionTreeSelector);
-            }
+
             var apiDescriptions = _apiDescriptionGroupCollectionProvider.ApiDescriptionGroups.Items;
 
+            foreach (var item1 in apiDescriptions)
+            {
+                foreach (var item in item1.Items)
+                {
+                    if (item.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor)
+                    {
+                        OpenApiPermissionTreeSelector openApiPermissionTreeSelector = new() { ApiName = controllerActionDescriptor.ControllerName ?? "Default" };
+                        groupOpenApis.TryAdd(openApiPermissionTreeSelector.ApiName, openApiPermissionTreeSelector);
+                    }
+                }
+            }
+
             // 获取所有需要数据权限的控制器
             var controllerTypes =
                 App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(RolePermissionAttribute), false));
 
-            foreach (var groupOpenApi in groupOpenApis)
+            //foreach (var groupOpenApi in groupOpenApis)
             {
 
                 foreach (var apiDescriptionGroup in apiDescriptions)
                 {
 
-
                     var routes = apiDescriptionGroup.Items.Where(api => api.ActionDescriptor is ControllerActionDescriptor);
 
-                    OpenApiPermissionTreeSelector openApiPermissionTreeSelector = groupOpenApi.Value;
-
                     Dictionary<string, OpenApiPermissionTreeSelector> openApiPermissionTreeSelectorDict = new();
 
                     foreach (var route in routes)
                     {
-                        if (!SpecificationDocumentBuilder.CheckApiDescriptionInCurrentGroup(groupOpenApi.Key, route))
-                        {
-                            continue;
-                        }
-
                         var actionDesc = (ControllerActionDescriptor)route.ActionDescriptor;
                         if (!actionDesc.ControllerTypeInfo.CustomAttributes.Any(a => a.AttributeType == typeof(RolePermissionAttribute)))
                             continue;
@@ -116,10 +109,8 @@ internal sealed class ApiPermissionService : IApiPermissionService
                     }
 
 
-                    openApiPermissionTreeSelector.Children.AddRange(openApiPermissionTreeSelectorDict.Values);
-
-                    if (openApiPermissionTreeSelector.Children.Any(a => a.Children.Count > 0))
-                        permissions.Add(openApiPermissionTreeSelector);
+                    if (openApiPermissionTreeSelectorDict.Values.Any(a => a.Children.Count > 0))
+                        permissions.AddRange(openApiPermissionTreeSelectorDict.Values);
 
                 }
 

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

@@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.WebUtilities;
 
-using System.Net;
 using System.Security.Claims;
 
 using UAParser;
@@ -72,7 +71,7 @@ public class AppService : IAppService
     }
     public ClaimsPrincipal? User => App.User;
 
-    public IPAddress? RemoteIpAddress => App.HttpContext?.Connection?.RemoteIpAddress;
+    public string? RemoteIpAddress => App.HttpContext?.GetRemoteIpAddressToIPv4();
 
     public int LocalPort => App.HttpContext.Connection.LocalPort;
 }

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

@@ -11,7 +11,6 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 
-using System.Net;
 using System.Security.Claims;
 
 using UAParser;
@@ -24,7 +23,7 @@ public class HybridAppService : IAppService
     {
         var str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 Edg/127.0.0.0";
         ClientInfo = Parser.GetDefault().Parse(str);
-        RemoteIpAddress = IPAddress.Parse("127.0.0.1");
+        RemoteIpAddress = "127.0.0.1";
     }
     public ClientInfo? ClientInfo { get; }
 
@@ -56,7 +55,7 @@ public class HybridAppService : IAppService
         }
     }
 
-    public IPAddress? RemoteIpAddress { get; }
+    public string? RemoteIpAddress { get; }
 
     public string GetReturnUrl(string returnUrl)
     {

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

@@ -9,7 +9,6 @@
 //------------------------------------------------------------------------------
 
 
-using System.Net;
 using System.Security.Claims;
 
 using UAParser;
@@ -31,7 +30,7 @@ public interface IAppService
     /// <summary>
     /// RemoteIpAddress
     /// </summary>
-    public IPAddress? RemoteIpAddress { get; }
+    public string? RemoteIpAddress { get; }
 
     /// <summary>
     /// GetReturnUrl

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

@@ -105,7 +105,7 @@ public class AuthService : IAuthService
         {
             var loginEvent = new LoginEvent
             {
-                Ip = _appService.RemoteIpAddress?.MapToIPv4()?.ToString(),
+                Ip = _appService.RemoteIpAddress,
                 SysUser = userinfo,
                 VerificatId = verificatId
             };
@@ -236,7 +236,7 @@ public class AuthService : IAuthService
         //登录事件参数
         var logingEvent = new LoginEvent
         {
-            Ip = _appService.RemoteIpAddress?.MapToIPv4()?.ToString(),
+            Ip = _appService.RemoteIpAddress,
             Device = App.GetService<IAppService>().ClientInfo?.OS?.ToString(),
             Expire = expire,
             SysUser = sysUser,

src/Admin/ThingsGateway.Admin.Application/Services/SugarService/BaseService.cs

@@ -47,12 +47,10 @@ public class BaseService<T> : IDataService<T>, IDisposable where T : class, new(
     }
 
     /// <inheritdoc/>
-    public Task<bool> DeleteAsync(IEnumerable<T> models)
+    public async Task<bool> DeleteAsync(IEnumerable<T> models)
     {
-        if (models.FirstOrDefault() is IPrimaryIdEntity)
-            return DeleteAsync(models.Select(a => ((IPrimaryIdEntity)a).Id));
-        else
-            return Task.FromResult(false);
+        using var db = GetDB();
+        return await db.Deleteable<T>().In(models.ToList()).ExecuteCommandHasChangeAsync().ConfigureAwait(false);
     }
 
     /// <inheritdoc/>
@@ -165,4 +163,6 @@ public class BaseService<T> : IDataService<T>, IDisposable where T : class, new(
     {
         return DbContext.Db.GetConnectionScopeWithAttr<T>().CopyNew();
     }
+
+
 }

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

@@ -103,4 +103,46 @@ public static class DbContext
         Console.WriteLine("【Sql执行时间】：" + DateTime.Now.ToDefaultDateTimeFormat());
         Console.WriteLine("【Sql语句】：" + msg + Environment.NewLine);
     }
+
+
+
+    public static async Task BulkCopyAsync<TITEM>(this SqlSugarClient db, List<TITEM> datas, int size) where TITEM : class, new()
+    {
+        switch (db.CurrentConnectionConfig.DbType)
+        {
+            case DbType.MySql:
+            case DbType.SqlServer:
+            case DbType.Sqlite:
+            case DbType.Oracle:
+            case DbType.PostgreSQL:
+            case DbType.Dm:
+            case DbType.MySqlConnector:
+            case DbType.Kdbndp:
+                await db.Fastest<TITEM>().PageSize(size).BulkCopyAsync(datas).ConfigureAwait(false);
+                break;
+            default:
+                await db.Insertable(datas).PageSize(size).ExecuteCommandAsync().ConfigureAwait(false);
+                break;
+        }
+
+    }
+    public static async Task BulkUpdateAsync<TITEM>(this SqlSugarClient db, List<TITEM> datas, int size) where TITEM : class, new()
+    {
+        switch (db.CurrentConnectionConfig.DbType)
+        {
+            case DbType.MySql:
+            case DbType.SqlServer:
+            case DbType.Sqlite:
+            case DbType.Oracle:
+            case DbType.PostgreSQL:
+            case DbType.Dm:
+            case DbType.MySqlConnector:
+            case DbType.Kdbndp:
+                await db.Fastest<TITEM>().PageSize(size).BulkUpdateAsync(datas).ConfigureAwait(false);
+                break;
+            default:
+                await db.Updateable(datas).PageSize(size).ExecuteCommandAsync().ConfigureAwait(false);
+                break;
+        }
+    }
 }

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

@@ -10,6 +10,7 @@
 
 using BootstrapBlazor.Components;
 
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
 using SqlSugar;
@@ -23,7 +24,7 @@ namespace ThingsGateway.Admin.Application;
 [AppStartup(1000000000)]
 public class Startup : AppStartup
 {
-    public void ConfigureAdminApp(IServiceCollection services)
+    public void Configure(IServiceCollection services)
     {
         Directory.CreateDirectory("DB");
 
@@ -75,7 +76,7 @@ public class Startup : AppStartup
 
     }
 
-    public void UseAdminCore(IServiceProvider serviceProvider)
+    public void Use(IApplicationBuilder applicationBuilder)
     {
         //检查ConfigId
         var configIdGroup = DbContext.DbConfigs.GroupBy(it => it.ConfigId);

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

@@ -18,11 +18,10 @@
 	</ItemGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.2" />
-		<!--<PackageReference Include="MiniExcel" Version="1.39.0" />-->
+		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.4" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
 		<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
-		<PackageReference Include="SqlSugarCore" Version="5.1.4.188" />
+		<PackageReference Include="SqlSugarCore" Version="5.1.4.193" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />

src/Admin/ThingsGateway.Admin.Razor/Startup.cs

@@ -15,7 +15,7 @@ namespace ThingsGateway.Admin.Razor;
 [AppStartup(-1)]
 public class Startup : AppStartup
 {
-    public void ConfigureAdminApp(IServiceCollection services)
+    public void Configure(IServiceCollection services)
     {
         services.AddScoped<IMenuService, MenuService>();
         services.AddBootstrapBlazorTableExportService();

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

@@ -10,6 +10,9 @@
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
+using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.StaticFiles;
@@ -18,6 +21,7 @@ using Microsoft.Extensions.Options;
 
 using Newtonsoft.Json;
 
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
@@ -291,6 +295,21 @@ public class Startup : AppStartup
         services.AddAuthorizationCore();
         services.AddScoped<IAuthorizationHandler, BlazorServerAuthenticationHandler>();
         services.AddScoped<AuthenticationStateProvider, BlazorServerAuthenticationStateProvider>();
+
+#if NET9_0_OR_GREATER
+        var certificate = X509CertificateLoader.LoadPkcs12FromFile("ThingsGateway.pfx", "ThingsGateway", X509KeyStorageFlags.EphemeralKeySet);
+#else
+        var certificate = new X509Certificate2("ThingsGateway.pfx", "ThingsGateway", X509KeyStorageFlags.EphemeralKeySet);
+#endif
+        services.AddDataProtection()
+            .PersistKeysToFileSystem(new DirectoryInfo("../keys"))
+            .ProtectKeysWithCertificate(certificate)
+            .UseCryptographicAlgorithms(new AuthenticatedEncryptorConfiguration
+            {
+                EncryptionAlgorithm = EncryptionAlgorithm.AES_256_CBC,
+                ValidationAlgorithm = ValidationAlgorithm.HMACSHA256
+            });
+
     }
 
 
@@ -298,9 +317,9 @@ public class Startup : AppStartup
     public void Use(IApplicationBuilder applicationBuilder, IWebHostEnvironment env)
     {
         var app = (WebApplication)applicationBuilder;
+        app.UseForwardedHeaders(new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.All, KnownNetworks = { }, KnownProxies = { } });
         app.UseBootstrapBlazor();
 
-        app.UseForwardedHeaders(new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.All });
 
         // 启用本地化
         var option = app.Services.GetService<IOptions<RequestLocalizationOptions>>();

src/Admin/ThingsGateway.AdminServer/ThingsGateway.AdminServer.csproj

@@ -72,6 +72,9 @@
 		<None Update="pm2-linux.json">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
+		<None Update="ThingsGateway.pfx">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
 		<None Update="thingsgateway.service">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>

src/Admin/ThingsGateway.Furion/AspNetCore/Extensions/HttpContextExtensions.cs

@@ -106,7 +106,7 @@ public static class HttpContextExtensions
     /// <param name="context"></param>
     /// <param name="xff">是否优先取 X-Forwarded-For</param>
     /// <returns></returns>
-    public static string GetRemoteIpAddressToIPv4(this HttpContext context, bool xff = false)
+    public static string GetRemoteIpAddressToIPv4(this HttpContext context, bool xff = true)
     {
         var ipv4 = context.Connection.RemoteIpAddress?.MapToIPv4()?.ToString();
 

src/Admin/ThingsGateway.Furion/Schedule/HostedServices/ScheduleHostedService.cs

@@ -147,7 +147,7 @@ internal sealed class ScheduleHostedService : BackgroundService
             await BackgroundProcessing(stoppingToken).ConfigureAwait(false);
         }
 
-        _logger.LogCritical($"Schedule hosted service is stopped.");
+        _logger.LogInformation($"Schedule hosted service is stopped.");
     }
 
     /// <summary>

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

@@ -32,7 +32,7 @@ public class TimeTick
     /// <summary>
     /// 上次触发时间
     /// </summary>
-    public DateTime LastTime { get; private set; } = DateTime.Now;
+    public DateTime LastTime { get; private set; } = DateTime.UtcNow;
 
     /// <summary>
     /// 是否触发时间刻度
@@ -62,7 +62,7 @@ public class TimeTick
         return result;
     }
 
-    public DateTime GetNextTime(DateTime currentTime, bool setLastTime = true)
+    public DateTime GetNextTime(DateTime currentTime, bool setLastTime = false)
     {
         // 在没有 Cron 表达式的情况下，使用固定间隔
         if (cron == null)
@@ -86,7 +86,7 @@ public class TimeTick
 
     }
 
-    public DateTime GetNextTime(bool setLastTime = true) => GetNextTime(DateTime.UtcNow, setLastTime);
+    public DateTime GetNextTime(bool setLastTime = false) => GetNextTime(DateTime.UtcNow, setLastTime);
 
     /// <summary>
     /// 是否到达设置的时间间隔

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

@@ -22,12 +22,34 @@ public static class JSRuntimeExtensions
     /// 获取文化信息
     /// </summary>
     /// <param name="jsRuntime"></param>
-    public static ValueTask<string> GetCulture(this IJSRuntime jsRuntime) => jsRuntime.InvokeAsync<string>("getCultureLocalStorage");
+    public static async ValueTask<string> GetCulture(this IJSRuntime jsRuntime)
+    {
+        try
+        {
+            return await jsRuntime.InvokeAsync<string>("getCultureLocalStorage");
+        }
+        catch
+        {
+            return null;
+        }
+
+    }
 
     /// <summary>
     /// 设置文化信息
     /// </summary>
     /// <param name="jsRuntime"></param>
     /// <param name="cultureName"></param>
-    public static ValueTask SetCulture(this IJSRuntime jsRuntime, string cultureName) => jsRuntime.InvokeVoidAsync("setCultureLocalStorage", cultureName);
+    public static async ValueTask SetCulture(this IJSRuntime jsRuntime, string cultureName)
+    {
+        try
+        {
+            await jsRuntime.InvokeVoidAsync("setCultureLocalStorage", cultureName);
+        }
+        catch
+        {
+
+        }
+
+    }
 }

src/Admin/ThingsGateway.Razor/Startup.cs

@@ -8,6 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
 using ThingsGateway.NewLife;
@@ -48,7 +49,7 @@ public class Startup : AppStartup
     }
 
     /// <inheritdoc/>
-    public void UseService(IServiceProvider serviceProvider)
+    public void Use(IApplicationBuilder applicationBuilder)
     {
     }
 }

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

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

src/Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.4.21</PluginVersion>
-		<ProPluginVersion>10.4.21</ProPluginVersion>
+		<PluginVersion>10.5.18</PluginVersion>
+		<ProPluginVersion>10.5.18</ProPluginVersion>
 		<AuthenticationVersion>2.1.7</AuthenticationVersion>
 	</PropertyGroup>
 

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

@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CS-Script" Version="4.9.5" />
+		<PackageReference Include="CS-Script" Version="4.9.6" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Foundation/ThingsGateway.Foundation.Razor/Startup.cs

@@ -15,7 +15,7 @@ namespace ThingsGateway.Debug;
 [AppStartup(100000000)]
 public class Startup : AppStartup
 {
-    public void ConfigureAdminApp(IServiceCollection services)
+    public void Configure(IServiceCollection services)
     {
         services.AddScoped<IPlatformService, PlatformService>();
     }

src/Foundation/ThingsGateway.Foundation/Channel/DDP/DDPUdpSessionChannel.cs

@@ -94,11 +94,11 @@ public class DDPUdpSessionChannel : UdpSessionChannel, IClientChannel, IDtuUdpSe
         return WaitLocks.GetOrAdd(key, (a) => new WaitLock(WaitLock.MaxCount));
     }
 
-    public override Task StopAsync()
+    public override Task<Result> StopAsync(CancellationToken token)
     {
         WaitLocks.ForEach(a => a.Value.SafeDispose());
         WaitLocks.Clear();
-        return base.StopAsync();
+        return base.StopAsync(token);
     }
 
     private ConcurrentDictionary<EndPoint, WaitLock> _waitLocks = new();

src/Foundation/ThingsGateway.Foundation/Channel/OtherChannel.cs

@@ -128,17 +128,17 @@ public class OtherChannel : SetupConfigObject, IClientChannel
 
     public Protocol Protocol => new Protocol("Other");
 
-    public DateTime LastReceivedTime { get; private set; }
+    public DateTimeOffset LastReceivedTime { get; private set; }
 
-    public DateTime LastSentTime { get; private set; }
+    public DateTimeOffset LastSentTime { get; private set; }
 
     public bool IsClient => true;
 
     public bool Online => true;
 
-    public Task CloseAsync(string msg)
+    public Task<Result> CloseAsync(string msg, CancellationToken token)
     {
-        return Task.CompletedTask;
+        return Task.FromResult(Result.Success);
     }
 
     public Task ConnectAsync(int millisecondsTimeout, CancellationToken token)

src/Foundation/ThingsGateway.Foundation/Channel/Plugin/DtuPlugin.cs

@@ -80,7 +80,7 @@ public class DtuPlugin : PluginBase, ITcpReceivingPlugin
             {
                 if (HeartbeatByte.SequenceEqual(e.ByteBlock.AsSegment(0, len)))
                 {
-                    if (DateTime.UtcNow - socket.LastSentTime.ToUniversalTime() < TimeSpan.FromMilliseconds(200))
+                    if (DateTimeOffset.Now - socket.LastSentTime < TimeSpan.FromMilliseconds(200))
                     {
                         await Task.Delay(200).ConfigureAwait(false);
                     }

src/Foundation/ThingsGateway.Foundation/Channel/Plugin/HeartbeatAndReceivePlugin.cs

@@ -42,7 +42,10 @@ internal sealed class HeartbeatAndReceivePlugin : PluginBase, ITcpConnectedPlugi
         set
         {
             _heartbeat = value;
-            HeartbeatByte = new ArraySegment<byte>(Encoding.UTF8.GetBytes(value));
+            if (!_heartbeat.IsNullOrEmpty())
+            {
+                HeartbeatByte = new ArraySegment<byte>(Encoding.UTF8.GetBytes(value));
+            }
         }
     }
     private string _heartbeat;
@@ -59,6 +62,8 @@ internal sealed class HeartbeatAndReceivePlugin : PluginBase, ITcpConnectedPlugi
             return;//此处可判断，如果为服务器，则不用使用心跳。
         }
 
+        HeartbeatTime = Math.Max(HeartbeatTime, 1000);
+
         if (DtuId.IsNullOrWhiteSpace()) return;
 
         if (client is ITcpClient tcpClient)
@@ -81,7 +86,7 @@ internal sealed class HeartbeatAndReceivePlugin : PluginBase, ITcpConnectedPlugi
 
                          try
                          {
-                             if (DateTime.UtcNow - tcpClient.LastSentTime.ToUniversalTime() < TimeSpan.FromMilliseconds(200))
+                             if (DateTimeOffset.Now - tcpClient.LastSentTime < TimeSpan.FromMilliseconds(200))
                              {
                                  await Task.Delay(200).ConfigureAwait(false);
                              }

src/Foundation/ThingsGateway.Foundation/Channel/Plugin/PluginUtil.cs

@@ -70,13 +70,13 @@ public static class PluginUtil
         {
             action += a =>
             {
-                a.UseCheckClear()
+                a.UseTcpSessionCheckClear()
         .SetCheckClearType(CheckClearType.All)
         .SetTick(TimeSpan.FromMilliseconds(channelOptions.CheckClearTime))
         .SetOnClose(async (c, t) =>
         {
             await c.ShutdownAsync(System.Net.Sockets.SocketShutdown.Both).ConfigureAwait(false);
-            c.SafeClose($"{channelOptions.CheckClearTime}ms Timeout");
+            await c.CloseAsync($"{channelOptions.CheckClearTime}ms Timeout").ConfigureAwait(false);
         });
             };
 

src/Foundation/ThingsGateway.Foundation/Channel/SerialPortChannel.cs

@@ -74,8 +74,9 @@ public class SerialPortChannel : SerialPortClient, IClientChannel
 
     //private readonly WaitLock _connectLock = new WaitLock();
     /// <inheritdoc/>
-    public override async Task CloseAsync(string msg)
+    public override async Task<Result> CloseAsync(string msg, CancellationToken token)
     {
+
         if (Online)
         {
             try
@@ -83,11 +84,12 @@ public class SerialPortChannel : SerialPortClient, IClientChannel
                 //await _connectLock.WaitAsync().ConfigureAwait(false);
                 if (Online)
                 {
-                    await base.CloseAsync(msg).ConfigureAwait(false);
+                    var result = await base.CloseAsync(msg, token).ConfigureAwait(false);
                     if (!Online)
                     {
                         await this.OnChannelEvent(Stoped).ConfigureAwait(false);
                     }
+                    return result;
                 }
             }
             finally
@@ -95,6 +97,7 @@ public class SerialPortChannel : SerialPortClient, IClientChannel
                 //_connectLock.Release();
             }
         }
+        return Result.Success;
     }
 
     /// <inheritdoc/>

src/Foundation/ThingsGateway.Foundation/Channel/TcpClientChannel.cs

@@ -72,7 +72,7 @@ public class TcpClientChannel : TcpClient, IClientChannel
 
     //private readonly WaitLock _connectLock = new WaitLock();
     /// <inheritdoc/>
-    public override async Task CloseAsync(string msg)
+    public override async Task<Result> CloseAsync(string msg, CancellationToken token)
     {
         if (Online)
         {
@@ -81,11 +81,12 @@ public class TcpClientChannel : TcpClient, IClientChannel
                 //await _connectLock.WaitAsync().ConfigureAwait(false);
                 if (Online)
                 {
-                    await base.CloseAsync(msg).ConfigureAwait(false);
+                    var result = await base.CloseAsync(msg, token).ConfigureAwait(false);
                     if (!Online)
                     {
                         await this.OnChannelEvent(Stoped).ConfigureAwait(false);
                     }
+                    return result;
                 }
             }
             finally
@@ -93,6 +94,7 @@ public class TcpClientChannel : TcpClient, IClientChannel
                 //_connectLock.Release();
             }
         }
+        return Result.Success;
     }
 
     /// <inheritdoc/>

src/Foundation/ThingsGateway.Foundation/Channel/TcpServiceChannel.cs

@@ -94,22 +94,22 @@ public abstract class TcpServiceChannelBase<TClient> : TcpService<TClient>, ITcp
     }
 
     /// <inheritdoc/>
-    public override async Task StopAsync()
+    public override async Task<Result> StopAsync(CancellationToken token)
     {
         if (Monitors.Any())
         {
             try
             {
-                await _connectLock.WaitAsync().ConfigureAwait(false);
+                await _connectLock.WaitAsync(token).ConfigureAwait(false);
                 if (Monitors.Any())
                 {
 
                     await ClearAsync().ConfigureAwait(false);
                     var iPHost = Monitors.FirstOrDefault()?.Option.IpHost;
-                    await base.StopAsync().ConfigureAwait(false);
+                    var result = await base.StopAsync(token).ConfigureAwait(false);
                     if (!Monitors.Any())
                         Logger?.Info($"{iPHost}{DefaultResource.Localizer["ServiceStoped"]}");
-
+                    return result;
                 }
             }
             finally
@@ -120,8 +120,10 @@ public abstract class TcpServiceChannelBase<TClient> : TcpService<TClient>, ITcp
         }
         else
         {
-            await base.StopAsync().ConfigureAwait(false);
+            var result = await base.StopAsync(token).ConfigureAwait(false);
+            return result;
         }
+        return Result.Success; ;
     }
 
 
@@ -192,9 +194,9 @@ public class TcpServiceChannel<TClient> : TcpServiceChannelBase<TClient>, IChann
     public ChannelEventHandler Stoping { get; set; } = new();
 
     /// <inheritdoc/>
-    public Task CloseAsync(string msg)
+    public Task<Result> CloseAsync(string msg, CancellationToken token)
     {
-        return StopAsync();
+        return StopAsync(token);
     }
 
     /// <inheritdoc/>

src/Foundation/ThingsGateway.Foundation/Channel/TcpSessionClientChannel.cs

@@ -64,10 +64,10 @@ public class TcpSessionClientChannel : TcpSessionClient, IClientChannel
     public virtual WaitLock GetLock(string key) => WaitLock;
 
     /// <inheritdoc/>
-    public override Task CloseAsync(string msg)
+    public override Task<Result> CloseAsync(string msg, CancellationToken token)
     {
         WaitHandlePool.SafeDispose();
-        return base.CloseAsync(msg);
+        return base.CloseAsync(msg, token);
     }
 
     /// <inheritdoc/>

src/Foundation/ThingsGateway.Foundation/Channel/UdpSessionChannel.cs

@@ -73,9 +73,9 @@ public class UdpSessionChannel : UdpSession, IClientChannel
     public ConcurrentDictionary<long, Func<IClientChannel, ReceivedDataEventArgs, bool, Task>> ChannelReceivedWaitDict { get; } = new();
 
     /// <inheritdoc/>
-    public Task CloseAsync(string msg)
+    public Task<Result> CloseAsync(string msg, CancellationToken token)
     {
-        return StopAsync();
+        return StopAsync(token);
     }
 
     /// <inheritdoc/>
@@ -127,26 +127,28 @@ public class UdpSessionChannel : UdpSession, IClientChannel
     }
 
     /// <inheritdoc/>
-    public override async Task StopAsync()
+    public override async Task<Result> StopAsync(CancellationToken token)
     {
         if (Monitor != null)
         {
             try
             {
-                await _connectLock.WaitAsync().ConfigureAwait(false);
+                await _connectLock.WaitAsync(token).ConfigureAwait(false);
                 if (Monitor != null)
                 {
                     await this.OnChannelEvent(Stoping).ConfigureAwait(false);
-                    await base.StopAsync().ConfigureAwait(false);
+                    var result = await base.StopAsync(token).ConfigureAwait(false);
                     if (Monitor == null)
                     {
                         await this.OnChannelEvent(Stoped).ConfigureAwait(false);
                         Logger?.Info($"{DefaultResource.Localizer["ServiceStoped"]}");
                     }
+                    return result;
                 }
                 else
                 {
-                    await base.StopAsync().ConfigureAwait(false);
+                    var result = await base.StopAsync(token).ConfigureAwait(false);
+                    return result;
                 }
             }
             finally
@@ -156,7 +158,8 @@ public class UdpSessionChannel : UdpSession, IClientChannel
         }
         else
         {
-            await base.StopAsync().ConfigureAwait(false);
+            var result = await base.StopAsync(token).ConfigureAwait(false);
+            return result;
         }
     }
 

src/Foundation/ThingsGateway.Foundation/Device/DeviceBase.cs

@@ -46,9 +46,9 @@ public abstract class DeviceBase : DisposableObject, IDevice
                 return;
             if (channel.Collects.Count > 0)
             {
-                var device = channel.Collects.First();
-                if (device.GetType() != GetType())
-                    throw new InvalidOperationException("The channel already exists in the device of another type");
+                //var device = channel.Collects.First();
+                //if (device.GetType() != GetType())
+                //    throw new InvalidOperationException("The channel already exists in the device of another type");
 
                 if (!SupportMultipleDevice())
                     throw new InvalidOperationException("The proactive response device does not support multiple devices");
@@ -97,9 +97,17 @@ public abstract class DeviceBase : DisposableObject, IDevice
             Channel.Stoping.Add(ChannelStoping);
             Channel.Started.Add(ChannelStarted);
             Channel.ChannelReceived.Add(ChannelReceived);
+
+
+            SetChannel();
         }
     }
 
+    protected virtual void SetChannel()
+    {
+        Channel.ChannelOptions.MaxConcurrentCount = 1;
+    }
+
     /// <inheritdoc/>
     ~DeviceBase()
     {
@@ -221,6 +229,14 @@ public abstract class DeviceBase : DisposableObject, IDevice
         }
         else
         {
+            if (Channel?.Collects?.Count > 1)
+            {
+                var dataHandlingAdapter = GetDataAdapter();
+                if (adapter.GetType() != dataHandlingAdapter.GetType())
+                {
+                    clientChannel.SetDataHandlingAdapter(dataHandlingAdapter);
+                }
+            }
         }
     }
 
@@ -546,7 +562,7 @@ public abstract class DeviceBase : DisposableObject, IDevice
         finally
         {
             waitLock.Release();
-            clientChannel.WaitHandlePool.Destroy(waitData);
+            clientChannel.WaitHandlePool.Destroy(sign);
             Channel.ChannelReceivedWaitDict.TryRemove(sign, out _);
         }
     }
@@ -944,7 +960,7 @@ public abstract class DeviceBase : DisposableObject, IDevice
                         if (tcpServiceChannel.TryGetClient($"ID={dtu.DtuId}", out var client))
                         {
                             client.WaitHandlePool?.SafeDispose();
-                            client.SafeClose();
+                            _ = client.CloseAsync();
                         }
 
                     }

src/Foundation/ThingsGateway.Foundation/Extensions/LoggerExtensions.cs

@@ -150,6 +150,13 @@ public static class LoggerExtensions
         logger.Log(TouchSocket.Core.LogLevel.Info, null, msg, null);
     }
 
+    /// <summary>
+    /// 输出提示日志
+    /// </summary>
+    public static void LogDebug(this ILog logger, string msg)
+    {
+        logger.Log(TouchSocket.Core.LogLevel.Debug, null, msg, null);
+    }
     /// <summary>
     /// 输出Trace日志
     /// </summary>

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

@@ -10,8 +10,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.4" />
-		<PackageReference Include="TouchSocket" Version="3.0.25" />
-		<PackageReference Include="TouchSocket.SerialPorts" Version="3.0.25" />
+		<PackageReference Include="TouchSocket" Version="3.1.2" />
+		<PackageReference Include="TouchSocket.SerialPorts" Version="3.1.2" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Gateway/ThingsGateway.Gateway.Application/Common/AsyncReadWriteLock.cs

@@ -40,9 +40,7 @@ public class AsyncReadWriteLock
 
     private void ReleaseWriter()
     {
-        Interlocked.Decrement(ref _writerCount);
-
-        if (Interlocked.Read(ref _writerCount) == 0)
+        if (Interlocked.Decrement(ref _writerCount) == 0)
         {
             var resetEvent = _readerLock;
             _readerLock = new(false);

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

@@ -13,6 +13,7 @@ using BootstrapBlazor.Components;
 using Mapster;
 
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 using SqlSugar;
@@ -35,6 +36,7 @@ namespace ThingsGateway.Gateway.Application;
 [Route("openApi/control")]
 [RolePermission]
 [LoggingMonitor]
+[ApiController]
 [Authorize(AuthenticationSchemes = "Bearer")]
 public class ControlController : ControllerBase
 {
@@ -139,7 +141,7 @@ public class ControlController : ControllerBase
             }
         }
 
-        return await GlobalData.RpcService.InvokeDeviceMethodAsync($"WebApi-{UserManager.UserAccount}-{App.HttpContext.Connection.RemoteIpAddress.MapToIPv4()}", deviceDatas).ConfigureAwait(false);
+        return await GlobalData.RpcService.InvokeDeviceMethodAsync($"WebApi-{UserManager.UserAccount}-{App.HttpContext?.GetRemoteIpAddressToIPv4()}", deviceDatas).ConfigureAwait(false);
 
     }
 

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

@@ -24,6 +24,7 @@ namespace ThingsGateway.Gateway.Application;
 [ApiDescriptionSettings("ThingsGateway.OpenApi", Order = 200)]
 [DisplayName("数据状态")]
 [Route("openApi/runtimeInfo")]
+[ApiController]
 [RolePermission]
 [Authorize(AuthenticationSchemes = "Bearer")]
 public class RuntimeInfoController : ControllerBase

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

@@ -35,6 +35,7 @@ public abstract class BusinessBaseWithCacheAlarmModel<VarModel, DevModel, AlarmM
         {
             try
             {
+                LogMessage?.LogInformation($"Add {typeof(DevModel).Name} data to file cache, count {data.Count}");
                 foreach (var item in data)
                 {
                     item.Id = CommonUtils.GetSingleId();
@@ -100,6 +101,7 @@ public abstract class BusinessBaseWithCacheAlarmModel<VarModel, DevModel, AlarmM
             {
                 if (_memoryAlarmModelQueue.Count > _businessPropertyWithCache.QueueMaxCount)
                 {
+                    LogMessage?.LogWarning($"{typeof(AlarmModel).Name} Queue exceeds limit, clear old data. If it doesn't work as expected, increase [QueueMaxCount] or Enable cache");
                     _memoryAlarmModelQueue.Clear();
                     _memoryAlarmModelQueue.Enqueue(data);
                     return;

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

@@ -36,6 +36,7 @@ public abstract class BusinessBaseWithCacheDeviceModel<VarModel, DevModel> : Bus
 
             try
             {
+                LogMessage?.LogInformation($"Add {typeof(DevModel).Name} data to file cache, count {data.Count}");
                 foreach (var item in data)
                 {
                     item.Id = CommonUtils.GetSingleId();
@@ -101,6 +102,7 @@ public abstract class BusinessBaseWithCacheDeviceModel<VarModel, DevModel> : Bus
             {
                 if (_memoryDevModelQueue.Count > _businessPropertyWithCache.QueueMaxCount)
                 {
+                    LogMessage?.LogWarning($"{typeof(DevModel).Name} Queue exceeds limit, clear old data. If it doesn't work as expected, increase [QueueMaxCount] or Enable cache");
                     _memoryDevModelQueue.Clear();
                     _memoryDevModelQueue.Enqueue(data);
                     return;

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

@@ -39,6 +39,7 @@ public abstract class BusinessBaseWithCacheVariableModel<VarModel> : BusinessBas
         {
             try
             {
+                LogMessage?.LogInformation($"Add {typeof(VarModel).Name} data to file cache, count {data.Count}");
                 foreach (var item in data)
                 {
                     item.Id = CommonUtils.GetSingleId();
@@ -147,6 +148,7 @@ public abstract class BusinessBaseWithCacheVariableModel<VarModel> : BusinessBas
             {
                 if (_memoryVarModelQueue.Count > _businessPropertyWithCache.QueueMaxCount)
                 {
+                    LogMessage?.LogWarning($"{typeof(VarModel).Name} Queue exceeds limit, clear old data. If it doesn't work as expected, increase [QueueMaxCount] or Enable cache");
                     _memoryVarModelQueue.Clear();
                     _memoryVarModelQueue.Enqueue(data);
                     return;

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

@@ -87,12 +87,12 @@ public abstract class BusinessBaseWithCacheIntervalAlarmModel<VarModel, DevModel
         // 触发一次设备状态变化和变量值变化事件
         CollectDevices?.ForEach(a =>
         {
-            if (a.Value.DeviceStatus == DeviceStatusEnum.OnLine)
+            if (a.Value.DeviceStatus == DeviceStatusEnum.OnLine && _businessPropertyWithCacheInterval.BusinessUpdateEnum != BusinessUpdateEnum.Interval)
                 DeviceStatusChange(a.Value, a.Value.Adapt<DeviceBasicData>());
         });
         IdVariableRuntimes.ForEach(a =>
         {
-            if (a.Value.IsOnline)
+            if (a.Value.IsOnline && _businessPropertyWithCacheInterval.BusinessUpdateEnum != BusinessUpdateEnum.Interval)
                 VariableValueChange(a.Value, a.Value.Adapt<VariableBasicData>());
         });
     }
@@ -162,6 +162,8 @@ public abstract class BusinessBaseWithCacheIntervalAlarmModel<VarModel, DevModel
                 {
                     if (_exTTimerTick.IsTickHappen())
                     {
+                        if (LogMessage.LogLevel <= LogLevel.Debug)
+                            LogMessage?.LogDebug($"Interval {typeof(VarModel).Name} data, count {IdVariableRuntimes.Count}");
                         // 间隔推送全部变量
                         var variableRuntimes = IdVariableRuntimes.Select(a => a.Value);
                         VariableTimeInterval(variableRuntimes, variableRuntimes.Adapt<List<VariableBasicData>>());
@@ -177,6 +179,8 @@ public abstract class BusinessBaseWithCacheIntervalAlarmModel<VarModel, DevModel
                     {
                         if (CollectDevices != null)
                         {
+                            if (LogMessage.LogLevel <= LogLevel.Debug)
+                                LogMessage?.LogDebug($"Interval {typeof(DevModel).Name} data, count {CollectDevices.Count}");
 
                             // 间隔推送全部设备
                             foreach (var deviceRuntime in CollectDevices.Select(a => a.Value))

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

@@ -85,12 +85,12 @@ public abstract class BusinessBaseWithCacheIntervalDeviceModel<VarModel, DevMode
 
         CollectDevices?.ForEach(a =>
         {
-            if (a.Value.DeviceStatus == DeviceStatusEnum.OnLine)
+            if (a.Value.DeviceStatus == DeviceStatusEnum.OnLine && _businessPropertyWithCacheInterval.BusinessUpdateEnum != BusinessUpdateEnum.Interval)
                 DeviceStatusChange(a.Value, a.Value.Adapt<DeviceBasicData>());
         });
         IdVariableRuntimes.ForEach(a =>
         {
-            if (a.Value.IsOnline)
+            if (a.Value.IsOnline && _businessPropertyWithCacheInterval.BusinessUpdateEnum != BusinessUpdateEnum.Interval)
                 VariableValueChange(a.Value, a.Value.Adapt<VariableBasicData>());
         });
     }
@@ -152,6 +152,8 @@ public abstract class BusinessBaseWithCacheIntervalDeviceModel<VarModel, DevMode
                 {
                     if (_exTTimerTick.IsTickHappen())
                     {
+                        if (LogMessage.LogLevel <= LogLevel.Debug)
+                            LogMessage?.LogDebug($"Interval  {typeof(VarModel).Name}  data, count {IdVariableRuntimes.Count}");
                         // 上传所有变量信息
                         var variableRuntimes = IdVariableRuntimes.Select(a => a.Value);
                         VariableTimeInterval(variableRuntimes, variableRuntimes.Adapt<List<VariableBasicData>>());
@@ -168,6 +170,8 @@ public abstract class BusinessBaseWithCacheIntervalDeviceModel<VarModel, DevMode
                     {
                         if (CollectDevices != null)
                         {
+                            if (LogMessage.LogLevel <= LogLevel.Debug)
+                                LogMessage?.LogDebug($"Interval  {typeof(DevModel).Name}  data, count {CollectDevices.Count}");
                             // 上传所有设备信息
                             foreach (var deviceRuntime in CollectDevices.Select(a => a.Value))
                             {

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

@@ -9,6 +9,9 @@
 //------------------------------------------------------------------------------
 
 using System.Globalization;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
 using System.Text.RegularExpressions;
 
 using ThingsGateway.NewLife.Json.Extension;
@@ -37,7 +40,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
             List<string> strings = new List<string>();
 
             // 使用正则表达式查找输入字符串中的所有匹配项
-            Regex regex = new Regex(@"\$\{(.+?)\}");
+            Regex regex = TopicRegex();
             MatchCollection matches = regex.Matches(input);
 
             // 遍历匹配结果，将匹配到的字符串添加到列表中
@@ -63,7 +66,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
     protected List<TopicJson> GetAlarms(IEnumerable<AlarmModel> item)
     {
         IEnumerable<dynamic>? data = Application.DynamicModelExtension.GetDynamicModel<AlarmModel>(item, _businessPropertyWithCacheIntervalScript.BigTextScriptAlarmModel);
-        List<TopicJson> topicJsonList = new List<TopicJson>();
+        var topicJsonList = new List<TopicJson>();
         var topics = Match(_businessPropertyWithCacheIntervalScript.AlarmTopic);
         if (topics.Count > 0)
         {
@@ -86,10 +89,12 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                     // 上传内容
                     if (_businessPropertyWithCacheIntervalScript.IsAlarmList)
                     {
+
                         // 如果是报警列表，则将整个分组转换为 JSON 字符串
-                        string json = group.Select(a => a).ToList().ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                        var gList = group.Select(a => a).ToList();
+                        string json = gList.ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                         // 将主题和 JSON 内容添加到列表中
-                        topicJsonList.Add(new(topic, json));
+                        topicJsonList.Add(new(topic, json, gList.Count));
                     }
                     else
                     {
@@ -98,7 +103,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         {
                             string json = JsonExtensions.ToJsonNetString(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
-                            topicJsonList.Add(new(topic, json));
+                            topicJsonList.Add(new(topic, json, 1));
                         }
                     }
                 }
@@ -108,15 +113,16 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
         {
             if (_businessPropertyWithCacheIntervalScript.IsAlarmList)
             {
-                string json = data.Select(a => a).ToList().ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
-                topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.AlarmTopic, json));
+                var gList = data.Select(a => a).ToList();
+                string json = gList.ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.AlarmTopic, json, gList.Count));
             }
             else
             {
                 foreach (var group in data)
                 {
                     string json = JsonExtensions.ToJsonNetString(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
-                    topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.AlarmTopic, json));
+                    topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.AlarmTopic, json, 1));
                 }
             }
         }
@@ -128,7 +134,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
     protected List<TopicJson> GetDeviceData(IEnumerable<DevModel> item)
     {
         IEnumerable<dynamic>? data = Application.DynamicModelExtension.GetDynamicModel<DevModel>(item, _businessPropertyWithCacheIntervalScript.BigTextScriptDeviceModel);
-        List<TopicJson> topicJsonList = new List<TopicJson>();
+        var topicJsonList = new List<TopicJson>();
         var topics = Match(_businessPropertyWithCacheIntervalScript.DeviceTopic);
         if (topics.Count > 0)
         {
@@ -153,9 +159,10 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         if (_businessPropertyWithCacheIntervalScript.IsDeviceList)
                         {
                             // 如果是设备列表，则将整个分组转换为 JSON 字符串
-                            string json = group.Select(a => a).ToList().ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                            var gList = group.Select(a => a).ToList();
+                            string json = gList.ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
-                            topicJsonList.Add(new(topic, json));
+                            topicJsonList.Add(new(topic, json, gList.Count));
                         }
                         else
                         {
@@ -164,7 +171,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                             {
                                 string json = JsonExtensions.ToJsonNetString(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                                 // 将主题和 JSON 内容添加到列表中
-                                topicJsonList.Add(new(topic, json));
+                                topicJsonList.Add(new(topic, json, 1));
                             }
                         }
                     }
@@ -175,15 +182,16 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
         {
             if (_businessPropertyWithCacheIntervalScript.IsDeviceList)
             {
-                string json = data.Select(a => a).ToList().ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
-                topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.DeviceTopic, json));
+                var gList = data.Select(a => a).ToList();
+                string json = gList.ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.DeviceTopic, json, gList.Count));
             }
             else
             {
                 foreach (var group in data)
                 {
                     string json = JsonExtensions.ToJsonNetString(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
-                    topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.DeviceTopic, json));
+                    topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.DeviceTopic, json, 1));
                 }
             }
         }
@@ -193,7 +201,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
     protected List<TopicJson> GetVariable(IEnumerable<VarModel> item)
     {
         IEnumerable<dynamic>? data = Application.DynamicModelExtension.GetDynamicModel<VarModel>(item, _businessPropertyWithCacheIntervalScript.BigTextScriptVariableModel);
-        List<TopicJson> topicJsonList = new List<TopicJson>();
+        var topicJsonList = new List<TopicJson>();
         var topics = Match(_businessPropertyWithCacheIntervalScript.VariableTopic);
         if (topics.Count > 0)
         {
@@ -218,9 +226,10 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         if (_businessPropertyWithCacheIntervalScript.IsVariableList)
                         {
                             // 如果是变量列表，则将整个分组转换为 JSON 字符串
-                            string json = group.Select(a => a).ToList().ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                            var gList = group.Select(a => a).ToList();
+                            string json = gList.ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
-                            topicJsonList.Add(new(topic, json));
+                            topicJsonList.Add(new(topic, json, gList.Count));
                         }
                         else
                         {
@@ -229,7 +238,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                             {
                                 string json = JsonExtensions.ToJsonNetString(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                                 // 将主题和 JSON 内容添加到列表中
-                                topicJsonList.Add(new(topic, json));
+                                topicJsonList.Add(new(topic, json, 1));
                             }
                         }
                     }
@@ -240,15 +249,16 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
         {
             if (_businessPropertyWithCacheIntervalScript.IsVariableList)
             {
-                string json = data.Select(a => a).ToList().ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
-                topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json));
+                var gList = data.Select(a => a).ToList();
+                string json = gList.ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, gList.Count));
             }
             else
             {
                 foreach (var group in data)
                 {
                     string json = JsonExtensions.ToJsonNetString(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
-                    topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json));
+                    topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, 1));
                 }
             }
         }
@@ -267,7 +277,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
         {
             data = item;
         }
-        List<TopicJson> topicJsonList = new List<TopicJson>();
+        var topicJsonList = new List<TopicJson>();
         var topics = Match(_businessPropertyWithCacheIntervalScript.VariableTopic);
         if (topics.Count > 0)
         {
@@ -291,10 +301,11 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         // 上传内容
                         if (_businessPropertyWithCacheIntervalScript.IsVariableList)
                         {
+
                             // 如果是变量列表，则将整个分组转换为 JSON 字符串
                             string json = group.Select(a => a).GroupBy(a => a.DeviceName, b => b).ToDictionary(a => a.Key, b => b.ToList()).ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
-                            topicJsonList.Add(new(topic, json));
+                            topicJsonList.Add(new(topic, json, group.Count()));
                         }
                         else
                         {
@@ -303,7 +314,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                             {
                                 string json = JsonExtensions.ToJsonNetString(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                                 // 将主题和 JSON 内容添加到列表中
-                                topicJsonList.Add(new(topic, json));
+                                topicJsonList.Add(new(topic, json, 1));
                             }
                         }
                     }
@@ -315,24 +326,58 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
             if (_businessPropertyWithCacheIntervalScript.IsVariableList)
             {
                 string json = data.Select(a => a).GroupBy(a => a.DeviceName, b => b).ToDictionary(a => a.Key, b => b.ToList()).ToJsonNetString(_businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
-                topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json));
+                topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, data.Count()));
             }
             else
             {
                 foreach (var group in data)
                 {
                     string json = JsonExtensions.ToJsonNetString(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
-                    topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json));
+                    topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, 1));
                 }
             }
         }
         return topicJsonList;
     }
 
+    //protected static byte[] Serialize(object value)
+    //{
+    //    var block = new ValueByteBlock(1024 * 64);
+    //    try
+    //    {
+    //        //将数据序列化到内存块
+    //        FastBinaryFormatter.Serialize(ref block, value);
+    //        block.SeekToStart();
+    //        return block.Memory.GetArray().Array;
+    //    }
+    //    finally
+    //    {
+    //        block.Dispose();
+    //    }
+    //}
+    protected static JsonSerializerOptions NoWriteIndentedJsonSerializerOptions = new JsonSerializerOptions
+    {
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+        WriteIndented = false
+    };
+    protected static JsonSerializerOptions WriteIndentedJsonSerializerOptions = new JsonSerializerOptions
+    {
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+        WriteIndented = true
+    };
+
+    protected static byte[] Serialize(object data, bool writeIndented)
+    {
+        if (data == null) return Array.Empty<byte>();
+        byte[] payload = JsonSerializer.SerializeToUtf8Bytes(data, data.GetType(), writeIndented ? WriteIndentedJsonSerializerOptions : NoWriteIndentedJsonSerializerOptions);
+        return payload;
+    }
+
+
     protected List<TopicArray> GetAlarmTopicArrays(IEnumerable<AlarmModel> item)
     {
         IEnumerable<dynamic>? data = Application.DynamicModelExtension.GetDynamicModel<AlarmModel>(item, _businessPropertyWithCacheIntervalScript.BigTextScriptAlarmModel);
-        List<TopicArray> topicJsonList = new List<TopicArray>();
+        List<TopicArray> topicArrayList = new List<TopicArray>();
         var topics = Match(_businessPropertyWithCacheIntervalScript.AlarmTopic);
         if (topics.Count > 0)
         {
@@ -355,18 +400,19 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                     // 上传内容
                     if (_businessPropertyWithCacheIntervalScript.IsAlarmList)
                     {
-                        var json = Serialize(group.Select(a => a).ToList().ToList());
+                        var gList = group.Select(a => a).ToList();
+                        var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                         // 将主题和 JSON 内容添加到列表中
-                        topicJsonList.Add(new(topic, json));
+                        topicArrayList.Add(new(topic, json, gList.Count));
                     }
                     else
                     {
                         // 如果不是报警列表，则将每个分组元素分别转换为 JSON 字符串
                         foreach (var gro in group)
                         {
-                            var json = Serialize(gro);
+                            var json = Serialize(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
-                            topicJsonList.Add(new(topic, json));
+                            topicArrayList.Add(new(topic, json, 1));
                         }
                     }
                 }
@@ -376,42 +422,27 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
         {
             if (_businessPropertyWithCacheIntervalScript.IsAlarmList)
             {
-                var json = Serialize(data.Select(a => a).ToList());
-                topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.AlarmTopic, json));
+                var gList = data.Select(a => a).ToList();
+                var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.AlarmTopic, json, gList.Count));
             }
             else
             {
                 foreach (var group in data)
                 {
-                    var json = Serialize(group);
-                    topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.AlarmTopic, json));
+                    var json = Serialize(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                    topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.AlarmTopic, json, 1));
                 }
             }
         }
 
-        return topicJsonList;
-    }
-
-    protected static ArraySegment<byte> Serialize(object value)
-    {
-        var block = new ValueByteBlock(1024 * 64);
-        try
-        {
-            //将数据序列化到内存块
-            FastBinaryFormatter.Serialize(ref block, value);
-            block.SeekToStart();
-            return block.Memory.GetArray();
-        }
-        finally
-        {
-            block.Dispose();
-        }
+        return topicArrayList;
     }
 
     protected List<TopicArray> GetDeviceTopicArray(IEnumerable<DevModel> item)
     {
         IEnumerable<dynamic>? data = Application.DynamicModelExtension.GetDynamicModel<DevModel>(item, _businessPropertyWithCacheIntervalScript.BigTextScriptDeviceModel);
-        List<TopicArray> topicJsonList = new List<TopicArray>();
+        List<TopicArray> topicArrayList = new List<TopicArray>();
         var topics = Match(_businessPropertyWithCacheIntervalScript.DeviceTopic);
         if (topics.Count > 0)
         {
@@ -436,18 +467,19 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         if (_businessPropertyWithCacheIntervalScript.IsDeviceList)
                         {
                             // 如果是设备列表，则将整个分组转换为 JSON 字符串
-                            var json = Serialize(group.Select(a => a).ToList());
+                            var gList = group.Select(a => a).ToList();
+                            var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
-                            topicJsonList.Add(new(topic, json));
+                            topicArrayList.Add(new(topic, json, gList.Count));
                         }
                         else
                         {
                             // 如果不是设备列表，则将每个分组元素分别转换为 JSON 字符串
                             foreach (var gro in group)
                             {
-                                var json = Serialize(gro);
+                                var json = Serialize(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                                 // 将主题和 JSON 内容添加到列表中
-                                topicJsonList.Add(new(topic, json));
+                                topicArrayList.Add(new(topic, json, 1));
                             }
                         }
                     }
@@ -458,25 +490,26 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
         {
             if (_businessPropertyWithCacheIntervalScript.IsDeviceList)
             {
-                var json = Serialize(data.Select(a => a).ToList());
-                topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.DeviceTopic, json));
+                var gList = data.Select(a => a).ToList();
+                var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.DeviceTopic, json, gList.Count));
             }
             else
             {
                 foreach (var group in data)
                 {
-                    var json = Serialize(group);
-                    topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.DeviceTopic, json));
+                    var json = Serialize(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                    topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.DeviceTopic, json, 1));
                 }
             }
         }
-        return topicJsonList;
+        return topicArrayList;
     }
 
     protected List<TopicArray> GetVariableTopicArray(IEnumerable<VarModel> item)
     {
         IEnumerable<dynamic>? data = Application.DynamicModelExtension.GetDynamicModel<VarModel>(item, _businessPropertyWithCacheIntervalScript.BigTextScriptVariableModel);
-        List<TopicArray> topicJsonList = new List<TopicArray>();
+        List<TopicArray> topicArrayList = new List<TopicArray>();
         var topics = Match(_businessPropertyWithCacheIntervalScript.VariableTopic);
         if (topics.Count > 0)
         {
@@ -501,18 +534,19 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         if (_businessPropertyWithCacheIntervalScript.IsVariableList)
                         {
                             // 如果是变量列表，则将整个分组转换为 JSON 字符串
-                            var json = Serialize(group.Select(a => a).ToList());
+                            var gList = group.Select(a => a).ToList();
+                            var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
-                            topicJsonList.Add(new(topic, json));
+                            topicArrayList.Add(new(topic, json, gList.Count));
                         }
                         else
                         {
                             // 如果不是变量列表，则将每个分组元素分别转换为 JSON 字符串
                             foreach (var gro in group)
                             {
-                                var json = Serialize(gro);
+                                var json = Serialize(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                                 // 将主题和 JSON 内容添加到列表中
-                                topicJsonList.Add(new(topic, json));
+                                topicArrayList.Add(new(topic, json, 1));
                             }
                         }
                     }
@@ -523,22 +557,22 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
         {
             if (_businessPropertyWithCacheIntervalScript.IsVariableList)
             {
-                var json = Serialize(data.Select(a => a).ToList());
-                topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json));
+                var gList = data.Select(a => a).ToList();
+                var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, gList.Count));
             }
             else
             {
                 foreach (var group in data)
                 {
-                    var json = Serialize(group);
-                    topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json));
+                    var json = Serialize(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                    topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, 1));
                 }
             }
         }
-        return topicJsonList;
+        return topicArrayList;
     }
 
-
     protected List<TopicArray> GetVariableBasicDataTopicArray(IEnumerable<VariableBasicData> item)
     {
         IEnumerable<VariableBasicData>? data = null;
@@ -551,7 +585,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
             data = item;
         }
 
-        List<TopicArray> topicJsonList = new List<TopicArray>();
+        List<TopicArray> topicArrayList = new List<TopicArray>();
         var topics = Match(_businessPropertyWithCacheIntervalScript.VariableTopic);
         if (topics.Count > 0)
         {
@@ -576,18 +610,19 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
                         if (_businessPropertyWithCacheIntervalScript.IsVariableList)
                         {
                             // 如果是变量列表，则将整个分组转换为 JSON 字符串
-                            var json = Serialize(group.Select(a => a).ToList());
+                            var gList = group.Select(a => a).ToList();
+                            var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                             // 将主题和 JSON 内容添加到列表中
-                            topicJsonList.Add(new(topic, json));
+                            topicArrayList.Add(new(topic, json, gList.Count));
                         }
                         else
                         {
                             // 如果不是变量列表，则将每个分组元素分别转换为 JSON 字符串
                             foreach (var gro in group)
                             {
-                                var json = Serialize(gro);
+                                var json = Serialize(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
                                 // 将主题和 JSON 内容添加到列表中
-                                topicJsonList.Add(new(topic, json));
+                                topicArrayList.Add(new(topic, json, 1));
                             }
                         }
                     }
@@ -598,21 +633,40 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
         {
             if (_businessPropertyWithCacheIntervalScript.IsVariableList)
             {
-                var json = Serialize(data.Select(a => a).ToList());
-                topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json));
+                var gList = data.Select(a => a).ToList();
+                var json = Serialize(gList, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, gList.Count));
             }
             else
             {
                 foreach (var group in data)
                 {
-                    var json = Serialize(group);
-                    topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json));
+                    var json = Serialize(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
+                    topicArrayList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json, 1));
                 }
             }
         }
-        return topicJsonList;
+        return topicArrayList;
     }
 
 
+    protected string GetDetailLogString(TopicArray topicArray, int queueCount)
+    {
+        if (queueCount > 0)
+            return $"Up Topic：{topicArray.Topic}{Environment.NewLine}PayLoad：{Encoding.UTF8.GetString(topicArray.Json)} {Environment.NewLine} VarModelQueue:{queueCount}";
+        else
+            return $"Up Topic：{topicArray.Topic}{Environment.NewLine}PayLoad：{Encoding.UTF8.GetString(topicArray.Json)}";
+    }
+
+    protected string GetCountLogString(TopicArray topicArray, int queueCount)
+    {
+        if (queueCount > 0)
+            return $"Up Topic：{topicArray.Topic}{Environment.NewLine}Count：{topicArray.Count} {Environment.NewLine} VarModelQueue:{queueCount}";
+        else
+            return $"Up Topic：{topicArray.Topic}{Environment.NewLine}Count：{topicArray.Count}";
+
+    }
+    [GeneratedRegex(@"\$\{(.+?)\}")]
+    private static partial Regex TopicRegex();
     #endregion 封装方法
 }

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

@@ -18,10 +18,10 @@ using TouchSocket.Core;
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
-/// 抽象类 <see cref="BusinessBaseWithCacheIntervalVariableModel{T}"/>，表示具有缓存间隔功能的业务基类，其中 T 代表变量模型。
+/// 抽象类 <see cref="BusinessBaseWithCacheIntervalVariableModel{VarModel}"/>，表示具有缓存间隔功能的业务基类，其中 T 代表变量模型。
 /// </summary>
-/// <typeparam name="T">变量模型类型</typeparam>
-public abstract class BusinessBaseWithCacheIntervalVariableModel<T> : BusinessBaseWithCacheVariableModel<T>
+/// <typeparam name="VarModel">变量模型类型</typeparam>
+public abstract class BusinessBaseWithCacheIntervalVariableModel<VarModel> : BusinessBaseWithCacheVariableModel<VarModel>
 {
     /// <summary>
     /// 用于定时触发的时间间隔。
@@ -73,7 +73,7 @@ public abstract class BusinessBaseWithCacheIntervalVariableModel<T> : BusinessBa
         // 触发一次变量值变化事件
         IdVariableRuntimes.ForEach(a =>
         {
-            if (a.Value.IsOnline)
+            if (a.Value.IsOnline && _businessPropertyWithCacheInterval.BusinessUpdateEnum != BusinessUpdateEnum.Interval)
                 VariableValueChange(a.Value, a.Value.Adapt<VariableBasicData>());
         });
     }
@@ -110,6 +110,8 @@ public abstract class BusinessBaseWithCacheIntervalVariableModel<T> : BusinessBa
                 {
                     if (_exTTimerTick.IsTickHappen())
                     {
+                        if (LogMessage.LogLevel <= LogLevel.Debug)
+                            LogMessage?.LogDebug($"Interval  {typeof(VarModel).Name}  data, count {IdVariableRuntimes.Count}");
                         //间隔推送全部变量
                         var variableRuntimes = IdVariableRuntimes.Select(a => a.Value);
                         VariableTimeInterval(variableRuntimes, variableRuntimes.Adapt<List<VariableBasicData>>());

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

@@ -1,32 +0,0 @@
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://thingsgateway.cn/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-
-using BootstrapBlazor.Components;
-
-namespace ThingsGateway.Gateway.Application;
-
-/// <summary>
-/// <inheritdoc/>
-/// </summary>
-public class BusinessPropertyWithCacheIntervalDBScript : BusinessPropertyWithCacheInterval
-{
-    /// <summary>
-    /// 表定义实体脚本
-    /// </summary>
-    [DynamicProperty]
-    [AutoGenerateColumn(ComponentType = typeof(Textarea), Rows = 3)]
-    public string? BigTextScriptTableModel { get; set; }
-
-    /// <summary>
-    /// 数据脚本
-    /// </summary>
-    [AutoGenerateColumn(ComponentType = typeof(Textarea), Rows = 3)]
-    public string? BigTextScriptDataModel { get; set; }
-}

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

@@ -12,11 +12,13 @@ namespace ThingsGateway.Gateway.Application;
 
 public struct TopicArray
 {
-    public TopicArray(string topic, ArraySegment<byte> json)
+    public TopicArray(string topic, byte[] json, int count)
     {
-        Topic = topic; Json = json;
+        Topic = topic; Json = json; Count = count;
     }
 
-    public ArraySegment<byte> Json { get; set; }
+    public int Count { get; set; } = 1;
+    public byte[] Json { get; set; }
     public string Topic { get; set; }
+
 }

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

@@ -12,10 +12,11 @@ namespace ThingsGateway.Gateway.Application;
 
 public struct TopicJson
 {
-    public TopicJson(string topic, string json)
+    public TopicJson(string topic, string json, int count)
     {
-        Topic = topic; Json = json;
+        Topic = topic; Json = json; Count = count;
     }
+    public int Count { get; set; } = 1;
 
     public string Json { get; set; }
     public string Topic { get; set; }

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

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

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

@@ -56,7 +56,7 @@ public class Device : BaseDataEntity, IValidatableObject
     /// <summary>
     /// 通道
     /// </summary>
-    [SugarColumn(ColumnDescription = "通道", Length = 200)]
+    [SugarColumn(ColumnDescription = "通道")]
     [AutoGenerateColumn(Ignore = true)]
     [IgnoreExcel]
     [MinValue(1)]

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

@@ -51,6 +51,13 @@ public class Variable : BaseDataEntity, IValidatableObject
     [Required]
     public virtual string Name { get; set; }
 
+    /// <summary>
+    /// 采集组
+    /// </summary>
+    [SugarColumn(ColumnDescription = "采集组", IsNullable = true)]
+    [AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 1)]
+    public virtual string CollectGroup { get; set; } = string.Empty;
+
     /// <summary>
     /// 分组名称
     /// </summary>

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

@@ -97,6 +97,7 @@
     "Name": "Name",
     "Description": "Description",
     "Group": "Group",
+    "CollectGroup": "CollectGroup",
     "DeviceId": "CollectionDevice",
     "DeviceId.MinValue": "{0} cannot be empty",
     "DeviceId.Required": "{0} cannot be empty",
@@ -452,6 +453,7 @@
     "Name.Required": "{0} cannot be empty",
     "Description": "Description",
     "Group": "Group",
+    "CollectGroup": "CollectGroup",
     "DeviceId": "CollectionDevice",
     "DeviceId.MinValue": "{0} cannot be empty",
     "DeviceId.Required": "{0} cannot be empty",

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

@@ -89,7 +89,8 @@
     "Name": "名称",
     "Name.Required": " {0} 不可为空",
     "Description": "描述",
-    "Group": "分组",
+    "Group": "业务组",
+    "CollectGroup": "采集组",
     "DeviceId": "采集设备",
     "DeviceId.MinValue": " {0} 不可为空",
     "DeviceId.Required": " {0} 不可为空",
@@ -486,7 +487,8 @@
     "Name": "名称",
     "Name.Required": " {0} 不可为空",
     "Description": "描述",
-    "Group": "分组",
+    "Group": "业务组",
+    "CollectGroup": "采集组",
     "DeviceId": "采集设备",
     "DeviceId.MinValue": " {0} 不可为空",
     "DeviceId.Required": " {0} 不可为空",

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

@@ -131,7 +131,7 @@ public class ChannelRuntime : Channel, IChannelOptions, IDisposable
 
     public void Dispose()
     {
-        Config?.SafeDispose();
+        //Config?.SafeDispose();
 
         GlobalData.Channels.TryRemove(Id, out _);
         DeviceThreadManage = null;
@@ -146,4 +146,57 @@ public class ChannelRuntime : Channel, IChannelOptions, IDisposable
         return $"{Name}[{base.ToString()}]";
     }
 
+
+    public IChannel GetChannel(TouchSocketConfig config)
+    {
+        lock (GlobalData.Channels)
+        {
+
+            if (DeviceThreadManage?.Channel?.DisposedValue == false)
+                return DeviceThreadManage?.Channel;
+
+
+            if (ChannelType == ChannelTypeEnum.TcpService
+                || ChannelType == ChannelTypeEnum.SerialPort
+                || ChannelType == ChannelTypeEnum.UdpSession
+                )
+            {
+                //获取相同配置的Tcp服务或Udp服务或COM
+                var same = GlobalData.Channels.FirstOrDefault(a =>
+                 {
+                     if (a.Value == this)
+                         return false;
+                     if (a.Value.DeviceThreadManage?.Channel?.DisposedValue == true || a.Value.DeviceThreadManage?.Channel?.DisposedValue == null)
+                         return false;
+
+                     if (a.Value.ChannelType == ChannelType)
+                     {
+                         if (a.Value.ChannelType == ChannelTypeEnum.TcpService)
+                             if (a.Value.BindUrl == BindUrl)
+                                 return true;
+                         if (a.Value.ChannelType == ChannelTypeEnum.UdpSession)
+                             if ((!BindUrl.IsNullOrWhiteSpace()) && a.Value.BindUrl == BindUrl)
+                                 return true;
+                         if (a.Value.ChannelType == ChannelTypeEnum.SerialPort)
+                             if (a.Value.PortName == PortName)
+                                 return true;
+                     }
+                     return false;
+                 }).Value;
+
+                if (same != null)
+                {
+                    return same.GetChannel(config);
+                }
+            }
+
+            if (DeviceThreadManage?.Channel?.DisposedValue == false)
+                return DeviceThreadManage?.Channel;
+
+            var ichannel = config.GetChannel(this);
+            return ichannel;
+        }
+
+    }
+
 }

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

@@ -19,5 +19,8 @@ public class VariableMapper : IRegister
     {
         config.ForType<Variable, VariableRuntime>()
         .Map(dest => dest.Value, src => src.InitValue);
+
+        config.ForType<VariableRuntime, VariableRuntime>()
+.Ignore(dest => dest.DeviceRuntime);
     }
 }

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

@@ -216,16 +216,7 @@ public class ChannelRuntimeService : IChannelRuntimeService
             await RuntimeServiceHelper.InitAsync(newChannelRuntimes, newDeviceRuntimes, _logger).ConfigureAwait(false);
 
 
-            var startCollectChannelEnable = GlobalData.StartCollectChannelEnable;
-            var startBusinessChannelEnable = GlobalData.StartBusinessChannelEnable;
-
-            var collectChannelRuntimes = newChannelRuntimes.Where(x => (x.Enable && x.IsCollect == true && startCollectChannelEnable));
-
-            var businessChannelRuntimes = newChannelRuntimes.Where(x => (x.Enable && x.IsCollect == false && startBusinessChannelEnable));
-
-            //根据初始冗余属性，筛选启动
-            await GlobalData.ChannelThreadManage.RestartChannelAsync(businessChannelRuntimes).ConfigureAwait(false);
-            await GlobalData.ChannelThreadManage.RestartChannelAsync(collectChannelRuntimes).ConfigureAwait(false);
+            await GlobalData.ChannelThreadManage.RestartChannelAsync(newChannelRuntimes).ConfigureAwait(false);
 
         }
         catch (Exception ex)

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

@@ -329,8 +329,8 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
         ManageHelper.CheckChannelCount(insertData.Count);
 
         using var db = GetDB();
-        await db.Fastest<Channel>().PageSize(100000).BulkCopyAsync(insertData).ConfigureAwait(false);
-        await db.Fastest<Channel>().PageSize(100000).BulkUpdateAsync(upData).ConfigureAwait(false);
+        await db.BulkCopyAsync(insertData, 100000).ConfigureAwait(false);
+        await db.BulkUpdateAsync(upData, 100000).ConfigureAwait(false);
         DeleteChannelFromCache();
         return channels.Select(a => a.Id).ToHashSet();
     }

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

@@ -351,8 +351,8 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
         ManageHelper.CheckDeviceCount(insertData.Count);
 
         using var db = GetDB();
-        await db.Fastest<Device>().PageSize(100000).BulkCopyAsync(insertData).ConfigureAwait(false);
-        await db.Fastest<Device>().PageSize(100000).BulkUpdateAsync(upData).ConfigureAwait(false);
+        await db.BulkCopyAsync(insertData, 100000).ConfigureAwait(false);
+        await db.BulkUpdateAsync(upData, 100000).ConfigureAwait(false);
         DeleteDeviceFromCache();
         return devices.Select(a => a.Id).ToHashSet();
     }

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

@@ -16,8 +16,6 @@ using System.Collections.Concurrent;
 
 using ThingsGateway.NewLife;
 
-using TouchSocket.Core;
-
 namespace ThingsGateway.Gateway.Application;
 
 internal sealed class ChannelThreadManage : IChannelThreadManage
@@ -115,8 +113,6 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
     {
         await PrivateRemoveChannelsAsync(channelRuntimes.Select(a => a.Id)).ConfigureAwait(false);
 
-        BytePool.Default.Clear();
-
         await channelRuntimes.ParallelForEachAsync(async (channelRuntime, token) =>
         {
             try

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

@@ -117,10 +117,9 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
         // 添加默认日志记录器
         LogMessage.AddLogger(new EasyLogger(logger.Log_Out) { LogLevel = TouchSocket.Core.LogLevel.Trace });
 
-        var ichannel = config.GetChannel(channelRuntime);
-
         // 根据配置获取通道实例
-        Channel = ichannel;
+        Channel = channelRuntime.GetChannel(config);
+
 
         //初始设置输出文本日志
         SetLog(CurrentChannel.LogLevel);
@@ -901,7 +900,8 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
             await NewDeviceLock.WaitAsync().ConfigureAwait(false);
 
             await PrivateRemoveDevicesAsync(Drivers.Keys).ConfigureAwait(false);
-            Channel?.SafeDispose();
+            if (Channel?.Collects.Count == 0)
+                Channel?.SafeDispose();
 
             LogMessage?.LogInformation(Localizer["ChannelDispose", CurrentChannel?.Name ?? string.Empty]);
 

src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/GatewayMonitorHostedService.cs

@@ -71,16 +71,7 @@ internal sealed class GatewayMonitorHostedService : BackgroundService, IGatewayM
                 }
             }
 
-            var startCollectChannelEnable = GlobalData.StartCollectChannelEnable;
-            var startBusinessChannelEnable = GlobalData.StartBusinessChannelEnable;
-
-            var collectChannelRuntimes = channelRuntimes.Where(x => (x.Enable && x.IsCollect == true && startCollectChannelEnable));
-
-            var businessChannelRuntimes = channelRuntimes.Where(x => (x.Enable && x.IsCollect == false && startBusinessChannelEnable));
-
-            //根据初始冗余属性，筛选启动
-            await ChannelThreadManage.RestartChannelAsync(businessChannelRuntimes).ConfigureAwait(false);
-            await ChannelThreadManage.RestartChannelAsync(collectChannelRuntimes).ConfigureAwait(false);
+            await ChannelThreadManage.RestartChannelAsync(channelRuntimes).ConfigureAwait(false);
 
 
         }

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

@@ -217,9 +217,9 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
 
         var result = await db.UseTranAsync(async () =>
         {
-            await db.Fastest<Channel>().PageSize(100000).BulkCopyAsync(newChannels).ConfigureAwait(false);
-            await db.Fastest<Device>().PageSize(100000).BulkCopyAsync(newDevices).ConfigureAwait(false);
-            await db.Fastest<Variable>().PageSize(100000).BulkCopyAsync(newVariables).ConfigureAwait(false);
+            await db.BulkCopyAsync(newChannels, 100000).ConfigureAwait(false);
+            await db.BulkCopyAsync(newDevices, 100000).ConfigureAwait(false);
+            await db.BulkCopyAsync(newVariables, 100000).ConfigureAwait(false);
         }).ConfigureAwait(false);
         if (result.IsSuccess)//如果成功了
         {
@@ -486,8 +486,8 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
         var insertData = variables.Where(a => !a.IsUp).ToList();
         ManageHelper.CheckVariableCount(insertData.Count);
         using var db = GetDB();
-        await db.Fastest<Variable>().PageSize(100000).BulkCopyAsync(insertData).ConfigureAwait(false);
-        await db.Fastest<Variable>().PageSize(100000).BulkUpdateAsync(upData).ConfigureAwait(false);
+        await db.BulkCopyAsync(insertData, 100000).ConfigureAwait(false);
+        await db.BulkUpdateAsync(upData, 100000).ConfigureAwait(false);
         _dispatchService.Dispatch(new());
         DeleteVariableCache();
         return variables.Select(a => a.Id).ToHashSet();

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

@@ -10,6 +10,10 @@
 
 using Mapster;
 
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
 using System.Reflection;
 
 namespace ThingsGateway.Gateway.Application;
@@ -17,7 +21,7 @@ namespace ThingsGateway.Gateway.Application;
 [AppStartup(-100)]
 public class Startup : AppStartup
 {
-    public void ConfigureAdminApp(IServiceCollection services)
+    public void Configure(IServiceCollection services)
     {
         services.AddConfigurableOptions<ChannelThreadOptions>();
         services.AddConfigurableOptions<GatewayLogOptions>();
@@ -62,8 +66,9 @@ public class Startup : AppStartup
         services.AddGatewayHostedService<IGatewayMonitorHostedService, GatewayMonitorHostedService>();
     }
 
-    public void UseAdminCore(IServiceProvider serviceProvider)
+    public void Use(IApplicationBuilder applicationBuilder)
     {
+        var serviceProvider = applicationBuilder.ApplicationServices;
         //检查ConfigId
         var configIdGroup = DbContext.DbConfigs.GroupBy(it => it.ConfigId);
         foreach (var configId in configIdGroup)
@@ -71,6 +76,7 @@ public class Startup : AppStartup
             if (configId.Count() > 1) throw new($"Sqlsugar connect configId: {configId.Key} Duplicate!");
         }
 
+
         //遍历配置
         DbContext.DbConfigs?.ForEach(it =>
         {
@@ -79,6 +85,20 @@ public class Startup : AppStartup
             if (it.InitTable == true)
                 connection.DbMaintenance.CreateDatabase();//创建数据库,如果存在则不创建
         });
+
+
+        //兼容变量名称唯一键处理
+        try
+        {
+            using var db = DbContext.GetDB<Variable>();
+            if (db.DbMaintenance.IsAnyIndex("unique_variable_name"))
+            {
+                var tables = db.DbMaintenance.DropIndex("unique_variable_name");
+            }
+        }
+        catch { }
+
+
         var fullName = Assembly.GetExecutingAssembly().FullName;//获取程序集全名
         CodeFirstUtils.CodeFirst(fullName!);//CodeFirst
 
@@ -88,16 +108,32 @@ public class Startup : AppStartup
         try
         {
             using var db = DbContext.GetDB<Channel>();
-            if (!db.DbMaintenance.IsAnyColumn(nameof(Channel), "LogEnable", false)) return;
-            var tables = db.DbMaintenance.DropColumn(nameof(Channel), "LogEnable");
+            if (db.DbMaintenance.IsAnyColumn(nameof(Channel), "LogEnable", false))
+            {
+                var tables = db.DbMaintenance.DropColumn(nameof(Channel), "LogEnable");
+            }
         }
         catch { }
         try
         {
             using var db = DbContext.GetDB<Device>();
-            if (!db.DbMaintenance.IsAnyColumn(nameof(Device), "LogEnable", false)) return;
-            var tables = db.DbMaintenance.DropColumn(nameof(Device), "LogEnable");
+            if (db.DbMaintenance.IsAnyColumn(nameof(Device), "LogEnable", false))
+            {
+                var tables = db.DbMaintenance.DropColumn(nameof(Device), "LogEnable");
+            }
         }
         catch { }
+
+
+
+
+        serviceProvider.GetService<IHostApplicationLifetime>().ApplicationStarted.Register(() =>
+        {
+            serviceProvider.GetService<ILoggerFactory>().CreateLogger(nameof(ThingsGateway)).LogInformation("ThingsGateway is started...");
+        });
+        serviceProvider.GetService<IHostApplicationLifetime>().ApplicationStopping.Register(() =>
+        {
+            serviceProvider.GetService<ILoggerFactory>().CreateLogger(nameof(ThingsGateway)).LogInformation("ThingsGateway is stopping...");
+        });
     }
 }

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

@@ -7,10 +7,9 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
-		<PackageReference Include="SqlSugar.TDengineCore" Version="4.18.6" />
 		<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
-		<PackageReference Include="TouchSocket.Dmtp" Version="3.0.25" />
-		<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.0.25" />
+		<PackageReference Include="TouchSocket.Dmtp" Version="3.1.2" />
+		<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.1.2" />
 		<PackageReference Include="ThingsGateway.Authentication" Version="$(AuthenticationVersion)" />
 
 	</ItemGroup>

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

@@ -105,8 +105,8 @@ public class TcpSessionClientDto
     public string PluginInfos { get; set; }
 
     [AutoGenerateColumn(Searchable = true, Filterable = true, Sortable = true)]
-    public DateTime LastReceivedTime { get; set; }
+    public DateTimeOffset LastReceivedTime { get; set; }
 
     [AutoGenerateColumn(Searchable = true, Filterable = true, Sortable = true)]
-    public DateTime LastSentTime { get; set; }
+    public DateTimeOffset LastSentTime { get; set; }
 }

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

@@ -1299,6 +1299,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
             try
             {
                 if (Disposed) return;
+                await Task.Delay(1000);
                 await OnClickSearch(SearchText);
 
                 Value = GetValue(Value);
@@ -1310,7 +1311,6 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
             }
             finally
             {
-                await Task.Delay(2000);
                 _isExecuting = false;
             }
         }

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

@@ -129,7 +129,6 @@ public partial class PropertyComponent : IPropertyUIBase
             return;
         }
 
-
         var op = new DialogOption()
         {
             IsScrolling = true,
@@ -144,6 +143,147 @@ public partial class PropertyComponent : IPropertyUIBase
     {
         {nameof(ScriptCheck.Data),data },
         {nameof(ScriptCheck.Script),script },
+        {nameof(ScriptCheck.OnGetDemo),()=>
+                {
+                    return
+                    pname == nameof(BusinessPropertyWithCacheIntervalScript.BigTextScriptDeviceModel)?
+                    """
+                    using ThingsGateway.Foundation;
+                    
+                    using System.Dynamic;
+                    using TouchSocket.Core;
+                    public class S1 : IDynamicModel
+                    {
+                        public IEnumerable<dynamic> GetList(IEnumerable<object> datas)
+                        {
+                            List<ExpandoObject> deviceObjs = new List<ExpandoObject>();
+                            foreach (var v in datas)
+                            {
+                                var device = (DeviceBasicData)v;
+                                var expando = new ExpandoObject();
+                                var deviceObj = new ExpandoObject();
+
+                                deviceObj.TryAdd(nameof(Device.Description), device.Description);
+                                deviceObj.TryAdd(nameof(DeviceBasicData.ActiveTime), device.ActiveTime);
+                                deviceObj.TryAdd(nameof(DeviceBasicData.DeviceStatus), device.DeviceStatus.ToString());
+                                deviceObj.TryAdd(nameof(DeviceBasicData.LastErrorMessage), device.LastErrorMessage);
+                                deviceObj.TryAdd(nameof(DeviceBasicData.PluginName), device.PluginName);
+                                deviceObj.TryAdd(nameof(DeviceBasicData.Remark1), device.Remark1);
+                                deviceObj.TryAdd(nameof(DeviceBasicData.Remark2), device.Remark2);
+                                deviceObj.TryAdd(nameof(DeviceBasicData.Remark3), device.Remark3);
+                                deviceObj.TryAdd(nameof(DeviceBasicData.Remark4), device.Remark4);
+                                deviceObj.TryAdd(nameof(DeviceBasicData.Remark5), device.Remark5);
+
+
+                                expando.TryAdd(nameof(Device.Name), deviceObj);
+
+                            }
+                            return deviceObjs;
+                        }
+                    }
+                    
+                    """
+                    :
+
+                    pname == nameof(BusinessPropertyWithCacheIntervalScript.BigTextScriptVariableModel)?
+
+                    """
+                    using System.Dynamic;
+                    using ThingsGateway.Foundation;
+                    using TouchSocket.Core;
+                    public class S2 : IDynamicModel
+                    {
+                        public IEnumerable<dynamic> GetList(IEnumerable<object> datas)
+                        {
+
+                            List<ExpandoObject> deviceObjs = new List<ExpandoObject>();
+                            //按设备名称分组
+                            var groups = datas.Where(a => !string.IsNullOrEmpty(((VariableBasicData)a).DeviceName)).GroupBy(a => ((VariableBasicData)a).DeviceName, a => ((VariableBasicData)a));
+                            foreach (var group in groups)
+                            {
+                                //按采集时间分组
+                                var data = group.GroupBy(a => a.CollectTime.DateTimeToUnixTimestamp());
+                                var deviceObj = new ExpandoObject();
+                                List<ExpandoObject> expandos = new List<ExpandoObject>();
+                                foreach (var item in data)
+                                {
+                                    var expando = new ExpandoObject();
+                                    expando.TryAdd("ts", item.Key);
+                                    var variableObj = new ExpandoObject();
+                                    foreach (var tag in item)
+                                    {
+                                        variableObj.TryAdd(tag.Name, tag.Value);
+                                    }
+                                    expando.TryAdd("values", variableObj);
+
+                                    expandos.Add(expando);
+                                }
+                                deviceObj.TryAdd(group.Key, expandos);
+                                deviceObjs.Add(deviceObj);
+                            }
+
+                            return deviceObjs;
+                        }
+                    }
+
+                    """
+                    :
+
+                    pname == nameof(BusinessPropertyWithCacheIntervalScript.BigTextScriptAlarmModel)?
+
+                    """
+                    using System.Dynamic;
+                    using ThingsGateway.Foundation;
+                                        
+                    using TouchSocket.Core;
+                    public class DeviceScript : IDynamicModel
+                    {
+                        public IEnumerable<dynamic> GetList(IEnumerable<object> datas)
+                        {
+
+                            List<ExpandoObject> deviceObjs = new List<ExpandoObject>();
+                            //按设备名称分组
+                            var groups = datas.Where(a => !string.IsNullOrEmpty(((AlarmVariable)a).DeviceName)).GroupBy(a => ((AlarmVariable)a).DeviceName, a => ((AlarmVariable)a));
+                            foreach (var group in groups)
+                            {
+                                //按采集时间分组
+                                var data = group.GroupBy(a => a.AlarmTime.DateTimeToUnixTimestamp());
+                                var deviceObj = new ExpandoObject();
+                                List<ExpandoObject> expandos = new List<ExpandoObject>();
+                                foreach (var item in data)
+                                {
+                                    var expando = new ExpandoObject();
+                                    expando.TryAdd("ts", item.Key);
+                                    var variableObj = new ExpandoObject();
+                                    foreach (var tag in item)
+                                    {
+                                        var alarmObj = new ExpandoObject();
+                                        alarmObj.TryAdd(nameof(tag.AlarmCode), tag.AlarmCode);
+                                        alarmObj.TryAdd(nameof(tag.AlarmText), tag.AlarmText);
+                                        alarmObj.TryAdd(nameof(tag.AlarmType), tag.AlarmType);
+                                        alarmObj.TryAdd(nameof(tag.AlarmLimit), tag.AlarmLimit);
+                                        alarmObj.TryAdd(nameof(tag.EventTime), tag.EventTime);
+                                        alarmObj.TryAdd(nameof(tag.EventType), tag.EventType);
+
+                                        variableObj.TryAdd(tag.Name, alarmObj);
+                                    }
+                                    expando.TryAdd("alarms", variableObj);
+
+                                    expandos.Add(expando);
+                                }
+                                deviceObj.TryAdd(group.Key, expandos);
+                                deviceObjs.Add(deviceObj);
+                            }
+
+                            return deviceObjs;
+                        }
+                    }
+                    """
+                    :
+                    ""
+                    ;
+                }
+            },
         {nameof(ScriptCheck.ScriptChanged),EventCallback.Factory.Create<string>(this, v =>
         {
                  if (pname == nameof(BusinessPropertyWithCacheIntervalScript.BigTextScriptAlarmModel))
@@ -171,3 +311,7 @@ public partial class PropertyComponent : IPropertyUIBase
     [Inject]
     private DialogService DialogService { get; set; }
 }
+
+
+
+

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

@@ -18,6 +18,8 @@
         <Alert Icon="fa-solid fa-circle-check" Color="Color.Success">@(new MarkupString("获取变量类实体，可用方法  <code>GlobalData.GetVariable(\"设备名称1\",\"变量名称1\")</code> "))</Alert>
         <Alert Icon="fa-solid fa-circle-check" Color="Color.Success">@(new MarkupString("详细说明查看文档对应内容页面"))</Alert>
 
+        <Button IsAsync OnClick="GetDemo" class="mt-3" Text="Demo" />
+
     </div>
     <div class="col-6  col-md-6">
         <BootstrapLabel Value=@Localizer["Input"] ShowLabelTooltip="true" />

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

@@ -56,4 +56,13 @@ public partial class ScriptCheck
     }
     [Inject]
     private IStringLocalizer<DeviceEditComponent> Localizer { get; set; }
+
+    private async Task GetDemo(Microsoft.AspNetCore.Components.Web.MouseEventArgs args)
+    {
+        Script = OnGetDemo?.Invoke();
+        await Change(Script);
+    }
+
+    [Parameter, EditorRequired]
+    public Func<string> OnGetDemo { get; set; }
 }

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

@@ -44,6 +44,7 @@
                     <EditorItem @bind-Field="@context.Name" Readonly=BatchEditEnable />
 
                     <EditorItem @bind-Field="@context.Description" />
+                    <EditorItem @bind-Field="@context.CollectGroup" />
                     <EditorItem @bind-Field="@context.Group" />
 
                     <EditorItem @bind-Field="@context.Unit" />

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

@@ -212,8 +212,8 @@ public partial class VariableEditComponent
                 {
                     var component = new BootstrapDynamicComponent(data.VariablePropertyUIType, new Dictionary<string, object?>
                     {
-                        [nameof(VariableEditComponent.Model)] = Model,
-                        [nameof(DeviceEditComponent.PluginPropertyEditorItems)] = data.EditorItems,
+                        [nameof(IPropertyUIBase.Model)] = Model,
+                        [nameof(IPropertyUIBase.PluginPropertyEditorItems)] = data.EditorItems,
                     });
                     VariablePropertyRenderFragments.AddOrUpdate(id, component.Render());
                 }

src/Gateway/ThingsGateway.Gateway.Razor/Startup.cs

@@ -15,7 +15,7 @@ namespace ThingsGateway.Gateway.Razor;
 [AppStartup(-1000)]
 public class Startup : AppStartup
 {
-    public void ConfigureAdminApp(IServiceCollection services)
+    public void Configure(IServiceCollection services)
     {
         services.AddBootstrapBlazorWinBoxService();
     }

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

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

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

@@ -19,11 +19,12 @@ namespace ThingsGateway.Management;
 [Route("openApi/autoUpdate")]
 [RolePermission]
 [LoggingMonitor]
+[ApiController]
 [Authorize(AuthenticationSchemes = "Bearer")]
-public class AutoUpdateControler : ControllerBase
+public class AutoUpdateController : ControllerBase
 {
     private IUpdateZipFileHostedService _updateZipFileService;
-    public AutoUpdateControler(IUpdateZipFileHostedService updateZipFileService)
+    public AutoUpdateController(IUpdateZipFileHostedService updateZipFileService)
     {
         _updateZipFileService = updateZipFileService;
     }

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

@@ -14,8 +14,8 @@
     "Password": "Password"
   },
 
-  "ThingsGateway.Management.AutoUpdateControler": {
-    "AutoUpdateControler": "AutoUpdate",
+  "ThingsGateway.Management.AutoUpdateController": {
+    "AutoUpdateController": "AutoUpdate",
     "Update": "Update"
   },
 

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

@@ -13,8 +13,8 @@
     "Unregister": "取消注册",
     "Password": "注册码"
   },
-  "ThingsGateway.Management.AutoUpdateControler": {
-    "AutoUpdateControler": "程序更新",
+  "ThingsGateway.Management.AutoUpdateController": {
+    "AutoUpdateController": "程序更新",
     "Update": "更新"
   },
   "ThingsGateway.Upgrade.UpdateZipFile": {

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

@@ -55,7 +55,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
     public string LogPath { get; }
     private TcpDmtpClient TcpDmtpClient;
     private TcpDmtpService TcpDmtpService;
-    private TcpDmtpClient GetTcpDmtpClient(RedundancyOptions redundancy)
+    private async Task<TcpDmtpClient> GetTcpDmtpClient(RedundancyOptions redundancy)
     {
         _log = new LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
         _log?.AddLogger(new EasyLogger(Log_Out) { LogLevel = TouchSocket.Core.LogLevel.Trace });
@@ -81,11 +81,11 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
                    .SetMaxFailCount(redundancy.MaxErrorCount);
                });
 
-        tcpDmtpClient.Setup(config);
+        await tcpDmtpClient.SetupAsync(config).ConfigureAwait(false);
         return tcpDmtpClient;
     }
 
-    private TcpDmtpService GetTcpDmtpService(RedundancyOptions redundancy)
+    private async Task<TcpDmtpService> GetTcpDmtpService(RedundancyOptions redundancy)
     {
         _log = new LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
         _log?.AddLogger(new EasyLogger(Log_Out) { LogLevel = TouchSocket.Core.LogLevel.Trace });
@@ -111,7 +111,7 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
                    .SetMaxFailCount(redundancy.MaxErrorCount);
                });
 
-        tcpDmtpService.Setup(config);
+        await tcpDmtpService.SetupAsync(config).ConfigureAwait(false);
         return tcpDmtpService;
     }
 
@@ -325,13 +325,13 @@ internal sealed class RedundancyHostedService : BackgroundService, IRedundancyHo
         {
             if (RedundancyOptions.IsMaster)
             {
-                TcpDmtpService = GetTcpDmtpService(RedundancyOptions);
+                TcpDmtpService = await GetTcpDmtpService(RedundancyOptions).ConfigureAwait(false);
                 await TcpDmtpService.StartAsync().ConfigureAwait(false);//启动
                 await ActiveAsync().ConfigureAwait(false);
             }
             else
             {
-                TcpDmtpClient = GetTcpDmtpClient(RedundancyOptions);
+                TcpDmtpClient = await GetTcpDmtpClient(RedundancyOptions).ConfigureAwait(false);
                 await StandbyAsync().ConfigureAwait(false);
             }
         }

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

@@ -15,7 +15,7 @@ using TouchSocket.Rpc;
 
 namespace ThingsGateway.Management;
 
-public partial class ReverseCallbackServer : RpcServer
+public partial class ReverseCallbackServer : SingletonRpcServer
 {
     [DmtpRpc(MethodInvoke = true)]
     public void UpdateGatewayData(List<DeviceDataWithValue> deviceDatas)

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

@@ -4,12 +4,19 @@
 @if (WebsiteOption.Value.ShowAuthorize)
 {
 
-    <Card class="mb-2">
+    <Card class="h-100">
         <BodyTemplate>
             <div class="ma-1">
-                <span>@Localizer["UUID"]</span>
-                <div class="my-2 ms-4 text-truncate">
-                    <Textarea Value="@ProAuthentication.UUID" rows="5" />
+                <div class="row g-3 form-inline">
+                    <div class="col-12 col-sm-12">
+
+                        <label class="form-label">
+
+                            @Localizer["UUID"]
+                        </label>
+
+                        <Textarea Value="@ProAuthentication.UUID" rows="5" />
+                    </div>
                 </div>
 
                 <PopConfirmButton Size="Size.Small" Color="Color.Success" Icon="fa-solid fa-bars" Text="@Localizer["Register"]" IsAsync OnConfirm="Register">
@@ -22,7 +29,7 @@
 
             </div>
 
-            <div class="ma-1">
+            <div class="ma-1 mt-4">
 
                 <div class="row g-3 form-inline">
                     <div class="col-12 col-sm-12">

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

@@ -9,21 +9,21 @@
 @namespace ThingsGateway.Management
 
 
-<div class=@($"{ClassString} row my-2 mx-2") style="min-height:500px;height: 50%;">
+<div class=@($"{ClassString} row g-0 h-100 mx-2") style="min-height:500px;">
 
-    <div class="col-12 h-100">
+    <div class="col-12 col-md-6 h-100">
 
-        <EditComponent Model="Model" OnSave="OnSaveRedundancy"/>
+        <EditComponent ItemsPerRow=1 Model="Model" OnSave="OnSaveRedundancy" />
 
     </div>
-    <div class="col-12 ">
+    <div class="col-12 col-md-6 h-100">
 
-    @if (Logger != null)
-    {
-            <LogConsole HeightString="500px" LogLevel=@(Logger.LogLevel) LogLevelChanged="(a)=>{
+        @if (Logger != null)
+        {
+            <LogConsole LogLevel=@(Logger.LogLevel) LogLevelChanged="(a)=>{
 Logger.LogLevel=a;
 }" LogPath=@LogPath HeaderText=@HeaderText></LogConsole>
-    }
+        }
     </div>
 </div>
 

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

@@ -19,7 +19,7 @@
 
         <TabItem Text=@RedundancyLocalizer[nameof(RedundancyOptions)]>
 
-            <Card class="mb-2">
+            <Card class="h-100">
 
                 <HeaderTemplate>
 
@@ -52,7 +52,7 @@
 
         <TabItem Text=@ManagementLocalizer["Restart"]>
 
-            <Card class="mb-2">
+            <Card class="h-100">
 
                 <BodyTemplate>
 

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

@@ -14,9 +14,7 @@
 
             <div class="col-12 col-md-8 p-1">
 
-                <div class="p-1">
-                    <Button IsAsync Color="Color.Primary" OnClick="OnUpdate">@ManagementLocalizer["Update"]</Button>
-                </div>
+                 <Button IsAsync Color="Color.Primary" OnClick="OnUpdate">@ManagementLocalizer["Update"]</Button>
 
             </div>
             <div class="col-12 col-md-4 p-1">

src/Gateway/ThingsGateway.Management/Startup.cs

@@ -8,6 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using Microsoft.AspNetCore.Builder;
+
 using System.Reflection;
 
 using ThingsGateway.Gateway.Application;
@@ -18,7 +20,7 @@ namespace ThingsGateway.Management;
 [AppStartup(10000000)]
 public class Startup : AppStartup
 {
-    public void ConfigureAdminApp(IServiceCollection services)
+    public void Configure(IServiceCollection services)
     {
         services.AddSingleton<IRedundancyService, RedundancyService>();
         services.AddGatewayHostedService<IRedundancyHostedService, RedundancyHostedService>();
@@ -29,8 +31,9 @@ public class Startup : AppStartup
     }
 
 
-    public void UseAdminCore(IServiceProvider serviceProvider)
+    public void Use(IApplicationBuilder applicationBuilder)
     {
+        var serviceProvider = applicationBuilder.ApplicationServices;
         //检查ConfigId
         var configIdGroup = DbContext.DbConfigs.GroupBy(it => it.ConfigId);
         foreach (var configId in configIdGroup)

src/Gateway/ThingsGateway.Management/Update/Services/UpgradeRpcServer.cs

@@ -13,7 +13,7 @@ using TouchSocket.Rpc;
 
 namespace ThingsGateway.Management;
 
-public partial class UpgradeRpcServer : RpcServer
+public partial class UpgradeRpcServer : SingletonRpcServer
 {
     [DmtpRpc(MethodInvoke = true)]
     public void Restart()

src/Gateway/ThingsGateway.RulesEngine/Node/Actuator/ExecuteScriptNode.cs

@@ -9,7 +9,64 @@ namespace ThingsGateway.RulesEngine;
 [CategoryNode(Category = "Actuator", ImgUrl = "_content/ThingsGateway.RulesEngine/img/CSharpScript.svg", Desc = nameof(ExecuteScriptNode), LocalizerType = typeof(ThingsGateway.RulesEngine._Imports), WidgetType = typeof(CSharpScriptWidget))]
 public class ExecuteScriptNode : TextNode, IActuatorNode, IExexcuteExpressionsBase, IDisposable
 {
-    public ExecuteScriptNode(string id, Point? position = null) : base(id, position) { Title = "ExecuteScriptNode"; Placeholder = "ExecuteScriptNode.Placeholder"; }
+    public ExecuteScriptNode(string id, Point? position = null) : base(id, position)
+    {
+        Title = "ExecuteScriptNode"; Placeholder = "ExecuteScriptNode.Placeholder";
+        Text =
+            """
+            using ThingsGateway.RulesEngine;
+            using ThingsGateway.Foundation;
+            using TouchSocket.Core;
+            using System.Text;
+
+            public class TestEx : IExexcuteExpressions
+            {
+
+                public TouchSocket.Core.ILog Logger { get; set; }
+
+                public async System.Threading.Tasks.Task<NodeOutput> ExecuteAsync(NodeInput input, System.Threading.CancellationToken cancellationToken)
+                {
+
+
+                    //想上传mqtt，可以自己写mqtt上传代码，或者通过mqtt插件的公开方法上传
+
+                    //直接获取mqttclient插件类型的第一个设备
+                    var driver = GlobalData.ReadOnlyChannels.FirstOrDefault(a => a.Value.PluginName == "ThingsGateway.Plugin.Mqtt.MqttClient").Value?.ReadDeviceRuntimes?.FirstOrDefault().Value?.Driver;
+                    if (driver != null)
+                    {
+                        //找到对应的MqttClient插件设备
+                        var mqttClient = (ThingsGateway.Plugin.Mqtt.MqttClient)driver;
+                        if (mqttClient == null)
+                            throw new("mqttClient NOT FOUND");
+                        var result = await mqttClient.MqttUpAsync("test", Encoding.UTF8.GetBytes("test"),1, default);// 主题 和 负载
+                        if (!result.IsSuccess)
+                            throw new(result.ErrorMessage);
+                        return new NodeOutput() { Value = result };
+                    }
+                    throw new("mqttClient NOT FOUND");
+
+
+                    //通过设备名称找出mqttClient插件
+                    //var driver = GlobalData.ReadOnlyDevices.FirstOrDefault(a => a.Value.Name == "mqttDevice1").Value?.Driver;
+                    //if (driver != null)
+                    //{
+                    //    //找到对应的MqttClient插件设备
+                    //    var mqttClient = (ThingsGateway.Plugin.Mqtt.MqttClient)driver;
+                    //    if (mqttClient == null)
+                    //        throw new("mqttClient NOT FOUND");
+                    //    var result = await mqttClient.MqttUpAsync("test", "test", default);// 主题 和 负载
+                    //    if (!result.IsSuccess)
+                    //        throw new(result.ErrorMessage);
+                    //    return new NodeOutput() { Value = result };
+                    //}
+                    //throw new("mqttClient NOT FOUND");
+                }
+            }
+            
+
+            """;
+
+    }
 
     private string text;
 

src/Gateway/ThingsGateway.RulesEngine/Node/Expression/ConditionNode.cs

@@ -11,7 +11,14 @@ namespace ThingsGateway.RulesEngine;
 [CategoryNode(Category = "Expression", ImgUrl = "_content/ThingsGateway.RulesEngine/img/CSharpScript.svg", Desc = nameof(ConditionNode), LocalizerType = typeof(ThingsGateway.RulesEngine._Imports), WidgetType = typeof(CSharpScriptWidget))]
 public class ConditionNode : TextNode, IConditionNode
 {
-    public ConditionNode(string id, Point? position = null) : base(id, position) { Title = "ConditionNode"; Placeholder = "ConditionNode.Placeholder"; }
+    public ConditionNode(string id, Point? position = null) : base(id, position)
+    {
+        Title = "ConditionNode"; Placeholder = "ConditionNode.Placeholder";
+        Text = "return true;";
+    }
+
+
+
 
     Task<bool> IConditionNode.ExecuteAsync(NodeInput input, CancellationToken cancellationToken)
     {

src/Gateway/ThingsGateway.RulesEngine/Node/Expression/DataNode.cs

@@ -8,7 +8,12 @@ namespace ThingsGateway.RulesEngine;
 [CategoryNode(Category = "Expression", ImgUrl = "_content/ThingsGateway.RulesEngine/img/CSharpScript.svg", Desc = nameof(DataNode), LocalizerType = typeof(ThingsGateway.RulesEngine._Imports), WidgetType = typeof(CSharpScriptWidget))]
 public class DataNode : TextNode, IExpressionNode
 {
-    public DataNode(string id, Point? position = null) : base(id, position) { Title = "DataNode"; Placeholder = "DataNode.Placeholder"; }
+    public DataNode(string id, Point? position = null) : base(id, position)
+    {
+        Title = "DataNode"; Placeholder = "DataNode.Placeholder";
+        Text = "return 1;";
+
+    }
 
     Task<NodeOutput> IExpressionNode.ExecuteAsync(NodeInput input, CancellationToken cancellationToken)
     {