更新依赖库

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

LICENSE

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

src/Admin/BlazorSetParametersAsyncGenerator/AnalyzerReleases.Shipped.md

@@ -0,0 +1,6 @@
+## Release 1.0
+
+### New Rules
+Rule ID | Category | Severity | Notes
+--------|----------|----------|--------------------
+TG0001 | Conflict | Error | SetParametersAsyncGenerator

src/Admin/BlazorSetParametersAsyncGenerator/BlazorSetParametersAsyncGenerator.csproj

@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<Import Project="..\..\PackNuget.props" />
+	<PropertyGroup>
+		<TargetFrameworks>netstandard2.0;</TargetFrameworks>
+		<Version>$(SourceGeneratorVersion)</Version>
+		<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+		<NoPackageAnalysis>true</NoPackageAnalysis>
+		<SignAssembly>false</SignAssembly>
+
+		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+		<IncludeBuildOutput>false</IncludeBuildOutput>
+		<!-- 避免 DLL 被打包到 lib/ -->
+		<EnableSourceGenerator>true</EnableSourceGenerator>
+		<!-- 可选 -->
+
+		
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Include="$(OutputPath)\$(TargetFileName)" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+	</ItemGroup>
+	
+
+	<ItemGroup>
+		<AdditionalFiles Include="AnalyzerReleases.Shipped.md" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" PrivateAssets="all" Private="false" />
+	</ItemGroup>
+</Project>

src/Admin/BlazorSetParametersAsyncGenerator/GlobalUsings.cs

@@ -7,5 +7,3 @@
 //  使用文档：https://thingsgateway.cn/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
-global using System;

src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/SetParametersAsyncGenerator.cs

