fix: 上次更新导致大小端配置映射错误

fix: timerx 池 max值取消
feat: mqttrpc支持脚本

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,12 +7,3 @@
 //  使用文档：https://thingsgateway.cn/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
-global using BootstrapBlazor.Components;
-
-global using Microsoft.AspNetCore.Components;
-global using Microsoft.Extensions.Localization;
-
-global using System.Diagnostics.CodeAnalysis;
-
-global using ThingsGateway.Razor;

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

@@ -20,6 +20,7 @@ using System.Collections.Concurrent;
 using ThingsGateway.Extension;
 using ThingsGateway.FriendlyException;
 using ThingsGateway.NewLife.Json.Extension;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
@@ -90,13 +91,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 +105,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

@@ -10,10 +10,10 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using System.ComponentModel.DataAnnotations;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 [SugarTable("sys_dict", TableDescription = "字典表")]

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

@@ -10,7 +10,7 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

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

@@ -10,10 +10,10 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using System.ComponentModel.DataAnnotations;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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

@@ -10,10 +10,10 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using System.ComponentModel.DataAnnotations;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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

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

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

@@ -14,10 +14,10 @@ using Microsoft.AspNetCore.Components.Routing;
 
 using Newtonsoft.Json;
 
-using SqlSugar;
-
 using System.ComponentModel.DataAnnotations;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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

@@ -10,10 +10,10 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using System.ComponentModel.DataAnnotations;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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

@@ -10,13 +10,13 @@
 
 using BootstrapBlazor.Components;
 
-using Mapster;
-
-using SqlSugar;
+using Riok.Mapperly.Abstractions;
 
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
@@ -31,7 +31,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

@@ -10,9 +10,8 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using ThingsGateway.List;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Filter/RequestAuditFilter.cs

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

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

@@ -20,6 +20,7 @@ using ThingsGateway.NewLife;
 using ThingsGateway.NewLife.Caching;
 using ThingsGateway.NewLife.Threading;
 using ThingsGateway.Schedule;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
@@ -52,16 +53,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 +71,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 +81,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));
@@ -110,7 +111,7 @@ public class HardwareJob : IJob, IHardwareJob
             catch (Exception ex)
             {
                 if (!error)
-                    _logger.LogWarning(ex, _localizer["GetHardwareInfoFail"]);
+                    _logger.LogWarning(ex, "Get Hardwareinfo Fail");
                 error = true;
             }
 
@@ -121,7 +122,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 +132,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);
@@ -152,7 +152,7 @@ public class HardwareJob : IJob, IHardwareJob
             catch (Exception ex)
             {
                 if (!error)
-                    _logger.LogWarning(ex, _localizer["GetHardwareInfoFail"]);
+                    _logger.LogWarning(ex, "Get Hardwareinfo Fail");
                 error = true;
             }
         }

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

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

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/Locales/en-US.json

