更新依赖库

fix: opcuaserver添加变量属性出现错误，已回退
refactor: 网关监控树节点保持展开状态
refactor: cache插件类日志输出

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;
 

src/Admin/ThingsGateway.Admin.Application/Const/CacheConst.cs

@@ -33,22 +33,22 @@ public static class CacheConst
     /// <summary>
     /// 资源表缓存Key
     /// </summary>
-    public const string Cache_SysResource = $"{CacheConst.Cache_Prefix_Admin}SysResource:";
+    public const string Cache_SysResource = $"{CacheConst.Cache_Prefix_Admin}SysResource:List";
 
     /// <summary>
     /// 角色表缓存Key
     /// </summary>
-    public const string Cache_SysRole = $"{CacheConst.Cache_Prefix_Admin}SysRole:";
+    public const string Cache_SysRole = $"{CacheConst.Cache_Prefix_Admin}SysRole:List";
 
     /// <summary>
     /// 用户表缓存Key
     /// </summary>
-    public const string Cache_SysUser = $"{CacheConst.Cache_Prefix_Admin}SysUser:";
+    public const string Cache_SysUser = $"{CacheConst.Cache_Prefix_Admin}SysUser:Hash";
 
     /// <summary>
     /// 用户账号关系缓存Key
     /// </summary>
-    public const string Cache_SysUserAccount = $"{CacheConst.Cache_Prefix_Admin}SysUserAccount:";
+    public const string Cache_SysUserAccount = $"{CacheConst.Cache_Prefix_Admin}SysUserAccount:Hash";
 
     /// <summary>
     /// 职位表缓存Key
@@ -58,7 +58,7 @@ public static class CacheConst
     /// <summary>
     /// 机构表缓存Key
     /// </summary>
-    public const string Cache_SysOrg = $"{CacheConst.Cache_Prefix_Admin}SysOrg:";
+    public const string Cache_SysOrg = $"{CacheConst.Cache_Prefix_Admin}SysOrg:List";
 
     /// <summary>
     /// 公司表缓存Key
@@ -67,12 +67,12 @@ public static class CacheConst
     /// <summary>
     /// 公司表缓存Key
     /// </summary>
-    public const string Cache_SysOrgTenant = $"{CacheConst.Cache_Prefix_Admin}OrgTenant:";
+    public const string Cache_SysOrgTenant = $"{CacheConst.Cache_Prefix_Admin}OrgTenant:Hash";
 
     /// <summary>
     /// Token表缓存Key
     /// </summary>
-    public const string Cache_Token = $"{CacheConst.Cache_Prefix_Admin}Token:";
+    public const string Cache_Token = $"{CacheConst.Cache_Prefix_Admin}Token:Hash";
 
     #region 登录错误次数
 

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 = "字典表")]

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>

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>

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;
 

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

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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>

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>

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;
 

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;
 

src/Admin/ThingsGateway.Admin.Application/Extensions/SchemeHelper.cs

@@ -8,9 +8,30 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-global using System;
-global using System.Collections.Generic;
-global using System.Threading;
-global using System.Threading.Tasks;
+using ThingsGateway.Extension;
 
-global using ThingsGateway.Gateway.Application;
+namespace ThingsGateway.Admin.Application;
+
+/// <inheritdoc/>
+[ThingsGateway.DependencyInjection.SuppressSniffer]
+public static class SchemeHelper
+{
+
+    public static string GetOrCreate()
+    {
+        var path = "Keys/SchemeKey.txt";
+        if (File.Exists(path))
+        {
+            var data = File.ReadAllText(path);
+            return data;
+        }
+        else
+        {
+            var data = DateTime.UtcNow.ToDefaultDateTimeFormat();
+            Directory.CreateDirectory("Keys");
+            File.WriteAllText(path, data);
+            return data;
+        }
+    }
+
+}

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;

src/Admin/ThingsGateway.Admin.Application/GlobalUsings.cs

@@ -8,4 +8,15 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-global using ThingsGateway.NewLife.Extension;
+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;

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;

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;
 
@@ -53,8 +50,8 @@ public class HardwareJob : IJob, IHardwareJob
 
     #endregion 属性
 
