修复hybrid程序

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/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.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/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.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,33 @@ 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>
     /// 当前用户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.32</PluginVersion>
-		<ProPluginVersion>10.6.32</ProPluginVersion>
-		<AuthenticationVersion>2.1.8</AuthenticationVersion>
+		<PluginVersion>10.7.1</PluginVersion>
+		<ProPluginVersion>10.7.1</ProPluginVersion>
+		<AuthenticationVersion>2.2.0</AuthenticationVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>

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

@@ -6,8 +6,9 @@
 @using BootstrapBlazor.Components
 @namespace ThingsGateway.Debug
 
+<div class="w-100" style=@($"height:{HeightString}")>
 
-    <Card HeaderText=@HeaderText class=@("w-100 h-100") style=@($"display: flex; flex: 1;{CardStyle}")>
+    <Card HeaderText=@HeaderText class=@("w-100 h-100")>
     <HeaderTemplate>
         <div class="flex-fill">
         </div>
@@ -37,7 +38,7 @@
 
     </HeaderTemplate>
     <BodyTemplate>
-                <div style=@($"height:{HeightString};overflow-y:scroll;flex-fill;")>
+                <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))> *@
@@ -57,3 +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; } = "100%";
+    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/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

@@ -75,7 +75,6 @@ public class SmartTriggerScheduler
                     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.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/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/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/GatewayMonitorPage.razor

@@ -24,9 +24,7 @@
         </FirstPaneTemplate>
         <SecondPaneTemplate>
 
-            <div class="h-100 ms-1" style="display: flex;  flex-direction: column;">
-                <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/VariableRuntimeInfo.razor.cs

@@ -35,6 +35,15 @@ 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()
     {
@@ -47,7 +56,7 @@ public partial class VariableRuntimeInfo : IDisposable
     {
         VariableRuntimeDispatchService.Subscribe(Refresh);
 
-        scheduler = new SmartTriggerScheduler(Notify, TimeSpan.FromMilliseconds(3000));
+        scheduler = new SmartTriggerScheduler(Notify, TimeSpan.FromMilliseconds(1000));
 
         _ = RunTimerAsync();
         base.OnInitialized();

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/RedundancyOptionsPage.razor

@@ -21,7 +21,7 @@
 
         @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.RulesEngine/Page/RulesStatus.razor

@@ -11,7 +11,7 @@
 
 @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"></LogConsole>
 }

src/ThingsGateway.Photino/Startup.cs

@@ -52,6 +52,7 @@ public class Startup : AppStartup
         services.AddSingleton<IAuthRazorService, HybridAuthRazorService>();
         services.AddSingleton<HybridAppService>();
         services.AddSingleton<IAppService, HybridAppService>(a => a.GetService<HybridAppService>());
+        services.AddSingleton<IClaimsPrincipalService, HybridClaimsPrincipalService>();
 
         services.AddScoped<IPlatformService, HybridPlatformService>();
         services.AddScoped<IGatewayExportService, HybridGatewayExportService>();

src/ThingsGateway.Server/Configuration/App.Development.json

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

src/ThingsGateway.Server/Configuration/App.json

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

src/ThingsGateway.Server/Program/SingleFilePublish.cs

@@ -41,6 +41,7 @@ public class SingleFilePublish : ISingleFilePublish
             "ThingsGateway.Razor",
             "ThingsGateway.Admin.Razor"   ,
             "ThingsGateway.Admin.Application",
+            "ThingsGateway.SqlSugar",
 
             "ThingsGateway.Management",
             "ThingsGateway.RulesEngine",

src/ThingsGateway.sln

@@ -101,6 +101,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.UpgradeServer
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.Plugin.Synchronization", "Plugin\ThingsGateway.Plugin.Synchronization\ThingsGateway.Plugin.Synchronization.csproj", "{438B86D4-0CAE-DCC3-E952-90CE77BB8661}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.SqlSugar", "Admin\ThingsGateway.SqlSugar\ThingsGateway.SqlSugar.csproj", "{544EDA9F-978F-84F7-48BF-FA5888F52FFB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -267,6 +269,10 @@ Global
 		{438B86D4-0CAE-DCC3-E952-90CE77BB8661}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{438B86D4-0CAE-DCC3-E952-90CE77BB8661}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{438B86D4-0CAE-DCC3-E952-90CE77BB8661}.Release|Any CPU.Build.0 = Release|Any CPU
+		{544EDA9F-978F-84F7-48BF-FA5888F52FFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{544EDA9F-978F-84F7-48BF-FA5888F52FFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{544EDA9F-978F-84F7-48BF-FA5888F52FFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{544EDA9F-978F-84F7-48BF-FA5888F52FFB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -310,10 +316,11 @@ Global
 		{7D5E01DE-D6D7-E45D-58FD-E01B38A312B2} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{29DCAC9C-2D0F-E251-E907-F07D804CA117} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{438B86D4-0CAE-DCC3-E952-90CE77BB8661} = {36510D70-161F-4241-B8D0-781E21032816}
+		{544EDA9F-978F-84F7-48BF-FA5888F52FFB} = {72C65578-92A5-4E99-9779-27835B12B32F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		RESX_Rules = {"EnabledRules":[]}
-		RESX_NeutralResourcesLanguage = zh-Hans
 		SolutionGuid = {199B1B96-4F56-4828-9531-813BA02DB282}
+		RESX_NeutralResourcesLanguage = zh-Hans
+		RESX_Rules = {"EnabledRules":[]}
 	EndGlobalSection
 EndGlobal

src/Upgrade/ThingsGateway.UpgradeServer/Program/SingleFilePublish.cs

@@ -41,6 +41,7 @@ public class SingleFilePublish : ISingleFilePublish
             "ThingsGateway.Razor",
             "ThingsGateway.Admin.Razor"   ,
             "ThingsGateway.Admin.Application",
+            "ThingsGateway.SqlSugar",
 
             "ThingsGateway.Foundation.Razor"   ,
             "ThingsGateway.UpgradeServer"   ,

src/Version.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>10.6.32</Version>
+    <Version>10.7.1</Version>
   </PropertyGroup>
 
   <ItemGroup>