diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/AppService/AppService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/AppService/AppService.cs
index 697010c06..a3fffd62f 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/AppService/AppService.cs
+++ b/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();
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Startup.cs b/src/Admin/ThingsGateway.Admin.Application/Startup.cs
index 1ceb6f866..4ecf81220 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Startup.cs
+++ b/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>();
diff --git a/src/Admin/ThingsGateway.Admin.Application/ThingsGateway.Admin.Application.csproj b/src/Admin/ThingsGateway.Admin.Application/ThingsGateway.Admin.Application.csproj
index 943e487b9..43f084540 100644
--- a/src/Admin/ThingsGateway.Admin.Application/ThingsGateway.Admin.Application.csproj
+++ b/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>
diff --git a/src/Admin/ThingsGateway.AdminServer/Configuration/App.Development.json b/src/Admin/ThingsGateway.AdminServer/Configuration/App.Development.json
index f15b026bb..8a4828cb5 100644
--- a/src/Admin/ThingsGateway.AdminServer/Configuration/App.Development.json
+++ b/src/Admin/ThingsGateway.AdminServer/Configuration/App.Development.json
@@ -11,6 +11,7 @@
 
     // nuget动态加载的程序集
     "SupportPackageNamePrefixs": [
+      "ThingsGateway.SqlSugar",
       "ThingsGateway.Admin.Application",
       "ThingsGateway.Admin.Razor",
       "ThingsGateway.Razor"
diff --git a/src/Admin/ThingsGateway.AdminServer/Configuration/App.json b/src/Admin/ThingsGateway.AdminServer/Configuration/App.json
index db108edf0..726a2e208 100644
--- a/src/Admin/ThingsGateway.AdminServer/Configuration/App.json
+++ b/src/Admin/ThingsGateway.AdminServer/Configuration/App.json
@@ -11,6 +11,7 @@
 
     // nuget动态加载的程序集
     "SupportPackageNamePrefixs": [
+      "ThingsGateway.SqlSugar",
       "ThingsGateway.Admin.Application",
       "ThingsGateway.Admin.Razor",
       "ThingsGateway.Razor"
diff --git a/src/Admin/ThingsGateway.AdminServer/Index/AdminIndex.razor.cs b/src/Admin/ThingsGateway.AdminServer/Index/AdminIndex.razor.cs
index c6e681093..6b4513f4c 100644
--- a/src/Admin/ThingsGateway.AdminServer/Index/AdminIndex.razor.cs
+++ b/src/Admin/ThingsGateway.AdminServer/Index/AdminIndex.razor.cs
@@ -12,16 +12,10 @@
 
 #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;
 
 
diff --git a/src/Admin/ThingsGateway.AdminServer/Layout/AccessDenied.razor.cs b/src/Admin/ThingsGateway.AdminServer/Layout/AccessDenied.razor.cs
index bdc9139a0..da19bc8c2 100644
--- a/src/Admin/ThingsGateway.AdminServer/Layout/AccessDenied.razor.cs
+++ b/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
diff --git a/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor.cs b/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor.cs
index aa068234f..810f833b3 100644
--- a/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor.cs
+++ b/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
diff --git a/src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor.cs b/src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor.cs
index f746f0dd1..82f2155cc 100644
--- a/src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor.cs
+++ b/src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor.cs
@@ -9,18 +9,12 @@
 //------------------------------------------------------------------------------
 
 #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;
 
 public partial class MainLayout : IDisposable
diff --git a/src/Admin/ThingsGateway.AdminServer/Program/Program.cs b/src/Admin/ThingsGateway.AdminServer/Program/Program.cs
index 7dfcd691d..342f4892e 100644
--- a/src/Admin/ThingsGateway.AdminServer/Program/Program.cs
+++ b/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
diff --git a/src/Admin/ThingsGateway.AdminServer/Program/SingleFilePublish.cs b/src/Admin/ThingsGateway.AdminServer/Program/SingleFilePublish.cs
index 257516cde..6eb6612d9 100644
--- a/src/Admin/ThingsGateway.AdminServer/Program/SingleFilePublish.cs
+++ b/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",
         ];
     }
 }