@@ -1,459 +1,402 @@
 {
+  "ThingsGateway.Admin.Application.AppConfig": {
+    "LoginPolicy": "LoginPolicy",
+    "PagePolicy": "PagePolicy",
+    "PasswordPolicy": "PasswordPolicy",
+    "WebsitePolicy": "WebsitePolicy"
+  },
+  "ThingsGateway.Admin.Application.AuthController": {
+    "AuthController": "Login API",
+    "LoginAsync": "Login",
+    "LogoutAsync": "Logout"
+  },
+  "ThingsGateway.Admin.Application.AuthService": {
+    "AuthErrorMax": "Account password error, will be locked for {1} minutes after exceeding {0} times, error count {2}",
+    "MustDesc": "Password needs to be encrypted with DESC before passing",
+    "OrgDisable": "The affiliated company/department has been deactivated, please contact the administrator",
+    "PasswordError": "Too many password errors, please try again in {0} minutes",
+    "SingleLoginWarn": "Your account is logged in elsewhere",
+    "TenantNull": "The tenant does not exist",
+    "UserDisable": "Account {0} has been disabled",
+    "UserNoModule": "This account has not been assigned a module. Please contact the administrator",
+    "UserNull": "User {0} does not exist"
+  },
   "ThingsGateway.Admin.Application.BaseDataEntity": {
     "CreateOrgId": "CreateOrgId"
   },
   "ThingsGateway.Admin.Application.BaseEntity": {
-    "SortCode": "SortCode",
     "CreateTime": "CreateTime",
     "CreateUser": "CreateUser",
+    "SortCode": "SortCode",
     "UpdateTime": "UpdateTime",
     "UpdateUser": "UpdateUser"
   },
-
   "ThingsGateway.Admin.Application.BlazorAuthenticationHandler": {
     "UserExpire": "User expired, please login again"
   },
-  "ThingsGateway.Admin.Application.SysUser": {
-    "Disable": "Disable",
-    "Enable": "Enable",
-    "GrantRole": "GrantRole",
-    "ExitVerificat": "You have been forcibly logged out",
-    "PasswordEdited": "Password changed, logged out",
-
-    "Avatar": "Avatar",
-    "Account": "Account",
-    "Account.Required": "Account.Required",
-    "Password": "Password",
-    "Status": "Status",
-    "Phone": "Phone",
-    "Email": "Email",
-    "LastLoginIp": "LastLoginIp",
-    "LastLoginDevice": "LastLoginDevice",
-    "LastLoginTime": "LastLoginTime",
-    "LastLoginAddress": "LastLoginAddress",
-    "LatestLoginIp": "LatestLoginIp",
-    "LatestLoginTime": "LatestLoginTime",
-    "LatestLoginDevice": "LatestLoginDevice",
-    "LatestLoginAddress": "LatestLoginAddress",
-    "OrgNames": "OrgNames",
-    "PositionName": "PositionName",
-    "OrgId": "Org",
-    "PositionId": "Position",
-    "DirectorId": "Director",
-
-    "CheckSelf": "Prohibit {0} yourself",
-    "CanotDeleteAdminUser": "Cannot delete built-in super admin user",
-    "CanotEditAdminUser": "Cannot edit super admin user",
-    "CanotGrantAdmin": "Cannot assign admins roles",
-    "EmailDup": "Duplicate email {0} exists",
-    "AccountDup": "Duplicate account {0} exists",
-    "CanotDeleteSelf": "Cannot delete yourself",
-    "EmailError": "Email format error {0}",
-    "PhoneError": "Phone number format error {0}",
-    "NoOrg": "The organization does not exist",
-    "DirectorSelf": "Cannot set oneself as the supervisor",
-
-    "DemoCanotUpdatePassword": "DEMO environment does not allow password modification",
-    "OldPasswordError": "Incorrect old password",
-    "ConfirmPasswordDiff": "Passwords entered twice are inconsistent",
-    "PasswordLengthLess": "Password length cannot be less than {0}",
-    "PasswordMustNum ": "Password must contain numbers",
-    "PasswordMustLow": "Password must contain lowercase letters",
-    "PasswordMustUpp": "Password must contain uppercase letters",
-    "PasswordMustSpecial": "Password must contain special characters"
-  },
-
-  "ThingsGateway.Admin.Application.SysRole": {
-    "Code": "Code",
-    "Name": "Name",
-    "Name.Required": "{0} is required",
-    "Category": "Category",
-    "OrgId": "Org",
-    "Global": "Global",
-    "Status": "Status",
-    "CanotDeleteAdmin": "Cannot delete built-in super admin role",
-    "CanotEditAdmin": "Cannot edit super admin role",
-    "CanotGrantAdmin": "Cannot assign admins roles",
-    "NameDup": "Duplicate role name {0}",
-
-    "OrgNotNull": "Organization cannot be null",
-    "SameOrgNameDup": "Duplicate role name exists: {0}",
-    "CannotRoleScopeAll": "Organization role cannot select global data scope",
-    "CodeDup": "Duplicate code exists: {0}"
-  },
-
-  "ThingsGateway.Admin.Application.RoleCategoryEnum": {
-    "Global": "Global",
-    "Org": "Org"
-  },
   "ThingsGateway.Admin.Application.DataScopeEnum": {
-    "SCOPE_SELF": "Self",
     "SCOPE_ALL": "All",
     "SCOPE_ORG": "OnlyOrg",
     "SCOPE_ORG_CHILD": "OrgChild",
-    "SCOPE_ORG_DEFINE": "Define"
+    "SCOPE_ORG_DEFINE": "Define",
+    "SCOPE_SELF": "Self"
   },
   "ThingsGateway.Admin.Application.DefaultDataScope": {
     "ScopeCategory": "DataScope",
     "ScopeDefineOrgIdList": "DefineOrgList"
   },
-
-
-  "ThingsGateway.Admin.Application.SysResource": {
-    "Title": "Title",
-    "Module": "Module",
-    "Title.Required": "{0} is required",
-    "Href.Required": "{0} is required",
-    "Icon": "Icon",
-    "Href": "Path",
-    "Code": "Code",
-    "Category": "Category",
-    "Target": "Target",
-    "NavLinkMatch": "NavLinkMatch",
-    "ParentId": "Parent",
-    "ResourceDup": "Duplicate name {0} exists",
-    "ResourceParentChoiceSelf": "Parent cannot choose itself",
-    "ResourceParentNull": "Parent does not exist {0}",
-    "NotFoundResource": "System exception, menu not found",
-    "ModuleIdDiff": "Module is inconsistent with parent menu",
-    "CanotDeleteSystemResource": "Cannot delete system resource {0}",
-    "ResourceMenuHrefNotNull": "Menu href cannot null"
+  "ThingsGateway.Admin.Application.DictTypeEnum": {
+    "Define": "Business",
+    "System": "System"
   },
-  "ThingsGateway.Admin.Application.SysOrgCopyInput": {
-    "TargetId": "Target",
-    "ContainsChild": "ContainsChild",
-    "ContainsPosition": "ContainsPosition"
-  },
-
-  "ThingsGateway.Admin.Application.SysPosition": {
-    "Category.Required": "{0} is a required field",
-    "Name.Required": "{0} is a required field",
-    "Code.Required": "{0} is a required field",
-    "OrgId.MinValue": "{0} is a required field",
-    "Category": "Category",
-    "Name": "Name",
-    "Code": "Code",
-    "Status": "Status",
-    "OrgId": "Organization",
-    "Remark": "Remarks",
-    "Dup": "Duplicate position exists with Category {0} and Name {1}",
-    "CodeDup": "Duplicate code {0} exists",
-    "NameDup": "Duplicate name {0} exists",
-    "CanotContainsSelf": "Cannot contain itself",
-    "TargetNameDup": "Target node has duplicate name {0}",
-    "ParentChoiceSelf": "Parent cannot be itself",
-    "ParentNull": "Parent does not exist {0}",
-    "DeleteUserFirst": "Please remove the users under the position first"
-  },
-
-  "ThingsGateway.Admin.Application.SysOrg": {
-    "Category.Required": "{0} is a required field",
-    "Name.Required": "{0} is a required field",
-    "Code.Required": "{0} is a required field",
-    "Category": "Category",
-    "Name": "Name",
-    "Code": "Code",
-    "Status": "Status",
-    "ParentId": "ParentOrg",
-    "Names": "Names",
-    "Remark": "Remarks",
-    "DirectorId": "Director",
-    "Dup": "Duplicate organization exists with Category {0} and Name {1}",
-    "CodeDup": "Duplicate code {0} exists",
-    "NameDup": "Duplicate name {0} exists",
-    "CanotContainsSelf": "Cannot contain itself",
-    "TargetNameDup": "Target node has duplicate name {0}",
-    "ParentChoiceSelf": "Parent cannot be itself",
-    "ParentNull": "Parent does not exist {0}",
-    "DeleteUserFirst": "Please remove the users under the organization first",
-    "DeleteRoleFirst": "Please remove the roles under the organization first",
-    "DeletePositionFirst": "Please remove the positions under the organization first",
-    "RootOrg": "Unable to create top-level organization"
-  },
-
-  "ThingsGateway.Admin.Application.OrgEnum": {
-    "COMPANY": "Company",
-    "DEPT": "Dept"
-  },
-  "ThingsGateway.Admin.Application.PositionCategoryEnum": {
-    "HIGH": "High",
-    "MIDDLE": "Middle",
-    "LOW": "Low"
-  },
-  //controller
-  "ThingsGateway.Admin.Application.AuthController": {
-    //auth
-    "AuthController": "Login API",
-    "LoginAsync": "Login",
-    "LogoutAsync": "Logout"
-  },
-  "ThingsGateway.Admin.Application.TestController": {
-    //auth
-    "TestController": "Test API",
-    "Test": "Test"
-  },
-  "ThingsGateway.Admin.Application.OpenApiAuthController": {
-    //auth
-    "OpenApiAuthController": "Login API",
-    "LoginAsync": "Login",
-    "LogoutAsync": "Logout"
-  },
-
   "ThingsGateway.Admin.Application.FileService": {
-    "FileNullError": "File cannot be empty",
     "FileLengthError": "File size cannot exceed {0} M",
+    "FileNullError": "File cannot be empty",
     "FileTypeError": "Not supported format {0}"
   },
-
-  "ThingsGateway.Admin.Application.UnifyResultProvider": {
-    "TokenOver": "Login has expired, please login again",
-    "NoPermission": "Access denied, no permission"
-  },
-
-  "ThingsGateway.Admin.Application.AuthService": {
-
-    "TenantNull": "The tenant does not exist",
-    "OrgDisable": "The affiliated company/department has been deactivated, please contact the administrator",
-
-    "SingleLoginWarn": "Your account is logged in elsewhere",
-    "UserNull": "User {0} does not exist",
-    "MustDesc": "Password needs to be encrypted with DESC before passing",
-    "PasswordError": "Too many password errors, please try again in {0} minutes",
-    "UserDisable": "Account {0} has been disabled",
-    "UserNoModule": "This account has not been assigned a module. Please contact the administrator",
-    "AuthErrorMax": "Account password error, will be locked for {1} minutes after exceeding {0} times, error count {2}"
-  },
-
   "ThingsGateway.Admin.Application.HardwareInfo": {
     "Environment": "HostEnvironment",
     "FrameworkDescription": ".NETFramework",
     "OsArchitecture": "System Architecture",
-    "UUID": "UUID",
-    "UpdateTime": "UpdateTime"
+    "UpdateTime": "UpdateTime",
+    "UUID": "UUID"
   },
-  "ThingsGateway.Admin.Application.HistoryHardwareInfo": {
-    "DriveUsage": "Disk Usage",
-    "MemoryUsage": "Memory",
-    "CpuUsage": "CPU Usage",
-    "Temperature": "Temperature",
-    "Battery": "Battery"
-  },
-
-
-  //oper
-  "ThingsGateway.Admin.Application.OperDescAttribute": {
-    //dict
-    "SaveDict": "Modify dictionary",
-    "DeleteDict": "Delete dictionary",
-    "EditLoginPolicy": "Modify login policy",
-    "EditPasswordPolicy": "Modify password policy",
-    "EditPagePolicy": "Modify page policy",
-    "EditWebsitePolicy": "Modify website settings",
-    //operlog
-    "DeleteOperLog": "Delete operation log",
-    "ExportOperLog": "Export operation log",
-
-    //resource
-    "SaveResource": "Modify resource",
-    "DeleteResource": "Delete resource",
-
-    //role
-    "SaveRole": "Modify role",
-    "DeleteRole": "Delete role",
-    "RoleGrantResource": "Role grant resource",
-    "RoleGrantUser": "Role grant user",
-    "RoleGrantApiPermission": "Role grant OpenApi",
-    "GrantApi": "GrantApi",
-    "GrantUser": "GrantUser",
-    "GrantRole": "GrantRole",
-    "GrantResource": "GrantResource",
-    //user
-    "SaveUser": "Modify user",
-    "DeleteuSER": "Delete user",
-    "ResetPassword": "Reset pw",
-    "UserGrantRole": "User grant role",
-    "UserGrantResource": "User grant resource",
-    "UserGrantApiPermission": "User grant OpenApi",
-
-    //usercenter
-    "UpdateUserInfo": "Update personal information",
-    "WorkbenchInfo": "Update personal workbench",
-    "UpdatePassword": "Update personal password",
-
-    //session
-    "ExitVerificat": "Force token off",
-    "ExitSession": "Force session off",
-
-
-    "CopyOrg": "Copy Organization",
-    "DeleteOrg": "Delete Organization",
-    "SaveOrg": "Save Organization",
-
-    "DeletePosition": "Delete Position",
-    "SavePosition": "Save Position",
-
-    "NoPermission": "No Permission",
-
-
-    "CopyResource": "CopyResource",
-    "ChangeParentResource": "ChangeParentResource"
-  },
-
-
-  //service
-
   "ThingsGateway.Admin.Application.HardwareJob": {
     "GetHardwareInfoFail": "Get Hardwareinfo Fail"
   },
-
-  //dto
-  "ThingsGateway.Admin.Application.UserSelectorOutput": {
+  "ThingsGateway.Admin.Application.HistoryHardwareInfo": {
+    "Battery": "Battery",
+    "CpuUsage": "CPU Usage",
+    "DriveUsage": "Disk Usage",
+    "MemoryUsage": "Memory",
+    "Temperature": "Temperature"
+  },
+  "ThingsGateway.Admin.Application.LogCateGoryEnum": {
+    "Exception": "Exception",
+    "Login": "Login",
+    "Logout": "Logout",
+    "Operate": "Operation"
+  },
+  "ThingsGateway.Admin.Application.LogEnum": {
+    "FAIL": "Fail",
+    "SUCCESS": "Success"
+  },
+  "ThingsGateway.Admin.Application.LoginInput": {
     "Account": "Account",
-    "OrgId": "Org"
+    "Account.Required": "{0} is required",
+    "Password": "Password",
+    "Password.Required": "{0} is required"
+  },
+  "ThingsGateway.Admin.Application.LoginPolicy": {
+    "ErrorCount": "Login error count lock threshold",
+    "ErrorCount.MinValue": "{0} value is too small",
+    "ErrorLockTime": "Login error lock duration (min)",
+    "ErrorLockTime.MinValue": "{0} value is too small",
+    "ErrorResetTime": "Login error count expiration duration (min)",
+    "ErrorResetTime.MinValue": "{0} value is too small",
+    "SingleOpen": "Single user login switch",
+    "VerificatExpireTime": "Login expiration time (min)",
+    "VerificatExpireTime.MinValue": "{0} value is too small"
+  },
+  "ThingsGateway.Admin.Application.LogoutInput": {
+    "VerificatId.Required": "{0} is required"
+  },
+  "ThingsGateway.Admin.Application.OpenApiAuthController": {
+    "LoginAsync": "Login",
+    "LogoutAsync": "Logout",
+    "OpenApiAuthController": "Login API"
+  },
+  "ThingsGateway.Admin.Application.OperateLogPageInput": {
+    "Account": "Account",
+    "Category": "Category",
+    "SearchDate": "SearchDate"
+  },
+  "ThingsGateway.Admin.Application.OperDescAttribute": {
+    "ChangeParentResource": "ChangeParentResource",
+    "CopyOrg": "Copy Organization",
+    "CopyResource": "CopyResource",
+    "DeleteDict": "Delete dictionary",
+    "DeleteOperLog": "Delete operation log",
+    "DeleteOrg": "Delete Organization",
+    "DeletePosition": "Delete Position",
+    "DeleteResource": "Delete resource",
+    "DeleteRole": "Delete role",
+    "DeleteuSER": "Delete user",
+    "EditLoginPolicy": "Modify login policy",
+    "EditPagePolicy": "Modify page policy",
+    "EditPasswordPolicy": "Modify password policy",
+    "EditWebsitePolicy": "Modify website settings",
+    "ExitSession": "Force session off",
+    "ExitVerificat": "Force token off",
+    "ExportOperLog": "Export operation log",
+    "GrantApi": "GrantApi",
+    "GrantResource": "GrantResource",
+    "GrantRole": "GrantRole",
+    "GrantUser": "GrantUser",
+    "NoPermission": "No Permission",
+    "ResetPassword": "Reset pw",
+    "RoleGrantApiPermission": "Role grant OpenApi",
+    "RoleGrantResource": "Role grant resource",
+    "RoleGrantUser": "Role grant user",
+    "SaveDict": "Modify dictionary",
+    "SaveOrg": "Save Organization",
+    "SavePosition": "Save Position",
+    "SaveResource": "Modify resource",
+    "SaveRole": "Modify role",
+    "SaveUser": "Modify user",
+    "UpdatePassword": "Update personal password",
+    "UpdateUserInfo": "Update personal information",
+    "UserGrantApiPermission": "User grant OpenApi",
+    "UserGrantResource": "User grant resource",
+    "UserGrantRole": "User grant role",
+    "WorkbenchInfo": "Update personal workbench"
+  },
+  "ThingsGateway.Admin.Application.OrgEnum": {
+    "COMPANY": "Company",
+    "DEPT": "Dept"
+  },
+  "ThingsGateway.Admin.Application.PagePolicy": {
+    "Razor": "Default homepage",
+    "Shortcuts": "Default shortcuts"
+  },
+  "ThingsGateway.Admin.Application.PasswordPolicy": {
+    "DefaultPassword": "Default user password",
+    "DefaultPassword.Required": "{0} is required",
+    "PasswordContainChar": "Contain special characters",
+    "PasswordContainLower": "Contain lowercase letters",
+    "PasswordContainNum": "Contain numbers",
+    "PasswordContainUpper": "Contain uppercase letters",
+    "PasswordMinLen": "Minimum password length",
+    "PasswordMinLen.MinValue": "{0} value is too small"
+  },
+  "ThingsGateway.Admin.Application.PositionCategoryEnum": {
+    "HIGH": "High",
+    "LOW": "Low",
+    "MIDDLE": "Middle"
+  },
+  "ThingsGateway.Admin.Application.ResourceCategoryEnum": {
+    "Button": "Button",
+    "Menu": "Menu",
+    "Module": "Module"
   },
   "ThingsGateway.Admin.Application.ResourceTableSearchModel": {
-    "Module": "Module",
     "Href": "Path",
+    "Module": "Module",
     "Title": "Title"
   },
-  "ThingsGateway.Admin.Application.WorkbenchInfo": {
-    "Razor": "Homepage",
-    "Shortcuts": "Shortcuts"
+  "ThingsGateway.Admin.Application.RoleCategoryEnum": {
+    "Global": "Global",
+    "Org": "Org"
   },
-  "ThingsGateway.Admin.Application.UpdatePasswordInput": {
-    "Password": "Password",
-    "NewPassword": "New password",
-    "ConfirmPassword": "Confirm password",
-    "Password.Required": "{0} is required",
-    "NewPassword.Required": "{0} is required",
-    "ConfirmPassword.Required": "{0} is required"
-  },
-
-  "ThingsGateway.Admin.Application.VerificatInfo": {
-    "Expire": "Expire(min)",
-    "Online": "Online",
-    "VerificatTimeout": "VerificatTimeout",
-    "Device": "Device",
-    "LoginIp": "LoginIp",
-    "LoginTime": "LoginTime"
-  },
-
   "ThingsGateway.Admin.Application.SessionOutput": {
     "Account": "Account",
-    "Online": "Online status",
     "LatestLoginIp": "Latest login IP",
     "LatestLoginTime": "Latest login time",
+    "Online": "Online status",
     "VerificatCount": "Token count"
   },
-
   "ThingsGateway.Admin.Application.SysDict": {
-    "Category.Required": "{0} is required",
-    "Name.Required": "{0} is required",
-    "Code.Required": "{0} is required",
     "Category": "Category",
-    "Name": "Name",
+    "Category.Required": "{0} is required",
     "Code": "Code",
-    "Remark": "Remark",
+    "Code.Required": "{0} is required",
     "DemoCanotUpdateWebsitePolicy": "DEMO environment does not allow modifying website settings",
-    "DictDup": "Duplicate configuration exists, category {0}, name {1}"
+    "DictDup": "Duplicate configuration exists, category {0}, name {1}",
+    "Name": "Name",
+    "Name.Required": "{0} is required",
+    "Remark": "Remark"
   },
-
   "ThingsGateway.Admin.Application.SysOperateLog": {
+    "Category": "Category",
     "ClassName": "ClassName",
     "ExeMessage": "ExeMessage",
-    "MethodName": "MethodName",
-    "ParamJson": "ParamJson",
-    "ReqMethod": "RequestMethod",
-    "ReqUrl": "RequestUrl",
-    "ResultJson": "ResultJson",
-    "Category": "Category",
     "ExeStatus": "ExeStatus",
+    "MethodName": "MethodName",
     "Name": "Name",
     "OpAccount": "OpAccount",
     "OpBrowser": "OpBrowser",
     "OpIp": "OpIp",
     "OpOs": "OpOs",
     "OpTime": "OpTime",
+    "ParamJson": "ParamJson",
+    "ReqMethod": "RequestMethod",
+    "ReqUrl": "RequestUrl",
+    "ResultJson": "ResultJson",
     "VerificatId": "VerificatId"
-
   },
-  "ThingsGateway.Admin.Application.OperateLogPageInput": {
-    "SearchDate": "SearchDate",
-    "Account": "Account",
-    "Category": "Category"
+  "ThingsGateway.Admin.Application.SysOrg": {
+    "CanotContainsSelf": "Cannot contain itself",
+    "Category": "Category",
+    "Category.Required": "{0} is a required field",
+    "Code": "Code",
+    "Code.Required": "{0} is a required field",
+    "CodeDup": "Duplicate code {0} exists",
+    "DeletePositionFirst": "Please remove the positions under the organization first",
+    "DeleteRoleFirst": "Please remove the roles under the organization first",
+    "DeleteUserFirst": "Please remove the users under the organization first",
+    "DirectorId": "Director",
+    "Dup": "Duplicate organization exists with Category {0} and Name {1}",
+    "Name": "Name",
+    "Name.Required": "{0} is a required field",
+    "NameDup": "Duplicate name {0} exists",
+    "Names": "Names",
+    "ParentChoiceSelf": "Parent cannot be itself",
+    "ParentId": "ParentOrg",
+    "ParentNull": "Parent does not exist {0}",
+    "Remark": "Remarks",
+    "RootOrg": "Unable to create top-level organization",
+    "Status": "Status",
+    "TargetNameDup": "Target node has duplicate name {0}"
   },
-  "ThingsGateway.Admin.Application.LoginInput": {
-    "Account": "Account",
-    "Password": "Password",
-    "Account.Required": "{0} is required",
-    "Password.Required": "{0} is required"
+  "ThingsGateway.Admin.Application.SysOrgCopyInput": {
+    "ContainsChild": "ContainsChild",
+    "ContainsPosition": "ContainsPosition",
+    "TargetId": "Target"
   },
-  "ThingsGateway.Admin.Application.LogoutInput": {
-    "VerificatId.Required": "{0} is required"
+  "ThingsGateway.Admin.Application.SysPosition": {
+    "CanotContainsSelf": "Cannot contain itself",
+    "Category": "Category",
+    "Category.Required": "{0} is a required field",
+    "Code": "Code",
+    "Code.Required": "{0} is a required field",
+    "CodeDup": "Duplicate code {0} exists",
+    "DeleteUserFirst": "Please remove the users under the position first",
+    "Dup": "Duplicate position exists with Category {0} and Name {1}",
+    "Name": "Name",
+    "Name.Required": "{0} is a required field",
+    "NameDup": "Duplicate name {0} exists",
+    "OrgId": "Organization",
+    "OrgId.MinValue": "{0} is a required field",
+    "ParentChoiceSelf": "Parent cannot be itself",
+    "ParentNull": "Parent does not exist {0}",
+    "Remark": "Remarks",
+    "Status": "Status",
+    "TargetNameDup": "Target node has duplicate name {0}"
   },
-  "ThingsGateway.Admin.Application.AppConfig": {
-    "LoginPolicy": "LoginPolicy",
-    "PasswordPolicy": "PasswordPolicy",
-    "PagePolicy": "PagePolicy",
-    "WebsitePolicy": "WebsitePolicy"
-  },
-  "ThingsGateway.Admin.Application.LoginPolicy": {
-    "SingleOpen": "Single user login switch",
-    "ErrorLockTime": "Login error lock duration (min)",
-    "ErrorResetTime": "Login error count expiration duration (min)",
-    "ErrorCount": "Login error count lock threshold",
-    "VerificatExpireTime": "Login expiration time (min)",
-    "ErrorLockTime.MinValue": "{0} value is too small",
-    "ErrorResetTime.MinValue": "{0} value is too small",
-    "ErrorCount.MinValue": "{0} value is too small",
-    "VerificatExpireTime.MinValue": "{0} value is too small"
-  },
-  "ThingsGateway.Admin.Application.PagePolicy": {
-    "Shortcuts": "Default shortcuts",
-    "Razor": "Default homepage"
-  },
-  "ThingsGateway.Admin.Application.PasswordPolicy": {
-    "DefaultPassword": "Default user password",
-    "DefaultPassword.Required": "{0} is required",
-    "PasswordMinLen": "Minimum password length",
-    "PasswordMinLen.MinValue": "{0} value is too small",
-    "PasswordContainNum": "Contain numbers",
-    "PasswordContainLower": "Contain lowercase letters",
-    "PasswordContainUpper": "Contain uppercase letters",
-    "PasswordContainChar": "Contain special characters"
-  },
-  "ThingsGateway.Admin.Application.WebsitePolicy": {
-    "WebStatus": "WebStatus",
-    "CloseTip": "CloseTip",
-    "CloseTip.Required": "{0} is required"
-  },
-  //enum
-  "ThingsGateway.Admin.Application.ResourceCategoryEnum": {
+  "ThingsGateway.Admin.Application.SysResource": {
+    "CanotDeleteSystemResource": "Cannot delete system resource {0}",
+    "Category": "Category",
+    "Code": "Code",
+    "Href": "Path",
+    "Href.Required": "{0} is required",
+    "Icon": "Icon",
     "Module": "Module",
-    "Menu": "Menu",
-    "Button": "Button"
+    "ModuleIdDiff": "Module is inconsistent with parent menu",
+    "NavLinkMatch": "NavLinkMatch",
+    "NotFoundResource": "System exception, menu not found",
+    "ParentId": "Parent",
+    "ResourceDup": "Duplicate name {0} exists",
+    "ResourceMenuHrefNotNull": "Menu href cannot null",
+    "ResourceParentChoiceSelf": "Parent cannot choose itself",
+    "ResourceParentNull": "Parent does not exist {0}",
+    "Target": "Target",
+    "Title": "Title",
+    "Title.Required": "{0} is required"
+  },
+  "ThingsGateway.Admin.Application.SysRole": {
+    "CannotRoleScopeAll": "Organization role cannot select global data scope",
+    "CanotDeleteAdmin": "Cannot delete built-in super admin role",
+    "CanotEditAdmin": "Cannot edit super admin role",
+    "CanotGrantAdmin": "Cannot assign admins roles",
+    "Category": "Category",
+    "Code": "Code",
+    "CodeDup": "Duplicate code exists: {0}",
+    "Global": "Global",
+    "Name": "Name",
+    "Name.Required": "{0} is required",
+    "NameDup": "Duplicate role name {0}",
+    "OrgId": "Org",
+    "OrgNotNull": "Organization cannot be null",
+    "SameOrgNameDup": "Duplicate role name exists: {0}",
+    "Status": "Status"
+  },
+  "ThingsGateway.Admin.Application.SysUser": {
+    "Account": "Account",
+    "Account.Required": "Account.Required",
+    "AccountDup": "Duplicate account {0} exists",
+    "Avatar": "Avatar",
+    "CanotDeleteAdminUser": "Cannot delete built-in super admin user",
+    "CanotDeleteSelf": "Cannot delete yourself",
+    "CanotEditAdminUser": "Cannot edit super admin user",
+    "CanotGrantAdmin": "Cannot assign admins roles",
+    "CheckSelf": "Prohibit {0} yourself",
+    "ConfirmPasswordDiff": "Passwords entered twice are inconsistent",
+    "DemoCanotUpdatePassword": "DEMO environment does not allow password modification",
+    "DirectorId": "Director",
+    "DirectorSelf": "Cannot set oneself as the supervisor",
+    "Disable": "Disable",
+    "Email": "Email",
+    "EmailDup": "Duplicate email {0} exists",
+    "EmailError": "Email format error {0}",
+    "Enable": "Enable",
+    "ExitVerificat": "You have been forcibly logged out",
+    "GrantRole": "GrantRole",
+    "LastLoginAddress": "LastLoginAddress",
+    "LastLoginDevice": "LastLoginDevice",
+    "LastLoginIp": "LastLoginIp",
+    "LastLoginTime": "LastLoginTime",
+    "LatestLoginAddress": "LatestLoginAddress",
+    "LatestLoginDevice": "LatestLoginDevice",
+    "LatestLoginIp": "LatestLoginIp",
+    "LatestLoginTime": "LatestLoginTime",
+    "NoOrg": "The organization does not exist",
+    "OldPasswordError": "Incorrect old password",
+    "OrgId": "Org",
+    "OrgNames": "OrgNames",
+    "Password": "Password",
+    "PasswordEdited": "Password changed, logged out",
+    "PasswordLengthLess": "Password length cannot be less than {0}",
+    "PasswordMustLow": "Password must contain lowercase letters",
+    "PasswordMustNum": "Password must contain numbers",
+    "PasswordMustSpecial": "Password must contain special characters",
+    "PasswordMustUpp": "Password must contain uppercase letters",
+    "Phone": "Phone",
+    "PhoneError": "Phone number format error {0}",
+    "PositionId": "Position",
+    "PositionName": "PositionName",
+    "Status": "Status"
   },
-
   "ThingsGateway.Admin.Application.TargetEnum": {
-    "_self": "Current window",
     "_blank": "New window",
     "_parent": "Parent window",
+    "_self": "Current window",
     "_top": "Top window"
   },
-  "ThingsGateway.Admin.Application.DictTypeEnum": {
-    "System": "System",
-    "Define": "Business"
+  "ThingsGateway.Admin.Application.TestController": {
+    "Test": "Test",
+    "TestController": "Test API"
   },
-
-  "ThingsGateway.Admin.Application.LogCateGoryEnum": {
-    "Login": "Login",
-    "Logout": "Logout",
-    "Operate": "Operation",
-    "Exception": "Exception"
+  "ThingsGateway.Admin.Application.UnifyResultProvider": {
+    "NoPermission": "Access denied, no permission",
+    "TokenOver": "Login has expired, please login again"
   },
-
-  "ThingsGateway.Admin.Application.LogEnum": {
-    "SUCCESS": "Success",
-    "FAIL": "Fail"
+  "ThingsGateway.Admin.Application.UpdatePasswordInput": {
+    "ConfirmPassword": "Confirm password",
+    "ConfirmPassword.Required": "{0} is required",
+    "NewPassword": "New password",
+    "NewPassword.Required": "{0} is required",
+    "Password": "Password",
+    "Password.Required": "{0} is required"
+  },
+  "ThingsGateway.Admin.Application.UserSelectorOutput": {
+    "Account": "Account",
+    "OrgId": "Org"
+  },
+  "ThingsGateway.Admin.Application.VerificatInfo": {
+    "Device": "Device",
+    "Expire": "Expire(min)",
+    "LoginIp": "LoginIp",
+    "LoginTime": "LoginTime",
+    "Online": "Online",
+    "VerificatTimeout": "VerificatTimeout"
+  },
+  "ThingsGateway.Admin.Application.WebsitePolicy": {
+    "CloseTip": "CloseTip",
+    "CloseTip.Required": "{0} is required",
+    "WebStatus": "WebStatus"
+  },
+  "ThingsGateway.Admin.Application.WorkbenchInfo": {
+    "Razor": "Homepage",
+    "Shortcuts": "Shortcuts"
   }
-}
+}

src/Admin/ThingsGateway.Admin.Application/Locales/zh-CN.json

@@ -1,462 +1,402 @@
 {
+  "ThingsGateway.Admin.Application.AppConfig": {
+    "LoginPolicy": "登录策略",
+    "PagePolicy": "页面设置",
+    "PasswordPolicy": "密码策略",
+    "WebsitePolicy": "网站设置"
+  },
+  "ThingsGateway.Admin.Application.AuthController": {
+    "AuthController": "登录API",
+    "LoginAsync": "登录",
+    "LogoutAsync": "注销"
+  },
+  "ThingsGateway.Admin.Application.AuthService": {
+    "AuthErrorMax": "账号密码错误，超过 {0} 次后将锁定 {1} 分钟，错误次数 {2} ",
+    "MustDesc": "密码需要DESC加密后传入",
+    "OrgDisable": "所属公司/部门已停用,请联系管理员",
+    "PasswordError": "密码错误次数过多，请 {0} 分钟后再试",
+    "SingleLoginWarn": "您的账号已在别处登录",
+    "TenantNull": "租户不存在",
+    "UserDisable": "账号 {0} 已停用",
+    "UserNoModule": "该账号未分配模块,请联系管理员",
+    "UserNull": "用户 {0} 不存在"
+  },
   "ThingsGateway.Admin.Application.BaseDataEntity": {
     "CreateOrgId": "创建机构Id"
   },
   "ThingsGateway.Admin.Application.BaseEntity": {
-    "SortCode": "排序",
     "CreateTime": "创建时间",
     "CreateUser": "创建人",
+    "SortCode": "排序",
     "UpdateTime": "更新时间",
     "UpdateUser": "更新人"
   },
-
   "ThingsGateway.Admin.Application.BlazorAuthenticationHandler": {
     "UserExpire": "用户登录已过期，请重新登录"
   },
-
-  "ThingsGateway.Admin.Application.SysUser": {
-    "Disable": "禁用",
-    "Enable": "启用",
-    "GrantRole": "分配角色",
-    "ExitVerificat": "您已被强制下线",
-    "PasswordEdited": "密码被修改，已退出登录",
-    "Avatar": "头像",
-    "Account": "账号",
-    "Account.Required": " {0} 是必填项",
-    "Password": "密码",
-    "Status": "状态",
-    "Phone": "手机",
-    "Email": "邮箱",
-    "LastLoginIp": "上次登录ip",
-    "LastLoginDevice": "上次登录设备",
-    "LastLoginTime": "上次登录时间",
-    "LastLoginAddress": "上次登录地点",
-    "LatestLoginIp": "最新登录ip",
-    "LatestLoginTime": "最新登录时间",
-    "LatestLoginDevice": "最新登录设备",
-    "LatestLoginAddress": "最新登录地点",
-    "OrgNames": "机构名称",
-    "PositionName": "职位名称",
-    "OrgId": "机构",
-    "PositionId": "职位",
-    "DirectorId": "主管",
-    "CheckSelf": "禁止 {0} 自己",
-    "CanotDeleteAdminUser": "不可删除系统内置超管用户",
-    "CanotEditAdminUser": "不可编辑超管用户",
-    "CanotGrantAdmin": "不能分配超管角色",
-    "EmailDup": "存在重复的邮箱 {0}",
-    "AccountDup": "存在重复的账号 {0}",
-    "CanotDeleteSelf": "不可删除自己",
-    "EmailError": "邮箱 {0} 格式错误",
-    "PhoneError": "手机号码 {0} 格式错误",
-    "NoOrg": "组织机构不存在",
-    "DirectorSelf": "不能设置自己为主管",
-
-
-    "DemoCanotUpdatePassword": "DEMO环境不允许修改密码",
-    "OldPasswordError": "原密码错误",
-    "ConfirmPasswordDiff": "两次输入的密码不一致",
-    "PasswordLengthLess": "密码长度不能小于 {0} ",
-    "PasswordMustNum ": "密码必须包含数字",
-    "PasswordMustLow": "密码必须包含小写字母",
-    "PasswordMustUpp": "密码必须包含大写字母",
-    "PasswordMustSpecial": "密码必须包含特殊字符"
-  },
-
-  "ThingsGateway.Admin.Application.SysRole": {
-    "Code": "编码",
-    "Name": "名称",
-    "Name.Required": " {0} 是必填项",
-    "Category": "分类",
-    "Global": "全局",
-    "Status": "状态",
-    "OrgId": "机构",
-
-    "CanotDeleteAdmin": "不可删除系统内置超管角色",
-    "CanotEditAdmin": "不可编辑超管角色",
-    "CanotGrantAdmin": "不能分配超管角色",
-
-    "NameDup": "存在重复的角色名称 {0}",
-    "OrgNotNull": "机构不能为空",
-    "SameOrgNameDup": "存在重复的角色名称 {0}",
-    "CannotRoleScopeAll": "机构角色不能选择全局数据范围",
-    "CodeDup": "存在重复的编码 {0}"
-  },
-  "ThingsGateway.Admin.Application.RoleCategoryEnum": {
-    "Global": "全局",
-    "Org": "机构"
-  },
   "ThingsGateway.Admin.Application.DataScopeEnum": {
-    "SCOPE_SELF": "仅自己",
     "SCOPE_ALL": "全部",
     "SCOPE_ORG": "仅所属组织",
     "SCOPE_ORG_CHILD": "所属组织及以下",
-    "SCOPE_ORG_DEFINE": "自定义"
+    "SCOPE_ORG_DEFINE": "自定义",
+    "SCOPE_SELF": "仅自己"
   },
   "ThingsGateway.Admin.Application.DefaultDataScope": {
     "ScopeCategory": "数据范围",
     "ScopeDefineOrgIdList": "自定义列表"
   },
-  "ThingsGateway.Admin.Application.SysResource": {
-    "Title": "标题",
-    "Module": "模块",
-    "Title.Required": "{0} 是必填项",
-    "Href.Required": "{0} 是必填项",
-    "Icon": "图标",
-    "Href": "路径",
-    "Code": "编码",
-    "Category": "分类",
-    "Target": "跳转类型",
-    "NavLinkMatch": "匹配类型",
-    "ParentId": "上级菜单",
-    "ResourceDup": "存在重复的名称 {0}",
-    "ResourceParentChoiceSelf": "父级不能选择自己",
-    "ResourceParentNull": "父级不存在 {0}",
-    "NotFoundResource": "系统异常，没找到该菜单",
-    "ModuleIdDiff": "模块与上级菜单不一致",
-    "CanotDeleteSystemResource": "不可删除系统资源 {0}",
-    "ResourceMenuHrefNotNull": "菜单的路径不能为空"
+  "ThingsGateway.Admin.Application.DictTypeEnum": {
+    "Define": "业务配置",
+    "System": "系统配置"
   },
-
-  "ThingsGateway.Admin.Application.SysOrgCopyInput": {
-    "TargetId": "目标机构",
-    "ContainsChild": "包含下级",
-    "ContainsPosition": "包含职位"
+  "ThingsGateway.Admin.Application.FileService": {
+    "FileLengthError": "文件大小不允许超过 {0} M",
+    "FileNullError": "文件不能为空",
+    "FileTypeError": "不支持 {0} 格式"
   },
-  "ThingsGateway.Admin.Application.SysPosition": {
-    "Category.Required": "{0} 是必填项",
-    "Name.Required": "{0} 是必填项",
-    "Code.Required": "{0} 是必填项",
-    "OrgId.MinValue": "{0} 是必填项",
-    "Category": "分类",
-    "Name": "名称",
-    "Code": "代码",
-    "Status": "状态",
-    "OrgId": "机构",
-    "Remark": "备注",
-    "Dup": "存在重复的岗位 分类 {0} 名称 {1}",
-    "CodeDup": "存在重复的编码 {0}",
-    "NameDup": "存在重复的名称 {0}",
-    "CanotContainsSelf": "不可包含自己",
-    "TargetNameDup": "目标节点存在重复的名称 {0}",
-    "ParentChoiceSelf": "父级不能选择自己",
-    "ParentNull": "父级不存在 {0}",
-    "DeleteUserFirst": "请先删除职位下的用户"
-
+  "ThingsGateway.Admin.Application.HardwareInfo": {
+    "Environment": "主机环境",
+    "FrameworkDescription": "NET框架",
+    "OsArchitecture": "系统架构",
+    "UpdateTime": "更新时间",
+    "UUID": "唯一编码"
   },
-
-  "ThingsGateway.Admin.Application.SysOrg": {
-    "Category.Required": "{0} 是必填项",
-    "Name.Required": "{0} 是必填项",
-    "Code.Required": "{0} 是必填项",
+  "ThingsGateway.Admin.Application.HardwareJob": {
+    "GetHardwareInfoFail": "获取硬件信息出错"
+  },
+  "ThingsGateway.Admin.Application.HistoryHardwareInfo": {
+    "Battery": "电池",
+    "CpuUsage": "CPU使用率",
+    "DriveUsage": "磁盘使用率",
+    "MemoryUsage": "内存",
+    "Temperature": "温度"
+  },
+  "ThingsGateway.Admin.Application.LogCateGoryEnum": {
+    "Exception": "异常",
+    "Login": "登录",
+    "Logout": "注销",
+    "Operate": "操作"
+  },
+  "ThingsGateway.Admin.Application.LogEnum": {
+    "FAIL": "失败",
+    "SUCCESS": "成功"
+  },
+  "ThingsGateway.Admin.Application.LoginInput": {
+    "Account": "登录账号",
+    "Account.Required": "{0} 是必填项",
+    "Password": "登录密码",
+    "Password.Required": "{0} 是必填项"
+  },
+  "ThingsGateway.Admin.Application.LoginPolicy": {
+    "ErrorCount": "登录错误次数锁定阈值",
+    "ErrorCount.MinValue": " {0} 值太小",
+    "ErrorLockTime": "登录错误锁定时长(分)",
+    "ErrorLockTime.MinValue": " {0} 值太小",
+    "ErrorResetTime": "登录错误次数过期时长(分)",
+    "ErrorResetTime.MinValue": " {0} 值太小",
+    "SingleOpen": "单用户登录开关",
+    "VerificatExpireTime": "登录过期时间(分)",
+    "VerificatExpireTime.MinValue": " {0} 值太小"
+  },
+  "ThingsGateway.Admin.Application.LogoutInput": {
+    "VerificatId.Required": "{0} 是必填项"
+  },
+  "ThingsGateway.Admin.Application.OpenApiAuthController": {
+    "LoginAsync": "登录",
+    "LogoutAsync": "注销",
+    "OpenApiAuthController": "登录API"
+  },
+  "ThingsGateway.Admin.Application.OperateLogPageInput": {
+    "Account": "操作账号",
     "Category": "分类",
-    "Name": "名称",
-    "Code": "代码",
-    "Status": "状态",
-    "ParentId": "上级机构",
-    "Names": "机构全称",
-    "Remark": "备注",
-    "DirectorId": "主管",
-    "Dup": "存在重复的机构 分类 {0} 名称 {1}",
-    "CodeDup": "存在重复的编码 {0}",
-    "NameDup": "存在重复的名称 {0}",
-    "CanotContainsSelf": "不可包含自己",
-    "TargetNameDup": "目标节点存在重复的名称 {0}",
-    "ParentChoiceSelf": "父级不能选择自己",
-    "ParentNull": "父级不存在 {0}",
-    "DeleteUserFirst": "请先删除机构下的用户",
-    "DeleteRoleFirst": "请先删除机构下的角色",
-    "DeletePositionFirst": "请先删除机构下的职位",
-    "RootOrg": "无法创建顶层机构"
+    "SearchDate": "时间范围"
+  },
+  "ThingsGateway.Admin.Application.OperDescAttribute": {
+    "ChangeParentResource": "更改父节点",
+    "CopyOrg": "复制机构",
+    "CopyResource": "复制资源",
+    "DeleteDict": "删除字典",
+    "DeleteOperLog": "删除操作日志",
+    "DeleteOrg": "删除机构",
+    "DeletePosition": "删除岗位",
+    "DeleteResource": "删除资源",
+    "DeleteRole": "删除角色",
+    "DeleteuSER": "删除用户",
+    "EditLoginPolicy": "修改登录策略",
+    "EditPagePolicy": "修改页面策略",
+    "EditPasswordPolicy": "修改密码策略",
+    "EditWebsitePolicy": "修改网站设置",
+    "ExitSession": "强退会话",
+    "ExitVerificat": "强退令牌",
+    "ExportOperLog": "导出操作日志",
+    "GrantApi": "API",
+    "GrantResource": "资源",
+    "GrantRole": "角色",
+    "GrantUser": "用户",
+    "NoPermission": "无权限操作",
+    "ResetPassword": "重置密码",
+    "RoleGrantApiPermission": "角色授权OpenApi",
+    "RoleGrantResource": "角色授权资源",
+    "RoleGrantUser": "角色授权用户",
+    "SaveDict": "修改字典",
+    "SaveOrg": "保存机构",
+    "SavePosition": "保存岗位",
+    "SaveResource": "修改资源",
+    "SaveRole": "修改角色",
+    "SaveUser": "修改用户",
+    "UpdatePassword": "更新个人密码",
+    "UpdateUserInfo": "更新个人信息",
+    "UserGrantApiPermission": "用户授权OpenApi",
+    "UserGrantResource": "用户授权资源",
+    "UserGrantRole": "用户授权角色",
+    "WorkbenchInfo": "更新个人工作台"
   },
   "ThingsGateway.Admin.Application.OrgEnum": {
     "COMPANY": "公司",
     "DEPT": "部门"
   },
+  "ThingsGateway.Admin.Application.PagePolicy": {
+    "Razor": "默认主页",
+    "Shortcuts": "默认快捷方式"
+  },
+  "ThingsGateway.Admin.Application.PasswordPolicy": {
+    "DefaultPassword": "默认用户密码",
+    "DefaultPassword.Required": " {0} 是必填项",
+    "PasswordContainChar": "包含特殊字符",
+    "PasswordContainLower": "包含小写字母",
+    "PasswordContainNum": "包含数字",
+    "PasswordContainUpper": "包含大写字母",
+    "PasswordMinLen": "密码最小长度",
+    "PasswordMinLen.MinValue": " {0} 值太小"
+  },
   "ThingsGateway.Admin.Application.PositionCategoryEnum": {
     "HIGH": "高层",
-    "MIDDLE": "中层",
-    "LOW": "低层"
+    "LOW": "低层",
+    "MIDDLE": "中层"
   },
-
-  //controller
-  "ThingsGateway.Admin.Application.AuthController": {
-    //auth
-    "AuthController": "登录API",
-    "LoginAsync": "登录",
-    "LogoutAsync": "注销"
-  },
-  "ThingsGateway.Admin.Application.TestController": {
-    //auth
-    "TestController": "测试API",
-    "Test": "测试"
-  },
-  "ThingsGateway.Admin.Application.OpenApiAuthController": {
-    //auth
-    "OpenApiAuthController": "登录API",
-    "LoginAsync": "登录",
-    "LogoutAsync": "注销"
-  },
-
-
-
-
-  "ThingsGateway.Admin.Application.FileService": {
-    "FileNullError": "文件不能为空",
-    "FileLengthError": "文件大小不允许超过 {0} M",
-    "FileTypeError": "不支持 {0} 格式"
-  },
-
-  "ThingsGateway.Admin.Application.UnifyResultProvider": {
-    "TokenOver": "登录已过期，请重新登录",
-    "NoPermission": "禁止访问，没有权限"
-  },
-
-  "ThingsGateway.Admin.Application.AuthService": {
-    "TenantNull": "租户不存在",
-    "OrgDisable": "所属公司/部门已停用,请联系管理员",
-    "SingleLoginWarn": "您的账号已在别处登录",
-    "UserNull": "用户 {0} 不存在",
-    "PasswordError": "密码错误次数过多，请 {0} 分钟后再试",
-    "AuthErrorMax": "账号密码错误，超过 {0} 次后将锁定 {1} 分钟，错误次数 {2} ",
-    "UserDisable": "账号 {0} 已停用",
-    "MustDesc": "密码需要DESC加密后传入",
-    "UserNoModule": "该账号未分配模块,请联系管理员"
-  },
-
-
-  "ThingsGateway.Admin.Application.HardwareInfo": {
-    "Environment": "主机环境",
-    "FrameworkDescription": "NET框架",
-    "OsArchitecture": "系统架构",
-    "UUID": "唯一编码",
-    "UpdateTime": "更新时间"
-  },
-  "ThingsGateway.Admin.Application.HistoryHardwareInfo": {
-    "DriveUsage": "磁盘使用率",
-    "MemoryUsage": "内存",
-    "CpuUsage": "CPU使用率",
-    "Temperature": "温度",
-    "Battery": "电池"
-  },
-
-  //oper
-  "ThingsGateway.Admin.Application.OperDescAttribute": {
-    //dict
-    "SaveDict": "修改字典",
-    "DeleteDict": "删除字典",
-    "EditLoginPolicy": "修改登录策略",
-    "EditPasswordPolicy": "修改密码策略",
-    "EditPagePolicy": "修改页面策略",
-    "EditWebsitePolicy": "修改网站设置",
-    //operlog
-    "DeleteOperLog": "删除操作日志",
-    "ExportOperLog": "导出操作日志",
-
-    //resource
-    "SaveResource": "修改资源",
-    "DeleteResource": "删除资源",
-
-    //role
-    "SaveRole": "修改角色",
-    "DeleteRole": "删除角色",
-    "RoleGrantResource": "角色授权资源",
-    "RoleGrantUser": "角色授权用户",
-    "RoleGrantApiPermission": "角色授权OpenApi",
-    "GrantApi": "API",
-    "GrantUser": "用户",
-    "GrantRole": "角色",
-    "GrantResource": "资源",
-    //user
-    "SaveUser": "修改用户",
-    "DeleteuSER": "删除用户",
-    "ResetPassword": "重置密码",
-    "UserGrantRole": "用户授权角色",
-    "UserGrantResource": "用户授权资源",
-    "UserGrantApiPermission": "用户授权OpenApi",
-
-    //usercenter
-    "UpdateUserInfo": "更新个人信息",
-    "WorkbenchInfo": "更新个人工作台",
-    "UpdatePassword": "更新个人密码",
-
-    //session
-    "ExitVerificat": "强退令牌",
-    "ExitSession": "强退会话",
-
-
-    "CopyOrg": "复制机构",
-    "DeleteOrg": "删除机构",
-    "SaveOrg": "保存机构",
-
-    "DeletePosition": "删除岗位",
-    "SavePosition": "保存岗位",
-
-    "NoPermission": "无权限操作",
-
-    "CopyResource": "复制资源",
-    "ChangeParentResource": "更改父节点"
-  },
-
-  //service
-
-  "ThingsGateway.Admin.Application.HardwareJob": {
-    "GetHardwareInfoFail": "获取硬件信息出错"
-  },
-
-  //dto
-  "ThingsGateway.Admin.Application.UserSelectorOutput": {
-    "Account": "账号",
-    "OrgId": "机构"
+  "ThingsGateway.Admin.Application.ResourceCategoryEnum": {
+    "Button": "按钮",
+    "Menu": "菜单",
+    "Module": "模块"
   },
   "ThingsGateway.Admin.Application.ResourceTableSearchModel": {
-    "Module": "模块",
     "Href": "路径",
+    "Module": "模块",
     "Title": "标题"
   },
-  "ThingsGateway.Admin.Application.WorkbenchInfo": {
-    "Razor": "主页",
-    "Shortcuts": "快捷方式"
+  "ThingsGateway.Admin.Application.RoleCategoryEnum": {
+    "Global": "全局",
+    "Org": "机构"
   },
-  "ThingsGateway.Admin.Application.UpdatePasswordInput": {
-    "Password": "密码",
-    "NewPassword": "新密码",
-    "ConfirmPassword": "确认密码",
-    "Password.Required": " {0} 是必填项",
-    "NewPassword.Required": " {0} 是必填项",
-    "ConfirmPassword.Required": " {0} 是必填项"
-  },
-
-
-  "ThingsGateway.Admin.Application.VerificatInfo": {
-    "Expire": "过期时间(分)",
-    "Online": "在线状态",
-    "VerificatTimeout": "超时时间",
-    "Device": "登录设备",
-    "LoginIp": "登录IP",
-    "LoginTime": "登录时间"
-  },
-
   "ThingsGateway.Admin.Application.SessionOutput": {
     "Account": "账号",
-    "Online": "在线状态",
     "LatestLoginIp": "最新登录ip",
     "LatestLoginTime": "最新登录时间",
+    "Online": "在线状态",
     "VerificatCount": "令牌数量"
   },
-
   "ThingsGateway.Admin.Application.SysDict": {
-    "Category.Required": "{0} 是必填项",
-    "Name.Required": "{0} 是必填项",
-    "Code.Required": "{0} 是必填项",
     "Category": "分类",
-    "Name": "名称",
+    "Category.Required": "{0} 是必填项",
     "Code": "代码",
-    "Remark": "备注",
+    "Code.Required": "{0} 是必填项",
+    "DemoCanotUpdateWebsitePolicy": "DEMO环境不允许修改网站设置",
     "DictDup": "存在重复的配置 分类 {0} 名称 {1}",
-    "DemoCanotUpdateWebsitePolicy": "DEMO环境不允许修改网站设置"
+    "Name": "名称",
+    "Name.Required": "{0} 是必填项",
+    "Remark": "备注"
   },
-
-
   "ThingsGateway.Admin.Application.SysOperateLog": {
+    "Category": "日志分类",
     "ClassName": "类名",
     "ExeMessage": "具体消息",
-    "MethodName": "方法名称",
-    "ParamJson": "请求参数",
-    "ReqMethod": "请求方式",
-    "ReqUrl": "请求地址",
-    "ResultJson": "返回结果",
-    "Category": "日志分类",
     "ExeStatus": "执行状态",
+    "MethodName": "方法名称",
     "Name": "日志名称",
     "OpAccount": "账号",
     "OpBrowser": "浏览器",
     "OpIp": "ip",
     "OpOs": "系统",
     "OpTime": "操作时间",
+    "ParamJson": "请求参数",
+    "ReqMethod": "请求方式",
+    "ReqUrl": "请求地址",
+    "ResultJson": "返回结果",
     "VerificatId": "验证Id"
-
   },
-  "ThingsGateway.Admin.Application.OperateLogPageInput": {
-    "SearchDate": "时间范围",
-    "Account": "操作账号",
-    "Category": "分类"
+  "ThingsGateway.Admin.Application.SysOrg": {
+    "CanotContainsSelf": "不可包含自己",
+    "Category": "分类",
+    "Category.Required": "{0} 是必填项",
+    "Code": "代码",
+    "Code.Required": "{0} 是必填项",
+    "CodeDup": "存在重复的编码 {0}",
+    "DeletePositionFirst": "请先删除机构下的职位",
+    "DeleteRoleFirst": "请先删除机构下的角色",
+    "DeleteUserFirst": "请先删除机构下的用户",
+    "DirectorId": "主管",
+    "Dup": "存在重复的机构 分类 {0} 名称 {1}",
+    "Name": "名称",
+    "Name.Required": "{0} 是必填项",
+    "NameDup": "存在重复的名称 {0}",
+    "Names": "机构全称",
+    "ParentChoiceSelf": "父级不能选择自己",
+    "ParentId": "上级机构",
+    "ParentNull": "父级不存在 {0}",
+    "Remark": "备注",
+    "RootOrg": "无法创建顶层机构",
+    "Status": "状态",
+    "TargetNameDup": "目标节点存在重复的名称 {0}"
   },
-  "ThingsGateway.Admin.Application.LoginInput": {
-    "Account": "登录账号",
-    "Password": "登录密码",
-    "Account.Required": "{0} 是必填项",
-    "Password.Required": "{0} 是必填项"
+  "ThingsGateway.Admin.Application.SysOrgCopyInput": {
+    "ContainsChild": "包含下级",
+    "ContainsPosition": "包含职位",
+    "TargetId": "目标机构"
   },
-  "ThingsGateway.Admin.Application.LogoutInput": {
-    "VerificatId.Required": "{0} 是必填项"
+  "ThingsGateway.Admin.Application.SysPosition": {
+    "CanotContainsSelf": "不可包含自己",
+    "Category": "分类",
+    "Category.Required": "{0} 是必填项",
+    "Code": "代码",
+    "Code.Required": "{0} 是必填项",
+    "CodeDup": "存在重复的编码 {0}",
+    "DeleteUserFirst": "请先删除职位下的用户",
+    "Dup": "存在重复的岗位 分类 {0} 名称 {1}",
+    "Name": "名称",
+    "Name.Required": "{0} 是必填项",
+    "NameDup": "存在重复的名称 {0}",
+    "OrgId": "机构",
+    "OrgId.MinValue": "{0} 是必填项",
+    "ParentChoiceSelf": "父级不能选择自己",
+    "ParentNull": "父级不存在 {0}",
+    "Remark": "备注",
+    "Status": "状态",
+    "TargetNameDup": "目标节点存在重复的名称 {0}"
   },
-  "ThingsGateway.Admin.Application.AppConfig": {
-    "LoginPolicy": "登录策略",
-    "PasswordPolicy": "密码策略",
-    "PagePolicy": "页面设置",
-    "WebsitePolicy": "网站设置"
-  },
-  "ThingsGateway.Admin.Application.LoginPolicy": {
-    "SingleOpen": "单用户登录开关",
-    "ErrorLockTime": "登录错误锁定时长(分)",
-    "ErrorResetTime": "登录错误次数过期时长(分)",
-    "ErrorCount": "登录错误次数锁定阈值",
-    "VerificatExpireTime": "登录过期时间(分)",
-    "ErrorLockTime.MinValue": " {0} 值太小",
-    "ErrorResetTime.MinValue": " {0} 值太小",
-    "ErrorCount.MinValue": " {0} 值太小",
-    "VerificatExpireTime.MinValue": " {0} 值太小"
-  },
-  "ThingsGateway.Admin.Application.PagePolicy": {
-    "Shortcuts": "默认快捷方式",
-    "Razor": "默认主页"
-  },
-  "ThingsGateway.Admin.Application.PasswordPolicy": {
-    "DefaultPassword": "默认用户密码",
-    "DefaultPassword.Required": " {0} 是必填项",
-    "PasswordMinLen": "密码最小长度",
-    "PasswordMinLen.MinValue": " {0} 值太小",
-    "PasswordContainNum": "包含数字",
-    "PasswordContainLower": "包含小写字母",
-    "PasswordContainUpper": "包含大写字母",
-    "PasswordContainChar": "包含特殊字符"
-  },
-  "ThingsGateway.Admin.Application.WebsitePolicy": {
-    "WebStatus": "是否开放",
-    "CloseTip": "关闭提示",
-    "CloseTip.Required": " {0} 是必填项"
-  },
-
-
-
-  //enum
-  "ThingsGateway.Admin.Application.ResourceCategoryEnum": {
+  "ThingsGateway.Admin.Application.SysResource": {
+    "CanotDeleteSystemResource": "不可删除系统资源 {0}",
+    "Category": "分类",
+    "Code": "编码",
+    "Href": "路径",
+    "Href.Required": "{0} 是必填项",
+    "Icon": "图标",
     "Module": "模块",
-    "Menu": "菜单",
-    "Button": "按钮"
+    "ModuleIdDiff": "模块与上级菜单不一致",
+    "NavLinkMatch": "匹配类型",
+    "NotFoundResource": "系统异常，没找到该菜单",
+    "ParentId": "上级菜单",
+    "ResourceDup": "存在重复的名称 {0}",
+    "ResourceMenuHrefNotNull": "菜单的路径不能为空",
+    "ResourceParentChoiceSelf": "父级不能选择自己",
+    "ResourceParentNull": "父级不存在 {0}",
+    "Target": "跳转类型",
+    "Title": "标题",
+    "Title.Required": "{0} 是必填项"
+  },
+  "ThingsGateway.Admin.Application.SysRole": {
+    "CannotRoleScopeAll": "机构角色不能选择全局数据范围",
+    "CanotDeleteAdmin": "不可删除系统内置超管角色",
+    "CanotEditAdmin": "不可编辑超管角色",
+    "CanotGrantAdmin": "不能分配超管角色",
+    "Category": "分类",
+    "Code": "编码",
+    "CodeDup": "存在重复的编码 {0}",
+    "Global": "全局",
+    "Name": "名称",
+    "Name.Required": " {0} 是必填项",
+    "NameDup": "存在重复的角色名称 {0}",
+    "OrgId": "机构",
+    "OrgNotNull": "机构不能为空",
+    "SameOrgNameDup": "存在重复的角色名称 {0}",
+    "Status": "状态"
+  },
+  "ThingsGateway.Admin.Application.SysUser": {
+    "Account": "账号",
+    "Account.Required": " {0} 是必填项",
+    "AccountDup": "存在重复的账号 {0}",
+    "Avatar": "头像",
+    "CanotDeleteAdminUser": "不可删除系统内置超管用户",
+    "CanotDeleteSelf": "不可删除自己",
+    "CanotEditAdminUser": "不可编辑超管用户",
+    "CanotGrantAdmin": "不能分配超管角色",
+    "CheckSelf": "禁止 {0} 自己",
+    "ConfirmPasswordDiff": "两次输入的密码不一致",
+    "DemoCanotUpdatePassword": "DEMO环境不允许修改密码",
+    "DirectorId": "主管",
+    "DirectorSelf": "不能设置自己为主管",
+    "Disable": "禁用",
+    "Email": "邮箱",
+    "EmailDup": "存在重复的邮箱 {0}",
+    "EmailError": "邮箱 {0} 格式错误",
+    "Enable": "启用",
+    "ExitVerificat": "您已被强制下线",
+    "GrantRole": "分配角色",
+    "LastLoginAddress": "上次登录地点",
+    "LastLoginDevice": "上次登录设备",
+    "LastLoginIp": "上次登录ip",
+    "LastLoginTime": "上次登录时间",
+    "LatestLoginAddress": "最新登录地点",
+    "LatestLoginDevice": "最新登录设备",
+    "LatestLoginIp": "最新登录ip",
+    "LatestLoginTime": "最新登录时间",
+    "NoOrg": "组织机构不存在",
+    "OldPasswordError": "原密码错误",
+    "OrgId": "机构",
+    "OrgNames": "机构名称",
+    "Password": "密码",
+    "PasswordEdited": "密码被修改，已退出登录",
+    "PasswordLengthLess": "密码长度不能小于 {0} ",
+    "PasswordMustLow": "密码必须包含小写字母",
+    "PasswordMustNum": "密码必须包含数字",
+    "PasswordMustSpecial": "密码必须包含特殊字符",
+    "PasswordMustUpp": "密码必须包含大写字母",
+    "Phone": "手机",
+    "PhoneError": "手机号码 {0} 格式错误",
+    "PositionId": "职位",
+    "PositionName": "职位名称",
+    "Status": "状态"
   },
-
   "ThingsGateway.Admin.Application.TargetEnum": {
-    "_self": "本窗口",
     "_blank": "新窗口",
     "_parent": "父级窗口",
+    "_self": "本窗口",
     "_top": "顶级窗口"
   },
-  "ThingsGateway.Admin.Application.DictTypeEnum": {
-    "System": "系统配置",
-    "Define": "业务配置"
+  "ThingsGateway.Admin.Application.TestController": {
+    "Test": "测试",
+    "TestController": "测试API"
   },
-
-  "ThingsGateway.Admin.Application.LogCateGoryEnum": {
-    "Login": "登录",
-    "Logout": "注销",
-    "Operate": "操作",
-    "Exception": "异常"
+  "ThingsGateway.Admin.Application.UnifyResultProvider": {
+    "NoPermission": "禁止访问，没有权限",
+    "TokenOver": "登录已过期，请重新登录"
   },
-
-  "ThingsGateway.Admin.Application.LogEnum": {
-    "SUCCESS": "成功",
-    "FAIL": "失败"
+  "ThingsGateway.Admin.Application.UpdatePasswordInput": {
+    "ConfirmPassword": "确认密码",
+    "ConfirmPassword.Required": " {0} 是必填项",
+    "NewPassword": "新密码",
+    "NewPassword.Required": " {0} 是必填项",
+    "Password": "密码",
+    "Password.Required": " {0} 是必填项"
+  },
+  "ThingsGateway.Admin.Application.UserSelectorOutput": {
+    "Account": "账号",
+    "OrgId": "机构"
+  },
+  "ThingsGateway.Admin.Application.VerificatInfo": {
+    "Device": "登录设备",
+    "Expire": "过期时间(分)",
+    "LoginIp": "登录IP",
+    "LoginTime": "登录时间",
+    "Online": "在线状态",
+    "VerificatTimeout": "超时时间"
+  },
+  "ThingsGateway.Admin.Application.WebsitePolicy": {
+    "CloseTip": "关闭提示",
+    "CloseTip.Required": " {0} 是必填项",
+    "WebStatus": "是否开放"
+  },
+  "ThingsGateway.Admin.Application.WorkbenchInfo": {
+    "Razor": "主页",
+    "Shortcuts": "快捷方式"
   }
-}
+}

src/Admin/ThingsGateway.Admin.Application/Logging/DatabaseLoggingWriter.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
-
 using System.Collections.Concurrent;
 using System.Reflection;
 
@@ -18,6 +16,7 @@ using ThingsGateway.FriendlyException;
 using ThingsGateway.Logging;
 using ThingsGateway.NewLife.Json.Extension;
 using ThingsGateway.Razor;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
@@ -144,7 +143,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;
         }
@@ -203,7 +202,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,33 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+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,14 @@
 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 +46,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 +76,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 +87,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 +145,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 +209,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/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/Auth/AuthService.cs

@@ -324,7 +324,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/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/OperateLog/SysOperateLogService.cs

@@ -10,10 +10,10 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 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

@@ -10,7 +10,7 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

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

@@ -10,10 +10,9 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.FriendlyException;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

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

@@ -10,7 +10,7 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

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

@@ -10,9 +10,8 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using ThingsGateway.FriendlyException;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

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

@@ -12,11 +12,8 @@ using BootstrapBlazor.Components;
 
 using Microsoft.Extensions.DependencyInjection;
 
-using SqlSugar;
-
-using System.Globalization;
-
 using ThingsGateway.FriendlyException;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
@@ -24,7 +21,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)
     {
@@ -33,7 +30,6 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
 
     #region 增删改查
 
-
     [OperDesc("CopyResource")]
     public async Task CopyAsync(IEnumerable<long> ids, long moduleId)
     {
@@ -144,12 +140,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;
     }
@@ -259,7 +255,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

@@ -10,7 +10,7 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

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

@@ -10,10 +10,9 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using ThingsGateway.FriendlyException;
 using ThingsGateway.NewLife.Json.Extension;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

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

@@ -10,9 +10,7 @@
 
 using BootstrapBlazor.Components;
 
-using Mapster;
-
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
@@ -69,7 +67,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 +92,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 +115,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/SysUserService.cs

@@ -10,15 +10,12 @@
 
 using BootstrapBlazor.Components;
 
-using Mapster;
-
-using SqlSugar;
-
 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;
 
@@ -453,7 +450,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);//设置密码
@@ -873,7 +870,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/VerificatInfo/VerificatInfoService.cs

@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 
@@ -37,6 +37,8 @@ internal sealed class VerificatInfoService : BaseService<VerificatInfo>, IVerifi
 
     private VerificatInfo? GetFromDb(long id)
     {
+        if (id == 0)
+            return null;
         using var db = GetDB();
         var verificatInfo = db.Queryable<VerificatInfo>().First(u => u.Id == id);
         if (verificatInfo != null)

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

@@ -10,11 +10,13 @@
 
 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;
@@ -65,10 +67,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(IApplicationBuilder applicationBuilder)
+    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 +148,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" />
@@ -27,9 +28,9 @@
 
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
-		<PackageReference Include="System.Formats.Asn1" Version="9.0.5" />
-		<PackageReference Include="System.Threading.RateLimiting" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(NET9Version)" />
+		<PackageReference Include="System.Formats.Asn1" Version="$(NET9Version)" />
+		<PackageReference Include="System.Threading.RateLimiting" Version="$(NET9Version)" />
 	</ItemGroup>
 	<ItemGroup>
 		<Content Remove="SeedData\Admin\*.json" />
@@ -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/VerificatInfoUtil.cs

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

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,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using Mapster;
-
 using ThingsGateway.Admin.Application;
 using ThingsGateway.NewLife;
 using ThingsGateway.NewLife.Extension;
@@ -88,7 +86,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 +119,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 +154,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

@@ -19,3 +19,4 @@ global using System.Diagnostics.CodeAnalysis;
 global using ThingsGateway.Razor;
 
 [assembly: SuppressMessage("Reliability", "CA2007", Justification = "<挂起>", Scope = "module")]
+[assembly: GlobalGenerateSetParametersAsync(true)]

src/Admin/ThingsGateway.Admin.Razor/Locales/en-US.json

@@ -1,74 +1,73 @@
 {
-  "ThingsGateway.Admin.Razor.LoginConnectionHub": {
-    "Jump": "Jump"
-  },
-  "ThingsGateway.Admin.Razor.UserLogin": {
-    "Account": "Username",
-    "Password": "Password",
-    "Login": "Login"
-  },
   "ThingsGateway.Admin.Razor._Imports": {
-    "Org": "Org",
-    "Position": "Position",
-    "Role": "Role",
-    "RoleList": "Role List",
-    "PositionList": "Position List",
-    "OrgList": "Org List",
-    "MaxCount": "Exceeding the quantity limit",
     "All": "All",
-    "Copy": "Copy",
     "Choice": "Choice",
-    "Picture": "Picture",
-    "Root": "Root",
-    "Save": "Save",
+    "Copy": "Copy",
     "CurrentVerificat": "CurrentVerificat",
     "EmptyText": "Empty",
-    "SelectPlaceHolder": "Please select ...",
-    "ExportButtonText": "Export/Import"
+    "ExportButtonText": "Export/Import",
+    "MaxCount": "Exceeding the quantity limit",
+    "Org": "Org",
+    "OrgList": "Org List",
+    "Picture": "Picture",
+    "Position": "Position",
+    "PositionList": "Position List",
+    "Role": "Role",
+    "RoleList": "Role List",
+    "Root": "Root",
+    "Save": "Save",
+    "SelectPlaceHolder": "Please select ..."
   },
   "ThingsGateway.Admin.Razor.ChoiceModuleComponent": {
     "SetDefaultModule": "Set as default module"
   },
-
   "ThingsGateway.Admin.Razor.HardwareInfoPage": {
-    "SystemInfo": "System Information",
+    "AvailableDisk": "Available Disk",
+    "AvailableMemory": "Available Memory",
+    "CpuUsage": "CPU Usage",
+    "Data": "Data",
+    "DateTime": "Date Time",
+    "DiskUsage": "Disk Usage",
     "HardwareInfo": "Hardware Resources",
     "HardwareInfoChart": "Hardware Resources History Chart",
-    "CpuUsage": "CPU Usage",
-    "AvailableMemory": "Available Memory",
-    "TotalMemory": "Total Memory",
-    "WorkingSet": "WorkingSet",
-    "MemoryUsage": "Memory",
-    "AvailableDisk": "Available Disk",
-    "TotalDisk": "Total Disk",
-    "DiskUsage": "Disk Usage",
     "HistoryHardwareInfo": "Historical Trends",
-    "DateTime": "Date Time",
-    "Data": "Data",
+    "MemoryUsage": "Memory",
     "OSName": "OS Name",
-    "OSVersion": "OS Version"
+    "OSVersion": "OS Version",
+    "SystemInfo": "System Information",
+    "TotalDisk": "Total Disk",
+    "TotalMemory": "Total Memory",
+    "WorkingSet": "WorkingSet"
+  },
+  "ThingsGateway.Admin.Razor.LoginConnectionHub": {
+    "Jump": "Jump"
   },
   "ThingsGateway.Admin.Razor.OperLogPage": {
-    "Date": "Date",
     "Count": "Count",
-    "Operate": "Succeed",
+    "Date": "Date",
     "Exception": "Failed",
     "Login": "Login",
     "Logout": "Logout",
+    "Operate": "Succeed",
     "SysOperateLog": "Operation Log"
   },
   "ThingsGateway.Admin.Razor.SessionPage": {
-    "VerificatInfo": "Token List",
-    "ExitSession": "Force Logout"
+    "ExitSession": "Force Logout",
+    "VerificatInfo": "Token List"
+  },
+  "ThingsGateway.Admin.Razor.UserCenterPage": {
+    "UpdatePasswordInfo": "Change Password",
+    "UpdateUserInfo": "Update Personal Information",
+    "UpdateWorkbenchInfo": "Update Personal Workbench",
+    "UserInfo": "Personal Information",
+    "WorkbenchInfo": "Personal Workbench"
+  },
+  "ThingsGateway.Admin.Razor.UserLogin": {
+    "Account": "Username",
+    "Login": "Login",
+    "Password": "Password"
   },
   "ThingsGateway.Admin.Razor.VerificatListDialog": {
     "ExitVerificat": "Force Logout Token"
-  },
-  "ThingsGateway.Admin.Razor.UserCenterPage": {
-    "UpdateUserInfo": "Update Personal Information",
-    "UserInfo": "Personal Information",
-    "UpdatePasswordInfo": "Change Password",
-    "UpdateWorkbenchInfo": "Update Personal Workbench",
-    "WorkbenchInfo": "Personal Workbench"
   }
-}
+}

src/Admin/ThingsGateway.Admin.Razor/Locales/zh-CN.json

@@ -1,74 +1,73 @@
 {
-  "ThingsGateway.Admin.Razor.LoginConnectionHub": {
-    "Jump": "跳转"
-  },
-  "ThingsGateway.Admin.Razor.UserLogin": {
-    "Account": "登录账号",
-    "Password": "登录密码",
-    "Login": "登录"
-  },
   "ThingsGateway.Admin.Razor._Imports": {
+    "All": "全部",
+    "Choice": "选择",
+    "Copy": "复制",
+    "CurrentVerificat": "当前令牌",
+    "EmptyText": "空",
+    "ExportButtonText": "导出/导入",
+    "MaxCount": "超过数量限制",
     "Org": "机构",
+    "OrgList": "机构列表",
+    "Picture": "头像",
     "Position": "岗位",
+    "PositionList": "岗位列表",
     "Role": "角色",
     "RoleList": "角色列表",
-    "PositionList": "岗位列表",
-    "OrgList": "机构列表",
-    "MaxCount": "超过数量限制",
-    "All": "全部",
-    "Copy": "复制",
-    "Choice": "选择",
-    "Picture": "头像",
     "Root": "根目录",
     "Save": "保存",
-    "CurrentVerificat": "当前令牌",
-    "SelectPlaceHolder": "请选择 ...",
-    "EmptyText": "空",
-    "ExportButtonText": "导出/导入"
+    "SelectPlaceHolder": "请选择 ..."
   },
   "ThingsGateway.Admin.Razor.ChoiceModuleComponent": {
     "SetDefaultModule": "设置为默认模块"
   },
-
   "ThingsGateway.Admin.Razor.HardwareInfoPage": {
-    "SystemInfo": "系统信息",
+    "AvailableDisk": "可用磁盘",
+    "AvailableMemory": "可用内存",
+    "CpuUsage": "CPU使用率",
+    "Data": "数据",
+    "DateTime": "时间",
+    "DiskUsage": "磁盘使用率",
     "HardwareInfo": "硬件资源",
     "HardwareInfoChart": "硬件资源历史曲线",
-    "CpuUsage": "CPU使用率",
-    "AvailableMemory": "可用内存",
-    "TotalMemory": "总内存",
-    "WorkingSet": "进程内存",
-    "MemoryUsage": "内存",
-    "AvailableDisk": "可用磁盘",
-    "TotalDisk": "总磁盘",
-    "DiskUsage": "磁盘使用率",
     "HistoryHardwareInfo": "历史曲线",
-    "DateTime": "时间",
-    "Data": "数据",
+    "MemoryUsage": "内存",
     "OSName": "系统名称",
-    "OSVersion": "系统版本"
+    "OSVersion": "系统版本",
+    "SystemInfo": "系统信息",
+    "TotalDisk": "总磁盘",
+    "TotalMemory": "总内存",
+    "WorkingSet": "进程内存"
+  },
+  "ThingsGateway.Admin.Razor.LoginConnectionHub": {
+    "Jump": "跳转"
   },
   "ThingsGateway.Admin.Razor.OperLogPage": {
-    "Date": "日期",
     "Count": "数量",
-    "Operate": "成功",
+    "Date": "日期",
     "Exception": "失败",
     "Login": "登录",
     "Logout": "注销",
+    "Operate": "成功",
     "SysOperateLog": "操作日志"
   },
   "ThingsGateway.Admin.Razor.SessionPage": {
-    "VerificatInfo": "令牌列表",
-    "ExitSession": "强退会话"
+    "ExitSession": "强退会话",
+    "VerificatInfo": "令牌列表"
+  },
+  "ThingsGateway.Admin.Razor.UserCenterPage": {
+    "UpdatePasswordInfo": "修改密码",
+    "UpdateUserInfo": "更新个人信息",
+    "UpdateWorkbenchInfo": "更新个人工作台",
+    "UserInfo": "个人信息",
+    "WorkbenchInfo": "个人工作台"
+  },
+  "ThingsGateway.Admin.Razor.UserLogin": {
+    "Account": "登录账号",
+    "Login": "登录",
+    "Password": "登录密码"
   },
   "ThingsGateway.Admin.Razor.VerificatListDialog": {
     "ExitVerificat": "强退令牌"
-  },
-  "ThingsGateway.Admin.Razor.UserCenterPage": {
-    "UpdateUserInfo": "更新个人信息",
-    "UserInfo": "个人信息",
-    "UpdatePasswordInfo": "修改密码",
-    "UpdateWorkbenchInfo": "更新个人工作台",
-    "WorkbenchInfo": "个人工作台"
   }
-}
+}

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

@@ -8,10 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
-
 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

@@ -8,9 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
-
 using ThingsGateway.Admin.Application;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Razor;
 

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

@@ -8,10 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
-
 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

@@ -8,10 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
-
 using ThingsGateway.Admin.Application;
 using ThingsGateway.NewLife.Extension;
+using ThingsGateway.SqlSugar;
 
 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/SysUserAvatarEdit.razor

@@ -1,7 +0,0 @@
-@namespace ThingsGateway.Admin.Razor
-@using ThingsGateway.Admin.Application
-
-    <AvatarUpload @bind-Value="@Picture" DisplayText=@AdminLocalizer["Picture"] IsSingle Accept="image/*" OnChange="OnAvatarUpload" DefaultFileList=PreviewFileList></AvatarUpload>
-
-
-

src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserAvatarEdit.razor.cs

@@ -1,73 +0,0 @@
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://thingsgateway.cn/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-
-using Microsoft.AspNetCore.Components.Forms;
-
-using ThingsGateway.Admin.Application;
-
-namespace ThingsGateway.Admin.Razor;
-
-public partial class SysUserAvatarEdit : IDisposable
-{
-    private List<UploadFile> PreviewFileList;
-
-    [Parameter]
-    [NotNull]
-    public SysUser? Model { get; set; }
-
-    [FileValidation(Extensions = [".png", ".jpg", ".jpeg"], FileSize = 200 * 1024)]
-    public IBrowserFile? Picture { get; set; }
-
-    [Inject]
-    private IStringLocalizer<ThingsGateway.Admin.Razor._Imports> AdminLocalizer { get; set; }
-
-    private CancellationTokenSource? ReadAvatarToken { get; set; }
-
-    [Inject]
-    [NotNull]
-    private ToastService ToastService { get; set; }
-
-    public void Dispose()
-    {
-        ReadAvatarToken?.Cancel();
-        GC.SuppressFinalize(this);
-    }
-
-    protected override Task OnParametersSetAsync()
-    {
-        PreviewFileList = new(new[] { new UploadFile { PrevUrl = Model.Avatar } });
-        return base.OnParametersSetAsync();
-    }
-
-    private async Task OnAvatarUpload(UploadFile file)
-    {
-        if (file?.File != null)
-        {
-            var format = file.File.ContentType;
-            ReadAvatarToken ??= new CancellationTokenSource();
-            if (ReadAvatarToken.IsCancellationRequested)
-            {
-                ReadAvatarToken.Dispose();
-                ReadAvatarToken = new CancellationTokenSource();
-            }
-
-            await file.RequestBase64ImageFileAsync(format, 640, 480, 1024 * 200, ReadAvatarToken.Token);
-
-            if (file.Code != 0)
-            {
-                await ToastService.Error($"{file.Error} ");
-            }
-            else
-            {
-                Model.Avatar = file.PrevUrl;
-            }
-        }
-    }
-}

src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserEdit.razor

@@ -3,7 +3,7 @@
 <div class="row g-2 mx-1 form-inline">
 
     <div class="col-12  col-md-12">
-        <SysUserAvatarEdit Model="Model"></SysUserAvatarEdit>
+        <AvatarUpload @bind-Value="@Picture" DisplayText=@AdminLocalizer["Picture"] IsMultiple=false Accept="image/*" OnChange="OnAvatarUpload" DefaultFileList=PreviewFileList></AvatarUpload>
     </div>
 
     <div class="col-12  col-md-6">

src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserEdit.razor.cs

@@ -8,6 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using Microsoft.AspNetCore.Components.Forms;
+
 using ThingsGateway.Admin.Application;
 using ThingsGateway.NewLife.Extension;
 
@@ -37,6 +39,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();
     }
 
@@ -45,4 +48,55 @@ public partial class SysUserEdit
         Model.OrgId = items.LastOrDefault()?.Parent?.Value?.ToLong() ?? 0;
         return Task.CompletedTask;
     }
+    [Inject]
+    ToastService ToastService { get; set; }
+
+    #region 头像
+
+    private List<UploadFile> PreviewFileList;
+
+    [FileValidation(Extensions = [".png", ".jpg", ".jpeg"], FileSize = 200 * 1024)]
+    public IBrowserFile? Picture { get; set; }
+
+
+    private CancellationTokenSource? ReadAvatarToken { get; set; }
+
+    public void Dispose()
+    {
+        ReadAvatarToken?.Cancel();
+        GC.SuppressFinalize(this);
+    }
+
+    protected override void OnInitialized()
+    {
+        PreviewFileList = new(new[] { new UploadFile { PrevUrl = Model.Avatar } });
+        base.OnInitialized();
+    }
+
+    private async Task OnAvatarUpload(UploadFile file)
+    {
+        if (file?.File != null)
+        {
+            var format = file.File.ContentType;
+            ReadAvatarToken ??= new CancellationTokenSource();
+            if (ReadAvatarToken.IsCancellationRequested)
+            {
+                ReadAvatarToken.Dispose();
+                ReadAvatarToken = new CancellationTokenSource();
+            }
+
+            await file.RequestBase64ImageFileAsync(format, 640, 480, 1024 * 200, token: ReadAvatarToken.Token);
+
+            if (file.Code != 0)
+            {
+                await ToastService.Error($"{file.Error} ");
+            }
+            else
+            {
+                Model.Avatar = file.PrevUrl;
+            }
+        }
+    }
+
+    #endregion 头像
 }

src/Admin/ThingsGateway.Admin.Razor/Pages/User/UserChoiceDialog.razor.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using Mapster;
-
 using ThingsGateway.Admin.Application;
 
 namespace ThingsGateway.Admin.Razor;
@@ -56,7 +54,7 @@ public partial class UserChoiceDialog
             OrgId = OrgId,
             PositionId = PositionId,
         });
-        QueryData<UserSelectorOutput> queryData = data.Adapt<QueryData<UserSelectorOutput>>();
+        QueryData<UserSelectorOutput> queryData = data.AdaptQueryDataUserSelectorOutput();
 
         return queryData;
     }

src/Admin/ThingsGateway.Admin.Razor/Pages/UserCenter/UserCenterPage.razor.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using Mapster;
-
 using Microsoft.AspNetCore.Components.Forms;
 
 using ThingsGateway.Admin.Application;
@@ -37,9 +35,9 @@ public partial class UserCenterPage
 
     protected override async Task OnParametersSetAsync()
     {
-        SysUser = AppContext.CurrentUser.Adapt<SysUser>();
+        SysUser = AppContext.CurrentUser.AdaptSysUser();
         SysUser.Avatar = AppContext.Avatar;
-        WorkbenchInfo = (await UserCenterService.GetLoginWorkbenchAsync(SysUser.Id)).Adapt<WorkbenchInfo>();
+        WorkbenchInfo = (await UserCenterService.GetLoginWorkbenchAsync(SysUser.Id)).AdaptWorkbenchInfo();
 
         await base.OnParametersSetAsync();
     }

src/Admin/ThingsGateway.Admin.Razor/Pages/UserCenter/UserInfoEditComponent.razor

@@ -4,7 +4,7 @@
 
 <ValidateForm class="p-4" Model="@Model" OnValidSubmit="OnSave">
 
-    <AvatarUpload @bind-Value="@Picture" DisplayText=@AdminLocalizer["Picture"] IsSingle Accept="image/*" OnChange="OnAvatarUpload" DefaultFileList=PreviewFileList></AvatarUpload>
+    <AvatarUpload @bind-Value="@Picture" DisplayText=@AdminLocalizer["Picture"] IsMultiple=false Accept="image/*" OnChange="OnAvatarUpload" DefaultFileList=PreviewFileList></AvatarUpload>
 
     <BootstrapInput @bind-Value=@Model.Phone></BootstrapInput>
     <BootstrapInput @bind-Value=@Model.Email></BootstrapInput>

src/Admin/ThingsGateway.Admin.Razor/Pages/UserCenter/UserInfoEditComponent.razor.cs

@@ -40,10 +40,10 @@ public partial class UserInfoEditComponent
         GC.SuppressFinalize(this);
     }
 
-    protected override Task OnParametersSetAsync()
+    protected override void OnInitialized()
     {
         PreviewFileList = new(new[] { new UploadFile { PrevUrl = Model.Avatar } });
-        return base.OnParametersSetAsync();
+        base.OnInitialized();
     }
 
     private async Task OnAvatarUpload(UploadFile file)
@@ -58,7 +58,7 @@ public partial class UserInfoEditComponent
                 ReadAvatarToken = new CancellationTokenSource();
             }
 
-            await file.RequestBase64ImageFileAsync(format, 640, 480, 1024 * 200, ReadAvatarToken.Token);
+            await file.RequestBase64ImageFileAsync(format, 640, 480, 1024 * 200, token: ReadAvatarToken.Token);
 
             if (file.Code != 0)
             {

src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 
 	<ItemGroup>
 		<ProjectReference Include="..\ThingsGateway.Admin.Application\ThingsGateway.Admin.Application.csproj" />
@@ -9,14 +9,15 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.16" />
+		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="$(NET8Version)" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.5" />
+		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="$(NET9Version)" />
 	</ItemGroup>
 
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+		<!--<UseRazorSourceGenerator>false</UseRazorSourceGenerator>-->
 	</PropertyGroup>
 	<ItemGroup>
 		<Content Remove="Locales\*.json" />
@@ -29,9 +30,15 @@
 	<ItemGroup>
 		<None Include="..\README.md" Pack="true" PackagePath="\" />
 		<None Include="..\README.zh-CN.md" Pack="true" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.md" Pack="false" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.zh-CN.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.zh-CN.md" Pack="false" PackagePath="\" />
 	</ItemGroup>
+
+
+	<ItemGroup>
+		<ProjectReference Include="..\BlazorSetParametersAsyncGenerator\BlazorSetParametersAsyncGenerator.csproj" PrivateAssets="all" OutputItemType="Analyzer" />
+	</ItemGroup>
+	
 </Project>
 
 

src/Admin/ThingsGateway.Admin.Razor/Util/ResourceUtil.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using Mapster;
-
 using ThingsGateway.Admin.Application;
 
 namespace ThingsGateway.Admin.Razor;
@@ -122,31 +120,4 @@ public static class ResourceUtil
         return trees;
     }
 
-    /// <summary>
-    /// 构建树节点
-    /// </summary>
-    public static List<TreeViewItem<T>> BuildTreeItemList<T>(IEnumerable<SysResource> sysresources, List<long> selectedItems, Microsoft.AspNetCore.Components.RenderFragment<T> render, long parentId = 0, TreeViewItem<T>? parent = null, Func<SysResource, bool> disableFunc = null) where T : class
-    {
-        if (sysresources == null) return null;
-        var trees = new List<TreeViewItem<T>>();
-        var roots = sysresources.Where(i => i.ParentId == parentId).OrderBy(i => i.SortCode);
-        foreach (var node in roots)
-        {
-            var item = new TreeViewItem<T>(node.Adapt<T>())
-            {
-                Text = node.Title,
-                Icon = node.Icon,
-                IsDisabled = disableFunc == null ? false : disableFunc(node),
-                IsActive = selectedItems.Any(v => node.Id == v),
-                IsExpand = true,
-                Parent = parent,
-                Template = render,
-                CheckedState = selectedItems.Any(i => i == node.Id) ? CheckboxState.Checked : CheckboxState.UnChecked
-            };
-            item.Items = BuildTreeItemList(sysresources, selectedItems, render, node.Id, item, disableFunc) ?? new();
-            trees.Add(item);
-        }
-        return trees;
-    }
-
 }

src/Admin/ThingsGateway.AdminServer/Configuration/App.Development.json

@@ -14,6 +14,7 @@
       "ThingsGateway.SqlSugar",
       "ThingsGateway.Admin.Application",
       "ThingsGateway.Admin.Razor",
+      "ThingsGateway.DB",
       "ThingsGateway.Razor"
     ]
   },

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

@@ -14,6 +14,7 @@
       "ThingsGateway.SqlSugar",
       "ThingsGateway.Admin.Application",
       "ThingsGateway.Admin.Razor",
+      "ThingsGateway.DB",
       "ThingsGateway.Razor"
     ]
   },

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

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

src/Admin/ThingsGateway.AdminServer/GlobalUsings.cs

@@ -1 +1 @@
-global using ThingsGateway.Admin.Application;
+

src/Admin/ThingsGateway.AdminServer/Index/AdminIndex.razor.cs

@@ -18,6 +18,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Extension;
 

src/Admin/ThingsGateway.AdminServer/Layout/AccessDenied.razor.cs

@@ -13,6 +13,8 @@ using Microsoft.Extensions.Localization;
 
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.Admin.Application;
+
 namespace ThingsGateway.AdminServer;
 
 public partial class AccessDenied

src/Admin/ThingsGateway.AdminServer/Layout/Login.razor.cs

@@ -11,8 +11,6 @@
 #pragma warning disable CA2007 // 考虑对等待的任务调用 ConfigureAwait
 using BootstrapBlazor.Components;
 
-using Mapster;
-
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Localization;
@@ -20,6 +18,7 @@ using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.DataEncryption;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.Razor;
@@ -70,7 +69,7 @@ public partial class Login
 
     private async Task LoginAsync(EditContext context)
     {
-        var model = loginModel.Adapt<LoginInput>();
+        var model = loginModel.AdaptLoginInput();
         model.Password = DESEncryption.Encrypt(model.Password);
         try
         {

src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor.cs

@@ -17,6 +17,7 @@ using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Razor;
 

src/Admin/ThingsGateway.AdminServer/Locales/en-US.json

@@ -1,81 +1,77 @@
 {
-  "ThingsGateway.AdminServer.NotFound404": {
-    "404": "Sorry, the page you are looking for does not exist.",
-    "401": "Sorry, you do not have permission to access this page.",
-    "Home": "Back to Home",
-    "Login": "Login"
+  "ThingsGateway.AdminServer.AdminIndex": {
+    "Alarm": "Real-time Alarm",
+    "AlarmCount": "Alarm Count",
+    "BackendLog": "Gateway Backend Log",
+    "BusinessDevice": "Business Device",
+    "CollectDevice": "Collect Device",
+    "Data": "Data",
+    "DateTime": "Date Time",
+    "HardwareInfoChart": "Hardware Information Historical Chart",
+    "HistoryHardwareInfo": "Historical Chart",
+    "OffLine": "Offline",
+    "OnLine": "Online",
+    "OperLog": "Recent Operations",
+    "RpcLog": "Gateway RPC Log",
+    "Shortcuts": "Shortcuts",
+    "Variable": "Variable"
   },
   "ThingsGateway.AdminServer.Login": {
-    "LoginErrorh1": "Login Error",
-    "LoginSuccessh1": "Login Success",
-    "LoginSuccessc1": "Redirecting to the page",
-    "LoginErrorh2": "Login Failed",
     "LoginErrorc2": "Please contact the administrator!",
+    "LoginErrorh1": "Login Error",
+    "LoginErrorh2": "Login Failed",
+    "LoginSuccessc1": "Redirecting to the page",
+    "LoginSuccessh1": "Login Success",
     "Remark1": "Admin",
     "Remark2": "",
     "Remark3": "Permission Framework Based on BlazorServer",
     "Welcome": "Welcome"
   },
-
   "ThingsGateway.AdminServer.MainLayout": {
-    "About": "About",
-    "FullScreenButton": "Full Screen",
-    "UserCenter": "User Center",
-    "ChoiceModule": "Switch Module",
-
-    "LoginErrorh1": "Login Error",
-    "LoginSuccessh1": "Login Success",
-    "LoginSuccessc1": "Redirecting to the page",
-    "LoginErrorh2": "Login Failed",
-    "LoginErrorc2": "Please contact the administrator!",
-    "Logout": "Logout",
-
-    "系统首页": "Home",
-    "权限管理": "Permission",
-    "用户管理": "User",
-    "角色管理": "Role",
-    "菜单管理": "Menu",
-    "机构管理": "Organization",
-    "职位管理": "Position",
-    "系统运维": "SystemOperation",
-    "系统配置": "System",
-    "字典管理": "Dictionary",
-    "操作日志": "Operation",
-    "会话管理": "Session",
-    "硬件信息": "HardwareInfo",
-    "网关管理": "GatewayManagement",
-    "插件管理": "PluginManagement",
-    "插件调试": "PluginDebugging",
-    "通道管理": "Channel",
-    "采集设备": "CollectionDevices",
-    "业务设备": "BusinessDevices",
     "变量管理": "Variable",
-    "网关状态": "GatewayStatus",
-    "设备状态": "Device",
-    "实时数据": "RealTimeData",
-    "实时报警": "RealTimeAlarms",
-    "网关日志": "GatewayLogs",
+    "采集设备": "CollectionDevices",
+    "菜单管理": "Menu",
+    "操作日志": "Operation",
+    "插件调试": "PluginDebugging",
+    "插件管理": "PluginManagement",
     "后台日志": "Backend",
-    "RPC日志": "RPC",
+    "会话管理": "Session",
+    "机构管理": "Organization",
+    "角色管理": "Role",
+    "权限管理": "Permission",
+    "设备状态": "Device",
+    "实时报警": "RealTimeAlarms",
+    "实时数据": "RealTimeData",
+    "通道管理": "Channel",
+    "网关管理": "GatewayManagement",
+    "网关日志": "GatewayLogs",
+    "网关状态": "GatewayStatus",
     "物联网关": "Gateway",
-    "系统管理": "Admin"
+    "系统管理": "Admin",
+    "系统配置": "System",
+    "系统首页": "Home",
+    "系统运维": "SystemOperation",
+    "业务设备": "BusinessDevices",
+    "硬件信息": "HardwareInfo",
+    "用户管理": "User",
+    "职位管理": "Position",
+    "字典管理": "Dictionary",
+    "About": "About",
+    "ChoiceModule": "Switch Module",
+    "FullScreenButton": "Full Screen",
+    "LoginErrorc2": "Please contact the administrator!",
+    "LoginErrorh1": "Login Error",
+    "LoginErrorh2": "Login Failed",
+    "LoginSuccessc1": "Redirecting to the page",
+    "LoginSuccessh1": "Login Success",
+    "Logout": "Logout",
+    "RPC日志": "RPC",
+    "UserCenter": "User Center"
   },
-
-  "ThingsGateway.AdminServer.AdminIndex": {
-    "CollectDevice": "Collect Device",
-    "BusinessDevice": "Business Device",
-    "Variable": "Variable",
-    "Alarm": "Real-time Alarm",
-    "AlarmCount": "Alarm Count",
-    "OnLine": "Online",
-    "OffLine": "Offline",
-    "Shortcuts": "Shortcuts",
-    "OperLog": "Recent Operations",
-    "BackendLog": "Gateway Backend Log",
-    "RpcLog": "Gateway RPC Log",
-    "HardwareInfoChart": "Hardware Information Historical Chart",
-    "DateTime": "Date Time",
-    "Data": "Data",
-    "HistoryHardwareInfo": "Historical Chart"
+  "ThingsGateway.AdminServer.NotFound404": {
+    "401": "Sorry, you do not have permission to access this page.",
+    "404": "Sorry, the page you are looking for does not exist.",
+    "Home": "Back to Home",
+    "Login": "Login"
   }
-}
+}

src/Admin/ThingsGateway.AdminServer/Locales/zh-CN.json

@@ -1,85 +1,77 @@
 {
-
-  "ThingsGateway.AdminServer.NotFound404": {
-    "404": "抱歉，您访问的页面不存在。",
-    "401": "抱歉，您无权限访问该页面。",
-    "Home": "回到首页",
-    "Login": "重新登录"
+  "ThingsGateway.AdminServer.AdminIndex": {
+    "Alarm": "实时报警",
+    "AlarmCount": "报警数量",
+    "BackendLog": "网关后台日志",
+    "BusinessDevice": "业务设备",
+    "CollectDevice": "采集设备",
+    "Data": "数据",
+    "DateTime": "时间",
+    "HardwareInfoChart": "硬件信息历史曲线",
+    "HistoryHardwareInfo": "历史曲线",
+    "OffLine": "离线",
+    "OnLine": "在线",
+    "OperLog": "最近操作",
+    "RpcLog": "网关RPC日志",
+    "Shortcuts": "快捷方式",
+    "Variable": "变量"
   },
   "ThingsGateway.AdminServer.Login": {
-    "LoginErrorh1": "登录异常",
-    "LoginSuccessh1": "登录成功",
-    "LoginSuccessc1": "即将跳转页面",
-    "LoginErrorh2": "登录失败",
     "LoginErrorc2": "请联系管理员!",
+    "LoginErrorh1": "登录异常",
+    "LoginErrorh2": "登录失败",
+    "LoginSuccessc1": "即将跳转页面",
+    "LoginSuccessh1": "登录成功",
     "Remark1": "后台管理",
     "Remark2": "",
     "Remark3": "基于BlazorServer的权限框架",
     "Welcome": "欢迎使用"
   },
-
-
   "ThingsGateway.AdminServer.MainLayout": {
-    "About": "关于",
-    "FullScreenButton": "全屏",
-    "UserCenter": "个人中心",
-    "ChoiceModule": "切换模块",
-
-    "LoginErrorh1": "登录异常",
-    "LoginSuccessh1": "登录成功",
-    "LoginSuccessc1": "即将跳转页面",
-    "LoginErrorh2": "登录失败",
-    "LoginErrorc2": "请联系管理员!",
-    "Logout": "注销",
-
-    "系统首页": "系统首页",
-    "权限管理": "权限管理",
-    "用户管理": "用户管理",
-    "角色管理": "角色管理",
-    "菜单管理": "菜单管理",
-    "机构管理": "机构管理",
-    "职位管理": "职位管理",
-    "系统运维": "系统运维",
-    "系统配置": "系统配置",
-    "字典管理": "字典管理",
-    "操作日志": "操作日志",
-    "会话管理": "会话管理",
-    "硬件信息": "硬件信息",
-    "网关管理": "网关管理",
-    "插件管理": "插件管理",
-    "插件调试": "插件调试",
-    "通道管理": "通道管理",
-    "采集设备": "采集设备",
-    "业务设备": "业务设备",
     "变量管理": "变量管理",
-    "网关状态": "网关状态",
-    "设备状态": "设备状态",
-    "实时数据": "实时数据",
-    "实时报警": "实时报警",
-    "网关日志": "网关日志",
+    "采集设备": "采集设备",
+    "菜单管理": "菜单管理",
+    "操作日志": "操作日志",
+    "插件调试": "插件调试",
+    "插件管理": "插件管理",
     "后台日志": "后台日志",
-    "RPC日志": "RPC日志",
+    "会话管理": "会话管理",
+    "机构管理": "机构管理",
+    "角色管理": "角色管理",
+    "权限管理": "权限管理",
+    "设备状态": "设备状态",
+    "实时报警": "实时报警",
+    "实时数据": "实时数据",
+    "通道管理": "通道管理",
+    "网关管理": "网关管理",
+    "网关日志": "网关日志",
+    "网关状态": "网关状态",
     "物联网关": "物联网关",
-    "系统管理": "系统管理"
+    "系统管理": "系统管理",
+    "系统配置": "系统配置",
+    "系统首页": "系统首页",
+    "系统运维": "系统运维",
+    "业务设备": "业务设备",
+    "硬件信息": "硬件信息",
+    "用户管理": "用户管理",
+    "职位管理": "职位管理",
+    "字典管理": "字典管理",
+    "About": "关于",
+    "ChoiceModule": "切换模块",
+    "FullScreenButton": "全屏",
+    "LoginErrorc2": "请联系管理员!",
+    "LoginErrorh1": "登录异常",
+    "LoginErrorh2": "登录失败",
+    "LoginSuccessc1": "即将跳转页面",
+    "LoginSuccessh1": "登录成功",
+    "Logout": "注销",
+    "RPC日志": "RPC日志",
+    "UserCenter": "个人中心"
   },
-
-
-  "ThingsGateway.AdminServer.AdminIndex": {
-    "CollectDevice": "采集设备",
-    "BusinessDevice": "业务设备",
-    "Variable": "变量",
-    "Alarm": "实时报警",
-    "AlarmCount": "报警数量",
-    "OnLine": "在线",
-    "OffLine": "离线",
-    "Shortcuts": "快捷方式",
-    "OperLog": "最近操作",
-    "BackendLog": "网关后台日志",
-    "RpcLog": "网关RPC日志",
-    "HardwareInfoChart": "硬件信息历史曲线",
-    "DateTime": "时间",
-    "Data": "数据",
-    "HistoryHardwareInfo": "历史曲线"
+  "ThingsGateway.AdminServer.NotFound404": {
+    "401": "抱歉，您无权限访问该页面。",
+    "404": "抱歉，您访问的页面不存在。",
+    "Home": "回到首页",
+    "Login": "重新登录"
   }
-
-}
+}

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

@@ -40,6 +40,7 @@ public class SingleFilePublish : ISingleFilePublish
             "ThingsGateway.NewLife.X",
             "ThingsGateway.Razor",
             "ThingsGateway.Admin.Razor"   ,
+             "ThingsGateway.DB",
             "ThingsGateway.Admin.Application",
             "ThingsGateway.SqlSugar",
         ];

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

@@ -21,13 +21,12 @@ using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
 using System.Security.Cryptography.X509Certificates;
-using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
-using ThingsGateway.Extension;
-using ThingsGateway.NewLife.Caching;
+using ThingsGateway.VirtualFileServer;
 
 namespace ThingsGateway.AdminServer;
 
@@ -47,11 +46,11 @@ public class Startup : AppStartup
         });
 
 
-        // 事件总线
-        services.AddEventBus(options =>
-        {
+        //// 事件总线
+        //services.AddEventBus(options =>
+        //{
 
-        });
+        //});
 
         // 任务调度
         services.AddSchedule(options =>
@@ -59,8 +58,6 @@ public class Startup : AppStartup
             options.AddPersistence<JobPersistence>();
         });
 
-        // 缓存
-        services.AddSingleton<ICache, MemoryCache>();
 
         // 允许跨域
         services.AddCorsAccessor();
@@ -150,104 +147,10 @@ public class Startup : AppStartup
         });
 
 
-        services.AddHealthChecks();
 
 
-        #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 控制台美化
-
-        #region api日志
-
-        //Monitor日志配置
-        //services.AddMonitorLogging(options =>
-        //{
-        //    options.JsonIndented = true;// 是否美化 JSON
-        //    options.GlobalEnabled = false;//全局启用
-        //    options.ConfigureLogger((logger, logContext, context) =>
-        //    {
-        //        var httpContext = context.HttpContext;//获取httpContext
-
-        //        //获取客户端信息
-        //        var client = App.GetService<IAppService>().UserAgent;
-        //        // 获取控制器/操作描述器
-        //        var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
-        //        //操作名称默认是控制器名加方法名,自定义操作名称要在action上加Description特性
-        //        var option = $"{controllerActionDescriptor.ControllerName}/{controllerActionDescriptor.ActionName}";
-
-        //        var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[controllerActionDescriptor.MethodInfo.Name];
-        //        //获取特性
-        //        option = desc.Value;//则将操作名称赋值为控制器上写的title
-
-        //        logContext.Set(LoggingConst.CateGory, option);//传操作名称
-        //        logContext.Set(LoggingConst.Operation, option);//传操作名称
-        //        logContext.Set(LoggingConst.Client, client);//客户端信息
-        //        logContext.Set(LoggingConst.Path, httpContext.Request.Path.Value);//请求地址
-        //        logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
-        //    });
-        //});
-
-        //日志写入数据库配置
-        services.AddDatabaseLogging<DatabaseLoggingWriter>(options =>
-        {
-            options.WriteFilter = (logMsg) =>
-            {
-                return logMsg.LogName == "System.Logging.RequestAudit";
-            };
-        });
-
-        #endregion api日志
 
         //已添加AddOptions
         // 增加多语言支持配置信息
@@ -302,7 +205,7 @@ public class Startup : AppStartup
         var certificate = new X509Certificate2("ThingsGateway.pfx", "ThingsGateway", X509KeyStorageFlags.EphemeralKeySet);
 #endif
         services.AddDataProtection()
-            .PersistKeysToFileSystem(new DirectoryInfo("keys"))
+            .PersistKeysToFileSystem(new DirectoryInfo("Keys"))
             .ProtectKeysWithCertificate(certificate)
             .UseCryptographicAlgorithms(new AuthenticatedEncryptorConfiguration
             {
@@ -370,7 +273,7 @@ public class Startup : AppStartup
 
 
         // 特定文件类型（文件后缀）处理
-        var contentTypeProvider = GetFileExtensionContentTypeProvider();
+        var contentTypeProvider = FS.GetFileExtensionContentTypeProvider();
         // contentTypeProvider.Mappings[".文件后缀"] = "MIME 类型";
         app.UseStaticFiles(new StaticFileOptions
         {
@@ -414,32 +317,4 @@ public class Startup : AppStartup
 
     }
 
-    /// <summary>
-    /// 初始化文件 ContentType 提供器
-    /// </summary>
-    /// <returns></returns>
-    private static FileExtensionContentTypeProvider GetFileExtensionContentTypeProvider()
-    {
-        var fileExtensionProvider = new FileExtensionContentTypeProvider();
-        fileExtensionProvider.Mappings[".iec"] = "application/octet-stream";
-        fileExtensionProvider.Mappings[".patch"] = "application/octet-stream";
-        fileExtensionProvider.Mappings[".apk"] = "application/vnd.android.package-archive";
-        fileExtensionProvider.Mappings[".pem"] = "application/x-x509-user-cert";
-        fileExtensionProvider.Mappings[".gzip"] = "application/x-gzip";
-        fileExtensionProvider.Mappings[".7zip"] = "application/zip";
-        fileExtensionProvider.Mappings[".jpg2"] = "image/jp2";
-        fileExtensionProvider.Mappings[".et"] = "application/kset";
-        fileExtensionProvider.Mappings[".dps"] = "application/ksdps";
-        fileExtensionProvider.Mappings[".cdr"] = "application/x-coreldraw";
-        fileExtensionProvider.Mappings[".shtml"] = "text/html";
-        fileExtensionProvider.Mappings[".php"] = "application/x-httpd-php";
-        fileExtensionProvider.Mappings[".php3"] = "application/x-httpd-php";
-        fileExtensionProvider.Mappings[".php4"] = "application/x-httpd-php";
-        fileExtensionProvider.Mappings[".phtml"] = "application/x-httpd-php";
-        fileExtensionProvider.Mappings[".pcd"] = "image/x-photo-cd";
-        fileExtensionProvider.Mappings[".bcmap"] = "application/octet-stream";
-        fileExtensionProvider.Mappings[".properties"] = "application/octet-stream";
-        fileExtensionProvider.Mappings[".m3u8"] = "application/x-mpegURL";
-        return fileExtensionProvider;
-    }
 }

src/Admin/ThingsGateway.AdminServer/ThingsGateway.AdminServer.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="..\..\Version.props" />
 
 
 	<PropertyGroup>
@@ -16,6 +16,7 @@
 
 		<!--动态适用GC-->
 		<GarbageCollectionAdaptationMode>1</GarbageCollectionAdaptationMode>
+		<CETCompat>false</CETCompat>
 		<!--使用自托管线程池-->
 		<!--<UseWindowsThreadPool>false</UseWindowsThreadPool> -->
 
@@ -44,9 +45,7 @@
 		</Content>
 	</ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.5" />
-	</ItemGroup>
+
 	<!--安装服务守护-->
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 
@@ -54,8 +53,8 @@
 		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-		<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.5" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="$(NET9Version)" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="$(NET9Version)" />
 	</ItemGroup>
 	
 	<ItemGroup>

src/Admin/ThingsGateway.DB/Entity/BaseEntity.cs

@@ -10,10 +10,10 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
@@ -41,19 +41,19 @@ public abstract class PrimaryKeyEntity : PrimaryIdEntity
     [SugarColumn(ColumnDescription = "扩展信息", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Ignore = true)]
-    public virtual string? ExtJson { get; set; }
+    public virtual string ExtJson { get; set; }
 }
 
 public interface IBaseEntity
 {
-    DateTime? CreateTime { get; set; }
-    string? CreateUser { get; set; }
+    DateTime CreateTime { get; set; }
+    string CreateUser { get; set; }
     long CreateUserId { get; set; }
     bool IsDelete { get; set; }
-    int? SortCode { get; set; }
-    DateTime? UpdateTime { get; set; }
-    string? UpdateUser { get; set; }
-    long? UpdateUserId { get; set; }
+    int SortCode { get; set; }
+    DateTime UpdateTime { get; set; }
+    string UpdateUser { get; set; }
+    long UpdateUserId { get; set; }
 }
 
 /// <summary>
@@ -61,13 +61,22 @@ public interface IBaseEntity
 /// </summary>
 public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
 {
+    private long createUserId;
+    private long updateUserId;
+    private DateTime createTime;
+    private DateTime updateTime;
+    private int sortCode;
+    private bool isDelete = false;
+    private string createUser;
+    private string updateUser;
+
     /// <summary>
     /// 创建时间
     /// </summary>
     [SugarColumn(ColumnDescription = "创建时间", IsOnlyIgnoreUpdate = true, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Visible = false, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
-    public virtual DateTime? CreateTime { get; set; }
+    public virtual DateTime CreateTime { get => createTime; set => createTime = value; }
 
     /// <summary>
     /// 创建人
@@ -76,7 +85,7 @@ public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
     [IgnoreExcel]
     [NotNull]
     [AutoGenerateColumn(Ignore = true)]
-    public virtual string? CreateUser { get; set; }
+    public virtual string CreateUser { get => createUser; set => createUser = value; }
 
     /// <summary>
     /// 创建者Id
@@ -84,7 +93,7 @@ public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
     [SugarColumn(ColumnDescription = "创建者Id", IsOnlyIgnoreUpdate = true, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Ignore = true)]
-    public virtual long CreateUserId { get; set; }
+    public virtual long CreateUserId { get => createUserId; set => createUserId = value; }
 
     /// <summary>
     /// 软删除
@@ -92,8 +101,7 @@ public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
     [SugarColumn(ColumnDescription = "软删除", IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Ignore = true)]
-    public virtual bool IsDelete { get; set; } = false;
-
+    public virtual bool IsDelete { get => isDelete; set => isDelete = value; }
 
     /// <summary>
     /// 更新时间
@@ -101,7 +109,7 @@ public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
     [SugarColumn(ColumnDescription = "更新时间", IsOnlyIgnoreInsert = true, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Visible = false, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
-    public virtual DateTime? UpdateTime { get; set; }
+    public virtual DateTime UpdateTime { get => updateTime; set => updateTime = value; }
 
     /// <summary>
     /// 更新人
@@ -109,7 +117,7 @@ public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
     [SugarColumn(ColumnDescription = "更新人", IsOnlyIgnoreInsert = true, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Ignore = true)]
-    public virtual string? UpdateUser { get; set; }
+    public virtual string UpdateUser { get => updateUser; set => updateUser = value; }
 
     /// <summary>
     /// 修改者Id
@@ -117,7 +125,7 @@ public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
     [SugarColumn(ColumnDescription = "修改者Id", IsOnlyIgnoreInsert = true, IsNullable = true)]
     [IgnoreExcel]
     [AutoGenerateColumn(Ignore = true)]
-    public virtual long? UpdateUserId { get; set; }
+    public virtual long UpdateUserId { get => updateUserId; set => updateUserId = value; }
 
     /// <summary>
     /// 排序码
@@ -125,7 +133,7 @@ public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
     [SugarColumn(ColumnDescription = "排序码", IsNullable = true)]
     [AutoGenerateColumn(Visible = false, DefaultSort = true, Sortable = true, DefaultSortOrder = SortOrder.Asc)]
     [IgnoreExcel]
-    public virtual int? SortCode { get; set; }
+    public virtual int SortCode { get => sortCode; set => sortCode = value; }
 }
 
 public interface IBaseDataEntity

src/Admin/ThingsGateway.DB/Extensions/ExportExcelExtensions.cs

@@ -11,8 +11,6 @@
 using BootstrapBlazor.Components;
 
 
-using Mapster;
-
 using MiniExcelLibs;
 using MiniExcelLibs.Attributes;
 using MiniExcelLibs.OpenXml;
@@ -45,7 +43,7 @@ public static class ExportExcelExtensions
         #region 列名称
 
         var type = typeof(T);
-        var propertyInfos = type.GetRuntimeProperties().Where(a => a.GetCustomAttribute<IgnoreExcelAttribute>() == null)
+        var propertyInfos = type.GetRuntimeProperties().Where(a => a.GetCustomAttribute<IgnoreExcelAttribute>(false) == null)
              .OrderBy(
             a =>
             {
@@ -104,7 +102,7 @@ public static class ExportExcelExtensions
             int index = 0;
             foreach (var item in data)
             {
-                var ignore = item.GetCustomAttribute<IgnoreExcelAttribute>() != null;
+                var ignore = item.GetCustomAttribute<IgnoreExcelAttribute>(false) != null;
                 //描述
                 var desc = type.GetPropertyDisplayName(item.Name);
                 //数据源增加

src/Admin/ThingsGateway.DB/Extensions/QueryPageOptionsExtensions.cs

@@ -10,7 +10,7 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;