增加演示站的gitee授权

.gitignore

@@ -365,4 +365,5 @@ FodyWeavers.xsd
 /src/*Pro*/
 /src/*Pro*
 /src/*pro*
-/src/*pro*/
+/src/*pro*/
+/src/ThingsGateway.Server/Configuration/GiteeOAuthSettings.json

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

@@ -8,6 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -29,9 +30,23 @@ public class AuthController : ControllerBase
     [AllowAnonymous]
     public Task<LoginOutput> LoginAsync([FromBody] LoginInput input)
     {
+
         return _authService.LoginAsync(input);
+
     }
 
+    [HttpGet("oauth-login")]
+    [AllowAnonymous]
+    public IActionResult OAuthLogin(string scheme = "Gitee", string returnUrl = "/")
+    {
+        var props = new AuthenticationProperties
+        {
+            RedirectUri = returnUrl
+        };
+        return Challenge(props, scheme);
+    }
+
+
     [HttpPost("logout")]
     [Authorize]
     [IgnoreRolePermission]

src/Admin/ThingsGateway.Admin.Application/Gitee/AdminOAuthHandler.cs

@@ -0,0 +1,212 @@
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.OAuth;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+using System.Net.Http.Headers;
+using System.Security.Claims;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 只适合 Demo 登录，会直接授权超管的权限
+/// </summary>
+public class AdminOAuthHandler<TOptions>(
+   IVerificatInfoService verificatInfoService,
+   IAppService appService,
+   ISysUserService sysUserService,
+   ISysDictService configService,
+    IOptionsMonitor<TOptions> options,
+    ILoggerFactory logger,
+    UrlEncoder encoder
+) : OAuthHandler<TOptions>(options, logger, encoder)
+    where TOptions : AdminOAuthOptions, new()
+{
+    private async Task<LoginEvent> GetLogin()
+    {
+        var sysUser = await sysUserService.GetUserByIdAsync(RoleConst.SuperAdminId).ConfigureAwait(false);//获取用户信息
+
+        var appConfig = await configService.GetAppConfigAsync().ConfigureAwait(false);
+
+
+        var expire = appConfig.LoginPolicy.VerificatExpireTime;
+
+        var loginEvent = new LoginEvent
+        {
+            Ip = appService.RemoteIpAddress,
+            Device = appService.UserAgent?.Platform,
+            Expire = expire,
+            SysUser = sysUser,
+            VerificatId = CommonUtils.GetSingleId()
+        };
+
+        //获取verificat列表
+        var tokenTimeout = loginEvent.DateTime.AddMinutes(loginEvent.Expire);
+        //生成verificat信息
+        var verificatInfo = new VerificatInfo
+        {
+            Device = loginEvent.Device,
+            Expire = loginEvent.Expire,
+            VerificatTimeout = tokenTimeout,
+            Id = loginEvent.VerificatId,
+            UserId = loginEvent.SysUser.Id,
+            LoginIp = loginEvent.Ip,
+            LoginTime = loginEvent.DateTime
+        };
+
+
+        //添加到verificat列表
+        verificatInfoService.Add(verificatInfo);
+
+        return loginEvent;
+    }
+    /// <summary>
+    /// 登录事件
+    /// </summary>
+    /// <param name="loginEvent"></param>
+    /// <returns></returns>
+    private async Task UpdateUser(LoginEvent loginEvent)
+    {
+        var sysUser = loginEvent.SysUser;
+
+        #region 登录/密码策略
+
+        var key = CacheConst.Cache_LoginErrorCount + sysUser.Account;//获取登录错误次数Key值
+        App.CacheService.Remove(key);//移除登录错误次数
+
+        //获取用户verificat列表
+        var userToken = verificatInfoService.GetOne(loginEvent.VerificatId);
+
+        #endregion 登录/密码策略
+
+        #region 重新赋值属性,设置本次登录信息为最新的信息
+
+        sysUser.LastLoginIp = sysUser.LatestLoginIp;
+        sysUser.LastLoginTime = sysUser.LatestLoginTime;
+        sysUser.LatestLoginIp = loginEvent.Ip;
+        sysUser.LatestLoginTime = loginEvent.DateTime;
+
+        #endregion 重新赋值属性,设置本次登录信息为最新的信息
+
+        using var db = DbContext.Db.GetConnectionScopeWithAttr<SysUser>().CopyNew();
+        //更新用户登录信息
+        if (await db.Updateable(sysUser).UpdateColumns(it => new
+        {
+            it.LastLoginIp,
+            it.LastLoginTime,
+            it.LatestLoginIp,
+            it.LatestLoginTime,
+        }).ExecuteCommandAsync().ConfigureAwait(false) > 0)
+            App.CacheService.HashAdd(CacheConst.Cache_SysUser, sysUser.Id.ToString(), sysUser);//更新Cache信息
+    }
+
+    protected override async Task<AuthenticationTicket> CreateTicketAsync(
+        ClaimsIdentity identity,
+        AuthenticationProperties properties,
+        OAuthTokenResponse tokens)
+    {
+        properties.RedirectUri = Options.HomePath;
+        properties.IsPersistent = true;
+
+        if (!string.IsNullOrEmpty(tokens.ExpiresIn) && int.TryParse(tokens.ExpiresIn, out var result))
+        {
+            properties.ExpiresUtc = TimeProvider.System.GetUtcNow().AddSeconds(result);
+        }
+        var user = await HandleUserInfoAsync(tokens).ConfigureAwait(false);
+
+        var sysUser = await GetLogin().ConfigureAwait(false);
+        await UpdateUser(sysUser).ConfigureAwait(false);
+        identity.AddClaim(new Claim(ClaimConst.VerificatId, sysUser.VerificatId.ToString()));
+        identity.AddClaim(new Claim(ClaimConst.UserId, RoleConst.SuperAdminId.ToString()));
+
+        identity.AddClaim(new Claim(ClaimConst.SuperAdmin, "true"));
+        identity.AddClaim(new Claim(ClaimConst.OrgId, RoleConst.DefaultTenantId.ToString()));
+        identity.AddClaim(new Claim(ClaimConst.TenantId, RoleConst.DefaultTenantId.ToString()));
+
+
+        var context = new OAuthCreatingTicketContext(
+            new ClaimsPrincipal(identity),
+            properties,
+            Context,
+            Scheme,
+            Options,
+            Backchannel,
+            tokens,
+            user
+        );
+
+        context.RunClaimActions();
+        await Events.CreatingTicket(context).ConfigureAwait(false);
+
+        return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+    }
+
+    /// <summary>刷新 Token 方法</summary>
+    protected virtual async Task<OAuthTokenResponse> RefreshTokenAsync(OAuthTokenResponse oAuthToken)
+    {
+        var query = new Dictionary<string, string>
+        {
+            { "refresh_token", oAuthToken.RefreshToken },
+            { "grant_type", "refresh_token" }
+        };
+
+        var request = new HttpRequestMessage(HttpMethod.Post, QueryHelpers.AddQueryString(Options.TokenEndpoint, query));
+        request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+        var response = await Backchannel.SendAsync(request, Context.RequestAborted).ConfigureAwait(false);
+
+        var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+        if (response.IsSuccessStatusCode)
+        {
+            return OAuthTokenResponse.Success(JsonDocument.Parse(content));
+        }
+
+        return OAuthTokenResponse.Failed(new OAuthTokenException($"OAuth token endpoint failure: {await Display(response).ConfigureAwait(false)}"));
+    }
+
+    /// <summary>处理用户信息方法</summary>
+    protected virtual async Task<JsonElement> HandleUserInfoAsync(OAuthTokenResponse tokens)
+    {
+        var request = new HttpRequestMessage(HttpMethod.Get, BuildUserInfoUrl(tokens));
+        request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+        var response = await Backchannel.SendAsync(request, Context.RequestAborted).ConfigureAwait(false);
+
+        var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+        if (response.IsSuccessStatusCode)
+        {
+            return JsonDocument.Parse(content).RootElement;
+        }
+
+        throw new OAuthTokenException($"OAuth user info endpoint failure: {await Display(response).ConfigureAwait(false)}");
+    }
+
+    /// <summary>生成用户信息请求地址方法</summary>
+    protected virtual string BuildUserInfoUrl(OAuthTokenResponse tokens)
+    {
+        return QueryHelpers.AddQueryString(Options.UserInformationEndpoint, new Dictionary<string, string>
+        {
+            { "access_token", tokens.AccessToken }
+        });
+    }
+
+    /// <summary>生成错误信息方法</summary>
+    protected static async Task<string> Display(HttpResponseMessage response)
+    {
+        var output = new StringBuilder();
+        output.Append($"Status: {response.StatusCode}; ");
+        output.Append($"Headers: {response.Headers}; ");
+        output.Append($"Body: {await response.Content.ReadAsStringAsync().ConfigureAwait(false)};");
+
+        return output.ToString();
+    }
+}
+
+/// <summary>自定义 Token 异常</summary>
+public class OAuthTokenException(string message) : Exception(message);

src/Admin/ThingsGateway.Admin.Application/Gitee/AdminOAuthOptions.cs

@@ -0,0 +1,33 @@
+using Microsoft.AspNetCore.Authentication.OAuth;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>OAuthOptions 配置类</summary>
+public abstract class AdminOAuthOptions : OAuthOptions
+{
+    /// <summary>默认构造函数</summary>
+    protected AdminOAuthOptions()
+    {
+        ConfigureClaims();
+
+        this.Events.OnRemoteFailure = context =>
+        {
+            var redirectUri = string.IsNullOrEmpty(HomePath) ? "/" : HomePath;
+            context.Response.Redirect(redirectUri);
+            context.HandleResponse();
+            return Task.CompletedTask;
+        };
+
+
+    }
+
+    /// <summary>配置 Claims 映射</summary>
+    protected virtual void ConfigureClaims()
+    {
+
+    }
+
+    /// <summary>获得/设置 登陆后首页</summary>
+    public string HomePath { get; set; } = "/";
+
+}

src/Admin/ThingsGateway.Admin.Application/Gitee/GiteeOAuthOptions.cs

@@ -0,0 +1,64 @@
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.OAuth;
+using Microsoft.AspNetCore.WebUtilities;
+
+using System.Net.Http.Headers;
+
+namespace ThingsGateway.Admin.Application;
+
+public class GiteeOAuthOptions : AdminOAuthOptions
+{
+    public GiteeOAuthOptions() : base()
+    {
+        this.SignInScheme = ClaimConst.Scheme;
+        this.AuthorizationEndpoint = "https://gitee.com/oauth/authorize";
+        this.TokenEndpoint = "https://gitee.com/oauth/token";
+        this.UserInformationEndpoint = "https://gitee.com/api/v5/user";
+        this.HomePath = "/";
+        this.CallbackPath = "/signin-gitee";
+
+        Events.OnCreatingTicket = async context =>
+        {
+            await HandlerGiteeStarredUrl(context).ConfigureAwait(false);
+        };
+
+        Events.OnRedirectToAuthorizationEndpoint = context =>
+        {
+            //context.RedirectUri = context.RedirectUri.Replace("http%3A%2F%2F", "https%3A%2F%2F"); // 强制替换
+            context.Response.Redirect(context.RedirectUri);
+            return Task.CompletedTask;
+        };
+    }
+    private static async Task HandlerGiteeStarredUrl(OAuthCreatingTicketContext context, string repoFullName = "ThingsGateway/ThingsGateway")
+    {
+        if (string.IsNullOrWhiteSpace(context.AccessToken))
+            throw new InvalidOperationException("Access token is missing.");
+
+        var uri = $"https://gitee.com/api/v5/user/starred/{repoFullName}";
+
+        var queryString = new Dictionary<string, string>
+        {
+            { "access_token", context.AccessToken }
+        };
+
+        var request = new HttpRequestMessage(HttpMethod.Put, QueryHelpers.AddQueryString(uri, queryString))
+        {
+            Headers = { Accept = { new MediaTypeWithQualityHeaderValue("application/json") } }
+        };
+
+        var response = await context.Backchannel.SendAsync(request, context.HttpContext.RequestAborted).ConfigureAwait(false);
+
+        if (!response.IsSuccessStatusCode)
+        {
+            var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+            throw new Exception($"Failed to star repository: {response.StatusCode}, {content}");
+        }
+    }
+    protected override void ConfigureClaims()
+    {
+        ClaimActions.MapJsonKey(ClaimConst.AvatarUrl, "avatar_url");
+        ClaimActions.MapJsonKey(ClaimConst.Account, "name");
+
+        base.ConfigureClaims();
+    }
+}

src/Admin/ThingsGateway.Admin.Application/Gitee/GiteeOAuthSettings.cs