-    private MemoryCache MemoryCache = new() { };
-    private const string CacheKey = "HistoryHardwareInfo";
+    private ICache MemoryCache => App.CacheService;
+    private const string CacheKey = $"{CacheConst.Cache_HardwareInfo}HistoryHardwareInfo";
     /// <inheritdoc/>
     public async Task<List<HistoryHardwareInfo>> GetHistoryHardwareInfos()
     {
@@ -81,8 +78,7 @@ public class HardwareJob : IJob, IHardwareJob
             {
                 if (HardwareInfo.MachineInfo == null)
                 {
-                    MachineInfo.Register();
-                    HardwareInfo.MachineInfo = MachineInfo.Current;
+                    HardwareInfo.MachineInfo = MachineInfo.GetCurrent();
 
                     string currentPath = Directory.GetCurrentDirectory();
                     DriveInfo drive = new(Path.GetPathRoot(currentPath));

src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HistoryHardwareInfo.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>

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;
 

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;

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;

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))) //如果当前路由信息不包含在角色授权路由列表中则认证失败

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;

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;
 

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;
 

src/Admin/ThingsGateway.Admin.Application/Services/Dict/ISysDictService.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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;
 

src/Admin/ThingsGateway.Admin.Application/Services/Event/EventService.cs

@@ -10,6 +10,8 @@
 
 using System.Collections.Concurrent;
 
+using ThingsGateway.NewLife.DictionaryExtensions;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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;

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;

src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/ISysOperateLogService.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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

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>

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;
 

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>

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;
 

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;

src/Admin/ThingsGateway.Admin.Application/Services/Resource/ISysResourceService.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

src/Admin/ThingsGateway.Admin.Application/Services/Resource/SysResourceService.cs

@@ -8,14 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using Microsoft.Extensions.DependencyInjection;
 
-using System.Globalization;
-
 using ThingsGateway.FriendlyException;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
@@ -23,7 +18,7 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
 {
     private readonly IRelationService _relationService;
 
-    private string CacheKey = $"{CacheConst.Cache_SysResource}-{CultureInfo.CurrentUICulture.Name}";
+    private string CacheKey = $"{CacheConst.Cache_SysResource}";
 
     public SysResourceService(IRelationService relationService)
     {
@@ -32,7 +27,6 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
 
     #region 增删改查
 
-
     [OperDesc("CopyResource")]
     public async Task CopyAsync(IEnumerable<long> ids, long moduleId)
     {
@@ -143,12 +137,12 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
     /// <returns>全部资源列表</returns>
     public async Task<List<SysResource>> GetAllAsync()
     {
-        var sysResources = App.CacheService.Get<List<SysResource>>(CacheKey);
+        var sysResources = App.CacheService.Get<List<SysResource>>(CacheConst.Cache_SysResource);
         if (sysResources == null)
         {
             using var db = GetDB();
             sysResources = await db.Queryable<SysResource>().ToListAsync().ConfigureAwait(false);
-            App.CacheService.Set(CacheKey, sysResources);
+            App.CacheService.Set(CacheConst.Cache_SysResource, sysResources);
         }
         return sysResources;
     }
@@ -258,7 +252,7 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
     /// </summary>
     public void RefreshCache()
     {
-        App.CacheService.Remove(CacheKey);
+        App.CacheService.Remove(CacheConst.Cache_SysResource);
         //删除超级管理员的缓存
         App.RootServices.GetRequiredService<ISysUserService>().DeleteUserFromCache(RoleConst.SuperAdminId);
     }

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>

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;
 

src/Admin/ThingsGateway.Admin.Application/Services/Session/Dto/SessionOutput.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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

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

src/Admin/ThingsGateway.Admin.Application/Services/User/Dto/UserOutput.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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;
 

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;
 

src/Admin/ThingsGateway.Admin.Application/Services/VerificatInfo/VerificatInfoService.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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>();

src/Admin/ThingsGateway.Admin.Application/UserAgent/UserAgentService.cs

@@ -21,7 +21,7 @@ namespace ThingsGateway.Admin.Application
             Settings = new UserAgentSettings();
         }
 
-        private MemoryCache MemoryCache { get; set; } = new();
+        private ICache MemoryCache => App.CacheService;
 
         /// <summary>
         /// Parses the specified user agent string.

src/Admin/ThingsGateway.Admin.Application/Util/ImportExportUtil.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using ThingsGateway.NewLife;
 
 namespace ThingsGateway.Admin.Application;

src/Admin/ThingsGateway.Admin.Application/Util/OpenApiUtil.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>

src/Admin/ThingsGateway.Admin.Application/Util/OrgUtil.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>

src/Admin/ThingsGateway.Admin.Application/Util/PositionUtil.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>

src/Admin/ThingsGateway.Admin.Application/Util/RoleUtil.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>

src/Admin/ThingsGateway.Admin.Application/Util/UserUtil.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>

src/Admin/ThingsGateway.Admin.Application/Util/VerificatInfoUtil.cs

@@ -9,7 +9,6 @@
 //------------------------------------------------------------------------------
 
 using ThingsGateway.Extension.Generic;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

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;
 

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;
 

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)]

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;
 