diff --git a/src/Admin/ThingsGateway.AdminServer/Program/Startup.cs b/src/Admin/ThingsGateway.AdminServer/Program/Startup.cs
index 88a1b1fcd..ff91d620a 100644
--- a/src/Admin/ThingsGateway.AdminServer/Program/Startup.cs
+++ b/src/Admin/ThingsGateway.AdminServer/Program/Startup.cs
@@ -18,18 +18,11 @@ 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;
-
 namespace ThingsGateway.AdminServer;
 
 [AppStartup(-99999)]
diff --git a/src/Admin/ThingsGateway.Admin.Application/Attributes/IgnoreExcelAttribute.cs b/src/Admin/ThingsGateway.SqlSugar/Attributes/IgnoreExcelAttribute.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/Attributes/IgnoreExcelAttribute.cs
rename to src/Admin/ThingsGateway.SqlSugar/Attributes/IgnoreExcelAttribute.cs
diff --git a/src/Admin/ThingsGateway.Admin.Application/Attributes/IgnoreSeedDataAttribute.cs b/src/Admin/ThingsGateway.SqlSugar/Attributes/IgnoreSeedDataAttribute.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/Attributes/IgnoreSeedDataAttribute.cs
rename to src/Admin/ThingsGateway.SqlSugar/Attributes/IgnoreSeedDataAttribute.cs
diff --git a/src/Admin/ThingsGateway.Admin.Application/Const/ClaimConst.cs b/src/Admin/ThingsGateway.SqlSugar/Const/ClaimConst.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/Const/ClaimConst.cs
rename to src/Admin/ThingsGateway.SqlSugar/Const/ClaimConst.cs
diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/BaseEntity.cs b/src/Admin/ThingsGateway.SqlSugar/Entity/BaseEntity.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/Entity/BaseEntity.cs
rename to src/Admin/ThingsGateway.SqlSugar/Entity/BaseEntity.cs
diff --git a/src/Admin/ThingsGateway.Admin.Application/Extensions/ExportExcelExtensions.cs b/src/Admin/ThingsGateway.SqlSugar/Extensions/ExportExcelExtensions.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/Extensions/ExportExcelExtensions.cs
rename to src/Admin/ThingsGateway.SqlSugar/Extensions/ExportExcelExtensions.cs
diff --git a/src/Admin/ThingsGateway.Admin.Application/Extensions/FileExtensions.cs b/src/Admin/ThingsGateway.SqlSugar/Extensions/FileExtensions.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/Extensions/FileExtensions.cs
rename to src/Admin/ThingsGateway.SqlSugar/Extensions/FileExtensions.cs
diff --git a/src/Admin/ThingsGateway.Admin.Application/Extensions/QueryPageOptionsExtensions.cs b/src/Admin/ThingsGateway.SqlSugar/Extensions/QueryPageOptionsExtensions.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/Extensions/QueryPageOptionsExtensions.cs
rename to src/Admin/ThingsGateway.SqlSugar/Extensions/QueryPageOptionsExtensions.cs
diff --git a/src/Admin/ThingsGateway.Admin.Application/Extensions/SqlSugarExtensions.cs b/src/Admin/ThingsGateway.SqlSugar/Extensions/SqlSugarExtensions.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/Extensions/SqlSugarExtensions.cs
rename to src/Admin/ThingsGateway.SqlSugar/Extensions/SqlSugarExtensions.cs
diff --git a/src/Admin/ThingsGateway.SqlSugar/GlobalUsings.cs b/src/Admin/ThingsGateway.SqlSugar/GlobalUsings.cs
new file mode 100644
index 000000000..ec2e58001
--- /dev/null
+++ b/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;
\ No newline at end of file
diff --git a/src/Admin/ThingsGateway.SqlSugar/Services/AppService/ClaimsPrincipalService.cs b/src/Admin/ThingsGateway.SqlSugar/Services/AppService/ClaimsPrincipalService.cs
new file mode 100644
index 000000000..e87e4a3dd
--- /dev/null
+++ b/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;
+
+}
diff --git a/src/Admin/ThingsGateway.SqlSugar/Services/AppService/IClaimsPrincipalService.cs b/src/Admin/ThingsGateway.SqlSugar/Services/AppService/IClaimsPrincipalService.cs
new file mode 100644
index 000000000..d8cef99a7
--- /dev/null
+++ b/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; }
+}
\ No newline at end of file
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/SugarAopService/ISugarAopService.cs b/src/Admin/ThingsGateway.SqlSugar/Services/SugarAopService/ISugarAopService.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/Services/SugarAopService/ISugarAopService.cs
rename to src/Admin/ThingsGateway.SqlSugar/Services/SugarAopService/ISugarAopService.cs
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/SugarAopService/SugarAopService.cs b/src/Admin/ThingsGateway.SqlSugar/Services/SugarAopService/SugarAopService.cs
similarity index 95%
rename from src/Admin/ThingsGateway.Admin.Application/Services/SugarAopService/SugarAopService.cs
rename to src/Admin/ThingsGateway.SqlSugar/Services/SugarAopService/SugarAopService.cs
index 600910963..4d88601a7 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/SugarAopService/SugarAopService.cs
+++ b/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);
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/SugarService/BaseService.cs b/src/Admin/ThingsGateway.SqlSugar/Services/SugarService/BaseService.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/Services/SugarService/BaseService.cs
rename to src/Admin/ThingsGateway.SqlSugar/Services/SugarService/BaseService.cs
diff --git a/src/Admin/ThingsGateway.Admin.Application/SqlSugar/CodeFirstUtils.cs b/src/Admin/ThingsGateway.SqlSugar/SqlSugar/CodeFirstUtils.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/SqlSugar/CodeFirstUtils.cs
rename to src/Admin/ThingsGateway.SqlSugar/SqlSugar/CodeFirstUtils.cs
diff --git a/src/Admin/ThingsGateway.Admin.Application/SqlSugar/DbContext.cs b/src/Admin/ThingsGateway.SqlSugar/SqlSugar/DbContext.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/SqlSugar/DbContext.cs
rename to src/Admin/ThingsGateway.SqlSugar/SqlSugar/DbContext.cs
diff --git a/src/Admin/ThingsGateway.Admin.Application/SqlSugar/ISqlSugarEntitySeedData.cs b/src/Admin/ThingsGateway.SqlSugar/SqlSugar/ISqlSugarEntitySeedData.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/SqlSugar/ISqlSugarEntitySeedData.cs
rename to src/Admin/ThingsGateway.SqlSugar/SqlSugar/ISqlSugarEntitySeedData.cs
diff --git a/src/Admin/ThingsGateway.Admin.Application/SqlSugar/SeedDataUtil.cs b/src/Admin/ThingsGateway.SqlSugar/SqlSugar/SeedDataUtil.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/SqlSugar/SeedDataUtil.cs
rename to src/Admin/ThingsGateway.SqlSugar/SqlSugar/SeedDataUtil.cs
diff --git a/src/Admin/ThingsGateway.Admin.Application/SqlSugar/SqlSugarOptions.cs b/src/Admin/ThingsGateway.SqlSugar/SqlSugar/SqlSugarOptions.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/SqlSugar/SqlSugarOptions.cs
rename to src/Admin/ThingsGateway.SqlSugar/SqlSugar/SqlSugarOptions.cs
diff --git a/src/Admin/ThingsGateway.SqlSugar/Startup.cs b/src/Admin/ThingsGateway.SqlSugar/Startup.cs
new file mode 100644
index 000000000..e8488667f
--- /dev/null
+++ b/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)
+    {
+
+
+    }
+}
diff --git a/src/Admin/ThingsGateway.Admin.Application/Static/UserManager.cs b/src/Admin/ThingsGateway.SqlSugar/Static/UserManager.cs
similarity index 56%
rename from src/Admin/ThingsGateway.Admin.Application/Static/UserManager.cs
rename to src/Admin/ThingsGateway.SqlSugar/Static/UserManager.cs
index 6dfb9e33d..558fcd068 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Static/UserManager.cs
+++ b/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;
 
 }