@@ -0,0 +1,7 @@
+namespace ThingsGateway.Admin.Application;
+
+public class GiteeOAuthSettings
+{
+    public string ClientId { get; set; }
+    public string ClientSecret { get; set; }
+}

src/Admin/ThingsGateway.Admin.Application/Gitee/GiteeOAuthUser.cs

@@ -0,0 +1,12 @@
+namespace ThingsGateway.Admin.Application;
+
+public class GiteeOAuthUser
+{
+    public string Id { get; set; }
+
+    public string Login { get; set; }
+
+    public string Name { get; set; }
+
+    public string Avatar_Url { get; set; }
+}

src/Admin/ThingsGateway.Admin.Application/Gitee/OAuthUserExtensions.cs

@@ -0,0 +1,22 @@
+using System.Text.Json;
+
+namespace ThingsGateway.Admin.Application;
+
+public static class OAuthUserExtensions
+{
+    public static GiteeOAuthUser ToAuthUser(this JsonElement element)
+    {
+        GiteeOAuthUser authUser = new GiteeOAuthUser();
+        JsonElement.ObjectEnumerator target = element.EnumerateObject();
+        authUser.Id = target.TryGetValue("id");
+        authUser.Login = target.TryGetValue("login");
+        authUser.Name = target.TryGetValue("name");
+        authUser.Avatar_Url = target.TryGetValue("avatar_url");
+        return authUser;
+    }
+
+    public static string TryGetValue(this JsonElement.ObjectEnumerator target, string propertyName)
+    {
+        return target.FirstOrDefault<JsonProperty>((Func<JsonProperty, bool>)(t => t.Name.Equals(propertyName, StringComparison.OrdinalIgnoreCase))).Value.ToString() ?? string.Empty;
+    }
+}

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

@@ -20,9 +20,11 @@ namespace ThingsGateway.Admin.Application;
 public class AppService : IAppService
 {
     private readonly IUserAgentService UserAgentService;
-    public AppService(IUserAgentService userAgentService)
+    private readonly IClaimsPrincipalService ClaimsPrincipalService;
+    public AppService(IUserAgentService userAgentService, IClaimsPrincipalService claimsPrincipalService)
     {
         UserAgentService = userAgentService;
+        ClaimsPrincipalService = claimsPrincipalService;
     }
     public string GetReturnUrl(string returnUrl)
     {
@@ -70,7 +72,7 @@ public class AppService : IAppService
             ExpiresUtc = diffTime,
         }).ConfigureAwait(false);
     }
-    public ClaimsPrincipal? User => App.User;
+    public ClaimsPrincipal? User => ClaimsPrincipalService.User;
 
     public string? RemoteIpAddress => App.HttpContext?.GetRemoteIpAddressToIPv4();
 

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

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

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

@@ -12,8 +12,6 @@ using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Localization;
 
-using SqlSugar;
-
 using System.Security.Claims;
 
 using ThingsGateway.DataEncryption;
@@ -64,6 +62,10 @@ public class AuthService : IAuthService
         {
             throw Oops.Bah(appConfig.WebsitePolicy.CloseTip);
         }