src/Admin/ThingsGateway.Admin.Razor/Pages/HardwareInfoPage.razor

@@ -90,8 +90,8 @@
                                         <h6>   @((100 - (availableMemory * 100.00 / memory)).ToString("F2") + " %")  </h6>
 
                                         <span>   @Localizer["WorkingSet"] <i> @(HardwareJob.HardwareInfo.WorkingSet + " MB")</i></span>
-                                        <span>   @Localizer["AvailableMemory"] <i> @((availableMemory / 1024.00 / 1024 / 1024).ToString("F2") + " GB")</i></span>
-                                        <span>   @Localizer["TotalMemory"] <i> @((memory / 1024.00 / 1024 / 1024).ToString("F2") + " GB")</i></span>
+                                        <span>   @Localizer["AvailableMemory"] <i> @((availableMemory / 1024.00 / 1024).ToString("F2") + " GB")</i></span>
+                                        <span>   @Localizer["TotalMemory"] <i> @((memory / 1024.00 / 1024).ToString("F2") + " GB")</i></span>
 
                                     </div>
                                 </Circle>

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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
 {

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

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
 {

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();
     }
 }

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>

src/Admin/ThingsGateway.Admin.Razor/_Imports.razor

@@ -15,5 +15,5 @@
 
 @using BootstrapBlazor.Components
 
-
+@using ThingsGateway.Common.Extension;
 @using ThingsGateway.Razor;

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"
     ]

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"
     ]

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

@@ -0,0 +1,22 @@
+{
+  "Cache": {
+    "CacheType": "Memory", // 可选：Memory 或 Redis
+
+    "MemoryCacheOptions": {
+      "Expire": 3600,
+      "Capacity": 100000,
+      "Period": 60
+    },
+
+    "RedisCacheOptions": {
+      "InstanceName": "ThingsGateway",
+      "Configuration": "server=127.0.0.1:6379;password=123456;db=3;timeout=3000",
+      "Server": "127.0.0.1:6379",
+      "Db": 3,
+      "UserName": "",
+      "Password": "123456",
+      "Timeout": 3000,
+      "Prefix": "ThingsGateway:"
+    }
+  }
+}

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">
     @* 左侧说明 *@

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;

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
 

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;

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

@@ -13,6 +13,8 @@ using Microsoft.AspNetCore.ResponseCompression;
 using System.Runtime.InteropServices;
 using System.Text;
 
+using ThingsGateway.Admin.Application;
+using ThingsGateway.DB;
 using ThingsGateway.NewLife.Log;
 
 namespace ThingsGateway.AdminServer;
@@ -29,6 +31,8 @@ public class Program
         // 增加中文编码支持
         Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
+        ClaimConst.Scheme = $"{typeof(Program).Assembly.GetName().Name}{SchemeHelper.GetOrCreate()}";
+
         #region 控制台输出Logo
 
         Console.Write(Environment.NewLine);

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",

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

