diff --git a/src/Admin/ThingsGateway.Admin.Application/Aop/OperDescAttribute.cs b/src/Admin/ThingsGateway.Admin.Application/Aop/OperDescAttribute.cs
index 2a728f57c..556a79bda 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Aop/OperDescAttribute.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Aop/OperDescAttribute.cs
@@ -20,7 +20,6 @@ using System.Collections.Concurrent;
 using ThingsGateway.Extension;
 using ThingsGateway.FriendlyException;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysDict.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysDict.cs
index 8707cc4a4..8215aa525 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysDict.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysDict.cs
@@ -8,12 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using System.ComponentModel.DataAnnotations;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 [SugarTable("sys_dict", TableDescription = "字典表")]
diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysOperateLog.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysOperateLog.cs
index 53a19cf22..5ab032bc1 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysOperateLog.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysOperateLog.cs
@@ -8,10 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysOrg.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysOrg.cs
index 42e316a06..da7de367a 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysOrg.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysOrg.cs
@@ -8,12 +8,8 @@
 // QQ群：605534569
 // ------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using System.ComponentModel.DataAnnotations;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysPosition.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysPosition.cs
index 14c7172ca..e74f86dfd 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysPosition.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysPosition.cs
@@ -8,11 +8,9 @@
 // QQ群：605534569
 // ------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using System.ComponentModel.DataAnnotations;
 
-using ThingsGateway.SqlSugar;
+
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysRelation.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysRelation.cs
index f0488628d..021397c17 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysRelation.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysRelation.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysResource.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysResource.cs
index 21de2e2fb..75545b6a6 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysResource.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysResource.cs
@@ -8,16 +8,12 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using Microsoft.AspNetCore.Components.Routing;
 
 using Newtonsoft.Json;
 
 using System.ComponentModel.DataAnnotations;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysRole.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysRole.cs
index 7119b59bc..3dcf2f2df 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysRole.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysRole.cs
@@ -8,12 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using System.ComponentModel.DataAnnotations;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/SysUser.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/SysUser.cs
index 2c205fa54..f2403c53f 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Entity/SysUser.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Entity/SysUser.cs
@@ -8,14 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using Riok.Mapperly.Abstractions;
 
 using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.CodeAnalysis;
-
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Entity/VerificatInfo.cs b/src/Admin/ThingsGateway.Admin.Application/Entity/VerificatInfo.cs
index c64c85799..7489ee91a 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Entity/VerificatInfo.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Entity/VerificatInfo.cs
@@ -8,10 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
-using ThingsGateway.List;
-using ThingsGateway.SqlSugar;
+using ThingsGateway.Common.List;
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Filter/RequestAuditFilter.cs b/src/Admin/ThingsGateway.Admin.Application/Filter/RequestAuditFilter.cs
index 3481ae06f..8b876a5e1 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Filter/RequestAuditFilter.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Filter/RequestAuditFilter.cs
@@ -79,7 +79,7 @@ public class RequestAuditFilter : IAsyncActionFilter, IOrderedFilter
 
         logData.TimeOperationElapsedMilliseconds = timeOperation.ElapsedMilliseconds;
 
-        var resultHttpContext = (resultContext as FilterContext).HttpContext;
+        var resultHttpContext = (resultContext as Microsoft.AspNetCore.Mvc.Filters.FilterContext).HttpContext;
 
         // 获取 HttpContext 和 HttpRequest 对象
         var httpContext = context.HttpContext;
diff --git a/src/Admin/ThingsGateway.Admin.Application/GlobalUsings.cs b/src/Admin/ThingsGateway.Admin.Application/GlobalUsings.cs
index ec2e58001..59d3021d1 100644
--- a/src/Admin/ThingsGateway.Admin.Application/GlobalUsings.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/GlobalUsings.cs
@@ -8,4 +8,15 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-global using ThingsGateway.NewLife.Extension;
\ No newline at end of file
+global using BootstrapBlazor.Components;
+
+global using Microsoft.Extensions.Localization;
+global using Microsoft.Extensions.Options;
+
+global using System.Diagnostics.CodeAnalysis;
+global using System.Globalization;
+
+global using ThingsGateway.Common;
+global using ThingsGateway.DB;
+global using ThingsGateway.NewLife.Extension;
+global using ThingsGateway.SqlSugar;
diff --git a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareInfo.cs b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareInfo.cs
index 746740244..2d79d67b9 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareInfo.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareInfo.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using ThingsGateway.NewLife;
 
 namespace ThingsGateway.Admin.Application;
diff --git a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareJob.cs b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareJob.cs
index 3d58948c8..5f7845621 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareJob.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareJob.cs
@@ -9,9 +9,7 @@
 // ------------------------------------------------------------------------------
 
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 using System.Runtime.InteropServices;
 
@@ -20,7 +18,6 @@ using ThingsGateway.NewLife;
 using ThingsGateway.NewLife.Caching;
 using ThingsGateway.NewLife.Threading;
 using ThingsGateway.Schedule;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HistoryHardwareInfo.cs b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HistoryHardwareInfo.cs
index 0681bb945..d86bb6011 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HistoryHardwareInfo.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HistoryHardwareInfo.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Logging/DatabaseLoggingWriter.cs b/src/Admin/ThingsGateway.Admin.Application/Logging/DatabaseLoggingWriter.cs
index 82c09b135..326e325a8 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Logging/DatabaseLoggingWriter.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Logging/DatabaseLoggingWriter.cs
@@ -15,8 +15,6 @@ using ThingsGateway.Extension;
 using ThingsGateway.FriendlyException;
 using ThingsGateway.Logging;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.Razor;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Mapper/AdminMapper.cs b/src/Admin/ThingsGateway.Admin.Application/Mapper/AdminMapper.cs
index 3670b494e..a30ed2af6 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Mapper/AdminMapper.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Mapper/AdminMapper.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using Riok.Mapperly.Abstractions;
 
 namespace ThingsGateway.Admin.Application;
diff --git a/src/Admin/ThingsGateway.Admin.Application/OAuth/AdminOAuthHandler.cs b/src/Admin/ThingsGateway.Admin.Application/OAuth/AdminOAuthHandler.cs
index 2dec57dae..3c3f90952 100644
--- a/src/Admin/ThingsGateway.Admin.Application/OAuth/AdminOAuthHandler.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/OAuth/AdminOAuthHandler.cs
@@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 using System.Collections.Concurrent;
 using System.Security.Claims;
diff --git a/src/Admin/ThingsGateway.Admin.Application/Provider/BlazorAuthenticationHandler.cs b/src/Admin/ThingsGateway.Admin.Application/Provider/BlazorAuthenticationHandler.cs
index 5e7b3df51..3aa0947fd 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Provider/BlazorAuthenticationHandler.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Provider/BlazorAuthenticationHandler.cs
@@ -10,7 +10,6 @@
 
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Http;
 
 using System.Security.Claims;
@@ -116,7 +115,7 @@ public class BlazorAuthenticationHandler : AppAuthorizeHandler
                 {
                     // 路由名称
                     var routeName = routeData.PageType.CustomAttributes.FirstOrDefault(x =>
-                        x.AttributeType == typeof(RouteAttribute))?.ConstructorArguments?[0].Value as string;
+                        x.AttributeType == typeof(Microsoft.AspNetCore.Components.RouteAttribute))?.ConstructorArguments?[0].Value as string;
                     if (routeName == null) return true;
 
                     if ((!user.PermissionCodeList.Contains(routeName.CutStart("/")) && !user.PermissionCodeList.Contains(routeName))) //如果当前路由信息不包含在角色授权路由列表中则认证失败
diff --git a/src/Admin/ThingsGateway.Admin.Application/Provider/UnifyResultProvider.cs b/src/Admin/ThingsGateway.Admin.Application/Provider/UnifyResultProvider.cs
index b33aa403a..26bf76b63 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Provider/UnifyResultProvider.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Provider/UnifyResultProvider.cs
@@ -11,11 +11,9 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Localization;
 
 using ThingsGateway.DataValidation;
 using ThingsGateway.FriendlyException;
-using ThingsGateway.Razor;
 using ThingsGateway.UnifyResult;
 
 namespace ThingsGateway.Admin.Application;
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/ApiPermission/ApiPermissionService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/ApiPermission/ApiPermissionService.cs
index de85f267b..73a1980aa 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/ApiPermission/ApiPermissionService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/ApiPermission/ApiPermissionService.cs
@@ -9,19 +9,15 @@
 // ------------------------------------------------------------------------------
 
 
-using BootstrapBlazor.Components;
-
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.Controllers;
-using Microsoft.Extensions.Options;
 
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-using System.Globalization;
 using System.Reflection;
 
-using ThingsGateway.Extension;
+using ThingsGateway.Common.Extension;
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthService.cs
index a1ef19909..1e00675cc 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthService.cs
@@ -10,7 +10,6 @@
 
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Localization;
 
 using System.Security.Claims;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Dict/ISysDictService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Dict/ISysDictService.cs
index 749705012..8d588b3f8 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Dict/ISysDictService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Dict/ISysDictService.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Dict/SysDictService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Dict/SysDictService.cs
index 27ac425d9..d4a05aef7 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Dict/SysDictService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Dict/SysDictService.cs
@@ -8,11 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using ThingsGateway.FriendlyException;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.Razor;
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/File/FileService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/File/FileService.cs
index b6f1a95f7..3e4c43ead 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/File/FileService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/File/FileService.cs
@@ -10,7 +10,6 @@
 
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Localization;
 
 using System.Text;
 using System.Web;
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/Dto/OperateLogInput.cs b/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/Dto/OperateLogInput.cs
index 8d8c02bf0..3ed7d48f1 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/Dto/OperateLogInput.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/Dto/OperateLogInput.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using ThingsGateway.Extension.Generic;
 
 namespace ThingsGateway.Admin.Application;
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/ISysOperateLogService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/ISysOperateLogService.cs
index a26f259be..9e61dad86 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/ISysOperateLogService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/ISysOperateLogService.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/SysOperateLogService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/SysOperateLogService.cs
index 566c38322..df668ae42 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/SysOperateLogService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/SysOperateLogService.cs
@@ -8,12 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using System.Data;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 internal sealed class SysOperateLogService : BaseService<SysOperateLog>, ISysOperateLogService
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Org/ISysOrgService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Org/ISysOrgService.cs
index d66ebeccd..9ab248d19 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Org/ISysOrgService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Org/ISysOrgService.cs
@@ -8,10 +8,6 @@
 // QQ群：605534569
 // ------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Org/SysOrgService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Org/SysOrgService.cs
index 455042831..b81fb1f15 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Org/SysOrgService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Org/SysOrgService.cs
@@ -8,11 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.FriendlyException;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Pos/ISysPositionService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Pos/ISysPositionService.cs
index 595838854..c9e2b40ed 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Pos/ISysPositionService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Pos/ISysPositionService.cs
@@ -8,10 +8,6 @@
 // QQ群：605534569
 // ------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Pos/SysPositionService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Pos/SysPositionService.cs
index 236a4ef1f..6e3ace77f 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Pos/SysPositionService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Pos/SysPositionService.cs
@@ -8,10 +8,7 @@
 // QQ群：605534569
 // ------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using ThingsGateway.FriendlyException;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Resource/Dto/ResourceInput.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Resource/Dto/ResourceInput.cs
index d054195b5..dd9aab809 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Resource/Dto/ResourceInput.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Resource/Dto/ResourceInput.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using System.ComponentModel.DataAnnotations;
 
 using ThingsGateway.Extension.Generic;
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Resource/ISysResourceService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Resource/ISysResourceService.cs
index b5bb445b7..53b9c7a49 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Resource/ISysResourceService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Resource/ISysResourceService.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Resource/SysResourceService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Resource/SysResourceService.cs
index e7424f6de..c60a27590 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Resource/SysResourceService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Resource/SysResourceService.cs
@@ -8,12 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using Microsoft.Extensions.DependencyInjection;
 
 using ThingsGateway.FriendlyException;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Role/ISysRoleService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Role/ISysRoleService.cs
index 56aabef67..9f8ace433 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Role/ISysRoleService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Role/ISysRoleService.cs
@@ -8,10 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Role/SysRoleService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Role/SysRoleService.cs
index 42c28e952..fe4ce42b7 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Role/SysRoleService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Role/SysRoleService.cs
@@ -8,11 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using ThingsGateway.FriendlyException;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Session/Dto/SessionOutput.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Session/Dto/SessionOutput.cs
index b57400a81..14e7f7238 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Session/Dto/SessionOutput.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Session/Dto/SessionOutput.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Session/ISessionService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Session/ISessionService.cs
index 4694d9238..78f1dd3d9 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Session/ISessionService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Session/ISessionService.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 public interface ISessionService
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Session/SessionService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/Session/SessionService.cs
index ecf67f3b5..c8a34d811 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Session/SessionService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Session/SessionService.cs
@@ -8,10 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 internal sealed class SessionService : BaseService<SysUser>, ISessionService
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/User/Dto/UserOutput.cs b/src/Admin/ThingsGateway.Admin.Application/Services/User/Dto/UserOutput.cs
index 6cbea9a54..eb2caa500 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/User/Dto/UserOutput.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/User/Dto/UserOutput.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/User/ISysUserService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/User/ISysUserService.cs
index e96dcee58..abd6cf890 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/User/ISysUserService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/User/ISysUserService.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/User/SysUserService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/User/SysUserService.cs
index 229e010a3..205c41302 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/User/SysUserService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/User/SysUserService.cs
@@ -8,14 +8,12 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
+using ThingsGateway.Common.Extension;
+using ThingsGateway.Common.Extension.Generic;
 using ThingsGateway.DataEncryption;
-using ThingsGateway.Extension;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.FriendlyException;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/UserCenter/UserCenterService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/UserCenter/UserCenterService.cs
index bbddc5552..2b0f2b81e 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/UserCenter/UserCenterService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/UserCenter/UserCenterService.cs
@@ -8,16 +8,13 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using System.Text.RegularExpressions;
 
+using ThingsGateway.Common.Extension;
 using ThingsGateway.DataEncryption;
-using ThingsGateway.Extension;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.FriendlyException;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.Razor;
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/VerificatInfo/VerificatInfoService.cs b/src/Admin/ThingsGateway.Admin.Application/Services/VerificatInfo/VerificatInfoService.cs
index b46cd5655..0cb1b8752 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/VerificatInfo/VerificatInfoService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/VerificatInfo/VerificatInfoService.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Startup.cs b/src/Admin/ThingsGateway.Admin.Application/Startup.cs
index e29f17138..fee1cd481 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Startup.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Startup.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
@@ -43,7 +41,6 @@ public class Startup : AppStartup
 
         services.AddSingleton<IVerificatInfoService, VerificatInfoService>();
 
-        services.AddScoped<IAuthRazorService, AuthRazorService>();
         services.AddSingleton<IApiPermissionService, ApiPermissionService>();
         services.AddSingleton<IFileService, FileService>();
         services.AddSingleton<IImportExportService, ImportExportService>();
diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/ImportExportUtil.cs b/src/Admin/ThingsGateway.Admin.Application/Util/ImportExportUtil.cs
index f4070d2b0..a0d2013f2 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Util/ImportExportUtil.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Util/ImportExportUtil.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using ThingsGateway.NewLife;
 
 namespace ThingsGateway.Admin.Application;
diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/OpenApiUtil.cs b/src/Admin/ThingsGateway.Admin.Application/Util/OpenApiUtil.cs
index c880c59fd..aeea1570a 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Util/OpenApiUtil.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Util/OpenApiUtil.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/OrgUtil.cs b/src/Admin/ThingsGateway.Admin.Application/Util/OrgUtil.cs
index 47e32c047..852c42a4d 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Util/OrgUtil.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Util/OrgUtil.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/PositionUtil.cs b/src/Admin/ThingsGateway.Admin.Application/Util/PositionUtil.cs
index d136baa7e..2edf2c037 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Util/PositionUtil.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Util/PositionUtil.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/RoleUtil.cs b/src/Admin/ThingsGateway.Admin.Application/Util/RoleUtil.cs
index 62add004c..336f4c736 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Util/RoleUtil.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Util/RoleUtil.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/UserUtil.cs b/src/Admin/ThingsGateway.Admin.Application/Util/UserUtil.cs
index 35948a5da..e1b3b0564 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Util/UserUtil.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Util/UserUtil.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>
diff --git a/src/Admin/ThingsGateway.Admin.Application/Util/VerificatInfoUtil.cs b/src/Admin/ThingsGateway.Admin.Application/Util/VerificatInfoUtil.cs
index fc80595d9..503d25eac 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Util/VerificatInfoUtil.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Util/VerificatInfoUtil.cs
@@ -9,7 +9,6 @@
 //------------------------------------------------------------------------------
 
 using ThingsGateway.Extension.Generic;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
diff --git a/src/Admin/ThingsGateway.Admin.Razor/Components/ChoiceModuleComponent.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Components/ChoiceModuleComponent.razor.cs
index 4b4104b40..6b6856cae 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/Components/ChoiceModuleComponent.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Components/ChoiceModuleComponent.razor.cs
@@ -9,7 +9,6 @@
 //------------------------------------------------------------------------------
 
 using ThingsGateway.Admin.Application;
-using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Admin.Razor;
 
diff --git a/src/Admin/ThingsGateway.Admin.Razor/Context/BlazorAppContext.cs b/src/Admin/ThingsGateway.Admin.Razor/Context/BlazorAppContext.cs
index 837f33cfb..dae2bc2e6 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/Context/BlazorAppContext.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Context/BlazorAppContext.cs
@@ -10,7 +10,6 @@
 
 using ThingsGateway.Admin.Application;
 using ThingsGateway.NewLife;
-using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Admin.Razor;
 
diff --git a/src/Admin/ThingsGateway.Admin.Razor/GlobalUsings.cs b/src/Admin/ThingsGateway.Admin.Razor/GlobalUsings.cs
index e0348f1fb..b9183193e 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/GlobalUsings.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/GlobalUsings.cs
@@ -16,7 +16,10 @@ global using Microsoft.Extensions.Options;
 
 global using System.Diagnostics.CodeAnalysis;
 
+global using ThingsGateway.Common;
+global using ThingsGateway.DB;
+global using ThingsGateway.NewLife.Extension;
 global using ThingsGateway.Razor;
-
+global using ThingsGateway.SqlSugar;
 [assembly: SuppressMessage("Reliability", "CA2007", Justification = "<挂起>", Scope = "module")]
 [assembly: GlobalGenerateSetParametersAsync(true)]
\ No newline at end of file
diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/AppConfig/EditPagePolicy.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/AppConfig/EditPagePolicy.razor.cs
index d4fa93972..3f1b366e7 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/AppConfig/EditPagePolicy.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/AppConfig/EditPagePolicy.razor.cs
@@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Components.Forms;
 
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Extension.Generic;
-using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Admin.Razor;
 
diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/OrgTree.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/OrgTree.razor.cs
index f56b09149..afe4878d8 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/OrgTree.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/OrgTree.razor.cs
@@ -9,8 +9,6 @@
 //------------------------------------------------------------------------------
 
 using ThingsGateway.Admin.Application;
-using ThingsGateway.NewLife.Extension;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Razor;
 
diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/SysOrgPage.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/SysOrgPage.razor.cs
index ca37e1697..10ed34f7e 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/SysOrgPage.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/Org/SysOrgPage.razor.cs
@@ -9,7 +9,6 @@
 //------------------------------------------------------------------------------
 
 using ThingsGateway.Admin.Application;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Razor;
 
diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/Position/PositionTree.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/Position/PositionTree.razor.cs
index 780a9a6eb..4ac79c374 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/Position/PositionTree.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/Position/PositionTree.razor.cs
@@ -9,8 +9,6 @@
 //------------------------------------------------------------------------------
 
 using ThingsGateway.Admin.Application;
-using ThingsGateway.NewLife.Extension;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Razor;
 
diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/RoleTree.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/RoleTree.razor.cs
index b027869c5..81f07bf4c 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/RoleTree.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/RoleTree.razor.cs
@@ -9,8 +9,6 @@
 //------------------------------------------------------------------------------
 
 using ThingsGateway.Admin.Application;
-using ThingsGateway.NewLife.Extension;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Razor;
 
diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRoleEdit.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRoleEdit.razor.cs
index 6b1465473..3b4c2b3c2 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRoleEdit.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRoleEdit.razor.cs
@@ -10,7 +10,6 @@
 
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Extension.Generic;
-using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Admin.Razor;
 
diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRolePage.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRolePage.razor.cs
index fcc463ddf..1f0b81735 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRolePage.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRolePage.razor.cs
@@ -9,7 +9,6 @@
 //------------------------------------------------------------------------------
 
 using ThingsGateway.Admin.Application;
-using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Admin.Razor;
 
diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserEdit.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserEdit.razor.cs
index 6b74b8563..efde7c83d 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserEdit.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserEdit.razor.cs
@@ -11,7 +11,6 @@
 using Microsoft.AspNetCore.Components.Forms;
 
 using ThingsGateway.Admin.Application;
-using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Admin.Razor;
 
diff --git a/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserPage.razor.cs b/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserPage.razor.cs
index 5349f1607..14d4977d3 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserPage.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserPage.razor.cs
@@ -9,7 +9,6 @@
 //------------------------------------------------------------------------------
 
 using ThingsGateway.Admin.Application;
-using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Admin.Razor;
 
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthRazorService.cs b/src/Admin/ThingsGateway.Admin.Razor/Services/AuthRazorService.cs
similarity index 95%
rename from src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthRazorService.cs
rename to src/Admin/ThingsGateway.Admin.Razor/Services/AuthRazorService.cs
index d177563cf..32dbbfa56 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthRazorService.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Services/AuthRazorService.cs
@@ -8,13 +8,11 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
+using ThingsGateway.Admin.Application;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.Razor;
 
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.Admin.Razor;
 
 internal sealed class AuthRazorService : IAuthRazorService
 {
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/HybridAuthRazorService.cs b/src/Admin/ThingsGateway.Admin.Razor/Services/HybridAuthRazorService.cs
similarity index 95%
rename from src/Admin/ThingsGateway.Admin.Application/Services/Auth/HybridAuthRazorService.cs
rename to src/Admin/ThingsGateway.Admin.Razor/Services/HybridAuthRazorService.cs
index 648a96c0c..0d24db78f 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/HybridAuthRazorService.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Services/HybridAuthRazorService.cs
@@ -8,9 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.Razor;
+using ThingsGateway.Admin.Application;
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.Admin.Razor;
 
 
 public class HybridAuthRazorService : IAuthRazorService
diff --git a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/IAuthRazorService.cs b/src/Admin/ThingsGateway.Admin.Razor/Services/IAuthRazorService.cs
similarity index 92%
rename from src/Admin/ThingsGateway.Admin.Application/Services/Auth/IAuthRazorService.cs
rename to src/Admin/ThingsGateway.Admin.Razor/Services/IAuthRazorService.cs
index 768d6a237..2aa1f2e1d 100644
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/IAuthRazorService.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Services/IAuthRazorService.cs
@@ -8,9 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.Razor;
+using ThingsGateway.Admin.Application;
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.Admin.Razor;
 
 public interface IAuthRazorService
 {
diff --git a/src/Admin/ThingsGateway.Admin.Razor/Startup.cs b/src/Admin/ThingsGateway.Admin.Razor/Startup.cs
index 0eeca4767..e7a856ce2 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/Startup.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Startup.cs
@@ -18,6 +18,7 @@ public class Startup : AppStartup
     public void Configure(IServiceCollection services)
     {
         services.AddScoped<IMenuService, MenuService>();
+        services.AddScoped<IAuthRazorService, AuthRazorService>();
         services.AddBootstrapBlazorTableExportService();
     }
 }
diff --git a/src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj b/src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj
index 85ddbbc0b..5eebba412 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj
+++ b/src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj
@@ -37,6 +37,7 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\BlazorSetParametersAsyncGenerator\BlazorSetParametersAsyncGenerator.csproj" PrivateAssets="all" OutputItemType="Analyzer" />
+		<ProjectReference Include="..\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />
 	</ItemGroup>
 	
 </Project>
diff --git a/src/Admin/ThingsGateway.Admin.Razor/_Imports.razor b/src/Admin/ThingsGateway.Admin.Razor/_Imports.razor
index d77ed7b7b..45cc1c367 100644
--- a/src/Admin/ThingsGateway.Admin.Razor/_Imports.razor
+++ b/src/Admin/ThingsGateway.Admin.Razor/_Imports.razor
@@ -15,5 +15,5 @@
 
 @using BootstrapBlazor.Components
 
-
+@using ThingsGateway.Common.Extension;
 @using ThingsGateway.Razor;
\ No newline at end of file
diff --git a/src/Admin/ThingsGateway.AdminServer/Configuration/App.Development.json b/src/Admin/ThingsGateway.AdminServer/Configuration/App.Development.json
index 1a7f4775e..fd7f1f770 100644
--- a/src/Admin/ThingsGateway.AdminServer/Configuration/App.Development.json
+++ b/src/Admin/ThingsGateway.AdminServer/Configuration/App.Development.json
@@ -14,6 +14,7 @@
       "ThingsGateway.SqlSugar",
       "ThingsGateway.Admin.Application",
       "ThingsGateway.Admin.Razor",
+      "ThingsGateway.Common",
       "ThingsGateway.DB",
       "ThingsGateway.Razor"
     ]
diff --git a/src/Admin/ThingsGateway.AdminServer/Configuration/App.json b/src/Admin/ThingsGateway.AdminServer/Configuration/App.json
index 0beae8fbc..94d401591 100644
--- a/src/Admin/ThingsGateway.AdminServer/Configuration/App.json
+++ b/src/Admin/ThingsGateway.AdminServer/Configuration/App.json
@@ -14,6 +14,7 @@
       "ThingsGateway.SqlSugar",
       "ThingsGateway.Admin.Application",
       "ThingsGateway.Admin.Razor",
+      "ThingsGateway.Common",
       "ThingsGateway.DB",
       "ThingsGateway.Razor"
     ]
diff --git a/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor b/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor
index 7038308d7..cb944daef 100644
--- a/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor
+++ b/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor
@@ -6,6 +6,7 @@
 @using ThingsGateway.Admin.Razor
 @using ThingsGateway.Extension;
 @using ThingsGateway.Razor
+@using ThingsGateway.Common.Extension;
 
 <div class="login h-100">
     @* 左侧说明 *@
diff --git a/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor.cs b/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor.cs
index 3b9275a2a..682e63e37 100644
--- a/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor.cs
+++ b/src/Admin/ThingsGateway.AdminServer/Layout/Login.razor.cs
@@ -19,6 +19,8 @@ using Microsoft.Extensions.Options;
 using System.Diagnostics.CodeAnalysis;
 
 using ThingsGateway.Admin.Application;
+using ThingsGateway.Admin.Razor;
+using ThingsGateway.Common;
 using ThingsGateway.DataEncryption;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.Razor;
diff --git a/src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor b/src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor
index 7b41db4c3..f474891da 100644
--- a/src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor
+++ b/src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor
@@ -17,9 +17,11 @@
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.Extensions.Localization
+@using ThingsGateway.Common.Extension;
 
 @using System.ComponentModel
 @using System.ComponentModel.DataAnnotations
+@using ThingsGateway.DB;
 
 @inject NavigationManager NavigationManager
 
diff --git a/src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor.cs b/src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor.cs
index a1c62d1a8..7b180820c 100644
--- a/src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor.cs
+++ b/src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor.cs
@@ -19,6 +19,7 @@ using System.Diagnostics.CodeAnalysis;
 
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
+using ThingsGateway.Common;
 using ThingsGateway.Razor;
 
 namespace ThingsGateway.AdminServer;
diff --git a/src/Admin/ThingsGateway.AdminServer/Program/Program.cs b/src/Admin/ThingsGateway.AdminServer/Program/Program.cs
index 0741fc13d..e0ceee57d 100644
--- a/src/Admin/ThingsGateway.AdminServer/Program/Program.cs
+++ b/src/Admin/ThingsGateway.AdminServer/Program/Program.cs
@@ -14,6 +14,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 
 using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 using ThingsGateway.NewLife.Log;
 
 namespace ThingsGateway.AdminServer;
@@ -30,7 +31,7 @@ public class Program
         // 增加中文编码支持
         Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