+
+
+
+
         string? password = input.Password;
         if (isCookie) //openApi登录不再需要解密
         {
@@ -237,25 +239,20 @@ public class AuthService : IAuthService
         var logingEvent = new LoginEvent
         {
             Ip = _appService.RemoteIpAddress,
-            Device = App.GetService<IAppService>().UserAgent?.Platform,
+            Device = _appService.UserAgent?.Platform,
             Expire = expire,
             SysUser = sysUser,
             VerificatId = verificatId
         };
         await WriteTokenToCache(loginPolicy, logingEvent).ConfigureAwait(false);//写入verificat到cache
         await UpdateUser(logingEvent).ConfigureAwait(false);
-        if (sysUser.Account == RoleConst.SuperAdmin)
-        {
-            var modules = (await _sysResourceService.GetAllAsync().ConfigureAwait(false)).Where(a => a.Category == ResourceCategoryEnum.Module).OrderBy(a => a.SortCode);//获取模块列表
-            sysUser.ModuleList = modules.ToList();//模块列表赋值给用户
-        }
+
         //返回结果
         return new LoginOutput
         {
             VerificatId = verificatId,
             Account = sysUser.Account,
             Id = sysUser.Id,
-            ModuleList = sysUser.ModuleList,
             AccessToken = accessToken,
             RefreshToken = refreshToken
         };

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

@@ -11,8 +11,6 @@
 using Microsoft.AspNetCore.Http.Connections.Features;
 using Microsoft.AspNetCore.SignalR;
 
-using Yitter.IdGenerator;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
@@ -28,7 +26,7 @@ public class UserIdProvider : IUserIdProvider
 
         if (UserId > 0)
         {
-            return $"{UserId}{SysHub.Separate}{YitIdHelper.NextId()}";//返回用户ID
+            return $"{UserId}{SysHub.Separate}{CommonUtils.GetSingleId()}";//返回用户ID
         }
 
         return connection.ConnectionId;

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

@@ -466,7 +466,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
             var exist = await GetUserByIdAsync(input.Id).ConfigureAwait(false);//获取用户信息
             if (exist != null)
             {
-                var isSuperAdmin = exist.Account == RoleConst.SuperAdmin;//判断是否有超管
+                var isSuperAdmin = exist.Id == RoleConst.SuperAdminId;//判断是否有超管
                 if (isSuperAdmin && !UserManager.SuperAdmin)
                     throw Oops.Bah(Localizer["CanotEditAdminUser"]);
 
@@ -540,7 +540,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
         await CheckApiDataScopeAsync(sysUser.OrgId, sysUser.CreateUserId).ConfigureAwait(false);
         if (sysUser != null)
         {
-            var isSuperAdmin = (sysUser.Account == RoleConst.SuperAdmin || input.GrantInfoList.Any(a => a == RoleConst.SuperAdminRoleId)) && !UserManager.SuperAdmin;//判断是否有超管
+            var isSuperAdmin = (sysUser.Id == RoleConst.SuperAdminId || input.GrantInfoList.Any(a => a == RoleConst.SuperAdminRoleId)) && !UserManager.SuperAdmin;//判断是否有超管
             if (isSuperAdmin)
                 throw Oops.Bah(Localizer["CanotGrantAdmin"]);
 
@@ -660,7 +660,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
     public async Task<bool> DeleteUserAsync(IEnumerable<long> ids)
     {
         using var db = GetDB();
-        var containsSuperAdmin = await db.Queryable<SysUser>().Where(it => it.Account == RoleConst.SuperAdmin && ids.Contains(it.Id)).AnyAsync().ConfigureAwait(false);//判断是否有超管
+        var containsSuperAdmin = await db.Queryable<SysUser>().Where(it => it.Id == RoleConst.SuperAdminId && ids.Contains(it.Id)).AnyAsync().ConfigureAwait(false);//判断是否有超管
         if (containsSuperAdmin)
             throw Oops.Bah(Localizer["CanotDeleteAdminUser"]);
         if (ids.Contains(UserManager.UserId))
@@ -899,7 +899,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
             var tenantId = await _sysOrgService.GetTenantIdByOrgIdAsync(sysUser.OrgId, sysOrgList).ConfigureAwait(false);
             sysUser.TenantId = tenantId;
 
-            if (sysUser.Account == RoleConst.SuperAdmin)
+            if (sysUser.Id == RoleConst.SuperAdminId)
             {
                 var modules = (await _sysResourceService.GetAllAsync().ConfigureAwait(false)).Where(a => a.Category == ResourceCategoryEnum.Module).OrderBy(a => a.SortCode);
                 sysUser.ModuleList = modules.ToList();//模块列表赋值给用户

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

@@ -13,8 +13,6 @@ using BootstrapBlazor.Components;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-using SqlSugar;
-
 using System.Reflection;
 
 using ThingsGateway.UnifyResult;
@@ -28,19 +26,12 @@ public class Startup : AppStartup
     {
         Directory.CreateDirectory("DB");
 
-        services.AddConfigurableOptions<SqlSugarOptions>();
         services.AddConfigurableOptions<AdminLogOptions>();
         services.AddConfigurableOptions<TenantOptions>();
 
-        services.AddSingleton(typeof(IDataService<>), typeof(BaseService<>));
-        services.AddSingleton<ISugarAopService, SugarAopService>();
-        services.AddSingleton<ISugarConfigAopService, SugarConfigAopService>();
-
         services.AddSingleton<IUserAgentService, UserAgentService>();
         services.AddSingleton<IAppService, AppService>();
 
-        StaticConfig.EnableAllWhereIF = true;
-
         services.AddConfigurableOptions<EmailOptions>();
         services.AddConfigurableOptions<HardwareInfoOptions>();
 
@@ -57,7 +48,6 @@ public class Startup : AppStartup
 
         services.AddSingleton<IVerificatInfoService, VerificatInfoService>();
         services.AddSingleton<IUserCenterService, UserCenterService>();
-        services.AddSingleton<ISugarAopService, SugarAopService>();
         services.AddSingleton<ISysDictService, SysDictService>();
         services.AddSingleton<ISysOperateLogService, SysOperateLogService>();
         services.AddSingleton<IRelationService, RelationService>();

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

@@ -18,9 +18,7 @@
 	</ItemGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.5" />
 		<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
-		<PackageReference Include="SqlSugarCore" Version="5.1.4.193" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
@@ -49,6 +47,7 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />
+		<ProjectReference Include="..\ThingsGateway.SqlSugar\ThingsGateway.SqlSugar.csproj" />
 	</ItemGroup>
 
 </Project>

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

@@ -40,6 +40,8 @@ public class BlazorAppContext
     /// </summary>
     public SysUser CurrentUser { get; private set; }
 
+    public string? Avatar => UserManager.AvatarUrl.IsNullOrEmpty() ? CurrentUser.Avatar : UserManager.AvatarUrl;
+
     /// <summary>
     /// 用户个人菜单
     /// </summary>

src/Admin/ThingsGateway.Admin.Razor/Pages/UserCenter/UserCenterPage.razor.cs

@@ -38,7 +38,7 @@ public partial class UserCenterPage
     protected override async Task OnParametersSetAsync()
     {
         SysUser = AppContext.CurrentUser.Adapt<SysUser>();
-        SysUser.Avatar = AppContext.CurrentUser.Avatar;
+        SysUser.Avatar = AppContext.Avatar;
         WorkbenchInfo = (await UserCenterService.GetLoginWorkbenchAsync(SysUser.Id)).Adapt<WorkbenchInfo>();
 
         await base.OnParametersSetAsync();

src/Admin/ThingsGateway.AdminServer/Configuration/App.Development.json

@@ -11,6 +11,7 @@
 
     // nuget动态加载的程序集
     "SupportPackageNamePrefixs": [
+      "ThingsGateway.SqlSugar",
       "ThingsGateway.Admin.Application",
       "ThingsGateway.Admin.Razor",
       "ThingsGateway.Razor"

src/Admin/ThingsGateway.AdminServer/Configuration/App.json

@@ -11,6 +11,7 @@
 
     // nuget动态加载的程序集
     "SupportPackageNamePrefixs": [
+      "ThingsGateway.SqlSugar",
       "ThingsGateway.Admin.Application",
       "ThingsGateway.Admin.Razor",
       "ThingsGateway.Razor"

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

@@ -12,15 +12,11 @@
 
 #pragma warning disable CA2007 // 考虑对等待的任务调用 ConfigureAwait
 
-using BootstrapBlazor.Components;
-
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 
-using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
-using ThingsGateway.Extension;
 
 namespace ThingsGateway.AdminServer;
 

src/Admin/ThingsGateway.AdminServer/Layout/AccessDenied.razor.cs

@@ -13,8 +13,6 @@ using Microsoft.Extensions.Localization;
 
 using System.Diagnostics.CodeAnalysis;
 
-using ThingsGateway.Admin.Application;
-
 namespace ThingsGateway.AdminServer;
 
 public partial class AccessDenied

src/Admin/ThingsGateway.AdminServer/Layout/Login.razor.cs

@@ -9,10 +9,6 @@
 //------------------------------------------------------------------------------
 
 #pragma warning disable CA2007 // 考虑对等待的任务调用 ConfigureAwait
-using BootstrapBlazor.Components;
-
-using Mapster;
-
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Localization;
@@ -20,11 +16,6 @@ using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
-using ThingsGateway.Admin.Application;
-using ThingsGateway.DataEncryption;
-using ThingsGateway.NewLife.Extension;
-using ThingsGateway.Razor;
-
 namespace ThingsGateway.AdminServer;
 
 public partial class Login

src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor

@@ -48,7 +48,7 @@
                         <CultureChooser />
                     </div>
 
-                    <Logout ImageUrl="@(AppContext.CurrentUser.Avatar??$"{WebsiteConst.DefaultResourceUrl}images/defaultUser.svg")" ShowUserName=false DisplayName="@UserManager.UserAccount" UserName="@UserManager.VerificatId.ToString()" PrefixUserNameText=@AdminLocalizer["CurrentVerificat"]>
+                    <Logout ImageUrl="@(AppContext.Avatar??$"{WebsiteConst.DefaultResourceUrl}images/defaultUser.svg")" ShowUserName=false DisplayName="@UserManager.UserAccount" UserName="@UserManager.VerificatId.ToString()" PrefixUserNameText=@AdminLocalizer["CurrentVerificat"]>
                         <LinkTemplate>
                             <a href=@("/") class="h6"><i class="fa-solid fa-suitcase me-2"></i>@Localizer["系统首页"]</a>
 

src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor.cs

@@ -9,17 +9,13 @@
 //------------------------------------------------------------------------------
 
 #pragma warning disable CA2007 // 考虑对等待的任务调用 ConfigureAwait
-using BootstrapBlazor.Components;
-
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
-using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
-using ThingsGateway.Razor;
 
 namespace ThingsGateway.AdminServer;
 
@@ -27,38 +23,6 @@ public partial class MainLayout : IDisposable
 {
     [Inject]
     IStringLocalizer<ThingsGateway.Razor._Imports> RazorLocalizer { get; set; }
-    private Task OnRefresh(ContextMenuItem item, object? context)
-    {
-        if (context is TabItem tabItem)
-        {
-            _tab.Refresh(tabItem);
-        }
-        return Task.CompletedTask;
-    }
-
-    private async Task OnClose(ContextMenuItem item, object? context)
-    {
-        if (context is TabItem tabItem)
-        {
-            await _tab.RemoveTab(tabItem);
-        }
-    }
-
-    private Task OnCloseOther(ContextMenuItem item, object? context)
-    {
-        if (context is TabItem tabItem)
-        {
-            _tab.ActiveTab(tabItem);
-        }
-        _tab.CloseOtherTabs();
-        return Task.CompletedTask;
-    }
-
-    private Task OnCloseAll(ContextMenuItem item, object? context)
-    {
-        _tab.CloseAllTabs();
-        return Task.CompletedTask;
-    }
 
     #region 全局通知
 

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

@@ -13,8 +13,6 @@ using Microsoft.AspNetCore.ResponseCompression;
 using System.Runtime.InteropServices;
 using System.Text;
 
-using ThingsGateway.NewLife.Log;
-
 namespace ThingsGateway.AdminServer;
 
 public class Program

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

@@ -40,7 +40,8 @@ public class SingleFilePublish : ISingleFilePublish
             "ThingsGateway.NewLife.X",
             "ThingsGateway.Razor",
             "ThingsGateway.Admin.Razor"   ,
-            "ThingsGateway.Admin.Application"
+            "ThingsGateway.Admin.Application",
+            "ThingsGateway.SqlSugar",
         ];
     }
 }

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

@@ -18,18 +18,12 @@ using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 
-using Newtonsoft.Json;
-
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
 
-using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
-using ThingsGateway.Extension;
-using ThingsGateway.NewLife.Caching;
-using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.AdminServer;
 
@@ -161,7 +155,8 @@ public class Startup : AppStartup
         {
             options.WriteFilter = (logMsg) =>
             {
-                if (logMsg.Message.IsNullOrEmpty()) return false;
+                if (App.HostApplicationLifetime.ApplicationStopping.IsCancellationRequested && logMsg.LogLevel >= LogLevel.Warning) return false;
+                if (string.IsNullOrEmpty(logMsg.Message)) return false;
                 else return true;
             };
 
@@ -369,12 +364,6 @@ public class Startup : AppStartup
         app.UseStaticFiles(new StaticFileOptions { ContentTypeProvider = provider });
         app.UseStaticFiles();
 
-        app.Use(async (context, next) =>
-        {
-            context.Response.Headers.Append("ThingsGateway", "ThingsGateway");
-            await next().ConfigureAwait(false);
-        });
-
 
         // 特定文件类型（文件后缀）处理
         var contentTypeProvider = GetFileExtensionContentTypeProvider();

src/Admin/ThingsGateway.Furion/App/App.cs

@@ -71,13 +71,25 @@ public static class App
     /// </summary>
     public static IServiceProvider RootServices => InternalApp.RootServices;
 
+    private static IHostApplicationLifetime hostApplicationLifetime;
+    public static IHostApplicationLifetime HostApplicationLifetime
+    {
+        get
+        {
+            if ((hostApplicationLifetime == null))
+            {
+                hostApplicationLifetime = RootServices?.GetService<IHostApplicationLifetime>();
+            }
+            return hostApplicationLifetime;
+        }
+    }
+
     private static IStringLocalizerFactory? stringLocalizerFactory;
 
     /// <summary>
     /// 本地化服务工厂
     /// </summary>
     public static IStringLocalizerFactory? StringLocalizerFactory
-
     {
         get
         {

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

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

src/Admin/ThingsGateway.SqlSugar/Const/ClaimConst.cs

@@ -31,6 +31,11 @@ public class ClaimConst
     /// </summary>
     public const string UserId = "UserId";
 
+    /// <summary>
+    /// AvatarUrl
+    /// </summary>
+    public const string AvatarUrl = "AvatarUrl";
+
     /// <summary>
     /// 验证Id
     /// </summary>

src/Admin/ThingsGateway.SqlSugar/GlobalUsings.cs

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

src/Admin/ThingsGateway.SqlSugar/Services/AppService/ClaimsPrincipalService.cs

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

src/Admin/ThingsGateway.SqlSugar/Services/AppService/IClaimsPrincipalService.cs

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

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

@@ -17,10 +17,10 @@ namespace ThingsGateway.Admin.Application;
 
 public class SugarAopService : ISugarAopService
 {
-    private IAppService _appService;
-    public SugarAopService(IAppService appService)
+    private IClaimsPrincipalService _claimsPrincipalService;
+    public SugarAopService(IClaimsPrincipalService appService)
     {
-        _appService = appService;
+        _claimsPrincipalService = appService;
     }
     /// <summary>
     /// Aop设置
@@ -85,7 +85,7 @@ public class SugarAopService : ISugarAopService
                 if (entityInfo.PropertyName == nameof(BaseEntity.CreateTime))
                     entityInfo.SetValue(DateTime.Now);
 
-                if (_appService.User != null)
+                if (_claimsPrincipalService.User != null)
                 {
                     //创建人
                     if (entityInfo.PropertyName == nameof(BaseEntity.CreateUserId))
@@ -103,7 +103,7 @@ public class SugarAopService : ISugarAopService
                 if (entityInfo.PropertyName == nameof(BaseEntity.UpdateTime))
                     entityInfo.SetValue(DateTime.Now);
                 //更新人
-                if (_appService.User != null)
+                if (_claimsPrincipalService.User != null)
                 {
                     if (entityInfo.PropertyName == nameof(BaseEntity.UpdateUserId))
                         entityInfo.SetValue(UserManager.UserId);

src/Admin/ThingsGateway.SqlSugar/Startup.cs

@@ -0,0 +1,44 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+using SqlSugar;
+
+namespace ThingsGateway.Admin.Application;
+
+[AppStartup(1000000000)]
+public class Startup : AppStartup
+{
+    public void Configure(IServiceCollection services)
+    {
+        services.AddConfigurableOptions<SqlSugarOptions>();
+
+        services.AddSingleton(typeof(IDataService<>), typeof(BaseService<>));
+        services.AddSingleton<ISugarAopService, SugarAopService>();
+        services.AddSingleton<ISugarConfigAopService, SugarConfigAopService>();
+
+        services.AddSingleton<IClaimsPrincipalService, ClaimsPrincipalService>();
+
+        StaticConfig.EnableAllWhereIF = true;
+
+        services.AddSingleton<ISugarAopService, SugarAopService>();
+
+    }
+
+    public void Use(IApplicationBuilder applicationBuilder)
+    {
+
+
+    }
+}

src/Admin/ThingsGateway.SqlSugar/Static/UserManager.cs

@@ -17,33 +17,39 @@ namespace ThingsGateway.Admin.Application;
 /// </summary>
 public static class UserManager
 {
-    private static readonly IAppService _appService;
+    private static readonly IClaimsPrincipalService _claimsPrincipalService;
     static UserManager()
     {
-        _appService = App.RootServices.GetService<IAppService>();
+        _claimsPrincipalService = App.RootServices.GetService<IClaimsPrincipalService>();
     }
     /// <summary>
     /// 是否超级管理员
     /// </summary>
-    public static bool SuperAdmin => (_appService.User?.FindFirst(ClaimConst.SuperAdmin)?.Value).ToBoolean(false);
+    public static bool SuperAdmin => (_claimsPrincipalService.User?.FindFirst(ClaimConst.SuperAdmin)?.Value).ToBoolean(false);
+
 
     /// <summary>
     /// 当前用户账号
     /// </summary>
-    public static string UserAccount => _appService.User?.FindFirst(ClaimConst.Account)?.Value;
+    public static string UserAccount => _claimsPrincipalService.User?.FindFirst(ClaimConst.Account)?.Value;
+
+    /// <summary>
+    /// AvatarUrl
+    /// </summary>
+    public static string AvatarUrl => (_claimsPrincipalService.User?.FindFirst(ClaimConst.AvatarUrl)?.Value);
 
     /// <summary>
     /// 当前用户Id
     /// </summary>
-    public static long UserId => (_appService.User?.FindFirst(ClaimConst.UserId)?.Value).ToLong();
+    public static long UserId => (_claimsPrincipalService.User?.FindFirst(ClaimConst.UserId)?.Value).ToLong();
 
     /// <summary>
     /// 当前验证Id
     /// </summary>
-    public static long VerificatId => (_appService.User?.FindFirst(ClaimConst.VerificatId)?.Value).ToLong();
+    public static long VerificatId => (_claimsPrincipalService.User?.FindFirst(ClaimConst.VerificatId)?.Value).ToLong();
 
-    public static long OrgId => (_appService.User?.FindFirst(ClaimConst.OrgId)?.Value).ToLong();
+    public static long OrgId => (_claimsPrincipalService.User?.FindFirst(ClaimConst.OrgId)?.Value).ToLong();
 
-    public static long TenantId => (_appService.User?.FindFirst(ClaimConst.TenantId)?.Value)?.ToLong() ?? 0;
+    public static long TenantId => (_claimsPrincipalService.User?.FindFirst(ClaimConst.TenantId)?.Value)?.ToLong() ?? 0;
 
 }

src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj

@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="$(SolutionDir)PackNuget.props" />
+
+	<PropertyGroup>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+	</PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
+	</PropertyGroup>
+	
+	<ItemGroup>
+		<PackageReference Include="SqlSugarCore" Version="5.1.4.193" />
+		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.5" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Include="..\README.md" Pack="true" PackagePath="\" />
+		<None Include="..\README.zh-CN.md" Pack="true" PackagePath="\" />
+		<None Remove="$(SolutionDir)..\README.md" Pack="false" PackagePath="\" />
+		<None Remove="$(SolutionDir)..\README.zh-CN.md" Pack="false" PackagePath="\" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />
+	</ItemGroup>
+
+</Project>

src/Directory.Build.props

@@ -1,9 +1,9 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.6.27</PluginVersion>
-		<ProPluginVersion>10.6.27</ProPluginVersion>
-		<AuthenticationVersion>2.1.8</AuthenticationVersion>
+		<PluginVersion>10.7.14</PluginVersion>
+		<ProPluginVersion>10.7.14</ProPluginVersion>
+		<AuthenticationVersion>2.2.0</AuthenticationVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>

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

@@ -6,7 +6,9 @@
 @using BootstrapBlazor.Components
 @namespace ThingsGateway.Debug
 
-<Card HeaderText=@HeaderText class=@("w-100") style=@($"{CardStyle}")>
+<div class="w-100" style=@($"height:{HeightString}")>
+
+    <Card HeaderText=@HeaderText class=@("w-100 h-100")>
     <HeaderTemplate>
         <div class="flex-fill">
         </div>
@@ -36,7 +38,7 @@
 
     </HeaderTemplate>
     <BodyTemplate>
-        <div style=@($"height:{HeightString};overflow-y:scroll")>
+                <div style=@($"height:calc(100% - 50px);overflow-y:scroll;flex-fill;")>
             <Virtualize Items="CurrentMessages??new  List<LogMessage>()" Context="itemMessage" ItemSize="60" OverscanCount=2>
                 <ItemContent>
                     @*       <Tooltip Placement="Placement.Bottom" Title=@itemMessage.Message.Substring(0, Math.Min(itemMessage.Message.Length, 500))> *@
@@ -56,4 +58,4 @@
 </Card>
 
 
-
+</div>

src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor.cs

@@ -33,13 +33,11 @@ public partial class LogConsole : IDisposable
     [Parameter]
     public EventCallback<LogLevel> LogLevelChanged { get; set; }
 
-    [Parameter]
-    public string CardStyle { get; set; } = "height: 100%;";
     [Parameter]
     public string HeaderText { get; set; } = "Log";
 
     [Parameter]
-    public string HeightString { get; set; } = "calc(100% - 50px)";
+    public string HeightString { get; set; } = "calc(100% - 300px)";
 
     [Parameter, EditorRequired]
     public string LogPath { get; set; }

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

@@ -28,11 +28,12 @@ public class DtuPlugin : PluginBase, ITcpReceivingPlugin
         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;
-    private ArraySegment<byte> HeartbeatByte;
+    private ArraySegment<byte> HeartbeatByte = new();
 
     /// <inheritdoc/>
     public async Task OnTcpReceiving(ITcpSession client, ByteBlockEventArgs e)

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

@@ -61,14 +61,14 @@ internal sealed class HeartbeatAndReceivePlugin : PluginBase, ITcpConnectedPlugi
         {
             return;//此处可判断，如果为服务器，则不用使用心跳。
         }
-
+        if (HeartbeatTime > 0)
+            SendHeartbeat = true;
         HeartbeatTime = Math.Max(HeartbeatTime, 1000);
 
         if (DtuId.IsNullOrWhiteSpace()) return;
 
         if (client is ITcpClient tcpClient)
         {
-            SendHeartbeat = true;
             await tcpClient.SendAsync(DtuIdByte).ConfigureAwait(false);
 
             if (Task == null)

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

@@ -47,7 +47,7 @@ public static class PluginUtil
         Action<IPluginManager> action = a => { };
 
         action += GetTcpServicePlugin(channelOptions);
-        if (!channelOptions.Heartbeat.IsNullOrWhiteSpace())
+        //if (!channelOptions.Heartbeat.IsNullOrWhiteSpace())
         {
             action += a =>
             {

src/Foundation/ThingsGateway.Foundation/Logger/TextFileReader.cs

@@ -8,17 +8,13 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using System.Buffers;
 using System.Text;
 
 using ThingsGateway.NewLife.Caching;
 
 namespace ThingsGateway.Foundation;
 
-public class LogDataCache
-{
-    public List<LogData> LogDatas { get; set; }
-    public long Length { get; set; }
-}
 /// <summary>
 /// 日志数据
 /// </summary>
@@ -47,8 +43,19 @@ public class LogData
 
 
 /// <summary>日志文本文件倒序读取</summary>
+
+public class LogDataCache
+{
+    public List<LogData> LogDatas { get; set; }
+    public long Length { get; set; }
+}
+
+/// <summary>高性能日志文件读取器（支持倒序读取）</summary>
 public class TextFileReader
 {
+    private static readonly MemoryCache _cache = new() { Expire = 30 };
+    private static readonly MemoryCache _fileLocks = new();
+    private static readonly ArrayPool<byte> _bytePool = ArrayPool<byte>.Shared;
     /// <summary>
     /// 获取指定目录下所有文件信息
     /// </summary>
@@ -86,159 +93,167 @@ public class TextFileReader
         return result;
     }
 
-    static MemoryCache _cache = new() { Expire = 30 };
+
     public static OperResult<List<LogData>> LastLog(string file, int lineCount = 200)
     {
-        lock (_cache)
-        {
+        if (!File.Exists(file))
+            return new OperResult<List<LogData>>("The file path is invalid");
 
-            OperResult<List<LogData>> result = new(); // 初始化结果对象
+        _fileLocks.SetExpire(file, TimeSpan.FromSeconds(30));
+        var fileLock = _fileLocks.GetOrAdd(file, _ => new object());
+        lock (fileLock)
+        {
             try
             {
-                if (!File.Exists(file)) // 检查文件是否存在
+                var fileInfo = new FileInfo(file);
+                var length = fileInfo.Length;
+                var cacheKey = $"{nameof(TextFileReader)}_{nameof(LastLog)}_{file})";
+                if (_cache.TryGetValue<LogDataCache>(cacheKey, out var cachedData))
                 {
-                    result.OperCode = 999;
-                    result.ErrorMessage = "The file path is invalid";
-                    return result;
-                }
-
-                List<string> txt = new(); // 存储读取的文本内容
-                long ps = 0; // 保存起始位置
-                var key = $"{nameof(TextFileReader)}_{nameof(LastLog)}_{file})";
-                long length = 0;
-                using (var fs = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
-                {
-                    length = fs.Length;
-                    var dataCache = _cache.Get<LogDataCache>(key);
-                    if (dataCache != null && dataCache.Length == length)
+                    if (cachedData != null && cachedData.Length == length)
                     {
-                        result.Content = dataCache.LogDatas;
-                        result.OperCode = 0; // 操作状态设为成功
-                        return result; // 返回解析结果
+                        return new OperResult<List<LogData>>() { Content = cachedData.LogDatas };
                     }
-
-                    if (ps <= 0) // 如果起始位置小于等于0，将起始位置设置为文件长度
-                        ps = length - 1;
-
-                    // 循环读取指定行数的文本内容
-                    for (int i = 0; i < lineCount; i++)
+                    else
                     {
-                        ps = InverseReadRow(fs, ps, out var value); // 使用逆序读取
-                        txt.Add(value);
-                        if (ps <= 0) // 如果已经读取到文件开头则跳出循环
-                            break;
+                        _cache.Remove(cacheKey);
                     }
                 }
 
-                // 使用单次 LINQ 操作进行过滤和解析
-                result.Content = txt
-                    .Select(a => ParseCSV(a))
-                    .Where(data => data.Count >= 3)
-                    .Select(data =>
-                    {
-                        var log = new LogData
-                        {
-                            LogTime = data[0].Trim(),
-                            LogLevel = Enum.TryParse(data[1].Trim(), out LogLevel level) ? level : LogLevel.Info,
-                            Message = data[2].Trim(),
-                            ExceptionString = data.Count > 3 ? data[3].Trim() : null
-                        };
-                        return log;
-                    })
-                    .ToList();
+                using var fs = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, 4096, FileOptions.SequentialScan);
+                var result = ReadLogsInverse(fs, lineCount, fileInfo.Length);
 
-                result.OperCode = 0; // 操作状态设为成功
-                var data = _cache.Set<LogDataCache>(key, new LogDataCache() { Length = length, LogDatas = result.Content });
+                _cache.Set(cacheKey, new LogDataCache
+                {
+                    LogDatas = result,
+                    Length = fileInfo.Length,
+                });
 
-                return result; // 返回解析结果
+                return new OperResult<List<LogData>>() { Content = result };
             }
-            catch (Exception ex) // 捕获异常
+            catch (Exception ex)
             {
-                result = new(ex); // 创建包含异常信息的结果对象
-                return result; // 返回异常结果
+                return new OperResult<List<LogData>>(ex);
             }
         }
     }
 
+    private static List<LogData> ReadLogsInverse(FileStream fs, int lineCount, long length)
+    {
+        length = fs.Length;
+        long ps = 0; // 保存起始位置
+        List<string> txt = new(); // 存储读取的文本内容
+
+        if (ps <= 0) // 如果起始位置小于等于0，将起始位置设置为文件长度
+            ps = length - 1;
+
+        // 循环读取指定行数的文本内容
+        for (int i = 0; i < lineCount; i++)
+        {
+            ps = InverseReadRow(fs, ps, out var value); // 使用逆序读取
+            txt.Add(value);
+            if (ps <= 0) // 如果已经读取到文件开头则跳出循环
+                break;
+        }
+
+        // 使用单次 LINQ 操作进行过滤和解析
+        var result = txt
+              .Select(a => ParseCSV(a))
+                  .Where(data => data.Count >= 3)
+                  .Select(data =>
+                  {
+                      var log = new LogData
+                      {
+                          LogTime = data[0].Trim(),
+                          LogLevel = Enum.TryParse(data[1].Trim(), out LogLevel level) ? level : LogLevel.Info,
+                          Message = data[2].Trim(),
+                          ExceptionString = data.Count > 3 ? data[3].Trim() : null
+                      };
+                      return log;
+                  })
+                  .ToList();
+
+
+        return result; // 返回解析结果
+    }
+
     private static long InverseReadRow(FileStream fs, long position, out string value, int maxRead = 102400)
     {
-        byte n = 0xD; // 换行符
-        byte a = 0xA; // 回车符
+        byte n = 0xD;
+        byte a = 0xA;
         value = string.Empty;
-        if (fs.Length == 0) return 0; // 若文件长度为0，则直接返回0作为新的位置
+
+        if (fs.Length == 0) return 0;
 
         var newPos = position;
-        List<byte> buffer = new List<byte>(maxRead); // 缓存读取的数据
+        byte[] buffer = _bytePool.Rent(maxRead); // 从池中租借字节数组
+        int index = 0;
 
         try
         {
-            var readLength = 0;
-
-            while (true) // 循环读取一行数据，TextFileLogger.Separator行判定
+            while (true)
             {
-                readLength++;
                 if (newPos <= 0)
                     newPos = 0;
 
                 fs.Position = newPos;
                 int byteRead = fs.ReadByte();
 
-                if (byteRead == -1) break; // 到达文件开头时跳出循环
+                if (byteRead == -1) break;
 
-                buffer.Add((byte)byteRead);
-
-                if (byteRead == n || byteRead == a)//判断当前字符是换行符 // TextFileLogger.Separator
-                {
-                    if (MatchSeparator(buffer))
-                    {
-                        // 去掉匹配的指定字符串
-                        buffer.RemoveRange(buffer.Count - TextFileLogger.SeparatorBytes.Length, TextFileLogger.SeparatorBytes.Length);
-                        break;
-                    }
-                }
-
-                if (buffer.Count > maxRead) // 超过最大字节数限制时丢弃数据
+                if (index >= maxRead)
                 {
                     newPos = -1;
                     return newPos;
                 }
+
+                buffer[index++] = (byte)byteRead;
+
+                if (byteRead == n || byteRead == a)
+                {
+                    if (MatchSeparator(buffer, index))
+                    {
+                        index -= TextFileLogger.SeparatorBytes.Length;
+                        break;
+                    }
+                }
+
                 newPos--;
                 if (newPos <= -1)
                     break;
             }
 
-            if (buffer.Count >= 10)
+            if (index >= 10)
             {
-                buffer.Reverse();
-                value = Encoding.UTF8.GetString(buffer.ToArray()); // 转换为字符串
+                Array.Reverse(buffer, 0, index); // 倒序
+                value = Encoding.UTF8.GetString(buffer, 0, index);
             }
 
-            return newPos; // 返回新的读取位置
+            return newPos;
         }
         finally
         {
+            _bytePool.Return(buffer); // 归还数组
         }
     }
 
 
-    private static bool MatchSeparator(List<byte> arr)
+    private static bool MatchSeparator(byte[] arr, int length)
     {
-        if (arr.Count < TextFileLogger.SeparatorBytes.Length)
-        {
+        if (length < TextFileLogger.SeparatorBytes.Length)
             return false;
-        }
-        var pos = arr.Count - 1;
+
+        int pos = length - 1;
         for (int i = 0; i < TextFileLogger.SeparatorBytes.Length; i++)
         {
             if (arr[pos] != TextFileLogger.SeparatorBytes[i])
-            {
                 return false;
-            }
             pos--;
         }
         return true;
     }
 
+
     private static List<string> ParseCSV(string data)
     {
         List<string> items = new List<string>();

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

@@ -0,0 +1,81 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Gateway.Application;
+
+public class SmartTriggerScheduler
+{
+    private readonly object _lock = new();          // 锁对象，保证线程安全
+    private readonly Func<Task> _action;                // 实际要执行的操作
+    private readonly TimeSpan _delay;               // 执行间隔（冷却时间）
+
+    private bool _isRunning = false;                // 当前是否有调度任务在运行
+    private bool _hasPending = false;               // 在等待期间是否有新的触发
+
+    // 构造函数，传入要执行的方法和最小执行间隔
+    public SmartTriggerScheduler(Func<Task> action, TimeSpan minimumInterval)
+    {
+        _action = action ?? throw new ArgumentNullException(nameof(action));
+        _delay = minimumInterval;
+    }
+
+    // 外部调用的触发方法（高频调用的地方调用这个）
+    public void Trigger()
+    {
+        lock (_lock)
+        {
+
+            if (_isRunning)
+            {
+                // 如果正在执行中，标记为“等待处理”，之后再执行一次
+                _hasPending = true;
+                return;
+            }
+
+            // 否则启动执行任务
+            _isRunning = true;
+            _ = Task.Run(ExecuteLoop); // 开启异步执行循环（非阻塞）
+        }
+    }
+
+    // 实际执行动作的循环逻辑
+    private async Task ExecuteLoop()
+    {
+        while (true)
+        {
+            Func<Task> actionToRun = null;
+
+            // 拷贝 _action，并清除等待标记
+            lock (_lock)
+            {
+                _hasPending = false;       // 当前这一轮已经处理了触发
+                actionToRun = _action;     // 拷贝要执行的逻辑（避免锁内执行）
+            }
+
+            // 执行外部提供的方法
+            await actionToRun().ConfigureAwait(false);
+
+            // 等待 delay 时间，进入冷却期
+            await Task.Delay(_delay).ConfigureAwait(false);
+
+            lock (_lock)
+            {
+                // 冷却期后检查是否在这段时间内有新的触发
+                if (!_hasPending)
+                {
+                    // 没有新的触发了，结束执行循环
+                    _isRunning = false;
+                    return;
+                }
+
+            }
+        }
+    }
+}

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

@@ -352,7 +352,12 @@ public abstract class DriverBase : DisposableObject, IDriver
 
     public string GetAuthString()
     {
-        return PluginServiceUtil.IsEducation(GetType()) ? ThingsGateway.Authentication.ProAuthentication.TryGetAuthorizeInfo(out _) ? Localizer["Authorized"] : Localizer["Unauthorized"] : string.Empty;
+        if (PluginServiceUtil.IsEducation(GetType()))
+        {
+            ThingsGateway.Authentication.ProAuthentication.TryGetAuthorizeInfo(out var authorizeInfo);
+            return authorizeInfo.Auth ? Localizer["Authorized"] : Localizer["Unauthorized"];
+        }
+        return string.Empty;
     }
 
     /// <summary>

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

@@ -8,6 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using BootstrapBlazor.Components;
+
 using Mapster;
 
 using System.Collections.Concurrent;
@@ -205,6 +207,30 @@ public static class GlobalData
 
     #region 单例服务
 
+
+    private static IDispatchService<ChannelRuntime> channelRuntimeDispatchService;
+    public static IDispatchService<ChannelRuntime> ChannelDeviceRuntimeDispatchService
+    {
+        get
+        {
+            if (channelRuntimeDispatchService == null)
+                channelRuntimeDispatchService = App.GetService<IDispatchService<ChannelRuntime>>();
+
+            return channelRuntimeDispatchService;
+        }
+    }
+    private static IDispatchService<VariableRuntime> variableRuntimeDispatchService;
+    public static IDispatchService<VariableRuntime> VariableRuntimeDispatchService
+    {
+        get
+        {
+            if (variableRuntimeDispatchService == null)
+                variableRuntimeDispatchService = App.GetService<IDispatchService<VariableRuntime>>();
+
+            return variableRuntimeDispatchService;
+        }
+    }
+
     private static ISysUserService sysUserService;
     public static ISysUserService SysUserService
     {

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

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

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

@@ -241,7 +241,7 @@ public class DeviceRuntime : Device, IDisposable
 
         ChannelRuntime = channelRuntime;
         ChannelRuntime?.DeviceRuntimes?.TryRemove(Id, out _);
-        ChannelRuntime.DeviceRuntimes.TryAdd(Id, this);
+        ChannelRuntime?.DeviceRuntimes?.TryAdd(Id, this);
 
         GlobalData.IdDevices.TryRemove(Id, out _);
         GlobalData.IdDevices.TryAdd(Id, this);

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

@@ -17,8 +17,6 @@ using Microsoft.Extensions.Logging;
 
 using ThingsGateway.NewLife;
 
-using TouchSocket.Core;
-
 namespace ThingsGateway.Gateway.Application;
 
 public class ChannelRuntimeService : IChannelRuntimeService
@@ -199,9 +197,7 @@ public class ChannelRuntimeService : IChannelRuntimeService
 
     public async Task RestartChannelAsync(IEnumerable<ChannelRuntime> oldChannelRuntimes)
     {
-        oldChannelRuntimes.SelectMany(a => a.DeviceRuntimes.SelectMany(a => a.Value.VariableRuntimes)).ParallelForEach(a => a.Value.SafeDispose());
-        oldChannelRuntimes.SelectMany(a => a.DeviceRuntimes).ParallelForEach(a => a.Value.SafeDispose());
-        oldChannelRuntimes.ParallelForEach(a => a.SafeDispose());
+        RuntimeServiceHelper.RemoveOldChannelRuntimes(oldChannelRuntimes);
         var ids = oldChannelRuntimes.Select(a => a.Id).ToHashSet();
         try
         {
@@ -229,4 +225,5 @@ public class ChannelRuntimeService : IChannelRuntimeService
         }
     }
 
+
 }

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

@@ -33,16 +33,6 @@ namespace ThingsGateway.Gateway.Application;
 
 internal sealed class ChannelService : BaseService<Channel>, IChannelService
 {
-    private readonly IDispatchService<Channel> _dispatchService;
-
-    /// <inheritdoc cref="IChannelService"/>
-    public ChannelService(
-    IDispatchService<Channel>? dispatchService
-        )
-    {
-        _dispatchService = dispatchService;
-    }
-
     #region CURD
 
     /// <inheritdoc/>
@@ -181,7 +171,6 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
     public void DeleteChannelFromCache()
     {
         App.CacheService.Remove(ThingsGatewayCacheConst.Cache_Channel);//删除通道缓存
-        _dispatchService.Dispatch(new());
     }
 
     /// <summary>

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

@@ -35,15 +35,11 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
 {
     private readonly IChannelService _channelService;
     private readonly IPluginService _pluginService;
-    private readonly IDispatchService<Device> _dispatchService;
 
-    public DeviceService(
-    IDispatchService<Device> dispatchService
-        )
+    public DeviceService()
     {
         _channelService = App.RootServices.GetRequiredService<IChannelService>();
         _pluginService = App.RootServices.GetRequiredService<IPluginService>();
-        _dispatchService = dispatchService;
     }
 
 
@@ -195,7 +191,6 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
     public void DeleteDeviceFromCache()
     {
         App.CacheService.Remove(ThingsGatewayCacheConst.Cache_Device);//删除设备缓存
-        _dispatchService.Dispatch(new());
     }
 
     /// <summary>

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

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using Microsoft.Extensions.Logging;
 
 using System.Collections.Concurrent;
@@ -21,17 +19,6 @@ namespace ThingsGateway.Gateway.Application;
 internal sealed class ChannelThreadManage : IChannelThreadManage
 {
     private ILogger _logger;
-    private IDispatchService<ChannelRuntime> channelRuntimeDispatchService;
-    private IDispatchService<ChannelRuntime> ChannelRuntimeDispatchService
-    {
-        get
-        {
-            if (channelRuntimeDispatchService == null)
-                channelRuntimeDispatchService = App.GetService<IDispatchService<ChannelRuntime>>();
-
-            return channelRuntimeDispatchService;
-        }
-    }
 
     public ChannelThreadManage()
     {
@@ -78,7 +65,6 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
             await NewChannelLock.WaitAsync().ConfigureAwait(false);
 
             await PrivateRemoveChannelsAsync(Enumerable.Repeat(channelId, 1)).ConfigureAwait(false);
-            ChannelRuntimeDispatchService.Dispatch(null);
         }
         finally
         {
@@ -98,7 +84,6 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
             await NewChannelLock.WaitAsync().ConfigureAwait(false);
 
             await PrivateRemoveChannelsAsync(channelIds).ConfigureAwait(false);
-            ChannelRuntimeDispatchService.Dispatch(null);
         }
         finally
         {
@@ -165,7 +150,6 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
         {
             await NewChannelLock.WaitAsync().ConfigureAwait(false);
             await PrivateRestartChannelAsync(Enumerable.Repeat(channelRuntime, 1)).ConfigureAwait(false);
-            ChannelRuntimeDispatchService.Dispatch(null);
         }
         finally
         {
@@ -183,7 +167,6 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
         {
             await NewChannelLock.WaitAsync().ConfigureAwait(false);
             await PrivateRestartChannelAsync(channelRuntimes).ConfigureAwait(false);
-            ChannelRuntimeDispatchService.Dispatch(null);
         }
         finally
         {

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

@@ -38,17 +38,6 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
     /// </summary>
     public static volatile int CycleInterval = ManageHelper.ChannelThreadOptions.MaxCycleInterval;
 
-    private IDispatchService<DeviceRuntime> devicelRuntimeDispatchService;
-    private IDispatchService<DeviceRuntime> DeviceRuntimeDispatchService
-    {
-        get
-        {
-            if (devicelRuntimeDispatchService == null)
-                devicelRuntimeDispatchService = App.GetService<IDispatchService<DeviceRuntime>>();
-
-            return devicelRuntimeDispatchService;
-        }
-    }
     static DeviceThreadManage()
     {
         Task.Factory.StartNew(async () => await SetCycleInterval().ConfigureAwait(false), TaskCreationOptions.LongRunning);
@@ -250,7 +239,6 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
         {
             await NewDeviceLock.WaitAsync().ConfigureAwait(false);
             await PrivateRestartDeviceAsync(Enumerable.Repeat(deviceRuntime, 1), deleteCache).ConfigureAwait(false);
-            DeviceRuntimeDispatchService.Dispatch(null);
         }
         finally
         {
@@ -268,7 +256,6 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
         {
             await NewDeviceLock.WaitAsync().ConfigureAwait(false);
             await PrivateRestartDeviceAsync(deviceRuntimes, deleteCache).ConfigureAwait(false);
-            DeviceRuntimeDispatchService.Dispatch(null);
         }
         finally
         {
@@ -440,7 +427,6 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
             await NewDeviceLock.WaitAsync().ConfigureAwait(false);
 
             await PrivateRemoveDevicesAsync(Enumerable.Repeat(deviceId, 1)).ConfigureAwait(false);
-            DeviceRuntimeDispatchService.Dispatch(null);
         }
         finally
         {
@@ -460,7 +446,6 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
             await NewDeviceLock.WaitAsync().ConfigureAwait(false);
 
             await PrivateRemoveDevicesAsync(deviceIds).ConfigureAwait(false);
-            DeviceRuntimeDispatchService.Dispatch(null);
         }
         finally
         {
@@ -662,6 +647,7 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
         //传入变量
         //newDeviceRuntime.VariableRuntimes.ParallelForEach(a => a.Value.SafeDispose());
         deviceRuntime.VariableRuntimes.ParallelForEach(a => a.Value.Init(newDeviceRuntime));
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
     }
 
     /// <inheritdoc/>
@@ -740,6 +726,8 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
                 LogMessage?.LogWarning($"device {newDeviceRuntime.Name} cannot found channel with id{newDeviceRuntime.ChannelId}");
 
             newDeviceRuntime.Init(channelRuntime);
+            GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+
             await channelRuntime.DeviceThreadManage.RestartDeviceAsync(newDeviceRuntime, false).ConfigureAwait(false);
             channelRuntime.DeviceThreadManage.LogMessage?.LogInformation($"Device {newDeviceRuntime.Name} switched to primary channel");
 

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

@@ -71,6 +71,9 @@ internal sealed class GatewayMonitorHostedService : BackgroundService, IGatewayM
                 }
             }
 
+            GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+            GlobalData.VariableRuntimeDispatchService.Dispatch(null);
+
             await ChannelThreadManage.RestartChannelAsync(channelRuntimes).ConfigureAwait(false);
 
 

src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/PluginService.cs

@@ -25,8 +25,6 @@ using ThingsGateway.NewLife;
 
 using TouchSocket.Core;
 
-using Yitter.IdGenerator;
-
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
@@ -518,7 +516,7 @@ internal sealed class PluginService : IPluginService
     {
         var fileInfo = new FileInfo(path);
         if (fileInfo.Exists)
-            fileInfo.MoveTo($"{path}{YitIdHelper.NextId()}{DelEx}", true);
+            fileInfo.MoveTo($"{path}{CommonUtils.GetSingleId()}{DelEx}", true);
         else
             return false;
         return true;
@@ -598,7 +596,7 @@ internal sealed class PluginService : IPluginService
             }
             _ = Task.Run(() =>
             {
-                _dispatchService.Dispatch(new());
+                _dispatchService.Dispatch(null);
             });
         }
     }

src/Gateway/ThingsGateway.Gateway.Application/Services/RuntimeServiceHelper.cs

@@ -51,6 +51,9 @@ internal static class RuntimeServiceHelper
                 logger.LogWarning(ex, "Init Channel");
             }
         }
+        GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
+
     }
 
     public static void Init(List<ChannelRuntime> newChannelRuntimes)
@@ -72,6 +75,7 @@ internal static class RuntimeServiceHelper
             }
 
         }
+        GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
     }
 
 
@@ -104,6 +108,10 @@ internal static class RuntimeServiceHelper
                 logger.LogWarning(ex, "Init Device");
             }
         }
+
+        GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
+
     }
 
     public static void Init(List<DeviceRuntime> newDeviceRuntimes)
@@ -124,6 +132,10 @@ internal static class RuntimeServiceHelper
                 deviceRuntime.VariableRuntimes.ParallelForEach(a => a.Value.Init(newDeviceRuntime));
             }
         }
+
+        GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
+
     }
     public static void Init(List<VariableRuntime> newVariableRuntimes)
     {
@@ -138,10 +150,20 @@ internal static class RuntimeServiceHelper
                 newVariableRuntime.Init(deviceRuntime);
             }
         }
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
     }
 
 
+    public static void RemoveOldChannelRuntimes(IEnumerable<ChannelRuntime> oldChannelRuntimes)
+    {
+        oldChannelRuntimes.SelectMany(a => a.DeviceRuntimes.SelectMany(a => a.Value.VariableRuntimes)).ParallelForEach(a => a.Value.Dispose());
+        oldChannelRuntimes.SelectMany(a => a.DeviceRuntimes).ParallelForEach(a => a.Value.Dispose());
+        oldChannelRuntimes.ParallelForEach(a => a.Dispose());
 
+        GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
+
+    }
 
     public static async Task<List<ChannelRuntime>> GetNewChannelRuntimesAsync(HashSet<long> ids)
     {
@@ -179,6 +201,8 @@ internal static class RuntimeServiceHelper
             });
             deviceRuntime.Dispose();
         }
+        GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
 
         return changedDriver;
     }
@@ -222,6 +246,10 @@ internal static class RuntimeServiceHelper
 
         }
 
+
+        GlobalData.ChannelDeviceRuntimeDispatchService.Dispatch(null);
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
+
         return changedDriver;
     }
 
@@ -332,6 +360,7 @@ internal static class RuntimeServiceHelper
             }
         }
 
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
     }
 
 