diff --git a/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj b/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj
new file mode 100644
index 000000000..e62901a72
--- /dev/null
+++ b/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>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/CommonUtils.cs b/src/Admin/ThingsGateway.SqlSugar/Util/CommonUtils.cs
similarity index 100%
rename from src/Admin/ThingsGateway.Admin.Application/Util/CommonUtils.cs
rename to src/Admin/ThingsGateway.SqlSugar/Util/CommonUtils.cs
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index b8f472d00..8efe61210 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.6.32</PluginVersion>
-		<ProPluginVersion>10.6.32</ProPluginVersion>
+		<PluginVersion>10.6.35</PluginVersion>
+		<ProPluginVersion>10.6.35</ProPluginVersion>
 		<AuthenticationVersion>2.1.8</AuthenticationVersion>
 	</PropertyGroup>
 
diff --git a/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor b/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor
index 33beda806..486e89155 100644
--- a/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor
+++ b/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>
diff --git a/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor.cs b/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor.cs
index 35f8e2db2..8fd18802b 100644
--- a/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor.cs
+++ b/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; }
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelRuntimeInfo.razor b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelRuntimeInfo.razor
index e6df7db8e..fa8809e24 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelRuntimeInfo.razor
+++ b/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);
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceRuntimeInfo.razor b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceRuntimeInfo.razor
index 6ea601d70..20faab189 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceRuntimeInfo.razor
+++ b/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);
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/GatewayMonitorPage.razor b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/GatewayMonitorPage.razor
index 8a9faeeef..e6dcb643d 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/GatewayMonitorPage.razor
+++ b/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>
diff --git a/src/Gateway/ThingsGateway.Management/Pages/RedundancyOptionsPage.razor b/src/Gateway/ThingsGateway.Management/Pages/RedundancyOptionsPage.razor
index beedf1452..bd5043bf2 100644
--- a/src/Gateway/ThingsGateway.Management/Pages/RedundancyOptionsPage.razor
+++ b/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>
         }