@@ -0,0 +1,439 @@
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+
+using System.Text;
+
+namespace Microsoft.AspNetCore.Components;
+
+[Generator]
+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 const string m_GenerateSetParametersAsyncAttribute = """ 
+    using System;
+    namespace Microsoft.AspNetCore.Components
+    {
+        [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
+        internal sealed class GenerateSetParametersAsyncAttribute : Attribute
+        {
+            public bool RequireExactMatch { get; set; }
+        }
+    }
+""";
+
+    private const string m_GlobalGenerateSetParametersAsyncAttribute = """ 
+    using System;
+    namespace Microsoft.AspNetCore.Components
+    {
+        [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",
+        title: "Parameter name conflict",
+        messageFormat: "Parameter names are case insensitive. {0} conflicts with {1}.",
+        category: "Conflict",
+        defaultSeverity: DiagnosticSeverity.Error,
+        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(IncrementalGeneratorInitializationContext context)
+    {
+        // 注入 attribute 源码
+        context.RegisterPostInitializationOutput(ctx =>
+        {
+            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));
+        });
+
+        // 筛选 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);
+        });
+    }
+
+    private static void Execute(SourceProductionContext context, Compilation compilation, ClassDeclarationSyntax classDeclaration)
+    {
+        var model = compilation.GetSemanticModel(classDeclaration.SyntaxTree);
+        var classSymbol = model.GetDeclaredSymbol(classDeclaration);
+        if (classSymbol is null || classSymbol.Name == "_Imports")
+            return;
+
+        var positiveAttr = compilation.GetTypeByMetadataName("Microsoft.AspNetCore.Components.GenerateSetParametersAsyncAttribute");
+        var negativeAttr = compilation.GetTypeByMetadataName("Microsoft.AspNetCore.Components.DoNotGenerateSetParametersAsyncAttribute");
+
+        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(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();
+        var type_kind = class_symbol.TypeKind switch { TypeKind.Class => "class", TypeKind.Interface => "interface", _ => "struct" };
+        var type_parameters = string.Join(", ", class_symbol.TypeArguments.Select(t => t.Name));
+        type_parameters = string.IsNullOrEmpty(type_parameters) ? type_parameters : "<" + type_parameters + ">";
+        context.AddCode(class_symbol.ToDisplayString() + "_override.cs", $@"
+using Microsoft.AspNetCore.Components;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+#pragma warning disable CA2007
+#pragma warning disable CS0162
+#pragma warning disable CS8632
+namespace {namespaceName}
+{{
+    public partial class {class_symbol.Name}{type_parameters}
+    {{
+        private bool _initialized;
+
+        /// <summary>
+        /// <inheritdoc/>
+        /// </summary>
+        public override Task SetParametersAsync(ParameterView parameters)
+        {{
+            Dictionary<string,object?> parameterValues = new();
+            foreach (var parameter in parameters)
+            {{
+              if(BlazorImplementation__WriteSingleParameter(parameter.Name, parameter.Value)==false)
+              {{
+                  // 如果没有处理参数，则添加到参数列表中
+                  parameterValues.Add(parameter.Name, parameter.Value);
+              }}
+            }}
+            
+            if(parameterValues.Count > 0)
+            {{
+                parameters.SetParameterProperties(this);
+            }}
+            if (!_initialized)
+            {{
+                _initialized = true;
+
+                return RunInitAndSetParametersAsync();
+            }}
+            else
+            {{
+                return CallOnParametersSetAsync();
+            }}
+        }}
+
+        // We do not want the debugger to consider NavigationExceptions caught by this method as user-unhandled.
+    #if NET9_0_OR_GREATER
+        [System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
+    #endif
+        private async Task RunInitAndSetParametersAsync()
+        {{
+            Task task;
+
+            try
+            {{
+                OnInitialized();
+                task = OnInitializedAsync();
+            }}
+            catch (Exception ex) when (ex is not NavigationException)
+            {{
+                throw;
+            }}
+
+            if (task.Status != TaskStatus.RanToCompletion && task.Status != TaskStatus.Canceled)
+            {{
+                // Call state has changed here so that we render after the sync part of OnInitAsync has run
+                // and wait for it to finish before we continue. If no async work has been done yet, we want
+                // to defer calling StateHasChanged up until the first bit of async code happens or until
+                // the end. Additionally, we want to avoid calling StateHasChanged if no
+                // async work is to be performed.
+                StateHasChanged();
+
+                try
+                {{
+                    await task;
+                }}
+                catch // avoiding exception filters for AOT runtime support
+                {{
+                    // Ignore exceptions from task cancellations.
+                    // Awaiting a canceled task may produce either an OperationCanceledException (if produced as a consequence of
+                    // CancellationToken.ThrowIfCancellationRequested()) or a TaskCanceledException (produced as a consequence of awaiting Task.FromCanceled).
+                    // It's much easier to check the state of the Task (i.e. Task.IsCanceled) rather than catch two distinct exceptions.
+                    if (!task.IsCanceled)
+                    {{
+                        throw;
+                    }}
+                }}
+
+                // Don't call StateHasChanged here. CallOnParametersSetAsync should handle that for us.
+            }}
+
+            await CallOnParametersSetAsync();
+        }}
+
+        // We do not want the debugger to consider NavigationExceptions caught by this method as user-unhandled.
+    #if NET9_0_OR_GREATER
+        [System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
+    #endif
+        private Task CallOnParametersSetAsync()
+        {{
+            Task task;
+
+            try
+            {{
+                OnParametersSet();
+                task = OnParametersSetAsync();
+            }}
+            catch (Exception ex) when (ex is not NavigationException)
+            {{
+    #if NET9_0_OR_GREATER
+                System.Diagnostics.Debugger.BreakForUserUnhandledException(ex);
+    #endif
+                throw;
+            }}
+
+            // If no async work is to be performed, i.e. the task has already ran to completion
+            // or was canceled by the time we got to inspect it, avoid going async and re-invoking
+            // StateHasChanged at the culmination of the async work.
+            var shouldAwaitTask = task.Status != TaskStatus.RanToCompletion &&
+                task.Status != TaskStatus.Canceled;
+
+            // We always call StateHasChanged here as we want to trigger a rerender after OnParametersSet and
+            // the synchronous part of OnParametersSetAsync has run.
+            StateHasChanged();
+
+            return shouldAwaitTask ?
+                CallStateHasChangedOnAsyncCompletion(task) :
+                Task.CompletedTask;
+        }}
+
+        // We do not want the debugger to stop more than once per user-unhandled exception.
+    #if NET9_0_OR_GREATER
+        [System.Diagnostics.DebuggerDisableUserUnhandledExceptions]
+    #endif
+        private async Task CallStateHasChangedOnAsyncCompletion(Task task)
+        {{
+            try
+            {{
+                await task;
+            }}
+            catch // avoiding exception filters for AOT runtime support
+            {{
+                // Ignore exceptions from task cancellations, but don't bother issuing a state change.
+                if (task.IsCanceled)
+                {{
+                    return;
+                }}
+
+                throw;
+            }}
+
+            StateHasChanged();
+        }}
+
+    }}
+}}
+#pragma warning restore CS8632
+#pragma warning restore CS0162
+#pragma warning restore CA2007
+");
+        var bases = class_symbol.GetTypeHierarchy().Where(t => !SymbolEqualityComparer.Default.Equals(t, class_symbol));
+        var members = class_symbol.GetMembers() // members of the type itself
+            .Concat(bases.SelectMany(t => t.GetMembers().Where(m => m.DeclaredAccessibility != Accessibility.Private))) // plus accessible members of any base
+            .Distinct(SymbolEqualityComparer.Default);
+        var property_symbols = members.OfType<IPropertySymbol>();
+        var writable_property_symbols = property_symbols.Where(ps =>
+            !ps.IsReadOnly || ps.GetAttributes().Any(a =>
+                a.AttributeClass?.Name is "CascadingParameter" or "CascadingParameterAttribute")
+        );
+
+        var parameter_symbols = writable_property_symbols
+            .Where(ps => ps.GetAttributes().Any(a => false
+            || a.AttributeClass.Name == "Parameter"
+            || a.AttributeClass.Name == "ParameterAttribute"
+            || a.AttributeClass.Name == "CascadingParameter"
+            || a.AttributeClass.Name == "CascadingParameterAttribute"
+
+        ));
+        var name_conflicts = parameter_symbols.GroupBy(ps => ps.Name.ToLowerInvariant()).Where(g => g.Count() > 1);
+        foreach (var conflict in name_conflicts)
+        {
+            var key = conflict.Key;
+            var conflicting_parameters = conflict.ToList();
+            foreach (var parameter in conflicting_parameters)
+            {
+                var this_name = parameter.Name;
+                var conflicting_name = conflicting_parameters.Select(p => p.Name).FirstOrDefault(n => n != this_name);
+                foreach (var location in parameter.Locations)
+                {
+                    context.ReportDiagnostic(Diagnostic.Create(ParameterNameConflict, location, this_name, conflicting_name));
+                }
+            }
+        }
+        var all = parameter_symbols.ToList();
+        var catch_all_parameter = parameter_symbols.FirstOrDefault(p =>
+        {
+            var parameter_attr = p.GetAttributes().FirstOrDefault(a => a.AttributeClass!.Name.StartsWith("Parameter"));
+            return parameter_attr?.NamedArguments.Any(n => n.Key == "CaptureUnmatchedValues" && n.Value.Value is bool v && v) == true;
+        });
+        var lower_case_match_cases = parameter_symbols.Except(new[] { catch_all_parameter }).Select(p => $"case \"{p.Name.ToLowerInvariant()}\": this.{p.Name} = ({p.Type.ToDisplayString()}) value; break;");
+        var lower_case_match_default = catch_all_parameter == null ? @"default: {return false;}" : $@"
+default:
+{{
+    this.{catch_all_parameter.Name} ??= new System.Collections.Generic.Dictionary<string, object>();
+    var writable_dict = this.{catch_all_parameter.Name};
+    if (!writable_dict.TryAdd(name, value))
+    {{
+        writable_dict[name] = value;
+    }}
+    break;
+}}";
+
+        var exact_match_cases = parameter_symbols.Except(new[] { catch_all_parameter }).Select(p => $"case \"{p!.Name}\": this.{p.Name} = ({p.Type.ToDisplayString()}) value; break;");
+        string exact_match_default;
+        if (force_exact_match)
+        {
+            if (catch_all_parameter == null) // exact matches are forced, and we do not have a catch-all parameter, therefore we need to throw on unmatched parameter
+            {
+                exact_match_default = @"default: { return false;";
+            }
+            else // exact matches are forced, and we DO have a catch-all parameter, therefore we simply add that unmatched parameter to the dictionary
+            {
+                exact_match_default = $@"
+default:
+{{
+    this.{catch_all_parameter.Name} ??= new System.Collections.Generic.Dictionary<string, object>();
+    var writable_dict = this.{catch_all_parameter.Name};
+    if (!writable_dict.TryAdd(name, value))
+    {{
+        writable_dict[name] = value;
+    }}
+    break;
+}}";
+            }
+        }
+        else
+        {
+            // exact matches are not forced, so if there is no exact match, we fall back to compare it in lower case
+            exact_match_default = $@"
+default:
+{{
+    switch (name.ToLowerInvariant())
+    {{
+        {string.Join("\n", lower_case_match_cases)}
+        {lower_case_match_default}
+    }}
+    break;
+}}
+";
+        }
+        context.AddCode(class_symbol.ToDisplayString() + "_implementation.cs", $@"
+using System;
+
+#pragma warning disable CS0162
+#pragma warning disable CS0618
+#pragma warning disable CS8632
+namespace {namespaceName}
+{{
+    public partial class {class_symbol.Name}{type_parameters}
+    {{
+
+        private bool BlazorImplementation__WriteSingleParameter(string name, object value)
+        {{
+            if(name != ""Body"")
+            {{
+
+                switch (name)
+                {{
+                    {string.Join("\n", exact_match_cases)}
+                    {exact_match_default}
+                }}
+                return true;
+            }}
+           return false;
+         }}
+    }}
+}}
+#pragma warning restore CS8632
+#pragma warning restore CS0618
+#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
+            .GetMembers("SetParametersAsync")
+            .OfType<IMethodSymbol>()
+            .Any(m =>
+                m.Parameters.Length == 1 &&
+                m.Parameters[0].Type.ToDisplayString() == "Microsoft.AspNetCore.Components.ParameterView" &&
+                m.DeclaredAccessibility == Accessibility.Public &&
+                !m.IsStatic);
+    }
+
+}

src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/SourceGeneratorContextExtension.cs

@@ -0,0 +1,15 @@
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+
+using System.Text;
+
+namespace Microsoft.AspNetCore.Components
+{
+    internal static class SourceGeneratorContextExtension
+    {
+        public static void AddCode(this SourceProductionContext context, string hint_name, string code)
+        {
+            context.AddSource(hint_name.Replace("<", "_").Replace(">", "_"), SourceText.From(code, Encoding.UTF8));
+        }
+    }
+}

src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/TypeSymbolExtension.cs

@@ -0,0 +1,19 @@
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Components
+{
+    public static class TypeSymbolExtension
+    {
+        public static IEnumerable<INamedTypeSymbol> GetTypeHierarchy(this INamedTypeSymbol symbol)
+        {
+            yield return symbol;
+            if (symbol.BaseType != null)
+            {
+                foreach (var type in GetTypeHierarchy(symbol.BaseType))
+                {
+                    yield return type;
+                }
+            }
+        }
+    }
+}

src/Admin/BlazorSetParametersAsyncGenerator/tools/install.ps1

@@ -0,0 +1,49 @@
+param($installPath, $toolsPath, $package, $project)
+
+$analyzersPaths = Join-Path (Join-Path (Split-Path -Path $toolsPath -Parent) "analyzers" ) * -Resolve
+
+foreach($analyzersPath in $analyzersPaths)
+{
+    # Install the language agnostic analyzers.
+    if (Test-Path $analyzersPath)
+    {
+        foreach ($analyzerFilePath in Get-ChildItem $analyzersPath -Filter *.dll)
+        {
+            if($project.Object.AnalyzerReferences)
+            {
+                $project.Object.AnalyzerReferences.Add($analyzerFilePath.FullName)
+            }
+        }
+    }
+}
+
+# $project.Type gives the language name like (C# or VB.NET)
+$languageFolder = ""
+if($project.Type -eq "C#")
+{
+    $languageFolder = "cs"
+}
+if($project.Type -eq "VB.NET")
+{
+    $languageFolder = "vb"
+}
+if($languageFolder -eq "")
+{
+    return
+}
+
+foreach($analyzersPath in $analyzersPaths)
+{
+    # Install language specific analyzers.
+    $languageAnalyzersPath = join-path $analyzersPath $languageFolder
+    if (Test-Path $languageAnalyzersPath)
+    {
+        foreach ($analyzerFilePath in Get-ChildItem $languageAnalyzersPath -Filter *.dll)
+        {
+            if($project.Object.AnalyzerReferences)
+            {
+                $project.Object.AnalyzerReferences.Add($analyzerFilePath.FullName)
+            }
+        }
+    }
+}

src/Admin/BlazorSetParametersAsyncGenerator/tools/uninstall.ps1

@@ -0,0 +1,56 @@
+param($installPath, $toolsPath, $package, $project)
+
+$analyzersPaths = Join-Path (Join-Path (Split-Path -Path $toolsPath -Parent) "analyzers" ) * -Resolve
+
+foreach($analyzersPath in $analyzersPaths)
+{
+    # Uninstall the language agnostic analyzers.
+    if (Test-Path $analyzersPath)
+    {
+        foreach ($analyzerFilePath in Get-ChildItem $analyzersPath -Filter *.dll)
+        {
+            if($project.Object.AnalyzerReferences)
+            {
+                $project.Object.AnalyzerReferences.Remove($analyzerFilePath.FullName)
+            }
+        }
+    }
+}
+
+# $project.Type gives the language name like (C# or VB.NET)
+$languageFolder = ""
+if($project.Type -eq "C#")
+{
+    $languageFolder = "cs"
+}
+if($project.Type -eq "VB.NET")
+{
+    $languageFolder = "vb"
+}
+if($languageFolder -eq "")
+{
+    return
+}
+
+foreach($analyzersPath in $analyzersPaths)
+{
+    # Uninstall language specific analyzers.
+    $languageAnalyzersPath = join-path $analyzersPath $languageFolder
+    if (Test-Path $languageAnalyzersPath)
+    {
+        foreach ($analyzerFilePath in Get-ChildItem $languageAnalyzersPath -Filter *.dll)
+        {
+            if($project.Object.AnalyzerReferences)
+            {
+                try
+                {
+                    $project.Object.AnalyzerReferences.Remove($analyzerFilePath.FullName)
+                }
+                catch
+                {
+
+                }
+            }
+        }
+    }
+}

src/Admin/ThingsGateway.Admin.Application/Aop/OperDescAttribute.cs

@@ -90,13 +90,12 @@ public sealed class OperDescAttribute : MoAttribute
             OperDescAttribute.WriteToQueue(log);
         }
     }
-
+    private static SqlSugarClient _db = DbContext.GetDB<SysOperateLog>();
     /// <summary>
     /// 将日志消息写入数据库中
     /// </summary>
     private static async Task ProcessQueue()
     {
-        var db = DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
         var appLifetime = App.RootServices!.GetService<IHostApplicationLifetime>()!;
         while (!appLifetime.ApplicationStopping.IsCancellationRequested)
         {
@@ -105,7 +104,7 @@ public sealed class OperDescAttribute : MoAttribute
                 var data = _logMessageQueue.ToListWithDequeue(); // 从日志队列中获取数据
                 if (data.Count > 0)
                 {
-                    await db.InsertableWithAttr(data).ExecuteCommandAsync(appLifetime.ApplicationStopping).ConfigureAwait(false);//入库
+                    await _db.InsertableWithAttr(data).ExecuteCommandAsync(appLifetime.ApplicationStopping).ConfigureAwait(false);//入库
                 }
             }
             catch (Exception ex)

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

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

src/Admin/ThingsGateway.Admin.Application/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;
     }

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

@@ -8,12 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using System.ComponentModel.DataAnnotations;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 [SugarTable("sys_dict", TableDescription = "字典表")]

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

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

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

@@ -8,12 +8,8 @@
 // QQ群：605534569
 // ------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using System.ComponentModel.DataAnnotations;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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

@@ -8,11 +8,9 @@
 // QQ群：605534569
 // ------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using System.ComponentModel.DataAnnotations;
 
-using ThingsGateway.SqlSugar;
+
 
 namespace ThingsGateway.Admin.Application;
 

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

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

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

@@ -8,16 +8,12 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using Microsoft.AspNetCore.Components.Routing;
 
 using Newtonsoft.Json;
 
 using System.ComponentModel.DataAnnotations;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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

@@ -8,12 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using System.ComponentModel.DataAnnotations;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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

@@ -8,14 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
-using 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>

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

@@ -8,10 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
-using ThingsGateway.List;
-using ThingsGateway.SqlSugar;
+using ThingsGateway.Common.List;
 
 namespace ThingsGateway.Admin.Application;
 

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

@@ -8,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;
+        }
     }
+
 }

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;
@@ -267,7 +267,7 @@ public class RequestAuditFilter : IAsyncActionFilter, IOrderedFilter
         }
         else
         {
-            logger.Log(LogLevel.Warning, $"{logData.Method}:{logData.Path}-{logData.Operation}{Environment.NewLine}{logData.Exception.ToSystemTextJsonString()}");
+            logger.Log(LogLevel.Warning, $"{logData.Method}:{logData.Path}-{logData.Operation}{Environment.NewLine}{logData.Exception?.ToSystemTextJsonString()}{Environment.NewLine}{logData.Validation?.ToSystemTextJsonString()}");
         }
     }
 

src/Admin/ThingsGateway.Admin.Application/Gitee/AdminOAuthOptions.cs

@@ -1,40 +0,0 @@
-using Microsoft.AspNetCore.Authentication.OAuth;
-
-using System.Text.Json;
-
-namespace ThingsGateway.Admin.Application;
-
-/// <summary>OAuthOptions 配置类</summary>
-public abstract class AdminOAuthOptions : OAuthOptions
-{
-    /// <summary>默认构造函数</summary>
-    protected AdminOAuthOptions()
-    {
-        ConfigureClaims();
-        this.Events.OnRemoteFailure = context =>
-        {
-            var redirectUri = string.IsNullOrEmpty(HomePath) ? "/" : HomePath;
-            context.Response.Redirect(redirectUri);
-            context.HandleResponse();
-            return Task.CompletedTask;
-        };
-
-
-    }
-
-    /// <summary>配置 Claims 映射</summary>
-    protected virtual void ConfigureClaims()
-    {
-
-    }
-
-    public virtual string GetName(JsonElement element)
-    {
-        JsonElement.ObjectEnumerator target = element.EnumerateObject();
-        return target.TryGetValue("name");
-    }
-
-    /// <summary>获得/设置 登陆后首页</summary>
-    public string HomePath { get; set; } = "/";
-
-}

src/Admin/ThingsGateway.Admin.Application/Gitee/GiteeOAuthUser.cs

@@ -1,12 +0,0 @@
-namespace ThingsGateway.Admin.Application;
-
-public class GiteeOAuthUser
-{
-    public string Id { get; set; }
-
-    public string Login { get; set; }
-
-    public string Name { get; set; }
-
-    public string Avatar_Url { get; set; }
-}

src/Admin/ThingsGateway.Admin.Application/Gitee/OAuthUserExtensions.cs

@@ -1,22 +0,0 @@
-using System.Text.Json;
-
-namespace ThingsGateway.Admin.Application;
-
-public static class OAuthUserExtensions
-{
-    public static GiteeOAuthUser ToAuthUser(this JsonElement element)
-    {
-        GiteeOAuthUser authUser = new GiteeOAuthUser();
-        JsonElement.ObjectEnumerator target = element.EnumerateObject();
-        authUser.Id = target.TryGetValue("id");
-        authUser.Login = target.TryGetValue("login");
-        authUser.Name = target.TryGetValue("name");
-        authUser.Avatar_Url = target.TryGetValue("avatar_url");
-        return authUser;
-    }
-
-    public static string TryGetValue(this JsonElement.ObjectEnumerator target, string propertyName)
-    {
-        return target.FirstOrDefault<JsonProperty>((Func<JsonProperty, bool>)(t => t.Name.Equals(propertyName, StringComparison.OrdinalIgnoreCase))).Value.ToString() ?? string.Empty;
-    }
-}

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

@@ -8,5 +8,15 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-global using ThingsGateway;
-global using ThingsGateway.NewLife.Extension;
+global using BootstrapBlazor.Components;
+
+global using Microsoft.Extensions.Localization;
+global using Microsoft.Extensions.Options;
+
+global using System.Diagnostics.CodeAnalysis;
+global using System.Globalization;
+
+global using ThingsGateway.Common;
+global using ThingsGateway.DB;
+global using ThingsGateway.NewLife.Extension;
+global using ThingsGateway.SqlSugar;

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

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

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

@@ -9,9 +9,7 @@
 // ------------------------------------------------------------------------------
 
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 using System.Runtime.InteropServices;
 
@@ -52,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.Db.GetConnectionScopeWithAttr<HistoryHardwareInfo>().CopyNew();
-            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);
         }
@@ -70,6 +68,7 @@ public class HardwareJob : IJob, IHardwareJob
 
     private bool error = false;
     private DateTime hisInsertTime = default;
+    private SqlSugarClient _db = DbContext.GetDB<HistoryHardwareInfo>();
 
     public async Task ExecuteAsync(JobExecutingContext context, CancellationToken stoppingToken)
     {
@@ -79,8 +78,7 @@ public class HardwareJob : IJob, IHardwareJob
             {
                 if (HardwareInfo.MachineInfo == null)
                 {
-                    await MachineInfo.RegisterAsync().ConfigureAwait(false);
-                    HardwareInfo.MachineInfo = MachineInfo.Current;
+                    HardwareInfo.MachineInfo = MachineInfo.GetCurrent();
 
                     string currentPath = Directory.GetCurrentDirectory();
                     DriveInfo drive = new(Path.GetPathRoot(currentPath));
@@ -121,7 +119,6 @@ public class HardwareJob : IJob, IHardwareJob
                     if (DateTime.Now > hisInsertTime.Add(TimeSpan.FromMilliseconds(HardwareInfoOptions.HistoryInterval)))
                     {
                         hisInsertTime = DateTime.Now;
-                        using var db = DbContext.Db.GetConnectionScopeWithAttr<HistoryHardwareInfo>().CopyNew();
                         {
                             var his = new HistoryHardwareInfo()
                             {
@@ -132,12 +129,12 @@ 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.Insertable(his).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
                             MemoryCache.Remove(CacheKey);
                         }
                         var sevenDaysAgo = TimerX.Now.AddDays(-HardwareInfoOptions.DaysAgo);
                         //删除特定信息
-                        var result = await db.Deleteable<HistoryHardwareInfo>(a => a.Date <= sevenDaysAgo).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
+                        var result = await _db.Deleteable<HistoryHardwareInfo>(a => a.Date <= sevenDaysAgo).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
                         if (result > 0)
                         {
                             MemoryCache.Remove(CacheKey);

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

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

src/Admin/ThingsGateway.Admin.Application/Job/LogJob/LogJob.cs

@@ -27,7 +27,7 @@ public class LogJob : IJob
 
     private static async Task DeleteSysOperateLog(int daysAgo, CancellationToken stoppingToken)
     {
-        using var db = DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
+        using var db = DbContext.GetDB<SysOperateLog>();
         var time = DateTime.Now.AddDays(-daysAgo);
         await db.DeleteableWithAttr<SysOperateLog>().Where(u => u.OpTime < time).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false); // 删除操作日志
     }

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;
 
@@ -143,7 +141,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
 
         if (flush)
         {
-            SqlSugarClient ??= DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
+            SqlSugarClient ??= DbContext.GetDB<SysOperateLog>();
             await SqlSugarClient.InsertableWithAttr(_operateLogMessageQueue.ToListWithDequeue()).ExecuteCommandAsync().ConfigureAwait(false);//入库
             return true;
         }
@@ -202,7 +200,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
 
         if (flush)
         {
-            SqlSugarClient ??= DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
+            SqlSugarClient ??= DbContext.GetDB<SysOperateLog>();
             await SqlSugarClient.InsertableWithAttr(_operateLogMessageQueue.ToListWithDequeue()).ExecuteCommandAsync().ConfigureAwait(false);//入库
             return true;
         }

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

src/Admin/ThingsGateway.Admin.Application/OAuth/AdminOAuthHandler.cs

@@ -1,18 +1,13 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.OAuth;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 using System.Collections.Concurrent;
-using System.Net.Http.Headers;
 using System.Security.Claims;
-using System.Text;
 using System.Text.Encodings.Web;
-using System.Text.Json;
 
 using ThingsGateway.Extension;
 
@@ -50,7 +45,7 @@ public class AdminOAuthHandler<TOptions>(
     /// </summary>
     private static async Task Insertable()
     {
-        var db = DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
+        var db = DbContext.GetDB<SysOperateLog>();
         var appLifetime = App.RootServices!.GetService<IHostApplicationLifetime>()!;
         while (!appLifetime.ApplicationStopping.IsCancellationRequested)
         {
@@ -80,6 +75,7 @@ public class AdminOAuthHandler<TOptions>(
         AuthenticationProperties properties,
         OAuthTokenResponse tokens)
     {
+        Backchannel.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", tokens.AccessToken);
         properties.RedirectUri = Options.HomePath;
         properties.IsPersistent = true;
         var appConfig = await configService.GetAppConfigAsync().ConfigureAwait(false);
@@ -90,7 +86,7 @@ public class AdminOAuthHandler<TOptions>(
             properties.ExpiresUtc = TimeProvider.System.GetUtcNow().AddSeconds(result);
             expire = (int)(result / 60.0);
         }
-        var user = await HandleUserInfoAsync(tokens).ConfigureAwait(false);
+        var user = await Options.HandleUserInfoAsync(Context, tokens).ConfigureAwait(false);
 
         var loginEvent = await GetLogin(expire).ConfigureAwait(false);
         await UpdateUser(loginEvent).ConfigureAwait(false);
@@ -148,43 +144,8 @@ public class AdminOAuthHandler<TOptions>(
     }
 
 
-    /// <summary>处理用户信息方法</summary>
-    protected virtual async Task<JsonElement> HandleUserInfoAsync(OAuthTokenResponse tokens)
-    {
-        var request = new HttpRequestMessage(HttpMethod.Get, BuildUserInfoUrl(tokens));
-        request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
 
-        var response = await Backchannel.SendAsync(request, Context.RequestAborted).ConfigureAwait(false);
 
-        var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-
-        if (response.IsSuccessStatusCode)
-        {
-            return JsonDocument.Parse(content).RootElement;
-        }
-
-        throw new OAuthTokenException($"OAuth user info endpoint failure: {await Display(response).ConfigureAwait(false)}");
-    }
-
-    /// <summary>生成用户信息请求地址方法</summary>
-    protected virtual string BuildUserInfoUrl(OAuthTokenResponse tokens)
-    {
-        return QueryHelpers.AddQueryString(Options.UserInformationEndpoint, new Dictionary<string, string>
-        {
-            { "access_token", tokens.AccessToken }
-        });
-    }
-
-    /// <summary>生成错误信息方法</summary>
-    protected static async Task<string> Display(HttpResponseMessage response)
-    {
-        var output = new StringBuilder();
-        output.Append($"Status: {response.StatusCode}; ");
-        output.Append($"Headers: {response.Headers}; ");
-        output.Append($"Body: {await response.Content.ReadAsStringAsync().ConfigureAwait(false)};");
-
-        return output.ToString();
-    }
 
     private async Task<LoginEvent> GetLogin(int expire)
     {
@@ -247,7 +208,7 @@ public class AdminOAuthHandler<TOptions>(
 
         #endregion 重新赋值属性,设置本次登录信息为最新的信息
 
-        using var db = DbContext.Db.GetConnectionScopeWithAttr<SysUser>().CopyNew();
+        using var db = DbContext.GetDB<SysUser>();
         //更新用户登录信息
         if (await db.Updateable(sysUser).UpdateColumns(it => new
         {

src/Admin/ThingsGateway.Admin.Application/OAuth/AdminOAuthOptions.cs

@@ -0,0 +1,87 @@
+using Microsoft.AspNetCore.Authentication.OAuth;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.WebUtilities;
+
+using System.Net.Http.Headers;
+using System.Text;
+using System.Text.Json;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>OAuthOptions 配置类</summary>
+public abstract class AdminOAuthOptions : OAuthOptions
+{
+    /// <summary>默认构造函数</summary>
+    protected AdminOAuthOptions()
+    {
+        ConfigureClaims();
+        this.Events.OnRemoteFailure = context =>
+        {
+            var redirectUri = string.IsNullOrEmpty(HomePath) ? "/" : HomePath;
+            context.Response.Redirect(redirectUri);
+            context.HandleResponse();
+            return Task.CompletedTask;
+        };
+
+        Backchannel = new HttpClient(new HttpClientHandler
+        {
+            ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
+        });
+        Backchannel.DefaultRequestHeaders.UserAgent.Add(
+            new ProductInfoHeaderValue("ThingsGateway", "1.0"));
+    }
+
+    /// <summary>配置 Claims 映射</summary>
+    protected virtual void ConfigureClaims()
+    {
+
+    }
+
+    public virtual string GetName(JsonElement element)
+    {
+        JsonElement.ObjectEnumerator target = element.EnumerateObject();
+        return target.TryGetValue("name");
+    }
+
+    /// <summary>获得/设置 登陆后首页</summary>
+    public string HomePath { get; set; } = "/";
+
+
+
+    /// <summary>处理用户信息方法</summary>
+    public virtual async Task<JsonElement> HandleUserInfoAsync(HttpContext context, OAuthTokenResponse tokens)
+    {
+        var request = new HttpRequestMessage(HttpMethod.Get, BuildUserInfoUrl(tokens));
+        request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+        var response = await Backchannel.SendAsync(request, context.RequestAborted).ConfigureAwait(false);
+
+        var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+        if (response.IsSuccessStatusCode)
+        {
+            return JsonDocument.Parse(content).RootElement;
+        }
+
+        throw new OAuthTokenException($"OAuth user info endpoint failure: {await Display(response).ConfigureAwait(false)}");
+    }
+
+    /// <summary>生成用户信息请求地址方法</summary>
+    protected virtual string BuildUserInfoUrl(OAuthTokenResponse tokens)
+    {
+        return QueryHelpers.AddQueryString(UserInformationEndpoint, new Dictionary<string, string>
+        {
+            { "access_token", tokens.AccessToken }
+        });
+    }
+    /// <summary>生成错误信息方法</summary>
+    protected async Task<string> Display(HttpResponseMessage response)
+    {
+        var output = new StringBuilder();
+        output.Append($"Status: {response.StatusCode}; ");
+        output.Append($"Headers: {response.Headers}; ");
+        output.Append($"Body: {await response.Content.ReadAsStringAsync().ConfigureAwait(false)};");
+
+        return output.ToString();
+    }
+}

src/Admin/ThingsGateway.Admin.Application/OAuth/Gitee/GiteeOAuthOptions.cs

@@ -3,16 +3,20 @@ using Microsoft.AspNetCore.Authentication.OAuth;
 using Microsoft.AspNetCore.WebUtilities;
 
 using System.Net.Http.Headers;
-using System.Text;
 using System.Text.Json;
 
+using ThingsGateway.NewLife.Log;
+
 namespace ThingsGateway.Admin.Application;
 
 public class GiteeOAuthOptions : AdminOAuthOptions
 {
-
+    INoticeService _noticeService;
+    IVerificatInfoService _verificatInfoService;
     public GiteeOAuthOptions() : base()
     {
+        _noticeService = App.GetService<INoticeService>();
+        _verificatInfoService = App.GetService<IVerificatInfoService>();
         this.SignInScheme = ClaimConst.Scheme;
         this.AuthorizationEndpoint = "https://gitee.com/oauth/authorize";
         this.TokenEndpoint = "https://gitee.com/oauth/token";
@@ -29,11 +33,14 @@ public class GiteeOAuthOptions : AdminOAuthOptions
 
         Events.OnRedirectToAuthorizationEndpoint = context =>
         {
-            //context.RedirectUri = context.RedirectUri.Replace("http%3A%2F%2F", "https%3A%2F%2F"); // 强制替换
             context.Response.Redirect(context.RedirectUri);
             return Task.CompletedTask;
         };
-
+        Events.OnRemoteFailure = context =>
+        {
+            XTrace.WriteException(context.Failure);
+            return Task.CompletedTask;
+        };
     }
 
     /// <summary>刷新 Token 方法</summary>
@@ -60,16 +67,7 @@ public class GiteeOAuthOptions : AdminOAuthOptions
         return OAuthTokenResponse.Failed(new OAuthTokenException($"OAuth token endpoint failure: {await Display(response).ConfigureAwait(false)}"));
     }
 
-    /// <summary>生成错误信息方法</summary>
-    protected static async Task<string> Display(HttpResponseMessage response)
-    {
-        var output = new StringBuilder();
-        output.Append($"Status: {response.StatusCode}; ");
-        output.Append($"Headers: {response.Headers}; ");
-        output.Append($"Body: {await response.Content.ReadAsStringAsync().ConfigureAwait(false)};");
 
-        return output.ToString();
-    }
 
     public override string GetName(JsonElement element)
     {
@@ -77,7 +75,7 @@ public class GiteeOAuthOptions : AdminOAuthOptions
         return target.TryGetValue("name");
     }
 
-    private static async Task HandlerGiteeStarredUrl(OAuthCreatingTicketContext context, string repoFullName = "ThingsGateway/ThingsGateway")
+    private async Task HandlerGiteeStarredUrl(OAuthCreatingTicketContext context, string repoFullName = "ThingsGateway/ThingsGateway")
     {
         if (string.IsNullOrWhiteSpace(context.AccessToken))
             throw new InvalidOperationException("Access token is missing.");
@@ -89,7 +87,7 @@ public class GiteeOAuthOptions : AdminOAuthOptions
             { "access_token", context.AccessToken }
         };
 
-        var request = new HttpRequestMessage(HttpMethod.Put, QueryHelpers.AddQueryString(uri, queryString))
+        var request = new HttpRequestMessage(HttpMethod.Get, QueryHelpers.AddQueryString(uri, queryString))
         {
             Headers = { Accept = { new MediaTypeWithQualityHeaderValue("application/json") } }
         };
@@ -99,7 +97,17 @@ public class GiteeOAuthOptions : AdminOAuthOptions
         if (!response.IsSuccessStatusCode)
         {
             var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-            throw new Exception($"Failed to star repository: {response.StatusCode}, {content}");
+
+            var id = context.Identity.Claims.FirstOrDefault(a => a.Type == ClaimConst.VerificatId).Value;
+
+            var verificatInfoIds = _verificatInfoService.GetOne(id.ToLong());
+
+            _ = Task.Run(async () =>
+             {
+                 await Task.Delay(5000).ConfigureAwait(false);
+                 await _noticeService.NavigationMesage(verificatInfoIds.ClientIds, "https://gitee.com/ThingsGateway/ThingsGateway", "创作不易，如有帮助请star仓库").ConfigureAwait(false);
+             });
+            //throw new Exception($"Failed to star repository: {response.StatusCode}, {content}");
         }
 
 

src/Admin/ThingsGateway.Admin.Application/OAuth/Github/GitHubOAuthOptions.cs

@@ -0,0 +1,122 @@
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.OAuth;
+using Microsoft.AspNetCore.Http;
+
+using System.Net.Http.Headers;
+using System.Text.Json;
+
+using ThingsGateway.NewLife.Log;
+
+namespace ThingsGateway.Admin.Application;
+
+public class GitHubOAuthOptions : AdminOAuthOptions
+{
+    INoticeService _noticeService;
+    IVerificatInfoService _verificatInfoService;
+    public GitHubOAuthOptions() : base()
+    {
+        _noticeService = App.GetService<INoticeService>();
+        _verificatInfoService = App.GetService<IVerificatInfoService>();
+        SignInScheme = ClaimConst.Scheme;
+        AuthorizationEndpoint = "https://github.com/login/oauth/authorize";
+        TokenEndpoint = "https://github.com/login/oauth/access_token";
+        UserInformationEndpoint = "https://api.github.com/user";
+        HomePath = "/";
+        CallbackPath = "/signin-github";
+
+        Scope.Add("read:user");
+        Scope.Add("public_repo"); // 需要用于 Star 仓库
+
+        Events.OnCreatingTicket = async context =>
+        {
+            await HandleGitHubStarAsync(context).ConfigureAwait(false);
+        };
+
+        Events.OnRedirectToAuthorizationEndpoint = context =>
+        {
+            context.Response.Redirect(context.RedirectUri);
+            return Task.CompletedTask;
+        };
+        Events.OnRemoteFailure = context =>
+        {
+            XTrace.WriteException(context.Failure);
+            return Task.CompletedTask;
+        };
+    }
+
+    protected override void ConfigureClaims()
+    {
+        ClaimActions.MapJsonKey(ClaimConst.AvatarUrl, "avatar_url");
+        ClaimActions.MapJsonKey(ClaimConst.Account, "login");
+
+        base.ConfigureClaims();
+    }
+
+    public override string GetName(JsonElement element)
+    {
+        if (element.TryGetProperty("login", out var loginProp))
+        {
+            return loginProp.GetString() ?? string.Empty;
+        }
+        return string.Empty;
+    }
+
+    private async Task HandleGitHubStarAsync(OAuthCreatingTicketContext context, string repoFullName = "ThingsGateway/ThingsGateway")
+    {
+        if (string.IsNullOrWhiteSpace(context.AccessToken))
+            throw new InvalidOperationException("Access token is missing.");
+
+
+
+        var request = new HttpRequestMessage(HttpMethod.Put, $"https://api.github.com/user/starred/{repoFullName}")
+        {
+            Headers =
+            {
+                Accept = { new MediaTypeWithQualityHeaderValue("application/vnd.github+json") },
+                Authorization = new AuthenticationHeaderValue("Bearer", context.AccessToken),
+            },
+            Content = new StringContent(string.Empty) // GitHub Star 接口需要空内容
+        };
+        request.Headers.UserAgent.Add(new ProductInfoHeaderValue("ThingsGateway", "1.0")); // GitHub API 要求 User-Agent
+
+        var response = await context.Backchannel.SendAsync(request, context.HttpContext.RequestAborted).ConfigureAwait(false);
+
+        if (!response.IsSuccessStatusCode)
+        {
+            var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            var id = context.Identity.Claims.FirstOrDefault(a => a.Type == ClaimConst.VerificatId).Value;
+
+            var verificatInfoIds = _verificatInfoService.GetOne(id.ToLong());
+            _ = Task.Run(async () =>
+            {
+                await Task.Delay(5000).ConfigureAwait(false);
+                await _noticeService.NavigationMesage(verificatInfoIds.ClientIds, "https://github.com/ThingsGateway/ThingsGateway", "创作不易，如有帮助请star仓库").ConfigureAwait(false);
+            });
+
+        }
+
+
+    }
+
+
+    /// <summary>处理用户信息方法</summary>
+    public override async Task<JsonElement> HandleUserInfoAsync(HttpContext context, OAuthTokenResponse tokens)
+    {
+
+        var request = new HttpRequestMessage(HttpMethod.Get, UserInformationEndpoint);
+        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", tokens.AccessToken);
+        request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/vnd.github+json"));
+        request.Headers.UserAgent.Add(new ProductInfoHeaderValue("ThingsGateway", "1.0")); // GitHub API 要求 User-Agent
+        var response = await Backchannel.SendAsync(request, context.RequestAborted).ConfigureAwait(false);
+
+        var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+        if (response.IsSuccessStatusCode)
+        {
+            return JsonDocument.Parse(content).RootElement;
+        }
+
+        throw new OAuthTokenException($"OAuth user info endpoint failure: {await Display(response).ConfigureAwait(false)}");
+    }
+}

src/Admin/ThingsGateway.Admin.Application/OAuth/Github/GithubOAuthSettings.cs

@@ -0,0 +1,6 @@
+namespace ThingsGateway.Admin.Application;
+
+public class GithubOAuthSettings : GiteeOAuthSettings
+{
+
+}

src/Admin/ThingsGateway.Admin.Application/OAuth/OAuthUserExtensions.cs

@@ -0,0 +1,11 @@
+using System.Text.Json;
+
+namespace ThingsGateway.Admin.Application;
+
+public static class OAuthUserExtensions
+{
+    public static string TryGetValue(this JsonElement.ObjectEnumerator target, string propertyName)
+    {
+        return target.FirstOrDefault<JsonProperty>((Func<JsonProperty, bool>)(t => t.Name.Equals(propertyName, StringComparison.OrdinalIgnoreCase))).Value.ToString() ?? string.Empty;
+    }
+}

src/Admin/ThingsGateway.Admin.Application/Provider/BlazorAuthenticationHandler.cs

@@ -10,7 +10,6 @@
 
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Http;
 
 using System.Security.Claims;
@@ -116,7 +115,7 @@ public class BlazorAuthenticationHandler : AppAuthorizeHandler
                 {
                     // 路由名称
                     var routeName = routeData.PageType.CustomAttributes.FirstOrDefault(x =>
-                        x.AttributeType == typeof(RouteAttribute))?.ConstructorArguments?[0].Value as string;
+                        x.AttributeType == typeof(Microsoft.AspNetCore.Components.RouteAttribute))?.ConstructorArguments?[0].Value as string;
                     if (routeName == null) return true;
 
                     if ((!user.PermissionCodeList.Contains(routeName.CutStart("/")) && !user.PermissionCodeList.Contains(routeName))) //如果当前路由信息不包含在角色授权路由列表中则认证失败

src/Admin/ThingsGateway.Admin.Application/Provider/UnifyResultProvider.cs

@@ -11,11 +11,9 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Localization;
 
 using ThingsGateway.DataValidation;
 using ThingsGateway.FriendlyException;
-using ThingsGateway.Razor;
 using ThingsGateway.UnifyResult;
 
 namespace ThingsGateway.Admin.Application;

src/Admin/ThingsGateway.Admin.Application/SeedData/SysRelationSeedData.cs

@@ -18,7 +18,7 @@ public class SysRelationSeedData : ISqlSugarEntitySeedData<SysRelation>
     /// <inheritdoc/>
     public IEnumerable<SysRelation> SeedData()
     {
-        var db = DbContext.Db.GetConnectionScopeWithAttr<SysRelation>().CopyNew();
+        using var db = DbContext.GetDB<SysRelation>();
         if (db.Queryable<SysRelation>().Any(a => a.ObjectId == RoleConst.SuperAdminId))
             return Enumerable.Empty<SysRelation>();
         var data = SeedDataUtil.GetSeedData<SysRelation>(PathExtensions.CombinePathWithOs("SeedData", "Admin", "seed_sys_relation.json"));

src/Admin/ThingsGateway.Admin.Application/Services/ApiPermission/ApiPermissionService.cs

@@ -9,19 +9,15 @@
 // ------------------------------------------------------------------------------
 
 
-using BootstrapBlazor.Components;
-
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.Controllers;
-using Microsoft.Extensions.Options;
 
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-using System.Globalization;
 using System.Reflection;
 
-using ThingsGateway.Extension;
+using ThingsGateway.Common.Extension;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Services/Auth/AuthService.cs

@@ -10,7 +10,6 @@
 
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Localization;
 
 using System.Security.Claims;
 
@@ -324,7 +323,7 @@ public class AuthService : IAuthService
 
         #endregion 重新赋值属性,设置本次登录信息为最新的信息
 
-        using var db = DbContext.Db.GetConnectionScopeWithAttr<SysUser>().CopyNew();
+        using var db = DbContext.GetDB<SysUser>();
         //更新用户登录信息
         if (await db.Updateable(sysUser).UpdateColumns(it => new
         {

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

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

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

@@ -8,11 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using ThingsGateway.FriendlyException;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.Razor;
 
 namespace ThingsGateway.Admin.Application;
 

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

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

src/Admin/ThingsGateway.Admin.Application/Services/File/FileService.cs

@@ -10,7 +10,6 @@
 
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Localization;
 
 using System.Text;
 using System.Web;

src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/Dto/OperateLogInput.cs

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

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

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

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

@@ -8,12 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using System.Data;
 
-using ThingsGateway.SqlSugar;
-
 namespace ThingsGateway.Admin.Application;
 
 internal sealed class SysOperateLogService : BaseService<SysOperateLog>, ISysOperateLogService

src/Admin/ThingsGateway.Admin.Application/Services/Org/ISysOrgService.cs

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

src/Admin/ThingsGateway.Admin.Application/Services/Org/SysOrgService.cs

@@ -8,11 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.FriendlyException;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Services/Pos/ISysPositionService.cs

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

src/Admin/ThingsGateway.Admin.Application/Services/Pos/SysPositionService.cs

@@ -8,10 +8,7 @@
 // QQ群：605534569
 // ------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using ThingsGateway.FriendlyException;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Services/Resource/Dto/ResourceInput.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using System.ComponentModel.DataAnnotations;
 
 using ThingsGateway.Extension.Generic;

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

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

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

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

src/Admin/ThingsGateway.Admin.Application/Services/Role/ISysRoleService.cs

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

src/Admin/ThingsGateway.Admin.Application/Services/Role/SysRoleService.cs

@@ -8,11 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using ThingsGateway.FriendlyException;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

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

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

src/Admin/ThingsGateway.Admin.Application/Services/Session/ISessionService.cs

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

src/Admin/ThingsGateway.Admin.Application/Services/Session/SessionService.cs

@@ -8,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;//令牌数量

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

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

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

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

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

@@ -8,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);//设置密码
@@ -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();//获取主管信息
             }
 
             //获取按钮码

src/Admin/ThingsGateway.Admin.Application/Services/UserCenter/UserCenterService.cs

@@ -8,16 +8,13 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
 using System.Text.RegularExpressions;
 
+using ThingsGateway.Common.Extension;
 using ThingsGateway.DataEncryption;
-using ThingsGateway.Extension;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.FriendlyException;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.Razor;
 
 namespace ThingsGateway.Admin.Application;
 

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

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

src/Admin/ThingsGateway.Admin.Application/Startup.cs

@@ -8,13 +8,13 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using BootstrapBlazor.Components;
-
-using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 using System.Reflection;
+using System.Text;
 
+using ThingsGateway.Extension;
 using ThingsGateway.UnifyResult;
 
 namespace ThingsGateway.Admin.Application;
@@ -41,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>();
@@ -65,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)
@@ -79,7 +145,7 @@ public class Startup : AppStartup
         //遍历配置
         DbContext.DbConfigs?.ForEach(it =>
         {
-            var connection = DbContext.Db.GetConnection(it.ConfigId);//获取数据库连接对象
+            var connection = DbContext.GetDB().GetConnection(it.ConfigId);//获取数据库连接对象
             if (it.InitDatabase == true)
                 connection.DbMaintenance.CreateDatabase();//创建数据库,如果存在则不创建
         });

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,13 +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.Razor\ThingsGateway.Razor.csproj" />
 		<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>

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

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

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

@@ -40,7 +40,7 @@ public static class ClearTokenUtil
     public static async Task DeleteUserTokenByOrgIds(HashSet<long> orgIds)
     {
         // 获取用户ID列表
-        var userIds = await DbContext.Db.CopyNew().QueryableWithAttr<SysUser>().Where(it => orgIds.Contains(it.OrgId)).Select(it => it.Id).ToListAsync().ConfigureAwait(false);
+        var userIds = await DbContext.GetDB<SysUser>().Queryable<SysUser>().Where(it => orgIds.Contains(it.OrgId)).Select(it => it.Id).ToListAsync().ConfigureAwait(false);
         //从redis中删除所属机构的用户token
         App.CacheService.HashDel<VerificatInfo>(CacheConst.Cache_Token, userIds.Select(it => it.ToString()).ToArray());
     }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/Admin/ThingsGateway.Admin.Razor/Components/ChoiceModuleComponent.razor.cs

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

src/Admin/ThingsGateway.Admin.Razor/Components/LoginConnectionHub.razor

@@ -5,6 +5,9 @@
     @<div>
         <span class="mx-3">@item.ConfirmMessage</span>
 
-        <Button Text=@Localizers["Jump"] Color="Color.Link" OnClick="()=>NavigationManager.NavigateTo(item.Uri)"></Button>
+        <a href=@item.Uri target="_blank">
+            @item.Uri
+        </a>
+
     </div>;
 }

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)
             {
@@ -156,7 +153,7 @@ public class BlazorAppContext
             CurrentUser = (await SysUserService.GetUserByIdAsync(UserManager.UserId))!;
         }
     }
-    TimeTick timeTick = new("50000");
+    TimeTick timeTick = new("60000");
     /// <summary>
     /// 是否拥有按钮授权
     /// </summary>

src/Admin/ThingsGateway.Admin.Razor/GlobalUsings.cs

@@ -16,6 +16,10 @@ global using Microsoft.Extensions.Options;
 
 global using System.Diagnostics.CodeAnalysis;
 
+global using ThingsGateway.Common;
+global using ThingsGateway.DB;
+global using ThingsGateway.NewLife.Extension;
 global using ThingsGateway.Razor;
-
+global using ThingsGateway.SqlSugar;
 [assembly: SuppressMessage("Reliability", "CA2007", Justification = "<挂起>", Scope = "module")]
+[assembly: GlobalGenerateSetParametersAsync(true)]

src/Admin/ThingsGateway.Admin.Razor/Pages/AppConfig/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();
     }
 

src/Admin/ThingsGateway.Admin.Razor/Pages/AppConfig/EditPagePolicy.razor.cs

@@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Components.Forms;
 
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Extension.Generic;
-using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Admin.Razor;
 

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

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

src/Admin/ThingsGateway.Admin.Razor/Pages/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();

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

src/Admin/ThingsGateway.Admin.Razor/Pages/Org/OrgTree.razor.cs

@@ -9,8 +9,6 @@
 //------------------------------------------------------------------------------
 
 using ThingsGateway.Admin.Application;
-using ThingsGateway.NewLife.Extension;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Razor;
 

src/Admin/ThingsGateway.Admin.Razor/Pages/Org/SysOrgPage.razor.cs

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

src/Admin/ThingsGateway.Admin.Razor/Pages/Position/PositionTree.razor.cs

@@ -9,8 +9,6 @@
 //------------------------------------------------------------------------------
 
 using ThingsGateway.Admin.Application;
-using ThingsGateway.NewLife.Extension;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Razor;
 

src/Admin/ThingsGateway.Admin.Razor/Pages/Resource/SysResourcePage.razor

@@ -33,7 +33,7 @@
             </PopConfirmButton>
             <PopConfirmButton Color=Color.Warning IsDisabled="SelectedRows.Count!=1||!AuthorizeButton(AdminOperConst.Edit)" Text=@OperDescLocalizer["ChangeParentResource"] Icon="fa fa-copy" OnConfirm="OnChangeParent">
                 <BodyTemplate>
-                    <div class="min-height-500 overflow-y-auto">
+                    <div class="overflow-y-auto" style="height:500px">
                         <TreeView Items="MenuTreeItems" IsVirtualize="true" OnTreeItemClick="a=>{ChangeParentId=a.Value.Id;return Task.CompletedTask;}" />
                     </div>
                 </BodyTemplate>

src/Admin/ThingsGateway.Admin.Razor/Pages/Role/RoleTree.razor.cs

@@ -9,8 +9,6 @@
 //------------------------------------------------------------------------------
 
 using ThingsGateway.Admin.Application;
-using ThingsGateway.NewLife.Extension;
-using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Razor;
 

src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRoleEdit.razor.cs

@@ -10,7 +10,6 @@
 
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Extension.Generic;
-using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.Admin.Razor;
 

src/Admin/ThingsGateway.Admin.Razor/Pages/Role/SysRolePage.razor.cs

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

src/Admin/ThingsGateway.Admin.Razor/Pages/Session/SessionPage.razor.cs

@@ -22,12 +22,11 @@ public partial class SessionPage
 
     #region 查询
 
-    private async Task<QueryData<SessionOutput>> OnQueryAsync(QueryPageOptions options)
+    private Task<QueryData<SessionOutput>> OnQueryAsync(QueryPageOptions options)
     {
-        return await Task.Run(async () =>
+        return Task.Run(() =>
          {
-             var data = await SessionService.PageAsync(options);
-             return data;
+             return SessionService.PageAsync(options);
          });
     }
 

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

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;
 
@@ -39,6 +38,7 @@ public partial class SysUserEdit
         var items = await SysPositionService.SelectorAsync(new PositionSelectorInput() { });
         Items = PositionUtil.BuildCascaderItemList(items);
         ModuleSelectedItems = ResourceUtil.BuildModuleSelectList((await SysResourceService.GetAllAsync())).ToList();
+        await InvokeAsync(StateHasChanged);
         await base.OnInitializedAsync();
     }
 

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;