10.9.62

orm性能优化
更新依赖
2025-10-31 15:43:59 +08:00 · 2025-07-20 21:52:59 +08:00 · 2025-07-20 19:04:25 +08:00 · 2025-07-20 10:44:20 +08:00 · 2025-07-19 22:36:13 +08:00 · 2025-07-19 21:38:19 +08:00
1313 changed files with 66254 additions and 17879 deletions
--- a/2
+++ b/2
@@ -85,7 +85,7 @@
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
+      as of the date such litigation is field.

   4. Cachetribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
--- a/src/Admin/BlazorSetParametersAsyncGenerator/BlazorSetParametersAsyncGenerator.csproj
+++ b/src/Admin/BlazorSetParametersAsyncGenerator/BlazorSetParametersAsyncGenerator.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;</TargetFrameworks>
 		<Version>$(SourceGeneratorVersion)</Version>
@@ -17,8 +17,7 @@
 	</PropertyGroup>

 	<ItemGroup>
-		<None Include="$(OutputPath)\$(TargetFileName)" Pack="true"
-			  PackagePath="analyzers/dotnet/cs" Visible="false" />
+		<None Include="$(OutputPath)\$(TargetFileName)" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
 	</ItemGroup>
 	

@@ -27,6 +26,6 @@
 	</ItemGroup>

 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" PrivateAssets="all" Private="false" />
 	</ItemGroup>
 </Project>
--- a/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/SetParametersAsyncGenerator.cs
+++ b/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/SetParametersAsyncGenerator.cs
@@ -1,63 +1,48 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;

-namespace BlazorSetParametersAsyncGenerator;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Components;

 [Generator]