@@ -350,6 +379,7 @@ internal static class RuntimeServiceHelper
                 }
             }
         }
+        GlobalData.VariableRuntimeDispatchService.Dispatch(null);
     }
 
 }

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

@@ -202,7 +202,6 @@ public class VariableRuntimeService : IVariableRuntimeService
                     await RuntimeServiceHelper.ChangedDriverAsync(_logger, cancellationToken).ConfigureAwait(false);
                 }
 
-                App.GetService<IDispatchService<DeviceRuntime>>().Dispatch(null);
             }
         }
         finally

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

@@ -36,20 +36,13 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
     private readonly IChannelService _channelService;
     private readonly IDeviceService _deviceService;
     private readonly IPluginService _pluginService;
-    private readonly IDispatchService<bool> _allDispatchService;
-    private readonly IDispatchService<Variable> _dispatchService;
 
     /// <inheritdoc cref="IVariableService"/>
-    public VariableService(
-   IDispatchService<Variable> dispatchService,
-   IDispatchService<bool> allDispatchService
-        )
+    public VariableService()
     {
         _channelService = App.RootServices.GetRequiredService<IChannelService>();
         _pluginService = App.RootServices.GetRequiredService<IPluginService>();
         _deviceService = App.RootServices.GetRequiredService<IDeviceService>();
-        _dispatchService = dispatchService;
-        _allDispatchService = allDispatchService;
     }
 
     #region 测试