@@ -26,7 +26,7 @@ using System.Text.Unicode;
 
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
-using ThingsGateway.NewLife.Caching;
+using ThingsGateway.DB;
 using ThingsGateway.VirtualFileServer;
 
 namespace ThingsGateway.AdminServer;
@@ -59,8 +59,6 @@ public class Startup : AppStartup
             options.AddPersistence<JobPersistence>();
         });
 
-        // 缓存
-        services.AddSingleton<ICache, MemoryCache>();
 
         // 允许跨域
         services.AddCorsAccessor();
@@ -110,7 +108,7 @@ public class Startup : AppStartup
          .AddHubOptions(options =>
          {
              //单个传入集线器消息的最大大小。默认 32 KB
-             options.MaximumReceiveMessageSize = 1024 * 1024;
+             options.MaximumReceiveMessageSize = 32 * 1024 * 1024;
              //可为客户端上载流缓冲的最大项数。 如果达到此限制，则会阻止处理调用，直到服务器处理流项。
              options.StreamBufferCapacity = 30;
              options.ClientTimeoutInterval = TimeSpan.FromMinutes(2);
@@ -129,7 +127,7 @@ public class Startup : AppStartup
         }).AddHubOptions(options =>
         {
             //单个传入集线器消息的最大大小。默认 32 KB
-            options.MaximumReceiveMessageSize = 1024 * 1024;
+            options.MaximumReceiveMessageSize = 32 * 1024 * 1024;
             //可为客户端上载流缓冲的最大项数。 如果达到此限制，则会阻止处理调用，直到服务器处理流项。
             options.StreamBufferCapacity = 30;
             options.ClientTimeoutInterval = TimeSpan.FromMinutes(2);
@@ -208,7 +206,7 @@ public class Startup : AppStartup
         var certificate = new X509Certificate2("ThingsGateway.pfx", "ThingsGateway", X509KeyStorageFlags.EphemeralKeySet);
 #endif
         services.AddDataProtection()
-            .PersistKeysToFileSystem(new DirectoryInfo("keys"))
+            .PersistKeysToFileSystem(new DirectoryInfo("Keys"))
             .ProtectKeysWithCertificate(certificate)
             .UseCryptographicAlgorithms(new AuthenticatedEncryptorConfiguration
             {

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>
 

src/Admin/ThingsGateway.Common/Attributes/IgnoreExcelAttribute.cs

@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 忽略Excel导入导出

src/Admin/ThingsGateway.Common/Attributes/IgnoreSeedDataAttribute.cs

@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Admin.Application;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 种子数据忽略新增

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;

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规则

src/Admin/ThingsGateway.Common/Common/IDriverUIBase.cs

@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Razor;
+namespace ThingsGateway.Common;
 
 public interface IDriverUIBase
 {

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>
 /// 文件导入通用输出
@@ -44,3 +44,14 @@ public class ImportPreviewOutput<T> : ImportPreviewOutputBase where T : class
     /// </summary>
     public Dictionary<string, T> Data { get; set; } = new();
 }
+/// <summary>
+/// 导入预览
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public class ImportPreviewListOutput<T> : ImportPreviewOutputBase where T : class
+{
+    /// <summary>
+    /// 数据
+    /// </summary>
+    public List<T> Data { get; set; } = new();
+}

src/Admin/ThingsGateway.Common/Common/ModelValueValidateForm.cs

@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Razor;
+namespace ThingsGateway.Common;
 
 public class ModelValueValidateForm
 {

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>

src/Admin/ThingsGateway.Common/Data/BasePageInput.cs

@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 全局分页查询输入参数

src/Admin/ThingsGateway.Common/Data/IBasePageInput.cs

@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 全局分页查询输入参数

src/Admin/ThingsGateway.Common/Data/IPrimaryIdEntity.cs

@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// 主键id基类

src/Admin/ThingsGateway.Common/Data/SqlSugarPagedList.cs

@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway;
+namespace ThingsGateway.Common;
 
 /// <summary>
 /// SqlSugar 分页泛型集合

src/Admin/ThingsGateway.Common/Extensions/DisplayExtensions.cs

@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Razor;
+namespace ThingsGateway.Common;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]