-public partial class SetParametersAsyncGenerator : ISourceGenerator
+public sealed partial class SetParametersAsyncGenerator : IIncrementalGenerator
 {
+    private const string m_DoNotGenerateSetParametersAsyncAttribute = """ 
+    using System;
+    namespace Microsoft.AspNetCore.Components
+    {
+        [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
+        internal sealed class DoNotGenerateSetParametersAsyncAttribute : Attribute { }
+    }
+""";

-    private string m_DoNotGenerateSetParametersAsyncAttribute = """
-        
-        using System;
-        namespace BlazorSetParametersAsyncGenerator
+    private const string m_GenerateSetParametersAsyncAttribute = """ 
+    using System;
+    namespace Microsoft.AspNetCore.Components
+    {
+        [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
+        internal sealed class GenerateSetParametersAsyncAttribute : Attribute
        {
-            [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
-            internal sealed class DoNotGenerateSetParametersAsyncAttribute : Attribute
-            {
-            }
+            public bool RequireExactMatch { get; set; }
        }
+    }
+""";

-
-        """
-        ;
-    private string m_GenerateSetParametersAsyncAttribute = """
-        
-        using System;
-        namespace BlazorSetParametersAsyncGenerator
+    private const string m_GlobalGenerateSetParametersAsyncAttribute = """ 
+    using System;
+    namespace Microsoft.AspNetCore.Components
+    {
+        [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
+        internal sealed class GlobalGenerateSetParametersAsyncAttribute : Attribute
        {
-            [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
-            internal sealed class GenerateSetParametersAsyncAttribute : Attribute
-            {
-                public bool RequireExactMatch { get; set; }
-            }
+            public bool Enable { get; }
+            public GlobalGenerateSetParametersAsyncAttribute(bool enable = true) { Enable = enable; }
        }
-
-
-        """
-        ;
-    private string m_GlobalGenerateSetParametersAsyncAttribute = """
-        
-        using System;
-        namespace BlazorSetParametersAsyncGenerator
-        {
-            [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
-            internal sealed class GlobalGenerateSetParametersAsyncAttribute : Attribute
-            {
-                public bool Enable { get; }
-
-                public GlobalGenerateSetParametersAsyncAttribute(bool enable = true)
-                {
-                    Enable = enable;
-                }
-            }
-
-        }
-
-
-        """
-        ;
+    }
+""";

    private static readonly DiagnosticDescriptor ParameterNameConflict = new DiagnosticDescriptor(
        id: "TG0001",
@@ -68,36 +53,64 @@ public partial class SetParametersAsyncGenerator : ISourceGenerator
        isEnabledByDefault: true,
        description: "Parameter names must be case insensitive to be usable in routes. Rename the parameter to not be in conflict with other parameters.");

-    public void Initialize(GeneratorInitializationContext context)
+    public void Initialize(IncrementalGeneratorInitializationContext context)
    {
-        context.RegisterForPostInitialization(a =>
+        // 注入 attribute 源码
+        context.RegisterPostInitializationOutput(ctx =>
        {
-            a.AddSource(nameof(m_DoNotGenerateSetParametersAsyncAttribute), m_DoNotGenerateSetParametersAsyncAttribute);
-            a.AddSource(nameof(m_GenerateSetParametersAsyncAttribute), m_GenerateSetParametersAsyncAttribute);
-            a.AddSource(nameof(m_GlobalGenerateSetParametersAsyncAttribute), m_GlobalGenerateSetParametersAsyncAttribute);
+            ctx.AddSource("DoNotGenerateSetParametersAsyncAttribute.g.cs", SourceText.From(m_DoNotGenerateSetParametersAsyncAttribute, Encoding.UTF8));
+            ctx.AddSource("GenerateSetParametersAsyncAttribute.g.cs", SourceText.From(m_GenerateSetParametersAsyncAttribute, Encoding.UTF8));
+            ctx.AddSource("GlobalGenerateSetParametersAsyncAttribute.g.cs", SourceText.From(m_GlobalGenerateSetParametersAsyncAttribute, Encoding.UTF8));
        });

-        // Register a syntax receiver that will be created for each generation pass
-        context.RegisterForSyntaxNotifications(() => new SyntaxReceiver());
+        // 筛选 ClassDeclarationSyntax
+        var classDeclarations = context.SyntaxProvider
+            .CreateSyntaxProvider(
+                predicate: static (node, _) => node is ClassDeclarationSyntax,
+                transform: static (ctx, _) => (ClassDeclarationSyntax)ctx.Node)
+            .Where(static c => c is not null);
+
+        // 合并 Compilation
+        var compilationProvider = context.CompilationProvider;
+
+        var candidateClasses = classDeclarations.Combine(compilationProvider);
+
+        context.RegisterSourceOutput(candidateClasses, static (spc, tuple) =>
+        {
+            var (classDeclaration, compilation) = tuple;
+            Execute(spc, compilation, classDeclaration);
+        });
    }

-    public void Execute(GeneratorExecutionContext context)
+    private static void Execute(SourceProductionContext context, Compilation compilation, ClassDeclarationSyntax classDeclaration)
    {
-        // https://github.com/dotnet/AspNetCore.Docs/blob/1e199f340780f407a685695e6c4d953f173fa891/aspnetcore/blazor/webassembly-performance-best-practices.md#implement-setparametersasync-manually
-        if (context.SyntaxReceiver is not SyntaxReceiver receiver)
-        {
+        var model = compilation.GetSemanticModel(classDeclaration.SyntaxTree);
+        var classSymbol = model.GetDeclaredSymbol(classDeclaration);
+        if (classSymbol is null || classSymbol.Name == "_Imports")
            return;
-        }

-        var candidate_classes = GetCandidateClasses(receiver, context);
+        var positiveAttr = compilation.GetTypeByMetadataName("Microsoft.AspNetCore.Components.GenerateSetParametersAsyncAttribute");
+        var negativeAttr = compilation.GetTypeByMetadataName("Microsoft.AspNetCore.Components.DoNotGenerateSetParametersAsyncAttribute");

-        foreach (var class_symbol in candidate_classes.Distinct(SymbolEqualityComparer.Default).Cast<INamedTypeSymbol>())
-        {
-            GenerateSetParametersAsyncMethod(context, class_symbol);
-        }
+        if (classSymbol.GetAttributes().Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, negativeAttr)))
+            return;
+
+        if (!IsPartial(classSymbol) || !IsComponent(classDeclaration, classSymbol, compilation))
+            return;
+
+        var globalEnable = compilation.Assembly.GetAttributes()
+            .FirstOrDefault(a => a.AttributeClass?.ToDisplayString() == "Microsoft.AspNetCore.Components.GlobalGenerateSetParametersAsyncAttribute")
+            ?.ConstructorArguments.FirstOrDefault().Value as bool? ?? false;
+
+        var hasPositive = classSymbol.GetAttributes().Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, positiveAttr));
+
+        if (!globalEnable && !hasPositive)
+            return;
+
+        GenerateSetParametersAsyncMethod(context, classSymbol);
    }

-    private static void GenerateSetParametersAsyncMethod(GeneratorExecutionContext context, INamedTypeSymbol class_symbol)
+    private static void GenerateSetParametersAsyncMethod(SourceProductionContext context, INamedTypeSymbol class_symbol)
    {
        var force_exact_match = class_symbol.GetAttributes().Any(a => a.NamedArguments.Any(na => na.Key == "RequireExactMatch" && na.Value.Value is bool v && v));
        var namespaceName = class_symbol.ContainingNamespace.ToDisplayString();
@@ -386,6 +399,31 @@ namespace {namespaceName}
 #pragma warning restore CS0162");
    }

+    private static bool IsPartial(INamedTypeSymbol symbol)
+    {
+        return symbol.DeclaringSyntaxReferences
+            .Select(r => r.GetSyntax())
+            .OfType<ClassDeclarationSyntax>()
+            .Any(c => c.Modifiers.Any(m => m.IsKind(SyntaxKind.PartialKeyword)));
+    }
+
+    private static bool IsComponent(ClassDeclarationSyntax classDeclaration, INamedTypeSymbol symbol, Compilation compilation)
+    {
+        if (HasUserDefinedSetParametersAsync(symbol))
+            return false;
+
+        if (classDeclaration.SyntaxTree.FilePath.EndsWith(".razor") || classDeclaration.SyntaxTree.FilePath.EndsWith(".razor.cs"))
+            return true;
+
+        var iComponent = compilation.GetTypeByMetadataName("Microsoft.AspNetCore.Components.IComponent");
+        var componentBase = compilation.GetTypeByMetadataName("Microsoft.AspNetCore.Components.ComponentBase");
+
+        if (iComponent == null || componentBase == null)
+            return false;
+
+        return symbol.AllInterfaces.Contains(iComponent) || SymbolEqualityComparer.Default.Equals(symbol.BaseType, componentBase);
+    }
+
    private static bool HasUserDefinedSetParametersAsync(INamedTypeSymbol classSymbol)
    {
        return classSymbol
@@ -398,137 +436,4 @@ namespace {namespaceName}
                !m.IsStatic);
    }

-
-    private static bool IsPartial(INamedTypeSymbol symbol)
-    {
-        return symbol.DeclaringSyntaxReferences
-            .Select(r => r.GetSyntax())
-            .OfType<ClassDeclarationSyntax>()
-            .Any(c => c.Modifiers.Any(m => m.IsKind(SyntaxKind.PartialKeyword)));
-    }
-    private static bool IsComponent(ClassDeclarationSyntax classDeclarationSyntax, INamedTypeSymbol symbol, Compilation compilation)
-    {
-        if (HasUserDefinedSetParametersAsync(symbol))
-        {
-            // 用户自己写了方法，不生成
-            return false;
-        }
-
-        if (!IsPartial(symbol))
-        {
-            return false;
-        }
-
-        if (classDeclarationSyntax.SyntaxTree.FilePath.EndsWith(".razor") || classDeclarationSyntax.SyntaxTree.FilePath.EndsWith(".razor.cs"))
-        {
-            return true;
-        }
-
-
-
-        var iComponent = compilation.GetTypeByMetadataName("Microsoft.AspNetCore.Components.IComponent");
-        var componentBase = compilation.GetTypeByMetadataName("Microsoft.AspNetCore.Components.ComponentBase");
-        if (iComponent == null || componentBase == null)
-            return false;
-
-        if (SymbolEqualityComparer.Default.Equals(symbol, iComponent))
-            return true;
-        if (SymbolEqualityComparer.Default.Equals(symbol, componentBase))
-            return true;
-
-        return false;
-    }
-
-    /// <summary>
-    /// Enumerate methods with at least one Group attribute
-    /// </summary>
-    private static IEnumerable<INamedTypeSymbol> GetCandidateClasses(SyntaxReceiver receiver, GeneratorExecutionContext context)
-    {
-        var compilation = context.Compilation;
-        var positiveAttributeSymbol = compilation.GetTypeByMetadataName("BlazorSetParametersAsyncGenerator.GenerateSetParametersAsyncAttribute");
-        var negativeAttributeSymbol = compilation.GetTypeByMetadataName("BlazorSetParametersAsyncGenerator.DoNotGenerateSetParametersAsyncAttribute");
-
-        // loop over the candidate methods, and keep the ones that are actually annotated
-
-        // 找特性
-        var assemblyAttributes = compilation.Assembly.GetAttributes();
-
-        var enableAttr = assemblyAttributes.FirstOrDefault(attr =>
-            attr.AttributeClass?.ToDisplayString() == "BlazorSetParametersAsyncGenerator.GlobalGenerateSetParametersAsyncAttribute");
-
-        var globalEnable = false;
-        if (enableAttr != null)
-        {
-            var arg = enableAttr.ConstructorArguments.FirstOrDefault();
-            if (arg.Value is bool b)
-                globalEnable = b;
-        }
-
-        foreach (ClassDeclarationSyntax class_declaration in receiver.CandidateClasses)
-        {
-            var model = compilation.GetSemanticModel(class_declaration.SyntaxTree);
-            var class_symbol = model.GetDeclaredSymbol(class_declaration);
-            if (class_symbol is null)
-            {
-                continue;
-            }
-            if (class_symbol.Name == "_Imports")
-            {
-                continue;
-            }
-
-            // 是否拒绝生成
-            var hasNegative = class_symbol.GetAttributes().Any(ad =>
-                ad.AttributeClass?.Equals(negativeAttributeSymbol, SymbolEqualityComparer.Default) == true);
-
-            if (hasNegative)
-                continue;
-
-
-            if (IsComponent(class_declaration, class_symbol, compilation))
-            {
-                if (globalEnable)
-                {
-                    yield return class_symbol;
-                }
-                else
-                {
-                    // 必须显式标注 Positive Attribute
-                    var hasPositive = class_symbol.GetAttributes().Any(ad =>
-                        ad.AttributeClass?.Equals(positiveAttributeSymbol, SymbolEqualityComparer.Default) == true);
-
-                    if (hasPositive)
-                        yield return class_symbol;
-                }
-            }
-            else
-            {
-
-            }
-        }
-    }
-
-    /// <summary>
-    /// Created on demand before each generation pass
-    /// </summary>
-    internal class SyntaxReceiver : ISyntaxReceiver
-    {
-        public List<ClassDeclarationSyntax> CandidateClasses { get; } = new List<ClassDeclarationSyntax>();
-
-        /// <summary>
-        /// Called for every syntax node in the compilation, we can inspect the nodes and save any information useful for generation
-        /// </summary>
-        public void OnVisitSyntaxNode(SyntaxNode syntax_node)
-        {
-            // any class with at least one attribute is a candidate for property generation
-            if (syntax_node is ClassDeclarationSyntax classDeclarationSyntax)
-            {
-                CandidateClasses.Add(classDeclarationSyntax);
-            }
-            else
-            {
-
-            }
-        }
-    }
 }
--- a/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/SourceGeneratorContextExtension.cs
+++ b/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/SourceGeneratorContextExtension.cs
@@ -3,11 +3,11 @@ using Microsoft.CodeAnalysis.Text;

 using System.Text;

-namespace BlazorSetParametersAsyncGenerator
+namespace Microsoft.AspNetCore.Components
 {
    internal static class SourceGeneratorContextExtension
    {
-        public static void AddCode(this GeneratorExecutionContext context, string hint_name, string code)
+        public static void AddCode(this SourceProductionContext context, string hint_name, string code)
        {
            context.AddSource(hint_name.Replace("<", "_").Replace(">", "_"), SourceText.From(code, Encoding.UTF8));
        }
--- a/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/StringExtension.cs
+++ b/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/StringExtension.cs
@@ -1,13 +0,0 @@
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-
-namespace BlazorSetParametersAsyncGenerator
-{
-    internal static class StringExtension
-    {
-        public static string NormalizeWhitespace(this string code)
-        {
-            return CSharpSyntaxTree.ParseText(code).GetRoot().NormalizeWhitespace().ToFullString();
-        }
-    }
-}
--- a/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/TypeSymbolExtension.cs
+++ b/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/TypeSymbolExtension.cs
@@ -1,6 +1,6 @@
 using Microsoft.CodeAnalysis;

-namespace BlazorSetParametersAsyncGenerator
+namespace Microsoft.AspNetCore.Components
 {
    public static class TypeSymbolExtension
    {
--- 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;

--- a/src/Admin/ThingsGateway.Admin.Application/Const/CacheConst.cs
+++ b/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 登录错误次数

--- a/src/Admin/ThingsGateway.Admin.Application/Controller/OpenApiController.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Controller/OpenApiController.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using Mapster;
-
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

@@ -41,9 +39,9 @@ public class OpenApiController : ControllerBase
    [AllowAnonymous]
    public async Task<OpenApiLoginOutput> LoginAsync([FromBody] OpenApiLoginInput input)
    {
-        var output = await _authService.LoginAsync(input.Adapt<LoginInput>(), false).ConfigureAwait(false);
+        var output = await _authService.LoginAsync(input.AdaptLoginInput(), false).ConfigureAwait(false);

-        var openApiLoginOutput = output.Adapt<OpenApiLoginOutput>();
+        var openApiLoginOutput = output.AdaptOpenApiLoginOutput();

        return openApiLoginOutput;
    }
--- 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 = "字典表")]
--- 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>
--- 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>
--- 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;

--- 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>
--- 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>
--- 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>
--- 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 Mapster;
+using Riok.Mapperly.Abstractions;

 using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.CodeAnalysis;
-
-using ThingsGateway.SqlSugar;

 namespace ThingsGateway.Admin.Application;

@@ -31,7 +26,7 @@ public class SysUser : BaseEntity
    ///</summary>
    [SugarColumn(ColumnDescription = "头像", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
    [AutoGenerateColumn(Visible = true, Sortable = false, Filterable = false)]
-    [AdaptIgnore]
+    [MapperIgnore]
    public virtual string? Avatar { get; set; }

    /// <summary>
@@ -175,14 +170,14 @@ public class SysUser : BaseEntity
    /// </summary>
    [SugarColumn(IsIgnore = true, IsJson = true)]
    [AutoGenerateColumn(Ignore = true)]
-    public List<long> OrgAndPosIdList { get; set; } = new List<long>();
+    public List<long>? OrgAndPosIdList { get; set; } = new List<long>();

    /// <summary>
    /// 主管信息
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    [AutoGenerateColumn(Ignore = true)]
-    public UserSelectorOutput DirectorInfo { get; set; }
+    public UserSelectorOutput? DirectorInfo { get; set; }

    #endregion

@@ -193,35 +188,35 @@ public class SysUser : BaseEntity
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    [AutoGenerateColumn(Ignore = true)]
-    public Dictionary<string, List<string>> ButtonCodeList { get; set; } = new();
+    public Dictionary<string, List<string>>? ButtonCodeList { get; set; } = new();

    /// <summary>
    /// 权限码集合
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    [AutoGenerateColumn(Ignore = true)]
-    public HashSet<string> PermissionCodeList { get; set; } = new();
+    public HashSet<string>? PermissionCodeList { get; set; } = new();

    /// <summary>
    /// 角色ID集合
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    [AutoGenerateColumn(Ignore = true)]
-    public HashSet<long> RoleIdList { get; set; } = new();
+    public HashSet<long>? RoleIdList { get; set; } = new();

    /// <summary>
    /// 机构及以下机构ID集合
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    [AutoGenerateColumn(Ignore = true)]
-    public HashSet<long> ScopeOrgChildList { get; set; }
+    public HashSet<long>? ScopeOrgChildList { get; set; }

    /// <summary>
    /// 模块集合
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    [AutoGenerateColumn(Ignore = true)]
-    public List<SysResource> ModuleList { get; set; } = new();
+    public List<SysResource>? ModuleList { get; set; } = new();

    /// <summary>
    /// 租户Id
--- 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;

--- a/src/Admin/ThingsGateway.Admin.Application/Extensions/SchemeHelper.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Extensions/SchemeHelper.cs
@@ -8,23 +8,30 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using Mapster;
+using ThingsGateway.Extension;

-using System.Text;
+namespace ThingsGateway.Admin.Application;

-namespace ThingsGateway.Razor;
-
-/// <summary>
-/// <see cref="Encoding"/> Master规则
-/// </summary>
-public class EncodingMapper : IRegister
+/// <inheritdoc/>
+[ThingsGateway.DependencyInjection.SuppressSniffer]
+public static class SchemeHelper
 {
-    /// <inheritdoc/>
-    public void Register(TypeAdapterConfig config)
+
+    public static string GetOrCreate()
    {
-        config.ForType<Encoding, Encoding>()
-            .Ignore(dest => dest.EncoderFallback)
-            .Ignore(dest => dest.DecoderFallback)
-              .ConstructUsing(src => Encoding.GetEncoding(src.CodePage));
+        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;
+        }
    }
+
 }
--- 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;
--- 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;
+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;
--- 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;
--- 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;

@@ -53,16 +50,16 @@ 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()
    {
        var historyHardwareInfos = MemoryCache.Get<List<HistoryHardwareInfo>>(CacheKey);
        if (historyHardwareInfos == null)
        {
-            using var db = DbContext.GetDB<HistoryHardwareInfo>(); ;
-            historyHardwareInfos = await db.Queryable<HistoryHardwareInfo>().Where(a => a.Date > DateTime.Now.AddDays(-3)).ToListAsync().ConfigureAwait(false);
+            using var db = DbContext.GetDB<HistoryHardwareInfo>();
+            historyHardwareInfos = await db.Queryable<HistoryHardwareInfo>().Where(a => a.Date > DateTime.Now.AddDays(-3)).Take(1000).ToListAsync().ConfigureAwait(false);

            MemoryCache.Set(CacheKey, historyHardwareInfos);
        }
@@ -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));
@@ -133,7 +129,7 @@ public class HardwareJob : IJob, IHardwareJob
                                CpuUsage = (HardwareInfo.MachineInfo.CpuRate * 100).ToInt(),
                                Temperature = (HardwareInfo.MachineInfo.Temperature).ToInt(),
                            };
-                            await _db.Insertable(his).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
+                            await _db.InsertableT(his).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
                            MemoryCache.Remove(CacheKey);
                        }
                        var sevenDaysAgo = TimerX.Now.AddDays(-HardwareInfoOptions.DaysAgo);
--- 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/>
--- 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;

--- a/src/Admin/ThingsGateway.Admin.Application/Mapper/AdminMapper.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Mapper/AdminMapper.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Riok.Mapperly.Abstractions;
+
+namespace ThingsGateway.Admin.Application;
+[Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, RequiredMappingStrategy = RequiredMappingStrategy.None)]
+public static partial class AdminMapper
+{
+    public static partial LoginInput AdaptLoginInput(this OpenApiLoginInput src);
+    public static partial OpenApiLoginOutput AdaptOpenApiLoginOutput(this LoginOutput src);
+    public static partial SessionOutput AdaptSessionOutput(this SysUser src);
+    public static partial SysUser AdaptSysUser(this SysUser src);
+    public static partial UserSelectorOutput AdaptUserSelectorOutput(this SysUser src);
+    public static partial List<SysResource> AdaptListSysResource(this IEnumerable<SysResource> src);
+    public static partial AppConfig AdaptAppConfig(this AppConfig src);
+    public static partial WorkbenchInfo AdaptWorkbenchInfo(this WorkbenchInfo src);
+    public static partial QueryData<UserSelectorOutput> AdaptQueryDataUserSelectorOutput(this QueryData<SysUser> src);
+    public static partial LoginInput AdaptLoginInput(this LoginInput src);
+}
+
+
+
+
--- 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;
@@ -211,7 +210,7 @@ public class AdminOAuthHandler<TOptions>(

        using var db = DbContext.GetDB<SysUser>();
        //更新用户登录信息
-        if (await db.Updateable(sysUser).UpdateColumns(it => new
+        if (await db.UpdateableT(sysUser).UpdateColumns(it => new
        {
            it.LastLoginIp,
            it.LastLoginTime,
--- 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))) //如果当前路由信息不包含在角色授权路由列表中则认证失败
--- 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;
--- 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;

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

@@ -326,7 +325,7 @@ public class AuthService : IAuthService

        using var db = DbContext.GetDB<SysUser>();
        //更新用户登录信息
-        if (await db.Updateable(sysUser).UpdateColumns(it => new
+        if (await db.UpdateableT(sysUser).UpdateColumns(it => new
        {
            it.LastLoginIp,
            it.LastLoginTime,
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/Dto/AuthOutput.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Auth/Dto/AuthOutput.cs
@@ -58,7 +58,7 @@ public class LoginOutput
    /// <summary>
    /// 模块列表
    /// </summary>
-    public IEnumerable<SysResource> ModuleList { get; set; } = Enumerable.Empty<SysResource>();
+    public IEnumerable<SysResource>? ModuleList { get; set; } = Enumerable.Empty<SysResource>();

    /// <summary>
    /// 刷新Token
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Dict/Dto/AppConfig.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Dict/Dto/AppConfig.cs
@@ -15,17 +15,17 @@ public class AppConfig
    /// <summary>
    /// 登录策略
    /// </summary>
-    public LoginPolicy LoginPolicy { get; set; }
+    public LoginPolicy? LoginPolicy { get; set; }

    /// <summary>
    /// 页面策略
    /// </summary>
-    public PagePolicy PagePolicy { get; set; }
+    public PagePolicy? PagePolicy { get; set; }

    /// <summary>
    /// 密码策略
    /// </summary>
-    public PasswordPolicy PasswordPolicy { get; set; }
+    public PasswordPolicy? PasswordPolicy { get; set; }

-    public WebsitePolicy WebsitePolicy { get; set; }
+    public WebsitePolicy? WebsitePolicy { get; set; }
 }
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Dict/Dto/PagePolicy.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Dict/Dto/PagePolicy.cs
@@ -15,5 +15,5 @@ public class PagePolicy
    /// <summary>
    /// 系统默认快捷方式菜单ID列表
    /// </summary>
-    public List<long> Shortcuts { get; set; } = new();
+    public List<long>? Shortcuts { get; set; } = new();
 }
--- 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>
--- 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;

--- a/src/Admin/ThingsGateway.Admin.Application/Services/Event/EventService.cs
+++ b/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>
--- 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;
@@ -90,7 +89,4 @@ internal sealed class FileService : IFileService
        if (!allowTypeS.Contains(fileSuffix)) throw Oops.Bah(_localizer["FileTypeError", fileSuffix]);
    }

-    #region 方法
-
-    #endregion 方法
 }
--- 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;
--- 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>
--- 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
--- 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>
--- 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;

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

--- a/src/Admin/ThingsGateway.Admin.Application/Services/Relation/RelationService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Relation/RelationService.cs
@@ -137,7 +137,7 @@ internal sealed class RelationService : BaseService<SysRelation>, IRelationServi
        {
            if (clear)
                await db.Deleteable<SysRelation>().Where(it => it.ObjectId == objectId && it.Category == category).ExecuteCommandAsync().ConfigureAwait(false);//删除老的
-            await db.Insertable(sysRelation).ExecuteCommandAsync().ConfigureAwait(false);//添加新的
+            await db.InsertableT(sysRelation).ExecuteCommandAsync().ConfigureAwait(false);//添加新的
        }).ConfigureAwait(false);
        if (result.IsSuccess)//如果成功了
        {
--- 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;
--- 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>
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Resource/SysResourceService.cs
+++ b/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)
    {
@@ -69,7 +63,7 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
        var resource = resourceList.First(a => a.Id == id);
        resource.ParentId = parentMenuId;
        using var db = GetDB();
-        var result = await db.Updateable(resource).ExecuteCommandAsync().ConfigureAwait(false);
+        var result = await db.UpdateableT(resource).ExecuteCommandAsync().ConfigureAwait(false);
        RefreshCache();//刷新缓存
        _relationService.RefreshCache(RelationCategoryEnum.RoleHasResource);//关系表刷新缓存
        _relationService.RefreshCache(RelationCategoryEnum.UserHasResource);//关系表刷新缓存
@@ -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;
    }
@@ -201,7 +195,7 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc

        if (type == ItemChangedType.Add)
        {
-            var result = await db.Insertable(input).ExecuteCommandAsync().ConfigureAwait(false);
+            var result = await db.InsertableT(input).ExecuteCommandAsync().ConfigureAwait(false);
            RefreshCache();//刷新缓存
            return result > 0;
        }
@@ -226,7 +220,7 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
            //事务
            var result = await db.UseTranAsync(async () =>
            {
-                await db.Updateable(input).ExecuteCommandAsync().ConfigureAwait(false);//更新数据
+                await db.UpdateableT(input).ExecuteCommandAsync().ConfigureAwait(false);//更新数据
                if (permissions.Count > 0)//如果权限列表大于0就更新
                {
                    await db.Updateable(permissions).ExecuteCommandAsync().ConfigureAwait(false);//更新关系表
@@ -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);
    }
--- 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>
--- 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;

--- 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>
--- 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
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Session/SessionService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Session/SessionService.cs
@@ -8,12 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using BootstrapBlazor.Components;
-
-using Mapster;
-
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;

 internal sealed class SessionService : BaseService<SysUser>, ISessionService
@@ -69,7 +63,7 @@ internal sealed class SessionService : BaseService<SysUser>, ISessionService

            var r = items.Select((it) =>
            {
-                var reuslt = it.Adapt<SessionOutput>();
+                var reuslt = it.AdaptSessionOutput();
                if (verificatInfoDicts.TryGetValue(it.Id, out var verificatInfos))
                {
                    reuslt.VerificatCount = verificatInfos.Count;//令牌数量
@@ -94,7 +88,7 @@ internal sealed class SessionService : BaseService<SysUser>, ISessionService

            var r = items.Select((it) =>
            {
-                var reuslt = it.Adapt<SessionOutput>();
+                var reuslt = it.AdaptSessionOutput();
                if (verificatInfoDicts.TryGetValue(it.Id, out var verificatInfos))
                {
                    reuslt.VerificatCount = verificatInfos.Count;//令牌数量
@@ -117,7 +111,7 @@ internal sealed class SessionService : BaseService<SysUser>, ISessionService

            var r = items.Select((it) =>
            {
-                var reuslt = it.Adapt<SessionOutput>();
+                var reuslt = it.AdaptSessionOutput();
                if (verificatInfoDicts.TryGetValue(it.Id, out var verificatInfos))
                {
                    reuslt.VerificatCount = verificatInfos.Count;//令牌数量
--- 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>
--- 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>
--- a/src/Admin/ThingsGateway.Admin.Application/Services/User/SysUserService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/User/SysUserService.cs
@@ -8,16 +8,12 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using BootstrapBlazor.Components;
-
-using Mapster;
-
+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;

@@ -452,7 +448,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService

        if (changedType == ItemChangedType.Add)
        {
-            var sysUser = input.Adapt<SysUser>();
+            var sysUser = input.AdaptSysUser();
            //获取默认密码
            sysUser.Avatar = input.Avatar;
            sysUser.Password = await GetDefaultPassWord(true).ConfigureAwait(false);//设置密码
@@ -474,7 +470,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService

                var sysUser = input;//实体转换
                using var db = GetDB();
-                var result = await db.Updateable(sysUser).IgnoreColumns(it =>
+                var result = await db.UpdateableT(sysUser).IgnoreColumns(it =>
                        new
                        {
                            //忽略更新字段
@@ -872,7 +868,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
            sysUser.OrgAndPosIdList.AddRange(sysUser.OrgId, sysUser.PositionId ?? 0);//添加组织和职位Id
            if (sysUser.DirectorId != null)
            {
-                sysUser.DirectorInfo = (await GetUserByIdAsync(sysUser.DirectorId.Value).ConfigureAwait(false)).Adapt<UserSelectorOutput>();//获取主管信息
+                sysUser.DirectorInfo = (await GetUserByIdAsync(sysUser.DirectorId.Value).ConfigureAwait(false)).AdaptUserSelectorOutput();//获取主管信息
            }

            //获取按钮码
--- a/src/Admin/ThingsGateway.Admin.Application/Services/UserCenter/Dto/UserCenterOutput.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/UserCenter/Dto/UserCenterOutput.cs
@@ -8,4 +8,3 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-namespace ThingsGateway.Admin.Application;
--- 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;

--- 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>
--- a/src/Admin/ThingsGateway.Admin.Application/Startup.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Startup.cs
@@ -8,12 +8,13 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using BootstrapBlazor.Components;
-
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;

 using System.Reflection;
+using System.Text;

+using ThingsGateway.Extension;
 using ThingsGateway.UnifyResult;

 namespace ThingsGateway.Admin.Application;
@@ -40,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>();
@@ -64,10 +64,77 @@ public class Startup : AppStartup

        services.AddSingleton(typeof(IEventService<>), typeof(EventService<>));

+
+        #region 控制台美化
+
+        services.AddConsoleFormatter(options =>
+        {
+            options.WriteFilter = (logMsg) =>
+            {
+                if (App.HostApplicationLifetime.ApplicationStopping.IsCancellationRequested && logMsg.LogLevel >= LogLevel.Warning) return false;
+                if (string.IsNullOrEmpty(logMsg.Message)) return false;
+                else return true;
+            };
+
+            options.MessageFormat = (logMsg) =>
+            {
+                //如果不是LoggingMonitor日志才格式化
+                if (logMsg.LogName != "System.Logging.LoggingMonitor")
+                {
+                    var stringBuilder = new StringBuilder();
+                    stringBuilder.AppendLine("【日志级别】：" + logMsg.LogLevel);
+                    stringBuilder.AppendLine("【日志类名】：" + logMsg.LogName);
+                    stringBuilder.AppendLine("【日志时间】：" + DateTime.Now.ToDefaultDateTimeFormat());
+                    stringBuilder.AppendLine("【日志内容】：" + logMsg.Message);
+                    if (logMsg.Exception != null)
+                    {
+                        stringBuilder.AppendLine("【异常信息】：" + logMsg.Exception);
+                    }
+                    return stringBuilder.ToString();
+                }
+                else
+                {
+                    return logMsg.Message;
+                }
+            };
+            options.WriteHandler = (logMsg, scopeProvider, writer, fmtMsg, opt) =>
+            {
+                ConsoleColor consoleColor = ConsoleColor.White;
+                switch (logMsg.LogLevel)
+                {
+                    case LogLevel.Information:
+                        consoleColor = ConsoleColor.DarkGreen;
+                        break;
+
+                    case LogLevel.Warning:
+                        consoleColor = ConsoleColor.DarkYellow;
+                        break;
+
+                    case LogLevel.Error:
+                        consoleColor = ConsoleColor.DarkRed;
+                        break;
+                }
+                writer.WriteWithColor(fmtMsg, ConsoleColor.Black, consoleColor);
+            };
+        });
+
+        #endregion 控制台美化
+        //日志写入数据库配置
+        services.AddDatabaseLogging<DatabaseLoggingWriter>(options =>
+        {
+            options.NameFilter = (name) =>
+            {
+                return (
+                name == "System.Logging.RequestAudit"
+                );
+            };
+        });
    }

    public void Use(IServiceProvider serviceProvider)
    {
+        NewLife.Log.XTrace.UnhandledExceptionLogEnable = () => !App.HostApplicationLifetime.ApplicationStopping.IsCancellationRequested;
+
        //检查ConfigId
        var configIdGroup = DbContext.DbConfigs.GroupBy(it => it.ConfigId);
        foreach (var configId in configIdGroup)
--- a/src/Admin/ThingsGateway.Admin.Application/ThingsGateway.Admin.Application.csproj
+++ b/src/Admin/ThingsGateway.Admin.Application/ThingsGateway.Admin.Application.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />

 	<PropertyGroup>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
@@ -18,7 +18,8 @@
 	</ItemGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
+		<PackageReference Include="Riok.Mapperly" Version="4.2.1" ExcludeAssets="runtime" PrivateAssets="all" />
+		<PackageReference Include="Rougamo.Fody" Version="5.0.1" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
@@ -41,12 +42,20 @@
 	<ItemGroup>
 		<None Include="..\README.md" Pack="true" PackagePath="\" />
 		<None Include="..\README.zh-CN.md" Pack="true" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.md" Pack="false" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.zh-CN.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.zh-CN.md" Pack="false" PackagePath="\" />
 	</ItemGroup>

 	<ItemGroup>
 		<ProjectReference Include="..\ThingsGateway.DB\ThingsGateway.DB.csproj" />
 	</ItemGroup>

+
+	<!--<Target Name="Mapster" AfterTargets="AfterBuild">
+		<Exec WorkingDirectory="$(ProjectDir)" Command="dotnet tool restore" />
+		<Exec WorkingDirectory="$(ProjectDir)" Command="dotnet mapster extension -o MapsterGenerator -a &quot;$(TargetDir)$(ProjectName).dll&quot;" />
+		<Exec WorkingDirectory="$(ProjectDir)" Command="dotnet mapster mapper -o MapsterGenerator -a &quot;$(TargetDir)$(ProjectName).dll&quot;" />
+	</Target>-->
+
+	
 </Project>
--- a/src/Admin/ThingsGateway.Admin.Application/UserAgent/UserAgentService.cs
+++ b/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.
--- 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;
--- 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/>
--- 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/>
@@ -26,8 +24,6 @@ public static class OrgUtil
        var data = items
        .Select((item, index) =>
            new SelectedItem(item.Id.ToString(), item.Name)
-            {
-            }
        ).ToList();
        return data;
    }
--- 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/>
--- 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/>
--- 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/>
@@ -27,8 +25,6 @@ public static class UserUtil
        var data = items
        .Select((item, index) =>
            new SelectedItem(item.Id.ToString(), item.Account)
-            {
-            }
        ).ToList();
        return data;
    }
--- 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;

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

--- a/src/Admin/ThingsGateway.Admin.Razor/Components/SysSignalRLoginConnectionHub.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Components/SysSignalRLoginConnectionHub.razor.cs
@@ -55,7 +55,7 @@ public partial class SysSignalRLoginConnectionHub : ComponentBase, IAsyncDisposa
                                return true;
                            };
                        }
-                        ;
+
                        return message;
                    };
                    foreach (var item in App.User?.Claims ?? new List<Claim>())
--- a/src/Admin/ThingsGateway.Admin.Razor/Context/BlazorAppContext.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Context/BlazorAppContext.cs
@@ -8,11 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using Mapster;
-
 using ThingsGateway.Admin.Application;
 using ThingsGateway.NewLife;
-using ThingsGateway.NewLife.Extension;

 namespace ThingsGateway.Admin.Razor;

@@ -88,7 +85,7 @@ public class BlazorAppContext
        if (UserManager.UserId > 0)
        {
            url = url.StartsWith('/') ? url : $"/{url}";
-            var sysResources = (await ResourceService.GetAllAsync()).Adapt<List<SysResource>>();
+            var sysResources = (await ResourceService.GetAllAsync()).AdaptListSysResource();
            if (TitleLocalizer != null)
            {
                sysResources.ForEach(a =>
@@ -121,7 +118,7 @@ public class BlazorAppContext
                CurrentModuleId = moduleId.Value;
            }
            UserWorkBench = await UserCenterService.GetLoginWorkbenchAsync(UserManager.UserId);
-            OwnMenus = (await UserCenterService.GetOwnMenuAsync(UserManager.UserId, 0)).Adapt<List<SysResource>>();
+            OwnMenus = (await UserCenterService.GetOwnMenuAsync(UserManager.UserId, 0)).AdaptListSysResource();

            if (TitleLocalizer != null)
            {
--- 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: BlazorSetParametersAsyncGenerator.GlobalGenerateSetParametersAsync(true)]
+[assembly: GlobalGenerateSetParametersAsync(true)]
--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/AppConfig/AppConfigPage.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/AppConfig/AppConfigPage.razor.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using Mapster;
-
 using Microsoft.AspNetCore.Components.Forms;

 using ThingsGateway.Admin.Application;
@@ -30,7 +28,7 @@ public partial class AppConfigPage

    protected override async Task OnParametersSetAsync()
    {
-        AppConfig = (await SysDictService.GetAppConfigAsync()).Adapt<AppConfig>();
+        AppConfig = (await SysDictService.GetAppConfigAsync()).AdaptAppConfig();
        await base.OnParametersSetAsync();
    }

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

--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/HardwareInfoPage.razor
+++ b/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>
--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/HardwareInfoPage.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/HardwareInfoPage.razor.cs
@@ -64,6 +64,7 @@ public partial class HardwareInfoPage : IDisposable

    private async Task<ChartDataSource> OnInit()
    {
+        if (App.HostApplicationLifetime.ApplicationStopping.IsCancellationRequested) return (new ChartDataSource());
        if (ChartDataSource == null)
        {
            var hisHardwareInfos = await HardwareJob.GetHistoryHardwareInfos();
--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/LogPage/OperLogPage.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/LogPage/OperLogPage.razor.cs
@@ -26,6 +26,7 @@ public partial class OperLogPage

    private async Task<ChartDataSource> OnInit()
    {
+        if (App.HostApplicationLifetime.ApplicationStopping.IsCancellationRequested) return (new ChartDataSource());
        if (ChartDataSource == null)
        {
            var dayStatisticsOutputs = await SysOperateLogService.StatisticsByDayAsync(7);
--- 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;

@@ -49,7 +47,7 @@ public partial class OrgTree : IDisposable
    private List<TreeViewItem<SysOrg>> ZItem;
    protected override async Task OnInitializedAsync()
    {
-        ZItem = new List<TreeViewItem<SysOrg>>() {new TreeViewItem<SysOrg>(new SysOrg(){ })
+        ZItem = new List<TreeViewItem<SysOrg>>() {new TreeViewItem<SysOrg>(new SysOrg())
        {
            Text = AdminLocalizer["All"],
            IsActive = Value == 0,
--- 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;

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

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

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

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

--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/User/RoleChoiceDialog.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/User/RoleChoiceDialog.razor.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using Mapster;
-
 using ThingsGateway.Admin.Application;

 namespace ThingsGateway.Admin.Razor;
@@ -47,10 +45,7 @@ public partial class RoleChoiceDialog
    private ISysRoleService? SysRoleService { get; set; }
    private async Task<QueryData<SysRole>> OnQueryAsync(QueryPageOptions options)
    {
-        var data = await SysRoleService.PageAsync(options, a => a.Where(b => b.OrgId == OrgId));
-        QueryData<SysRole> queryData = data.Adapt<QueryData<SysRole>>();
-
-        return queryData;
+        return await SysRoleService.PageAsync(options, a => a.Where(b => b.OrgId == OrgId));
    }
    #region 查询
    private long OrgId { get; set; }
--- 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;

@@ -36,9 +35,10 @@ public partial class SysUserEdit
    protected override async Task OnInitializedAsync()
    {
        BoolItems = LocalizerUtil.GetBoolItems(Model.GetType(), nameof(Model.Status));
-        var items = await SysPositionService.SelectorAsync(new PositionSelectorInput() { });
+        var items = await SysPositionService.SelectorAsync(new PositionSelectorInput());
        Items = PositionUtil.BuildCascaderItemList(items);
        ModuleSelectedItems = ResourceUtil.BuildModuleSelectList((await SysResourceService.GetAllAsync())).ToList();
+        await InvokeAsync(StateHasChanged);
        await base.OnInitializedAsync();
    }

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

--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/User/UserChoiceDialog.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/User/UserChoiceDialog.razor.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using Mapster;
-
 using ThingsGateway.Admin.Application;

 namespace ThingsGateway.Admin.Razor;
@@ -56,7 +54,7 @@ public partial class UserChoiceDialog
            OrgId = OrgId,
            PositionId = PositionId,
        });
-        QueryData<UserSelectorOutput> queryData = data.Adapt<QueryData<UserSelectorOutput>>();
+        QueryData<UserSelectorOutput> queryData = data.AdaptQueryDataUserSelectorOutput();

        return queryData;
    }
--- a/src/Admin/ThingsGateway.Admin.Razor/Pages/UserCenter/UserCenterPage.razor.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Pages/UserCenter/UserCenterPage.razor.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using Mapster;
-
 using Microsoft.AspNetCore.Components.Forms;

 using ThingsGateway.Admin.Application;
@@ -37,9 +35,9 @@ public partial class UserCenterPage

    protected override async Task OnParametersSetAsync()
    {
-        SysUser = AppContext.CurrentUser.Adapt<SysUser>();
+        SysUser = AppContext.CurrentUser.AdaptSysUser();
        SysUser.Avatar = AppContext.Avatar;
-        WorkbenchInfo = (await UserCenterService.GetLoginWorkbenchAsync(SysUser.Id)).Adapt<WorkbenchInfo>();
+        WorkbenchInfo = (await UserCenterService.GetLoginWorkbenchAsync(SysUser.Id)).AdaptWorkbenchInfo();

        await base.OnParametersSetAsync();
    }
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthRazorService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Auth/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
 {
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/HybridAuthRazorService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Auth/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
--- a/src/Admin/ThingsGateway.Admin.Application/Services/Auth/IAuthRazorService.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Services/Auth/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
 {
--- 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();
    }
 }
--- a/src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj
+++ b/src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">

-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />

 	<ItemGroup>
 		<ProjectReference Include="..\ThingsGateway.Admin.Application\ThingsGateway.Admin.Application.csproj" />
@@ -30,13 +30,14 @@
 	<ItemGroup>
 		<None Include="..\README.md" Pack="true" PackagePath="\" />
 		<None Include="..\README.zh-CN.md" Pack="true" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.md" Pack="false" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.zh-CN.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.zh-CN.md" Pack="false" PackagePath="\" />
 	</ItemGroup>


 	<ItemGroup>
 		<ProjectReference Include="..\BlazorSetParametersAsyncGenerator\BlazorSetParametersAsyncGenerator.csproj" PrivateAssets="all" OutputItemType="Analyzer" />
+		<ProjectReference Include="..\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />
 	</ItemGroup>
 	
 </Project>
--- a/src/Admin/ThingsGateway.Admin.Razor/Util/ResourceUtil.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/Util/ResourceUtil.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using Mapster;
-
 using ThingsGateway.Admin.Application;

 namespace ThingsGateway.Admin.Razor;
@@ -29,8 +27,6 @@ public static class ResourceUtil
        var data = items.Where(a => a.Category == ResourceCategoryEnum.Menu)
        .Select((item, index) =>
            new SelectedItem(item.Id.ToString(), item.Title)
-            {
-            }
        ).ToList();
        return data;
    }
@@ -122,31 +118,4 @@ public static class ResourceUtil
        return trees;
    }

-    /// <summary>
-    /// 构建树节点
-    /// </summary>
-    public static List<TreeViewItem<T>> BuildTreeItemList<T>(IEnumerable<SysResource> sysresources, List<long> selectedItems, Microsoft.AspNetCore.Components.RenderFragment<T> render, long parentId = 0, TreeViewItem<T>? parent = null, Func<SysResource, bool> disableFunc = null) where T : class
-    {
-        if (sysresources == null) return null;
-        var trees = new List<TreeViewItem<T>>();
-        var roots = sysresources.Where(i => i.ParentId == parentId).OrderBy(i => i.SortCode);
-        foreach (var node in roots)
-        {
-            var item = new TreeViewItem<T>(node.Adapt<T>())
-            {
-                Text = node.Title,
-                Icon = node.Icon,
-                IsDisabled = disableFunc == null ? false : disableFunc(node),
-                IsActive = selectedItems.Any(v => node.Id == v),
-                IsExpand = true,
-                Parent = parent,
-                Template = render,
-                CheckedState = selectedItems.Any(i => i == node.Id) ? CheckboxState.Checked : CheckboxState.UnChecked
-            };
-            item.Items = BuildTreeItemList(sysresources, selectedItems, render, node.Id, item, disableFunc) ?? new();
-            trees.Add(item);
-        }
-        return trees;
-    }
-
 }
--- 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;
--- 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"
    ]
--- 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"
    ]
--- a/src/Admin/ThingsGateway.AdminServer/Configuration/Cache.json
+++ b/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:"
+    }
+  }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
2248356998 qq.com	605830edce	10.9.62	2025-07-20 21:52:59 +08:00
2248356998 qq.com	ca86441e05	orm性能优化	2025-07-20 19:04:25 +08:00
2248356998 qq.com	b30b876c5f	更新依赖	2025-07-20 10:44:20 +08:00
2248356998 qq.com	f95590b4cb	修正拼写错误	2025-07-19 22:36:13 +08:00
2248356998 qq.com	9921130406	更新依赖	2025-07-19 21:38:19 +08:00
2248356998 qq.com	5c47589ca1	更新依赖	2025-07-19 21:31:46 +08:00
2248356998 qq.com	048abfae2e	添加可空标识	2025-07-19 13:35:55 +08:00
Diego	8e35c16edf	恢复restart标记	2025-07-18 17:46:56 +08:00
Diego	143b751213	Revert "build: 10.9.42" This reverts commit `2cafe745b9`.	2025-07-18 14:41:19 +08:00
Diego	2cafe745b9	build: 10.9.42 feat: 优化读写调度 feat: rpc日志添加执行时间字段	2025-07-18 09:48:41 +08:00
Diego	210ac2c122	更新解决方案	2025-07-18 00:02:38 +08:00
Diego	4707ce6d58	新增RemoteWebApp项目	2025-07-17 23:41:11 +08:00
2248356998 qq.com	788a8b670d	10.9.40	2025-07-16 21:18:14 +08:00
2248356998 qq.com	5e4f0057e4	更新依赖库	2025-07-15 21:24:19 +08:00
2248356998 qq.com	2960c13ef1	更新依赖库	2025-07-15 03:56:46 +08:00
2248356998 qq.com	f11b7f7ab4	10.9.37	2025-07-13 22:47:14 +08:00
Diego	9bb9cd7419	10.9.35	2025-07-11 07:14:52 +08:00
Diego	ba008ef8ba	更新.NETVersion	2025-07-09 13:35:42 +08:00
Diego	28b533decf	10.9.34	2025-07-09 13:31:08 +08:00
Diego	9ee638c2f1	更新依赖包	2025-07-08 23:59:24 +08:00
Diego	d90fdbaf35	补充更新nuget包	2025-07-08 18:15:50 +08:00
Diego	b55e3db736	10.9.29	2025-07-08 17:55:37 +08:00
Diego	dbee8496cb	opcuaServer支持decimal类型	2025-07-08 16:53:28 +08:00
Diego	044e78bea9	opcuaserver回退修改	2025-07-08 15:52:12 +08:00
Diego	fe79128d90	build: 10.9.26 fix: opcuaserver添加变量属性出现错误，已回退 refactor: 网关监控树节点保持展开状态 refactor: cache插件类日志输出	2025-07-08 14:33:27 +08:00
Diego	34120da008	ToDecimal方法添加异步捕获，防止double类型值超限	2025-07-08 11:21:06 +08:00
Diego	4c62bb0b21	10.9.25	2025-07-08 10:19:01 +08:00
Diego	46b16279c7	build: 10.9.24	2025-07-08 09:41:45 +08:00
2248356998 qq.com	0779efc5dd	refactor: 冗余服务代码修正	2025-07-08 02:38:05 +08:00
Diego	8acdb780e8	nuget本地源创建文件夹	2025-07-07 19:07:08 +08:00
Diego	2e310b919e	添加Keys文件夹	2025-07-07 16:54:58 +08:00
Diego	4155c07269	10.9.23	2025-07-07 15:20:39 +08:00
Diego	32fa833736	build: 10.9.22	2025-07-07 15:10:06 +08:00
Diego	2258f08555	build: 10.9.19	2025-07-07 13:44:19 +08:00
2248356998 qq.com	d90b32f165	refactor: 调整冗余服务代码	2025-07-07 00:15:46 +08:00
2248356998 qq.com	1492377322	refactor:调整部分插件父类	2025-07-06 01:33:15 +08:00
Diego	32eefbf545	build: 10.9.18 feat: 网关监控树节点添加右侧常用操作按钮	2025-07-04 13:54:35 +08:00
Diego	a825ca5f6f	网关监控树节点添加右侧常用操作按钮	2025-07-04 12:50:07 +08:00
Diego	e270b0c4f6	no message	2025-07-04 09:01:31 +08:00
Diego	6ae44ccf58	10.9.17	2025-07-04 08:36:37 +08:00
Diego	1aa0df6339	feat: 支持变量低内存导出	2025-07-03 23:24:56 +08:00
Diego	62c3693dbe	导出通道和设备支持IEnumerable低内存	2025-07-03 19:34:51 +08:00
Diego	e4e503c97b	build: 添加nuget.config，自定义nuget源，方便本地调试自行编译	2025-07-03 12:43:51 +08:00
2248356998 qq.com	5ec1ee7627	fix: 上次更新导致大小端配置映射错误	2025-07-02 21:51:00 +08:00
Diego	79789388fc	fix: opcuaserver动态刷新变量节点会导致新建的动态节点无法刷新订阅	2025-07-02 19:11:11 +08:00
Diego	2c4194ee18	refactor: opcua某些不存在的节点ID不再影响整体订阅，只出现日志提示	2025-07-02 15:09:52 +08:00
Diego	1b2be585af	fix: 报警分析错误设置循环	2025-07-02 14:26:25 +08:00
Diego	83736647e7	feat: S7PLC增加WString支持	2025-07-02 12:49:55 +08:00
Diego	b06405717d	build: 10.9.9 fix: timerx 池 max值取消 feat: mqttrpc支持脚本	2025-07-02 10:03:50 +08:00
2248356998 qq.com	298a1f2ed4	更新docker文件	2025-07-02 07:32:23 +08:00
Diego	74a47a1983	build: 10.9.8 支持redis缓存	2025-07-01 17:55:03 +08:00
Diego	a48a42abe4	modbusslave 异常捕获	2025-07-01 10:51:10 +08:00
Diego	feb1d0a3c5	feat: 增加后台服务生命周期识别	2025-06-30 10:59:18 +08:00
Diego	92bca824e6	10.9.6	2025-06-29 22:19:53 +08:00
2248356998 qq.com	025c699517	feat: s7增加请求id识别	2025-06-29 22:06:53 +08:00
2248356998 qq.com	53f8fbe4b1	refactor: 变量排序导出	2025-06-28 21:43:06 +08:00
2248356998 qq.com	77bfabc41d	feat: 改用Mapperly源生成，代替Mapster	2025-06-28 00:00:43 +08:00
Diego	6427ee6ee0	refactor：降低sqlite依赖	2025-06-27 14:44:00 +08:00
Diego	4c95997d62	build: 10.9.2 fix: taos connection dispose refactor: opcua AddSubscriptionAsync 添加延时和重试	2025-06-27 11:16:58 +08:00
Diego	1d82cea40d	build: 10.9.1 fix: 任务空错误异常 feat: 数据库插件增加字符串变量表和数值变量表两种情况	2025-06-27 03:02:03 +08:00
Diego	e78799424c	添加日志输出筛选	2025-06-25 17:09:05 +08:00
Diego	1000c8d38f	docs: 更新采集插件开发文档	2025-06-25 14:22:58 +08:00
Diego	b2589fc634	build: 10.8.24 fix: 变量离线后再次上线，如果值不变，会导致在线状态不刷新 fix: s7离线恢复时，可能触发多次协议握手导致异常	2025-06-25 11:19:06 +08:00
Diego	c80e57a4e8	build: 10.8.24 fix: 变量离线后再次上线，如果值不变，会导致在线状态不刷新 fix: s7离线恢复时，可能触发多次协议握手导致异常	2025-06-25 11:17:04 +08:00
Diego	6510c3e289	feat: 增加一个变量读写表达式常用转换的友好编辑界面	2025-06-24 16:14:35 +08:00
Diego	920e407d05	恢复规则引擎脚本接口	2025-06-24 10:52:00 +08:00
Diego	7314c8901d	fix: 用户编辑框初始刷新职位	2025-06-24 09:15:33 +08:00
Diego	4e9f02b48c	更新依赖包	2025-06-24 09:03:34 +08:00
2248356998 qq.com	9ae7602cb4	配置最大连接数	2025-06-24 00:09:07 +08:00
2248356998 qq.com	aa8aa36aef	build: 10.8.19 fix: s7 复用地址对象导致读取异常 feat: 规则引擎node添加内部异常捕获 feat: 变量增加属性: 写入后再次读取检查值是否一致	2025-06-23 21:21:27 +08:00
2248356998 qq.com	0174f7c6f2	更新依赖	2025-06-22 23:05:12 +08:00
2248356998 qq.com	df9e7d6ff1	10.8.17	2025-06-22 21:11:37 +08:00
Diego	b40ca920d3	fix: 变量自动刷新运行态	2025-06-20 16:58:45 +08:00
Diego	5a4b0a0e93	修改插件过期提示	2025-06-20 14:43:13 +08:00
Diego	a879edd68b	10.8.12	2025-06-20 13:52:42 +08:00
Diego	62e0a6ee9d	gitee登录按钮隐藏	2025-06-19 17:04:22 +08:00
Diego	765e5564d4	10.8.10	2025-06-19 16:56:04 +08:00
Diego	10eecac19b	feat: 优化设备状态逻辑	2025-06-19 11:41:43 +08:00