-        ThingsGateway.Admin.Application.ClaimConst.Scheme = $"{typeof(Program).Assembly.GetName().Name}{SchemeHelper.GetOrCreate()}";
+        ClaimConst.Scheme = $"{typeof(Program).Assembly.GetName().Name}{SchemeHelper.GetOrCreate()}";
 
         #region 控制台输出Logo
 
diff --git a/src/Admin/ThingsGateway.AdminServer/Program/SingleFilePublish.cs b/src/Admin/ThingsGateway.AdminServer/Program/SingleFilePublish.cs
index 362c88bfb..e123d19c3 100644
--- a/src/Admin/ThingsGateway.AdminServer/Program/SingleFilePublish.cs
+++ b/src/Admin/ThingsGateway.AdminServer/Program/SingleFilePublish.cs
@@ -40,6 +40,7 @@ public class SingleFilePublish : ISingleFilePublish
             "ThingsGateway.NewLife.X",
             "ThingsGateway.Razor",
             "ThingsGateway.Admin.Razor"   ,
+            "ThingsGateway.Common",
              "ThingsGateway.DB",
             "ThingsGateway.Admin.Application",
             "ThingsGateway.SqlSugar",
diff --git a/src/Admin/ThingsGateway.AdminServer/Program/Startup.cs b/src/Admin/ThingsGateway.AdminServer/Program/Startup.cs
index 9c0130f3a..f5e3bd169 100644
--- a/src/Admin/ThingsGateway.AdminServer/Program/Startup.cs
+++ b/src/Admin/ThingsGateway.AdminServer/Program/Startup.cs
@@ -26,6 +26,7 @@ using System.Text.Unicode;
 
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
+using ThingsGateway.DB;
 using ThingsGateway.VirtualFileServer;
 
 namespace ThingsGateway.AdminServer;
diff --git a/src/Admin/ThingsGateway.AdminServer/ThingsGateway.AdminServer.csproj b/src/Admin/ThingsGateway.AdminServer/ThingsGateway.AdminServer.csproj
index 842190646..8b66dad7e 100644
--- a/src/Admin/ThingsGateway.AdminServer/ThingsGateway.AdminServer.csproj
+++ b/src/Admin/ThingsGateway.AdminServer/ThingsGateway.AdminServer.csproj
@@ -7,7 +7,7 @@
 		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
 	</PropertyGroup>
 
-	<Import Project="Admin.targets" Condition=" '$(Configuration)' != 'Debug' " />
+	<!--<Import Project="Admin.targets" Condition=" '$(Configuration)' != 'Debug' " />-->
 	<PropertyGroup>
 		<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
 		<SatelliteResourceLanguages>zh-Hans;en-US</SatelliteResourceLanguages>
@@ -26,7 +26,7 @@
 		<!--<PlatformTarget>x86</PlatformTarget>-->
 	</PropertyGroup>
 
-	<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
+	<ItemGroup>
 		<ProjectReference Include="..\ThingsGateway.Admin.Razor\ThingsGateway.Admin.Razor.csproj" />
 	</ItemGroup>
 
diff --git a/src/Admin/ThingsGateway.DB/Attributes/IgnoreExcelAttribute.cs b/src/Admin/ThingsGateway.Common/Attributes/IgnoreExcelAttribute.cs
similarity index 94%
rename from src/Admin/ThingsGateway.DB/Attributes/IgnoreExcelAttribute.cs
rename to src/Admin/ThingsGateway.Common/Attributes/IgnoreExcelAttribute.cs
index 48c9d491c..d35e1cc60 100644
--- a/src/Admin/ThingsGateway.DB/Attributes/IgnoreExcelAttribute.cs
+++ b/src/Admin/ThingsGateway.Common/Attributes/IgnoreExcelAttribute.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 忽略Excel导入导出
diff --git a/src/Admin/ThingsGateway.DB/Attributes/IgnoreSeedDataAttribute.cs b/src/Admin/ThingsGateway.Common/Attributes/IgnoreSeedDataAttribute.cs
similarity index 96%
rename from src/Admin/ThingsGateway.DB/Attributes/IgnoreSeedDataAttribute.cs
rename to src/Admin/ThingsGateway.Common/Attributes/IgnoreSeedDataAttribute.cs
index 5f6751daf..40e933cf9 100644
--- a/src/Admin/ThingsGateway.DB/Attributes/IgnoreSeedDataAttribute.cs
+++ b/src/Admin/ThingsGateway.Common/Attributes/IgnoreSeedDataAttribute.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 种子数据忽略新增
diff --git a/src/Admin/ThingsGateway.Razor/Common/ConcurrentList.cs b/src/Admin/ThingsGateway.Common/Common/ConcurrentList.cs
similarity index 99%
rename from src/Admin/ThingsGateway.Razor/Common/ConcurrentList.cs
rename to src/Admin/ThingsGateway.Common/Common/ConcurrentList.cs
index f35f92a35..541eb2bac 100644
--- a/src/Admin/ThingsGateway.Razor/Common/ConcurrentList.cs
+++ b/src/Admin/ThingsGateway.Common/Common/ConcurrentList.cs
@@ -10,13 +10,12 @@
 
 using System.Collections;
 
-namespace ThingsGateway.List;
+namespace ThingsGateway.Common.List;
 
 /// <summary>
 /// 线程安全的List，其基本操作和List一致。
 /// </summary>
 /// <typeparam name="T"></typeparam>