diff --git a/src/Gateway/ThingsGateway.RulesEngine/Page/RulesStatus.razor b/src/Gateway/ThingsGateway.RulesEngine/Page/RulesStatus.razor
index ea0c8f6e1..a12cb0646 100644
--- a/src/Gateway/ThingsGateway.RulesEngine/Page/RulesStatus.razor
+++ b/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>
 }
diff --git a/src/ThingsGateway.Server/Configuration/App.Development.json b/src/ThingsGateway.Server/Configuration/App.Development.json
index dd36b615a..e92cb26a4 100644
--- a/src/ThingsGateway.Server/Configuration/App.Development.json
+++ b/src/ThingsGateway.Server/Configuration/App.Development.json
@@ -11,6 +11,7 @@
 
     // nuget动态加载的程序集
     "SupportPackageNamePrefixs": [
+      "ThingsGateway.SqlSugar",
       "ThingsGateway.Admin.Application",
       "ThingsGateway.Admin.Razor",
       "ThingsGateway.Gateway.Application",
diff --git a/src/ThingsGateway.Server/Configuration/App.json b/src/ThingsGateway.Server/Configuration/App.json
index d3fb3f562..98f9d42f8 100644
--- a/src/ThingsGateway.Server/Configuration/App.json
+++ b/src/ThingsGateway.Server/Configuration/App.json
@@ -11,6 +11,7 @@
 
     // nuget动态加载的程序集
     "SupportPackageNamePrefixs": [
+      "ThingsGateway.SqlSugar",
       "ThingsGateway.Admin.Application",
       "ThingsGateway.Admin.Razor",
       "ThingsGateway.Gateway.Application",
diff --git a/src/ThingsGateway.Server/Program/SingleFilePublish.cs b/src/ThingsGateway.Server/Program/SingleFilePublish.cs
index cbe4951c4..ed0f265b4 100644
--- a/src/ThingsGateway.Server/Program/SingleFilePublish.cs
+++ b/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",
diff --git a/src/ThingsGateway.sln b/src/ThingsGateway.sln
index def0ca2c2..1ba26339a 100644
--- a/src/ThingsGateway.sln
+++ b/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
diff --git a/src/Upgrade/ThingsGateway.UpgradeServer/Program/SingleFilePublish.cs b/src/Upgrade/ThingsGateway.UpgradeServer/Program/SingleFilePublish.cs
index cf2b27d9e..d8fa8e29a 100644
--- a/src/Upgrade/ThingsGateway.UpgradeServer/Program/SingleFilePublish.cs
+++ b/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"   ,
diff --git a/src/Version.props b/src/Version.props
index ea82d5680..ed2ebf212 100644
--- a/src/Version.props
+++ b/src/Version.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>10.6.32</Version>
+    <Version>10.6.35</Version>
   </PropertyGroup>
 
   <ItemGroup>