@@ -230,7 +223,6 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
         {
             _channelService.DeleteChannelFromCache();//刷新缓存
             _deviceService.DeleteDeviceFromCache();
-            _allDispatchService.Dispatch(new());
             DeleteVariableCache();
         }
         else
@@ -297,7 +289,6 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
         }
         finally
         {
-            _dispatchService.Dispatch(new());
 
         }
     }
@@ -318,7 +309,6 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
              .ToList();
 
             var result = (await db.Updateable(data).UpdateColumns(differences.Select(a => a.Key).ToArray()).ExecuteCommandAsync().ConfigureAwait(false)) > 0;
-            _dispatchService.Dispatch(new());
             if (result)
                 DeleteVariableCache();
             return result;
@@ -341,7 +331,6 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
 
         if (result > 0)
             DeleteVariableCache();
-        _dispatchService.Dispatch(new());
     }
 
     [OperDesc("DeleteVariable", isRecordPar: false, localizerType: typeof(Variable))]
@@ -354,7 +343,6 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
                           .WhereIF(dataScope != null && dataScope?.Count > 0, u => dataScope.Contains(u.CreateOrgId))//在指定机构列表查询
              .WhereIF(dataScope?.Count == 0, u => u.CreateUserId == UserManager.UserId)
              .ExecuteCommandAsync().ConfigureAwait(false)) > 0;