-[ThingsGateway.DependencyInjection.SuppressSniffer]
 public class ConcurrentList<T> : IList<T>, IReadOnlyList<T>
 {
     private readonly List<T> m_list;
diff --git a/src/Admin/ThingsGateway.Razor/Common/EncodingMapper.cs b/src/Admin/ThingsGateway.Common/Common/EncodingMapper.cs
similarity index 97%
rename from src/Admin/ThingsGateway.Razor/Common/EncodingMapper.cs
rename to src/Admin/ThingsGateway.Common/Common/EncodingMapper.cs
index dce946fe3..cad924be0 100644
--- a/src/Admin/ThingsGateway.Razor/Common/EncodingMapper.cs
+++ b/src/Admin/ThingsGateway.Common/Common/EncodingMapper.cs
@@ -12,7 +12,7 @@
 
 //using System.Text;
 
-//namespace ThingsGateway.Razor;
+//namespace ThingsGateway.Common;
 
 ///// <summary>
 ///// <see cref="Encoding"/> Master规则
diff --git a/src/Admin/ThingsGateway.Razor/Common/IDriverUIBase.cs b/src/Admin/ThingsGateway.Common/Common/IDriverUIBase.cs
similarity index 97%
rename from src/Admin/ThingsGateway.Razor/Common/IDriverUIBase.cs
rename to src/Admin/ThingsGateway.Common/Common/IDriverUIBase.cs
index fa8ea8bd6..cad2e1629 100644
--- a/src/Admin/ThingsGateway.Razor/Common/IDriverUIBase.cs
+++ b/src/Admin/ThingsGateway.Common/Common/IDriverUIBase.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Razor;
+namespace ThingsGateway.Common;
 
 public interface IDriverUIBase
 {
diff --git a/src/Admin/ThingsGateway.Razor/Common/ImportPreviewOutput.cs b/src/Admin/ThingsGateway.Common/Common/ImportPreviewOutput.cs
similarity index 96%
rename from src/Admin/ThingsGateway.Razor/Common/ImportPreviewOutput.cs
rename to src/Admin/ThingsGateway.Common/Common/ImportPreviewOutput.cs
index e12b4c548..d4d58a448 100644
--- a/src/Admin/ThingsGateway.Razor/Common/ImportPreviewOutput.cs
+++ b/src/Admin/ThingsGateway.Common/Common/ImportPreviewOutput.cs
@@ -8,9 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.List;
+using ThingsGateway.Common.List;
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 文件导入通用输出
diff --git a/src/Admin/ThingsGateway.Razor/Common/ModelValueValidateForm.cs b/src/Admin/ThingsGateway.Common/Common/ModelValueValidateForm.cs
similarity index 95%
rename from src/Admin/ThingsGateway.Razor/Common/ModelValueValidateForm.cs
rename to src/Admin/ThingsGateway.Common/Common/ModelValueValidateForm.cs
index 0ca7850c6..4c3322282 100644
--- a/src/Admin/ThingsGateway.Razor/Common/ModelValueValidateForm.cs
+++ b/src/Admin/ThingsGateway.Common/Common/ModelValueValidateForm.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Razor;
+namespace ThingsGateway.Common;
 
 public class ModelValueValidateForm
 {
diff --git a/src/Admin/ThingsGateway.Razor/Common/RandomHelper.cs b/src/Admin/ThingsGateway.Common/Common/RandomHelper.cs
similarity index 98%
rename from src/Admin/ThingsGateway.Razor/Common/RandomHelper.cs
rename to src/Admin/ThingsGateway.Common/Common/RandomHelper.cs
index 52575c0c7..dbf66ba12 100644
--- a/src/Admin/ThingsGateway.Razor/Common/RandomHelper.cs
+++ b/src/Admin/ThingsGateway.Common/Common/RandomHelper.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 using System;
 using System.Text;
@@ -16,7 +16,6 @@ using System.Text;
 /// <summary>
 /// 随机数
 /// </summary>
-[ThingsGateway.DependencyInjection.SuppressSniffer]
 public static class RandomHelper
 {
     /// <summary>
diff --git a/src/Admin/ThingsGateway.Razor/Data/BasePageInput.cs b/src/Admin/ThingsGateway.Common/Data/BasePageInput.cs
similarity index 97%
rename from src/Admin/ThingsGateway.Razor/Data/BasePageInput.cs
rename to src/Admin/ThingsGateway.Common/Data/BasePageInput.cs
index c18590fc4..922caf11f 100644
--- a/src/Admin/ThingsGateway.Razor/Data/BasePageInput.cs
+++ b/src/Admin/ThingsGateway.Common/Data/BasePageInput.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 全局分页查询输入参数
diff --git a/src/Admin/ThingsGateway.Razor/Data/IBasePageInput.cs b/src/Admin/ThingsGateway.Common/Data/IBasePageInput.cs
similarity index 97%
rename from src/Admin/ThingsGateway.Razor/Data/IBasePageInput.cs
rename to src/Admin/ThingsGateway.Common/Data/IBasePageInput.cs
index e024097d0..94c05408c 100644
--- a/src/Admin/ThingsGateway.Razor/Data/IBasePageInput.cs
+++ b/src/Admin/ThingsGateway.Common/Data/IBasePageInput.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 全局分页查询输入参数
diff --git a/src/Admin/ThingsGateway.Razor/Data/IPrimaryIdEntity.cs b/src/Admin/ThingsGateway.Common/Data/IPrimaryIdEntity.cs
similarity index 96%
rename from src/Admin/ThingsGateway.Razor/Data/IPrimaryIdEntity.cs
rename to src/Admin/ThingsGateway.Common/Data/IPrimaryIdEntity.cs
index 60b57755f..b793394e8 100644
--- a/src/Admin/ThingsGateway.Razor/Data/IPrimaryIdEntity.cs
+++ b/src/Admin/ThingsGateway.Common/Data/IPrimaryIdEntity.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 主键id基类
diff --git a/src/Admin/ThingsGateway.Razor/Data/SqlSugarPagedList.cs b/src/Admin/ThingsGateway.Common/Data/SqlSugarPagedList.cs
similarity index 97%
rename from src/Admin/ThingsGateway.Razor/Data/SqlSugarPagedList.cs
rename to src/Admin/ThingsGateway.Common/Data/SqlSugarPagedList.cs
index d1fe86cde..5bb228d76 100644
--- a/src/Admin/ThingsGateway.Razor/Data/SqlSugarPagedList.cs
+++ b/src/Admin/ThingsGateway.Common/Data/SqlSugarPagedList.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// SqlSugar 分页泛型集合
diff --git a/src/Admin/ThingsGateway.Razor/Extensions/DisplayExtensions.cs b/src/Admin/ThingsGateway.Common/Extensions/DisplayExtensions.cs
similarity index 96%
rename from src/Admin/ThingsGateway.Razor/Extensions/DisplayExtensions.cs
rename to src/Admin/ThingsGateway.Common/Extensions/DisplayExtensions.cs
index 6b4289267..5f8efb41d 100644
--- a/src/Admin/ThingsGateway.Razor/Extensions/DisplayExtensions.cs
+++ b/src/Admin/ThingsGateway.Common/Extensions/DisplayExtensions.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Razor;
+namespace ThingsGateway.Common;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
diff --git a/src/Admin/ThingsGateway.Razor/Extensions/GenericExtensions.cs b/src/Admin/ThingsGateway.Common/Extensions/GenericExtensions.cs
similarity index 98%
rename from src/Admin/ThingsGateway.Razor/Extensions/GenericExtensions.cs
rename to src/Admin/ThingsGateway.Common/Extensions/GenericExtensions.cs
index a3f1d09a2..b5f5d2ce7 100644
--- a/src/Admin/ThingsGateway.Razor/Extensions/GenericExtensions.cs
+++ b/src/Admin/ThingsGateway.Common/Extensions/GenericExtensions.cs
@@ -10,7 +10,7 @@
 
 using System.Reflection;
 
-namespace ThingsGateway.Extension.Generic;
+namespace ThingsGateway.Common.Extension.Generic;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
diff --git a/src/Admin/ThingsGateway.Razor/Extensions/JSRuntimeExtensions.cs b/src/Admin/ThingsGateway.Common/Extensions/JSRuntimeExtensions.cs
similarity index 92%
rename from src/Admin/ThingsGateway.Razor/Extensions/JSRuntimeExtensions.cs
rename to src/Admin/ThingsGateway.Common/Extensions/JSRuntimeExtensions.cs
index 9a6cf1b81..2c938043f 100644
--- a/src/Admin/ThingsGateway.Razor/Extensions/JSRuntimeExtensions.cs
+++ b/src/Admin/ThingsGateway.Common/Extensions/JSRuntimeExtensions.cs
@@ -10,7 +10,7 @@
 
 using Microsoft.JSInterop;
 
-namespace ThingsGateway.Razor;
+namespace ThingsGateway.Common.Extension;
 
 /// <summary>
 /// JSRuntime扩展方法
@@ -26,7 +26,7 @@ public static class JSRuntimeExtensions
     {
         try
         {
-            return await jsRuntime.InvokeAsync<string>("getCultureLocalStorage");
+            return await jsRuntime.InvokeAsync<string>("getCultureLocalStorage").ConfigureAwait(false);
         }
         catch
         {
@@ -44,7 +44,7 @@ public static class JSRuntimeExtensions
     {
         try
         {
-            await jsRuntime.InvokeVoidAsync("setCultureLocalStorage", cultureName);
+            await jsRuntime.InvokeVoidAsync("setCultureLocalStorage", cultureName).ConfigureAwait(false);
         }
         catch
         {
diff --git a/src/Admin/ThingsGateway.Razor/Extensions/LocalizerExtensions.cs b/src/Admin/ThingsGateway.Common/Extensions/LocalizerExtensions.cs
similarity index 99%
rename from src/Admin/ThingsGateway.Razor/Extensions/LocalizerExtensions.cs
rename to src/Admin/ThingsGateway.Common/Extensions/LocalizerExtensions.cs
index dbc19bf04..7b992ad09 100644
--- a/src/Admin/ThingsGateway.Razor/Extensions/LocalizerExtensions.cs
+++ b/src/Admin/ThingsGateway.Common/Extensions/LocalizerExtensions.cs
@@ -15,7 +15,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common.Extension;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
diff --git a/src/Admin/ThingsGateway.Razor/Extensions/ObjectExtensions.cs b/src/Admin/ThingsGateway.Common/Extensions/ObjectExtensions.cs
similarity index 99%
rename from src/Admin/ThingsGateway.Razor/Extensions/ObjectExtensions.cs
rename to src/Admin/ThingsGateway.Common/Extensions/ObjectExtensions.cs
index 7199bda53..2b12768e6 100644
--- a/src/Admin/ThingsGateway.Razor/Extensions/ObjectExtensions.cs
+++ b/src/Admin/ThingsGateway.Common/Extensions/ObjectExtensions.cs
@@ -7,6 +7,7 @@
 //  使用文档：https://thingsgateway.cn/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
+#if NET6_0_OR_GREATER
 
 using System.Collections.Concurrent;
 using System.ComponentModel;
@@ -15,12 +16,10 @@ using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Text.RegularExpressions;
 
-namespace ThingsGateway;
-
+namespace ThingsGateway.Common.Extension;
 /// <summary>
 /// 对象拓展类
 /// </summary>
-[ThingsGateway.DependencyInjection.SuppressSniffer]
 public static class ObjectExtensions
 {
     /// <summary>
@@ -614,3 +613,4 @@ public static class ObjectExtensions
         return string.Concat(str.First().ToString().ToUpper(), str.AsSpan(1));
     }
 }
+#endif
\ No newline at end of file
diff --git a/src/Admin/ThingsGateway.Razor/Extensions/ParallelExtensions.cs b/src/Admin/ThingsGateway.Common/Extensions/ParallelExtensions.cs
similarity index 98%
rename from src/Admin/ThingsGateway.Razor/Extensions/ParallelExtensions.cs
rename to src/Admin/ThingsGateway.Common/Extensions/ParallelExtensions.cs
index 4510142cf..c458ada38 100644
--- a/src/Admin/ThingsGateway.Razor/Extensions/ParallelExtensions.cs
+++ b/src/Admin/ThingsGateway.Common/Extensions/ParallelExtensions.cs
@@ -7,15 +7,15 @@
 //  使用文档：https://thingsgateway.cn/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
+#if NET6_0_OR_GREATER
 
 using System.Collections.Concurrent;
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common.Extension;
 
 /// <summary>
 /// 提供对 IEnumerable 的并行操作扩展方法
 /// </summary>
-[ThingsGateway.DependencyInjection.SuppressSniffer]
 public static class ParallelExtensions
 {
     /// <summary>
@@ -145,3 +145,6 @@ public static class ParallelExtensions
 
 
 }
+
+
+#endif
\ No newline at end of file
diff --git a/src/Admin/ThingsGateway.Razor/Extensions/StringExtensions.cs b/src/Admin/ThingsGateway.Common/Extensions/StringExtensions.cs
similarity index 98%
rename from src/Admin/ThingsGateway.Razor/Extensions/StringExtensions.cs
rename to src/Admin/ThingsGateway.Common/Extensions/StringExtensions.cs
index 1dbe2af7c..5890f745f 100644
--- a/src/Admin/ThingsGateway.Razor/Extensions/StringExtensions.cs
+++ b/src/Admin/ThingsGateway.Common/Extensions/StringExtensions.cs
@@ -7,13 +7,13 @@
 //  使用文档：https://thingsgateway.cn/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
+#if NET6_0_OR_GREATER
 
 using System.Text.RegularExpressions;
 
-namespace ThingsGateway.Extension;
+namespace ThingsGateway.Common.Extension;
 
 /// <inheritdoc/>
-[ThingsGateway.DependencyInjection.SuppressSniffer]
 public static class StringExtensions
 {
     /// <summary>
@@ -195,3 +195,4 @@ public static class StringExtensions
     /// <returns>真：是汉字；假：不是</returns>
     private static bool IsChinese(string text) => Regex.IsMatch(text, @"[\u4e00-\u9fbb]");
 }
+#endif
\ No newline at end of file
diff --git a/src/ThingsGateway.OnlyApi/GlobalUsings.cs b/src/Admin/ThingsGateway.Common/GlobalUsings.cs
similarity index 70%
rename from src/ThingsGateway.OnlyApi/GlobalUsings.cs
rename to src/Admin/ThingsGateway.Common/GlobalUsings.cs
index e855c4d36..5c6682ca6 100644
--- a/src/ThingsGateway.OnlyApi/GlobalUsings.cs
+++ b/src/Admin/ThingsGateway.Common/GlobalUsings.cs
@@ -8,4 +8,13 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-global using System;
+global using BootstrapBlazor.Components;
+
+global using Microsoft.Extensions.Localization;
+global using Microsoft.Extensions.Options;
+
+global using System.Diagnostics.CodeAnalysis;
+global using System.Globalization;
+
+
+global using ThingsGateway.NewLife.Extension;
\ No newline at end of file
diff --git a/src/Admin/ThingsGateway.Razor/Localization/Json/CacheManager.cs b/src/Admin/ThingsGateway.Common/Localization/Json/CacheManager.cs
similarity index 99%
rename from src/Admin/ThingsGateway.Razor/Localization/Json/CacheManager.cs
rename to src/Admin/ThingsGateway.Common/Localization/Json/CacheManager.cs
index 3be29b066..3a041a4de 100644
--- a/src/Admin/ThingsGateway.Razor/Localization/Json/CacheManager.cs
+++ b/src/Admin/ThingsGateway.Common/Localization/Json/CacheManager.cs
@@ -12,12 +12,15 @@ using System.Reflection;
 
 using System.ComponentModel.DataAnnotations;
 
+using ThingsGateway.Common.Extension;
+
+
 
 #if NET8_0_OR_GREATER
 using System.Collections.Frozen;
 #endif
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 缓存操作类
diff --git a/src/Admin/ThingsGateway.Razor/Localization/Json/CacheManagerHelpers.cs b/src/Admin/ThingsGateway.Common/Localization/Json/CacheManagerHelpers.cs
similarity index 97%
rename from src/Admin/ThingsGateway.Razor/Localization/Json/CacheManagerHelpers.cs
rename to src/Admin/ThingsGateway.Common/Localization/Json/CacheManagerHelpers.cs
index 2f8a7890c..76b1c4b6b 100644
--- a/src/Admin/ThingsGateway.Razor/Localization/Json/CacheManagerHelpers.cs
+++ b/src/Admin/ThingsGateway.Common/Localization/Json/CacheManagerHelpers.cs
@@ -6,7 +6,7 @@
 using Microsoft.Extensions.Caching.Memory;
 
 using System.Reflection;
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 internal static class CacheManagerHelpers
 {
diff --git a/src/Admin/ThingsGateway.Razor/Localization/Json/JsonLocalizationServiceCollectionExtensions.cs b/src/Admin/ThingsGateway.Common/Localization/Json/JsonLocalizationServiceCollectionExtensions.cs
similarity index 92%
rename from src/Admin/ThingsGateway.Razor/Localization/Json/JsonLocalizationServiceCollectionExtensions.cs
rename to src/Admin/ThingsGateway.Common/Localization/Json/JsonLocalizationServiceCollectionExtensions.cs
index 04ee9d028..315788176 100644
--- a/src/Admin/ThingsGateway.Razor/Localization/Json/JsonLocalizationServiceCollectionExtensions.cs
+++ b/src/Admin/ThingsGateway.Common/Localization/Json/JsonLocalizationServiceCollectionExtensions.cs
@@ -6,12 +6,12 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 多语言支持注入服务扩展类
 /// </summary>
-internal static class JsonLocalizationServiceCollectionExtensions
+public static class JsonLocalizationServiceCollectionExtensions
 {
     /// <summary>
     /// 注入 Json 格式多语言服务
diff --git a/src/Admin/ThingsGateway.Razor/Localization/Json/JsonStringLocalizer.cs b/src/Admin/ThingsGateway.Common/Localization/Json/JsonStringLocalizer.cs
similarity index 99%
rename from src/Admin/ThingsGateway.Razor/Localization/Json/JsonStringLocalizer.cs
rename to src/Admin/ThingsGateway.Common/Localization/Json/JsonStringLocalizer.cs
index 335a81910..b53dcc527 100644
--- a/src/Admin/ThingsGateway.Razor/Localization/Json/JsonStringLocalizer.cs
+++ b/src/Admin/ThingsGateway.Common/Localization/Json/JsonStringLocalizer.cs
@@ -8,9 +8,10 @@ using Microsoft.Extensions.Logging;
 using System.Reflection;
 using System.Resources;
 
+using ThingsGateway.Common.Extension;
 using ThingsGateway.NewLife.Collections;
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// JsonStringLocalizer 实现类
diff --git a/src/Admin/ThingsGateway.Razor/Localization/Json/JsonStringLocalizerFactory.cs b/src/Admin/ThingsGateway.Common/Localization/Json/JsonStringLocalizerFactory.cs
similarity index 99%
rename from src/Admin/ThingsGateway.Razor/Localization/Json/JsonStringLocalizerFactory.cs
rename to src/Admin/ThingsGateway.Common/Localization/Json/JsonStringLocalizerFactory.cs
index 97e901e98..6ab15d711 100644
--- a/src/Admin/ThingsGateway.Razor/Localization/Json/JsonStringLocalizerFactory.cs
+++ b/src/Admin/ThingsGateway.Common/Localization/Json/JsonStringLocalizerFactory.cs
@@ -7,7 +7,7 @@ using Microsoft.Extensions.Logging;
 
 using System.Reflection;
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// IStringLocalizerFactory 实现类
diff --git a/src/Admin/ThingsGateway.Razor/Localization/Json/LocalizationOptionsExtensions.cs b/src/Admin/ThingsGateway.Common/Localization/Json/LocalizationOptionsExtensions.cs
similarity index 99%
rename from src/Admin/ThingsGateway.Razor/Localization/Json/LocalizationOptionsExtensions.cs
rename to src/Admin/ThingsGateway.Common/Localization/Json/LocalizationOptionsExtensions.cs
index 7374d6f92..22f85fb78 100644
--- a/src/Admin/ThingsGateway.Razor/Localization/Json/LocalizationOptionsExtensions.cs
+++ b/src/Admin/ThingsGateway.Common/Localization/Json/LocalizationOptionsExtensions.cs
@@ -8,7 +8,7 @@ using Microsoft.Extensions.Primitives;
 
 using System.Reflection;
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// JsonLocalizationOptions 扩展方法
diff --git a/src/Admin/ThingsGateway.Razor/Options/MenuOptions.cs b/src/Admin/ThingsGateway.Common/Options/MenuOptions.cs
similarity index 96%
rename from src/Admin/ThingsGateway.Razor/Options/MenuOptions.cs
rename to src/Admin/ThingsGateway.Common/Options/MenuOptions.cs
index feaa7a706..b52562ef7 100644
--- a/src/Admin/ThingsGateway.Razor/Options/MenuOptions.cs
+++ b/src/Admin/ThingsGateway.Common/Options/MenuOptions.cs
@@ -10,7 +10,7 @@
 
 using ThingsGateway.ConfigurableOptions;
 
-namespace ThingsGateway.Razor;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 菜单配置
diff --git a/src/Admin/ThingsGateway.Razor/Options/WebsiteOptions.cs b/src/Admin/ThingsGateway.Common/Options/WebsiteOptions.cs
similarity index 96%
rename from src/Admin/ThingsGateway.Razor/Options/WebsiteOptions.cs
rename to src/Admin/ThingsGateway.Common/Options/WebsiteOptions.cs
index 6e895d4bd..7d75a01d2 100644
--- a/src/Admin/ThingsGateway.Razor/Options/WebsiteOptions.cs
+++ b/src/Admin/ThingsGateway.Common/Options/WebsiteOptions.cs
@@ -10,7 +10,7 @@
 
 using ThingsGateway.ConfigurableOptions;
 
-namespace ThingsGateway.Razor;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 网站配置
@@ -27,6 +27,7 @@ public class WebsiteOptions : IConfigurableOptions
     /// </summary>
     public bool Demo { get; set; }
 
+    public bool WebPageEnable { get; set; } = true;
     /// <summary>
     /// 是否显示关于页面
     /// </summary>
diff --git a/src/Admin/ThingsGateway.Common/Startup.cs b/src/Admin/ThingsGateway.Common/Startup.cs
new file mode 100644
index 000000000..feedf0bcd
--- /dev/null
+++ b/src/Admin/ThingsGateway.Common/Startup.cs
@@ -0,0 +1,40 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.Extensions.DependencyInjection;
+
+using ThingsGateway.NewLife;
+
+using Yitter.IdGenerator;
+
+namespace ThingsGateway.Common;
+
+[AppStartup(0)]
+public class Startup : AppStartup
+{
+    public void Configure(IServiceCollection services)
+    {
+        services.AddJsonLocalization();
+
+        services.AddConfigurableOptions<MenuOptions>();
+        services.AddConfigurableOptions<WebsiteOptions>();
+
+        MachineInfo.GetCurrent();
+
+        // 配置雪花Id算法机器码
+        YitIdHelper.SetIdGenerator(new IdGeneratorOptions
+        {
+            WorkerId = 1// 取值范围0~63
+        });
+
+
+    }
+
+}
diff --git a/src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj b/src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj
new file mode 100644
index 000000000..9991c8e3e
--- /dev/null
+++ b/src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
+
+	<PropertyGroup>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+	</PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
+	</PropertyGroup>
+	
+	<ItemGroup>
+		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" />
+		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
+		<PackageReference Include="BootstrapBlazor" Version="9.8.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Include="..\README.md" Pack="true" PackagePath="\" />
+		<None Include="..\README.zh-CN.md" Pack="true" PackagePath="\" />
+		<None Remove="..\..\..\README.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.zh-CN.md" Pack="false" PackagePath="\" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<!--<PackageReference Include="ThingsGateway.Razor" Version="$(SourceGeneratorVersion)" />-->
+		<!--<ProjectReference Include="..\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />-->
+		<ProjectReference Include="..\ThingsGateway.Furion\ThingsGateway.Furion.csproj" />
+		<!--<PackageReference Include="SqlSugarCore" Version="5.1.4.195" />-->
+	</ItemGroup>
+
+
+
+
+</Project>
diff --git a/src/Admin/ThingsGateway.Razor/UnifyResult/UnifyResult.cs b/src/Admin/ThingsGateway.Common/UnifyResult/UnifyResult.cs
similarity index 97%
rename from src/Admin/ThingsGateway.Razor/UnifyResult/UnifyResult.cs
rename to src/Admin/ThingsGateway.Common/UnifyResult/UnifyResult.cs
index 0d6e674ec..967c1939c 100644
--- a/src/Admin/ThingsGateway.Razor/UnifyResult/UnifyResult.cs
+++ b/src/Admin/ThingsGateway.Common/UnifyResult/UnifyResult.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Razor;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 全局返回结果
diff --git a/src/Admin/ThingsGateway.Razor/Util/LocalizerUtil.cs b/src/Admin/ThingsGateway.Common/Util/LocalizerUtil.cs
similarity index 99%
rename from src/Admin/ThingsGateway.Razor/Util/LocalizerUtil.cs
rename to src/Admin/ThingsGateway.Common/Util/LocalizerUtil.cs
index 09c04b875..72ccbd238 100644
--- a/src/Admin/ThingsGateway.Razor/Util/LocalizerUtil.cs
+++ b/src/Admin/ThingsGateway.Common/Util/LocalizerUtil.cs
@@ -10,7 +10,7 @@
 
 using System.Reflection;
 
-namespace ThingsGateway.Razor;
+namespace ThingsGateway.Common;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
diff --git a/src/Admin/ThingsGateway.DB/Const/ClaimConst.cs b/src/Admin/ThingsGateway.DB/Const/ClaimConst.cs
index 0bc0dd62b..501da8790 100644
--- a/src/Admin/ThingsGateway.DB/Const/ClaimConst.cs
+++ b/src/Admin/ThingsGateway.DB/Const/ClaimConst.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 /// <summary>
 /// 授权用户常量
diff --git a/src/Admin/ThingsGateway.DB/Entity/BaseEntity.cs b/src/Admin/ThingsGateway.DB/Entity/BaseEntity.cs
index bfa25b663..4e5d58394 100644
--- a/src/Admin/ThingsGateway.DB/Entity/BaseEntity.cs
+++ b/src/Admin/ThingsGateway.DB/Entity/BaseEntity.cs
@@ -10,11 +10,7 @@
 
 using BootstrapBlazor.Components;
 
-using System.Diagnostics.CodeAnalysis;
-
-using ThingsGateway.SqlSugar;
-
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 /// <summary>
 /// 主键id基类
diff --git a/src/Admin/ThingsGateway.DB/Extensions/ExportExcelExtensions.cs b/src/Admin/ThingsGateway.DB/Extensions/ExportExcelExtensions.cs
index 7a5430903..d01cd518a 100644
--- a/src/Admin/ThingsGateway.DB/Extensions/ExportExcelExtensions.cs
+++ b/src/Admin/ThingsGateway.DB/Extensions/ExportExcelExtensions.cs
@@ -18,7 +18,9 @@ using MiniExcelLibs.OpenXml;
 using System.Data;
 using System.Reflection;
 
-namespace ThingsGateway.Admin.Application;
+using ThingsGateway.Common.Extension;
+
+namespace ThingsGateway.DB;
 
 /// <summary>
 /// 导出excel扩展
diff --git a/src/Admin/ThingsGateway.DB/Extensions/FileExtensions.cs b/src/Admin/ThingsGateway.DB/Extensions/FileExtensions.cs
index 1967ea67f..f4b0a4efb 100644
--- a/src/Admin/ThingsGateway.DB/Extensions/FileExtensions.cs
+++ b/src/Admin/ThingsGateway.DB/Extensions/FileExtensions.cs
@@ -10,7 +10,7 @@
 
 using Microsoft.AspNetCore.Components.Forms;
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
diff --git a/src/Admin/ThingsGateway.DB/Extensions/QueryPageOptionsExtensions.cs b/src/Admin/ThingsGateway.DB/Extensions/QueryPageOptionsExtensions.cs
index dfcd3c369..34cf76a7a 100644
--- a/src/Admin/ThingsGateway.DB/Extensions/QueryPageOptionsExtensions.cs
+++ b/src/Admin/ThingsGateway.DB/Extensions/QueryPageOptionsExtensions.cs
@@ -10,9 +10,7 @@
 
 using BootstrapBlazor.Components;
 
-using ThingsGateway.SqlSugar;
-
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
diff --git a/src/Admin/ThingsGateway.DB/Extensions/SqlSugarExtensions.cs b/src/Admin/ThingsGateway.DB/Extensions/SqlSugarExtensions.cs
index 47e9d349d..44aa9eca7 100644
--- a/src/Admin/ThingsGateway.DB/Extensions/SqlSugarExtensions.cs
+++ b/src/Admin/ThingsGateway.DB/Extensions/SqlSugarExtensions.cs
@@ -11,9 +11,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 
-using ThingsGateway.SqlSugar;
-
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
diff --git a/src/Admin/ThingsGateway.DB/GlobalUsings.cs b/src/Admin/ThingsGateway.DB/GlobalUsings.cs
index ec2e58001..74bc1c2e1 100644
--- a/src/Admin/ThingsGateway.DB/GlobalUsings.cs
+++ b/src/Admin/ThingsGateway.DB/GlobalUsings.cs
@@ -8,4 +8,10 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-global using ThingsGateway.NewLife.Extension;
\ No newline at end of file
+global using Microsoft.Extensions.Localization;
+
+global using System.Diagnostics.CodeAnalysis;
+
+global using ThingsGateway.Common;
+global using ThingsGateway.NewLife.Extension;
+global using ThingsGateway.SqlSugar;
diff --git a/src/Admin/ThingsGateway.DB/Services/AppService/ClaimsPrincipalService.cs b/src/Admin/ThingsGateway.DB/Services/AppService/ClaimsPrincipalService.cs
index e87e4a3dd..f77d7d2bd 100644
--- a/src/Admin/ThingsGateway.DB/Services/AppService/ClaimsPrincipalService.cs
+++ b/src/Admin/ThingsGateway.DB/Services/AppService/ClaimsPrincipalService.cs
@@ -10,7 +10,7 @@
 
 using System.Security.Claims;
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 public class ClaimsPrincipalService : IClaimsPrincipalService
 {
diff --git a/src/Admin/ThingsGateway.DB/Services/AppService/IClaimsPrincipalService.cs b/src/Admin/ThingsGateway.DB/Services/AppService/IClaimsPrincipalService.cs
index d8cef99a7..085604639 100644
--- a/src/Admin/ThingsGateway.DB/Services/AppService/IClaimsPrincipalService.cs
+++ b/src/Admin/ThingsGateway.DB/Services/AppService/IClaimsPrincipalService.cs
@@ -10,7 +10,7 @@
 
 using System.Security.Claims;
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 public interface IClaimsPrincipalService
 {
diff --git a/src/Admin/ThingsGateway.DB/Services/SugarAopService/ISugarAopService.cs b/src/Admin/ThingsGateway.DB/Services/SugarAopService/ISugarAopService.cs
index 36d6cf3f7..1d1fc11ad 100644
--- a/src/Admin/ThingsGateway.DB/Services/SugarAopService/ISugarAopService.cs
+++ b/src/Admin/ThingsGateway.DB/Services/SugarAopService/ISugarAopService.cs
@@ -8,10 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-
-using ThingsGateway.SqlSugar;
-
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.DB/Services/SugarAopService/SugarAopService.cs b/src/Admin/ThingsGateway.DB/Services/SugarAopService/SugarAopService.cs
index 0645cd293..96870dd56 100644
--- a/src/Admin/ThingsGateway.DB/Services/SugarAopService/SugarAopService.cs
+++ b/src/Admin/ThingsGateway.DB/Services/SugarAopService/SugarAopService.cs
@@ -11,9 +11,7 @@
 
 using Microsoft.Extensions.Hosting;
 
-using ThingsGateway.SqlSugar;
-
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 public class SugarAopService : ISugarAopService
 {
diff --git a/src/Admin/ThingsGateway.DB/Services/SugarService/BaseService.cs b/src/Admin/ThingsGateway.DB/Services/SugarService/BaseService.cs
index 7138fe117..e3f84c6f0 100644
--- a/src/Admin/ThingsGateway.DB/Services/SugarService/BaseService.cs
+++ b/src/Admin/ThingsGateway.DB/Services/SugarService/BaseService.cs
@@ -10,11 +10,7 @@
 
 using BootstrapBlazor.Components;
 
-using Microsoft.Extensions.Localization;
-
-using ThingsGateway.SqlSugar;
-
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 /// <summary>
 /// 通用服务
diff --git a/src/Admin/ThingsGateway.DB/SqlSugar/CodeFirstUtils.cs b/src/Admin/ThingsGateway.DB/SqlSugar/CodeFirstUtils.cs
index c0c5e5c90..38690433b 100644
--- a/src/Admin/ThingsGateway.DB/SqlSugar/CodeFirstUtils.cs
+++ b/src/Admin/ThingsGateway.DB/SqlSugar/CodeFirstUtils.cs
@@ -12,9 +12,9 @@ using System.Collections;
 using System.Data;
 using System.Reflection;
 
-using ThingsGateway.SqlSugar;
+using ThingsGateway.Common.Extension;
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 /// <summary>
 /// CodeFirst功能类
diff --git a/src/Admin/ThingsGateway.DB/SqlSugar/DbContext.cs b/src/Admin/ThingsGateway.DB/SqlSugar/DbContext.cs
index 2704004c1..f83d34fb7 100644
--- a/src/Admin/ThingsGateway.DB/SqlSugar/DbContext.cs
+++ b/src/Admin/ThingsGateway.DB/SqlSugar/DbContext.cs
@@ -12,9 +12,8 @@ using Microsoft.Extensions.DependencyInjection;
 
 using ThingsGateway.Extension;
 using ThingsGateway.NewLife.Log;
-using ThingsGateway.SqlSugar;
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 /// <summary>
 /// 数据库上下文对象
diff --git a/src/Admin/ThingsGateway.DB/SqlSugar/ISqlSugarEntitySeedData.cs b/src/Admin/ThingsGateway.DB/SqlSugar/ISqlSugarEntitySeedData.cs
index 9eff32e73..8a635a987 100644
--- a/src/Admin/ThingsGateway.DB/SqlSugar/ISqlSugarEntitySeedData.cs
+++ b/src/Admin/ThingsGateway.DB/SqlSugar/ISqlSugarEntitySeedData.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 /// <summary>
 /// 实体种子数据接口
diff --git a/src/Admin/ThingsGateway.DB/SqlSugar/SeedDataUtil.cs b/src/Admin/ThingsGateway.DB/SqlSugar/SeedDataUtil.cs
index 52de0d284..dac02284a 100644
--- a/src/Admin/ThingsGateway.DB/SqlSugar/SeedDataUtil.cs
+++ b/src/Admin/ThingsGateway.DB/SqlSugar/SeedDataUtil.cs
@@ -17,9 +17,8 @@ using System.Reflection;
 using System.Text.RegularExpressions;
 
 using ThingsGateway.NewLife;
-using ThingsGateway.SqlSugar;
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 /// <summary>
 /// 种子数据工具类
 /// </summary>
diff --git a/src/Admin/ThingsGateway.DB/SqlSugar/SqlSugarOptions.cs b/src/Admin/ThingsGateway.DB/SqlSugar/SqlSugarOptions.cs
index 563057e96..e3d307d80 100644
--- a/src/Admin/ThingsGateway.DB/SqlSugar/SqlSugarOptions.cs
+++ b/src/Admin/ThingsGateway.DB/SqlSugar/SqlSugarOptions.cs
@@ -9,9 +9,8 @@
 //------------------------------------------------------------------------------
 
 using ThingsGateway.ConfigurableOptions;
-using ThingsGateway.SqlSugar;
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 /// <summary>
 /// SqlSugar配置
diff --git a/src/Admin/ThingsGateway.DB/Startup.cs b/src/Admin/ThingsGateway.DB/Startup.cs
index b03c2e65d..0b62ba213 100644
--- a/src/Admin/ThingsGateway.DB/Startup.cs
+++ b/src/Admin/ThingsGateway.DB/Startup.cs
@@ -12,9 +12,7 @@ using BootstrapBlazor.Components;
 
 using Microsoft.Extensions.DependencyInjection;
 
-using ThingsGateway.SqlSugar;
-
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 [AppStartup(1000000000)]
 public class Startup : AppStartup
diff --git a/src/Admin/ThingsGateway.DB/Static/UserManager.cs b/src/Admin/ThingsGateway.DB/Static/UserManager.cs
index 951d3da39..5bae61d96 100644
--- a/src/Admin/ThingsGateway.DB/Static/UserManager.cs
+++ b/src/Admin/ThingsGateway.DB/Static/UserManager.cs
@@ -10,7 +10,7 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 /// <summary>
 /// 当前登录用户信息
diff --git a/src/Admin/ThingsGateway.DB/ThingsGateway.DB.csproj b/src/Admin/ThingsGateway.DB/ThingsGateway.DB.csproj
index 57193e42a..19c9689a9 100644
--- a/src/Admin/ThingsGateway.DB/ThingsGateway.DB.csproj
+++ b/src/Admin/ThingsGateway.DB/ThingsGateway.DB.csproj
@@ -12,6 +12,8 @@
 	
 	<ItemGroup>
 		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" />
+		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
+		<PackageReference Include="BootstrapBlazor" Version="9.8.0" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -23,7 +25,8 @@
 
 	<ItemGroup>
 		<!--<PackageReference Include="ThingsGateway.Razor" Version="$(SourceGeneratorVersion)" />-->
-		<ProjectReference Include="..\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />
+		<!--<ProjectReference Include="..\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />-->
+		<ProjectReference Include="..\ThingsGateway.Common\ThingsGateway.Common.csproj" />
 		<ProjectReference Include="..\ThingsGateway.SqlSugar\ThingsGateway.SqlSugar.csproj" />
 		<!--<PackageReference Include="SqlSugarCore" Version="5.1.4.195" />-->
 	</ItemGroup>
diff --git a/src/Admin/ThingsGateway.DB/Util/CommonUtils.cs b/src/Admin/ThingsGateway.DB/Util/CommonUtils.cs
index 26c084b4e..104172100 100644
--- a/src/Admin/ThingsGateway.DB/Util/CommonUtils.cs
+++ b/src/Admin/ThingsGateway.DB/Util/CommonUtils.cs
@@ -10,7 +10,7 @@
 
 using Yitter.IdGenerator;
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.DB;
 
 /// <summary>
 /// 公共功能
diff --git a/src/Admin/ThingsGateway.Furion/App/App.cs b/src/Admin/ThingsGateway.Furion/App/App.cs
index f203af482..9b38a006d 100644
--- a/src/Admin/ThingsGateway.Furion/App/App.cs
+++ b/src/Admin/ThingsGateway.Furion/App/App.cs
@@ -18,8 +18,6 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 
-using StackExchange.Profiling;
-
 using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -325,26 +323,6 @@ public static class App
     }
 
 
-    /// <summary>
-    /// 打印验证信息到 MiniProfiler
-    /// </summary>
-    /// <param name="category">分类</param>
-    /// <param name="state">状态</param>
-    /// <param name="message">消息</param>
-    /// <param name="isError">是否为警告消息</param>
-    public static void PrintToMiniProfiler(string category, string state, string message = null, bool isError = false)
-    {
-        if (!CanBeMiniProfiler()) return;
-
-        // 打印消息
-        var titleCaseCategory = Thread.CurrentThread.CurrentCulture.TextInfo.ToTitleCase(category);
-        var customTiming = MiniProfiler.Current?.CustomTiming(category, string.IsNullOrWhiteSpace(message) ? $"{titleCaseCategory} {state}" : message, state);
-        if (customTiming == null) return;
-
-        // 判断是否是警告消息
-        if (isError) customTiming.Errored = true;
-    }
-
     /// <summary>
     /// 构造函数
     /// </summary>
@@ -582,19 +560,6 @@ public static class App
         return types.Where(u => u.IsPublic && !u.IsDefined(typeof(SuppressSnifferAttribute), false));
     }
 
-    /// <summary>
-    /// 判断是否启用 MiniProfiler
-    /// </summary>
-    /// <returns></returns>
-    internal static bool CanBeMiniProfiler()
-    {
-        // 减少不必要的监听
-        if (Settings.InjectMiniProfiler != true || HttpContext == null
-            || !(HttpContext.Request.Headers.TryGetValue("request-from", out var value) && value == "swagger")) return false;
-
-        return true;
-    }
-
     /// <summary>
     /// 处理获取对象异常问题
     /// </summary>
diff --git a/src/Admin/ThingsGateway.Furion/App/Options/AppSettingsOptions.cs b/src/Admin/ThingsGateway.Furion/App/Options/AppSettingsOptions.cs
index fd9c11d90..96c4670fb 100644
--- a/src/Admin/ThingsGateway.Furion/App/Options/AppSettingsOptions.cs
+++ b/src/Admin/ThingsGateway.Furion/App/Options/AppSettingsOptions.cs
@@ -10,7 +10,6 @@
 // ------------------------------------------------------------------------
 
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
 
 using ThingsGateway.ConfigurableOptions;
 
@@ -21,11 +20,6 @@ namespace ThingsGateway;
 /// </summary>
 public sealed class AppSettingsOptions : IConfigurableOptions<AppSettingsOptions>
 {
-    /// <summary>
-    /// 集成 MiniProfiler 组件
-    /// </summary>
-    public bool? InjectMiniProfiler { get; set; }
-
     /// <summary>
     /// 是否启用规范化文档
     /// </summary>
@@ -64,11 +58,6 @@ public sealed class AppSettingsOptions : IConfigurableOptions<AppSettingsOptions
     /// <param name="configuration"></param>
     public void PostConfigure(AppSettingsOptions options, IConfiguration configuration)
     {
-        // 非 Web 环境总是 false，如果是生产环境且不配置 InjectMiniProfiler，默认总是false，MiniProfiler 生产环境耗内存
-        if (App.WebHostEnvironment == default
-            || (App.HostEnvironment.IsProduction() && options.InjectMiniProfiler == null)) options.InjectMiniProfiler = false;
-        else options.InjectMiniProfiler ??= true;
-
         options.InjectSpecificationDocument ??= true;
         options.EnabledReferenceAssemblyScan ??= false;
         options.ExternalAssemblies ??= Array.Empty<string>();
diff --git a/src/Admin/ThingsGateway.Furion/DataValidation/Filters/DataValidationFilter.cs b/src/Admin/ThingsGateway.Furion/DataValidation/Filters/DataValidationFilter.cs
index ce5d6c8b2..35de365d1 100644
--- a/src/Admin/ThingsGateway.Furion/DataValidation/Filters/DataValidationFilter.cs
+++ b/src/Admin/ThingsGateway.Furion/DataValidation/Filters/DataValidationFilter.cs
@@ -200,9 +200,6 @@ public sealed class DataValidationFilter : IAsyncActionFilter, IOrderedFilter
             finalContext.Result = unifyResult.OnValidateFailed(context, validationMetadata);
         }
 
-        // 打印验证失败信息
-        App.PrintToMiniProfiler("validation", "Failed", $"Validation Failed:\r\n\r\n{validationMetadata.Message}", true);
-
         return true;
     }
 }
\ No newline at end of file
diff --git a/src/Admin/ThingsGateway.Furion/DataValidation/Filters/DataValidationPageFilter.cs b/src/Admin/ThingsGateway.Furion/DataValidation/Filters/DataValidationPageFilter.cs
index d48b8263f..5cb0d0b8a 100644
--- a/src/Admin/ThingsGateway.Furion/DataValidation/Filters/DataValidationPageFilter.cs
+++ b/src/Admin/ThingsGateway.Furion/DataValidation/Filters/DataValidationPageFilter.cs
@@ -162,8 +162,6 @@ public sealed class DataValidationPageFilter : IAsyncPageFilter, IOrderedFilter
             Code = validationMetadata.Message
         };
 
-        // 打印验证失败信息
-        App.PrintToMiniProfiler("validation", "Failed", $"Validation Failed:\r\n\r\n{validationMetadata.Message}", true);
 
         return true;
     }
diff --git a/src/Admin/ThingsGateway.Furion/FriendlyException/Filters/FriendlyExceptionFilter.cs b/src/Admin/ThingsGateway.Furion/FriendlyException/Filters/FriendlyExceptionFilter.cs
index 920f29f44..7389cbbdb 100644
--- a/src/Admin/ThingsGateway.Furion/FriendlyException/Filters/FriendlyExceptionFilter.cs
+++ b/src/Admin/ThingsGateway.Furion/FriendlyException/Filters/FriendlyExceptionFilter.cs
@@ -16,10 +16,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-using System.Diagnostics;
 using System.Logging;
 
-using ThingsGateway;
 using ThingsGateway.DataValidation;
 using ThingsGateway.DynamicApiController;
 using ThingsGateway.FriendlyException;
@@ -153,37 +151,6 @@ public sealed class FriendlyExceptionFilter : IAsyncExceptionFilter
             logger.LogError(context.Exception, context.Exception.Message);
         }
 
-        // 打印错误消息
-        PrintToMiniProfiler(context.Exception);
     }
 
-    /// <summary>
-    /// 打印错误到 MiniProfiler 中
-    /// </summary>
-    /// <param name="exception"></param>
-    internal static void PrintToMiniProfiler(Exception exception)
-    {
-        // 判断是否注入 MiniProfiler 组件
-        if (App.Settings.InjectMiniProfiler != true || exception == null) return;
-
-        // 获取异常堆栈
-        var stackTrace = new StackTrace(exception, true);
-        if (stackTrace.FrameCount == 0) return;
-        var traceFrame = stackTrace.GetFrame(0);
-
-        // 获取出错的文件名
-        var exceptionFileName = traceFrame.GetFileName();
-
-        // 获取出错的行号
-        var exceptionFileLineNumber = traceFrame.GetFileLineNumber();
-
-        // 打印错误文件名和行号
-        if (!string.IsNullOrWhiteSpace(exceptionFileName) && exceptionFileLineNumber > 0)
-        {
-            App.PrintToMiniProfiler("errors", "Locator", $"{exceptionFileName}:line {exceptionFileLineNumber}", true);
-        }
-
-        // 打印完整的堆栈信息
-        App.PrintToMiniProfiler("errors", "StackTrace", exception.ToString(), true);
-    }
 }
\ No newline at end of file
diff --git a/src/Admin/ThingsGateway.Furion/SpecificationDocument/Assets/index-mini-profiler.html b/src/Admin/ThingsGateway.Furion/SpecificationDocument/Assets/index-mini-profiler.html
deleted file mode 100644
index fcdf692db..000000000
--- a/src/Admin/ThingsGateway.Furion/SpecificationDocument/Assets/index-mini-profiler.html
+++ /dev/null
@@ -1,472 +0,0 @@
-<!-- HTML for static distribution bundle build -->
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>%(DocumentTitle)</title>
-    <link rel="stylesheet" type="text/css" href="%(StylesPath)">
-    <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
-    <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
-    <style>
-
-        html {
-            box-sizing: border-box;
-            overflow: -moz-scrollbars-vertical;
-            overflow-y: scroll;
-        }
-
-        *,
-        *:before,
-        *:after {
-            box-sizing: inherit;
-        }
-
-        body {
-            margin: 0;
-            background: #fafafa;
-        }
-
-        #login-form {
-            position: fixed;
-            top: 30px;
-            left: 50%;
-            margin-left: -191px;
-            width: 382px;
-            display: none;
-            border-color: #49cc90;
-            background: rgba(73,204,144,.1);
-            border: 1px solid #000;
-            border-radius: 4px;
-            box-shadow: 0 0 3px rgb(0 0 0 / 19%);
-            font-family: monospace;
-            overflow: hidden;
-        }
-
-        .login-title {
-            background-color: rgb(27, 27, 27);
-            height: 50px;
-            padding: 7px 0 0 7px;
-        }
-
-            .login-title img {
-                display: block;
-                height: 36px;
-            }
-
-        .login-area {
-            padding: 25px 40px 32px;
-            background-color: rgb(232, 246, 240);
-        }
-
-        .form-row {
-            padding: 6px 0;
-        }
-
-            .form-row label {
-                font-size: 14px;
-                flex: 1;
-                margin: 0;
-                font-family: sans-serif;
-                color: #3b4151;
-                font-weight: 700;
-            }
-
-            .form-row input {
-                width: 100%;
-                max-width: 340px;
-                min-width: 100px;
-                margin: 5px 0;
-                padding: 8px 10px;
-                border: 1px solid #d9d9d9;
-                border-radius: 4px;
-                background: #fff;
-            }
-
-            .form-row button {
-                padding: 8px 40px;
-                font-size: 14px;
-                border: none;
-                outline: none;
-                font-weight: 700;
-                cursor: pointer;
-                border-radius: 3px;
-                background-color: #4990e2;
-                color: #fff;
-                border-color: #4990e2;
-                box-shadow: 0 0 5px rgb(0 0 0 / 30%);
-                width: 100%;
-                box-sizing: border-box;
-            }
-
-                .form-row button:hover {
-                    opacity: 0.8;
-                }
-
-        #login-error {
-            font-size: 14px;
-            flex: 1;
-            margin: 0;
-            font-family: sans-serif;
-            color: red;
-            margin-top: 8px;
-        }
-    </style>
-    %(HeadContent)
-</head>
-
-<body>
-    <div id="swagger-ui"></div>
-    <div id="login-form">
-        <div class="login-title">
-            <img src="data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 407 116">
  <defs>
    <style>
      .cls-1 {
        clip-path: url(#clip-SW_TM-logo-on-dark);
      }

      .cls-2 {
        fill: #fff;
      }

      .cls-3 {
        fill: #85ea2d;
      }

      .cls-4 {
        fill: #173647;
      }
    </style>
    <clipPath id="clip-SW_TM-logo-on-dark">
      <rect width="407" height="116"/>
    </clipPath>
  </defs>
  <g id="SW_TM-logo-on-dark" class="cls-1">
    <g id="SW_In-Product" transform="translate(-0.301)">
      <path id="Path_2936" data-name="Path 2936" class="cls-2" d="M359.15,70.674h-.7V66.992h-1.26v-.6h3.219v.6H359.15Z"/>
      <path id="Path_2937" data-name="Path 2937" class="cls-2" d="M363.217,70.674,361.975,67.1h-.023q.05.8.05,1.494v2.083h-.636V66.391h.987l1.19,3.407h.017l1.225-3.407h.99v4.283H365.1V68.556c0-.213.006-.49.016-.832s.02-.549.028-.621h-.023l-1.286,3.571Z"/>
      <path id="Path_2938" data-name="Path 2938" class="cls-3" d="M50.328,97.669A47.642,47.642,0,1,1,97.971,50.027,47.642,47.642,0,0,1,50.328,97.669Z"/>
      <path id="Path_2939" data-name="Path 2939" class="cls-3" d="M50.328,4.769A45.258,45.258,0,1,1,5.07,50.027,45.258,45.258,0,0,1,50.328,4.769m0-4.769a50.027,50.027,0,1,0,50.027,50.027A50.027,50.027,0,0,0,50.328,0Z"/>
      <path id="Path_2940" data-name="Path 2940" class="cls-4" d="M31.8,33.854c-.154,1.712.058,3.482-.057,5.213a42.665,42.665,0,0,1-.693,5.156,9.53,9.53,0,0,1-4.1,5.829c4.079,2.654,4.54,6.771,4.81,10.946.135,2.25.077,4.52.308,6.752.173,1.731.846,2.174,2.636,2.231.73.02,1.48,0,2.327,0V75.33c-5.29.9-9.657-.6-10.734-5.079a30.76,30.76,0,0,1-.654-5c-.117-1.789.076-3.578-.058-5.367-.386-4.906-1.02-6.56-5.713-6.791v-6.1A9.191,9.191,0,0,1,20.9,46.82c2.577-.135,3.674-.924,4.231-3.463a29.3,29.3,0,0,0,.481-4.329,82.1,82.1,0,0,1,.6-8.406c.673-3.982,3.136-5.906,7.234-6.137,1.154-.057,2.327,0,3.655,0v5.464c-.558.038-1.039.115-1.539.115C32.226,29.949,32.052,31.084,31.8,33.854Zm6.406,12.658h-.077a3.515,3.515,0,1,0-.346,7.021h.231a3.461,3.461,0,0,0,3.655-3.251V50.09a3.523,3.523,0,0,0-3.461-3.578Zm12.062,0a3.373,3.373,0,0,0-3.482,3.251,1.79,1.79,0,0,0,.02.327,3.3,3.3,0,0,0,3.578,3.443,3.263,3.263,0,0,0,3.443-3.558,3.308,3.308,0,0,0-3.557-3.463Zm12.351,0a3.592,3.592,0,0,0-3.655,3.482A3.529,3.529,0,0,0,62.5,53.533h.039c1.769.309,3.559-1.4,3.674-3.462a3.571,3.571,0,0,0-3.6-3.559Zm16.948.288c-2.232-.1-3.348-.846-3.9-2.962a21.447,21.447,0,0,1-.635-4.136c-.154-2.578-.135-5.175-.308-7.753-.4-6.117-4.828-8.252-11.254-7.195v5.31c1.019,0,1.808,0,2.6.019,1.366.019,2.4.539,2.539,2.059.135,1.385.135,2.789.27,4.193.269,2.79.422,5.618.9,8.369A8.715,8.715,0,0,0,73.7,50.052c-3.4,2.289-4.406,5.559-4.578,9.234-.1,2.52-.154,5.059-.289,7.6-.115,2.308-.923,3.058-3.251,3.116-.654.019-1.289.077-2.019.115v5.445c1.365,0,2.616.077,3.866,0,3.886-.231,6.233-2.117,7-5.887A49.079,49.079,0,0,0,75,63.4c.135-1.923.116-3.866.308-5.771.289-2.982,1.655-4.213,4.636-4.4a4.037,4.037,0,0,0,.828-.192v-6.1c-.5-.058-.843-.115-1.208-.135Z"/>
      <path id="Path_2941" data-name="Path 2941" class="cls-2" d="M152.273,58.122a11.228,11.228,0,0,1-4.384,9.424q-4.383,3.382-11.9,3.382-8.14,0-12.524-2.1V63.7a32.9,32.9,0,0,0,6.137,1.879,32.3,32.3,0,0,0,6.575.689q5.322,0,8.015-2.02a6.626,6.626,0,0,0,2.692-5.62,7.222,7.222,0,0,0-.954-3.9,8.885,8.885,0,0,0-3.194-2.8,44.634,44.634,0,0,0-6.81-2.911q-6.387-2.286-9.126-5.417a11.955,11.955,0,0,1-2.74-8.172A10.164,10.164,0,0,1,128.039,27q3.977-3.131,10.52-3.131a31,31,0,0,1,12.555,2.5L149.455,31a28.382,28.382,0,0,0-11.021-2.38,10.668,10.668,0,0,0-6.606,1.816,5.984,5.984,0,0,0-2.38,5.041,7.722,7.722,0,0,0,.877,3.9,8.242,8.242,0,0,0,2.959,2.786,36.7,36.7,0,0,0,6.371,2.8q7.2,2.566,9.91,5.51A10.84,10.84,0,0,1,152.273,58.122Z"/>
      <path id="Path_2942" data-name="Path 2942" class="cls-2" d="M185.288,70.3,179,50.17q-.594-1.848-2.222-8.391h-.251q-1.252,5.479-2.192,8.453L167.849,70.3h-6.011l-9.361-34.315h5.447q3.318,12.931,5.057,19.693a80.112,80.112,0,0,1,1.988,9.111h.25q.345-1.785,1.112-4.618t1.33-4.493l6.294-19.693h5.635l6.137,19.693a66.369,66.369,0,0,1,2.379,9.048h.251a33.163,33.163,0,0,1,.673-3.475q.548-2.347,6.528-25.266h5.385L191.456,70.3Z"/>
      <path id="Path_2943" data-name="Path 2943" class="cls-2" d="M225.115,70.3l-1.033-4.885h-.25a14.446,14.446,0,0,1-5.119,4.368,15.608,15.608,0,0,1-6.372,1.143q-5.1,0-8-2.63t-2.9-7.483q0-10.4,16.626-10.9l5.823-.188V47.6q0-4.038-1.738-5.964T216.6,39.713a22.633,22.633,0,0,0-9.706,2.63l-1.6-3.977a24.437,24.437,0,0,1,5.557-2.16,24.056,24.056,0,0,1,6.058-.783q6.136,0,9.1,2.724t2.959,8.735V70.3Zm-11.741-3.663A10.549,10.549,0,0,0,221,63.977a9.845,9.845,0,0,0,2.771-7.451v-3.1l-5.2.219q-6.2.219-8.939,1.926a5.8,5.8,0,0,0-2.74,5.306,5.354,5.354,0,0,0,1.707,4.29,7.081,7.081,0,0,0,4.775,1.472Z"/>
      <path id="Path_2944" data-name="Path 2944" class="cls-2" d="M264.6,35.987v3.287l-6.356.752a11.16,11.16,0,0,1,2.255,6.856,10.148,10.148,0,0,1-3.444,8.047q-3.444,3-9.456,3a15.734,15.734,0,0,1-2.88-.25Q241.4,59.438,241.4,62.1a2.242,2.242,0,0,0,1.159,2.082,8.456,8.456,0,0,0,3.976.673h6.074q5.573,0,8.563,2.348a8.158,8.158,0,0,1,2.99,6.825,9.743,9.743,0,0,1-4.571,8.688q-4.572,2.989-13.338,2.99-6.732,0-10.379-2.5a8.087,8.087,0,0,1-3.647-7.076,7.946,7.946,0,0,1,2-5.417,10.211,10.211,0,0,1,5.636-3.1,5.429,5.429,0,0,1-2.207-1.847,4.89,4.89,0,0,1-.893-2.912,5.53,5.53,0,0,1,1-3.288,10.529,10.529,0,0,1,3.162-2.723,9.275,9.275,0,0,1-4.336-3.726,10.945,10.945,0,0,1-1.675-6.012q0-5.634,3.382-8.688t9.58-3.052a17.439,17.439,0,0,1,4.853.626ZM237.233,76.062a4.66,4.66,0,0,0,2.348,4.227,12.973,12.973,0,0,0,6.732,1.44q6.543,0,9.69-1.956a5.992,5.992,0,0,0,3.147-5.307q0-2.787-1.723-3.867t-6.481-1.08h-6.23a8.205,8.205,0,0,0-5.51,1.69,6.043,6.043,0,0,0-1.973,4.853Zm2.818-29.086a6.984,6.984,0,0,0,2.035,5.448,8.123,8.123,0,0,0,5.667,1.847q7.608,0,7.608-7.389,0-7.733-7.7-7.733a7.628,7.628,0,0,0-5.635,1.972q-1.976,1.973-1.975,5.855Z"/>
      <path id="Path_2945" data-name="Path 2945" class="cls-2" d="M299.136,35.987v3.287l-6.356.752a11.168,11.168,0,0,1,2.254,6.856,10.145,10.145,0,0,1-3.444,8.047q-3.444,3-9.455,3a15.734,15.734,0,0,1-2.88-.25q-3.32,1.754-3.319,4.415a2.243,2.243,0,0,0,1.158,2.082,8.459,8.459,0,0,0,3.976.673h6.074q5.574,0,8.563,2.348a8.158,8.158,0,0,1,2.99,6.825,9.743,9.743,0,0,1-4.571,8.688q-4.57,2.989-13.337,2.99-6.732,0-10.379-2.5a8.088,8.088,0,0,1-3.648-7.076,7.947,7.947,0,0,1,2-5.417,10.207,10.207,0,0,1,5.636-3.1,5.432,5.432,0,0,1-2.208-1.847,4.889,4.889,0,0,1-.892-2.912,5.53,5.53,0,0,1,1-3.288,10.529,10.529,0,0,1,3.162-2.723,9.271,9.271,0,0,1-4.336-3.726,10.945,10.945,0,0,1-1.675-6.012q0-5.634,3.381-8.688t9.581-3.052a17.444,17.444,0,0,1,4.853.626ZM271.772,76.062a4.658,4.658,0,0,0,2.348,4.227,12.969,12.969,0,0,0,6.731,1.44q6.544,0,9.691-1.956a5.993,5.993,0,0,0,3.146-5.307q0-2.787-1.722-3.867t-6.481-1.08h-6.23a8.208,8.208,0,0,0-5.511,1.69A6.042,6.042,0,0,0,271.772,76.062Zm2.818-29.086a6.984,6.984,0,0,0,2.035,5.448,8.121,8.121,0,0,0,5.667,1.847q7.607,0,7.608-7.389,0-7.733-7.7-7.733a7.629,7.629,0,0,0-5.635,1.972q-1.975,1.973-1.975,5.855Z"/>
      <path id="Path_2946" data-name="Path 2946" class="cls-2" d="M316.778,70.928q-7.608,0-12.007-4.634t-4.4-12.868q0-8.3,4.086-13.181a13.573,13.573,0,0,1,10.974-4.884A12.938,12.938,0,0,1,325.638,39.6q3.762,4.247,3.762,11.2v3.287H305.757q.156,6.044,3.053,9.174t8.156,3.131a27.633,27.633,0,0,0,10.958-2.317v4.634a27.5,27.5,0,0,1-5.213,1.706,29.251,29.251,0,0,1-5.933.513Zm-1.409-31.215a8.489,8.489,0,0,0-6.591,2.692,12.416,12.416,0,0,0-2.9,7.452h17.94q0-4.916-2.191-7.53a7.714,7.714,0,0,0-6.258-2.614Z"/>
      <path id="Path_2947" data-name="Path 2947" class="cls-2" d="M350.9,35.361a20.38,20.38,0,0,1,4.1.375l-.721,4.822a17.712,17.712,0,0,0-3.757-.47A9.142,9.142,0,0,0,343.4,43.47a12.327,12.327,0,0,0-2.959,8.422V70.3h-5.2V35.987h4.29l.6,6.356h.25a15.072,15.072,0,0,1,4.6-5.166,10.356,10.356,0,0,1,5.919-1.816Z"/>
      <path id="Path_2948" data-name="Path 2948" class="cls-2" d="M255.857,96.638s-3.43-.391-4.85-.391c-2.058,0-3.111.735-3.111,2.18,0,1.568.882,1.935,3.748,2.719,3.527.98,4.8,1.911,4.8,4.777,0,3.675-2.3,5.267-5.61,5.267a35.687,35.687,0,0,1-5.487-.662l.27-2.18s3.306.441,5.046.441c2.082,0,3.037-.931,3.037-2.7,0-1.421-.759-1.91-3.331-2.523-3.626-.93-5.193-2.033-5.193-4.948,0-3.381,2.229-4.776,5.585-4.776a37.2,37.2,0,0,1,5.315.587Z"/>
      <path id="Path_2949" data-name="Path 2949" class="cls-2" d="M262.967,94.14H267.7l3.748,13.106L275.2,94.14h4.752v16.78H277.2V96.42h-.145l-4.191,13.816h-2.842L265.831,96.42h-.145v14.5h-2.719Z"/>
      <path id="Path_2950" data-name="Path 2950" class="cls-2" d="M322.057,94.14H334.3v2.425h-4.728V110.92h-2.743V96.565h-4.777Z"/>
      <path id="Path_2951" data-name="Path 2951" class="cls-2" d="M346.137,94.14c3.332,0,5.12,1.249,5.12,4.361,0,2.033-.637,3.037-1.984,3.772,1.445.563,2.4,1.592,2.4,3.9,0,3.43-2.081,4.752-5.339,4.752h-6.566V94.14Zm-3.65,2.352v4.8h3.6c1.666,0,2.4-.832,2.4-2.474,0-1.617-.833-2.327-2.5-2.327Zm0,7.1v4.973h3.7c1.689,0,2.694-.539,2.694-2.548,0-1.911-1.421-2.425-2.744-2.425Z"/>
      <path id="Path_2952" data-name="Path 2952" class="cls-2" d="M358.414,94.14H369v2.377h-7.864v4.751h6.394V103.6h-6.394v4.924H369v2.4H358.414Z"/>
      <path id="Path_2953" data-name="Path 2953" class="cls-2" d="M378.747,94.14h5.414l4.164,16.78h-2.744L384.342,106h-5.777l-1.239,4.923h-2.719Zm.361,9.456h4.708l-1.737-7.178h-1.225Z"/>
      <path id="Path_2954" data-name="Path 2954" class="cls-2" d="M397.1,105.947v4.973h-2.719V94.14h6.37c3.7,0,5.683,2.12,5.683,5.843,0,2.376-.956,4.519-2.744,5.352l2.769,5.585H403.47l-2.426-4.973Zm3.651-9.455H397.1v7.1h3.7c2.057,0,2.841-1.85,2.841-3.589,0-1.9-.934-3.511-2.894-3.511Z"/>
      <path id="Path_2955" data-name="Path 2955" class="cls-2" d="M290.013,94.14h5.413l4.164,16.78h-2.743L295.608,106h-5.777l-1.239,4.923h-2.719Zm.361,9.456h4.707l-1.737-7.178h-1.225Z"/>
      <path id="Path_2956" data-name="Path 2956" class="cls-2" d="M308.362,105.947v4.973h-2.719V94.14h6.369c3.7,0,5.683,2.12,5.683,5.843,0,2.376-.955,4.519-2.743,5.352l2.768,5.585h-2.989l-2.425-4.973Zm3.65-9.455h-3.65v7.1h3.7c2.058,0,2.841-1.85,2.841-3.589C314.9,98.1,313.972,96.492,312.012,96.492Z"/>
      <path id="Path_2957" data-name="Path 2957" class="cls-2" d="M130.606,107.643a3.02,3.02,0,0,1-1.18,2.537,5.113,5.113,0,0,1-3.2.91,8.03,8.03,0,0,1-3.371-.564v-1.383a8.793,8.793,0,0,0,1.652.506,8.672,8.672,0,0,0,1.77.186,3.565,3.565,0,0,0,2.157-.544,1.783,1.783,0,0,0,.725-1.512,1.947,1.947,0,0,0-.257-1.05,2.393,2.393,0,0,0-.86-.754,12.171,12.171,0,0,0-1.833-.784,5.842,5.842,0,0,1-2.456-1.458,3.213,3.213,0,0,1-.738-2.2,2.736,2.736,0,0,1,1.071-2.267,4.444,4.444,0,0,1,2.831-.843,8.341,8.341,0,0,1,3.38.675l-.447,1.247a7.639,7.639,0,0,0-2.966-.641,2.878,2.878,0,0,0-1.779.489,1.612,1.612,0,0,0-.64,1.357,2.081,2.081,0,0,0,.236,1.049,2.231,2.231,0,0,0,.8.75,9.878,9.878,0,0,0,1.715.754,6.8,6.8,0,0,1,2.667,1.483,2.919,2.919,0,0,1,.723,2.057Z"/>
      <path id="Path_2958" data-name="Path 2958" class="cls-2" d="M134.447,101.686v5.991a2.411,2.411,0,0,0,.515,1.686,2.09,2.09,0,0,0,1.609.556,2.629,2.629,0,0,0,2.12-.792,4,4,0,0,0,.67-2.587v-4.854h1.4v9.236H139.6l-.2-1.239h-.075a2.793,2.793,0,0,1-1.193,1.045,4,4,0,0,1-1.74.362,3.529,3.529,0,0,1-2.524-.8,3.409,3.409,0,0,1-.839-2.562v-6.042Z"/>
      <path id="Path_2959" data-name="Path 2959" class="cls-2" d="M148.206,111.09a3.993,3.993,0,0,1-1.647-.333,3.1,3.1,0,0,1-1.252-1.023h-.1a12.265,12.265,0,0,1,.1,1.533v3.8h-1.4V101.686h1.137l.194,1.264h.067a3.257,3.257,0,0,1,1.256-1.1,3.831,3.831,0,0,1,1.643-.337,3.413,3.413,0,0,1,2.836,1.256,6.683,6.683,0,0,1-.017,7.057,3.42,3.42,0,0,1-2.817,1.264Zm-.2-8.385a2.482,2.482,0,0,0-2.048.784,4.041,4.041,0,0,0-.649,2.494v.312a4.625,4.625,0,0,0,.649,2.785,2.467,2.467,0,0,0,2.082.839,2.164,2.164,0,0,0,1.875-.969,4.6,4.6,0,0,0,.678-2.671,4.428,4.428,0,0,0-.678-2.651,2.232,2.232,0,0,0-1.915-.923Z"/>
      <path id="Path_2960" data-name="Path 2960" class="cls-2" d="M159.039,111.09a3.993,3.993,0,0,1-1.647-.333,3.1,3.1,0,0,1-1.252-1.023h-.1a12.265,12.265,0,0,1,.1,1.533v3.8h-1.4V101.686h1.137l.194,1.264h.067a3.257,3.257,0,0,1,1.256-1.1,3.831,3.831,0,0,1,1.643-.337,3.413,3.413,0,0,1,2.836,1.256,6.683,6.683,0,0,1-.017,7.057,3.42,3.42,0,0,1-2.817,1.264Zm-.2-8.385a2.482,2.482,0,0,0-2.048.784,4.041,4.041,0,0,0-.649,2.494v.312a4.625,4.625,0,0,0,.649,2.785,2.467,2.467,0,0,0,2.082.839,2.164,2.164,0,0,0,1.875-.969,4.6,4.6,0,0,0,.678-2.671,4.428,4.428,0,0,0-.678-2.651,2.232,2.232,0,0,0-1.911-.923Z"/>
      <path id="Path_2961" data-name="Path 2961" class="cls-2" d="M173.612,106.3a5.093,5.093,0,0,1-1.137,3.527,4.005,4.005,0,0,1-3.143,1.268,4.172,4.172,0,0,1-2.2-.581,3.84,3.84,0,0,1-1.483-1.669,5.8,5.8,0,0,1-.522-2.545,5.087,5.087,0,0,1,1.129-3.518,3.991,3.991,0,0,1,3.135-1.26,3.907,3.907,0,0,1,3.08,1.29,5.071,5.071,0,0,1,1.141,3.488Zm-7.036,0a4.384,4.384,0,0,0,.708,2.7,2.809,2.809,0,0,0,4.167,0,4.365,4.365,0,0,0,.712-2.7,4.293,4.293,0,0,0-.712-2.675,2.5,2.5,0,0,0-2.1-.915,2.461,2.461,0,0,0-2.072.9,4.334,4.334,0,0,0-.7,2.69Z"/>
      <path id="Path_2962" data-name="Path 2962" class="cls-2" d="M180.525,101.517a5.506,5.506,0,0,1,1.1.1l-.194,1.3a4.786,4.786,0,0,0-1.011-.127,2.46,2.46,0,0,0-1.917.911,3.318,3.318,0,0,0-.8,2.267v4.955h-1.4v-9.236h1.154l.16,1.71h.068a4.054,4.054,0,0,1,1.238-1.39,2.787,2.787,0,0,1,1.6-.49Z"/>
      <path id="Path_2963" data-name="Path 2963" class="cls-2" d="M187.363,109.936a4.506,4.506,0,0,0,.716-.055,4.387,4.387,0,0,0,.548-.114v1.07a2.5,2.5,0,0,1-.67.181,5,5,0,0,1-.8.072q-2.68,0-2.68-2.823v-5.494h-1.323V102.1l1.323-.582.59-1.972h.809v2.141h2.68v1.087h-2.68v5.435a1.869,1.869,0,0,0,.4,1.281A1.377,1.377,0,0,0,187.363,109.936Z"/>
      <path id="Path_2964" data-name="Path 2964" class="cls-2" d="M194.538,111.09a4.239,4.239,0,0,1-3.231-1.247,4.824,4.824,0,0,1-1.184-3.463,5.355,5.355,0,0,1,1.1-3.548,3.652,3.652,0,0,1,2.954-1.315,3.484,3.484,0,0,1,2.747,1.142,4.378,4.378,0,0,1,1.011,3.013v.885h-6.362a3.66,3.66,0,0,0,.822,2.469,2.843,2.843,0,0,0,2.2.843,7.431,7.431,0,0,0,2.949-.624v1.247a7.377,7.377,0,0,1-1.4.459,7.863,7.863,0,0,1-1.6.139Zm-.379-8.4a2.286,2.286,0,0,0-1.774.725,3.337,3.337,0,0,0-.779,2.006h4.828a3.072,3.072,0,0,0-.59-2.027,2.076,2.076,0,0,0-1.685-.706Z"/>
      <path id="Path_2965" data-name="Path 2965" class="cls-2" d="M206.951,109.683h-.076a3.287,3.287,0,0,1-2.9,1.407,3.427,3.427,0,0,1-2.819-1.239,5.452,5.452,0,0,1-1.006-3.522,5.542,5.542,0,0,1,1.011-3.548,3.4,3.4,0,0,1,2.814-1.264,3.361,3.361,0,0,1,2.883,1.365h.109l-.059-.665-.034-.649V97.809h1.4v13.113h-1.138Zm-2.8.236a2.551,2.551,0,0,0,2.078-.779,3.947,3.947,0,0,0,.644-2.516v-.3a4.638,4.638,0,0,0-.653-2.8,2.481,2.481,0,0,0-2.086-.839,2.14,2.14,0,0,0-1.883.957,4.76,4.76,0,0,0-.653,2.7,4.554,4.554,0,0,0,.649,2.671,2.194,2.194,0,0,0,1.906.906Z"/>
      <path id="Path_2966" data-name="Path 2966" class="cls-2" d="M220.712,101.534a3.435,3.435,0,0,1,2.827,1.243,6.653,6.653,0,0,1-.009,7.053,3.417,3.417,0,0,1-2.818,1.26,4,4,0,0,1-1.648-.333,3.094,3.094,0,0,1-1.251-1.023h-.1l-.295,1.188h-1V97.809h1.4V101q0,1.069-.068,1.921h.068a3.322,3.322,0,0,1,2.894-1.387Zm-.2,1.171a2.44,2.44,0,0,0-2.064.822,6.338,6.338,0,0,0,.017,5.553,2.464,2.464,0,0,0,2.081.839,2.158,2.158,0,0,0,1.922-.94,4.828,4.828,0,0,0,.632-2.7,4.645,4.645,0,0,0-.632-2.689,2.242,2.242,0,0,0-1.959-.885Z"/>
      <path id="Path_2967" data-name="Path 2967" class="cls-2" d="M225.758,101.686h1.5l2.023,5.267a20.188,20.188,0,0,1,.826,2.6h.067q.109-.431.459-1.471t2.288-6.4h1.5L230.452,112.2a5.253,5.253,0,0,1-1.378,2.212,2.932,2.932,0,0,1-1.934.653,5.659,5.659,0,0,1-1.264-.143V113.8a4.9,4.9,0,0,0,1.037.1,2.136,2.136,0,0,0,2.056-1.618l.514-1.314Z"/>
    </g>
  </g>
</svg>
" alt="" />
-        </div>
-        <div class="login-area">
-            <div class="form-row">
-                <label for="userName">User Name: </label>
-                <input type="text" id="userName" name="userName" />
-            </div>
-            <div class="form-row">
-                <label for="password">Password: </label>
-                <input type="password" id="password" name="password" />
-            </div>
-            <div class="form-row">
-                <label></label>
-                <button id="submit">Submit</button>
-            </div>
-            <div id="login-error"></div>
-        </div>
-    </div>
-
-    <script async id="mini-profiler" src="%(VirtualPath)/index-mini-profiler/includes.min.js?v=4.5.4+b99c53b4e4" data-version="4.5.4+b99c53b4e4" data-path="%(VirtualPath)/index-mini-profiler/" data-current-id="6550f5c3-ee7c-4fe8-ad62-50ebe10981da" data-ids="1d69c663-8e94-450f-a9c0-5151181753c6,ee743436-a134-4dea-96d3-2fc1ecf1a8f1,415301e6-ce04-4b6e-944f-6ffbfd047b4e,2acbf351-731a-4bad-a073-62cbaddd1026,467c5d9c-e53c-4a75-8a4e-954146cc70d3,1a51ec71-8a8c-4e87-9b2e-09837644bd93,6550f5c3-ee7c-4fe8-ad62-50ebe10981da" data-position="Left" data-scheme="Light" data-decimal-places="2" data-authorized="true" data-max-traces="15" data-toggle-shortcut="Alt+P" data-trivial-milliseconds="2.0" data-ignored-duplicate-execute-types="Open,OpenAsync,Close,CloseAsync"></script>
-    <!-- Workaround for https://github.com/swagger-api/swagger-editor/issues/1371 -->
-    <script>
-        if (window.navigator.userAgent.indexOf("Edge") > -1) {
-            console.log("Removing native Edge fetch in favor of swagger-ui's polyfill")
-            window.fetch = undefined;
-        }
-    </script>
-
-    <script src="%(ScriptBundlePath)" charset="utf-8"></script>
-    <script src="%(ScriptPresetsPath)" charset="utf-8"></script>
-    <script>
-        /* Source: https://gist.github.com/lamberta/3768814
-         * Parse a string function definition and return a function object. Does not use eval.
-         * @param {string} str
-         * @return {function}
-         *
-         * Example:
-         *  var f = function (x, y) { return x * y; };
-         *  var g = parseFunction(f.toString());
-         *  g(33, 3); //=> 99
-         */
-        function parseFunction(str) {
-            if (!str) return void (0);
-
-            var fn_body_idx = str.indexOf('{'),
-                fn_body = str.substring(fn_body_idx + 1, str.lastIndexOf('}')),
-                fn_declare = str.substring(0, fn_body_idx),
-                fn_params = fn_declare.substring(fn_declare.indexOf('(') + 1, fn_declare.lastIndexOf(')')),
-                args = fn_params.split(',');
-
-            args.push(fn_body);
-
-            function Fn() {
-                return Function.apply(this, args);
-            }
-            Fn.prototype = Function.prototype;
-
-            return new Fn();
-        }
-
-        // get uri all query variables
-        function getQueryVariables(uri) {
-            var searchArgs = window.location.search;
-            if (uri) {
-                var s = uri.indexOf('?');
-                searchArgs = s > -1 ? uri.substring(s) : '';
-            }
-            var query = searchArgs.substring(1);
-            var vars = query.split('&');
-            var varObj = {};
-            for (var i = 0; i < vars.length; i++) {
-                var pair = vars[i].split('=');
-                varObj[pair[0]] = pair[1];
-            }
-            return varObj;
-        }
-
-        // get uri query variable
-        function getQueryVariable(variable, uri) {
-            var vars = getQueryVariables(uri);
-            for (var key in vars) {
-                if (key === variable) return vars[key];
-            }
-            return (false);
-        }
-
-        // if value is null or undefined than execute delete operate, else execute update
-        function updateQueryVariable(uri, key, value) {
-            var re = new RegExp('([?&])' + key + '=.*?(&|$)', 'i');
-            var separator = uri.indexOf('?') !== -1 ? '&' : '?';
-            if (uri.match(re)) {
-                return uri.replace(re, !value ? '' : ('$1' + key + '=' + value + '$2'));
-            }
-            else {
-                return !value ? '' : (uri + separator + key + '=' + value);
-            }
-        }
-
-        // get uri template
-        function getUrlTemplate(uri) {
-            var reg = /\{(.+?)\}/g;
-            return uri.match(reg);
-        }
-
-        // hide empty tags
-        var HideEmptyTagsPlugin = function HideEmptyTagsPlugin() {
-            return {
-                statePlugins: {
-                    spec: {
-                        wrapSelectors: {
-                            taggedOperations: function taggedOperations(ori) {
-                                return function () {
-                                    return ori.apply(void 0, arguments).filter(function (tagMeta) {
-                                        return tagMeta.get("operations") && tagMeta.get("operations").size > 0;
-                                    });
-                                };
-                            }
-                        }
-                    }
-                }
-            };
-        };
-
-        var tokenKey = "access-token";
-        var cultureKey = "culture";
-
-        // default response interceptor
-        function defaultResponseInterceptor(response) {
-            // handle jwt token
-            var accessToken = response.headers[tokenKey];
-            if (accessToken && accessToken != "invalid_token") {
-                window.localStorage.setItem(tokenKey, accessToken);
-                ui.preauthorizeApiKey("Bearer", accessToken);
-            }
-            else if (accessToken == "invalid_token") {
-                window.localStorage.removeItem(tokenKey);
-                ui.authActions.logout(["Bearer"]);
-            }
-
-            return response;
-        }
-
-        // default request interceptor
-        function defaultRequestInterceptor(request) {
-            var url = request.url;
-
-            // add swagger header
-            request.headers["request-from"] = "swagger";
-
-            // handle template
-            var temps = getUrlTemplate(url);
-            if (temps && temps.length > 0) {
-                for (var i = 0; i < temps.length; i++) {
-                    var temp = temps[i];
-                    var key = temp.substring(1, temp.length - 1);
-                    var queryKey = getQueryVariable(key, url);
-                    if (queryKey) {
-                        url = updateQueryVariable(url.replace(temp, queryKey), key);
-                    }
-                    else url = url.replace(temp, '');
-                }
-                request.url = url;
-            }
-
-            // handle culture lang
-            var culture = getQueryVariable(cultureKey);
-            if (culture && culture.length > 0) {
-                request.url = updateQueryVariable(url, cultureKey, culture);
-            }
-
-            return request;
-        }
-
-        // send ajax request
-        function sendRequest(params) {
-            let xhr = new XMLHttpRequest();
-            xhr.onreadystatechange = function () {
-                if (xhr.readyState == 4 && xhr.status == 200) {
-                    let obj = JSON.parse(xhr.response);
-                    let headers = xhr.getAllResponseHeaders();
-                    let arr = headers.trim().split(/[\r\n]+/);
-                    let headerMap = {};
-                    arr.forEach(function (line) {
-                        let parts = line.split(': ');
-                        let header = parts.shift();
-                        let value = parts.join(': ');
-                        headerMap[header] = value;
-                    });
-
-                    params.success(obj, headerMap);
-                } else if (xhr.readyState == 4 && xhr.status >= 400) {
-                    params.error(xhr);
-                }
-            }
-
-            function objectToString(obj) {
-                let arr = [];
-                for (var k in obj) {
-                    arr.push(`${k}=${encodeURIComponent(obj[k])}`);
-                }
-
-                return arr.join('&');
-            }
-
-            let qs = objectToString(params.data);
-
-            var accessToken = window.localStorage.getItem(tokenKey);
-
-            if (params.method.toUpperCase() == 'GET') {
-                xhr.open('GET', params.url + '?' + qs);
-                if (accessToken) {
-                    xhr.setRequestHeader('Authorization', 'Bearer ' + accessToken);
-                }
-                xhr.send();
-            } else if (params.method.toUpperCase() == 'POST') {
-                xhr.open('POST', params.url);
-                if (accessToken) {
-                    xhr.setRequestHeader('Authorization', 'Bearer ' + accessToken);
-                }
-                xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-                xhr.send(qs);
-            }
-        }
-
-        // init swagger ui
-        function initSwaggerUI(configObject, oauthConfigObject) {
-            configObject.onComplete = function () {
-                var accessToken = window.localStorage.getItem(tokenKey);
-                if (accessToken) {
-                    ui.preauthorizeApiKey("Bearer", accessToken);
-                }
-            };
-
-            // Workaround for https://github.com/swagger-api/swagger-ui/issues/5945
-            configObject.urls.forEach(function (item) {
-                if (item.url.startsWith("http") || item.url.startsWith("/")) return;
-                item.url = window.location.href.replace("index.html", item.url).split('#')[0];
-            });
-
-            // If validatorUrl is not explicitly provided, disable the feature by setting to null
-            if (!configObject.hasOwnProperty("validatorUrl"))
-                configObject.validatorUrl = null
-
-            // If oauth2RedirectUrl isn't specified, use the built-in default
-            if (!configObject.hasOwnProperty("oauth2RedirectUrl"))
-                configObject.oauth2RedirectUrl = (new URL("oauth2-redirect.html", window.location.href)).href;
-
-            // Apply mandatory parameters
-            configObject.dom_id = "#swagger-ui";
-            configObject.presets = [SwaggerUIBundle.presets.apis, SwaggerUIStandalonePreset, HideEmptyTagsPlugin];
-            configObject.layout = "StandaloneLayout";
-
-            // Parse and add interceptor functions
-            var interceptors = JSON.parse('%(Interceptors)');
-            if (interceptors.RequestInterceptorFunction)
-                configObject.requestInterceptor = parseFunction(interceptors.RequestInterceptorFunction);
-            if (interceptors.ResponseInterceptorFunction)
-                configObject.responseInterceptor = parseFunction(interceptors.ResponseInterceptorFunction);
-
-            // Begin Swagger UI call region
-
-            const ui = SwaggerUIBundle(configObject);
-
-            ui.initOAuth(oauthConfigObject);
-
-            // End Swagger UI call region
-
-            window.ui = ui
-        }
-
-        window.onload = function () {
-            var configObject = JSON.parse('%(ConfigObject)');
-            var oauthConfigObject = JSON.parse('%(OAuthConfigObject)');
-
-            var loginObject = configObject.LoginInfo;
-            if (loginObject && loginObject.Enabled === true) {
-                var loginForm = document.getElementById("login-form");
-                var userName = document.getElementById("userName");
-                var password = document.getElementById("password");
-                var submit = document.getElementById("submit");
-                var loginError = document.getElementById("login-error");
-                loginForm.style.display = "block";
-
-                sendRequest({
-                    method: "POST",
-                    url: loginObject.CheckUrl,
-                    success: function (res, headerMap) {
-                        if (res.toString() === "200") {
-                            loginForm.style.display = "none";
-                            initSwaggerUI(configObject, oauthConfigObject);
-                        }
-                        else {
-                            userName.focus();
-
-                            submit.addEventListener("click", function (ev) {
-                                if (userName.value.trim().length === 0) {
-                                    userName.focus();
-                                    return;
-                                }
-                                if (password.value.trim().length === 0) {
-                                    password.focus();
-                                    return;
-                                }
-
-                                loginError.innerHTML = "";
-
-                                sendRequest({
-                                    method: "POST",
-                                    url: loginObject.SubmitUrl,
-                                    data: {
-                                        userName: userName.value.trim(),
-                                        password: password.value.trim()
-                                    },
-                                    success: function (res, headerMap) {
-                                        if (res.toString() === "200") {
-                                            loginForm.style.display = "none";
-                                            initSwaggerUI(configObject, oauthConfigObject);
-                                            defaultResponseInterceptor({ headers: headerMap });
-                                        }
-                                        else {
-                                            loginError.innerHTML = "Invalid UserName or Password.";
-                                        }
-                                    },
-                                    error: function (xhr) {
-                                        if (xhr.status === 404) {
-                                            loginError.innerHTML = "Not Found: " + loginObject.SubmitUrl;
-                                        }
-                                        else {
-                                            loginError.innerHTML = "Internal ServerError: " + loginObject.SubmitUrl;
-                                        }
-                                    }
-                                });
-                            });
-                        }
-                    },
-                    error: function (xhr) {
-                        if (xhr.status === 404) {
-                            loginError.innerHTML = "Not Found: " + loginObject.CheckUrl;
-                        }
-                        else {
-                            loginError.innerHTML = "Internal ServerError: " + loginObject.CheckUrl;
-                        }
-                    }
-                });
-            }
-            else {
-                initSwaggerUI(configObject, oauthConfigObject);
-            }
-        }
-    </script>
-</body>
-</html>
diff --git a/src/Admin/ThingsGateway.Furion/SpecificationDocument/Builders/SpecificationDocumentBuilder.cs b/src/Admin/ThingsGateway.Furion/SpecificationDocument/Builders/SpecificationDocumentBuilder.cs
index c3cf35755..90432351e 100644
--- a/src/Admin/ThingsGateway.Furion/SpecificationDocument/Builders/SpecificationDocumentBuilder.cs
+++ b/src/Admin/ThingsGateway.Furion/SpecificationDocument/Builders/SpecificationDocumentBuilder.cs
@@ -628,7 +628,7 @@ public static class SpecificationDocumentBuilder
         var thisAssembly = thisType.Assembly;
 
         // 判断是否启用 MiniProfile
-        var customIndex = $"{Reflect.GetAssemblyName(thisAssembly)}{thisType.Namespace.Replace(nameof(ThingsGateway), string.Empty)}.Assets.{(_appSettings.InjectMiniProfiler != true ? "index" : "index-mini-profiler")}.html";
+        var customIndex = $"{Reflect.GetAssemblyName(thisAssembly)}{thisType.Namespace.Replace(nameof(ThingsGateway), string.Empty)}.Assets.index.html";
         swaggerUIOptions.IndexStream = () =>
         {
             StringBuilder htmlBuilder;
diff --git a/src/Admin/ThingsGateway.Furion/SpecificationDocument/Extensions/SpecificationDocumentApplicationBuilderExtensions.cs b/src/Admin/ThingsGateway.Furion/SpecificationDocument/Extensions/SpecificationDocumentApplicationBuilderExtensions.cs
index fa1ce4ab8..0f3dc445d 100644
--- a/src/Admin/ThingsGateway.Furion/SpecificationDocument/Extensions/SpecificationDocumentApplicationBuilderExtensions.cs
+++ b/src/Admin/ThingsGateway.Furion/SpecificationDocument/Extensions/SpecificationDocumentApplicationBuilderExtensions.cs
@@ -47,9 +47,6 @@ public static class SpecificationDocumentApplicationBuilderExtensions
         // 配置 Swagger UI 参数
         app.UseSwaggerUI(options => SpecificationDocumentBuilder.BuildUI(options, routePrefix, configureSwaggerUI, withProxy));
 
-        // 启用 MiniProfiler组件
-        if (App.Settings.InjectMiniProfiler == true) app.UseMiniProfiler();
-
         return app;
     }
 }
\ No newline at end of file
diff --git a/src/Admin/ThingsGateway.Furion/SpecificationDocument/Extensions/SpecificationDocumentServiceCollectionExtensions.cs b/src/Admin/ThingsGateway.Furion/SpecificationDocument/Extensions/SpecificationDocumentServiceCollectionExtensions.cs
index 46f3d00e9..8c7d632cf 100644
--- a/src/Admin/ThingsGateway.Furion/SpecificationDocument/Extensions/SpecificationDocumentServiceCollectionExtensions.cs
+++ b/src/Admin/ThingsGateway.Furion/SpecificationDocument/Extensions/SpecificationDocumentServiceCollectionExtensions.cs
@@ -61,33 +61,8 @@ public static class SpecificationDocumentServiceCollectionExtensions
         // 添加Swagger生成器服务
         services.AddSwaggerGen(options => SpecificationDocumentBuilder.BuildGen(options, configure));
 
-        // 添加 MiniProfiler 服务
-        AddMiniProfiler(services);
-
         return services;
     }
 
-    /// <summary>
-    /// 添加 MiniProfiler 配置
-    /// </summary>
-    /// <param name="services"></param>
-    private static void AddMiniProfiler(IServiceCollection services)
-    {
-        // 注册MiniProfiler 组件
-        if (App.Settings.InjectMiniProfiler != true) return;
 
-        services.AddMiniProfiler(options =>
-        {
-            // 减少非 Swagger 页面请求监听问题
-            options.ShouldProfile = (req) =>
-            {
-                if (!req.Headers.ContainsKey("request-from")) return false;
-                return true;
-            };
-
-            options.RouteBasePath = "/index-mini-profiler";
-            options.EnableMvcFilterProfiling = false;
-            options.EnableMvcViewProfiling = false;
-        });
-    }
 }
\ No newline at end of file
diff --git a/src/Admin/ThingsGateway.Furion/ThingsGateway.Furion.csproj b/src/Admin/ThingsGateway.Furion/ThingsGateway.Furion.csproj
index 2be5bc71d..c35031767 100644
--- a/src/Admin/ThingsGateway.Furion/ThingsGateway.Furion.csproj
+++ b/src/Admin/ThingsGateway.Furion/ThingsGateway.Furion.csproj
@@ -22,13 +22,8 @@
 
 	<ItemGroup>
 		<None Remove="FriendlyException\Assets\error.html" />
-		<None Remove="SpecificationDocument\Assets\index-mini-profiler.html" />
 		<None Remove="SpecificationDocument\Assets\index.html" />
-	</ItemGroup>
-
-	<ItemGroup>
 		<EmbeddedResource Include="FriendlyException\Assets\error.html" />
-		<EmbeddedResource Include="SpecificationDocument\Assets\index-mini-profiler.html" />
 		<EmbeddedResource Include="SpecificationDocument\Assets\index.html" />
 	</ItemGroup>
 
@@ -37,7 +32,6 @@
 		<!--<PackageReference Include="FastExpressionCompiler" Version="5.3.0" />-->
 		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 		<!--<PackageReference Include="Mapster" Version="7.4.0" />-->