-        _dispatchService.Dispatch(new());
 
         if (result)
             DeleteVariableCache();
@@ -428,7 +416,6 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
 
         if (await base.SaveAsync(input, type).ConfigureAwait(false))
         {
-            _dispatchService.Dispatch(new());
             DeleteVariableCache();
             return true;
         }
@@ -493,7 +480,6 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
         using var db = GetDB();
         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.Razor/Components/GatewayAbout.razor.cs

@@ -10,8 +10,6 @@
 
 using Microsoft.Extensions.Options;
 
-using ThingsGateway.Authentication;
-
 namespace ThingsGateway.Gateway.Razor;
 
 /// <inheritdoc/>
@@ -27,39 +25,5 @@ public partial class GatewayAbout
     [NotNull]
     private IOptions<WebsiteOptions>? WebsiteOption { get; set; }
 
-    private string Password { get; set; }
-    private AuthorizeInfo AuthorizeInfo { get; set; }
-    [Inject]
-    ToastService ToastService { get; set; }
-
-    protected override void OnParametersSet()
-    {
-        ProAuthentication.TryGetAuthorizeInfo(out var authorizeInfo);
-        AuthorizeInfo = authorizeInfo;
-        base.OnParametersSet();
-    }
-
-    private async Task Register()
-    {
-        var result = ProAuthentication.TryAuthorize(Password, out var authorizeInfo);
-        if (result)
-        {
-            AuthorizeInfo = authorizeInfo;
-            await ToastService.Default();
-        }
-        else
-            await ToastService.Default(false);
-
-        Password = string.Empty;
-        await InvokeAsync(StateHasChanged);
-    }
-    private async Task Unregister()
-    {
-        ProAuthentication.UnAuthorize();
-        var result = ProAuthentication.TryGetAuthorizeInfo(out var authorizeInfo);
-        AuthorizeInfo = authorizeInfo;
-
-        await InvokeAsync(StateHasChanged);
-    }
 
 }

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

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

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelRuntimeInfo.razor

@@ -5,7 +5,7 @@
 
 <ChannelRuntimeInfo1 ChannelRuntime="ChannelRuntime" />
 
-<LogConsole CardStyle="height: calc(100% - 330px);" LogLevel=@((ChannelRuntime?.DeviceThreadManage?.LogMessage)?.LogLevel??TouchSocket.Core.LogLevel.Trace)
+<LogConsole HeightString="calc(100% - 270px)" LogLevel=@((ChannelRuntime?.DeviceThreadManage?.LogMessage)?.LogLevel ?? TouchSocket.Core.LogLevel.Trace)
             LogLevelChanged="(logLevel)=>
         {
                 ChannelRuntime.DeviceThreadManage?.SetLogAsync(logLevel);

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

@@ -43,10 +43,7 @@ public partial class ChannelRuntimeInfo1 : IDisposable
         {
             try
             {
-                await InvokeAsync(() =>
-                {
-                    StateHasChanged();
-                });
+                await InvokeAsync(StateHasChanged);
             }
             catch (Exception ex)
             {

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

@@ -51,7 +51,7 @@ public partial class ChannelTable : IDisposable
             try
             {
                 if (table != null)
-                    await table.QueryAsync();
+                    await InvokeAsync(table.QueryAsync);
             }
             catch (Exception ex)
             {
@@ -59,7 +59,7 @@ public partial class ChannelTable : IDisposable
             }
             finally
             {
-                await Task.Delay(1000);
+                await Task.Delay(5000);
             }
         }
     }
@@ -115,7 +115,7 @@ public partial class ChannelTable : IDisposable
             {
 
                 await Task.Run(() =>GlobalData.ChannelRuntimeService.CopyAsync(channels,devices,AutoRestartThread, default));
-                    await table.QueryAsync();
+                    await InvokeAsync(table.QueryAsync);
 
             }},
             {nameof(ChannelCopyComponent.Model),oneModel },

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

@@ -17,7 +17,6 @@ using SqlSugar;
 
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Gateway.Application;
-using ThingsGateway.NewLife;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.NewLife.Json.Extension;
 
@@ -127,7 +126,7 @@ public partial class ChannelDeviceTree
              {nameof(ChannelEditComponent.OnValidSubmit), async () =>
             {
                 await Task.Run(() =>GlobalData.ChannelRuntimeService.SaveChannelAsync(oneModel,itemChangedType,AutoRestartThread));
-               await Notify();
+               ////await Notify();
             }},
             {nameof(ChannelEditComponent.Model),oneModel },
             {nameof(ChannelEditComponent.ValidateEnable),true },
@@ -175,7 +174,7 @@ public partial class ChannelDeviceTree
             {
 
                 await Task.Run(() =>GlobalData.ChannelRuntimeService.CopyAsync(channels,devices,AutoRestartThread, default));
-                    await Notify();
+                    //await Notify();
 
             }},
             {nameof(ChannelCopyComponent.Model),oneModel },
@@ -252,7 +251,7 @@ public partial class ChannelDeviceTree
                 Spinner.SetRun(true);
                 await Task.Run(() => GlobalData.ChannelRuntimeService.BatchEditAsync(changedModels, oldModel, oneModel,AutoRestartThread));
 