-		<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.5.4" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
 	</ItemGroup>
 
diff --git a/src/Admin/ThingsGateway.Furion/UnifyResult/Filters/SucceededUnifyResultFilter.cs b/src/Admin/ThingsGateway.Furion/UnifyResult/Filters/SucceededUnifyResultFilter.cs
index bb810215d..7ab032721 100644
--- a/src/Admin/ThingsGateway.Furion/UnifyResult/Filters/SucceededUnifyResultFilter.cs
+++ b/src/Admin/ThingsGateway.Furion/UnifyResult/Filters/SucceededUnifyResultFilter.cs
@@ -117,8 +117,6 @@ public class SucceededUnifyResultFilter : IAsyncActionFilter, IOrderedFilter
             var result = unifyResult.OnValidateFailed(context, validationMetadata);
             if (result != null) actionExecutedContext.Result = result;
 
-            // 打印验证失败信息
-            App.PrintToMiniProfiler("validation", "Failed", $"Validation Failed:\r\n\r\n{validationMetadata.Message}", true);
         }
         else
         {
diff --git a/src/Admin/ThingsGateway.Razor/Components/CultureChooser.razor.cs b/src/Admin/ThingsGateway.Razor/Components/CultureChooser.razor.cs
index 969f1b3b4..afc76eb59 100644
--- a/src/Admin/ThingsGateway.Razor/Components/CultureChooser.razor.cs
+++ b/src/Admin/ThingsGateway.Razor/Components/CultureChooser.razor.cs
@@ -8,6 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using ThingsGateway.Common.Extension;
 using ThingsGateway.NewLife;
 
 namespace ThingsGateway.Razor;
diff --git a/src/Admin/ThingsGateway.Razor/Components/DefaultTable.razor.cs b/src/Admin/ThingsGateway.Razor/Components/DefaultTable.razor.cs
index 1a2c64eab..779a6f7a2 100644
--- a/src/Admin/ThingsGateway.Razor/Components/DefaultTable.razor.cs
+++ b/src/Admin/ThingsGateway.Razor/Components/DefaultTable.razor.cs
@@ -8,6 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+
 namespace ThingsGateway.Razor;
 
 [CascadingTypeParameter(nameof(TItem))]
diff --git a/src/Admin/ThingsGateway.Razor/Components/EditorForm/EditorFormObject.razor.cs b/src/Admin/ThingsGateway.Razor/Components/EditorForm/EditorFormObject.razor.cs
index 533cbb8ba..f121b5b65 100644
--- a/src/Admin/ThingsGateway.Razor/Components/EditorForm/EditorFormObject.razor.cs
+++ b/src/Admin/ThingsGateway.Razor/Components/EditorForm/EditorFormObject.razor.cs
@@ -5,8 +5,6 @@
 
 using Microsoft.AspNetCore.Components.Forms;
 
-using ThingsGateway.Razor;
-
 namespace BootstrapBlazor.Components;
 
 /// <summary>
diff --git a/src/Admin/ThingsGateway.Razor/GlobalUsings.cs b/src/Admin/ThingsGateway.Razor/GlobalUsings.cs
index bf35e40e0..6b5b89db7 100644
--- a/src/Admin/ThingsGateway.Razor/GlobalUsings.cs
+++ b/src/Admin/ThingsGateway.Razor/GlobalUsings.cs
@@ -8,7 +8,6 @@
 // QQ群：605534569
 // ------------------------------------------------------------------------------
 
-
 global using BootstrapBlazor.Components;
 
 global using Microsoft.AspNetCore.Components;
@@ -18,6 +17,9 @@ global using Microsoft.Extensions.Options;
 global using System.Diagnostics.CodeAnalysis;
 global using System.Globalization;
 
+global using ThingsGateway.Common;
+global using ThingsGateway.NewLife.Extension;
+
 
 
 [assembly: SuppressMessage("Reliability", "CA2007", Justification = "<挂起>", Scope = "module")]
diff --git a/src/Admin/ThingsGateway.Razor/Services/DefaultMenuService.cs b/src/Admin/ThingsGateway.Razor/Services/DefaultMenuService.cs
index a81262338..5e7403674 100644
--- a/src/Admin/ThingsGateway.Razor/Services/DefaultMenuService.cs
+++ b/src/Admin/ThingsGateway.Razor/Services/DefaultMenuService.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.NewLife.Extension;
-
 namespace ThingsGateway.Razor;
 
 public class DefaultMenuService : IMenuService
diff --git a/src/Admin/ThingsGateway.Razor/Startup.cs b/src/Admin/ThingsGateway.Razor/Startup.cs
index 8083296ea..372539379 100644
--- a/src/Admin/ThingsGateway.Razor/Startup.cs
+++ b/src/Admin/ThingsGateway.Razor/Startup.cs
@@ -10,10 +10,6 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-using ThingsGateway.NewLife;
-
-using Yitter.IdGenerator;
-
 namespace ThingsGateway.Razor;
 
 /// <inheritdoc/>
@@ -36,21 +32,10 @@ public class Startup : AppStartup
 
         services.AddJsonLocalization();
 
-        services.AddConfigurableOptions<MenuOptions>();
         services.ConfigureIconThemeOptions(options => options.ThemeKey = "fa");
         services.AddSingleton<IAppVersionService, VersionService>();
         services.AddScoped<IMenuService, DefaultMenuService>();
 
-        services.AddConfigurableOptions<WebsiteOptions>();
-
-        _ = MachineInfo.RegisterAsync();
-
-        // 配置雪花Id算法机器码
-        YitIdHelper.SetIdGenerator(new IdGeneratorOptions
-        {
-            WorkerId = 1// 取值范围0~63
-        });
-
     }
 
     /// <inheritdoc/>
diff --git a/src/Admin/ThingsGateway.Razor/ThingsGateway.Razor.csproj b/src/Admin/ThingsGateway.Razor/ThingsGateway.Razor.csproj
index 654ca5c84..a9d3f0d38 100644
--- a/src/Admin/ThingsGateway.Razor/ThingsGateway.Razor.csproj
+++ b/src/Admin/ThingsGateway.Razor/ThingsGateway.Razor.csproj
@@ -25,7 +25,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\ThingsGateway.Furion\ThingsGateway.Furion.csproj" />
+		<ProjectReference Include="..\ThingsGateway.Common\ThingsGateway.Common.csproj" />
 	</ItemGroup>
 
 