-              await Notify();
+              //await Notify();
                 await InvokeAsync(() =>
                 {
 
@@ -304,7 +303,7 @@ public partial class ChannelDeviceTree
     }
 finally
                 {
-               await Notify();
+               //await Notify();
             await InvokeAsync( ()=>
             {
 
@@ -422,7 +421,7 @@ finally
                 Spinner.SetRun(true);
 
                 await Task.Run(() => GlobalData.ChannelRuntimeService.DeleteChannelAsync(modelIds.Select(a => a.Id), AutoRestartThread, default));
-                await Notify();
+                //await Notify();
                 await InvokeAsync(() =>
                 {
                     Spinner.SetRun(false);
@@ -466,7 +465,7 @@ finally
 
                 var key = await GlobalData.GetCurrentUserChannels().ConfigureAwait(false);
                 await Task.Run(() => GlobalData.ChannelRuntimeService.DeleteChannelAsync(key.Select(a => a.Id), AutoRestartThread, default));
-                await Notify();
+                //await Notify();
                 await InvokeAsync(() =>
                 {
                     Spinner.SetRun(false);
@@ -592,7 +591,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
 
             });
             await Task.Run(() => GlobalData.ChannelRuntimeService.ImportChannelAsync(value, AutoRestartThread));
-            await Notify();
+            //await Notify();
             await InvokeAsync(() =>
             {
                 Spinner.SetRun(false);
@@ -647,7 +646,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
             {
 
                 await Task.Run(() =>GlobalData.DeviceRuntimeService.CopyAsync(devices,AutoRestartThread, default));
-               await Notify();
+               //await Notify();
 
             }},
             {nameof(DeviceCopyComponent.Model),oneModel },
@@ -697,7 +696,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
              {nameof(DeviceEditComponent.OnValidSubmit), async () =>
              {
                  await Task.Run(() =>GlobalData.DeviceRuntimeService.SaveDeviceAsync(oneModel,itemChangedType, AutoRestartThread));
-               await Notify();
+               //await Notify();
             }},
             {nameof(DeviceEditComponent.Model),oneModel },
             {nameof(DeviceEditComponent.AutoRestartThread),AutoRestartThread },
@@ -783,7 +782,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
 
                 });
                 await Task.Run(() =>GlobalData.DeviceRuntimeService.BatchEditAsync(changedModels,oldModel,oneModel,AutoRestartThread));
-                await Notify();
+                //await Notify();
                          await InvokeAsync(() =>
             {
                                 Spinner.SetRun(false);
@@ -832,7 +831,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
     }
 finally
                 {
-                await Notify();
+                //await Notify();
                                  await InvokeAsync( ()=>
             {
 
@@ -955,7 +954,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
                 Spinner.SetRun(true);
 
                 await Task.Run(() => GlobalData.DeviceRuntimeService.DeleteDeviceAsync(modelIds.Select(a => a.Id), AutoRestartThread, default));
-                await Notify();
+                //await Notify();
                 await InvokeAsync(() =>
                 {
                     Spinner.SetRun(false);
@@ -1002,7 +1001,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
                 var data = await GlobalData.GetCurrentUserDevices().ConfigureAwait(false);
 
                 await Task.Run(() => GlobalData.DeviceRuntimeService.DeleteDeviceAsync(data.Select(a => a.Id), AutoRestartThread, default));
-                await Notify();
+                //await Notify();
                 await InvokeAsync(() =>
                 {
                     Spinner.SetRun(false);
@@ -1136,7 +1135,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
             });
 
             await Task.Run(() => GlobalData.DeviceRuntimeService.ImportDeviceAsync(value, AutoRestartThread));
-            await Notify();
+            //await Notify();
             await InvokeAsync(() =>
             {
                 Spinner.SetRun(false);
@@ -1210,6 +1209,8 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
     private ChannelDeviceTreeItem UnknownItem = new() { ChannelDevicePluginType = ChannelDevicePluginTypeEnum.PluginType, PluginType = null };
 
     private TreeViewItem<ChannelDeviceTreeItem> UnknownTreeViewItem;
+
+    SmartTriggerScheduler? scheduler;
     protected override async Task OnInitializedAsync()
     {
 
@@ -1264,8 +1265,8 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
 
         Items = ZItem;
         ChannelRuntimeDispatchService.Subscribe(Refresh);
-        DeviceRuntimeDispatchService.Subscribe(Refresh);
 
+        scheduler = new SmartTriggerScheduler(Notify, TimeSpan.FromMilliseconds(3000));
 
         _ = Task.Run(async () =>
         {
@@ -1289,43 +1290,20 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
         await base.OnInitializedAsync();
     }
 
-    private WaitLock WaitLock = new();
-
-    private volatile bool _isExecuting = false;
 
     private async Task Notify()
     {
-        if (_isExecuting) return;
-        try
+        if (Disposed) return;
+        await OnClickSearch(SearchText);
+
+        Value = GetValue(Value);
+        if (ChannelDeviceChanged != null)
         {
-            await WaitLock.WaitAsync();
-
-            if (_isExecuting) return;
-
-            _isExecuting = true;
-
-            try
-            {
-                if (Disposed) return;
-                await OnClickSearch(SearchText);
-
-                Value = GetValue(Value);
-                if (ChannelDeviceChanged != null)
-                {
-                    await ChannelDeviceChanged.Invoke(Value);
-                }
-                await InvokeAsync(StateHasChanged);
-            }
-            finally
-            {
-                await Task.Delay(1000);
-                _isExecuting = false;
-            }
-        }
-        finally
-        {
-            WaitLock.Release();
+            await ChannelDeviceChanged.Invoke(Value);
         }
+        await InvokeAsync(StateHasChanged);
+
+
     }
 
     private static ChannelDeviceTreeItem GetValue(ChannelDeviceTreeItem channelDeviceTreeItem)
@@ -1354,18 +1332,15 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
 
 
 
-    private async Task Refresh(DispatchEntry<DeviceRuntime> entry)
+    private Task Refresh(DispatchEntry<ChannelRuntime> entry)
     {
-        await Notify();
+        scheduler.Trigger();
+        return Task.CompletedTask;
     }
-    private async Task Refresh(DispatchEntry<ChannelRuntime> entry)
-    {
-        await Notify();
-    }
-    [Inject]
-    private IDispatchService<DeviceRuntime> DeviceRuntimeDispatchService { get; set; }
+
     [Inject]
     private IDispatchService<ChannelRuntime> ChannelRuntimeDispatchService { get; set; }
+
     private string SearchText;
 
     private async Task<List<TreeViewItem<ChannelDeviceTreeItem>>> OnClickSearch(string searchText)
@@ -1523,7 +1498,6 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
     {
         Disposed = true;
         ChannelRuntimeDispatchService.UnSubscribe(Refresh);
-        DeviceRuntimeDispatchService.UnSubscribe(Refresh);
         return base.DisposeAsync(disposing);
     }
 

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

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

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

@@ -5,7 +5,7 @@
 
 <DeviceRuntimeInfo1 DeviceRuntime="DeviceRuntime" />
 
-<LogConsole CardStyle="height: calc(100% - 330px);" LogLevel=@((DeviceRuntime?.Driver?.LogMessage)?.LogLevel??TouchSocket.Core.LogLevel.Trace)
+<LogConsole HeightString="calc(100% - 270px)" LogLevel=@((DeviceRuntime?.Driver?.LogMessage)?.LogLevel ?? TouchSocket.Core.LogLevel.Trace)
             LogLevelChanged="(logLevel)=>
         {
                 DeviceRuntime.Driver?.SetLogAsync(logLevel);

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

@@ -88,9 +88,9 @@ public partial class DeviceRuntimeInfo1 : IDisposable
         {
             try
             {
+                OnParametersSet();
                 await InvokeAsync(() =>
                 {
-                    OnParametersSet();
                     StateHasChanged();
                 });
             }

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

@@ -51,7 +51,7 @@ public partial class DeviceTable : IDisposable
             try
             {
                 if (table != null)
-                    await table.QueryAsync();
+                    await InvokeAsync(table.QueryAsync);
             }
             catch (Exception ex)
             {
@@ -59,7 +59,7 @@ public partial class DeviceTable : IDisposable
             }
             finally
             {
-                await Task.Delay(1000);
+                await Task.Delay(5000);
             }
         }
     }
@@ -115,7 +115,7 @@ public partial class DeviceTable : IDisposable
             {
 
                 await Task.Run(() =>GlobalData.DeviceRuntimeService.CopyAsync(devices,AutoRestartThread, default));
-                    await table.QueryAsync();
+                    await InvokeAsync(table.QueryAsync);
 
             }},
             {nameof(DeviceCopyComponent.Model),oneModel },
@@ -353,7 +353,7 @@ finally
                 await InvokeAsync(async () =>
                 {
                     await ToastService.Default();
-                    await InvokeAsync(table.QueryAsync);
+                    await table.QueryAsync();
                 });
             });
         }

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

@@ -24,9 +24,7 @@
         </FirstPaneTemplate>
         <SecondPaneTemplate>
 
-            <div class="h-100 ms-1">
-                <GatewayInfo AutoRestartThread=AutoRestartThread SelectModel=SelectModel ShowChannelRuntime=ShowChannelRuntime ShowDeviceRuntime=ShowDeviceRuntime ShowType=ShowType VariableRuntimes=VariableRuntimes ChannelRuntimes="ChannelRuntimes" DeviceRuntimes="DeviceRuntimes" />
-            </div>
+            <GatewayInfo AutoRestartThread=AutoRestartThread SelectModel=SelectModel ShowChannelRuntime=ShowChannelRuntime ShowDeviceRuntime=ShowDeviceRuntime ShowType=ShowType VariableRuntimes=VariableRuntimes ChannelRuntimes="ChannelRuntimes" DeviceRuntimes="DeviceRuntimes" />
 
         </SecondPaneTemplate>
     </Split>

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

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

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

@@ -21,6 +21,7 @@
             ShowExtendButtons=true
             ShowToolbar="true"
             ShowExportButton
+            IsAutoRefresh
             ShowDefaultButtons=true
             ShowSearch=false
             ExtendButtonColumnWidth=220

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

@@ -35,15 +35,29 @@ public partial class VariableRuntimeInfo : IDisposable
 
     [Parameter]
     public IEnumerable<VariableRuntime>? Items { get; set; } = Enumerable.Empty<VariableRuntime>();
+    private IEnumerable<VariableRuntime>? _previousItemsRef;
+    protected override async Task OnParametersSetAsync()
+    {
+        if (!ReferenceEquals(_previousItemsRef, Items))
+        {
+            _previousItemsRef = Items;
+            await Refresh(null);
+        }
+    }
 
     public void Dispose()
     {
         Disposed = true;
+        VariableRuntimeDispatchService.UnSubscribe(Refresh);
         GC.SuppressFinalize(this);
     }
 
     protected override void OnInitialized()
     {
+        VariableRuntimeDispatchService.Subscribe(Refresh);
+
+        scheduler = new SmartTriggerScheduler(Notify, TimeSpan.FromMilliseconds(1000));
+
         _ = RunTimerAsync();
         base.OnInitialized();
     }
@@ -62,6 +76,23 @@ public partial class VariableRuntimeInfo : IDisposable
         }
         return Task.FromResult(ret);
     }
+    [Inject]
+    private IDispatchService<VariableRuntime> VariableRuntimeDispatchService { get; set; }
+    private SmartTriggerScheduler scheduler;
+
+
+    private Task Refresh(DispatchEntry<VariableRuntime> entry)
+    {
+        scheduler.Trigger();
+        return Task.CompletedTask;
+    }
+
+    private async Task Notify()
+    {
+        if (Disposed) return;
+        if (table != null)
+            await InvokeAsync(table.QueryAsync);
+    }
 
 
     private async Task RunTimerAsync()
@@ -70,8 +101,10 @@ public partial class VariableRuntimeInfo : IDisposable
         {
             try
             {
-                if (table != null)
-                    await table.QueryAsync();
+                //if (table != null)
+                //    await table.QueryAsync();
+
+                await InvokeAsync(StateHasChanged);
             }
             catch (Exception ex)
             {

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

@@ -40,7 +40,7 @@
                         </label>
 
                         <label class="form-control">
-                            @(AuthorizeInfo != null ? Localizer["Authorized"] : Localizer["Unauthorized"])
+                            @(AuthorizeInfo?.Auth==true ? Localizer["Authorized"] : Localizer["Unauthorized"])
                         </label>
                     </div>
                 </div>
@@ -50,6 +50,7 @@
                 @if (AuthorizeInfo != null)
                 {
                     <div class="row g-3 form-inline">
+
                         <div class="col-12 col-sm-12">
 
                             <label class="form-label">
@@ -70,7 +71,7 @@
                             </label>
 
                             <label class="form-control">
-                                @AuthorizeInfo?.ExpireTime
+                                @AuthorizeInfo?.RealExpireTime
                             </label>
                         </div>
 

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

@@ -55,7 +55,7 @@ public partial class Authentication
     private async Task Unregister()
     {
         ProAuthentication.UnAuthorize();
-        var result = ProAuthentication.TryGetAuthorizeInfo(out var authorizeInfo);
+        _ = ProAuthentication.TryGetAuthorizeInfo(out var authorizeInfo);
         AuthorizeInfo = authorizeInfo;
 
         await InvokeAsync(StateHasChanged);

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

@@ -31,8 +31,14 @@ public partial class RedundancyOptionsHeader : IDisposable
         {
             while (!Disposed)
             {
-                await InvokeAsync(StateHasChanged);
-                await Task.Delay(3000);
+                try
+                {
+                    await InvokeAsync(StateHasChanged);
+                }
+                finally
+                {
+                    await Task.Delay(3000);
+                }
             }
         });
         return base.OnInitializedAsync();

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

@@ -15,13 +15,13 @@
 
         <EditComponent ItemsPerRow=1 Model="Model" OnSave="OnSaveRedundancy" />
 
-        <Button IsDisabled=@(Model.IsMaster) OnClick="ForcedSync">@RedundancyLocalizer["ForcedSync"]</Button>
+        <Button IsDisabled=@(Model.IsMaster||(!Model.Enable)) OnClick="ForcedSync">@RedundancyLocalizer["ForcedSync"]</Button>
     </div>
     <div class="col-12 col-md-6 h-100">
 
         @if (Logger != null)
         {
-            <LogConsole LogLevel=@(Logger.LogLevel) LogLevelChanged="(a)=>{
+            <LogConsole HeightString="calc(100% - 100px)" LogLevel=@(Logger.LogLevel) LogLevelChanged="(a)=>{
 Logger.LogLevel=a;
 }" LogPath=@LogPath HeaderText=@HeaderText></LogConsole>
         }

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

@@ -5,26 +5,34 @@
 
 <div class="h-100">
     <DefaultTable TItem="UpdateZipFile"
-                AutoGenerateColumns="true"
-                ShowDefaultButtons=false
-                EditDialogSize="Size.Large"
-                AllowResizing="true"
-                IsFixedHeader=true
-                ShowAddButton="false"
-                ShowRefresh="true"
-                ShowEmpty="true"
-                ShowSearch="false"
-                IsMultipleSelect=false
-                ShowExtendEditButton=false
-                ShowExtendDeleteButton=false
-                ShowExtendButtons=true
-                ShowDeleteButton="false"
-                ShowEditButton="false"
-                ShowAdvancedSearch=false
-                OnQueryAsync="OnQueryAsync">
+                  AutoGenerateColumns="true"
+                  ShowDefaultButtons=false
+                  EditDialogSize="Size.Large"
+                  AllowResizing="true"
+                  IsFixedHeader=true
+                  ShowAddButton="false"
+                  ShowRefresh="true"
+                  ShowEmpty="true"
+                  ShowSearch="false"
+                  IsMultipleSelect=false
+                  ShowExtendEditButton=false
+                  ShowExtendDeleteButton=false
+                  ShowExtendButtons=true
+                  ShowDeleteButton="false"
+                  ShowEditButton="false"
+                  ShowAdvancedSearch=false
+                  OnQueryAsync="OnQueryAsync">
+
+
+
+        @*         <TableToolbarTemplate>
+            <TableToolbarButton TItem="UpdateZipFile" Color="Color.Info" Icon="fa fa-plus" Text="test"
+                                OnClickCallback="a=>ShowInfo(a.FirstOrDefault())" />
+
+        </TableToolbarTemplate> *@
 
         <RowButtonTemplate>
-            <TableCellButton Size="Size.ExtraSmall" Color="Color.Success" Icon="fa-solid fa-people-roof" Text="@ManagementLocalizer["Info"]" OnClick="()=>ShowInfo(context)" />
+            <TableCellButton Size="Size.ExtraSmall" Color="Color.Success" Icon="fa-solid fa-people-roof" Text="@ManagementLocalizer["Info"]" OnClick="() => ShowInfo(context)" />
         </RowButtonTemplate>
 
     </DefaultTable>

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

@@ -167,15 +167,15 @@ public partial class RulesPage
 
     private async Task Notify()
     {
-        var current = ExecutionContext.Capture();
         try
         {
-            ExecutionContext.Restore(context);
+            if (table != null)
+                await table.QueryAsync();
             await InvokeAsync(StateHasChanged);
         }
         finally
         {
-            ExecutionContext.Restore(current);
+
         }
     }
 

src/Gateway/ThingsGateway.RulesEngine/Page/RulesStatus.razor

@@ -11,9 +11,9 @@
 
 @if (_rules != null)
 {
-    <LogConsole LogLevel=@(_rules.Log.LogLevel) LogLevelChanged="(a)=>{
+    <LogConsole HeightString="100%" LogLevel=@(_rules.Log.LogLevel) LogLevelChanged="(a)=>{
 _rules.Log.LogLevel=a;
-}" LogPath=@_rules.Log.LogPath HeaderText="@_rules.Rules.Name" HeightString="calc(100vh - var(--bs-header-height) - var(--bb-layout-header-height) - 130px)"></LogConsole>
+}" LogPath=@_rules.Log.LogPath HeaderText="@_rules.Rules.Name"></LogConsole>
 }
 
 

src/Gateway/ThingsGateway.RulesEngine/Services/RulesEngineHostedService.cs

@@ -35,9 +35,12 @@ internal sealed class RulesEngineHostedService : BackgroundService, IRulesEngine
     internal const string LogPathFormat = "Logs/RulesEngineLog/{0}";
     internal const string LogDir = "Logs/RulesEngineLog";
     private readonly ILogger _logger;
+    private IDispatchService<Rules> dispatchService;
+
     /// <inheritdoc cref="RulesEngineHostedService"/>
     public RulesEngineHostedService(ILogger<RulesEngineHostedService> logger, IStringLocalizer<RulesEngineHostedService> localizer)
     {
+        dispatchService = App.GetService<IDispatchService<Rules>>();
         _logger = logger;
         Localizer = localizer;
     }
@@ -60,8 +63,7 @@ internal sealed class RulesEngineHostedService : BackgroundService, IRulesEngine
             {
                 var data = Init(rules);
                 await Start(data.rulesLog, data.blazorDiagram, TokenSource.Token).ConfigureAwait(false);
-                var service = App.GetService<IDispatchService<Rules>>();
-                service.Dispatch(new());
+                dispatchService.Dispatch(null);
             }
 
         }
@@ -89,8 +91,7 @@ internal sealed class RulesEngineHostedService : BackgroundService, IRulesEngine
                     BlazorDiagrams.Remove(del.Key);
                 }
             }
-            var service = App.GetService<IDispatchService<Rules>>();
-            service.Dispatch(new());
+            dispatchService.Dispatch(null);
         }
         finally
         {
@@ -198,8 +199,8 @@ internal sealed class RulesEngineHostedService : BackgroundService, IRulesEngine
             var item = Init(rules);
             await Start(item.rulesLog, item.blazorDiagram, cancellationToken).ConfigureAwait(false);
         }
-        var service = App.GetService<IDispatchService<Rules>>();
-        service.Dispatch(new());
+        dispatchService.Dispatch(null);
+
 
         _ = Task.Factory.StartNew(async () =>
         {

src/Plugin/ThingsGateway.Debug.Photino/MainLayout.razor.cs

@@ -25,39 +25,6 @@ public partial class MainLayout
 {
     [Inject]
     IStringLocalizer<ThingsGateway.Razor._Imports> RazorLocalizer { get; set; }
-    private Task OnRefresh(ContextMenuItem item, object? context)
-    {
-        if (context is TabItem tabItem)
-        {
-            _tab.Refresh(tabItem);
-        }
-        return Task.CompletedTask;
-    }
-
-    private async Task OnClose(ContextMenuItem item, object? context)
-    {
-        if (context is TabItem tabItem)
-        {
-            await _tab.RemoveTab(tabItem);
-        }
-    }
-
-    private Task OnCloseOther(ContextMenuItem item, object? context)
-    {
-        if (context is TabItem tabItem)
-        {
-            _tab.ActiveTab(tabItem);
-        }
-        _tab.CloseOtherTabs();
-        return Task.CompletedTask;
-    }
-
-    private Task OnCloseAll(ContextMenuItem item, object? context)
-    {
-        _tab.CloseAllTabs();
-        return Task.CompletedTask;
-    }
-
 
     private Tab _tab { get; set; }
 

src/Plugin/ThingsGateway.Foundation.Modbus/Helper/PackHelper.cs

@@ -51,7 +51,7 @@ public class PackHelper
             // 获取变量的位偏移量
             //if (item.DataType == DataTypeEnum.Boolean)
             item.Index = device.GetBitOffsetDefault(address);
-            if (item.DataType == DataTypeEnum.Byte)
+            if (item.DataType == DataTypeEnum.Byte && !(item.ArrayLength > 1))
                 item.Index += (item.Index % 2 == 0) ? 1 : -1;
         }
 

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

@@ -12,6 +12,7 @@ using Mapster;
 
 using Newtonsoft.Json.Linq;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.Foundation;
 
@@ -60,11 +61,8 @@ public partial class Synchronization : BusinessBase, IRpcDriver
 
     protected override async ValueTask ProtectedExecuteAsync(CancellationToken cancellationToken)
     {
-
         try
         {
-
-
             if (_driverPropertys.IsServer)
             {
                 if (_tcpDmtpService.ServerState != ServerState.Running)
@@ -129,6 +127,7 @@ public partial class Synchronization : BusinessBase, IRpcDriver
 
 
                     // 如果 online 为 true，表示设备在线
+                    if (online)
                     {
                         var deviceRunTimes = CollectDevices.Where(a => a.Value.IsCollect == true).Select(a => a.Value).Adapt<List<DeviceDataWithValue>>();
 
@@ -258,10 +257,7 @@ public partial class Synchronization : BusinessBase, IRpcDriver
                     var data = await _tcpDmtpClient.GetDmtpRpcActor().InvokeTAsync<List<DataWithDatabase>>(
                                        nameof(ReverseCallbackServer.GetData), waitInvoke).ConfigureAwait(false);
 
-                    data.ForEach(a => a.Channel.Enable = false);
-                    await GlobalData.ChannelRuntimeService.CopyAsync(data.Select(a => a.Channel).ToList(), data.SelectMany(a => a.DeviceVariables).ToDictionary(a => a.Device, a => a.Variables), true, cancellationToken).ConfigureAwait(false);
-
-                    LogMessage?.LogTrace($"ForcedSync data success");
+                    await Add(data, cancellationToken).ConfigureAwait(false);
 
                 }
             }
@@ -277,10 +273,10 @@ public partial class Synchronization : BusinessBase, IRpcDriver
                     foreach (var item in _tcpDmtpService.Clients)
                     {
                         var data = await item.GetDmtpRpcActor().InvokeTAsync<List<DataWithDatabase>>(nameof(ReverseCallbackServer.GetData), waitInvoke).ConfigureAwait(false);
-                        data.ForEach(a => a.Channel.Enable = false);
 
-                        await GlobalData.ChannelRuntimeService.CopyAsync(data.Select(a => a.Channel).ToList(), data.SelectMany(a => a.DeviceVariables).ToDictionary(a => a.Device, a => a.Variables), true, cancellationToken).ConfigureAwait(false);
-                        LogMessage?.LogTrace($"{item.GetIPPort()}: ForcedSync data success");
+
+                        await Add(data, cancellationToken).ConfigureAwait(false);
+
                     }
 
                 }
@@ -300,6 +296,27 @@ public partial class Synchronization : BusinessBase, IRpcDriver
         }
 
     }
+    private async Task Add(List<DataWithDatabase> data, CancellationToken cancellationToken)
+    {
+        data.ForEach(a =>
+        {
+            a.Channel.Enable = false;
+            a.Channel.Id = CommonUtils.GetSingleId();
+            a.DeviceVariables.ForEach(b =>
+            {
+                b.Device.ChannelId = a.Channel.Id;
+                b.Device.Id = CommonUtils.GetSingleId();
+                b.Variables.ForEach(c =>
+                {
+                    c.DeviceId = b.Device.Id;
+                    c.Id = 0;
+                });
+            });
+        });
+        await GlobalData.ChannelRuntimeService.CopyAsync(data.Select(a => a.Channel).ToList(), data.SelectMany(a => a.DeviceVariables).ToDictionary(a => a.Device, a => a.Variables), true, cancellationToken).ConfigureAwait(false);
+
+        LogMessage?.LogTrace($"ForcedSync data success");
+    }
 
     /// <summary>
     /// 异步写入方法
@@ -321,12 +338,12 @@ public partial class Synchronization : BusinessBase, IRpcDriver
         {
             if (deviceDatas.TryGetValue(item.Key.DeviceName ?? string.Empty, out var variableDatas))
             {
-                variableDatas.Add(item.Key.Name, item.Value?.ToString() ?? string.Empty);
+                variableDatas.TryAdd(item.Key.Name, item.Value?.ToString() ?? string.Empty);
             }
             else
             {
-                deviceDatas.Add(item.Key.DeviceName ?? string.Empty, new());
-                deviceDatas[item.Key.DeviceName ?? string.Empty].Add(item.Key.Name, item.Value?.ToString() ?? string.Empty);
+                deviceDatas.TryAdd(item.Key.DeviceName ?? string.Empty, new());
+                deviceDatas[item.Key.DeviceName ?? string.Empty].TryAdd(item.Key.Name, item.Value?.ToString() ?? string.Empty);
             }
         }
 
@@ -383,7 +400,7 @@ public partial class Synchronization : BusinessBase, IRpcDriver
                                 try
                                 {
 
-                                    var data = await _tcpDmtpClient.GetDmtpRpcActor().InvokeTAsync<Dictionary<string, Dictionary<string, OperResult<object>>>>(
+                                    var data = await client.GetDmtpRpcActor().InvokeTAsync<Dictionary<string, Dictionary<string, OperResult<object>>>>(
                                                          nameof(ReverseCallbackServer.Rpc), waitInvoke, new Dictionary<string, Dictionary<string, string>>() { { item.Key, item.Value } }).ConfigureAwait(false);
 
                                     dataResult.AddRange(data);
@@ -396,7 +413,7 @@ public partial class Synchronization : BusinessBase, IRpcDriver
 
                                     foreach (var vItem in item.Value)
                                     {
-                                        dataResult[item.Key].Add(vItem.Key, new OperResult<object>(ex));
+                                        dataResult[item.Key].TryAdd(vItem.Key, new OperResult<object>(ex));
                                     }
                                 }
                             }
@@ -407,7 +424,7 @@ public partial class Synchronization : BusinessBase, IRpcDriver
 
                         foreach (var vItem in item.Value)
                         {
-                            dataResult[item.Key].Add(vItem.Key, new OperResult<object>("No online"));
+                            dataResult[item.Key].TryAdd(vItem.Key, new OperResult<object>("No online"));
                         }
                     }
 

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

@@ -15,7 +15,7 @@ namespace ThingsGateway.Plugin.Synchronization;
 /// <summary>
 /// <inheritdoc/>
 /// </summary>
-public class SynchronizationProperty : BusinessPropertyBase
+public class SynchronizationProperty : BusinessPropertyBase, IBusinessPropertyAllVariableBase
 {
     [DynamicProperty]
     public bool IsServer { get; set; } = true;