diff --git a/src/Base1.sln b/src/Base1.sln
index 3bdb2771a..442111edf 100644
--- a/src/Base1.sln
+++ b/src/Base1.sln
@@ -32,6 +32,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.Razor", "Admi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorSetParametersAsyncGenerator", "Admin\BlazorSetParametersAsyncGenerator\BlazorSetParametersAsyncGenerator.csproj", "{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.Common", "Admin\ThingsGateway.Common\ThingsGateway.Common.csproj", "{28579DA6-6976-A674-9011-EA681BE9E1AF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -70,6 +72,10 @@ Global
 		{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28579DA6-6976-A674-9011-EA681BE9E1AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28579DA6-6976-A674-9011-EA681BE9E1AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28579DA6-6976-A674-9011-EA681BE9E1AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28579DA6-6976-A674-9011-EA681BE9E1AF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -83,10 +89,11 @@ Global
 		{8198BEEA-AC24-4D70-B3D7-2601A803610B} = {72C65578-92A5-4E99-9779-27835B12B32F}
 		{93C0CC9A-500E-419A-B896-F36225377D43} = {72C65578-92A5-4E99-9779-27835B12B32F}
 		{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3} = {72C65578-92A5-4E99-9779-27835B12B32F}
+		{28579DA6-6976-A674-9011-EA681BE9E1AF} = {72C65578-92A5-4E99-9779-27835B12B32F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		RESX_NeutralResourcesLanguage = zh-Hans
-		RESX_Rules = {"EnabledRules":[]}
 		SolutionGuid = {199B1B96-4F56-4828-9531-813BA02DB282}
+		RESX_Rules = {"EnabledRules":[]}
+		RESX_NeutralResourcesLanguage = zh-Hans
 	EndGlobalSection
 EndGlobal
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 0e9116637..c29be034a 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,11 +1,11 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.9.35</PluginVersion>
-		<ProPluginVersion>10.9.35</ProPluginVersion>
-		<DefaultVersion>10.9.35</DefaultVersion>
-		<AuthenticationVersion>2.9.16</AuthenticationVersion>
-		<SourceGeneratorVersion>10.9.15</SourceGeneratorVersion>
+		<PluginVersion>10.9.37</PluginVersion>
+		<ProPluginVersion>10.9.37</ProPluginVersion>
+		<DefaultVersion>10.9.37</DefaultVersion>
+		<AuthenticationVersion>2.9.18</AuthenticationVersion>
+		<SourceGeneratorVersion>10.9.18</SourceGeneratorVersion>
 		<NET8Version>8.0.18</NET8Version>
 		<NET9Version>9.0.7</NET9Version>
 		<SatelliteResourceLanguages>zh-Hans;en-US</SatelliteResourceLanguages>
diff --git a/src/Foundation/ThingsGateway.CSScript/ExpressionEvaluatorExtension.cs b/src/Foundation/ThingsGateway.CSScript/ExpressionEvaluatorExtension.cs
index 26c8dd658..a62871931 100644
--- a/src/Foundation/ThingsGateway.CSScript/ExpressionEvaluatorExtension.cs
+++ b/src/Foundation/ThingsGateway.CSScript/ExpressionEvaluatorExtension.cs
@@ -16,8 +16,7 @@ using System.Text;
 
 using ThingsGateway.NewLife;
 using ThingsGateway.NewLife.Caching;
-
-using TouchSocket.Core;
+using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Gateway.Application.Extensions;
 
@@ -162,7 +161,7 @@ public static class ExpressionEvaluatorExtension
     /// <summary>
     /// 计算表达式：例如：(int)raw*100，raw为原始值
     /// </summary>
-    public static object GetExpressionsResult(this string expressions, object rawvalue, ILog logger)
+    public static object GetExpressionsResult(this string expressions, object rawvalue, TouchSocket.Core.ILog logger)
     {
         if (string.IsNullOrWhiteSpace(expressions))
         {
diff --git a/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/ConverterConfigComponent.razor.cs b/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/ConverterConfigComponent.razor.cs
index 14d8ae22a..77ab7f42b 100644
--- a/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/ConverterConfigComponent.razor.cs
+++ b/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/ConverterConfigComponent.razor.cs
@@ -14,7 +14,7 @@ using System.Text;
 
 using ThingsGateway.Foundation;
 
-using LocalizerUtil = ThingsGateway.Razor.LocalizerUtil;
+using LocalizerUtil = ThingsGateway.Common.LocalizerUtil;
 
 namespace ThingsGateway.Debug;
 
diff --git a/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/DeviceComponent.razor b/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/DeviceComponent.razor
index 7ca0f66af..cc4725cca 100644
--- a/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/DeviceComponent.razor
+++ b/src/Foundation/ThingsGateway.Foundation.Razor/DebugPages/DeviceComponent.razor
@@ -4,6 +4,7 @@
 @using ThingsGateway.Foundation
 @using BootstrapBlazor.Components
 @using ThingsGateway.NewLife.Json.Extension
+@using ThingsGateway.Common.Extension
 @namespace ThingsGateway.Debug
 @inherits DeviceComponentBase
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Common/InternalTableColumn.cs b/src/Gateway/ThingsGateway.Gateway.Application/Common/InternalTableColumn.cs
index d5f27f4ed..1adccf002 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Common/InternalTableColumn.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Common/InternalTableColumn.cs
@@ -10,8 +10,6 @@
 
 using Microsoft.AspNetCore.Components;
 
-using System.Diagnostics.CodeAnalysis;
-
 namespace BootstrapBlazor.Components;
 
 /// <summary>
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Common/StringOrdinalIgnoreCaseEqualityComparer.cs b/src/Gateway/ThingsGateway.Gateway.Application/Common/StringOrdinalIgnoreCaseEqualityComparer.cs
index ab2a8d73d..78c26abbf 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Common/StringOrdinalIgnoreCaseEqualityComparer.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Common/StringOrdinalIgnoreCaseEqualityComparer.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using System.Diagnostics.CodeAnalysis;
-
 namespace ThingsGateway.Gateway.Application;
 
 public sealed class StringOrdinalIgnoreCaseEqualityComparer : EqualityComparer<string>
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Const/ExportString.cs b/src/Gateway/ThingsGateway.Gateway.Application/Const/ExportString.cs
index 104470bdd..2f5aa7eb2 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Const/ExportString.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Const/ExportString.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using Microsoft.Extensions.Localization;
-
 namespace ThingsGateway.Gateway.Application;
 
 public static class ExportString
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Controller/ControlController.cs b/src/Gateway/ThingsGateway.Gateway.Application/Controller/ControlController.cs
index 44bba1902..620b036dd 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Controller/ControlController.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Controller/ControlController.cs
@@ -19,7 +19,6 @@ using System.ComponentModel.DataAnnotations;
 using System.IO.Ports;
 
 using ThingsGateway.FriendlyException;
-using ThingsGateway.SqlSugar;
 
 using TouchSocket.Core;
 using TouchSocket.Sockets;
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Controller/RuntimeInfoController.cs b/src/Gateway/ThingsGateway.Gateway.Application/Controller/RuntimeInfoController.cs
index 47aab5889..3eaa4e0d1 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Controller/RuntimeInfoController.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Controller/RuntimeInfoController.cs
@@ -14,7 +14,6 @@ using Microsoft.AspNetCore.Mvc;
 using System.ComponentModel;
 
 using ThingsGateway.NewLife.Extension;
-using ThingsGateway.SqlSugar;
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheIntervalScript.cs b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheIntervalScript.cs
index 5fe80ed6a..d5a5a48b2 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheIntervalScript.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheIntervalScript.cs
@@ -8,7 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/DB/BusinessDatabaseUtil.cs b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/DB/BusinessDatabaseUtil.cs
index 7ca9dc530..07328288b 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/DB/BusinessDatabaseUtil.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/DB/BusinessDatabaseUtil.cs
@@ -11,8 +11,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Driver/CacheDB/CacheDB.cs b/src/Gateway/ThingsGateway.Gateway.Application/Driver/CacheDB/CacheDB.cs
index 5b46839d1..c2b89adcd 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/CacheDB/CacheDB.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/CacheDB/CacheDB.cs
@@ -9,7 +9,6 @@
 //------------------------------------------------------------------------------
 
 using ThingsGateway.NewLife;
-using ThingsGateway.SqlSugar;
 
 using TouchSocket.Core;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Driver/CacheDB/CacheDBItem.cs b/src/Gateway/ThingsGateway.Gateway.Application/Driver/CacheDB/CacheDBItem.cs
index 62d663a6a..ddc8eba26 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/CacheDB/CacheDBItem.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/CacheDB/CacheDBItem.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Gateway.Application;
 
 [SugarTable("CacheDBItem")]
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectBase.cs b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectBase.cs
index 03b08a235..bd1157929 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectBase.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectBase.cs
@@ -14,6 +14,7 @@ using Newtonsoft.Json.Linq;
 
 using System.Collections.Concurrent;
 
+using ThingsGateway.Common.Extension;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.Gateway.Application.Extensions;
 using ThingsGateway.NewLife.Json.Extension;
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectFoundationBase.cs b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectFoundationBase.cs
index 124349c4c..784ade3fe 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectFoundationBase.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectFoundationBase.cs
@@ -14,6 +14,7 @@ using Newtonsoft.Json.Linq;
 
 using System.Collections.Concurrent;
 
+using ThingsGateway.Common.Extension;
 using ThingsGateway.NewLife.Threading;
 
 using TouchSocket.Core;
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Driver/DriverBase.cs b/src/Gateway/ThingsGateway.Gateway.Application/Driver/DriverBase.cs
index ccca04385..ecd1cc8e4 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/DriverBase.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/DriverBase.cs
@@ -10,14 +10,12 @@
 
 using BootstrapBlazor.Components;
 
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 
 using System.Text;
 
 using ThingsGateway.NewLife;
 using ThingsGateway.NewLife.Threading;
-using ThingsGateway.Razor;
 
 using TouchSocket.Core;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Driver/DynamicModelExtension.cs b/src/Gateway/ThingsGateway.Gateway.Application/Driver/DynamicModelExtension.cs
index dd32512f5..83c898fdc 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/DynamicModelExtension.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/DynamicModelExtension.cs
@@ -10,7 +10,7 @@
 
 using System.Reflection;
 
-using ThingsGateway.Extension.Generic;
+using ThingsGateway.Common.Extension.Generic;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.NewLife.Reflection;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Entity/BackendLog.cs b/src/Gateway/ThingsGateway.Gateway.Application/Entity/BackendLog.cs
index 81a01b8a0..f853650ed 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Entity/BackendLog.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Entity/BackendLog.cs
@@ -10,8 +10,6 @@
 
 using BootstrapBlazor.Components;
 
-using ThingsGateway.SqlSugar;
-
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 
 namespace ThingsGateway.Gateway.Application;
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Entity/Channel.cs b/src/Gateway/ThingsGateway.Gateway.Application/Entity/Channel.cs
index 20644b589..e7215fa64 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Entity/Channel.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Entity/Channel.cs
@@ -11,11 +11,8 @@
 using BootstrapBlazor.Components;
 
 using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.CodeAnalysis;
 using System.IO.Ports;
 
-using ThingsGateway.SqlSugar;
-
 using TouchSocket.Core;
 using TouchSocket.Sockets;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Entity/Device.cs b/src/Gateway/ThingsGateway.Gateway.Application/Entity/Device.cs
index 693b9e45b..10677289e 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Entity/Device.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Entity/Device.cs
@@ -15,8 +15,6 @@ using Riok.Mapperly.Abstractions;
 using System.ComponentModel.DataAnnotations;
 
 using ThingsGateway.NewLife.Extension;
-using ThingsGateway.Razor;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Gateway.Application;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Entity/RpcLog.cs b/src/Gateway/ThingsGateway.Gateway.Application/Entity/RpcLog.cs
index 9e5b28776..f9088501a 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Entity/RpcLog.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Entity/RpcLog.cs
@@ -10,8 +10,6 @@
 
 using BootstrapBlazor.Components;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Entity/Variable.cs b/src/Gateway/ThingsGateway.Gateway.Application/Entity/Variable.cs
index bb6b814fa..8f8f0e750 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Entity/Variable.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Entity/Variable.cs
@@ -14,10 +14,6 @@ using Riok.Mapperly.Abstractions;
 
 using System.Collections.Concurrent;
 using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.CodeAnalysis;
-
-using ThingsGateway.Razor;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Gateway.Application;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Extensions/ServiceCollectionHostedServiceExtensions.cs b/src/Gateway/ThingsGateway.Gateway.Application/Extensions/ServiceCollectionHostedServiceExtensions.cs
index d1d4472cc..e75f469c8 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Extensions/ServiceCollectionHostedServiceExtensions.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Extensions/ServiceCollectionHostedServiceExtensions.cs
@@ -11,8 +11,6 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 
-using System.Diagnostics.CodeAnalysis;
-
 namespace Microsoft.Extensions.DependencyInjection;
 
 /// <summary>
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/GlobalUsings.cs b/src/Gateway/ThingsGateway.Gateway.Application/GlobalUsings.cs
index 97615e340..682afd296 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/GlobalUsings.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/GlobalUsings.cs
@@ -9,6 +9,13 @@
 //------------------------------------------------------------------------------
 
 global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Localization;
+
+global using System.Diagnostics.CodeAnalysis;
+global using System.Globalization;
 
 global using ThingsGateway.Admin.Application;
+global using ThingsGateway.Common;
+global using ThingsGateway.DB;
 global using ThingsGateway.Foundation;
+global using ThingsGateway.SqlSugar;
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Logging/BackendLogDatabaseLoggingWriter.cs b/src/Gateway/ThingsGateway.Gateway.Application/Logging/BackendLogDatabaseLoggingWriter.cs
index fb4ae969e..ed97d6fc2 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Logging/BackendLogDatabaseLoggingWriter.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Logging/BackendLogDatabaseLoggingWriter.cs
@@ -14,7 +14,6 @@ using System.Collections.Concurrent;
 
 using ThingsGateway.Extension;
 using ThingsGateway.Logging;
-using ThingsGateway.SqlSugar;
 
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Model/AlarmVariable.cs b/src/Gateway/ThingsGateway.Gateway.Application/Model/AlarmVariable.cs
index d056fb11b..137225d7c 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Model/AlarmVariable.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Model/AlarmVariable.cs
@@ -12,8 +12,6 @@ using BootstrapBlazor.Components;
 
 using Newtonsoft.Json;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Model/DriverMethodInfo.cs b/src/Gateway/ThingsGateway.Gateway.Application/Model/DriverMethodInfo.cs
index 7ceba9859..03b242184 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Model/DriverMethodInfo.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Model/DriverMethodInfo.cs
@@ -12,8 +12,6 @@ using Riok.Mapperly.Abstractions;
 
 using System.Reflection;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Model/PluginInfo.cs b/src/Gateway/ThingsGateway.Gateway.Application/Model/PluginInfo.cs
index c551c884f..ab4e35a85 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Model/PluginInfo.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Model/PluginInfo.cs
@@ -10,8 +10,6 @@
 
 using BootstrapBlazor.Components;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Model/VariableRunTime.property.cs b/src/Gateway/ThingsGateway.Gateway.Application/Model/VariableRunTime.property.cs
index c015c3363..d0f705fbb 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Model/VariableRunTime.property.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Model/VariableRunTime.property.cs
@@ -12,8 +12,6 @@ using BootstrapBlazor.Components;
 
 using Riok.Mapperly.Abstractions;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelService.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelService.cs
index e062f76cd..ff70c939a 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelService.cs
@@ -19,10 +19,11 @@ using System.Data;
 using System.Reflection;
 using System.Text;
 
+using ThingsGateway.Common.Extension;
+using ThingsGateway.Common.Extension.Generic;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.Foundation.Extension.Dynamic;
 using ThingsGateway.FriendlyException;
-using ThingsGateway.SqlSugar;
 
 using TouchSocket.Core;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelServiceHelpers.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelServiceHelpers.cs
index a51ae99c4..216c74b34 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelServiceHelpers.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelServiceHelpers.cs
@@ -13,6 +13,8 @@ using BootstrapBlazor.Components;
 
 using System.Reflection;
 
+using ThingsGateway.Common.Extension;
+
 namespace ThingsGateway.Gateway.Application;
 
 public static class ChannelServiceHelpers
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/IChannelService.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/IChannelService.cs
index a5f77517d..06fc09d0c 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/IChannelService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/IChannelService.cs
@@ -12,8 +12,6 @@ using BootstrapBlazor.Components;
 
 using Microsoft.AspNetCore.Components.Forms;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceService.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceService.cs
index fce701c2d..8bd60e06a 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceService.cs
@@ -19,10 +19,11 @@ using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 using System.Text;
 
+using ThingsGateway.Common.Extension;
+using ThingsGateway.Common.Extension.Generic;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.Foundation.Extension.Dynamic;
 using ThingsGateway.FriendlyException;
-using ThingsGateway.SqlSugar;
 
 using TouchSocket.Core;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceServiceHelpers.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceServiceHelpers.cs
index 5c3366796..9781908e0 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceServiceHelpers.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceServiceHelpers.cs
@@ -14,6 +14,8 @@ using BootstrapBlazor.Components;
 using System.Collections.Concurrent;
 using System.Reflection;
 
+using ThingsGateway.Common.Extension;
+
 namespace ThingsGateway.Gateway.Application;
 
 public static class DeviceServiceHelpers
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/Device/IDeviceService.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/Device/IDeviceService.cs
index 6170cc13a..aa7f69eb4 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Device/IDeviceService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Device/IDeviceService.cs
@@ -15,8 +15,6 @@ using Microsoft.AspNetCore.Components.Forms;
 using System.Collections.Concurrent;
 using System.Reflection;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayLogs/BackendLogService.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayLogs/BackendLogService.cs
index 1ad3f38a6..9dd6e78c6 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayLogs/BackendLogService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayLogs/BackendLogService.cs
@@ -12,8 +12,6 @@ using BootstrapBlazor.Components;
 
 using System.Data;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Gateway.Application;
 
 internal sealed class BackendLogService : BaseService<BackendLog>, IBackendLogService
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayLogs/RpcLogService.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayLogs/RpcLogService.cs
index 7ec1305ef..d2ee80af4 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayLogs/RpcLogService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayLogs/RpcLogService.cs
@@ -12,8 +12,6 @@ using BootstrapBlazor.Components;
 
 using System.Data;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Gateway.Application;
 
 internal sealed class RpcLogService : BaseService<RpcLog>, IRpcLogService
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/AlarmManage/AlarmTask.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/AlarmManage/AlarmTask.cs
index 26487fc5d..5c919beeb 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/AlarmManage/AlarmTask.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/AlarmManage/AlarmTask.cs
@@ -10,6 +10,7 @@
 
 using Microsoft.Extensions.Logging;
 
+using ThingsGateway.Common.Extension;
 using ThingsGateway.Gateway.Application.Extensions;
 using ThingsGateway.NewLife;
 using ThingsGateway.NewLife.Extension;
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/ChannelManage/ChannelThreadManage.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/ChannelManage/ChannelThreadManage.cs
index 8b524c5f7..82595ddfc 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/ChannelManage/ChannelThreadManage.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/ChannelManage/ChannelThreadManage.cs
@@ -12,6 +12,7 @@ using Microsoft.Extensions.Logging;
 
 using System.Collections.Concurrent;
 
+using ThingsGateway.Common.Extension;
 using ThingsGateway.NewLife;
 
 namespace ThingsGateway.Gateway.Application;
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/DeviceManage/DeviceThreadManage.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/DeviceManage/DeviceThreadManage.cs
index 683caba4a..d8a343f0b 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/DeviceManage/DeviceThreadManage.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/DeviceManage/DeviceThreadManage.cs
@@ -14,6 +14,7 @@ using Microsoft.Extensions.Hosting;
 
 using System.Collections.Concurrent;
 
+using ThingsGateway.Common.Extension;
 using ThingsGateway.Gateway.Application.Extensions;
 using ThingsGateway.NewLife;
 using ThingsGateway.NewLife.Extension;
@@ -684,13 +685,12 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
         {
             try
             {
-                //检测设备线程假死
                 await Task.Delay(1000, cancellationToken).ConfigureAwait(false);
                 foreach (var kv in Drivers)
                 {
                     if (Disposed) return;
                     var deviceRuntime = kv.Value.CurrentDevice;
-                    if (GlobalData.IsRedundant(deviceRuntime.Id) && deviceRuntime.Driver != null && deviceRuntime.RedundantSwitchType == RedundantSwitchTypeEnum.Script)
+                    if (deviceRuntime != null && GlobalData.IsRedundant(deviceRuntime.Id) && deviceRuntime.Driver != null && deviceRuntime.RedundantSwitchType == RedundantSwitchTypeEnum.Script)
                     {
                         _ = Task.Run(async () =>
                         {
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/GatewayMonitorHostedService.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/GatewayMonitorHostedService.cs
index ee9678188..5cdafc7b5 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/GatewayMonitorHostedService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/GatewayMonitorHostedService.cs
@@ -9,9 +9,10 @@
 //------------------------------------------------------------------------------
 
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 
+using ThingsGateway.Common.Extension;
+
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/Management/Update/Services/UpdateZipFileHostedService.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/Management/Update/Services/UpdateZipFileHostedService.cs
index 1b398fd8a..1eaa84037 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Management/Update/Services/UpdateZipFileHostedService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Management/Update/Services/UpdateZipFileHostedService.cs
@@ -9,7 +9,6 @@
 //------------------------------------------------------------------------------
 
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 
 using System.Reflection;
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/PluginService.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/PluginService.cs
index f6186c198..f70c8e96e 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/PluginService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/PluginService.cs
@@ -11,12 +11,10 @@
 using BootstrapBlazor.Components;
 
 using Microsoft.CodeAnalysis;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 
 using System.Collections.Concurrent;
 using System.Data;
-using System.Globalization;
 using System.Reflection;
 using System.Runtime.Loader;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/PluginServiceUtil.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/PluginServiceUtil.cs
index e32637097..18aac4073 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/PluginServiceUtil.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/PluginServiceUtil.cs
@@ -17,7 +17,6 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 
 using ThingsGateway.NewLife.Extension;
-using ThingsGateway.Razor;
 
 namespace ThingsGateway.Gateway.Application;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/Rpc/RpcService.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/Rpc/RpcService.cs
index e61048b69..2d0daf0b6 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Rpc/RpcService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Rpc/RpcService.cs
@@ -9,16 +9,15 @@
 // ------------------------------------------------------------------------------
 
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Localization;
 
 using Newtonsoft.Json.Linq;
 
 using System.Collections.Concurrent;
 
+using ThingsGateway.Common.Extension;
 using ThingsGateway.Extension;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.SqlSugar;
 
 using TouchSocket.Core;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Attributes/CategoryNode.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Attributes/CategoryNode.cs
index 4c0445ab0..615a0a47f 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Attributes/CategoryNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Attributes/CategoryNode.cs
@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Localization;
-
-namespace ThingsGateway.Gateway.Application;
+namespace ThingsGateway.Gateway.Application;
 
 public sealed class CategoryNode : Attribute
 {
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Entity/Rules.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Entity/Rules.cs
index 85c4dbb5f..7a470b1c9 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Entity/Rules.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Entity/Rules.cs
@@ -6,7 +6,6 @@ using System.ComponentModel.DataAnnotations;
 
 using ThingsGateway.Blazor.Diagrams.Core.Geometry;
 using ThingsGateway.Blazor.Diagrams.Core.Models;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Gateway.Application;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/AlarmChangedTriggerNode.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/AlarmChangedTriggerNode.cs
index 98f34a88f..7bf0b9cca 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/AlarmChangedTriggerNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/AlarmChangedTriggerNode.cs
@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 
 using ThingsGateway.Blazor.Diagrams.Core.Geometry;
+using ThingsGateway.Common.Extension;
 
 using TouchSocket.Core;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/DeviceChangedTriggerNode.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/DeviceChangedTriggerNode.cs
index bf020ca34..f9a1da833 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/DeviceChangedTriggerNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/DeviceChangedTriggerNode.cs
@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 
 using ThingsGateway.Blazor.Diagrams.Core.Geometry;
+using ThingsGateway.Common.Extension;
 
 using TouchSocket.Core;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/ValueChangedTriggerNode.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/ValueChangedTriggerNode.cs
index de6f01ad6..0b812a7e4 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/ValueChangedTriggerNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/ValueChangedTriggerNode.cs
@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 
 using ThingsGateway.Blazor.Diagrams.Core.Geometry;
+using ThingsGateway.Common.Extension;
 
 using TouchSocket.Core;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Services/RulesEngineHostedService.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Services/RulesEngineHostedService.cs
index 67520d5f1..c40223b93 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Services/RulesEngineHostedService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Services/RulesEngineHostedService.cs
@@ -11,7 +11,6 @@
 using BootstrapBlazor.Components;
 
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 
 using ThingsGateway.Blazor.Diagrams.Core;
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Services/RulesService.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Services/RulesService.cs
index 6d2b546de..5c1bb57f5 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Services/RulesService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Services/RulesService.cs
@@ -13,7 +13,6 @@ using BootstrapBlazor.Components;
 using System.Data;
 
 using ThingsGateway.Extension.Generic;
-using ThingsGateway.SqlSugar;
 
 using TouchSocket.Core;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/RuntimeServiceHelper.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/RuntimeServiceHelper.cs
index 2556f2b8b..2413da738 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RuntimeServiceHelper.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RuntimeServiceHelper.cs
@@ -13,6 +13,7 @@ using BootstrapBlazor.Components;
 
 using Microsoft.Extensions.Logging;
 
+using ThingsGateway.Common.Extension;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.NewLife.Collections;
 using ThingsGateway.NewLife.DictionaryExtensions;
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/IVariableService.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/IVariableService.cs
index a75a2494c..5f5aeab37 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/IVariableService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/IVariableService.cs
@@ -15,8 +15,6 @@ using Microsoft.AspNetCore.Components.Forms;
 using System.Collections.Concurrent;
 using System.Reflection;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableService.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableService.cs
index abfa93aea..13fb1395d 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableService.cs
@@ -19,9 +19,10 @@ using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 using System.Text;
 
+using ThingsGateway.Common.Extension;
+using ThingsGateway.Common.Extension.Generic;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.Foundation.Extension.Dynamic;
-using ThingsGateway.SqlSugar;
 
 using TouchSocket.Core;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableServiceHelpers.cs b/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableServiceHelpers.cs
index d361a0f8b..2c6400ef8 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableServiceHelpers.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableServiceHelpers.cs
@@ -14,6 +14,8 @@ using BootstrapBlazor.Components;
 using System.Collections.Concurrent;
 using System.Reflection;
 
+using ThingsGateway.Common.Extension;
+
 using TouchSocket.Core;
 
 namespace ThingsGateway.Gateway.Application;
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Startup.cs b/src/Gateway/ThingsGateway.Gateway.Application/Startup.cs
index 9ba6b2ce5..67a67d56d 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Startup.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Startup.cs
@@ -15,7 +15,6 @@ using System.Reflection;
 
 using ThingsGateway.Authentication;
 using ThingsGateway.Management;
-using ThingsGateway.SqlSugar;
 using ThingsGateway.Upgrade;
 
 namespace ThingsGateway.Gateway.Application;
@@ -77,7 +76,6 @@ public class Startup : AppStartup
         services.AddSingleton<IBackendLogService, BackendLogService>();
         services.AddSingleton<IRpcLogService, RpcLogService>();
         services.AddSingleton<IRpcService, RpcService>();
-        services.AddScoped<IGatewayExportService, GatewayExportService>();
 
         services.AddGatewayHostedService<IAlarmHostedService, AlarmHostedService>();
         services.AddGatewayHostedService<IGatewayMonitorHostedService, GatewayMonitorHostedService>();
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Components/TcpServiceComponent.razor.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Components/TcpServiceComponent.razor.cs
index d40e33b08..a9f951df8 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Components/TcpServiceComponent.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Components/TcpServiceComponent.razor.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 using ThingsGateway.Foundation;
 using ThingsGateway.NewLife.Json.Extension;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/GlobalUsings.cs b/src/Gateway/ThingsGateway.Gateway.Razor/GlobalUsings.cs
index 87668eb64..4340a60e6 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/GlobalUsings.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/GlobalUsings.cs
@@ -15,6 +15,7 @@ global using Microsoft.Extensions.Localization;
 
 global using System.Diagnostics.CodeAnalysis;
 
+global using ThingsGateway.Common;
 global using ThingsGateway.Gateway.Application;
 global using ThingsGateway.Razor;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelCopyComponent.razor.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelCopyComponent.razor.cs
index 9fed4e184..b2ac01b62 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelCopyComponent.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelCopyComponent.razor.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 
 namespace ThingsGateway.Gateway.Razor;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelTable.razor.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelTable.razor.cs
index ca4063e35..dd5d211d0 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelTable.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelTable.razor.cs
@@ -10,7 +10,7 @@
 
 using Microsoft.AspNetCore.Components.Forms;
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.NewLife.Extension;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceCopyComponent.razor.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceCopyComponent.razor.cs
index 4cb605f36..85298df54 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceCopyComponent.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceCopyComponent.razor.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 
 namespace ThingsGateway.Gateway.Razor;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceTable.razor.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceTable.razor.cs
index 38f11a6ea..f71d8d975 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceTable.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceTable.razor.cs
@@ -10,7 +10,7 @@
 
 using Microsoft.AspNetCore.Components.Forms;
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.NewLife.Extension;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableCopyComponent.razor.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableCopyComponent.razor.cs
index a80c407ec..5467436b6 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableCopyComponent.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableCopyComponent.razor.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 
 namespace ThingsGateway.Gateway.Razor;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableEditComponent.razor b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableEditComponent.razor
index b9ed62246..94d71dad1 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableEditComponent.razor
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableEditComponent.razor
@@ -3,6 +3,7 @@
 @using ThingsGateway.Admin.Razor
 @using ThingsGateway.Foundation
 @using ThingsGateway.Gateway.Application
+@using ThingsGateway.Common.Extension
 @inherits ComponentDefault
 
 <div class="variable">
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRuntimeInfo.razor.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRuntimeInfo.razor.cs
index d915ac1a9..42ce90f2e 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRuntimeInfo.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRuntimeInfo.razor.cs
@@ -11,7 +11,7 @@
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Options;
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.NewLife.Json.Extension;
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RealAlarmPage/RealAlarmPage.razor.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RealAlarmPage/RealAlarmPage.razor.cs
index 9776efb6e..c65a4a878 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RealAlarmPage/RealAlarmPage.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RealAlarmPage/RealAlarmPage.razor.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 
 namespace ThingsGateway.Gateway.Razor;
 
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayExport/GatewayExportService.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Services/GatewayExport/GatewayExportService.cs
similarity index 98%
rename from src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayExport/GatewayExportService.cs
rename to src/Gateway/ThingsGateway.Gateway.Razor/Services/GatewayExport/GatewayExportService.cs
index dfff10b78..b6a8e21c1 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayExport/GatewayExportService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Services/GatewayExport/GatewayExportService.cs
@@ -15,7 +15,7 @@ using ThingsGateway.Extension;
 
 using TouchSocket.Core;
 
-namespace ThingsGateway.Gateway.Application;
+namespace ThingsGateway.Gateway.Razor;
 
 internal sealed class GatewayExportService : IGatewayExportService
 {
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayExport/HybridGatewayExportService.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Services/GatewayExport/HybridGatewayExportService.cs
similarity index 98%
rename from src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayExport/HybridGatewayExportService.cs
rename to src/Gateway/ThingsGateway.Gateway.Razor/Services/GatewayExport/HybridGatewayExportService.cs
index b2131fa8b..a457a3a38 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayExport/HybridGatewayExportService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Services/GatewayExport/HybridGatewayExportService.cs
@@ -8,9 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.Gateway.Application;
+using ThingsGateway.Admin.Application;
 
-namespace ThingsGateway.Server;
+namespace ThingsGateway.Gateway.Razor;
 
 public sealed class HybridGatewayExportService : IGatewayExportService
 {
diff --git a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayExport/IGatewayExportService.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Services/GatewayExport/IGatewayExportService.cs
similarity index 94%
rename from src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayExport/IGatewayExportService.cs
rename to src/Gateway/ThingsGateway.Gateway.Razor/Services/GatewayExport/IGatewayExportService.cs
index 337e848e5..702373e55 100644
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayExport/IGatewayExportService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Services/GatewayExport/IGatewayExportService.cs
@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Gateway.Application;
+namespace ThingsGateway.Gateway.Razor;
 
 public interface IGatewayExportService
 {
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Startup.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Startup.cs
index c8789a7b8..81541197a 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Startup.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Startup.cs
@@ -17,6 +17,7 @@ public class Startup : AppStartup
 {
     public void Configure(IServiceCollection services)
     {
+        services.AddScoped<IGatewayExportService, GatewayExportService>();
         services.AddBootstrapBlazorWinBoxService();
     }
 }
diff --git a/src/PackNuget.props b/src/PackNuget.props
index f77599fdf..01aa99351 100644
--- a/src/PackNuget.props
+++ b/src/PackNuget.props
@@ -12,8 +12,9 @@
 		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
 
 	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)' == 'Release'">
+	
+	<!--Condition="'$(Configuration)' == 'Release'"-->
+	<PropertyGroup>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	</PropertyGroup>
 
diff --git a/src/Plugin/ThingsGateway.Debug.Photino/MainLayout.razor b/src/Plugin/ThingsGateway.Debug.Photino/MainLayout.razor
index e468b4fb0..67b136fe1 100644
--- a/src/Plugin/ThingsGateway.Debug.Photino/MainLayout.razor
+++ b/src/Plugin/ThingsGateway.Debug.Photino/MainLayout.razor
@@ -4,6 +4,7 @@
 @using BootstrapBlazor.Components
 @using ThingsGateway.Extension
 @using ThingsGateway.NewLife.Extension
+@using ThingsGateway.Common.Extension
 @using ThingsGateway.Razor
 @inject NavigationManager NavigationManager
 
diff --git a/src/Plugin/ThingsGateway.Debug.Photino/MainLayout.razor.cs b/src/Plugin/ThingsGateway.Debug.Photino/MainLayout.razor.cs
index 8d8746571..71447ab48 100644
--- a/src/Plugin/ThingsGateway.Debug.Photino/MainLayout.razor.cs
+++ b/src/Plugin/ThingsGateway.Debug.Photino/MainLayout.razor.cs
@@ -17,6 +17,7 @@ using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.Common;
 using ThingsGateway.Razor;
 
 namespace ThingsGateway.Debug;
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/Mapper/GatewayMapper.cs b/src/Plugin/ThingsGateway.Plugin.DB/Mapper/GatewayMapper.cs
index 9df59d2d0..498697dd8 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/Mapper/GatewayMapper.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/Mapper/GatewayMapper.cs
@@ -10,7 +10,7 @@
 
 using Riok.Mapperly.Abstractions;
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 using ThingsGateway.Plugin.SqlHistoryAlarm;
 
 namespace ThingsGateway.Plugin.DB;
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/Entity/QuestDBHistoryValue.cs b/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/Entity/QuestDBHistoryValue.cs
index 9c3a97563..7099da400 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/Entity/QuestDBHistoryValue.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/Entity/QuestDBHistoryValue.cs
@@ -10,6 +10,7 @@
 
 using BootstrapBlazor.Components;
 
+using ThingsGateway.Common;
 using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Plugin.QuestDB;
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.cs b/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.cs
index 662f16e72..6b146a5df 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.cs
@@ -10,7 +10,8 @@
 
 using BootstrapBlazor.Components;
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.Common;
+using ThingsGateway.DB;
 using ThingsGateway.Debug;
 using ThingsGateway.Foundation;
 using ThingsGateway.NewLife;
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/Razor/QuestDBPage.razor.cs b/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/Razor/QuestDBPage.razor.cs
index 090cb7731..046b73a2d 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/Razor/QuestDBPage.razor.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/Razor/QuestDBPage.razor.cs
@@ -12,8 +12,8 @@ using BootstrapBlazor.Components;
 
 using Microsoft.AspNetCore.Components;
 
+using ThingsGateway.Common;
 using ThingsGateway.Plugin.DB;
-using ThingsGateway.Razor;
 
 namespace ThingsGateway.Plugin.QuestDB;
 
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Entity/SQLHistoryValue.cs b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Entity/SQLHistoryValue.cs
index 1a603aeda..86fcbdea4 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Entity/SQLHistoryValue.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Entity/SQLHistoryValue.cs
@@ -10,6 +10,7 @@
 
 using BootstrapBlazor.Components;
 
+using ThingsGateway.Common;
 using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Plugin.SqlDB;
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Entity/SQLRealValue.cs b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Entity/SQLRealValue.cs
index b69d8f52c..a71b79ceb 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Entity/SQLRealValue.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Entity/SQLRealValue.cs
@@ -10,6 +10,7 @@
 
 using BootstrapBlazor.Components;
 
+using ThingsGateway.Common;
 using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Plugin.SqlDB;
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Razor/SqlDBPage.razor.cs b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Razor/SqlDBPage.razor.cs
index c006047c0..6bb9583f8 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Razor/SqlDBPage.razor.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Razor/SqlDBPage.razor.cs
@@ -12,8 +12,8 @@ using BootstrapBlazor.Components;
 
 using Microsoft.AspNetCore.Components;
 
+using ThingsGateway.Common;
 using ThingsGateway.Plugin.DB;
-using ThingsGateway.Razor;
 
 namespace ThingsGateway.Plugin.SqlDB;
 
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Razor/SqlDBProducerPropertyRazor.razor.cs b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Razor/SqlDBProducerPropertyRazor.razor.cs
index 422644604..62652c5ff 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Razor/SqlDBProducerPropertyRazor.razor.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/Razor/SqlDBProducerPropertyRazor.razor.cs
@@ -16,11 +16,11 @@ using Microsoft.Extensions.Localization;
 
 using System.Text;
 
+using ThingsGateway.Common;
 using ThingsGateway.Gateway.Razor;
 using ThingsGateway.Plugin.DB;
 using ThingsGateway.Plugin.SqlDB;
 using ThingsGateway.Plugin.TDengineDB;
-using ThingsGateway.Razor;
 using ThingsGateway.SqlSugar;
 
 using TouchSocket.Core;
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SplitTable/SqlDBBusinessDatabaseUtil.cs b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SplitTable/SqlDBBusinessDatabaseUtil.cs
index 01e7163cb..6c843a431 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SplitTable/SqlDBBusinessDatabaseUtil.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SplitTable/SqlDBBusinessDatabaseUtil.cs
@@ -13,7 +13,7 @@ using Microsoft.Extensions.DependencyInjection;
 using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 using ThingsGateway.SqlSugar;
 
 
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDBProducer.cs b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDBProducer.cs
index 4af51ff9d..3a1e34832 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDBProducer.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDBProducer.cs
@@ -10,7 +10,8 @@
 
 using BootstrapBlazor.Components;
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.Common;
+using ThingsGateway.DB;
 using ThingsGateway.Debug;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.Foundation;
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/Razor/HistoryAlarmPage.razor.cs b/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/Razor/HistoryAlarmPage.razor.cs
index b6900e61f..3004bf7fb 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/Razor/HistoryAlarmPage.razor.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/Razor/HistoryAlarmPage.razor.cs
@@ -12,7 +12,7 @@ using BootstrapBlazor.Components;
 
 using Microsoft.AspNetCore.Components;
 
-using ThingsGateway.Razor;
+using ThingsGateway.Common;
 
 namespace ThingsGateway.Plugin.SqlHistoryAlarm;
 
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.cs b/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.cs
index c4f3fa7b9..2594fe037 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.cs
@@ -10,7 +10,8 @@
 
 using BootstrapBlazor.Components;
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.Common;
+using ThingsGateway.DB;
 using ThingsGateway.Foundation;
 using ThingsGateway.NewLife;
 using ThingsGateway.SqlSugar;
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBHistoryValue.cs b/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBHistoryValue.cs
index 8c1367a8a..950871b36 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBHistoryValue.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBHistoryValue.cs
@@ -10,6 +10,7 @@
 
 using BootstrapBlazor.Components;
 
+using ThingsGateway.Common;
 using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Plugin.TDengineDB;
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBPage.razor.cs b/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBPage.razor.cs
index 49a360e4a..0656d78e1 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBPage.razor.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBPage.razor.cs
@@ -12,8 +12,8 @@ using BootstrapBlazor.Components;
 
 using Microsoft.AspNetCore.Components;
 
+using ThingsGateway.Common;
 using ThingsGateway.Plugin.DB;
-using ThingsGateway.Razor;
 
 namespace ThingsGateway.Plugin.TDengineDB;
 
diff --git a/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBProducer.cs b/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBProducer.cs
index 2a64890a8..edde68679 100644
--- a/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBProducer.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBProducer.cs
@@ -12,7 +12,8 @@ using BootstrapBlazor.Components;
 
 using System.Reflection;
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.Common;
+using ThingsGateway.DB;
 using ThingsGateway.Debug;
 using ThingsGateway.Foundation;
 using ThingsGateway.NewLife;
diff --git a/src/Plugin/ThingsGateway.Plugin.Dlt645/Pages/Dlt645_2007AddressComponent.razor.cs b/src/Plugin/ThingsGateway.Plugin.Dlt645/Pages/Dlt645_2007AddressComponent.razor.cs
index 9367cef54..439e6847b 100644
--- a/src/Plugin/ThingsGateway.Plugin.Dlt645/Pages/Dlt645_2007AddressComponent.razor.cs
+++ b/src/Plugin/ThingsGateway.Plugin.Dlt645/Pages/Dlt645_2007AddressComponent.razor.cs
@@ -15,6 +15,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Localization;
 
+using ThingsGateway.Common;
 using ThingsGateway.Foundation;
 using ThingsGateway.Foundation.Dlt645;
 using ThingsGateway.Razor;
diff --git a/src/Plugin/ThingsGateway.Plugin.Modbus/Pages/ModbusAddressComponent.razor.cs b/src/Plugin/ThingsGateway.Plugin.Modbus/Pages/ModbusAddressComponent.razor.cs
index ceabbf2ab..46cc10e36 100644
--- a/src/Plugin/ThingsGateway.Plugin.Modbus/Pages/ModbusAddressComponent.razor.cs
+++ b/src/Plugin/ThingsGateway.Plugin.Modbus/Pages/ModbusAddressComponent.razor.cs
@@ -15,6 +15,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Localization;
 
+using ThingsGateway.Common;
 using ThingsGateway.Foundation;
 using ThingsGateway.Foundation.Modbus;
 using ThingsGateway.Razor;
diff --git a/src/Plugin/ThingsGateway.Plugin.Mqtt/MqttPropertyRazor.razor.cs b/src/Plugin/ThingsGateway.Plugin.Mqtt/MqttPropertyRazor.razor.cs
index 93b83f122..aca4c2340 100644
--- a/src/Plugin/ThingsGateway.Plugin.Mqtt/MqttPropertyRazor.razor.cs
+++ b/src/Plugin/ThingsGateway.Plugin.Mqtt/MqttPropertyRazor.razor.cs
@@ -14,7 +14,7 @@ using BootstrapBlazor.Components;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 
-using ThingsGateway.Razor;
+using ThingsGateway.Common;
 
 namespace ThingsGateway.Plugin.Mqtt
 {
diff --git a/src/Plugin/ThingsGateway.Plugin.OpcDa/Pages/OpcDaImportVariable.razor.cs b/src/Plugin/ThingsGateway.Plugin.OpcDa/Pages/OpcDaImportVariable.razor.cs
index cd7a45228..38d08fa21 100644
--- a/src/Plugin/ThingsGateway.Plugin.OpcDa/Pages/OpcDaImportVariable.razor.cs
+++ b/src/Plugin/ThingsGateway.Plugin.OpcDa/Pages/OpcDaImportVariable.razor.cs
@@ -25,6 +25,7 @@ using ThingsGateway.Foundation.OpcDa.Rcw;
 
 using ThingsGateway.Gateway.Application;
 using ThingsGateway.Plugin.OpcDa;
+using ThingsGateway.DB;
 
 #endif
 
@@ -271,7 +272,7 @@ public partial class OpcDaImportVariable
             {
             }
 
-            var id = Admin.Application.CommonUtils.GetSingleId();
+            var id = CommonUtils.GetSingleId();
             return new Variable()
             {
                 Name = a.Name,
@@ -289,7 +290,7 @@ public partial class OpcDaImportVariable
 
     private Device GetImportDevice(long channelId)
     {
-        var id = Admin.Application.CommonUtils.GetSingleId();
+        var id = CommonUtils.GetSingleId();
         var data = new Device()
         {
             Name = Plc.OpcDaProperty.OpcName + "-" + id,
@@ -310,7 +311,7 @@ public partial class OpcDaImportVariable
 
     private Channel GetImportChannel()
     {
-        var id = Admin.Application.CommonUtils.GetSingleId();
+        var id = CommonUtils.GetSingleId();
         var data = new Channel()
         {
             Name = Plc.OpcDaProperty.OpcName + "-" + id,
diff --git a/src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/OpcUaServer.cs b/src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/OpcUaServer.cs
index 16a022e11..1fb80c567 100644
--- a/src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/OpcUaServer.cs
+++ b/src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/OpcUaServer.cs
@@ -12,13 +12,17 @@ using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 
 using Opc.Ua;
+using Opc.Ua.Bindings;
 using Opc.Ua.Configuration;
 
 using System.Collections.Concurrent;
+using System.Reflection;
 
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.Gateway.Application;
+using ThingsGateway.NewLife;
 using ThingsGateway.NewLife.DictionaryExtensions;
+using ThingsGateway.NewLife.Reflection;
 
 using TouchSocket.Core;
 
@@ -125,6 +129,39 @@ public partial class OpcUaServer : BusinessBase
     private void UaDispose()
     {
         ApplicationInstance.MessageDlg = null;
+
+        try
+        {
+
+
+            //https://github.com/OPCFoundation/UA-.NETStandard/pull/3113
+
+
+            var typeDict = m_server.MessageContext.Factory.GetValue("m_encodeableTypes") as Dictionary<ExpandedNodeId, Type>;
+            typeDict.Clear();
+            m_server.MessageContext.Factory.TryDispose();
+
+            typeof(EncodeableFactory).GetField("s_globalFactory", BindingFlags.NonPublic | BindingFlags.Static)?.SetValue(null, new EncodeableFactory());
+            typeof(ServiceMessageContext).GetField("s_globalContext", BindingFlags.NonPublic | BindingFlags.Static)?.SetValue(null, typeof(ServiceMessageContext).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null, new Type[] { typeof(bool) }, null).Invoke(new object[] { true }));
+
+
+            var listeners = m_server.GetValue("m_listeners") as List<ITransportListener>;
+            if (listeners != null)
+            {
+                foreach (var item in listeners)
+                {
+                    if (item is TcpTransportListener transportListener)
+                    {
+                        var timer = transportListener.GetValue("m_inactivityDetectionTimer") as IDisposable;
+                        timer?.Dispose();
+                    }
+                }
+            }
+        }
+        catch
+        {
+
+        }
         m_server?.Stop();
         m_server?.NodeManager?.SafeDispose();
         m_server?.SafeDispose();
diff --git a/src/Plugin/ThingsGateway.Plugin.OpcUa/Pages/OpcUaImportVariable.razor.cs b/src/Plugin/ThingsGateway.Plugin.OpcUa/Pages/OpcUaImportVariable.razor.cs
index eb0f80b6a..69ae2e03f 100644
--- a/src/Plugin/ThingsGateway.Plugin.OpcUa/Pages/OpcUaImportVariable.razor.cs
+++ b/src/Plugin/ThingsGateway.Plugin.OpcUa/Pages/OpcUaImportVariable.razor.cs
@@ -19,6 +19,7 @@ using Opc.Ua;
 
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.Common.Extension;
 using ThingsGateway.Extension;
 using ThingsGateway.Foundation.OpcUa;
 
@@ -26,6 +27,7 @@ using ThingsGateway.Foundation.OpcUa;
 
 using ThingsGateway.Gateway.Application;
 using ThingsGateway.Plugin.OpcUa;
+using ThingsGateway.DB;
 
 #endif
 
@@ -308,7 +310,7 @@ public partial class OpcUaImportVariable
                  {
                  }
 
-                 var id = Admin.Application.CommonUtils.GetSingleId();
+                 var id = CommonUtils.GetSingleId();
 
                  variables.Add(new Variable()
                  {
@@ -330,7 +332,7 @@ public partial class OpcUaImportVariable
 
     private Device GetImportDevice(long channelId)
     {
-        var id = Admin.Application.CommonUtils.GetSingleId();
+        var id = CommonUtils.GetSingleId();
         var data = new Device()
         {
             Name = Plc.OpcUaProperty.OpcUrl + "-" + id,
@@ -355,7 +357,7 @@ public partial class OpcUaImportVariable
 
     private Channel GetImportChannel()
     {
-        var id = Admin.Application.CommonUtils.GetSingleId();
+        var id = CommonUtils.GetSingleId();
         var data = new Channel()
         {
             Name = Plc.OpcUaProperty.OpcUrl + "-" + id,
diff --git a/src/Plugin/ThingsGateway.Plugin.OpcUa/Pages/OpcUaMasterRuntimeRazor.razor.cs b/src/Plugin/ThingsGateway.Plugin.OpcUa/Pages/OpcUaMasterRuntimeRazor.razor.cs
index ca8187e53..1d227546a 100644
--- a/src/Plugin/ThingsGateway.Plugin.OpcUa/Pages/OpcUaMasterRuntimeRazor.razor.cs
+++ b/src/Plugin/ThingsGateway.Plugin.OpcUa/Pages/OpcUaMasterRuntimeRazor.razor.cs
@@ -14,6 +14,7 @@ using BootstrapBlazor.Components;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 
+using ThingsGateway.Common;
 using ThingsGateway.Razor;
 
 namespace ThingsGateway.Plugin.OpcUa
diff --git a/src/Plugin/ThingsGateway.Plugin.SiemensS7/Pages/SiemensS7AddressComponent.razor.cs b/src/Plugin/ThingsGateway.Plugin.SiemensS7/Pages/SiemensS7AddressComponent.razor.cs
index 66f3c1473..e96f25048 100644
--- a/src/Plugin/ThingsGateway.Plugin.SiemensS7/Pages/SiemensS7AddressComponent.razor.cs
+++ b/src/Plugin/ThingsGateway.Plugin.SiemensS7/Pages/SiemensS7AddressComponent.razor.cs
@@ -15,6 +15,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Localization;
 
+using ThingsGateway.Common;
 using ThingsGateway.Foundation;
 using ThingsGateway.Foundation.SiemensS7;
 using ThingsGateway.Razor;
diff --git a/src/ThingsGateway.OnlyApi/Program.cs b/src/ThingsGateway.OnlyApi/Program.cs
deleted file mode 100644
index 8699a2db0..000000000
--- a/src/ThingsGateway.OnlyApi/Program.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://thingsgateway.cn/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-
-using Microsoft.AspNetCore.ResponseCompression;
-
-using System.Runtime.InteropServices;
-using System.Text;
-
-using ThingsGateway.Admin.Application;
-using ThingsGateway.NewLife.Log;
-using ThingsGateway.SqlSugar;
-
-namespace ThingsGateway.Server;
-
-public class Program
-{
-    private static readonly string[] second = new[] { "application/octet-stream" };
-
-    public static async Task Main(string[] args)
-    {
-        await Task.Delay(2000).ConfigureAwait(false);
-        //当前工作目录设为程序集的基目录
-        System.IO.Directory.SetCurrentDirectory(AppContext.BaseDirectory);
-        // 增加中文编码支持
-        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-
-        ThingsGateway.Admin.Application.ClaimConst.Scheme = $"{typeof(Program).Assembly.GetName().Name}{SchemeHelper.GetOrCreate()}";
-
-        #region 控制台输出Logo
-
-        Console.Write(Environment.NewLine);
-        Console.ForegroundColor = ConsoleColor.Yellow;
-        XTrace.WriteLine(string.Empty);
-        XTrace.UseConsole();
-        Console.WriteLine(
-            """
-
-               _______  _      _                      _____         _
-              |__   __|| |    (_)                    / ____|       | |
-                 | |   | |__   _  _ __    __ _  ___ | |  __   __ _ | |_  ___ __      __ __ _  _   _
-                 | |   | '_ \ | || '_ \  / _` |/ __|| | |_ | / _` || __|/ _ \\ \ /\ / // _` || | | |
-                 | |   | | | || || | | || (_| |\__ \| |__| || (_| || |_|  __/ \ V  V /| (_| || |_| |
-                 |_|   |_| |_||_||_| |_| \__, ||___/ \_____| \__,_| \__|\___|  \_/\_/  \__,_| \__, |
-                                          __/ |                                                __/ |
-                                         |___/                                                |___/
-
-            """
-         );
-        Console.ResetColor();
-
-        #endregion 控制台输出Logo
-
-
-        await Serve.RunAsync(RunOptions.Default.ConfigureFirstActionBuilder(builder =>
-        {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                builder.Host.UseWindowsService();
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                builder.Host.UseSystemd();
-
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                builder.Logging.ClearProviders(); //去除默认的事件日志提供者，某些情况下会日志输出异常，导致程序崩溃
-
-        }).ConfigureBuilder(builder =>
-        {
-
-            if (!builder.Environment.IsDevelopment())
-            {
-                builder.Services.AddResponseCompression(
-                    opts =>
-                    {
-                        opts.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(second);
-                    });
-            }
-
-            builder.WebHost.UseWebRoot("wwwroot");
-            builder.WebHost.UseStaticWebAssets();
-            // 设置接口超时时间和上传大小-Kestrel
-            builder.WebHost.ConfigureKestrel(u =>
-            {
-                u.Limits.KeepAliveTimeout = TimeSpan.FromMinutes(30);
-                u.Limits.RequestHeadersTimeout = TimeSpan.FromMinutes(30);
-                u.Limits.MaxRequestBodySize = null;
-            });
-
-
-
-        })
-        .Configure(app =>
-        {
-            ReflectionInoHelper.RemoveAllCache();
-            InstanceFactory.RemoveCache();
-        })
-                  ).ConfigureAwait(false);
-
-        await Task.Delay(2000).ConfigureAwait(false);
-    }
-
-}
diff --git a/src/ThingsGateway.OnlyApi/Properties/launchSettings.json b/src/ThingsGateway.OnlyApi/Properties/launchSettings.json
deleted file mode 100644
index c3a1845f8..000000000
--- a/src/ThingsGateway.OnlyApi/Properties/launchSettings.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://*:5000"
-    },
-    "demo": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Demo"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://*:5000"
-    },
-    "PostgreSQL": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "PostgreSQL "
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://*:5000"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  },
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://*:59494/",
-      "sslPort": 44372
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/ThingsGateway.OnlyApi/Startup.cs b/src/ThingsGateway.OnlyApi/Startup.cs
deleted file mode 100644
index 8e438c8d1..000000000
--- a/src/ThingsGateway.OnlyApi/Startup.cs
+++ /dev/null
@@ -1,372 +0,0 @@
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://thingsgateway.cn/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.DataProtection;
-using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
-using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
-using Microsoft.AspNetCore.HttpOverrides;
-using Microsoft.AspNetCore.StaticFiles;
-using Microsoft.Extensions.Options;
-
-using Newtonsoft.Json;
-
-using System.Security.Cryptography.X509Certificates;
-using System.Text.Encodings.Web;
-using System.Text.Unicode;
-
-using ThingsGateway.Admin.Application;
-using ThingsGateway.Admin.Razor;
-using ThingsGateway.Razor;
-using ThingsGateway.VirtualFileServer;
-
-namespace ThingsGateway.Server;
-
-[AppStartup(-99999)]
-public class Startup : AppStartup
-{
-    public void ConfigBlazorServer(IServiceCollection services)
-    {
-
-        // 增加中文编码支持网页源码显示汉字
-        services.AddSingleton(HtmlEncoder.Create(UnicodeRanges.All));
-        //并发启动/停止host
-        services.Configure<HostOptions>(options =>
-        {
-            options.ServicesStartConcurrently = true;
-            options.ServicesStopConcurrently = true;
-        });
-
-        //// 事件总线
-        //services.AddEventBus(options =>
-        //{
-
-        //});
-
-        // 任务调度
-        services.AddSchedule(options =>
-        {
-            options.AddPersistence<JobPersistence>();
-        });
-
-
-
-        // 允许跨域
-        services.AddCorsAccessor();
-
-        // 
-        //services.AddRazorPages();
-
-        // Json序列化设置
-        static void SetNewtonsoftJsonSetting(JsonSerializerSettings setting)
-        {
-            setting.DateFormatHandling = DateFormatHandling.IsoDateFormat;
-            setting.DateTimeZoneHandling = DateTimeZoneHandling.Local;
-            // setting.Converters.AddDateTimeTypeConverters(localized: true); // 时间本地化
-            //setting.DateFormatString = "yyyy-MM-dd HH:mm:ss"; // 时间格式化
-            setting.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; // 忽略循环引用
-
-            // setting.ContractResolver = new CamelCasePropertyNamesContractResolver(); // 解决动态对象属性名大写
-            setting.NullValueHandling = NullValueHandling.Ignore; // 忽略空值
-            // setting.Converters.AddLongTypeConverters(); // long转string（防止js精度溢出） 超过17位开启
-            // setting.MetadataPropertyHandling = MetadataPropertyHandling.Ignore; // 解决DateTimeOffset异常
-            // setting.DateParseHandling = DateParseHandling.None; // 解决DateTimeOffset异常
-            // setting.Converters.Add(new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }); // 解决DateTimeOffset异常
-        }
-        ;
-
-        services.AddMvcFilter<RequestAuditFilter>();
-
-        services.AddControllers()
-            .AddNewtonsoftJson(options => SetNewtonsoftJsonSetting(options.SerializerSettings))
-            //.AddXmlSerializerFormatters()
-            //.AddXmlDataContractSerializerFormatters()
-            .AddInjectWithUnifyResult<UnifyResultProvider>();
-
-
-#if NET8_0_OR_GREATER
-        services
-         .AddRazorComponents(options =>
-     {
-         options.TemporaryRedirectionUrlValidityDuration = TimeSpan.FromMinutes(10);
-     })
-         .AddInteractiveServerComponents(options =>
-         {
-             options.RootComponents.MaxJSRootComponents = 500;
-             options.JSInteropDefaultCallTimeout = TimeSpan.FromMinutes(2);
-             options.MaxBufferedUnacknowledgedRenderBatches = 20;
-             options.DisconnectedCircuitRetentionPeriod = TimeSpan.FromMinutes(10);
-         })
-         .AddHubOptions(options =>
-         {
-             //单个传入集线器消息的最大大小。默认 32 KB
-             options.MaximumReceiveMessageSize = 32 * 1024 * 1024;
-             //可为客户端上载流缓冲的最大项数。 如果达到此限制，则会阻止处理调用，直到服务器处理流项。
-             options.StreamBufferCapacity = 30;
-             options.ClientTimeoutInterval = TimeSpan.FromMinutes(2);
-             options.KeepAliveInterval = TimeSpan.FromSeconds(15);
-             options.HandshakeTimeout = TimeSpan.FromSeconds(30);
-         });
-
-#else
-
-        services.AddServerSideBlazor(options =>
-        {
-            options.RootComponents.MaxJSRootComponents = 500;
-            options.JSInteropDefaultCallTimeout = TimeSpan.FromMinutes(2);
-            options.MaxBufferedUnacknowledgedRenderBatches = 20;
-            options.DisconnectedCircuitRetentionPeriod = TimeSpan.FromMinutes(10);
-        }).AddHubOptions(options =>
-        {
-            //单个传入集线器消息的最大大小。默认 32 KB
-            options.MaximumReceiveMessageSize = 32 * 1024 * 1024;
-            //可为客户端上载流缓冲的最大项数。 如果达到此限制，则会阻止处理调用，直到服务器处理流项。
-            options.StreamBufferCapacity = 30;
-            options.ClientTimeoutInterval = TimeSpan.FromMinutes(2);
-            options.KeepAliveInterval = TimeSpan.FromSeconds(15);
-            options.HandshakeTimeout = TimeSpan.FromSeconds(30);
-        });
-
-#endif
-
-        // 配置Nginx转发获取客户端真实IP
-        // 注1：如果负载均衡不是在本机通过 Loopback 地址转发请求的，一定要加上options.KnownNetworks.Clear()和options.KnownProxies.Clear()
-        // 注2：如果设置环境变量 ASPNETCORE_FORWARDEDHEADERS_ENABLED 为 True，则不需要下面的配置代码
-        services.Configure<ForwardedHeadersOptions>(options =>
-        {
-            options.ForwardedHeaders = ForwardedHeaders.All;
-            options.KnownNetworks.Clear();
-            options.KnownProxies.Clear();
-        });
-
-
-
-        #region api日志
-
-        //Monitor日志配置
-        //services.AddMonitorLogging(options =>
-        //{
-        //    options.JsonIndented = true;// 是否美化 JSON
-        //    options.GlobalEnabled = false;//全局启用
-        //    options.ConfigureLogger((logger, logContext, context) =>
-        //    {
-        //        var httpContext = context.HttpContext;//获取httpContext
-
-        //        //获取客户端信息
-        //        var userAgent = App.GetService<IAppService>().UserAgent;
-        //        // 获取控制器/操作描述器
-        //        var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
-        //        //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
-        //        var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
-
-        //        var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
-        //        //获取特性
-        //        option = desc.Value;//则将操作名称赋值为控制器上写的title
-
-        //        logContext.Set(LoggingConst.CateGory, option);//传操作名称
-        //        logContext.Set(LoggingConst.Operation, option);//传操作名称
-        //        logContext.Set(LoggingConst.Client, userAgent);//客户端信息
-        //        logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
-        //        logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
-        //    });
-        //});
-
-
-
-        #endregion api日志
-
-        //已添加AddOptions
-        // 增加多语言支持配置信息
-        services.AddRequestLocalization<IOptionsMonitor<BootstrapBlazor.Components.BootstrapBlazorOptions>>((localizerOption, blazorOption) =>
-        {
-            blazorOption.OnChange(op => Invoke(op));
-            Invoke(blazorOption.CurrentValue);
-
-            void Invoke(BootstrapBlazor.Components.BootstrapBlazorOptions option)
-            {
-                var supportedCultures = option.GetSupportedCultures();
-                localizerOption.SupportedCultures = supportedCultures;
-                localizerOption.SupportedUICultures = supportedCultures;
-            }
-        });
-
-        services.AddScoped<BlazorAppContext>(a =>
-        {
-            var appContext = new BlazorAppContext(
-             a.GetService<ISysResourceService>(),
-             a.GetService<IUserCenterService>(),
-             a.GetService<ISysUserService>());
-            //appContext.TitleLocalizer = a.GetRequiredService<IStringLocalizer<MainLayout>>();
-
-            return appContext;
-        });
-
-        services.AddHttpContextAccessor();
-
-        //添加cookie授权
-        var authenticationBuilder = services.AddAuthentication(ClaimConst.Scheme).AddCookie(ClaimConst.Scheme, a =>
-        {
-            a.AccessDeniedPath = "/Account/AccessDenied/";
-            a.LogoutPath = "/Account/Logout/";
-            a.LoginPath = "/Account/Login/";
-        });
-
-        var websiteOptions = App.GetOptions<WebsiteOptions>()!;
-        if (websiteOptions.Demo)
-        {
-            authenticationBuilder.AddOAuth<GiteeOAuthOptions, AdminOAuthHandler<GiteeOAuthOptions>>("Gitee", "Gitee", options =>
-        {
-            var data = App.GetConfig<GiteeOAuthSettings>("GiteeOAuthSettings");
-            options.ClientId = data.ClientId;
-            options.ClientSecret = data.ClientSecret;
-
-        });
-        }
-
-        // 添加jwt授权
-        authenticationBuilder.AddJwt();
-
-        services.AddAuthorization();
-#if NET8_0_OR_GREATER
-        services.AddCascadingAuthenticationState();
-#endif
-        services.AddAuthorizationCore();
-        services.AddScoped<IAuthorizationHandler, BlazorServerAuthenticationHandler>();
-        services.AddScoped<AuthenticationStateProvider, BlazorServerAuthenticationStateProvider>();
-
-
-#if NET9_0_OR_GREATER
-        var certificate = X509CertificateLoader.LoadPkcs12FromFile("ThingsGateway.pfx", "ThingsGateway", X509KeyStorageFlags.EphemeralKeySet);
-#else
-        var certificate = new X509Certificate2("ThingsGateway.pfx", "ThingsGateway", X509KeyStorageFlags.EphemeralKeySet);
-#endif
-        services.AddDataProtection()
-            .PersistKeysToFileSystem(new DirectoryInfo("Keys"))
-            .ProtectKeysWithCertificate(certificate)
-            .UseCryptographicAlgorithms(new AuthenticatedEncryptorConfiguration
-            {
-                EncryptionAlgorithm = EncryptionAlgorithm.AES_256_CBC,
-                ValidationAlgorithm = ValidationAlgorithm.HMACSHA256
-            });
-    }
-
-
-
-    public void Use(IApplicationBuilder applicationBuilder, IWebHostEnvironment env)
-    {
-        var app = (WebApplication)applicationBuilder;
-        app.UseForwardedHeaders(new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.All, KnownNetworks = { }, KnownProxies = { } });
-
-        app.UseBootstrapBlazor();
-
-
-        // 启用本地化
-        var option = app.Services.GetService<IOptions<RequestLocalizationOptions>>();
-        if (option != null)
-        {
-            app.UseRequestLocalization(option.Value);
-        }
-
-        // 任务调度看板
-        app.UseScheduleUI(options =>
-        {
-            options.RequestPath = "/schedule";  // 必须以 / 开头且不以 / 结尾
-            options.DisableOnProduction = true; // 生产环境关闭
-            options.DisplayEmptyTriggerJobs = true; // 是否显示空作业触发器的作业
-            options.DisplayHead = false; // 是否显示页头
-            options.DefaultExpandAllJobs = false; // 是否默认展开所有作业
-        });
-
-        if (env.IsDevelopment())
-        {
-            app.UseDeveloperExceptionPage();
-        }
-        else
-        {
-            app.UseExceptionHandler("/Error");
-            app.UseResponseCompression();
-            app.UseStaticFiles(new StaticFileOptions { OnPrepareResponse = ctx => ctx.ProcessCache(app.Configuration) });
-        }
-
-
-        app.UseStaticFiles(new StaticFileOptions
-        {
-            OnPrepareResponse = (stf) =>
-            {
-                stf.ProcessCache(app.Configuration);
-                stf.Context.Response.Headers.AccessControlAllowOrigin = "*";
-                stf.Context.Response.Headers.AccessControlAllowHeaders = "*";
-            }
-        });
-        var provider = new FileExtensionContentTypeProvider();
-        provider.Mappings[".properties"] = "application/octet-stream";
-        provider.Mappings[".moc"] = "application/x-msdownload";
-        provider.Mappings[".moc3"] = "application/x-msdownload";
-        provider.Mappings[".mtn"] = "application/x-msdownload";
-
-        app.UseStaticFiles(new StaticFileOptions { ContentTypeProvider = provider });
-        app.UseStaticFiles();
-
-        // 特定文件类型（文件后缀）处理
-        var contentTypeProvider = FS.GetFileExtensionContentTypeProvider();
-        // contentTypeProvider.Mappings[".文件后缀"] = "MIME 类型";
-        app.UseStaticFiles(new StaticFileOptions
-        {
-            ContentTypeProvider = contentTypeProvider
-        });
-
-        //// 启用HTTPS
-        //app.UseHttpsRedirection();
-
-
-        // 添加状态码拦截中间件
-        app.UseUnifyResultStatusCodes();
-
-        // 路由注册
-        app.UseRouting();
-
-        // 启用跨域，必须在 UseRouting 和 UseAuthentication 之间注册
-        app.UseCorsAccessor();
-
-        // 启用鉴权授权
-        app.UseAuthentication();
-        app.UseAuthorization();
-
-        // 任务调度看板
-        app.UseScheduleUI(options =>
-        {
-            options.RequestPath = "/schedule";  // 必须以 / 开头且不以 / 结尾
-            options.DisableOnProduction = true; // 生产环境关闭
-            options.DisplayEmptyTriggerJobs = true; // 是否显示空作业触发器的作业
-            options.DisplayHead = false; // 是否显示页头
-            options.DefaultExpandAllJobs = false; // 是否默认展开所有作业
-        });
-
-        app.UseInject();
-
-#if NET8_0_OR_GREATER
-        app.UseAntiforgery();
-#endif
-        app.MapControllers();
-        app.MapHubs();
-
-        if (env.IsDevelopment())
-        {
-            app.MapGet("/", context =>
-    {
-        context.Response.Redirect("/api/index.html");
-        return Task.CompletedTask;
-    });
-        }
-    }
-
-
-}
diff --git a/src/ThingsGateway.OnlyApi/ThingsGateway.OnlyApi.csproj b/src/ThingsGateway.OnlyApi/ThingsGateway.OnlyApi.csproj
deleted file mode 100644
index 249d9be44..000000000
--- a/src/ThingsGateway.OnlyApi/ThingsGateway.OnlyApi.csproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-	<Import Project="..\Version.props" />
-
-
-	<ItemGroup Condition=" '$(SolutionName)' != 'ThingsGatewayRelease' ">
-		<ProjectReference Include="..\Gateway\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj" />
-		<ProjectReference Include="..\Gateway\ThingsGateway.Gateway.Razor\ThingsGateway.Gateway.Razor.csproj" />
-		<ProjectReference Include="..\Admin\ThingsGateway.Photino.Blazor\ThingsGateway.Photino.Blazor.csproj" />
-
-	</ItemGroup>
-
-
-	<!--发布版-->
-	<Import Project="..\ThingsGateway.Server\targets\Gateway.targets" Condition=" '$(SolutionName)' == 'ThingsGatewayRelease' " />
-	<Import Project="..\ThingsGateway.Server\targets\Admin.targets" Condition=" '$(SolutionName)' == 'ThingsGatewayRelease' " />
-	<!--nuget包解压复制文件，上下文动态加载，网关管理和网关冗余-->
-	<Import Project="..\ThingsGateway.Server\targets\GatewayOther.targets" Condition=" '$(SolutionName)' == 'ThingsGatewayRelease' " />
-
-	<ItemGroup Condition=" '$(SolutionName)' == 'ThingsGatewayRelease' ">
-		<PackageReference Include="ThingsGateway.Photino.Blazor" Version="$(Version)" />
-	</ItemGroup>
-
-
-	<!--nuget包解压复制文件，上下文动态加载-->
-	<Import Project="..\ThingsGateway.Server\targets\PluginContext.targets" Condition=" '$(SolutionName)' != 'ThingsGatewayPro' AND  '$(Configuration)' != 'Debug' " />
-	<!--直接引用-->
-	<Import Project="..\ThingsGateway.Server\targets\PluginDebug.targets" Condition=" '$(SolutionName)' != 'ThingsGatewayPro' AND '$(Configuration)' == 'Debug' " />
-
-	<!--直接引用Pro-->
-	<Import Project="..\ThingsGateway.Server\targets\PluginDebug.targets" Condition=" '$(SolutionName)' == 'ThingsGatewayPro' AND '$(Configuration)' == 'Debug'" />
-	<Import Project="..\ThingsGateway.Server\targets\PluginContext.targets" Condition=" '$(SolutionName)' == 'ThingsGatewayPro' AND  '$(Configuration)' != 'Debug' " />
-
-	<!--nuget包解压复制文件，插件域隔离动态加载-->
-	<!--<Import Project="targets\Plugin.targets" />-->
-
-	<!--nuget包解压复制文件，上下文动态加载，Pro插件-->
-	<Import Project="..\ThingsGateway.Server\targets\Pro2.targets" Condition=" '$(SolutionName)' != 'ThingsGatewayPro' OR  '$(Configuration)' != 'Debug'" />
-
-
-
-	<Import Project="..\ThingsGateway.Server\targets\ProPluginDebug.targets" Condition=" '$(SolutionName)' == 'ThingsGatewayPro' AND '$(Configuration)' == 'Debug'" />
-
-	<!--打包复制-->
-	<Import Project="..\ThingsGateway.Server\targets\PluginPublish.targets" />
-
-	<PropertyGroup>
-		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
-		<CustomTargetFramework>$(TargetFramework)</CustomTargetFramework>
-		<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
-		<SatelliteResourceLanguages>zh-Hans;en-US</SatelliteResourceLanguages>
-		<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
-		<ApplicationIcon>favicon.ico</ApplicationIcon>
-
-		<!--动态适用GC-->
-		<GarbageCollectionAdaptationMode>1</GarbageCollectionAdaptationMode>
-
-		<CETCompat>false</CETCompat>
-		<!--<TieredCompilation>false</TieredCompilation>-->
-
-		<!--使用自托管线程池-->
-		<!--<UseWindowsThreadPool>false</UseWindowsThreadPool> -->
-
-		<!--使用工作站GC-->
-		<!--<ServerGarbageCollection>true</ServerGarbageCollection>-->
-
-		<!--<PlatformTarget>x86</PlatformTarget>-->
-	</PropertyGroup>
-
-
-	<!--安装服务守护-->
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-
-		<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.1" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
-	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-		<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="$(NET9Version)" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="$(NET9Version)" />
-	</ItemGroup>
-
-	<ItemGroup>
-
-		<Compile Include="..\ThingsGateway.Server\Program\SingleFilePublish.cs" Link="Program\SingleFilePublish.cs" />
-
-
-		<Content Include="..\ThingsGateway.Server\ThingsGateway.pfx" Link="ThingsGateway.pfx">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-
-
-		<Content Include="..\ThingsGateway.Server\wwwroot\favicon.ico" Link="wwwroot\favicon.ico" />
-		<Content Include="..\ThingsGateway.Server\wwwroot\favicon.png" Link="wwwroot\favicon.png" />
-		<Content Include="..\ThingsGateway.Server\appsettings.Development.json" Link="appsettings.Development.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="..\ThingsGateway.Server\appsettings.json" Link="appsettings.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-
-		<Content Include="..\ThingsGateway.Server\Configuration\*" LinkBase="Configuration">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-
-		<EmbeddedResource Include="..\ThingsGateway.Server\Locales\en-US.json" Link="Locales\en-US.json" />
-		<EmbeddedResource Include="..\ThingsGateway.Server\Locales\zh-CN.json" Link="Locales\zh-CN.json" />
-
-
-		<Content Update="wwwroot\**">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
-
-
-</Project>
diff --git a/src/ThingsGateway.OnlyApi/favicon.ico b/src/ThingsGateway.OnlyApi/favicon.ico
deleted file mode 100644
index d5a4939b2..000000000
Binary files a/src/ThingsGateway.OnlyApi/favicon.ico and /dev/null differ
diff --git a/src/ThingsGateway.Photino/Startup.cs b/src/ThingsGateway.Photino/Startup.cs
index 67b458f55..a86110c88 100644
--- a/src/ThingsGateway.Photino/Startup.cs
+++ b/src/ThingsGateway.Photino/Startup.cs
@@ -30,8 +30,9 @@ using System.Text.Unicode;
 
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
+using ThingsGateway.DB;
 using ThingsGateway.Debug;
-using ThingsGateway.Gateway.Application;
+using ThingsGateway.Gateway.Razor;
 using ThingsGateway.VirtualFileServer;
 
 namespace ThingsGateway.Server;
diff --git a/src/ThingsGateway.Server/Configuration/App.Development.json b/src/ThingsGateway.Server/Configuration/App.Development.json
index c30cd4748..357540550 100644
--- a/src/ThingsGateway.Server/Configuration/App.Development.json
+++ b/src/ThingsGateway.Server/Configuration/App.Development.json
@@ -14,6 +14,7 @@
       "ThingsGateway.SqlSugar",
       "ThingsGateway.Admin.Application",
       "ThingsGateway.Admin.Razor",
+      "ThingsGateway.Common",
       "ThingsGateway.DB",
       "ThingsGateway.Gateway.Application",
       "ThingsGateway.Gateway.Razor",
diff --git a/src/ThingsGateway.Server/Configuration/App.json b/src/ThingsGateway.Server/Configuration/App.json
index b565a3d81..ea6483ecb 100644
--- a/src/ThingsGateway.Server/Configuration/App.json
+++ b/src/ThingsGateway.Server/Configuration/App.json
@@ -14,6 +14,7 @@
       "ThingsGateway.SqlSugar",
       "ThingsGateway.Admin.Application",
       "ThingsGateway.Admin.Razor",
+      "ThingsGateway.Common",
       "ThingsGateway.DB",
       "ThingsGateway.Gateway.Application",
       "ThingsGateway.Gateway.Razor",
diff --git a/src/ThingsGateway.Server/Configuration/Website.Demo.json b/src/ThingsGateway.Server/Configuration/Website.Demo.json
index fa304f99a..f91c6fcf9 100644
--- a/src/ThingsGateway.Server/Configuration/Website.Demo.json
+++ b/src/ThingsGateway.Server/Configuration/Website.Demo.json
@@ -9,6 +9,7 @@
     "QQGroup1Number": "605534569",
     "Title": "ThingsGateway",
     "Demo": true,
-    "ShowAuthorize": true
+    "ShowAuthorize": true,
+    "WebPageEnable": true
   }
 }
\ No newline at end of file
diff --git a/src/ThingsGateway.Server/Configuration/Website.PostgreSQL .json b/src/ThingsGateway.Server/Configuration/Website.PostgreSQL .json
index cfb1f9cd5..6dee73f59 100644
--- a/src/ThingsGateway.Server/Configuration/Website.PostgreSQL .json	
+++ b/src/ThingsGateway.Server/Configuration/Website.PostgreSQL .json	
@@ -9,6 +9,7 @@
     "QQGroup1Number": "605534569",
     "Title": "ThingsGateway",
     "Demo": false,
-    "ShowAuthorize": true
+    "ShowAuthorize": true,
+    "WebPageEnable": true
   }
 }
\ No newline at end of file
diff --git a/src/ThingsGateway.Server/Configuration/Website.json b/src/ThingsGateway.Server/Configuration/Website.json
index cfb1f9cd5..6dee73f59 100644
--- a/src/ThingsGateway.Server/Configuration/Website.json
+++ b/src/ThingsGateway.Server/Configuration/Website.json
@@ -9,6 +9,7 @@
     "QQGroup1Number": "605534569",
     "Title": "ThingsGateway",
     "Demo": false,
-    "ShowAuthorize": true
+    "ShowAuthorize": true,
+    "WebPageEnable": true
   }
 }
\ No newline at end of file
diff --git a/src/ThingsGateway.Server/Layout/Login.razor b/src/ThingsGateway.Server/Layout/Login.razor
index 58f8764fa..452b9c735 100644
--- a/src/ThingsGateway.Server/Layout/Login.razor
+++ b/src/ThingsGateway.Server/Layout/Login.razor
@@ -6,6 +6,7 @@
 @using ThingsGateway.Admin.Razor
 @using ThingsGateway.Extension;
 @using ThingsGateway.Razor
+@using ThingsGateway.Common.Extension;
 
 <div class="login h-100">
     @* 左侧说明 *@
diff --git a/src/ThingsGateway.Server/Layout/Login.razor.cs b/src/ThingsGateway.Server/Layout/Login.razor.cs
index e9ad73633..685eded4e 100644
--- a/src/ThingsGateway.Server/Layout/Login.razor.cs
+++ b/src/ThingsGateway.Server/Layout/Login.razor.cs
@@ -19,6 +19,8 @@ using Microsoft.Extensions.Options;
 using System.Diagnostics.CodeAnalysis;
 
 using ThingsGateway.Admin.Application;
+using ThingsGateway.Admin.Razor;
+using ThingsGateway.Common;
 using ThingsGateway.DataEncryption;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.Razor;
diff --git a/src/ThingsGateway.Server/Layout/MainLayout.razor b/src/ThingsGateway.Server/Layout/MainLayout.razor
index ac1256dfd..6165a070a 100644
--- a/src/ThingsGateway.Server/Layout/MainLayout.razor
+++ b/src/ThingsGateway.Server/Layout/MainLayout.razor
@@ -17,6 +17,8 @@
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.Extensions.Localization
+@using ThingsGateway.DB;
+@using ThingsGateway.Common.Extension;
 
 @using System.ComponentModel
 @using System.ComponentModel.DataAnnotations
diff --git a/src/ThingsGateway.Server/Layout/MainLayout.razor.cs b/src/ThingsGateway.Server/Layout/MainLayout.razor.cs
index ba6503d2d..34e2255d3 100644
--- a/src/ThingsGateway.Server/Layout/MainLayout.razor.cs
+++ b/src/ThingsGateway.Server/Layout/MainLayout.razor.cs
@@ -19,6 +19,7 @@ using System.Diagnostics.CodeAnalysis;
 
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
+using ThingsGateway.Common;
 using ThingsGateway.Gateway.Razor;
 using ThingsGateway.Razor;
 
diff --git a/src/ThingsGateway.Server/Program/Program.cs b/src/ThingsGateway.Server/Program/Program.cs
index cb4c2a977..8f088c544 100644
--- a/src/ThingsGateway.Server/Program/Program.cs
+++ b/src/ThingsGateway.Server/Program/Program.cs
@@ -14,6 +14,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 
 using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 using ThingsGateway.NewLife.Log;
 using ThingsGateway.SqlSugar;
 
@@ -31,7 +32,7 @@ public class Program
         // 增加中文编码支持
         Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
-        ThingsGateway.Admin.Application.ClaimConst.Scheme = $"{typeof(Program).Assembly.GetName().Name}{SchemeHelper.GetOrCreate()}";
+        ClaimConst.Scheme = $"{typeof(Program).Assembly.GetName().Name}{SchemeHelper.GetOrCreate()}";
 
         #region 控制台输出Logo
 
diff --git a/src/ThingsGateway.Server/Program/SingleFilePublish.cs b/src/ThingsGateway.Server/Program/SingleFilePublish.cs
index 52f74f5c9..93d9bbbbb 100644
--- a/src/ThingsGateway.Server/Program/SingleFilePublish.cs
+++ b/src/ThingsGateway.Server/Program/SingleFilePublish.cs
@@ -40,6 +40,7 @@ public class SingleFilePublish : ISingleFilePublish
             "ThingsGateway.NewLife.X",
             "ThingsGateway.Razor",
             "ThingsGateway.Admin.Razor"   ,
+            "ThingsGateway.Common",
              "ThingsGateway.DB",
             "ThingsGateway.Admin.Application",
             "ThingsGateway.SqlSugar",
diff --git a/src/ThingsGateway.Server/Program/Startup.cs b/src/ThingsGateway.Server/Program/Startup.cs
index 804b61e85..73c0dd31f 100644
--- a/src/ThingsGateway.Server/Program/Startup.cs
+++ b/src/ThingsGateway.Server/Program/Startup.cs
@@ -26,7 +26,8 @@ using System.Text.Unicode;
 
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
-using ThingsGateway.Razor;
+using ThingsGateway.Common;
+using ThingsGateway.DB;
 using ThingsGateway.VirtualFileServer;
 
 namespace ThingsGateway.Server;
@@ -333,6 +334,25 @@ public class Startup : AppStartup
 #if NET8_0_OR_GREATER
         app.UseAntiforgery();
 #endif
+        var options = App.GetConfig<WebsiteOptions>("Website");
+        if (!options.WebPageEnable)
+        {
+            // 中间件拦截，返回 403
+            app.Use((context, next) =>
+            {
+                var path = context.Request.Path.Value;
+                if (path?.StartsWith("/_blazor", StringComparison.OrdinalIgnoreCase) == true)
+                {
+                    context.Response.StatusCode = 500;
+                    return Task.CompletedTask;
+                }
+                else
+                {
+                    return next();
+                }
+            });
+        }
+
         app.MapControllers();
         app.MapHubs();
 
diff --git a/src/ThingsGateway.Server/targets/PluginPublish.targets b/src/ThingsGateway.Server/targets/PluginPublish.targets
index 9a6b82e68..384f3c781 100644
--- a/src/ThingsGateway.Server/targets/PluginPublish.targets
+++ b/src/ThingsGateway.Server/targets/PluginPublish.targets
@@ -16,14 +16,14 @@
 	</Target>
 
 
-	<Target Name="RemoveXmlDocs1" AfterTargets="Build">
+	<Target Name="RemoveXmlDocs1" AfterTargets="Build" Condition=" '$(Configuration)' != 'Debug' ">
 		<ItemGroup>
 			<XmlFilesToDelete Include="$(TargetDir)*.xml" />
 		</ItemGroup>
 		<Delete Files="@(XmlFilesToDelete)" />
 	</Target>
 
-	<Target Name="RemoveXmlDocs2" AfterTargets="Publish">
+	<Target Name="RemoveXmlDocs2" AfterTargets="Publish" Condition=" '$(Configuration)' != 'Debug' ">
 		<ItemGroup>
 			<XmlFilesToDelete Include="$(PublishDir)*.xml" />
 		</ItemGroup>
diff --git a/src/ThingsGateway.sln b/src/ThingsGateway.sln
index b9797276f..2415eac32 100644
--- a/src/ThingsGateway.sln
+++ b/src/ThingsGateway.sln
@@ -102,6 +102,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.Blazor.Diagra
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorSetParametersAsyncGenerator", "Admin\BlazorSetParametersAsyncGenerator\BlazorSetParametersAsyncGenerator.csproj", "{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.Common", "Admin\ThingsGateway.Common\ThingsGateway.Common.csproj", "{28579DA6-6976-A674-9011-EA681BE9E1AF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -272,6 +274,10 @@ Global
 		{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28579DA6-6976-A674-9011-EA681BE9E1AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28579DA6-6976-A674-9011-EA681BE9E1AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28579DA6-6976-A674-9011-EA681BE9E1AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28579DA6-6976-A674-9011-EA681BE9E1AF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -316,10 +322,11 @@ Global
 		{317B8159-28B1-49B1-1884-97D1BBDED982} = {72C65578-92A5-4E99-9779-27835B12B32F}
 		{AFC0BEE4-E682-BCED-F631-99707421015A} = {5948EA23-4B42-4C22-A266-2E0AE5FA575F}
 		{4C412EC1-8501-8211-5A57-3CEEE7EEA6B3} = {72C65578-92A5-4E99-9779-27835B12B32F}
+		{28579DA6-6976-A674-9011-EA681BE9E1AF} = {72C65578-92A5-4E99-9779-27835B12B32F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {199B1B96-4F56-4828-9531-813BA02DB282}
-		RESX_Rules = {"EnabledRules":[]}
 		RESX_NeutralResourcesLanguage = zh-Hans
+		RESX_Rules = {"EnabledRules":[]}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Upgrade/ThingsGateway.Upgrade/Pages/GatewayOnlinePage.razor.cs b/src/Upgrade/ThingsGateway.Upgrade/Pages/GatewayOnlinePage.razor.cs
index d5233026e..91d07a332 100644
--- a/src/Upgrade/ThingsGateway.Upgrade/Pages/GatewayOnlinePage.razor.cs
+++ b/src/Upgrade/ThingsGateway.Upgrade/Pages/GatewayOnlinePage.razor.cs
@@ -9,7 +9,7 @@
 //------------------------------------------------------------------------------
 #pragma warning disable CA2007 // 考虑对等待的任务调用 ConfigureAwait
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 
 using TouchSocket.Dmtp;
 
diff --git a/src/Upgrade/ThingsGateway.Upgrade/Services/UpdateZipFileService.cs b/src/Upgrade/ThingsGateway.Upgrade/Services/UpdateZipFileService.cs
index a88b7a1e9..95fa6bca4 100644
--- a/src/Upgrade/ThingsGateway.Upgrade/Services/UpdateZipFileService.cs
+++ b/src/Upgrade/ThingsGateway.Upgrade/Services/UpdateZipFileService.cs
@@ -2,7 +2,7 @@
 
 using System.Text;
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.NewLife.Json.Extension;
 
diff --git a/src/Upgrade/ThingsGateway.Upgrade/Startup.cs b/src/Upgrade/ThingsGateway.Upgrade/Startup.cs
index 1396bf5f4..204741e45 100644
--- a/src/Upgrade/ThingsGateway.Upgrade/Startup.cs
+++ b/src/Upgrade/ThingsGateway.Upgrade/Startup.cs
@@ -14,7 +14,7 @@ using Microsoft.Extensions.Hosting;
 
 using System.Reflection;
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 
 namespace ThingsGateway.Upgrade;
 
diff --git a/src/Upgrade/ThingsGateway.UpgradeServer/Layout/Login.razor b/src/Upgrade/ThingsGateway.UpgradeServer/Layout/Login.razor
index 91c9ab09c..ea2be88ba 100644
--- a/src/Upgrade/ThingsGateway.UpgradeServer/Layout/Login.razor
+++ b/src/Upgrade/ThingsGateway.UpgradeServer/Layout/Login.razor
@@ -5,6 +5,7 @@
 @using ThingsGateway.Admin.Application;
 @using ThingsGateway.Admin.Razor
 @using ThingsGateway.Extension;
+@using ThingsGateway.Common.Extension;
 @using ThingsGateway.Razor
 
 <div class="login h-100">
diff --git a/src/Upgrade/ThingsGateway.UpgradeServer/Layout/Login.razor.cs b/src/Upgrade/ThingsGateway.UpgradeServer/Layout/Login.razor.cs
index 4f3beacad..89b53e49c 100644
--- a/src/Upgrade/ThingsGateway.UpgradeServer/Layout/Login.razor.cs
+++ b/src/Upgrade/ThingsGateway.UpgradeServer/Layout/Login.razor.cs
@@ -18,6 +18,7 @@ using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.Common;
 using ThingsGateway.DataEncryption;
 
 using TouchSocket.Core;
diff --git a/src/Upgrade/ThingsGateway.UpgradeServer/Layout/MainLayout.razor b/src/Upgrade/ThingsGateway.UpgradeServer/Layout/MainLayout.razor
index 533096781..08531d618 100644
--- a/src/Upgrade/ThingsGateway.UpgradeServer/Layout/MainLayout.razor
+++ b/src/Upgrade/ThingsGateway.UpgradeServer/Layout/MainLayout.razor
@@ -17,6 +17,8 @@
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.Extensions.Localization
+@using ThingsGateway.Common.Extension;
+@using ThingsGateway.DB;
 
 @using System.ComponentModel
 @using System.ComponentModel.DataAnnotations
diff --git a/src/Upgrade/ThingsGateway.UpgradeServer/Layout/MainLayout.razor.cs b/src/Upgrade/ThingsGateway.UpgradeServer/Layout/MainLayout.razor.cs
index 5b7b72d7d..7e6816dfb 100644
--- a/src/Upgrade/ThingsGateway.UpgradeServer/Layout/MainLayout.razor.cs
+++ b/src/Upgrade/ThingsGateway.UpgradeServer/Layout/MainLayout.razor.cs
@@ -17,6 +17,8 @@ using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.Common;
+
 namespace ThingsGateway.UpgradeServer;
 
 public partial class MainLayout : IDisposable
diff --git a/src/Upgrade/ThingsGateway.UpgradeServer/Program/Startup.cs b/src/Upgrade/ThingsGateway.UpgradeServer/Program/Startup.cs
index 2288fdaa6..fcb76d95e 100644
--- a/src/Upgrade/ThingsGateway.UpgradeServer/Program/Startup.cs
+++ b/src/Upgrade/ThingsGateway.UpgradeServer/Program/Startup.cs
@@ -24,6 +24,7 @@ using System.Security.Cryptography.X509Certificates;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
 
+using ThingsGateway.DB;
 using ThingsGateway.VirtualFileServer;
 
 namespace ThingsGateway.UpgradeServer;
diff --git a/src/Upgrade/ThingsGateway.UpgradeServer/Program/Startup1.cs b/src/Upgrade/ThingsGateway.UpgradeServer/Program/Startup1.cs
index 40d31e30a..94bc22f78 100644
--- a/src/Upgrade/ThingsGateway.UpgradeServer/Program/Startup1.cs
+++ b/src/Upgrade/ThingsGateway.UpgradeServer/Program/Startup1.cs
@@ -10,6 +10,8 @@
 
 using System.Reflection;
 
+using ThingsGateway.DB;
+
 namespace ThingsGateway.Upgrade;
 
 [AppStartup(100000000)]
diff --git a/src/Upgrade/ThingsGateway.UpgradeServer/SeedData/SysRelationSeedData.cs b/src/Upgrade/ThingsGateway.UpgradeServer/SeedData/SysRelationSeedData.cs
index 3706d9c44..9d9aa7b3b 100644
--- a/src/Upgrade/ThingsGateway.UpgradeServer/SeedData/SysRelationSeedData.cs
+++ b/src/Upgrade/ThingsGateway.UpgradeServer/SeedData/SysRelationSeedData.cs
@@ -8,6 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using ThingsGateway.DB;
+
 namespace ThingsGateway.Upgrade;
 
 /// <summary>
diff --git a/src/Upgrade/ThingsGateway.UpgradeServer/SeedData/SysResourceSeedData.cs b/src/Upgrade/ThingsGateway.UpgradeServer/SeedData/SysResourceSeedData.cs
index 216963156..47624558f 100644
--- a/src/Upgrade/ThingsGateway.UpgradeServer/SeedData/SysResourceSeedData.cs
+++ b/src/Upgrade/ThingsGateway.UpgradeServer/SeedData/SysResourceSeedData.cs
@@ -8,6 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using ThingsGateway.DB;
+
 namespace ThingsGateway.Upgrade;
 
 /// <summary>