10.5.14

优化opcua变量缓存
修复cron表达式间隔

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.gitignore

@@ -360,4 +360,9 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+
+/src/*Pro*/
+/src/*Pro*
+/src/*pro*
+/src/*pro*/

README.md

@@ -5,7 +5,7 @@
 ## Introduction
 
 
-A cross-platform, high-performance edge data collection gateway based on net8, capable of handling millions of data points per.
+A cross-platform, high-performance edge data collection gateway based on net9.
 
 
 ## Documentation
@@ -16,6 +16,32 @@ A cross-platform, high-performance edge data collection gateway based on net8, c
 [NuGet](https://www.nuget.org/packages?q=Tags%3A%22ThingsGateway%22)
 
 
+
+## Demo
+
+
+[Demo](https://demo.thingsgateway.cn/)
+
+
+Account: **SuperAdmin**
+
+
+Password: **111111**
+
+
+**In the upper-right corner, switch to the IoT Gateway module in the personal popup box**
+
+## Docker
+
+```shell
+
+docker pull registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway
+
+docker pull registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway_arm64
+```
+
+
+
 ### Plugin List
 
 
@@ -30,6 +56,7 @@ A cross-platform, high-performance edge data collection gateway based on net8, c
 | Dlt6452007  | Supports Serial/Tcp/Udp links                                 |
 | OpcDaMaster | Compiled for 64-bit                                           |
 | OpcUaMaster | Supports certificate login, object extension, Json read/write |
+| Webhook          | Webhook                                             |
 
 #### Business Plugins
 
@@ -52,29 +79,8 @@ A cross-platform, high-performance edge data collection gateway based on net8, c
 ## License
 
 
-[Apache-2.0](https://gitee.com/diego2098/ThingsGateway/blob/master/LICENSE)
+[License](https://thingsgateway.cn/docs/1)
 
-
-## Demo
-
-
-[Demo](http://47.119.161.158:5000/)
-
-Account: **SuperAdmin**
-
-Password: **111111**
-
-**In the upper-right corner, switch to the IoT Gateway module in the personal popup box**
-
-## Docker
-
-```shell
-
-docker pull registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway
-
-docker pull registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway_arm64
-```
-
 
 
 ## Sponsorship

README.zh-CN.md

@@ -2,7 +2,7 @@
 
 ## 介绍
 
-基于net8的跨平台高性能边缘采集网关，单机采集数据点位可达百万
+基于net9的跨平台高性能边缘采集网关
 
 ## 文档
 
@@ -10,6 +10,27 @@
 
 [NuGet](https://www.nuget.org/packages?q=Tags%3A%22ThingsGateway%22)
 
+
+## 演示
+
+[ThingsGateway演示地址](https://demo.thingsgateway.cn/)
+
+账户	:  **SuperAdmin**
+
+密码 : **111111**
+
+**右上角个人弹出框中，切换到物联网关模块**
+
+## Docker
+
+```shell
+
+docker pull registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway
+
+docker pull registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway_arm64
+```
+
+
 ### 插件列表
 
 #### 采集插件
@@ -38,29 +59,12 @@
 | SqlHistoryAlarm      | 报警历史数据关系数据库存储                                 |
 | TDengineDB       | 时序数据库存储                                             |
 | QuestDB          | 时序数据库存储                                             |
+| Webhook          | Webhook                                             |
 
 ## 协议
 
-[Apache-2.0](https://gitee.com/diego2098/ThingsGateway/blob/master/LICENSE)
+[版权声明](https://thingsgateway.cn/docs/1)
 
-## 演示
-
-[ThingsGateway演示地址](http://47.119.161.158:5000/)
-
-账户	:  **SuperAdmin**
-
-密码 : **111111**
-
-**右上角个人弹出框中，切换到物联网关模块**
-
-## Docker
-
-```shell
-
-docker pull registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway
-
-docker pull registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway_arm64
-```
 
 ## 赞助
 
@@ -73,3 +77,10 @@ QQ群：605534569 [跳转](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=NnBjPO-8kcN
 ## Pro插件
 
 [插件列表](https://thingsgateway.cn/docs/1001)
+
+
+## 特别声明
+
+ThingsGateway 项目已加入 [dotNET China](https://gitee.com/dotnetchina)  组织。<br/>
+
+![dotnetchina](https://gitee.com/dotnetchina/home/raw/master/assets/dotnetchina-raw.png "dotNET China LOGO")

src/.editorconfig

@@ -117,8 +117,6 @@ dotnet_naming_style.帕斯卡拼写法.required_suffix =
 dotnet_naming_style.帕斯卡拼写法.word_separator =
 dotnet_naming_style.帕斯卡拼写法.capitalization = pascal_case
 
-[*.cs]
-# Add file header
 file_header_template = ------------------------------------------------------------------------------\n此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充\n此代码版权（除特别声明外的代码）归作者本人Diego所有\n源代码使用协议遵循本仓库的开源协议及附加协议\nGitee源代码仓库：https://gitee.com/diego2098/ThingsGateway\nGithub源代码仓库：https://github.com/kimdiego2098/ThingsGateway\n使用文档：https://thingsgateway.cn/\nQQ群：605534569\n------------------------------------------------------------------------------
 
 [*.{cs,vb}]

src/Admin/README.md

@@ -0,0 +1,21 @@
+
+<div align="center"><h1 align="center">ThingsBlazor</a></h1></div>
+<div align="center"><h3 align="center">权限管理框架</h3></div>
+
+
+### 🎁 框架介绍
+ 一个通用的AspNetCore小型权限框架，BlazorServer实现RBAC权限管理，在线会话管理。
+
+
+ ### 📙 衍生作品
+  - 👉[ThingsGateway](https://gitee.com/diego2098/ThingsGateway)
+    跨平台边缘采集网关
+
+### 💐 特别鸣谢/源码参考(引用)
+ - 👉[Simple.Admin](https://gitee.com/zxzyjs/SimpleAdmin)
+ - 👉[Furion](https://gitee.com/dotnetchina/Furion)
+ - 👉[Bootstrap Blazor](https://www.blazor.zone/)
+
+### 🍎 联系作者
+ * QQ群：605534569
+ * 邮箱：2248356998@qq.com

src/Admin/README.zh-CN.md

@@ -0,0 +1,21 @@
+
+<div align="center"><h1 align="center">ThingsBlazor</a></h1></div>
+<div align="center"><h3 align="center">权限管理框架</h3></div>
+
+
+### 🎁 框架介绍
+ 一个通用的AspNetCore小型权限框架，BlazorServer实现RBAC权限管理，在线会话管理。
+
+
+ ### 📙 衍生作品
+  - 👉[ThingsGateway](https://gitee.com/diego2098/ThingsGateway)
+    跨平台边缘采集网关
+
+### 💐 特别鸣谢/源码参考(引用)
+ - 👉[Simple.Admin](https://gitee.com/zxzyjs/SimpleAdmin)
+ - 👉[Furion](https://gitee.com/dotnetchina/Furion)
+ - 👉[Bootstrap Blazor](https://www.blazor.zone/)
+
+### 🍎 联系作者
+ * QQ群：605534569
+ * 邮箱：2248356998@qq.com

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

@@ -0,0 +1,164 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+using Rougamo;
+using Rougamo.Context;
+using Rougamo.Metadatas;
+
+using System.Collections.Concurrent;
+
+using ThingsGateway.Extension;
+using ThingsGateway.FriendlyException;
+using ThingsGateway.NewLife.Json.Extension;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// Aop拦截器
+/// </summary>
+[Pointcut(AccessFlags.Public | AccessFlags.Method)]
+[Advice(Feature.OnException | Feature.OnSuccess)]
+public sealed class OperDescAttribute : MoAttribute
+{
+    /// <summary>
+    /// 日志消息队列（线程安全）
+    /// </summary>
+    private static readonly ConcurrentQueue<SysOperateLog> _logMessageQueue = new();
+    private static readonly IAppService AppService;
+
+    static OperDescAttribute()
+    {
+        // 创建长时间运行的后台任务，并将日志消息队列中数据写入存储中
+        Task.Factory.StartNew(ProcessQueue, TaskCreationOptions.LongRunning);
+        AppService = App.RootServices.GetService<IAppService>();
+    }
+
+    public OperDescAttribute(string description, bool isRecordPar = true, object localizerType = null)
+    {
+        Description = description;
+        IsRecordPar = isRecordPar;
+        LocalizerType = (Type)localizerType;
+    }
+
+    /// <summary>
+    /// 说明，需配置本地化json文件
+    /// </summary>
+    public string Description { get; }
+
+    /// <summary>
+    /// 是否记录进出参数
+    /// </summary>
+    public bool IsRecordPar { get; }
+
+    public Type? LocalizerType { get; }
+
+    public override void OnException(MethodContext context)
+    {
+        //插入异常日志
+        SysOperateLog log = GetOperLog(LocalizerType, context);
+
+        log.Category = LogCateGoryEnum.Exception;//操作类型为异常
+        log.ExeStatus = false;//操作状态为失败
+        if (context.Exception is AppFriendlyException exception)
+            log.ExeMessage = exception?.Message;
+        else
+            log.ExeMessage = context.Exception?.ToString();
+
+        OperDescAttribute.WriteToQueue(log);
+    }
+
+    public override void OnSuccess(MethodContext context)
+    {
+        //插入操作日志
+        SysOperateLog log = GetOperLog(LocalizerType, context);
+        OperDescAttribute.WriteToQueue(log);
+    }
+
+    /// <summary>
+    /// 将日志消息写入数据库中
+    /// </summary>
+    private static async Task ProcessQueue()
+    {
+        var db = DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
+        var appLifetime = App.RootServices!.GetService<IHostApplicationLifetime>()!;
+        while (!appLifetime.ApplicationStopping.IsCancellationRequested)
+        {
+            try
+            {
+                var data = _logMessageQueue.ToListWithDequeue(); // 从日志队列中获取数据
+                if (data.Count > 0)
+                {
+                    await db.InsertableWithAttr(data).ExecuteCommandAsync(appLifetime.ApplicationStopping).ConfigureAwait(false);//入库
+                }
+            }
+            catch (Exception ex)
+            {
+                NewLife.Log.XTrace.WriteException(ex);
+            }
+            finally
+            {
+                await Task.Delay(3000, appLifetime.ApplicationStopping).ConfigureAwait(false);
+            }
+        }
+    }
+
+    private SysOperateLog GetOperLog(Type? localizerType, MethodContext context)
+    {
+        var methodBase = context.Method;
+        var clientInfo = AppService.ClientInfo;
+        string? paramJson = null;
+        if (IsRecordPar)
+        {
+            var args = context.Arguments;
+            var parametersInfo = methodBase.GetParameters();
+            var parametersDict = new Dictionary<string, object>();
+
+            for (int i = 0; i < parametersInfo.Length; i++)
+            {
+                parametersDict[parametersInfo[i].Name!] = args[i];
+            }
+            paramJson = parametersDict.ToJsonNetString();
+        }
+        var result = context.ReturnValue;
+        var resultJson = IsRecordPar ? result?.ToJsonNetString() : null;
+        //操作日志表实体
+        var log = new SysOperateLog
+        {
+            Name = (localizerType == null ? App.CreateLocalizerByType(typeof(OperDescAttribute)) : App.CreateLocalizerByType(localizerType))![Description],
+            Category = LogCateGoryEnum.Operate,
+            ExeStatus = true,
+            OpIp = AppService?.RemoteIpAddress ?? string.Empty,
+            OpBrowser = clientInfo?.UA?.Family + clientInfo?.UA?.Major,
+            OpOs = clientInfo?.OS?.Family + clientInfo?.OS?.Major,
+            OpTime = DateTime.Now,
+            OpAccount = UserManager.UserAccount,
+            ReqUrl = null,
+            ReqMethod = "browser",
+            ResultJson = resultJson,
+            ClassName = methodBase.ReflectedType!.Name,
+            MethodName = methodBase.Name,
+            ParamJson = paramJson,
+            VerificatId = UserManager.VerificatId,
+        };
+        return log;
+    }
+
+    /// <summary>
+    /// 将日志消息写入队列中等待后台任务出队写入数据库
+    /// </summary>
+    /// <param name="logMsg">结构化日志消息</param>
+    private static void WriteToQueue(SysOperateLog logMsg)
+    {
+        _logMessageQueue.Enqueue(logMsg);
+    }
+}

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

@@ -0,0 +1,19 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 忽略Excel导入导出
+/// </summary>
+[AttributeUsage(AttributeTargets.Property)]
+public sealed class IgnoreExcelAttribute : Attribute
+{
+}

src/Admin/ThingsGateway.Admin.Application/Attributes/IgnoreRolePermissionAttribute.cs

@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 需要角色授权权限
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+public sealed class RolePermissionAttribute : Attribute
+{
+}
+
+/// <summary>
+/// 忽略角色授权权限
+/// </summary>
+public sealed class IgnoreRolePermissionAttribute : Attribute
+{
+}

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

@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 种子数据忽略新增
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+public sealed class IgnoreSeedDataAddAttribute : Attribute
+{
+}
+
+/// <summary>
+/// 种子数据忽略修改
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+public sealed class IgnoreSeedDataUpdateAttribute : Attribute
+{
+}
+
+/// <summary>
+/// 忽略初始化表
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+public sealed class IgnoreInitTableAttribute : Attribute
+{
+}

src/Admin/ThingsGateway.Admin.Application/Attributes/SuperAdminAttribute.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 管理员才能访问
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+public sealed class SuperAdminAttribute : Attribute
+{
+}
+
+/// <summary>
+/// 忽略超级管理员才能访问特性
+/// </summary>
+[AttributeUsage(AttributeTargets.Method)]
+public sealed class IgnoreSuperAdminAttribute : Attribute
+{
+}

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

@@ -0,0 +1,85 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+[ThingsGateway.DependencyInjection.SuppressSniffer]
+public class CacheConst
+{
+    /// <summary>
+    /// Token表缓存Key
+    /// </summary>
+    public const string Cache_HardwareInfo = $"{CacheConst.Cache_Prefix_Admin}Cache_HardwareInfo:";
+
+    public const string Cache_Prefix_Admin = "ThingsGatewayAdmin:";
+
+    /// <summary>
+    /// 系统字典表缓存Key
+    /// </summary>
+    public const string Cache_SysDict = $"{CacheConst.Cache_Prefix_Admin}SysDict:";
+
+    /// <summary>
+    /// 关系表缓存Key
+    /// </summary>
+    public const string Cache_SysRelation = $"{CacheConst.Cache_Prefix_Admin}SysRelation:";
+
+    /// <summary>
+    /// 资源表缓存Key
+    /// </summary>
+    public const string Cache_SysResource = $"{CacheConst.Cache_Prefix_Admin}SysResource:";
+
+    /// <summary>
+    /// 角色表缓存Key
+    /// </summary>
+    public const string Cache_SysRole = $"{CacheConst.Cache_Prefix_Admin}SysRole:";
+
+    /// <summary>
+    /// 用户表缓存Key
+    /// </summary>
+    public const string Cache_SysUser = $"{CacheConst.Cache_Prefix_Admin}SysUser:";
+
+    /// <summary>
+    /// 用户账号关系缓存Key
+    /// </summary>
+    public const string Cache_SysUserAccount = $"{CacheConst.Cache_Prefix_Admin}SysUserAccount:";
+
+    /// <summary>
+    /// 职位表缓存Key
+    /// </summary>
+    public const string Cache_SysPosition = $"{CacheConst.Cache_Prefix_Admin}SysPosition:";
+
+    /// <summary>
+    /// 机构表缓存Key
+    /// </summary>
+    public const string Cache_SysOrg = $"{CacheConst.Cache_Prefix_Admin}SysOrg:";
+
+    /// <summary>
+    /// 公司表缓存Key
+    /// </summary>
+    public const string Cache_SysTenant = $"{CacheConst.Cache_Prefix_Admin}Tenant:";
+    /// <summary>
+    /// 公司表缓存Key
+    /// </summary>
+    public const string Cache_SysOrgTenant = $"{CacheConst.Cache_Prefix_Admin}OrgTenant:";
+
+    /// <summary>
+    /// Token表缓存Key
+    /// </summary>
+    public const string Cache_Token = $"{CacheConst.Cache_Prefix_Admin}Token:";
+
+    #region 登录错误次数
+
+    /// <summary>
+    ///  登录错误次数缓存Key
+    /// </summary>
+    public const string Cache_LoginErrorCount = $"{CacheConst.Cache_Prefix_Admin}LoginErrorCount:";
+
+    #endregion 登录错误次数
+}

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

@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 授权用户常量
+/// </summary>
+[ThingsGateway.DependencyInjection.SuppressSniffer]
+public class ClaimConst
+{
+    /// <summary>
+    /// 账号
+    /// </summary>
+    public const string Account = "Account";
+
+    /// <summary>
+    /// SuperAdmin
+    /// </summary>
+    public const string SuperAdmin = "SuperAdmin";
+
+    /// <summary>
+    /// 用户Id
+    /// </summary>
+    public const string UserId = "UserId";
+
+    /// <summary>
+    /// 验证Id
+    /// </summary>
+    public const string VerificatId = "VerificatId";
+
+    /// <summary>
+    /// 组织Id
+    /// </summary>
+    public const string OrgId = "OrgId";
+
+    /// <summary>
+    /// 租户Id
+    /// </summary>
+    public const string TenantId = "TenantId";
+
+
+    public static volatile string Scheme = "ThingsGateway.AdminServer";
+}

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

@@ -0,0 +1,22 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 通讯器常量
+/// </summary>
+public class HubConst
+{
+    /// <summary>
+    /// 系统HubUrl
+    /// </summary>
+    public const string SysHubUrl = "/hubs/thingsgateway";
+}

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

@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 资源表常量
+/// </summary>
+[ThingsGateway.DependencyInjection.SuppressSniffer]
+public class ResourceConst
+{
+    /// <summary>
+    /// 系统内置编码
+    /// </summary>
+    public const string System = "System";
+
+    /// <summary>
+    /// 系统管理内置ID 1
+    /// </summary>
+    public const long SystemId = 2;
+}

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

@@ -0,0 +1,50 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 角色常量
+/// </summary>
+[ThingsGateway.DependencyInjection.SuppressSniffer]
+public class RoleConst
+{
+    /// <summary>
+    /// api角色
+    /// </summary>
+    public const string ApiRole = "ApiRole";
+
+    /// <summary>
+    /// 业务管理员
+    /// </summary>
+    public const string BizAdmin = "BizAdmin";
+
+    /// <summary>
+    /// 超级管理员
+    /// </summary>
+    public const string SuperAdmin = "SuperAdmin";
+
+    /// <summary>
+    /// 超级管理员Id
+    /// </summary>
+    public const long SuperAdminId = 212725263002001;
+    /// <summary>
+    /// 默认租户Id
+    /// </summary>
+    public const long DefaultTenantId = 252885263003720;
+    /// <summary>
+    /// 默认岗位Id
+    /// </summary>
+    public const long DefaultPositionId = 212725263003001;
+    /// <summary>
+    /// 超级管理员Id
+    /// </summary>
+    public const long SuperAdminRoleId = 212725263001001;
+}

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

@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// SqlSugar系统常量
+/// </summary>
+[ThingsGateway.DependencyInjection.SuppressSniffer]
+public class SqlSugarConst
+{
+    /// <summary>
+    /// DB_Admin
+    /// </summary>
+    public const string DB_Admin = "DB_Admin";
+
+    /// <summary>
+    /// DB_Custom
+    /// </summary>
+    public const string DB_Custom = "DB_Custom";
+
+    /// <summary>
+    /// DB_HardwareInfo
+    /// </summary>
+    public const string DB_HardwareInfo = "DB_HardwareInfo";
+
+    /// <summary>
+    /// DB_Log
+    /// </summary>
+    public const string DB_Log = "DB_Log";
+
+    /// <summary>
+    /// DB_TokenCache
+    /// </summary>
+    public const string DB_TokenCache = "DB_TokenCache";
+}

src/Admin/ThingsGateway.Admin.Application/Controller/AuthController.cs

@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ThingsGateway.Admin.Application;
+
+[ApiDescriptionSettings(false)]
+[Route("api/auth")]
+[LoggingMonitor]
+public class AuthController : ControllerBase
+{
+    private readonly IAuthService _authService;
+
+    public AuthController(IAuthService authService)
+    {
+        _authService = authService;
+    }
+
+    [HttpPost("login")]
+    [AllowAnonymous]
+    public Task<LoginOutput> LoginAsync([FromBody] LoginInput input)
+    {
+        return _authService.LoginAsync(input);
+    }
+
+    [HttpPost("logout")]
+    [Authorize]
+    [IgnoreRolePermission]
+    public Task LogoutAsync()
+    {
+        return _authService.LoginOutAsync();
+    }
+}

src/Admin/ThingsGateway.Admin.Application/Controller/CultureController.cs

@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Localization;
+using Microsoft.AspNetCore.Mvc;
+
+using RouteAttribute = Microsoft.AspNetCore.Mvc.RouteAttribute;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 文化 Controller
+/// </summary>
+[ApiDescriptionSettings(false)]
+[Route("[controller]/[action]")]
+public class CultureController : Controller
+{
+    /// <summary>
+    /// 重置文化方法
+    /// </summary>
+    /// <param name="redirectUri"></param>
+    /// <returns></returns>
+    [HttpGet]
+    public IActionResult ResetCulture(string redirectUri)
+    {
+        HttpContext.Response.Cookies.Delete(CookieRequestCultureProvider.DefaultCookieName);
+
+        return LocalRedirect(redirectUri);
+    }
+
+    /// <summary>
+    /// 设置文化方法
+    /// </summary>
+    /// <param name="culture"></param>
+    /// <param name="redirectUri"></param>
+    /// <returns></returns>
+    [HttpGet]
+    public IActionResult SetCulture(string culture, string redirectUri)
+    {
+        if (string.IsNullOrEmpty(culture))
+        {
+            HttpContext.Response.Cookies.Delete(CookieRequestCultureProvider.DefaultCookieName);
+        }
+        else
+        {
+            HttpContext.Response.Cookies.Append(
+                CookieRequestCultureProvider.DefaultCookieName,
+                CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture, culture)), new CookieOptions()
+                {
+                    Expires = DateTimeOffset.Now.AddYears(1)
+                });
+
+            //更改全局文化，采集后台也会变化
+            //var cultureInfo = new CultureInfo(culture);
+            //CultureInfo.DefaultThreadCurrentCulture = cultureInfo;
+            //CultureInfo.DefaultThreadCurrentUICulture = cultureInfo;
+
+            //CultureInfo.CurrentCulture = cultureInfo;
+            //CultureInfo.CurrentUICulture = cultureInfo;
+        }
+
+        return LocalRedirect(redirectUri);
+    }
+}

src/Admin/ThingsGateway.Admin.Application/Controller/FileController.cs

@@ -0,0 +1,50 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 文件下载
+/// </summary>
+[ApiDescriptionSettings(false)]
+[Route("api/file")]
+public class FileController : ControllerBase
+{
+    /// <summary>
+    /// 下载wwwroot文件夹下的文件
+    /// </summary>
+    /// <param name="fileName">相对路径</param>
+    /// <returns></returns>
+    [HttpGet("download")]
+    public IActionResult Download(string fileName)
+    {
+        // Validate the fileName to prevent path injection
+        if (string.IsNullOrEmpty(fileName))
+        {
+            return BadRequest("Invalid file name.");
+        }
+
+        var filePath = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", fileName);
+
+        if (!System.IO.File.Exists(filePath))
+        {
+            return NotFound();
+        }
+
+        var fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+
+        Response.Headers.Append("Access-Control-Expose-Headers", "Content-Disposition");
+
+        return File(fileStream, "application/octet-stream", (fileName.Replace('/', '_')));
+    }
+}

src/Admin/ThingsGateway.Admin.Application/Controller/OpenApiController.cs

@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Mapster;
+
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+using System.ComponentModel;
+
+namespace ThingsGateway.Admin.Application;
+
+
+/// <summary>
+/// 登录
+/// </summary>
+[ApiDescriptionSettings("ThingsGateway.OpenApi", Order = 200)]
+[Description("登录")]
+[Route("openapi/auth")]
+[Authorize(AuthenticationSchemes = "Bearer")]
+[LoggingMonitor]
+public class OpenApiController : ControllerBase
+{
+    private readonly IAuthService _authService;
+
+    public OpenApiController(IAuthService authService)
+    {
+        _authService = authService;
+    }
+
+    [HttpPost("login")]
+    [DisplayName("登录")]
+    [AllowAnonymous]
+    public async Task<OpenApiLoginOutput> LoginAsync([FromBody] OpenApiLoginInput input)
+    {
+        var output = await _authService.LoginAsync(input.Adapt<LoginInput>(), false).ConfigureAwait(false);
+
+        var openApiLoginOutput = output.Adapt<OpenApiLoginOutput>();
+
+        return openApiLoginOutput;
+    }
+
+    [HttpPost("logout")]
+    [Authorize]
+    [DisplayName("登出")]
+    [IgnoreRolePermission]
+    public Task LogoutAsync()
+    {
+        return _authService.LoginOutAsync();
+    }
+}

src/Admin/ThingsGateway.Admin.Application/Controller/TestController.cs

@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+//此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+// 此代码版权（除特别声明外的代码）归作者本人Diego所有
+// 源代码使用协议遵循本仓库的开源协议及附加协议
+// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+// 使用文档：https://thingsgateway.cn/
+// QQ群：605534569
+// ------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ThingsGateway.Admin.Application;
+
+[Route("api/[controller]/[action]")]
+[AllowAnonymous]
+public class TestController : ControllerBase
+{
+    [HttpPost]
+    public Task Test(string data)
+    {
+        for (int i = 0; i < 3; i++)
+        {
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
+        }
+        return Task.CompletedTask;
+    }
+}

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

@@ -0,0 +1,148 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using SqlSugar;
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 主键id基类
+/// </summary>
+public abstract class PrimaryIdEntity : IPrimaryIdEntity
+{
+    /// <summary>
+    /// 主键Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "Id", IsPrimaryKey = true)]
+    [IgnoreExcel]
+    [AutoGenerateColumn(Visible = false, IsVisibleWhenEdit = false, IsVisibleWhenAdd = false, Sortable = true, DefaultSort = true, DefaultSortOrder = SortOrder.Asc)]
+    public virtual long Id { get; set; }
+}
+
+/// <summary>
+/// 主键实体基类
+/// </summary>
+public abstract class PrimaryKeyEntity : PrimaryIdEntity
+{
+    /// <summary>
+    /// 拓展信息
+    /// </summary>
+    [SugarColumn(ColumnDescription = "扩展信息", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    [IgnoreExcel]
+    [AutoGenerateColumn(Ignore = true)]
+    public virtual string? ExtJson { get; set; }
+}
+
+public interface IBaseEntity
+{
+    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; }
+}
+
+/// <summary>
+/// 框架实体基类
+/// </summary>
+public abstract class BaseEntity : PrimaryKeyEntity, IBaseEntity
+{
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "创建时间", IsOnlyIgnoreUpdate = true, IsNullable = true)]
+    [IgnoreExcel]
+    [AutoGenerateColumn(Visible = false, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
+    public virtual DateTime? CreateTime { get; set; }
+
+    /// <summary>
+    /// 创建人
+    /// </summary>
+    [SugarColumn(ColumnDescription = "创建人", IsOnlyIgnoreUpdate = true, IsNullable = true)]
+    [IgnoreExcel]
+    [NotNull]
+    [AutoGenerateColumn(Ignore = true)]
+    public virtual string? CreateUser { get; set; }
+
+    /// <summary>
+    /// 创建者Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "创建者Id", IsOnlyIgnoreUpdate = true, IsNullable = true)]
+    [IgnoreExcel]
+    [AutoGenerateColumn(Ignore = true)]
+    public virtual long CreateUserId { get; set; }
+
+    /// <summary>
+    /// 软删除
+    /// </summary>
+    [SugarColumn(ColumnDescription = "软删除", IsNullable = true)]
+    [IgnoreExcel]
+    [AutoGenerateColumn(Ignore = true)]
+    public virtual bool IsDelete { get; set; } = false;
+
+
+    /// <summary>
+    /// 更新时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "更新时间", IsOnlyIgnoreInsert = true, IsNullable = true)]
+    [IgnoreExcel]
+    [AutoGenerateColumn(Visible = false, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
+    public virtual DateTime? UpdateTime { get; set; }
+
+    /// <summary>
+    /// 更新人
+    /// </summary>
+    [SugarColumn(ColumnDescription = "更新人", IsOnlyIgnoreInsert = true, IsNullable = true)]
+    [IgnoreExcel]
+    [AutoGenerateColumn(Ignore = true)]
+    public virtual string? UpdateUser { get; set; }
+
+    /// <summary>
+    /// 修改者Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "修改者Id", IsOnlyIgnoreInsert = true, IsNullable = true)]
+    [IgnoreExcel]
+    [AutoGenerateColumn(Ignore = true)]
+    public virtual long? UpdateUserId { get; set; }
+
+    /// <summary>
+    /// 排序码
+    ///</summary>
+    [SugarColumn(ColumnDescription = "排序码", IsNullable = true)]
+    [AutoGenerateColumn(Visible = false, DefaultSort = true, Sortable = true, DefaultSortOrder = SortOrder.Asc)]
+    [IgnoreExcel]
+    public virtual int? SortCode { get; set; }
+}
+
+public interface IBaseDataEntity
+{
+    long CreateOrgId { get; set; }
+}
+
+/// <summary>
+/// 业务数据实体基类(数据权限)
+/// </summary>
+public abstract class BaseDataEntity : BaseEntity, IBaseDataEntity
+{
+    /// <summary>
+    /// 创建者部门Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "创建者部门Id", IsOnlyIgnoreUpdate = true, IsNullable = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    [IgnoreExcel]
+    public virtual long CreateOrgId { get; set; }
+}

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

@@ -0,0 +1,59 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using SqlSugar;
+
+using System.ComponentModel.DataAnnotations;
+
+namespace ThingsGateway.Admin.Application;
+
+[SugarTable("sys_dict", TableDescription = "字典表")]
+[Tenant(SqlSugarConst.DB_Admin)]
+public class SysDict : BaseEntity
+{
+    /// <summary>
+    /// 类型
+    ///</summary>
+    [SugarColumn(ColumnDescription = "类型")]
+    [AutoGenerateColumn(Ignore = true, Filterable = true, Sortable = true)]
+    public virtual DictTypeEnum DictType { get; set; }
+
+    /// <summary>
+    /// 分类
+    ///</summary>
+    [SugarColumn(ColumnDescription = "分类", Length = 200)]
+    [Required]
+    [AutoGenerateColumn(Searchable = true, Filterable = true, Sortable = true)]
+    public string Category { get; set; }
+
+    /// <summary>
+    /// 名称
+    ///</summary>
+    [SugarColumn(ColumnDescription = "名称", Length = 200)]
+    [Required]
+    [AutoGenerateColumn(Searchable = true, Filterable = true, Sortable = true)]
+    public virtual string Name { get; set; }
+
+    /// <summary>
+    /// 代码
+    ///</summary>
+    [SugarColumn(ColumnDescription = "代码", ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    [Required]
+    [AutoGenerateColumn(Searchable = true, Filterable = true, Sortable = true)]
+    public virtual string Code { get; set; }
+
+    /// <summary>
+    /// 描述
+    ///</summary>
+    [SugarColumn(ColumnDescription = "描述", Length = 200, IsNullable = true)]
+    public string Remark { get; set; }
+}

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

@@ -0,0 +1,136 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using SqlSugar;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 操作日志表
+///</summary>
+[SugarTable("sys_operatelog", TableDescription = "操作日志表")]
+[Tenant(SqlSugarConst.DB_Log)]
+public class SysOperateLog
+{
+    /// <summary>
+    /// 日志分类
+    ///</summary>
+    [SugarColumn(ColumnDescription = "日志分类")]
+    [AutoGenerateColumn(Order = 1, Filterable = true, Sortable = true)]
+    public LogCateGoryEnum Category { get; set; }
+
+    /// <summary>
+    /// 日志名称
+    ///</summary>
+    [SugarColumn(ColumnDescription = "日志名称", Length = 200)]
+    [AutoGenerateColumn(Order = 2, Filterable = true, Sortable = true)]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 类名称
+    ///</summary>
+    [SugarColumn(ColumnDescription = "类名称", Length = 200)]
+    [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
+    public string ClassName { get; set; }
+
+    /// <summary>
+    /// 方法名称
+    ///</summary>
+    [SugarColumn(ColumnDescription = "方法名称", Length = 200)]
+    [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
+    public string MethodName { get; set; }
+
+    /// <summary>
+    /// 请求参数
+    ///</summary>
+    [SugarColumn(ColumnDescription = "请求参数", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    [AutoGenerateColumn(ShowTips = true, Filterable = true, Sortable = true)]
+    public string? ParamJson { get; set; }
+
+    /// <summary>
+    /// 请求方式
+    ///</summary>
+    [SugarColumn(ColumnDescription = "请求方式", Length = 200, IsNullable = true)]
+    [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
+    public string? ReqMethod { get; set; }
+
+    /// <summary>
+    /// 请求地址
+    ///</summary>
+    [SugarColumn(ColumnDescription = "请求地址", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
+    public string? ReqUrl { get; set; }
+
+    /// <summary>
+    /// 返回结果
+    ///</summary>
+    [SugarColumn(ColumnDescription = "返回结果", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    [AutoGenerateColumn(ShowTips = true, Filterable = true, Sortable = true)]
+    public string? ResultJson { get; set; }
+
+    /// <summary>
+    /// 具体消息
+    ///</summary>
+    [SugarColumn(ColumnDescription = "具体消息", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    [AutoGenerateColumn(ShowTips = true, Filterable = true, Sortable = true)]
+    public string? ExeMessage { get; set; }
+
+    /// <summary>
+    /// 执行状态
+    ///</summary>
+    [SugarColumn(ColumnDescription = "执行状态")]
+    [AutoGenerateColumn(Filterable = true, Sortable = true)]
+    public bool ExeStatus { get; set; }
+
+    /// <summary>
+    /// 操作账号
+    ///</summary>
+    [SugarColumn(ColumnDescription = "操作账号", Length = 200, IsNullable = true)]
+    [AutoGenerateColumn(Filterable = true, Sortable = true)]
+    public string? OpAccount { get; set; }
+
+    /// <summary>
+    /// 操作浏览器
+    ///</summary>
+    [SugarColumn(ColumnDescription = "操作浏览器", Length = 200)]
+    [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
+    public string OpBrowser { get; set; }
+
+    /// <summary>
+    /// 操作ip
+    ///</summary>
+    [SugarColumn(ColumnDescription = "操作ip", Length = 200)]
+    [AutoGenerateColumn(Filterable = true, Sortable = true)]
+    public string? OpIp { get; set; }
+
+    /// <summary>
+    /// 操作系统
+    ///</summary>
+    [SugarColumn(ColumnDescription = "操作系统", Length = 200)]
+    [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
+    public string OpOs { get; set; }
+
+    /// <summary>
+    /// 操作时间
+    ///</summary>
+    [SugarColumn(ColumnDescription = "操作时间")]
+    [AutoGenerateColumn(Visible = true, DefaultSort = true, Sortable = true, DefaultSortOrder = SortOrder.Desc)]
+    public DateTime OpTime { get; set; }
+
+    /// <summary>
+    /// 验证Id
+    ///</summary>
+    [SugarColumn(ColumnDescription = "验证Id")]
+    [IgnoreExcel]
+    [AutoGenerateColumn(Visible = false, Filterable = true, Sortable = true)]
+    public long VerificatId { get; set; }
+}

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

@@ -0,0 +1,81 @@
+// ------------------------------------------------------------------------------
+// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+// 此代码版权（除特别声明外的代码）归作者本人Diego所有
+// 源代码使用协议遵循本仓库的开源协议及附加协议
+// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+// 使用文档：https://thingsgateway.cn/
+// QQ群：605534569
+// ------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using SqlSugar;
+
+using System.ComponentModel.DataAnnotations;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 组织表
+///</summary>
+[SugarTable("sys_org", TableDescription = "组织表")]
+[Tenant(SqlSugarConst.DB_Admin)]
+public class SysOrg : BaseEntity
+{
+    /// <summary>
+    /// 父id
+    ///</summary>
+    [SugarColumn(ColumnName = "ParentId", ColumnDescription = "父id")]
+    [AutoGenerateColumn(Ignore = true)]
+    public long ParentId { get; set; }
+
+    [SugarColumn(ColumnName = "ParentIdList", ColumnDescription = "父id列表", IsNullable = true, IsJson = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    public List<long> ParentIdList { get; set; } = new List<long>();
+
+    /// <summary>
+    /// 主管ID
+    ///</summary>
+    [SugarColumn(ColumnName = "DirectorId", ColumnDescription = "主管ID", IsNullable = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    public long? DirectorId { get; set; }
+
+    /// <summary>
+    /// 名称
+    ///</summary>
+    [SugarColumn(ColumnName = "Name", ColumnDescription = "名称", Length = 200)]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    [Required]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 全称
+    ///</summary>
+    [SugarColumn(ColumnName = "Names", ColumnDescription = "全称", Length = 500)]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public string Names { get; set; }
+
+    /// <summary>
+    /// 编码
+    ///</summary>
+    [SugarColumn(ColumnName = "Code", ColumnDescription = "编码", Length = 200)]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 分类
+    ///</summary>
+    [SugarColumn(ColumnName = "Category", ColumnDescription = "分类")]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public OrgEnum Category { get; set; }
+
+
+    [SugarColumn(ColumnName = "Status", ColumnDescription = "启用")]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public bool Status { get; set; } = true;
+
+
+
+
+}

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

@@ -0,0 +1,61 @@
+// ------------------------------------------------------------------------------
+// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+// 此代码版权（除特别声明外的代码）归作者本人Diego所有
+// 源代码使用协议遵循本仓库的开源协议及附加协议
+// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+// 使用文档：https://thingsgateway.cn/
+// QQ群：605534569
+// ------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using SqlSugar;
+
+using System.ComponentModel.DataAnnotations;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 职位表
+///</summary>
+[SugarTable("sys_position", TableDescription = "职位表")]
+[Tenant(SqlSugarConst.DB_Admin)]
+public class SysPosition : BaseEntity
+{
+    /// <summary>
+    /// 组织id
+    ///</summary>
+    [SugarColumn(ColumnName = "OrgId", ColumnDescription = "组织id")]
+    [AutoGenerateColumn(Ignore = true)]
+    [MinValue(1)]
+    public virtual long OrgId { get; set; }
+
+    /// <summary>
+    /// 名称
+    ///</summary>
+    [SugarColumn(ColumnName = "Name", ColumnDescription = "名称", Length = 200)]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    [Required]
+    public virtual string Name { get; set; }
+
+    /// <summary>
+    /// 编码
+    ///</summary>
+    [SugarColumn(ColumnName = "Code", ColumnDescription = "编码", Length = 200)]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public string Code { get; set; }
+
+
+    [SugarColumn(ColumnName = "Status", ColumnDescription = "启用")]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public bool Status { get; set; } = true;
+
+    /// <summary>
+    /// 分类
+    ///</summary>
+    [SugarColumn(ColumnName = "Category", ColumnDescription = "分类")]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public virtual PositionCategoryEnum Category { get; set; }
+
+}

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

@@ -0,0 +1,39 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using SqlSugar;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 系统关系表
+///</summary>
+[SugarTable("sys_relation", TableDescription = "系统关系表")]
+[Tenant(SqlSugarConst.DB_Admin)]
+public class SysRelation : PrimaryKeyEntity
+{
+    /// <summary>
+    /// 分类
+    ///</summary>
+    [SugarColumn(ColumnDescription = "分类")]
+    public RelationCategoryEnum Category { get; set; }
+
+    /// <summary>
+    /// 对象ID
+    ///</summary>
+    [SugarColumn(ColumnDescription = "对象ID")]
+    public long ObjectId { get; set; }
+
+    /// <summary>
+    /// 目标ID
+    ///</summary>
+    [SugarColumn(ColumnDescription = "目标ID", IsNullable = true)]
+    public string? TargetId { get; set; }
+}

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

@@ -0,0 +1,101 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using Microsoft.AspNetCore.Components.Routing;
+
+using Newtonsoft.Json;
+
+using SqlSugar;
+
+using System.ComponentModel.DataAnnotations;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 系统资源表
+///</summary>
+[SugarTable("sys_resource", TableDescription = "系统资源表")]
+[Tenant(SqlSugarConst.DB_Admin)]
+public class SysResource : BaseEntity
+{
+    /// <summary>
+    /// 父id
+    ///</summary>
+    [SugarColumn(ColumnDescription = "父id")]
+    [AutoGenerateColumn(Ignore = true)]
+    public virtual long ParentId { get; set; } = 0;
+
+    /// <summary>
+    /// 模块
+    ///</summary>
+    [SugarColumn(ColumnDescription = "模块")]
+    [AutoGenerateColumn(Ignore = true)]
+    public virtual long Module { get; set; }
+
+    /// <summary>
+    /// 标题
+    ///</summary>
+    [SugarColumn(ColumnDescription = "标题", Length = 200)]
+    [Required]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true, Searchable = true)]
+    public virtual string Title { get; set; }
+
+    /// <summary>
+    /// 图标
+    ///</summary>
+    [SugarColumn(ColumnDescription = "图标", Length = 200, IsNullable = true)]
+    [AutoGenerateColumn(Visible = true, Sortable = false, Filterable = false)]
+    public virtual string? Icon { get; set; }
+
+    /// <summary>
+    /// 编码
+    ///</summary>
+    [SugarColumn(ColumnDescription = "编码", Length = 200)]
+    [Required]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
+    public virtual string Code { get; set; }
+
+    /// <summary>
+    /// 分类
+    ///</summary>
+    [SugarColumn(ColumnDescription = "分类")]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public ResourceCategoryEnum Category { get; set; } = ResourceCategoryEnum.Menu;
+
+    /// <summary>
+    /// 目标类型
+    ///</summary>
+    [SugarColumn(ColumnDescription = "目标类型", IsNullable = true)]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public virtual TargetEnum? Target { get; set; }
+
+    /// <summary>
+    /// 菜单匹配类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "菜单匹配类型", IsNullable = true)]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public virtual NavLinkMatch? NavLinkMatch { get; set; }
+
+    /// <summary>
+    /// 路径
+    ///</summary>
+    [SugarColumn(ColumnDescription = "路径", Length = 200, IsNullable = true)]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true, Searchable = true)]
+    public virtual string Href { get; set; }
+
+    /// <summary>
+    /// 子节点
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    public List<SysResource>? Children { get; set; }
+}

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

@@ -0,0 +1,94 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using SqlSugar;
+
+using System.ComponentModel.DataAnnotations;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 系统角色表
+///</summary>
+[SugarTable("sys_role", TableDescription = "系统角色表")]
+[Tenant(SqlSugarConst.DB_Admin)]
+public class SysRole : BaseEntity
+{
+    /// <summary>
+    /// 名称
+    ///</summary>
+    [SugarColumn(ColumnDescription = "名称", Length = 200)]
+    [Required]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public virtual string Name { get; set; }
+
+    /// <summary>
+    /// 编码
+    ///</summary>
+    [SugarColumn(ColumnDescription = "编码", Length = 200)]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 分类
+    ///</summary>
+    [SugarColumn(ColumnDescription = "分类", IsNullable = false)]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public virtual RoleCategoryEnum Category { get; set; }
+
+    /// <summary>
+    /// 组织id
+    ///</summary>
+    [SugarColumn(ColumnName = "OrgId", ColumnDescription = "组织id", IsNullable = false)]
+    [AutoGenerateColumn(Ignore = true)]
+    public long OrgId { get; set; }
+
+    /// <summary>
+    /// 默认数据范围
+    ///</summary>
+    [SugarColumn(ColumnName = "DefaultDataScope", ColumnDescription = "默认数据范围", IsJson = true, ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = false)]
+    [AutoGenerateColumn(Ignore = true)]
+    public virtual DefaultDataScope DefaultDataScope { get; set; } = new();
+
+    public override bool Equals(object? obj)
+    {
+        if (obj == null || !(obj is SysRole))
+        {
+            return false;
+        }
+
+        return Id == ((SysRole)obj).Id;
+    }
+
+    public override int GetHashCode()
+    {
+        return Id.GetHashCode();
+    }
+}
+
+
+
+/// <summary>
+/// 默认数据范围
+/// </summary>
+public class DefaultDataScope
+{
+    /// <summary>
+    /// 数据范围
+    /// </summary>
+    public DataScopeEnum ScopeCategory { get; set; }
+
+    /// <summary>
+    /// 自定义机构范围列表
+    /// </summary>
+    public List<long> ScopeDefineOrgIdList { get; set; } = new List<long>();
+}

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

@@ -0,0 +1,253 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using Mapster;
+
+using SqlSugar;
+
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 系统用户表
+///</summary>
+[SugarTable("sys_user", TableDescription = "系统用户表")]
+[Tenant(SqlSugarConst.DB_Admin)]
+public class SysUser : BaseEntity
+{
+    /// <summary>
+    /// 头像
+    ///</summary>
+    [SugarColumn(ColumnDescription = "头像", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    [AutoGenerateColumn(Visible = true, Sortable = false, Filterable = false)]
+    [AdaptIgnore]
+    public virtual string? Avatar { get; set; }
+
+    /// <summary>
+    /// 账号
+    ///</summary>
+    [SugarColumn(ColumnDescription = "账号", Length = 200)]
+    [Required]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public virtual string Account { get; set; }
+
+    /// <summary>
+    /// 密码
+    ///</summary>
+    [SugarColumn(ColumnDescription = "密码", ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    [AutoGenerateColumn(Ignore = true)]
+    public string Password { get; set; }
+
+    /// <summary>
+    /// 状态
+    ///</summary>
+    [SugarColumn(ColumnDescription = "状态")]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public bool Status { get; set; } = true;
+
+    /// <summary>
+    /// 手机
+    /// 这里使用了SM4自动加密解密
+    ///</summary>
+    [SugarColumn(ColumnDescription = "手机", Length = 200, IsNullable = true)]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public string? Phone { get; set; }
+
+    /// <summary>
+    /// 邮箱
+    ///</summary>
+    [SugarColumn(ColumnDescription = "邮箱", Length = 200, IsNullable = true)]
+    [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
+    public string? Email { get; set; }
+
+    /// <summary>
+    /// 上次登录ip
+    ///</summary>
+    [SugarColumn(ColumnDescription = "上次登录ip", Length = 200, IsNullable = true)]
+    [AutoGenerateColumn(Visible = false, Sortable = true, Filterable = true, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
+    public string? LastLoginIp { get; set; }
+
+    /// <summary>
+    /// 上次登录设备
+    ///</summary>
+    [SugarColumn(ColumnDescription = "上次登录设备", IsNullable = true)]
+    [AutoGenerateColumn(Visible = false, Sortable = true, Filterable = true, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
+    public string? LastLoginDevice { get; set; }
+
+    /// <summary>
+    /// 上次登录时间
+    ///</summary>
+    [SugarColumn(ColumnDescription = "上次登录时间", IsNullable = true)]
+    [AutoGenerateColumn(Visible = false, Sortable = true, Filterable = true, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
+    public DateTime? LastLoginTime { get; set; }
+
+    /// <summary>
+    /// 上次登录地点
+    ///</summary>
+    [SugarColumn(ColumnDescription = "上次登录地点", Length = 200, IsNullable = true)]
+    [AutoGenerateColumn(Visible = false, Sortable = true, Filterable = true, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
+    public string LastLoginAddress { get; set; }
+
+    /// <summary>
+    /// 最新登录ip
+    ///</summary>
+    [SugarColumn(ColumnDescription = "最新登录ip", Length = 200, IsNullable = true)]
+    [AutoGenerateColumn(Visible = false, Sortable = true, Filterable = true, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
+    public string? LatestLoginIp { get; set; }
+
+    /// <summary>
+    /// 最新登录时间
+    ///</summary>
+    [SugarColumn(ColumnDescription = "最新登录时间", IsNullable = true)]
+    [AutoGenerateColumn(Visible = false, Sortable = true, Filterable = true, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
+    public DateTime? LatestLoginTime { get; set; }
+
+    /// <summary>
+    /// 最新登录设备
+    ///</summary>
+    [SugarColumn(ColumnDescription = "最新登录设备", IsNullable = true)]
+    [AutoGenerateColumn(Visible = false, Sortable = true, Filterable = true, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
+    public string? LatestLoginDevice { get; set; }
+
+    /// <summary>
+    /// 最新登录地点
+    ///</summary>
+    [SugarColumn(ColumnDescription = "最新登录地点", Length = 200, IsNullable = true)]
+    [AutoGenerateColumn(Visible = false, Sortable = true, Filterable = true, IsVisibleWhenAdd = false, IsVisibleWhenEdit = false)]
+    public string LatestLoginAddress { get; set; }
+
+    /// <summary>
+    /// 机构id
+    ///</summary>
+    [SugarColumn(ColumnName = "OrgId", ColumnDescription = "机构id", IsNullable = false)]
+    [AutoGenerateColumn(Ignore = true)]
+    public virtual long OrgId { get; set; }
+
+    /// <summary>
+    /// 职位id
+    ///</summary>
+    [SugarColumn(ColumnName = "PositionId", ColumnDescription = "职位id", IsNullable = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    [Required]
+    [NotNull]
+    public virtual long? PositionId { get; set; }
+
+    /// <summary>
+    /// 主管id
+    ///</summary>
+    [SugarColumn(ColumnName = "DirectorId", ColumnDescription = "主管id", IsNullable = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    public long? DirectorId { get; set; }
+
+    #region other
+    /// <summary>
+    /// 机构信息
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    public string OrgName { get; set; }
+
+    /// <summary>
+    /// 机构信息全称
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public string OrgNames { get; set; }
+
+    /// <summary>
+    /// 职位信息
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public string PositionName { get; set; }
+
+    /// <summary>
+    /// 组织和机构ID列表,组织ID从上到下最后是职位
+    /// </summary>
+    [SugarColumn(IsIgnore = true, IsJson = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    public List<long> OrgAndPosIdList { get; set; } = new List<long>();
+
+    /// <summary>
+    /// 主管信息
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    public UserSelectorOutput DirectorInfo { get; set; }
+
+    #endregion
+
+    #region other
+
+    /// <summary>
+    /// 按钮码集合
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    public Dictionary<string, List<string>> ButtonCodeList { get; set; } = new();
+
+    /// <summary>
+    /// 权限码集合
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    public HashSet<string> PermissionCodeList { get; set; } = new();
+
+    /// <summary>
+    /// 角色ID集合
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    public HashSet<long> RoleIdList { get; set; } = new();
+
+    /// <summary>
+    /// 机构及以下机构ID集合
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    public HashSet<long> ScopeOrgChildList { get; set; }
+
+    /// <summary>
+    /// 模块集合
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    public List<SysResource> ModuleList { get; set; } = new();
+
+    /// <summary>
+    /// 租户Id
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    public long? TenantId { get; set; }
+
+
+    /// <summary>
+    /// 全局用戶
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    [AutoGenerateColumn(Ignore = true)]
+    public bool IsGlobal { get; set; }
+
+    #endregion other
+}
+
+/// <summary>
+/// 数据范围类
+/// </summary>
+public class DataScope
+{
+    /// <summary>
+    /// API接口
+    /// </summary>
+    public string ApiUrl { get; set; }
+}

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

@@ -0,0 +1,88 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using SqlSugar;
+
+using ThingsGateway.List;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 会话信息
+/// </summary>
+
+[SugarTable("verificatinfo", TableDescription = "验证缓存表")]
+[Tenant(SqlSugarConst.DB_TokenCache)]
+public class VerificatInfo : PrimaryIdEntity
+{
+    /// <summary>
+    /// 客户端ID列表
+    /// </summary>
+    [AutoGenerateColumn(Ignore = true)]
+    [SugarColumn(ColumnDescription = "客户端ID列表", IsNullable = true, IsJson = true)]
+    public ConcurrentList<string> ClientIds { get; set; } = new();
+
+    /// <summary>
+    /// 验证Id
+    /// </summary>
+    [AutoGenerateColumn(Ignore = true)]
+    public long UserId { get; set; }
+
+    /// <summary>
+    /// 验证Id
+    /// </summary>
+    [AutoGenerateColumn(Filterable = true, Sortable = true)]
+    [SugarColumn(ColumnDescription = "Id", IsPrimaryKey = true)]
+    [IgnoreExcel]
+    public override long Id { get; set; }
+
+    /// <summary>
+    /// 登录IP
+    /// </summary>
+    [AutoGenerateColumn(Filterable = true, Sortable = true, Width = 200)]
+    public string LoginIp { get; set; }
+
+    /// <summary>
+    /// 登录时间
+    /// </summary>
+    [AutoGenerateColumn(Filterable = true, Sortable = true, Width = 200)]
+    public DateTime LoginTime { get; set; }
+
+    /// <summary>
+    /// 在线状态
+    /// </summary>
+    [Newtonsoft.Json.JsonIgnore]
+    [System.Text.Json.Serialization.JsonIgnore]
+    [AutoGenerateColumn(Filterable = true, Sortable = true, Width = 120)]
+    [SugarColumn(IsIgnore = true)]
+    public bool Online => ClientIds.Count > 0;
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    [AutoGenerateColumn(Filterable = true, Sortable = true)]
+    public int Expire { get; set; }
+
+    /// <summary>
+    /// 超时时间
+    /// </summary>
+    [AutoGenerateColumn(Filterable = true, Sortable = true)]
+    public DateTime VerificatTimeout { get; set; }
+
+    /// <summary>
+    /// 登录设备
+    /// </summary>
+    [AutoGenerateColumn(Filterable = true, Sortable = true, Width = 100)]
+    public string Device { get; set; }
+
+
+}

src/Admin/ThingsGateway.Admin.Application/Enum/DataScopeEnum.cs

@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public enum DataScopeEnum
+{
+
+    /// <summary>
+    /// 仅自己
+    /// </summary>
+    SCOPE_SELF,
+
+    /// <summary>
+    /// 所有
+    /// </summary>
+    SCOPE_ALL,
+
+    /// <summary>
+    /// 仅所属组织
+    /// </summary>
+    SCOPE_ORG,
+
+    /// <summary>
+    /// 所属组织及以下
+    /// </summary>
+    SCOPE_ORG_CHILD,
+
+    /// <summary>
+    /// 自定义
+    /// </summary>
+    SCOPE_ORG_DEFINE,
+
+}

src/Admin/ThingsGateway.Admin.Application/Enum/DictTypeEnum.cs

@@ -8,16 +8,20 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Foundation;
+namespace ThingsGateway.Admin.Application;
 
 /// <summary>
-/// 能对适配器做配置的客户端
+/// 字典表类型
 /// </summary>
-public interface IAdapterObject
+public enum DictTypeEnum
 {
     /// <summary>
-    /// 设置数据处理适配器
+    /// 系统使用
     /// </summary>
-    /// <param name="adapter">适配器</param>
-    void SetDataHandlingAdapter(DataHandlingAdapter adapter);
+    System,
+
+    /// <summary>
+    /// 用户自定义
+    /// </summary>
+    Define,
 }

src/Admin/ThingsGateway.Admin.Application/Enum/LogCateGoryEnum.cs

@@ -0,0 +1,19 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public enum LogCateGoryEnum
+{
+    Login,
+    Logout,
+    Operate,
+    Exception
+}

src/Admin/ThingsGateway.Admin.Application/Enum/OrgEnum.cs

@@ -0,0 +1,17 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public enum OrgEnum
+{
+    DEPT,
+    COMPANY,
+}

src/Admin/ThingsGateway.Admin.Application/Enum/PositionCategoryEnum.cs

@@ -0,0 +1,18 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public enum PositionCategoryEnum
+{
+    HIGH,
+    MIDDLE,
+    LOW,
+}

src/Admin/ThingsGateway.Admin.Application/Enum/RelationCategoryEnum.cs

@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public enum RelationCategoryEnum
+{
+    UserHasRole,
+    UserHasResource,
+    UserHasPermission,
+    UserHasOpenApiPermission,
+    UserHasModule,
+    UserWorkbenchData,
+    RoleHasResource,
+    RoleHasPermission,
+    RoleHasOpenApiPermission,
+    RoleHasModule,
+}

src/Admin/ThingsGateway.Admin.Application/Enum/ResourceCategoryEnum.cs

@@ -0,0 +1,18 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public enum ResourceCategoryEnum
+{
+    Module,
+    Menu,
+    Button,
+}

src/Admin/ThingsGateway.Admin.Application/Enum/RoleCategoryEnum.cs

@@ -0,0 +1,17 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public enum RoleCategoryEnum
+{
+    Global = 0,
+    Org = 2,
+}

src/Admin/ThingsGateway.Admin.Application/Enum/TargetEnum.cs

@@ -0,0 +1,19 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public enum TargetEnum
+{
+    _self,
+    _blank,
+    _parent,
+    _top
+}

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

@@ -0,0 +1,55 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Http;
+
+using System.Net;
+using System.Text.Json;
+
+namespace Microsoft.AspNetCore.Builder;
+
+[ThingsGateway.DependencyInjection.SuppressSniffer]
+public static class ApplicationBuilderExtensions
+{
+    public static IApplicationBuilder UseBootstrapBlazor(this IApplicationBuilder builder)
+    {
+        // 获得客户端 IP 地址
+        builder.UseWhen(context => context.Request.Path.StartsWithSegments("/ip.axd"), app => app.Run(async context =>
+        {
+            var ip = "";
+            var headers = context.Request.Headers;
+            if (headers.TryGetValue("X-Forwarded-For", out var value))
+            {
+                var ips = new List<string>();
+                foreach (var xf in value)
+                {
+                    if (!string.IsNullOrEmpty(xf))
+                    {
+                        ips.Add(xf);
+                    }
+                }
+                ip = string.Join(";", ips);
+            }
+            else
+            {
+                ip = context.Connection.RemoteIpAddress.ToIPv4String();
+            }
+
+            context.Response.Headers.TryAdd("Content-Type", new Microsoft.Extensions.Primitives.StringValues("application/json; charset=utf-8"));
+            await context.Response.WriteAsync(JsonSerializer.Serialize(new { Id = context.TraceIdentifier, Ip = ip })).ConfigureAwait(false);
+        }));
+        return builder;
+    }
+    public static string ToIPv4String(this IPAddress? address)
+    {
+        var ipv4Address = (address ?? IPAddress.IPv6Loopback).ToString();
+        return ipv4Address.StartsWith("::ffff:") ? (address ?? IPAddress.IPv6Loopback).MapToIPv4().ToString() : ipv4Address;
+    }
+}

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

@@ -0,0 +1,88 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.StaticFiles;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Net.Http.Headers;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <inheritdoc/>
+[ThingsGateway.DependencyInjection.SuppressSniffer]
+public static class CacheExtensions
+{
+    private static int? _age;
+
+    private static List<string>? _files;
+
+    public static void ProcessCache(this StaticFileResponseContext context, IConfiguration configuration)
+    {
+        if (context.CanCache(configuration, out var age))
+        {
+            context.Context.Response.Headers[HeaderNames.CacheControl] = $"public, max-age={age}";
+        }
+    }
+
+    private static bool CanCache(this StaticFileResponseContext context, IConfiguration configuration, out int age)
+    {
+        var ret = false;
+        age = 0;
+
+        var files = configuration.GetFiles();
+        if (files.Any(i => context.CanCache(i)))
+        {
+            ret = true;
+            age = configuration.GetAge();
+        }
+        return ret;
+    }
+
+    private static bool CanCache(this StaticFileResponseContext context, string file)
+    {
+        var ext = Path.GetExtension(context.File.PhysicalPath) ?? "";
+        bool ret = file.Equals(ext, StringComparison.OrdinalIgnoreCase);
+        if (ret && ext.Equals(".js", StringComparison.OrdinalIgnoreCase))
+        {
+            // process javascript file
+            ret = false;
+            if (context.Context.Request.QueryString.HasValue)
+            {
+                var paras = QueryHelpers.ParseQuery(context.Context.Request.QueryString.Value);
+                ret = paras.ContainsKey("v");
+            }
+        }
+        return ret;
+    }
+
+    private static int GetAge(this IConfiguration configuration)
+    {
+        _age ??= GetAge();
+        return _age.Value;
+
+        int GetAge()
+        {
+            var cacheSection = configuration.GetSection("Cache-Control");
+            return cacheSection.GetValue<int>("Max-Age", 1000 * 60 * 10);
+        }
+    }
+
+    private static List<string> GetFiles(this IConfiguration configuration)
+    {
+        _files ??= GetFiles();
+        return _files;
+
+        List<string> GetFiles()
+        {
+            var cacheSection = configuration.GetSection("Cache-Control");
+            return cacheSection.GetSection("Files").Get<List<string>>() ?? new();
+        }
+    }
+}

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

@@ -0,0 +1,120 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+
+using Mapster;
+
+using MiniExcelLibs;
+using MiniExcelLibs.Attributes;
+using MiniExcelLibs.OpenXml;
+
+using System.Data;
+using System.Reflection;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 导出excel扩展
+/// </summary>
+[ThingsGateway.DependencyInjection.SuppressSniffer]
+public static class ExportExcelExtensions
+{
+    /// <summary>
+    /// 导出excel
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="data"></param>
+    /// <param name="sheetName"></param>
+    /// <returns></returns>
+    public static Dictionary<string, object> ExportExcel<T>(this IEnumerable<T>? data, string sheetName)
+    {
+        //总数据
+        Dictionary<string, object> sheets = new();
+        //通道页
+        List<Dictionary<string, object>> valveLogExports = new();
+
+        #region 列名称
+
+        var type = typeof(T);
+        var propertyInfos = type.GetRuntimeProperties().Where(a => a.GetCustomAttribute<IgnoreExcelAttribute>() == null)
+             .OrderBy(
+            a =>
+            {
+                var order = a.GetCustomAttribute<AutoGenerateColumnAttribute>()?.Order ?? int.MaxValue; ;
+                if (order < 0)
+                {
+                    order = order + 10000000;
+                }
+                else if (order == 0)
+                {
+                    order = 10000000;
+                }
+                return order;
+            }
+            )
+            ;
+
+        #endregion 列名称
+
+        foreach (var device in data)
+        {
+            Dictionary<string, object> valveLogExport = new();
+            foreach (var item in propertyInfos)
+            {
+                //描述
+                var desc = type.GetPropertyDisplayName(item.Name);
+                //数据源增加
+                valveLogExport.Add(desc ?? item.Name, item.GetValue(device)?.ToString());
+            }
+
+            //添加完整设备信息
+            valveLogExports.Add(valveLogExport);
+        }
+        //添加设备页
+        sheets.Add(sheetName, valveLogExports);
+        return sheets;
+    }
+
+
+    /// <summary>
+    /// 导出excel
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="stream"></param>
+    /// <param name="input"></param>
+    /// <param name="isDynamicExcelColumn"></param>
+    /// <returns></returns>
+    public static async Task ExportExcel<T>(this Stream stream, object input, bool isDynamicExcelColumn) where T : class
+    {
+        var config = new OpenXmlConfiguration();
+        if (isDynamicExcelColumn)
+        {
+            var type = typeof(T);
+            var data = type.GetRuntimeProperties();
+            List<DynamicExcelColumn> dynamicExcelColumns = new();
+            int index = 0;
+            foreach (var item in data)
+            {
+                var ignore = item.GetCustomAttribute<IgnoreExcelAttribute>() != null;
+                //描述
+                var desc = type.GetPropertyDisplayName(item.Name);
+                //数据源增加
+                dynamicExcelColumns.Add(new DynamicExcelColumn(item.Name) { Ignore = ignore, Index = index, Name = desc ?? item.Name, Width = 30 });
+                if (!ignore)
+                    index++;
+            }
+            config.DynamicColumns = dynamicExcelColumns.ToArray();
+        }
+        config.TableStyles = TableStyles.None;
+        await MiniExcel.SaveAsAsync(stream, input, configuration: config).ConfigureAwait(false);
+    }
+}

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

@@ -0,0 +1,44 @@
+// ------------------------------------------------------------------------------
+// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+// 此代码版权（除特别声明外的代码）归作者本人Diego所有
+// 源代码使用协议遵循本仓库的开源协议及附加协议
+// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+// 使用文档：https://thingsgateway.cn/
+// QQ群：605534569
+// ------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Components.Forms;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <inheritdoc/>
+[ThingsGateway.DependencyInjection.SuppressSniffer]
+public static class FileExtensions
+{
+    /// <summary>
+    /// 存储本地文件
+    /// </summary>
+    /// <param name="pPath">存储的第一层目录</param>
+    /// <param name="file"></param>
+    /// <returns>文件全路径</returns>
+    public static async Task<string> StorageLocal(this IBrowserFile file, string pPath = "imports")
+    {
+        string uploadFileFolder = App.WebHostEnvironment?.WebRootPath ?? "wwwroot"!;//赋值路径
+        var now = CommonUtils.GetSingleId();
+        var filePath = Path.Combine(uploadFileFolder, pPath);
+        if (!Directory.Exists(filePath))//如果不存在就创建文件夹
+            Directory.CreateDirectory(filePath);
+        //var fileSuffix = Path.GetExtension(file.Name).ToLower();// 文件后缀
+        var fileObjectName = $"{now}{file.Name}";//存储后的文件名
+        var fileName = Path.Combine(filePath, fileObjectName);//获取文件全路径
+        fileName = fileName.Replace("\\", "/");//格式化一系
+        //存储文件
+        using (var stream = File.Create(Path.Combine(filePath, fileObjectName)))
+        {
+            using var fs = file.OpenReadStream(1024 * 1024 * 500);
+            await fs.CopyToAsync(stream).ConfigureAwait(false);
+        }
+        return fileName;
+    }
+}

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

@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using SqlSugar;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <inheritdoc/>
+[ThingsGateway.DependencyInjection.SuppressSniffer]
+public static class QueryPageOptionsExtensions
+{
+
+    public static IEnumerable<T> GetData<T>(this IEnumerable<T> datas, QueryPageOptions option, out int totalCount, FilterKeyValueAction where = null)
+    {
+        totalCount = 0;
+        if (datas == null)
+            return new List<T>();
+        where ??= option.ToFilter();
+        if (where.HasFilters())
+        {
+            datas = datas.Where(where.GetFilterFunc<T>());//name asc模式
+        }
+
+        if (option.SortList.Count > 0)
+        {
+            datas = datas.Sort(option.SortList);//name asc模式
+        }
+        if (option.AdvancedSortList.Count > 0)
+        {
+            datas = datas.Sort(option.AdvancedSortList);//name asc模式
+        }
+        if (option.SortOrder != SortOrder.Unset && !option.SortName.IsNullOrWhiteSpace())
+        {
+            datas = datas.Sort(option.SortName, option.SortOrder);
+        }
+
+        totalCount = datas.Count();
+
+        if (option.IsPage)
+        {
+            datas = datas.Skip((option.PageIndex - 1) * option.PageItems).Take(option.PageItems);
+        }
+        else if (option.IsVirtualScroll)
+        {
+            datas = datas.Skip((option.StartIndex) * option.PageItems).Take(option.PageItems);
+        }
+        return datas;
+    }
+
+    /// <summary>
+    /// 根据查询条件返回sqlsugar ISugarQueryable
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static ISugarQueryable<T> GetQuery<T>(this SqlSugarClient db, QueryPageOptions option, ISugarQueryable<T>? query = null, FilterKeyValueAction where = null)
+    {
+        query ??= db.Queryable<T>();
+        where ??= option.ToFilter();
+
+        if (where.HasFilters())
+        {
+            query = query.Where(where.GetFilterLambda<T>());//name asc模式
+        }
+
+        foreach (var item in option.SortList)
+        {
+            query = query.OrderByIF(!string.IsNullOrEmpty(item), $"{item}");//name asc模式
+        }
+        foreach (var item in option.AdvancedSortList)
+        {
+            query = query.OrderByIF(!string.IsNullOrEmpty(item), $"{item}");//name asc模式
+        }
+        query = query.OrderByIF(option.SortOrder != SortOrder.Unset, $"{option.SortName} {option.SortOrder}");
+        return query;
+    }
+
+    /// <summary>
+    /// 根据查询条件返回QueryData
+    /// </summary>
+    public static QueryData<T> GetQueryData<T>(this IEnumerable<T> datas, QueryPageOptions option, FilterKeyValueAction where = null)
+    {
+        var ret = new QueryData<T>()
+        {
+            IsSorted = option.SortOrder != SortOrder.Unset,
+            IsFiltered = option.Filters.Count > 0,
+            IsAdvanceSearch = option.AdvanceSearches.Count > 0 || option.CustomerSearches.Count > 0,
+            IsSearch = option.Searches.Count > 0
+        };
+        var items = datas.GetData(option, out var totalCount, where);
+        ret.TotalCount = totalCount;
+        ret.Items = items.ToList();
+        return ret;
+    }
+}

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

@@ -0,0 +1,244 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using SqlSugar;
+
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <inheritdoc/>
+[ThingsGateway.DependencyInjection.SuppressSniffer]
+public static class SqlSugarExtensions
+{
+    /// <inheritdoc/>
+    public static ISugarQueryable<TEntity> ExportIgnoreColumns<TEntity>(this ISugarQueryable<TEntity> queryable)
+    {
+        return queryable.IgnoreColumns(
+               [
+           nameof(BaseEntity.Id),
+           nameof(BaseEntity.CreateTime),
+           nameof(BaseEntity.CreateUser),
+           nameof(BaseEntity.CreateUserId),
+           nameof(BaseDataEntity.CreateOrgId),
+           nameof(BaseEntity.ExtJson),
+           nameof(BaseEntity.IsDelete),
+           nameof(BaseEntity.UpdateTime),
+           nameof(BaseEntity.UpdateUser),
+           nameof(BaseEntity.UpdateUserId),
+                ]
+          );
+    }
+
+    /// <inheritdoc/>
+    public static SqlSugarPagedList<TEntity> ToPagedList<TEntity>(this ISugarQueryable<TEntity> queryable, int current,
+        int size)
+    {
+        var total = 0;
+        var records = queryable.ToPageList(current, size, ref total);
+        var pages = (int)Math.Ceiling(total / (double)size);
+        return new SqlSugarPagedList<TEntity>
+        {
+            Current = current,
+            Size = size,
+            Records = records,
+            Total = total,
+            Pages = pages,
+            HasNextPages = current < pages,
+            HasPrevPages = current - 1 > 0
+        };
+    }
+
+    /// <summary>
+    /// SqlSugar分页扩展,查询出结果后再转换实体类
+    /// </summary>
+    public static SqlSugarPagedList<TResult> ToPagedList<TEntity, TResult>(this ISugarQueryable<TEntity> queryable,
+        int current, int size)
+    {
+        var totalCount = 0;
+        var records = queryable.ToPageList(current, size, ref totalCount);
+        var totalPages = (int)Math.Ceiling(totalCount / (double)size);
+        return new SqlSugarPagedList<TResult>
+        {
+            Current = current,
+            Size = size,
+            Records = records.Cast<TResult>(),
+            Total = totalCount,
+            Pages = totalPages,
+            HasNextPages = current < totalPages,
+            HasPrevPages = current - 1 > 0
+        };
+    }
+
+    /// <summary>
+    /// SqlSugar分页扩展，查询前扩展转换实体类
+    /// </summary>
+    public static SqlSugarPagedList<TResult> ToPagedList<TEntity, TResult>(this ISugarQueryable<TEntity> queryable, int pageIndex,
+        int pageSize, Expression<Func<TEntity, TResult>> expression)
+    {
+        var totalCount = 0;
+        var items = queryable.ToPageList(pageIndex, pageSize, ref totalCount, expression);
+        var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
+        return new SqlSugarPagedList<TResult>
+        {
+            Current = pageIndex,
+            Size = pageSize,
+            Records = items,
+            Total = totalCount,
+            Pages = totalPages,
+            HasNextPages = pageIndex < totalPages,
+            HasPrevPages = pageIndex - 1 > 0
+        };
+    }
+
+    /// <summary>
+    /// 分页查询
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="list">数据列表</param>
+    /// <param name="basePageInput">参数</param>
+    /// <param name="isAll">不分页</param>
+    /// <returns>分页集合</returns>
+    public static SqlSugarPagedList<T> ToPagedList<T>(this IEnumerable<T> list, BasePageInput basePageInput = null, bool isAll = false)
+    {
+        if (isAll)
+        {
+            list = Sort(list, basePageInput);
+            var data = new SqlSugarPagedList<T>
+            {
+                Current = 1,
+                Size = list?.Count() ?? 0,
+                Records = list,
+                Total = list?.Count() ?? 0,
+                Pages = 1,
+                HasNextPages = false,
+                HasPrevPages = false
+            };
+            return data;
+        }
+
+        int _PageIndex = basePageInput.Current;
+        int _PageSize = basePageInput.Size;
+        var num = list.Count();
+        var pageConut = (double)num / _PageSize;
+        int PageConut = (int)Math.Ceiling(pageConut);
+        list = Sort(list, basePageInput);
+        if (PageConut >= _PageIndex)
+        {
+            list = list.Skip((_PageIndex - 1) * _PageSize).Take(_PageSize);
+        }
+        return new SqlSugarPagedList<T>
+        {
+            Current = _PageIndex,
+            Size = _PageSize,
+            Records = list,
+            Total = num,
+            Pages = PageConut,
+            HasNextPages = _PageIndex < PageConut,
+            HasPrevPages = _PageIndex - 1 > 0
+        };
+    }
+
+    /// <summary>
+    /// SqlSugar分页扩展，查询前扩展转换实体类
+    /// </summary>
+    public static async Task<SqlSugarPagedList<TEntity>> ToPagedListAsync<TEntity>(this ISugarQueryable<TEntity> queryable,
+        int current, int size)
+    {
+        RefAsync<int> totalCount = 0;
+        var records = await queryable.ToPageListAsync(current, size, totalCount).ConfigureAwait(false);
+        var totalPages = (int)Math.Ceiling(totalCount / (double)size);
+        return new SqlSugarPagedList<TEntity>
+        {
+            Current = current,
+            Size = size,
+            Records = records,
+            Total = (int)totalCount,
+            Pages = totalPages,
+            HasNextPages = current < totalPages,
+            HasPrevPages = current - 1 > 0
+        };
+    }
+
+    /// <summary>
+    /// SqlSugar分页扩展,查询出结果后再转换实体类
+    /// </summary>
+    public static async Task<SqlSugarPagedList<TResult>> ToPagedListAsync<TEntity, TResult>(this ISugarQueryable<TEntity> queryable,
+        int current, int size)
+    {
+        RefAsync<int> totalCount = 0;
+        var records = await queryable.ToPageListAsync(current, size, totalCount).ConfigureAwait(false);
+        var totalPages = (int)Math.Ceiling(totalCount / (double)size);
+        return new SqlSugarPagedList<TResult>
+        {
+            Current = current,
+            Size = size,
+            Records = records.Cast<TResult>(),
+            Total = (int)totalCount,
+            Pages = totalPages,
+            HasNextPages = current < totalPages,
+            HasPrevPages = current - 1 > 0
+        };
+    }
+
+    /// <summary>
+    /// SqlSugar分页扩展，查询前扩展转换实体类
+    /// </summary>
+    public static async Task<SqlSugarPagedList<TResult>> ToPagedListAsync<TEntity, TResult>(
+        this ISugarQueryable<TEntity> queryable, int pageIndex, int pageSize, Expression<Func<TEntity, TResult>> expression)
+    {
+        RefAsync<int> totalCount = 0;
+        var items = await queryable.ToPageListAsync(pageIndex, pageSize, totalCount, expression).ConfigureAwait(false);
+        var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
+        return new SqlSugarPagedList<TResult>
+        {
+            Current = pageIndex,
+            Size = pageSize,
+            Records = items,
+            Total = (int)totalCount,
+            Pages = totalPages,
+            HasNextPages = pageIndex < totalPages,
+            HasPrevPages = pageIndex - 1 > 0
+        };
+    }
+
+    /// <inheritdoc/>
+    public static async Task<bool> UpdateRangeAsync<T>(this SqlSugarClient db, List<T> updateObjs) where T : class, new()
+    {
+        return await db.Updateable(updateObjs).ExecuteCommandAsync().ConfigureAwait(false) > 0;
+    }
+
+    /// <inheritdoc/>
+    public static async Task<bool> UpdateSetColumnsTrueAsync<T>(this SqlSugarClient db, Expression<Func<T, T>> columns, Expression<Func<T, bool>> whereExpression) where T : class, new()
+    {
+        return await db.Updateable<T>().SetColumns(columns, appendColumnsByDataFilter: true).Where(whereExpression)
+            .ExecuteCommandAsync().ConfigureAwait(false) > 0;
+    }
+
+    private static IEnumerable<T> Sort<T>(this IEnumerable<T> list, BasePageInput basePageInput)
+    {
+        if (basePageInput != null && basePageInput.SortField != null)
+        {
+            for (int i = 0; i < basePageInput.SortField.Count; i++)
+            {
+                var pro = typeof(T).GetRuntimeProperty(basePageInput.SortField[i]);
+                if (pro != null)
+                {
+                    if (!basePageInput.SortDesc[i])
+                        list = list.OrderBy(a => pro.GetValue(a));
+                    else
+                        list = list.OrderByDescending(a => pro.GetValue(a));
+                }
+            }
+        }
+        return list;
+    }
+}

src/Admin/ThingsGateway.Admin.Application/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Rougamo />
+</Weavers>

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

@@ -0,0 +1,12 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+global using ThingsGateway;
+global using ThingsGateway.NewLife.Extension;

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

@@ -0,0 +1,60 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using ThingsGateway.NewLife;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <inheritdoc/>
+public class HardwareInfo
+{
+    /// <summary>
+    /// 当前磁盘信息
+    /// </summary>
+    public DriveInfo DriveInfo { get; set; }
+
+    /// <summary>
+    /// 硬件信息获取
+    /// </summary>
+    public MachineInfo? MachineInfo { get; set; }
+
+    /// <summary>
+    /// 主机环境
+    /// </summary>
+    public string Environment { get; set; }
+
+    /// <summary>
+    /// NET框架
+    /// </summary>
+    public string FrameworkDescription { get; set; }
+
+    /// <summary>
+    /// 系统架构
+    /// </summary>
+    public string OsArchitecture { get; set; }
+
+    /// <summary>
+    /// 唯一编码
+    /// </summary>
+    public string UUID { get; set; }
+
+    /// <summary>
+    /// 进程占用内存
+    /// </summary>
+    [AutoGenerateColumn(Ignore = true)]
+    public string WorkingSet { get; set; }
+
+    /// <summary>
+    /// 更新时间
+    /// </summary>
+    public string UpdateTime { get; set; }
+}

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

@@ -0,0 +1,146 @@
+// ------------------------------------------------------------------------------
+// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+// 此代码版权（除特别声明外的代码）归作者本人Diego所有
+// 源代码使用协议遵循本仓库的开源协议及附加协议
+// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+// 使用文档：https://thingsgateway.cn/
+// QQ群：605534569
+// ------------------------------------------------------------------------------
+
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+using System.Runtime.InteropServices;
+
+using ThingsGateway.Extension;
+using ThingsGateway.NewLife;
+using ThingsGateway.NewLife.Threading;
+using ThingsGateway.Schedule;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 获取硬件信息作业任务
+/// </summary>
+[JobDetail("hardware_log", Description = "获取硬件信息", GroupName = "Hardware", Concurrent = false)]
+[PeriodSeconds(30, TriggerId = "trigger_hardware", Description = "获取硬件信息", RunOnStart = true)]
+public class HardwareJob : IJob, IHardwareJob
+{
+    private readonly ILogger _logger;
+    private readonly IStringLocalizer _localizer;
+
+    /// <inheritdoc/>
+    public HardwareJob(ILogger<HardwareJob> logger, IStringLocalizer<HardwareJob> localizer, IOptions<HardwareInfoOptions> options)
+    {
+        _logger = logger;
+        _localizer = localizer;
+        HardwareInfoOptions = options.Value;
+    }
+    #region 属性
+
+    /// <summary>
+    /// 运行信息获取
+    /// </summary>
+    public HardwareInfo HardwareInfo { get; } = new();
+
+    /// <inheritdoc/>
+    public HardwareInfoOptions HardwareInfoOptions { get; private set; }
+
+    #endregion 属性
+
+    /// <inheritdoc/>
+    public async Task<List<HistoryHardwareInfo>> GetHistoryHardwareInfos()
+    {
+        using var db = DbContext.Db.GetConnectionScopeWithAttr<HistoryHardwareInfo>().CopyNew();
+        return await db.Queryable<HistoryHardwareInfo>().ToListAsync().ConfigureAwait(false);
+    }
+
+    private bool error = false;
+    private DateTime hisInsertTime = default;
+
+    public async Task ExecuteAsync(JobExecutingContext context, CancellationToken stoppingToken)
+    {
+        if (HardwareInfoOptions.Enable)
+        {
+            try
+            {
+                if (HardwareInfo.MachineInfo == null)
+                {
+                    await MachineInfo.RegisterAsync().ConfigureAwait(false);
+                    HardwareInfo.MachineInfo = MachineInfo.Current;
+
+                    string currentPath = Directory.GetCurrentDirectory();
+                    DriveInfo drive = new(Path.GetPathRoot(currentPath));
+
+                    HardwareInfoOptions.DaysAgo = Math.Min(Math.Max(HardwareInfoOptions.DaysAgo, 1), 7);
+                    if (HardwareInfoOptions.HistoryInterval < 60000) HardwareInfoOptions.HistoryInterval = 60000;
+                    HardwareInfo.DriveInfo = drive;
+                    HardwareInfo.OsArchitecture = Environment.OSVersion.Platform.ToString() + " " + RuntimeInformation.OSArchitecture.ToString(); // 系统架构
+                    HardwareInfo.FrameworkDescription = RuntimeInformation.FrameworkDescription; // NET框架
+                    HardwareInfo.Environment = App.HostEnvironment.IsDevelopment() ? "Development" : "Production";
+                    HardwareInfo.UUID = HardwareInfo.MachineInfo.UUID;
+
+                    HardwareInfo.UpdateTime = TimerX.Now.ToDefaultDateTimeFormat();
+
+                }
+            }
+            catch
+            {
+            }
+            try
+            {
+                HardwareInfo.MachineInfo.Refresh();
+                HardwareInfo.UpdateTime = TimerX.Now.ToDefaultDateTimeFormat();
+                HardwareInfo.WorkingSet = (Environment.WorkingSet / 1024.0 / 1024.0).ToString("F2");
+                error = false;
+            }
+            catch (Exception ex)
+            {
+                if (!error)
+                    _logger.LogWarning(ex, _localizer["GetHardwareInfoFail"]);
+                error = true;
+            }
+
+            try
+            {
+                if (HardwareInfoOptions.Enable)
+                {
+                    if (DateTime.Now > hisInsertTime.Add(TimeSpan.FromMilliseconds(HardwareInfoOptions.HistoryInterval)))
+                    {
+                        hisInsertTime = DateTime.Now;
+                        using var db = DbContext.Db.GetConnectionScopeWithAttr<HistoryHardwareInfo>().CopyNew();
+                        {
+                            var his = new HistoryHardwareInfo()
+                            {
+                                Date = TimerX.Now,
+                                DriveUsage = (100 - (HardwareInfo.DriveInfo.TotalFreeSpace * 100.00 / HardwareInfo.DriveInfo.TotalSize)).ToString("F2"),
+                                Battery = (HardwareInfo.MachineInfo.Battery * 100).ToString("F2"),
+                                MemoryUsage = (HardwareInfo.WorkingSet),
+                                CpuUsage = (HardwareInfo.MachineInfo.CpuRate * 100).ToString("F2"),
+                                Temperature = (HardwareInfo.MachineInfo.Temperature).ToString("F2"),
+                            };
+                            await db.Insertable(his).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
+                        }
+                        var sevenDaysAgo = TimerX.Now.AddDays(-HardwareInfoOptions.DaysAgo);
+                        //删除特定信息
+                        await db.Deleteable<HistoryHardwareInfo>(a => a.Date <= sevenDaysAgo).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
+                    }
+                }
+                error = false;
+            }
+            catch (OperationCanceledException)
+            {
+            }
+            catch (Exception ex)
+            {
+                if (!error)
+                    _logger.LogWarning(ex, _localizer["GetHardwareInfoFail"]);
+                error = true;
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using SqlSugar;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <inheritdoc/>
+[SugarTable("his_hardwareinfo", TableDescription = "硬件信息历史表")]
+[Tenant(SqlSugarConst.DB_HardwareInfo)]
+public class HistoryHardwareInfo
+{
+    /// <inheritdoc/>
+    [SugarColumn(ColumnDescription = "磁盘使用率")]
+    public string DriveUsage { get; set; }
+
+    /// <inheritdoc/>
+    [SugarColumn(ColumnDescription = "内存")]
+    public string MemoryUsage { get; set; }
+
+    /// <inheritdoc/>
+    [SugarColumn(ColumnDescription = "CPU使用率")]
+    public string CpuUsage { get; set; }
+
+    /// <inheritdoc/>
+    [SugarColumn(ColumnDescription = "温度")]
+    public string Temperature { get; set; }
+
+    /// <inheritdoc/>
+    [SugarColumn(ColumnDescription = "电池")]
+    public string Battery { get; set; }
+
+    /// <inheritdoc/>
+    [SugarColumn(ColumnDescription = "时间")]
+    public DateTime Date { get; set; }
+}

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

@@ -0,0 +1,18 @@
+// ------------------------------------------------------------------------------
+// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+// 此代码版权（除特别声明外的代码）归作者本人Diego所有
+// 源代码使用协议遵循本仓库的开源协议及附加协议
+// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+// 使用文档：https://thingsgateway.cn/
+// QQ群：605534569
+// ------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public interface IHardwareJob
+{
+    HardwareInfo HardwareInfo { get; }
+    HardwareInfoOptions HardwareInfoOptions { get; }
+    Task<List<HistoryHardwareInfo>> GetHistoryHardwareInfos();
+}

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

@@ -0,0 +1,76 @@
+// ------------------------------------------------------------------------------
+// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+// 此代码版权（除特别声明外的代码）归作者本人Diego所有
+// 源代码使用协议遵循本仓库的开源协议及附加协议
+// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+// 使用文档：https://thingsgateway.cn/
+// QQ群：605534569
+// ------------------------------------------------------------------------------
+
+using ThingsGateway.Schedule;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 作业持久化（数据库）
+/// </summary>
+public class JobPersistence : IJobPersistence
+{
+
+    /// <summary>
+    /// 作业调度服务启动时
+    /// </summary>
+    /// <param name="stoppingToken"></param>
+    /// <returns></returns>
+    /// <exception cref="NotSupportedException"></exception>
+    public async Task<IEnumerable<SchedulerBuilder>> PreloadAsync(CancellationToken stoppingToken)
+    {
+        await Task.CompletedTask.ConfigureAwait(false);
+        // 获取所有定义的作业
+        var allJobs = App.EffectiveTypes.ScanToBuilders().ToList();
+        return allJobs;
+    }
+
+    /// <summary>
+    /// 作业计划初始化通知
+    /// </summary>
+    /// <param name="builder"></param>
+    /// <param name="stoppingToken"></param>
+    /// <returns></returns>
+    public Task<SchedulerBuilder> OnLoadingAsync(SchedulerBuilder builder, CancellationToken stoppingToken)
+    {
+        return Task.FromResult(builder);
+    }
+
+    /// <summary>
+    /// 作业计划Scheduler的JobDetail变化时
+    /// </summary>
+    /// <param name="context"></param>
+    /// <returns></returns>
+    public async Task OnChangedAsync(PersistenceContext context)
+    {
+        await Task.CompletedTask.ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// 作业计划Scheduler的触发器Trigger变化时
+    /// </summary>
+    /// <param name="context"></param>
+    /// <returns></returns>
+    public async Task OnTriggerChangedAsync(PersistenceTriggerContext context)
+    {
+        await Task.CompletedTask.ConfigureAwait(false);
+
+    }
+
+    /// <summary>
+    /// 作业触发器运行记录
+    /// </summary>
+    /// <param name="context"></param>
+    /// <returns></returns>
+    public async Task OnExecutionRecordAsync(PersistenceExecutionRecordContext context)
+    {
+        await Task.CompletedTask.ConfigureAwait(false);
+    }
+}

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

@@ -0,0 +1,34 @@
+// ------------------------------------------------------------------------------
+// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+// 此代码版权（除特别声明外的代码）归作者本人Diego所有
+// 源代码使用协议遵循本仓库的开源协议及附加协议
+// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+// 使用文档：https://thingsgateway.cn/
+// QQ群：605534569
+// ------------------------------------------------------------------------------
+
+using ThingsGateway.Schedule;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 清理日志作业任务
+/// </summary>
+[JobDetail("job_log", Description = "清理操作日志", GroupName = "Log", Concurrent = false)]
+[Daily(TriggerId = "trigger_log", Description = "清理操作日志", RunOnStart = true)]
+public class LogJob : IJob
+{
+    public async Task ExecuteAsync(JobExecutingContext context, CancellationToken stoppingToken)
+    {
+        var daysAgo = App.GetOptions<AdminLogOptions>()?.OperateLogDaysAgo ?? 7;
+        await LogJob.DeleteSysOperateLog(daysAgo, stoppingToken).ConfigureAwait(false);
+    }
+
+    private static async Task DeleteSysOperateLog(int daysAgo, CancellationToken stoppingToken)
+    {
+        using var db = DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
+        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

@@ -0,0 +1,466 @@
+{
+  "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",
+    "SortCode": "SortCode",
+    "CreateTime": "CreateTime",
+    "UpdateTime": "UpdateTime",
+    "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",
+    "SortCode": "Sort",
+    "CreateTime": "CreateTime",
+    "UpdateTime": "UpdateTime",
+    "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"
+  },
+  "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",
+    "SortCode": "Sort",
+    "CreateTime": "CreateTime",
+    "UpdateTime": "UpdateTime",
+    "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.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",
+    "SortCode": "SortCode",
+    "CreateTime": "CreateTime",
+    "UpdateTime": "UpdateTime",
+    "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",
+    "SortCode": "SortCode",
+    "CreateTime": "CreateTime",
+    "UpdateTime": "UpdateTime",
+    "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",
+    "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"
+  },
+  "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": {
+    "Account": "Account",
+    "OrgId": "Org"
+  },
+  "ThingsGateway.Admin.Application.ResourceTableSearchModel": {
+    "Module": "Module",
+    "Href": "Path",
+    "Title": "Title"
+  },
+  "ThingsGateway.Admin.Application.WorkbenchInfo": {
+    "Razor": "Homepage",
+    "Shortcuts": "Shortcuts"
+  },
+  "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",
+    "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",
+    "Code": "Code",
+    "Remark": "Remark",
+    "SortCode": "Sort",
+    "CreateTime": "CreateTime",
+    "UpdateTime": "UpdateTime",
+    "DemoCanotUpdateWebsitePolicy": "DEMO environment does not allow modifying website settings",
+    "DictDup": "Duplicate configuration exists, category {0}, name {1}"
+  },
+
+  "ThingsGateway.Admin.Application.SysOperateLog": {
+    "ClassName": "ClassName",
+    "ExeMessage": "ExeMessage",
+    "MethodName": "MethodName",
+    "ParamJson": "ParamJson",
+    "ReqMethod": "RequestMethod",
+    "ReqUrl": "RequestUrl",
+    "ResultJson": "ResultJson",
+    "Category": "Category",
+    "ExeStatus": "ExeStatus",
+    "Name": "Name",
+    "OpAccount": "OpAccount",
+    "OpBrowser": "OpBrowser",
+    "OpIp": "OpIp",
+    "OpOs": "OpOs",
+    "OpTime": "OpTime",
+    "VerificatId": "VerificatId"
+
+  },
+  "ThingsGateway.Admin.Application.OperateLogPageInput": {
+    "SearchDate": "SearchDate",
+    "Account": "Account",
+    "Category": "Category"
+  },
+  "ThingsGateway.Admin.Application.LoginInput": {
+    "Account": "Account",
+    "Password": "Password",
+    "Account.Required": "{0} is required",
+    "Password.Required": "{0} is required"
+  },
+  "ThingsGateway.Admin.Application.LogoutInput": {
+    "VerificatId.Required": "{0} is required"
+  },
+  "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": {
+    "Module": "Module",
+    "Menu": "Menu",
+    "Button": "Button"
+  },
+
+  "ThingsGateway.Admin.Application.TargetEnum": {
+    "_self": "Current window",
+    "_blank": "New window",
+    "_parent": "Parent window",
+    "_top": "Top window"
+  },
+  "ThingsGateway.Admin.Application.DictTypeEnum": {
+    "System": "System",
+    "Define": "Business"
+  },
+
+  "ThingsGateway.Admin.Application.LogCateGoryEnum": {
+    "Login": "Login",
+    "Logout": "Logout",
+    "Operate": "Operation",
+    "Exception": "Exception"
+  },
+
+  "ThingsGateway.Admin.Application.LogEnum": {
+    "SUCCESS": "Success",
+    "FAIL": "Fail"
+  }
+}

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

@@ -0,0 +1,469 @@
+{
+  "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": "最新登录地点",
+      "SortCode": "排序",
+      "CreateTime": "创建时间",
+      "UpdateTime": "更新时间",
+      "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": "分类",
+      "SortCode": "排序",
+      "Global": "全局",
+      "Status": "状态",
+      "OrgId": "机构",
+      "CreateTime": "创建时间",
+      "UpdateTime": "更新时间",
+
+      "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": "自定义"
+    },
+    "ThingsGateway.Admin.Application.DefaultDataScope": {
+      "ScopeCategory": "数据范围",
+      "ScopeDefineOrgIdList": "自定义列表"
+    },
+    "ThingsGateway.Admin.Application.SysResource": {
+      "Title": "标题",
+      "Module": "模块",
+      "Title.Required": "{0} 是必填项",
+      "Href.Required": "{0} 是必填项",
+      "Icon": "图标",
+      "Href": "路径",
+      "Code": "编码",
+      "Category": "分类",
+      "Target": "跳转类型",
+      "NavLinkMatch": "匹配类型",
+      "SortCode": "排序",
+      "ParentId": "上级菜单",
+      "CreateTime": "创建时间",
+      "UpdateTime": "更新时间",
+      "ResourceDup": "存在重复的名称 {0}",
+      "ResourceParentChoiceSelf": "父级不能选择自己",
+      "ResourceParentNull": "父级不存在 {0}",
+      "NotFoundResource": "系统异常，没找到该菜单",
+      "ModuleIdDiff": "模块与上级菜单不一致",
+      "CanotDeleteSystemResource": "不可删除系统资源 {0}",
+      "ResourceMenuHrefNotNull": "菜单的路径不能为空"
+    },
+
+    "ThingsGateway.Admin.Application.SysOrgCopyInput": {
+      "TargetId": "目标机构",
+      "ContainsChild": "包含下级",
+      "ContainsPosition": "包含职位"
+    },
+    "ThingsGateway.Admin.Application.SysPosition": {
+      "Category.Required": "{0} 是必填项",
+      "Name.Required": "{0} 是必填项",
+      "Code.Required": "{0} 是必填项",
+      "OrgId.MinValue": "{0} 是必填项",
+      "Category": "分类",
+      "Name": "名称",
+      "Code": "代码",
+      "Status": "状态",
+      "OrgId": "机构",
+      "Remark": "备注",
+      "SortCode": "排序",
+      "CreateTime": "创建时间",
+      "UpdateTime": "更新时间",
+      "Dup": "存在重复的岗位 分类 {0} 名称 {1}",
+      "CodeDup": "存在重复的编码 {0}",
+      "NameDup": "存在重复的名称 {0}",
+      "CanotContainsSelf": "不可包含自己",
+      "TargetNameDup": "目标节点存在重复的名称 {0}",
+      "ParentChoiceSelf": "父级不能选择自己",
+      "ParentNull": "父级不存在 {0}",
+      "DeleteUserFirst": "请先删除职位下的用户"
+
+    },
+
+    "ThingsGateway.Admin.Application.SysOrg": {
+      "Category.Required": "{0} 是必填项",
+      "Name.Required": "{0} 是必填项",
+      "Code.Required": "{0} 是必填项",
+      "Category": "分类",
+      "Name": "名称",
+      "Code": "代码",
+      "Status": "状态",
+      "ParentId": "上级机构",
+      "Names": "机构全称",
+      "Remark": "备注",
+      "DirectorId": "主管",
+      "SortCode": "排序",
+      "CreateTime": "创建时间",
+      "UpdateTime": "更新时间",
+      "Dup": "存在重复的机构 分类 {0} 名称 {1}",
+      "CodeDup": "存在重复的编码 {0}",
+      "NameDup": "存在重复的名称 {0}",
+      "CanotContainsSelf": "不可包含自己",
+      "TargetNameDup": "目标节点存在重复的名称 {0}",
+      "ParentChoiceSelf": "父级不能选择自己",
+      "ParentNull": "父级不存在 {0}",
+      "DeleteUserFirst": "请先删除机构下的用户",
+      "DeleteRoleFirst": "请先删除机构下的角色",
+      "DeletePositionFirst": "请先删除机构下的职位",
+      "RootOrg": "无法创建顶层机构"
+    },
+    "ThingsGateway.Admin.Application.OrgEnum": {
+      "COMPANY": "公司",
+      "DEPT": "部门"
+    },
+    "ThingsGateway.Admin.Application.PositionCategoryEnum": {
+      "HIGH": "高层",
+      "MIDDLE": "中层",
+      "LOW": "低层"
+    },
+
+    //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.ResourceTableSearchModel": {
+      "Module": "模块",
+      "Href": "路径",
+      "Title": "标题"
+    },
+    "ThingsGateway.Admin.Application.WorkbenchInfo": {
+      "Razor": "主页",
+      "Shortcuts": "快捷方式"
+    },
+    "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": "最新登录时间",
+      "VerificatCount": "令牌数量"
+    },
+
+    "ThingsGateway.Admin.Application.SysDict": {
+      "Category.Required": "{0} 是必填项",
+      "Name.Required": "{0} 是必填项",
+      "Code.Required": "{0} 是必填项",
+      "Category": "分类",
+      "Name": "名称",
+      "Code": "代码",
+      "Remark": "备注",
+      "SortCode": "排序",
+      "CreateTime": "创建时间",
+      "UpdateTime": "更新时间",
+      "DictDup": "存在重复的配置 分类 {0} 名称 {1}",
+      "DemoCanotUpdateWebsitePolicy": "DEMO环境不允许修改网站设置"
+    },
+
+
+    "ThingsGateway.Admin.Application.SysOperateLog": {
+      "ClassName": "类名",
+      "ExeMessage": "具体消息",
+      "MethodName": "方法名称",
+      "ParamJson": "请求参数",
+      "ReqMethod": "请求方式",
+      "ReqUrl": "请求地址",
+      "ResultJson": "返回结果",
+      "Category": "日志分类",
+      "ExeStatus": "执行状态",
+      "Name": "日志名称",
+      "OpAccount": "账号",
+      "OpBrowser": "浏览器",
+      "OpIp": "ip",
+      "OpOs": "系统",
+      "OpTime": "操作时间",
+      "VerificatId": "验证Id"
+
+    },
+    "ThingsGateway.Admin.Application.OperateLogPageInput": {
+      "SearchDate": "时间范围",
+      "Account": "操作账号",
+      "Category": "分类"
+    },
+    "ThingsGateway.Admin.Application.LoginInput": {
+      "Account": "登录账号",
+      "Password": "登录密码",
+      "Account.Required": "{0} 是必填项",
+      "Password.Required": "{0} 是必填项"
+    },
+    "ThingsGateway.Admin.Application.LogoutInput": {
+      "VerificatId.Required": "{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": {
+      "Module": "模块",
+      "Menu": "菜单",
+      "Button": "按钮"
+    },
+
+    "ThingsGateway.Admin.Application.TargetEnum": {
+      "_self": "本窗口",
+      "_blank": "新窗口",
+      "_parent": "父级窗口",
+      "_top": "顶级窗口"
+    },
+    "ThingsGateway.Admin.Application.DictTypeEnum": {
+      "System": "系统配置",
+      "Define": "业务配置"
+    },
+
+    "ThingsGateway.Admin.Application.LogCateGoryEnum": {
+      "Login": "登录",
+      "Logout": "注销",
+      "Operate": "操作",
+      "Exception": "异常"
+    },
+
+    "ThingsGateway.Admin.Application.LogEnum": {
+      "SUCCESS": "成功",
+      "FAIL": "失败"
+    }
+  }

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

@@ -0,0 +1,214 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using SqlSugar;
+
+using System.Collections.Concurrent;
+
+using ThingsGateway.Extension;
+using ThingsGateway.FriendlyException;
+using ThingsGateway.Logging;
+using ThingsGateway.NewLife.Json.Extension;
+using ThingsGateway.Razor;
+
+using UAParser;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 数据库写入器
+/// </summary>
+public class DatabaseLoggingWriter : IDatabaseLoggingWriter
+{
+    /// <summary>
+    /// 日志消息队列（线程安全）
+    /// </summary>
+    private readonly ConcurrentQueue<SysOperateLog> _operateLogMessageQueue = new();
+
+    private SqlSugarClient SqlSugarClient;
+
+    /// <summary>
+    /// 此方法只会写入经由MVCFilter捕捉的方法日志，对于BlazorServer的内部操作，由<see cref="OperDescAttribute"/>执行
+    /// </summary>
+    /// <param name="logMsg"></param>
+    /// <param name="flush"></param>
+    public async Task WriteAsync(LogMessage logMsg, bool flush)
+    {
+        //获取请求json字符串
+        var jsonString = logMsg.Context.Get("loggingMonitor").ToString();
+        //转成实体
+        var loggingMonitor = jsonString.FromJsonNetString<LoggingMonitorJson>();
+        //日志时间赋值
+        loggingMonitor.LogDateTime = logMsg.LogDateTime;
+        // loggingMonitor.ReturnInformation.Value
+        //验证失败不记录日志
+        bool save = false;
+        if (loggingMonitor.Validation == null)
+        {
+            var operation = logMsg.Context.Get(LoggingConst.Operation).ToString();//获取操作名称
+            var client = (ClientInfo)logMsg.Context.Get(LoggingConst.Client);//获取客户端信息
+            var path = logMsg.Context.Get(LoggingConst.Path).ToString();//获取操作名称
+            var method = logMsg.Context.Get(LoggingConst.Method).ToString();//获取方法
+            //表示访问日志
+            if (path == "/api/auth/login" || path == "/api/auth/logout")
+            {
+                //如果没有异常信息
+                if (loggingMonitor.Exception == null)
+                {
+                    save = await CreateVisitLog(operation, path, loggingMonitor, client, flush).ConfigureAwait(false);//添加到访问日志
+                }
+                else
+                {
+                    //添加到异常日志
+                    save = await CreateOperationLog(operation, path, loggingMonitor, client, flush).ConfigureAwait(false);
+                }
+            }
+            else
+            {
+                //只有定义了Title的POST方法才记录日志
+                if (!operation.IsNullOrWhiteSpace() && method == "POST")
+                {
+                    //添加到操作日志
+                    save = await CreateOperationLog(operation, path, loggingMonitor, client, flush).ConfigureAwait(false);
+                }
+            }
+        }
+        if (save)
+        {
+            await Task.Delay(1000).ConfigureAwait(false);
+        }
+    }
+
+    /// <summary>
+    /// 创建操作日志
+    /// </summary>
+    /// <param name="operation">操作名称</param>
+    /// <param name="path">请求地址</param>
+    /// <param name="loggingMonitor">loggingMonitor</param>
+    /// <param name="clientInfo">客户端信息</param>
+    /// <param name="flush"></param>
+    /// <returns></returns>
+    private async Task<bool> CreateOperationLog(string operation, string path, LoggingMonitorJson loggingMonitor, ClientInfo clientInfo, bool flush)
+    {
+        //账号
+        var opAccount = loggingMonitor.AuthorizationClaims?.Where(it => it.Type == ClaimConst.Account).Select(it => it.Value).FirstOrDefault();
+
+        //获取参数json字符串，
+        var paramJson = loggingMonitor.Parameters == null || loggingMonitor.Parameters.Count == 0 ? null : loggingMonitor.Parameters[0].Value.ToJsonNetString();
+
+        //获取结果json字符串
+        var resultJson = string.Empty;
+        if (loggingMonitor.ReturnInformation != null)//如果有返回值
+        {
+            if (loggingMonitor.ReturnInformation.Value != null)//如果返回值不为空
+            {
+                resultJson = loggingMonitor.ReturnInformation.Value.ToJsonNetString();
+            }
+        }
+
+        //操作日志表实体
+        var sysLogOperate = new SysOperateLog
+        {
+            Name = operation,
+            Category = LogCateGoryEnum.Operate,
+            ExeStatus = true,
+            OpIp = loggingMonitor.RemoteIPv4,
+            OpBrowser = clientInfo?.UA?.Family + clientInfo?.UA?.Major,
+            OpOs = clientInfo?.OS?.Family + clientInfo?.OS?.Major,
+            OpTime = loggingMonitor.LogDateTime.LocalDateTime,
+            OpAccount = opAccount,
+            ReqMethod = loggingMonitor.HttpMethod,
+            ReqUrl = path,
+            ResultJson = resultJson,
+            ClassName = loggingMonitor.DisplayName,
+            MethodName = loggingMonitor.ActionName,
+            ParamJson = paramJson,
+            VerificatId = UserManager.VerificatId,
+        };
+        //如果异常不为空
+        if (loggingMonitor.Exception != null)
+        {
+            sysLogOperate.Category = LogCateGoryEnum.Exception;//操作类型为异常
+            sysLogOperate.ExeStatus = false;//操作状态为失败
+
+            if (loggingMonitor.Exception.Type == typeof(AppFriendlyException).ToString())
+                sysLogOperate.ExeMessage = loggingMonitor?.Exception.Message;
+            else
+                sysLogOperate.ExeMessage = $"{loggingMonitor.Exception.Type}:{loggingMonitor.Exception.Message}{Environment.NewLine}{loggingMonitor.Exception.StackTrace}";
+        }
+
+        _operateLogMessageQueue.Enqueue(sysLogOperate);
+
+        if (flush)
+        {
+            SqlSugarClient ??= DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
+            await SqlSugarClient.InsertableWithAttr(_operateLogMessageQueue.ToListWithDequeue()).ExecuteCommandAsync().ConfigureAwait(false);//入库
+            return true;
+        }
+        return false;
+    }
+
+    /// <summary>
+    /// 创建访问日志
+    /// </summary>
+    /// <param name="operation">访问类型</param>
+    /// <param name="path"></param>
+    /// <param name="loggingMonitor">loggingMonitor</param>
+    /// <param name="clientInfo">客户端信息</param>
+    /// <param name="flush"></param>
+    private async Task<bool> CreateVisitLog(string operation, string path, LoggingMonitorJson loggingMonitor, ClientInfo clientInfo, bool flush)
+    {
+        long verificatId = 0;//验证Id
+        var opAccount = "";//用户账号
+        if (path == "/api/auth/login")
+        {
+            //如果是登录，用户信息就从返回值里拿
+            var result = loggingMonitor.ReturnInformation?.Value?.ToJsonNetString();//返回值转json
+            var userInfo = result.FromJsonNetString<UnifyResult<LoginOutput>>();//格式化成user表
+            opAccount = userInfo.Data.Account;//赋值账号
+            verificatId = userInfo.Data.VerificatId;
+        }
+        else
+        {
+            //如果是登录出，用户信息就从AuthorizationClaims里拿
+            opAccount = loggingMonitor.AuthorizationClaims.Where(it => it.Type == ClaimConst.Account).Select(it => it.Value).FirstOrDefault();
+            verificatId = loggingMonitor.AuthorizationClaims.Where(it => it.Type == ClaimConst.VerificatId).Select(it => it.Value).FirstOrDefault().ToLong();
+        }
+        //日志表实体
+        var sysLogVisit = new SysOperateLog
+        {
+            Name = operation,
+            Category = path == "/api/auth/login" ? LogCateGoryEnum.Login : LogCateGoryEnum.Logout,
+            ExeStatus = true,
+            OpIp = loggingMonitor.RemoteIPv4,
+            OpBrowser = clientInfo?.UA?.Family + clientInfo?.UA?.Major,
+            OpOs = clientInfo?.OS?.Family + clientInfo?.OS?.Major,
+            OpTime = loggingMonitor.LogDateTime.LocalDateTime,
+            VerificatId = verificatId,
+            OpAccount = opAccount,
+
+            ReqMethod = loggingMonitor.HttpMethod,
+            ReqUrl = path,
+            ResultJson = loggingMonitor.ReturnInformation?.Value?.ToJsonNetString(),
+            ClassName = loggingMonitor.DisplayName,
+            MethodName = loggingMonitor.ActionName,
+            ParamJson = loggingMonitor.Parameters?.ToJsonNetString(),
+        };
+        _operateLogMessageQueue.Enqueue(sysLogVisit);
+
+        if (flush)
+        {
+            SqlSugarClient ??= DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
+            await SqlSugarClient.InsertableWithAttr(_operateLogMessageQueue.ToListWithDequeue()).ExecuteCommandAsync().ConfigureAwait(false);//入库
+            return true;
+        }
+        return false;
+    }
+}

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

@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 日志常量
+/// </summary>
+public class LoggingConst
+{
+    /// <summary>
+    /// 分类
+    /// </summary>
+    public const string CateGory = "CateGory";
+
+    /// <summary>
+    /// 客户端信息
+    /// </summary>
+    public const string Client = "Client";
+
+    /// <summary>
+    /// 请求方法：POST/GET
+    /// </summary>
+    public const string Method = "Method";
+
+    /// <summary>
+    /// 操作名称
+    /// </summary>
+    public const string Operation = "Operation";
+
+    /// <summary>
+    /// 请求地址
+    /// </summary>
+    public const string Path = "Path";
+}

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

@@ -0,0 +1,187 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 认证信息
+/// </summary>
+public class AuthorizationClaims
+{
+    /// <summary>
+    /// 类型
+    /// </summary>
+    public string Type { get; set; }
+
+    /// <summary>
+    /// 值
+    /// </summary>
+    public string Value { get; set; }
+}
+
+/// <summary>
+/// 异常信息
+/// </summary>
+public class LogException
+{
+    /// <summary>
+    /// 异常内容
+    /// </summary>
+    public string Message { get; set; }
+
+    /// <summary>
+    /// 堆栈信息
+    /// </summary>
+    public string StackTrace { get; set; }
+
+    /// <summary>
+    /// 异常类型
+    /// </summary>
+    public string Type { get; set; }
+}
+
+/// <summary>
+/// 请求信息格式化
+/// </summary>
+public class LoggingMonitorJson
+{
+    /// <summary>
+    /// 方法名称
+    /// </summary>
+    public string ActionName { get; set; }
+
+    /// <summary>
+    /// 认证信息
+    /// </summary>
+    public List<AuthorizationClaims> AuthorizationClaims { get; set; }
+
+    /// <summary>
+    /// 控制器名
+    /// </summary>
+    public string ControllerName { get; set; }
+
+    /// <summary>
+    /// 类名称
+    /// </summary>
+    public string DisplayName { get; set; }
+
+    /// <summary>
+    /// 环境
+    /// </summary>
+    public string Environment { get; set; }
+
+    /// <summary>
+    /// 异常信息
+    /// </summary>
+    public LogException Exception { get; set; }
+
+    /// <summary>
+    /// 请求方法
+    /// </summary>
+    public string HttpMethod { get; set; }
+
+    /// <summary>
+    /// 服务端
+    /// </summary>
+    public string LocalIPv4 { get; set; }
+
+    /// <summary>
+    /// 日志时间
+    /// </summary>
+    public DateTimeOffset LogDateTime { get; set; }
+
+    /// <summary>
+    /// 系统架构
+    /// </summary>
+    public string OsArchitecture { get; set; }
+
+    /// <summary>
+    /// 系统名称
+    /// </summary>
+    public string OsDescription { get; set; }
+
+    /// <summary>
+    /// 参数列表
+    /// </summary>
+    public List<Parameters> Parameters { get; set; }
+
+    /// <summary>
+    /// 客户端IPV4地址
+    /// </summary>
+    public string RemoteIPv4 { get; set; }
+
+    /// <summary>
+    /// 认证信息
+    /// </summary>
+    public string RequestHeaderAuthorization { get; set; }
+
+    /// <summary>
+    /// 认证信息
+    /// </summary>
+    public string RequestHeaderCookies { get; set; }
+
+    /// <summary>
+    /// 请求地址
+    /// </summary>
+    public string RequestUrl { get; set; }
+
+    /// <summary>
+    /// 返回信息
+    /// </summary>
+    public ReturnInformation ReturnInformation { get; set; }
+
+    /// <summary>
+    /// 浏览器标识
+    /// </summary>
+    public string UserAgent { get; set; }
+
+    /// <summary>
+    /// 验证错误信息
+    /// </summary>
+    public Validation Validation { get; set; }
+}
+
+/// <summary>
+/// 请求参数
+/// </summary>
+public class Parameters
+{
+    /// <summary>
+    /// 参数名
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 值
+    /// </summary>
+    public object Value { get; set; }
+}
+
+/// <summary>
+/// 返回信息
+/// </summary>
+public class ReturnInformation
+{
+    /// <summary>
+    /// 返回值
+    /// </summary>
+    public object Value { get; set; }
+}
+
+/// <summary>
+/// 验证失败信息
+/// </summary>
+public class Validation
+{
+    /// <summary>
+    /// 错误详情
+    /// </summary>
+    public string Message { get; set; }
+}

src/Admin/ThingsGateway.Admin.Application/Options/AdminLogOptions.cs

@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using ThingsGateway.ConfigurableOptions;
+
+namespace ThingsGateway.Admin.Application;
+
+
+public sealed class AdminLogOptions : IConfigurableOptions
+{
+
+    public int OperateLogDaysAgo { get; set; }
+
+}

src/Admin/ThingsGateway.Admin.Application/Options/EmailOptions.cs

@@ -0,0 +1,60 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using ThingsGateway.ConfigurableOptions;
+
+namespace ThingsGateway.Admin.Application;
+
+
+/// <summary>
+/// 邮件配置选项
+/// </summary>
+public sealed class EmailOptions : IConfigurableOptions
+{
+    /// <summary>
+    /// 主机
+    /// </summary>
+    public string Host { get; set; }
+
+    /// <summary>
+    /// 端口
+    /// </summary>
+    public int Port { get; set; }
+
+    /// <summary>
+    /// 默认发件者邮箱
+    /// </summary>
+    public string DefaultFromEmail { get; set; }
+
+    /// <summary>
+    /// 默认接收人邮箱
+    /// </summary>
+    public string DefaultToEmail { get; set; }
+
+    /// <summary>
+    /// 启用SSL
+    /// </summary>
+    public bool EnableSsl { get; set; }
+
+    /// <summary>
+    /// 邮箱账号
+    /// </summary>
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// 邮箱密码
+    /// </summary>
+    public string Password { get; set; }
+
+    /// <summary>
+    /// 默认邮件标题
+    /// </summary>
+    public string DefaultFromName { get; set; }
+}

src/Admin/ThingsGateway.Admin.Application/Options/HardwareInfoOptions.cs

@@ -0,0 +1,34 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using ThingsGateway.ConfigurableOptions;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 历史硬件信息
+/// </summary>
+public class HardwareInfoOptions : IConfigurableOptions
+{
+    /// <summary>
+    /// 启用
+    /// </summary>
+    public bool Enable { get; set; } = true;
+
+    /// <summary>
+    /// 历史保存间隔
+    /// </summary>
+    public int HistoryInterval { get; set; } = 60000;
+
+    /// <summary>
+    /// 历史保留天数
+    /// </summary>
+    public int DaysAgo { get; set; } = 7;
+}

src/Admin/ThingsGateway.Admin.Application/Options/TenantOptions.cs

@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using ThingsGateway.ConfigurableOptions;
+
+namespace ThingsGateway.Admin.Application;
+
+
+public sealed class TenantOptions : IConfigurableOptions
+{
+    /// <summary>
+    /// 启用
+    /// </summary>
+    public bool Enable { get; set; }
+
+}

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

@@ -0,0 +1,283 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Http;
+
+using System.Security.Claims;
+
+using ThingsGateway.Authorization;
+using ThingsGateway.DataEncryption;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <inheritdoc/>
+public class BlazorAuthenticationHandler : AppAuthorizeHandler
+{
+    private readonly ISysDictService _sysDictService;
+    private readonly ISysRoleService _sysRoleService;
+    private readonly ISysUserService _sysUserService;
+
+    public BlazorAuthenticationHandler(ISysUserService sysUserService, ISysRoleService sysRoleService, ISysDictService sysDictService)
+    {
+        _sysUserService = sysUserService;
+        _sysRoleService = sysRoleService;
+        _sysDictService = sysDictService;
+    }
+
+    /// <inheritdoc/>
+    public override async Task HandleAsync(AuthorizationHandlerContext context, DefaultHttpContext httpContext)
+    {
+        var isAuthenticated = context.User.Identity?.IsAuthenticated;
+        if (isAuthenticated == true)
+        {
+            if (await CheckVerificatFromCacheAsync(context).ConfigureAwait(false))
+            {
+                await AuthorizeHandleAsync(context).ConfigureAwait(false);
+            }
+            else
+            {
+                await Fail(context).ConfigureAwait(false);
+            }
+        }
+        else
+        {
+            await Fail(context).ConfigureAwait(false);// 授权失败
+        }
+
+    }
+    static async Task Fail(AuthorizationHandlerContext context)
+    {
+        var verificatId = UserManager.VerificatId;
+        var verificatInfo = App.GetService<IVerificatInfoService>().GetOne(verificatId, false);
+        if (App.HttpContext != null)
+        {
+            var identity = new ClaimsIdentity();
+            App.HttpContext.User = new ClaimsPrincipal(identity);
+        }
+        context.Fail(); // 授权失败
+
+        if (verificatInfo != null)
+            await App.GetService<INoticeService>().UserLoginOut(verificatInfo.ClientIds, App.CreateLocalizerByType(typeof(BlazorAuthenticationHandler))["UserExpire"]).ConfigureAwait(false);
+
+        DefaultHttpContext currentHttpContext = context.GetCurrentHttpContext();
+        if (currentHttpContext == null)
+            return;
+        currentHttpContext.Response.StatusCode = 401; //返回401给授权筛选器用
+        currentHttpContext.SignoutToSwagger();
+        await currentHttpContext.SignOutAsync().ConfigureAwait(false);
+    }
+    /// <inheritdoc/>
+    public override async Task<bool> PipelineAsync(AuthorizationHandlerContext context, DefaultHttpContext httpContext)
+    {
+        var userId = context.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.UserId)?.Value?.ToLong(0) ?? 0;
+
+        var user = await _sysUserService.GetUserByIdAsync(userId).ConfigureAwait(false);
+        if (context.Resource is Microsoft.AspNetCore.Components.RouteData routeData)
+        {
+            var roles = await _sysRoleService.GetRoleListByUserIdAsync(userId).ConfigureAwait(false);
+
+            //这里鉴别用户使能状态
+            if (user == null || !user.Status)
+            {
+                return false;
+            }
+
+            //超级管理员都能访问
+            var isSuperAdmin = context.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.SuperAdmin)?.Value.ToBoolean();
+            if (isSuperAdmin == true) return true;
+
+            // 获取超级管理员特性
+            var superAdminAttr = routeData.PageType.CustomAttributes.FirstOrDefault(x =>
+               x.AttributeType == typeof(SuperAdminAttribute));
+
+            if (superAdminAttr != null) //如果是超级管理员才能访问的接口
+            {
+                return false; //直接没权限
+            }
+            //获取角色授权特性
+            var isRolePermission = routeData.PageType.CustomAttributes.FirstOrDefault(x =>
+               x.AttributeType == typeof(RolePermissionAttribute));
+            if (isRolePermission != null)
+            {
+                //获取忽略角色授权特性
+                var isIgnoreRolePermission = routeData.PageType.CustomAttributes.FirstOrDefault(x =>
+       x.AttributeType == typeof(IgnoreRolePermissionAttribute));
+                if (isIgnoreRolePermission == null)
+                {
+                    // 路由名称
+                    var routeName = routeData.PageType.CustomAttributes.FirstOrDefault(x =>
+                        x.AttributeType == typeof(RouteAttribute))?.ConstructorArguments?[0].Value as string;
+                    if (routeName == null) return true;
+
+                    if ((!user.PermissionCodeList.Contains(routeName.CutStart("/")) && !user.PermissionCodeList.Contains(routeName))) //如果当前路由信息不包含在角色授权路由列表中则认证失败
+                        return false;
+                    else
+                        return true;
+                }
+                else
+                {
+                    return true;
+                }
+            }
+            else
+            {
+                return true;
+            }
+        }
+        else
+        {
+            //这里鉴别用户使能状态
+            if (user == null || !user.Status)
+            {
+                return false;
+            }
+
+            //超级管理员都能访问
+            var isSuperAdmin = context.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.SuperAdmin)?.Value?.ToBoolean();
+            if (isSuperAdmin == true) return true;
+
+            if (httpContext == null)
+            {
+                //非API请求
+                return true;
+            }
+
+            var superAdminAttr = httpContext.GetMetadata<SuperAdminAttribute>();
+
+            if (superAdminAttr != null) //如果是超级管理员才能访问的接口
+            {
+                //获取忽略超级管理员特性
+                var ignoreSpuerAdmin = httpContext.GetMetadata<IgnoreSuperAdminAttribute>();
+                if (ignoreSpuerAdmin == null && isSuperAdmin != true) //如果只能超级管理员访问并且用户不是超级管理员
+                    return false; //直接没权限
+            }
+
+            //获取角色授权特性
+            var isRolePermission = httpContext.GetMetadata<RolePermissionAttribute>();
+            if (isRolePermission != null)
+            {
+                //获取忽略角色授权特性
+                var ignoreRolePermission = httpContext.GetMetadata<IgnoreRolePermissionAttribute>();
+                if (ignoreRolePermission == null)
+                {
+                    // 路由名称
+                    var routeName = httpContext.Request.Path.Value;
+                    if (routeName == null) return true;
+                    if ((!user.PermissionCodeList.Contains(routeName.CutStart("/")) && !user.PermissionCodeList.Contains(routeName))) //如果当前路由信息不包含在角色授权路由列表中则认证失败
+                        return false;
+                    else
+                    {
+                        return true; //没有用户信息则返回认证失败
+                    }
+                }
+            }
+            else
+            {
+                return true;
+            }
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// 检查 BearerToken/Cookie 有效性
+    /// </summary>
+    /// <param name="context">DefaultHttpContext</param>
+    /// <returns></returns>
+    private async Task<bool> CheckVerificatFromCacheAsync(AuthorizationHandlerContext context)
+    {
+        DefaultHttpContext currentHttpContext = context.GetCurrentHttpContext();
+        var userId = context.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.UserId)?.Value?.ToLong();
+        var verificatId = context.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.VerificatId)?.Value?.ToLong();
+        var expire = (await _sysDictService.GetAppConfigAsync().ConfigureAwait(false)).LoginPolicy.VerificatExpireTime;
+        if (currentHttpContext == null)
+        {
+            return CheckVerificat(userId, verificatId);
+        }
+        else
+        {
+            if (await JWTEncryption.AutoRefreshToken(context, currentHttpContext, expire, expire * 2).ConfigureAwait(false))
+            {
+                //var token = JWTEncryption.GetJwtBearerToken(currentHttpContext); //获取当前token
+
+                var verificatInfo = userId != null ? VerificatInfoService.GetOne(verificatId ?? 0, false) : null;//获取token信息
+                if (verificatInfo != null)
+                {
+                    if (verificatInfo.VerificatTimeout < DateTime.Now.AddMinutes(1))
+                    {
+                        verificatInfo.VerificatTimeout = verificatInfo.VerificatTimeout.AddMinutes(verificatInfo.Expire); //新的过期时间
+                        VerificatInfoService.Update(verificatInfo); //更新tokne信息到cache
+                    }
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            else
+            {
+                //失败
+                return false;
+            }
+        }
+    }
+    private static IVerificatInfoService _verificatInfoService;
+    private static IVerificatInfoService VerificatInfoService
+    {
+        get
+        {
+            if (_verificatInfoService == null)
+                _verificatInfoService = App.GetService<IVerificatInfoService>();
+
+            return _verificatInfoService;
+        }
+    }
+    public static bool CheckVerificat(long? userId, long? verificatId, bool autoUpdate = true)
+    {
+        var verificatInfo = userId != null ? VerificatInfoService.GetOne(verificatId ?? 0, false) : null;//获取token信息
+
+        if (verificatInfo != null)
+        {
+            if (verificatInfo.VerificatTimeout < DateTime.Now.AddMinutes(1))
+            {
+                if (!autoUpdate && verificatInfo.VerificatTimeout < DateTime.Now)
+                    return false;
+
+                if (verificatInfo.VerificatTimeout.AddMinutes(verificatInfo.Expire) < DateTime.Now)
+                {
+                    return false;
+                }
+
+                if (autoUpdate)
+                {
+                    verificatInfo.VerificatTimeout = verificatInfo.VerificatTimeout.AddMinutes(verificatInfo.Expire); //新的过期时间
+                    VerificatInfoService.Update(verificatInfo); //更新tokne信息到cache
+
+
+                }
+
+                //无法在server中刷新cookies，单页面应用会一直保持登录状态，所以这里不需要刷新cookies，但是F5刷新后会重新登录
+
+            }
+
+
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+}

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

@@ -0,0 +1,105 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Components.Authorization;
+
+using System.Security.Claims;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <inheritdoc/>
+public class BlazorHybridAuthenticationStateProvider : AuthenticationStateProvider
+{
+    private readonly IAppService _appService;
+    private CancellationTokenSource _loopCancellationTokenSource = new CancellationTokenSource();
+
+    public BlazorHybridAuthenticationStateProvider(IAppService appService)
+    {
+        _appService = appService;
+    }
+
+    private AuthenticationState AuthenticationState = new AuthenticationState(new ClaimsPrincipal());
+    public void UserChanged(ClaimsPrincipal user)
+    {
+        AuthenticationState = new AuthenticationState(user);
+        NotifyAuthenticationStateChanged(GetAuthenticationStateAsync());
+        var oldCancellationTokenSource = _loopCancellationTokenSource;
+        if (oldCancellationTokenSource is not null)
+        {
+            oldCancellationTokenSource.Cancel();
+            oldCancellationTokenSource.Dispose();
+        }
+
+        _loopCancellationTokenSource = new CancellationTokenSource();
+        if (AuthenticationState.User?.Identity?.IsAuthenticated == true)
+            _ = RevalidationLoop(_loopCancellationTokenSource.Token);
+    }
+    private async Task RevalidationLoop(CancellationToken cancellationToken)
+    {
+        try
+        {
+            if (AuthenticationState.User.Identity?.IsAuthenticated == true)
+            {
+                while (!cancellationToken.IsCancellationRequested)
+                {
+                    bool isValid = false;
+
+                    try
+                    {
+                        await Task.Delay(30000, cancellationToken).ConfigureAwait(false);
+                        isValid = await ValidateAuthenticationStateAsync(AuthenticationState, cancellationToken).ConfigureAwait(false);
+                    }
+                    catch (TaskCanceledException)
+                    {
+                        break;
+                    }
+
+                    if (!isValid)
+                    {
+                        ForceSignOut();
+                        break;
+                    }
+                }
+            }
+        }
+        catch
+        {
+            ForceSignOut();
+        }
+    }
+    protected virtual async Task<bool> ValidateAuthenticationStateAsync(AuthenticationState authenticationState, CancellationToken cancellationToken)
+    {
+        var userId = authenticationState.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.UserId)?.Value?.ToLong();
+        var verificatId = authenticationState.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.VerificatId)?.Value?.ToLong();
+        var result = BlazorAuthenticationHandler.CheckVerificat(userId, verificatId, false);
+        if (!result)
+        {
+            var verificatInfo = App.GetService<IVerificatInfoService>().GetOne(verificatId ?? 0, false);
+            if (App.HttpContext != null)
+            {
+                var identity = new ClaimsIdentity();
+                App.HttpContext.User = new ClaimsPrincipal(identity);
+            }
+
+            if (verificatInfo != null)
+                await App.GetService<INoticeService>().UserLoginOut(verificatInfo.ClientIds, App.CreateLocalizerByType(typeof(BlazorAuthenticationHandler))["UserExpire"]).ConfigureAwait(false);
+        }
+        return result;
+    }
+    private void ForceSignOut()
+    {
+        var anonymousUser = new ClaimsPrincipal(new ClaimsIdentity());
+        UserChanged(anonymousUser);
+    }
+    public override Task<AuthenticationState> GetAuthenticationStateAsync()
+    {
+        return Task.FromResult(AuthenticationState);
+    }
+}

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

@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <inheritdoc/>
+public class BlazorHybridAuthorizationHandler : BlazorAuthenticationHandler
+{
+
+    public BlazorHybridAuthorizationHandler(ISysUserService sysUserService, ISysRoleService sysRoleService, ISysDictService sysDictService) : base(sysUserService, sysRoleService, sysDictService)
+    {
+    }
+
+}

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

@@ -0,0 +1,19 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <inheritdoc/>
+public class BlazorServerAuthenticationHandler : BlazorAuthenticationHandler
+{
+    public BlazorServerAuthenticationHandler(ISysUserService sysUserService, ISysRoleService sysRoleService, ISysDictService sysDictService) : base(sysUserService, sysRoleService, sysDictService)
+    {
+    }
+}

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

@@ -0,0 +1,50 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Components.Server;
+using Microsoft.Extensions.Logging;
+
+using System.Security.Claims;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <inheritdoc/>
+public class BlazorServerAuthenticationStateProvider : RevalidatingServerAuthenticationStateProvider
+{
+    private readonly IAppService _appService;
+
+    public BlazorServerAuthenticationStateProvider(ILoggerFactory loggerFactory, IAppService appService) : base(loggerFactory)
+    {
+        _appService = appService;
+    }
+
+    protected override TimeSpan RevalidationInterval => TimeSpan.FromSeconds(30);
+
+    protected override async Task<bool> ValidateAuthenticationStateAsync(AuthenticationState authenticationState, CancellationToken cancellationToken)
+    {
+        var userId = authenticationState.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.UserId)?.Value?.ToLong();
+        var verificatId = authenticationState.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.VerificatId)?.Value?.ToLong();
+        var result = BlazorAuthenticationHandler.CheckVerificat(userId, verificatId, false);
+        if (!result)
+        {
+            var verificatInfo = App.GetService<IVerificatInfoService>().GetOne(verificatId ?? 0, false);
+            if (App.HttpContext != null)
+            {
+                var identity = new ClaimsIdentity();
+                App.HttpContext.User = new ClaimsPrincipal(identity);
+            }
+
+            if (verificatInfo != null)
+                await App.GetService<INoticeService>().UserLoginOut(verificatInfo.ClientIds, App.CreateLocalizerByType(typeof(BlazorAuthenticationHandler))["UserExpire"]).ConfigureAwait(false);
+        }
+        return result;
+    }
+}

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

@@ -0,0 +1,102 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Localization;
+
+using ThingsGateway.DataValidation;
+using ThingsGateway.FriendlyException;
+using ThingsGateway.Razor;
+using ThingsGateway.UnifyResult;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 规范化RESTful风格返回值
+/// </summary>
+[UnifyModel(typeof(UnifyResult<>))]
+public class UnifyResultProvider : IUnifyResultProvider
+{
+    private static IStringLocalizer Localizer = App.CreateLocalizerByType(typeof(UnifyResultProvider))!;
+
+    /// <summary>
+    /// 状态码响应拦截
+    /// </summary>
+    public async Task OnResponseStatusCodes(HttpContext context, int statusCode, UnifyResultSettingsOptions unifyResultSettings = null)
+    {
+        switch (statusCode)
+        {
+            // 处理 401 状态码
+            case StatusCodes.Status401Unauthorized:
+                await context.Response.WriteAsJsonAsync(RESTfulResult(statusCode, false, Localizer["TokenOver"].Value)).ConfigureAwait(false);
+                break;
+            // 处理 403 状态码
+            case StatusCodes.Status403Forbidden:
+                await context.Response.WriteAsJsonAsync(RESTfulResult(statusCode, false, default, Localizer["NoPermission"].Value)).ConfigureAwait(false);
+                break;
+
+            default: break;
+        }
+    }
+
+    /// <summary>
+    /// 成功返回
+    /// </summary>
+    /// <param name="context"></param>
+    /// <param name="data"></param>
+    /// <returns></returns>
+    public IActionResult OnSucceeded(ActionExecutedContext context, object? data)
+    {
+        return new JsonResult(RESTfulResult(StatusCodes.Status200OK, true, data));
+    }
+
+
+
+    /// <summary>
+    /// 返回 RESTful 风格结果集
+    /// </summary>
+    /// <param name="statusCode">状态码</param>
+    /// <param name="succeeded">是否成功</param>
+    /// <param name="data">数据</param>
+    /// <param name="errors">错误信息</param>
+    /// <returns></returns>
+    private static UnifyResult<object> RESTfulResult(int statusCode, bool succeeded = default, object? data = default, object? errors = default)
+    {
+        return new UnifyResult<object>
+        {
+            Code = statusCode,
+            Msg = statusCode == StatusCodes.Status200OK ? "Success" : errors,
+            Data = data,
+            Time = DateTime.Now,
+        };
+    }
+
+    public IActionResult OnAuthorizeException(DefaultHttpContext context, ExceptionMetadata metadata)
+    {
+        return new JsonResult(RESTfulResult(metadata.StatusCode, data: metadata.Data, errors: metadata.Errors ?? metadata.Exception?.Message)
+               , UnifyContext.GetSerializerSettings(context));
+    }
+
+    public IActionResult OnException(ExceptionContext context, ExceptionMetadata metadata)
+    {
+        return new JsonResult(RESTfulResult(metadata.StatusCode, data: metadata.Data, errors: metadata.Errors ?? metadata.Exception?.Message)
+                 , UnifyContext.GetSerializerSettings(context));
+    }
+
+    public IActionResult OnValidateFailed(ActionExecutingContext context, ValidationMetadata metadata)
+    {
+        return new JsonResult(RESTfulResult(metadata.StatusCode ?? StatusCodes.Status400BadRequest, data: metadata.Data, errors: metadata.ValidationResult) // 如果需要只显示第一条错误，修改为：errors: metadata.FirstErrorMessage
+                      , UnifyContext.GetSerializerSettings(context));
+    }
+
+
+}

src/Admin/ThingsGateway.Admin.Application/SeedData/Admin/seed_sys_dict.json

@@ -0,0 +1,124 @@
+{
+  "RECORDS": [
+    {
+      "Id": 252875263003121,
+      "DictType": "System",
+      "Category": "LoginPolicy",
+      "Name": "VerificatExpireTime",
+      "Code": "14400",
+      "Remark": "Verificat过期时间(分)",
+      "IsDelete": "0",
+      "SortCode": 9
+    },
+    {
+      "Id": 252875263003720,
+      "DictType": "System",
+      "Category": "PagePolicy",
+      "Name": "Shortcuts",
+      "Code": "[100]",
+      "Remark": "系统默认工作台数据",
+      "IsDelete": "0",
+      "SortCode": 1
+    },
+    {
+      "Id": 252875263003728,
+      "DictType": "System",
+      "Category": "PasswordPolicy",
+      "Name": "DefaultPassword",
+      "Code": "111111",
+      "Remark": "默认用户密码",
+      "IsDelete": "0",
+      "SortCode": 1
+    },
+    {
+      "Id": 364564896825413,
+      "DictType": "System",
+      "Category": "LoginPolicy",
+      "Name": "SingleOpen",
+      "Code": "False",
+      "Remark": "单用户登录开关",
+      "IsDelete": "0",
+      "SortCode": 1
+    },
+    {
+      "Id": 432079540875333,
+      "DictType": "System",
+      "Category": "LoginPolicy",
+      "Name": "ErrorCount",
+      "Code": "10",
+      "Remark": "登录错误次数",
+      "IsDelete": "0",
+      "SortCode": 99
+    },
+    {
+      "Id": 432079718375493,
+      "DictType": "System",
+      "Category": "LoginPolicy",
+      "Name": "ErrorResetTime",
+      "Code": "1",
+      "Remark": "错误重置时间",
+      "IsDelete": "0",
+      "SortCode": 99
+    },
+    {
+      "Id": 432079850803269,
+      "DictType": "System",
+      "Category": "LoginPolicy",
+      "Name": "ErrorLockTime",
+      "Code": "2",
+      "Remark": "登录错误锁定时长",
+      "IsDelete": "0",
+      "SortCode": 99
+    },
+    {
+      "Id": 432111701160005,
+      "DictType": "System",
+      "Category": "PasswordPolicy",
+      "Name": "PasswordMinLen",
+      "Code": "6",
+      "Remark": "密码最小长度",
+      "IsDelete": "0",
+      "SortCode": 99
+    },
+    {
+      "Id": 432112135159877,
+      "DictType": "System",
+      "Category": "PasswordPolicy",
+      "Name": "PasswordContainNum",
+      "Code": "False",
+      "Remark": "包含数字",
+      "IsDelete": "0",
+      "SortCode": 99
+    },
+    {
+      "Id": 432112321953861,
+      "DictType": "System",
+      "Category": "PasswordPolicy",
+      "Name": "PasswordContainLower",
+      "Code": "False",
+      "Remark": "包含小写字母",
+      "IsDelete": "0",
+      "SortCode": 99
+    },
+    {
+      "Id": 432112380907589,
+      "DictType": "System",
+      "Category": "PasswordPolicy",
+      "Name": "PasswordContainUpper",
+      "Code": "False",
+      "Remark": "包含大写字母",
+      "IsDelete": "0",
+      "SortCode": 99
+    },
+    {
+      "Id": 432112495247429,
+      "DictType": "System",
+      "Category": "PasswordPolicy",
+      "Name": "PasswordContainChar",
+      "Code": "False",
+      "Remark": "包含特殊字符",
+      "IsDelete": "0",
+      "SortCode": 99
+    }
+  ]
+}

src/Admin/ThingsGateway.Admin.Application/SeedData/Admin/seed_sys_relation.json

@@ -0,0 +1,11 @@
+{
+  "RECORDS": [
+    {
+      "Id": 503217527844933,
+      "Category": 0,
+      "ObjectId": 212725263002001,
+      "TargetId": "212725263001001",
+      "ExtJson": null
+    }
+  ]
+}

src/Admin/ThingsGateway.Admin.Application/SeedData/Admin/seed_sys_resource.json

@@ -0,0 +1,288 @@
+{
+  "RECORDS": [
+    {
+      "Id": 2,
+      "ParentId": 0,
+      "Title": "系统管理",
+      "Code": "System",
+      "Category": "MODULE",
+      "Target": "_self",
+      "Href": "",
+      "Icon": "fa-solid fa-house-user",
+
+      "CreateTime": null,
+      "CreateUser": null,
+      "CreateUserId": 0,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 100001,
+      "ParentId": 0,
+      "Module": 2,
+      "Title": "权限管理",
+      "Code": "System",
+      "NavLinkMatch": "All",
+      "Category": "MENU",
+      "Target": "_self",
+      "Href": null,
+      "Icon": "fa-solid fa-users-gear",
+
+      "CreateTime": null,
+      "CreateUser": null,
+      "CreateUserId": 0,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 100,
+      "ExtJson": null
+    },
+    {
+      "Id": 100002,
+      "ParentId": 0,
+      "Module": 2,
+      "Title": "系统运维",
+      "NavLinkMatch": "All",
+      "Code": "System",
+      "Category": "MENU",
+      "Target": "_self",
+      "Href": null,
+      "Icon": "fa-solid fa-file-circle-check",
+
+      "CreateTime": null,
+      "CreateUser": null,
+      "CreateUserId": 0,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 101,
+      "ExtJson": null
+    },
+    {
+      "Id": 100001001,
+      "Module": 2,
+      "ParentId": 100001,
+      "Title": "用户管理",
+      "NavLinkMatch": "All",
+      "Code": "System",
+      "Category": "MENU",
+      "Target": "_self",
+      "Href": "/admin/user",
+      "Icon": "fa-solid fa-user-gear",
+
+      "CreateTime": null,
+      "CreateUser": null,
+      "CreateUserId": 0,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+    {
+      "Id": 100001005,
+      "Module": 2,
+      "ParentId": 100001,
+      "Title": "机构管理",
+      "NavLinkMatch": "All",
+      "Code": "System",
+      "Category": "MENU",
+      "Target": "_self",
+      "Href": "/admin/org",
+      "Icon": "fa-solid fa-user-gear",
+
+      "CreateTime": null,
+      "CreateUser": null,
+      "CreateUserId": 0,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+    {
+      "Id": 100001004,
+      "Module": 2,
+      "ParentId": 100001,
+      "Title": "职位管理",
+      "NavLinkMatch": "All",
+      "Code": "System",
+      "Category": "MENU",
+      "Target": "_self",
+      "Href": "/admin/position",
+      "Icon": "fa-solid fa-user-gear",
+
+      "CreateTime": null,
+      "CreateUser": null,
+      "CreateUserId": 0,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+    {
+      "Id": 100001002,
+      "Module": 2,
+      "ParentId": 100001,
+      "Title": "角色管理",
+      "Code": "System",
+      "Category": "MENU",
+      "Target": "_self",
+      "NavLinkMatch": "All",
+      "Href": "/admin/role",
+      "Icon": "fa-solid fa-users-gear",
+
+      "CreateTime": null,
+      "CreateUser": null,
+      "CreateUserId": 0,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 2,
+      "ExtJson": null
+    },
+    {
+      "Id": 100001003,
+      "Module": 2,
+      "ParentId": 100001,
+      "Title": "菜单管理",
+      "Code": "System",
+      "Category": "MENU",
+      "Target": "_self",
+      "Href": "/admin/resource",
+      "NavLinkMatch": "All",
+      "Icon": "fa-solid fa-bars",
+
+      "CreateTime": null,
+      "CreateUser": null,
+      "CreateUserId": 0,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 3,
+      "ExtJson": null
+    },
+    {
+      "Id": 100002001,
+      "ParentId": 100002,
+      "Module": 2,
+      "Title": "系统配置",
+      "Code": "System",
+      "Category": "MENU",
+      "NavLinkMatch": "All",
+      "Target": "_self",
+      "Href": "/admin/config",
+      "Icon": "fa-solid fa-gear",
+
+      "CreateTime": null,
+      "CreateUser": null,
+      "CreateUserId": 0,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+    {
+      "Id": 100002002,
+      "Module": 2,
+      "ParentId": 100002,
+      "Title": "字典管理",
+      "Code": "System",
+      "NavLinkMatch": "All",
+      "Category": "MENU",
+      "Target": "_self",
+      "Href": "/admin/dict",
+      "Icon": "fa-solid fa-gear",
+
+      "CreateTime": null,
+      "CreateUser": null,
+      "CreateUserId": 0,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+    {
+      "Id": 100002003,
+      "Module": 2,
+      "ParentId": 100002,
+      "Title": "操作日志",
+      "NavLinkMatch": "All",
+      "Code": "System",
+      "Category": "MENU",
+      "Target": "_self",
+      "Href": "/admin/oplog",
+      "Icon": "fa-solid fa-edit",
+
+      "CreateTime": null,
+      "CreateUser": null,
+      "CreateUserId": 0,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 3,
+      "ExtJson": null
+    },
+    {
+      "Id": 100002004,
+      "Module": 2,
+      "ParentId": 100002,
+      "Title": "会话管理",
+      "NavLinkMatch": "All",
+      "Code": "System",
+      "Category": "MENU",
+      "Target": "_self",
+      "Href": "/admin/session",
+      "Icon": "fa-solid fa-person-circle-check",
+
+      "CreateTime": null,
+      "CreateUser": null,
+      "CreateUserId": 0,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 4,
+      "ExtJson": null
+    },
+    {
+      "Id": 100002005,
+      "Module": 2,
+      "ParentId": 100002,
+      "Title": "硬件信息",
+      "NavLinkMatch": "All",
+      "Code": "System",
+      "Category": "MENU",
+      "Target": "_self",
+      "Href": "/admin/hardwareinfo",
+      "Icon": "fas fa-server",
+
+      "CreateTime": null,
+      "CreateUser": null,
+      "CreateUserId": 0,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 4,
+      "ExtJson": null
+    }
+  ]
+}

src/Admin/ThingsGateway.Admin.Application/SeedData/Admin/seed_sys_resourcebutton.json

@@ -0,0 +1,845 @@
+{
+  "RECORDS": [
+    {
+      "Id": 501949744332869,
+      "ParentId": 100001001,
+      "Module": 2,
+      "Title": "查询",
+      "Code": "System",
+      "Category": "Button",
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:47:46.973",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+    {
+      "Id": 502949744332869,
+      "ParentId": 100001001,
+      "Module": 2,
+      "Title": "新增",
+      "Code": "System",
+      "Category": "Button",
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:47:46.973",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+    {
+      "Id": 502949744332870,
+      "ParentId": 100001001,
+      "Module": 2,
+      "Title": "编辑",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:47:46.973",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 2,
+      "ExtJson": null
+    },
+    {
+      "Id": 502949744332871,
+      "ParentId": 100001001,
+      "Module": 2,
+      "Title": "删除",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:47:46.973",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 3,
+      "ExtJson": null
+    },
+    {
+      "Id": 502950809124933,
+      "ParentId": 100001001,
+      "Module": 2,
+      "Title": "重置密码",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:52:06.903",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 502950980558917,
+      "ParentId": 100001001,
+      "Module": 2,
+      "Title": "授权角色",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:52:48.757",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 502951076454469,
+      "ParentId": 100001001,
+      "Module": 2,
+      "Title": "授权资源",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:53:12.17",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": "11/1/2024 14:55:44.917",
+      "UpdateUser": "SuperAdmin",
+      "UpdateUserId": 212725263002001,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 502951133163589,
+      "ParentId": 100001001,
+      "Module": 2,
+      "Title": "授权Api",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:53:26.017",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": "11/1/2024 15:01:16.98",
+      "UpdateUser": "SuperAdmin",
+      "UpdateUserId": 212725263002001,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 513951271813189,
+      "ParentId": 100001002,
+      "Module": 2,
+      "Title": "查询",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:53:59.867",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+
+    {
+      "Id": 502951271813189,
+      "ParentId": 100001002,
+      "Module": 2,
+      "Title": "新增",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:53:59.867",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+    {
+      "Id": 502951271813190,
+      "ParentId": 100001002,
+      "Module": 2,
+      "Title": "编辑",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:53:59.867",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 2,
+      "ExtJson": null
+    },
+    {
+      "Id": 502951271813191,
+      "ParentId": 100001002,
+      "Module": 2,
+      "Title": "删除",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:53:59.867",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 3,
+      "ExtJson": null
+    },
+    {
+      "Id": 502951661793349,
+      "ParentId": 100001002,
+      "Module": 2,
+      "Title": "授权资源",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:55:35.077",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 502952928694341,
+      "ParentId": 100001002,
+      "Module": 2,
+      "Title": "授权用户",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:00:44.377",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 502952990781509,
+      "ParentId": 100001002,
+      "Module": 2,
+      "Title": "授权Api",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:00:59.537",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": "11/1/2024 15:01:10.2",
+      "UpdateUser": "SuperAdmin",
+      "UpdateUserId": 212725263002001,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 512953216376901,
+      "ParentId": 100001003,
+      "Module": 2,
+      "Title": "查询",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:01:54.617",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+
+    {
+      "Id": 502953216376901,
+      "ParentId": 100001003,
+      "Module": 2,
+      "Title": "新增",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:01:54.617",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+    {
+      "Id": 502953216376902,
+      "ParentId": 100001003,
+      "Module": 2,
+      "Title": "编辑",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:01:54.617",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 2,
+      "ExtJson": null
+    },
+    {
+      "Id": 502953216376903,
+      "ParentId": 100001003,
+      "Module": 2,
+      "Title": "删除",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:01:54.617",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 3,
+      "ExtJson": null
+    },
+    {
+      "Id": 512953961062469,
+      "ParentId": 100002002,
+      "Module": 2,
+      "Title": "查询",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:04:56.42",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+
+    {
+      "Id": 502953961062469,
+      "ParentId": 100002002,
+      "Module": 2,
+      "Title": "新增",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:04:56.42",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+    {
+      "Id": 502953961062470,
+      "ParentId": 100002002,
+      "Module": 2,
+      "Title": "编辑",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:04:56.42",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 2,
+      "ExtJson": null
+    },
+    {
+      "Id": 502953961062471,
+      "ParentId": 100002002,
+      "Module": 2,
+      "Title": "删除",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:04:56.42",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 3,
+      "ExtJson": null
+    },
+
+    {
+      "Id": 532953961062469,
+      "ParentId": 100002001,
+      "Module": 2,
+      "Title": "查询",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:04:56.42",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+
+    {
+      "Id": 502954345615429,
+      "ParentId": 100002001,
+      "Module": 2,
+      "Code": "System",
+      "Title": "密码策略保存",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:06:30.307",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 502954382938181,
+      "ParentId": 100002001,
+      "Module": 2,
+      "Code": "System",
+      "Title": "登录策略保存",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:06:39.417",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 502954382931181,
+      "ParentId": 100002001,
+      "Module": 2,
+      "Code": "System",
+      "Title": "页面策略保存",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:06:39.417",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 502954382931281,
+      "ParentId": 100002001,
+      "Module": 2,
+      "Title": "网站策略保存",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:06:39.417",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 505954686193733,
+      "ParentId": 100002003,
+      "Module": 2,
+      "Title": "查询",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:07:53.453",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+
+    {
+      "Id": 502954686193733,
+      "ParentId": 100002003,
+      "Module": 2,
+      "Title": "日志清空",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:07:53.453",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 501954811879493,
+      "ParentId": 100002004,
+      "Module": 2,
+      "Title": "查询",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:08:24.14",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 502954811879493,
+      "ParentId": 100002004,
+      "Module": 2,
+      "Title": "会话强退",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 15:08:24.14",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 401949744332869,
+      "ParentId": 100001005,
+      "Module": 2,
+      "Title": "查询",
+      "Code": "System",
+      "Category": "Button",
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:47:46.973",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+    {
+      "Id": 402949744332869,
+      "ParentId": 100001005,
+      "Module": 2,
+      "Title": "新增",
+      "Code": "System",
+      "Category": "Button",
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:47:46.973",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+    {
+      "Id": 402949744332870,
+      "ParentId": 100001005,
+      "Module": 2,
+      "Title": "编辑",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:47:46.973",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 2,
+      "ExtJson": null
+    },
+    {
+      "Id": 402949744332871,
+      "ParentId": 100001005,
+      "Module": 2,
+      "Title": "删除",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:47:46.973",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 3,
+      "ExtJson": null
+    },
+
+    {
+      "Id": 301949744332869,
+      "ParentId": 100001004,
+      "Module": 2,
+      "Title": "查询",
+      "Code": "System",
+      "Category": "Button",
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:47:46.973",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+    {
+      "Id": 302949744332869,
+      "ParentId": 100001004,
+      "Module": 2,
+      "Title": "新增",
+      "Code": "System",
+      "Category": "Button",
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:47:46.973",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 1,
+      "ExtJson": null
+    },
+    {
+      "Id": 302949744332870,
+      "ParentId": 100001004,
+      "Module": 2,
+      "Title": "编辑",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:47:46.973",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 2,
+      "ExtJson": null
+    },
+    {
+      "Id": 302949744332871,
+      "ParentId": 100001004,
+      "Module": 2,
+      "Title": "删除",
+      "Code": "System",
+      "Category": "Button",
+
+      "Href": null,
+      "Icon": null,
+
+      "CreateTime": "11/1/2024 14:47:46.973",
+      "CreateUser": "SuperAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": "0",
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 3,
+      "ExtJson": null
+    }
+  ]
+}

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

@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 系统配置种子数据
+/// </summary>
+public class SysDictSeedData : ISqlSugarEntitySeedData<SysDict>
+{
+    /// <inheritdoc/>
+    public IEnumerable<SysDict> SeedData()
+    {
+        var data = SeedDataUtil.GetSeedData<SysDict>(PathExtensions.CombinePathWithOs("SeedData", "Admin", "seed_sys_dict.json"));
+
+        var assembly = GetType().Assembly;
+        return SeedDataUtil.GetSeedDataByJson<SysDict>(SeedDataUtil.GetManifestResourceStream(assembly, "SeedData.Admin.seed_sys_dict.json")).Concat(data);
+    }
+
+
+}

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

@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 职位表种子数据
+/// </summary>
+public class SysOrgSeedData : ISqlSugarEntitySeedData<SysOrg>
+{
+    /// <inheritdoc/>
+    public IEnumerable<SysOrg> SeedData()
+    {
+        var data = SeedDataUtil.GetSeedData<SysOrg>(PathExtensions.CombinePathWithOs("SeedData", "Admin", "seed_sys_org.json"));
+
+        var assembly = GetType().Assembly;
+        return new List<SysOrg>()
+        {
+            new SysOrg()
+            {
+                  Id=RoleConst.DefaultTenantId,
+                  Status=true,
+                  IsDelete=false,
+                  DirectorId=RoleConst.SuperAdminId,
+                  Name="Default",
+                  Code="Diego",
+                  Category=OrgEnum.COMPANY,
+                  CreateUserId=RoleConst.SuperAdminId,
+                  Names="Default",
+                  SortCode=0
+            }
+        }.Concat(SeedDataUtil.GetSeedDataByJson<SysOrg>(SeedDataUtil.GetManifestResourceStream(assembly, "SeedData.Admin.seed_sys_org.json")).Concat(data));
+
+    }
+}

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

@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 职位表种子数据
+/// </summary>
+public class SysPositionSeedData : ISqlSugarEntitySeedData<SysPosition>
+{
+    /// <inheritdoc/>
+    public IEnumerable<SysPosition> SeedData()
+    {
+        var data = SeedDataUtil.GetSeedData<SysPosition>(PathExtensions.CombinePathWithOs("SeedData", "Admin", "seed_sys_position.json"));
+
+        var assembly = GetType().Assembly;
+        return new List<SysPosition>()
+        {
+            new SysPosition()
+            {
+                  Id=RoleConst.DefaultPositionId,
+                  Status=true,
+                  IsDelete=false,
+                  Name="管理员",
+                  OrgId=RoleConst.DefaultTenantId,
+                  Code="ThingsGateway",
+                  Category=PositionCategoryEnum.HIGH,
+                  CreateUserId=RoleConst.SuperAdminId,
+                  SortCode=0
+            }
+        }.Concat(SeedDataUtil.GetSeedDataByJson<SysPosition>(SeedDataUtil.GetManifestResourceStream(assembly, "SeedData.Admin.seed_sys_position.json")).Concat(data));
+
+    }
+}

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

@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 关系表种子数据
+/// </summary>
+public class SysRelationSeedData : ISqlSugarEntitySeedData<SysRelation>
+{
+    /// <inheritdoc/>
+    public IEnumerable<SysRelation> SeedData()
+    {
+        var db = DbContext.Db.GetConnectionScopeWithAttr<SysRelation>().CopyNew();
+        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"));
+        var assembly = GetType().Assembly;
+        return SeedDataUtil.GetSeedDataByJson<SysRelation>(SeedDataUtil.GetManifestResourceStream(assembly, "SeedData.Admin.seed_sys_relation.json")).Concat(data);
+    }
+}

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

@@ -0,0 +1,36 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 资源表种子数据
+/// </summary>
+public class SysResourceSeedData : ISqlSugarEntitySeedData<SysResource>
+{
+    /// <inheritdoc/>
+    public IEnumerable<SysResource> SeedData()
+    {
+        var data1 = SeedDataUtil.GetSeedData<SysResource>(PathExtensions.CombinePathWithOs("SeedData", "Admin", "seed_sys_resource.json"));
+        var data2 = SeedDataUtil.GetSeedData<SysResource>(PathExtensions.CombinePathWithOs("SeedData", "Admin", "seed_sys_resourcebutton.json"));
+        var data3 = SeedDataUtil.GetSeedData<SysResource>(PathExtensions.CombinePathWithOs("SeedData", "Admin", "seed_biz_resource.json"));
+
+        var assembly = GetType().Assembly;
+        return SeedDataUtil.GetSeedDataByJson<SysResource>(SeedDataUtil.GetManifestResourceStream(assembly, "SeedData.Admin.seed_sys_resource.json"))
+            .Concat(SeedDataUtil.GetSeedDataByJson<SysResource>(SeedDataUtil.GetManifestResourceStream(assembly, "SeedData.Admin.seed_sys_resourcebutton.json")))
+            .Concat(SeedDataUtil.GetSeedDataByJson<SysResource>(SeedDataUtil.GetManifestResourceStream(assembly, "SeedData.Admin.seed_biz_resource.json")))
+
+            .Concat(data1)
+            .Concat(data2)
+            .Concat(data3)
+            ;
+
+    }
+}

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

@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 角色种子数据
+/// </summary>
+public class SysRoleSeedData : ISqlSugarEntitySeedData<SysRole>
+{
+    /// <inheritdoc/>
+    public IEnumerable<SysRole> SeedData()
+    {
+        var data = SeedDataUtil.GetSeedData<SysRole>(PathExtensions.CombinePathWithOs("SeedData", "Admin", "seed_sys_role.json"));
+        var assembly = GetType().Assembly;
+        return new List<SysRole>()
+        {
+            new SysRole()
+            {
+                  Id=RoleConst.SuperAdminRoleId,
+                  Code=RoleConst.SuperAdmin,
+                  Name="超级管理员",
+                  Category=RoleCategoryEnum.Global,
+                  DefaultDataScope=new(),
+                  IsDelete=false,
+                  SortCode=0
+            }
+        }.Concat(SeedDataUtil.GetSeedDataByJson<SysRole>(SeedDataUtil.GetManifestResourceStream(assembly, "SeedData.Admin.seed_sys_role.json")).Concat(data));
+    }
+}

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

@@ -0,0 +1,40 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 用户表种子数据
+/// </summary>
+public class SysUserSeedData : ISqlSugarEntitySeedData<SysUser>
+{
+    /// <inheritdoc/>
+    public IEnumerable<SysUser> SeedData()
+    {
+        var data = SeedDataUtil.GetSeedData<SysUser>(PathExtensions.CombinePathWithOs("SeedData", "Admin", "seed_sys_user.json"));
+        var assembly = GetType().Assembly;
+        return new List<SysUser>()
+        {
+            new SysUser()
+            {
+                  Id=RoleConst.SuperAdminId,
+                  Account=RoleConst.SuperAdmin,
+                  Password="7DA385A25A98388E",
+                  OrgId=RoleConst.DefaultTenantId,
+                  PositionId=RoleConst.DefaultPositionId,
+                  Status=true,
+                  IsDelete=false,
+                  SortCode=0
+            }
+        }.Concat(SeedDataUtil.GetSeedDataByJson<SysUser>(SeedDataUtil.GetManifestResourceStream(assembly, "SeedData.Admin.seed_sys_user.json"))).Concat(data);
+    }
+
+
+}

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

@@ -0,0 +1,195 @@
+// ------------------------------------------------------------------------------
+// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+// 此代码版权（除特别声明外的代码）归作者本人Diego所有
+// 源代码使用协议遵循本仓库的开源协议及附加协议
+// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+// 使用文档：https://thingsgateway.cn/
+// QQ群：605534569
+// ------------------------------------------------------------------------------
+
+
+using BootstrapBlazor.Components;
+
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.Extensions.Options;
+
+using Swashbuckle.AspNetCore.SwaggerGen;
+
+using System.Globalization;
+using System.Reflection;
+
+using ThingsGateway.Extension;
+using ThingsGateway.SpecificationDocument;
+
+namespace ThingsGateway.Admin.Application;
+
+internal sealed class ApiPermissionService : IApiPermissionService
+{
+    private readonly IApiDescriptionGroupCollectionProvider _apiDescriptionGroupCollectionProvider;
+    private readonly SwaggerGeneratorOptions _generatorOptions;
+
+    public ApiPermissionService(
+        IOptions<SwaggerGeneratorOptions> generatorOptions,
+        IApiDescriptionGroupCollectionProvider apiDescriptionGroupCollectionProvider)
+    {
+        _generatorOptions = generatorOptions.Value;
+        _apiDescriptionGroupCollectionProvider = apiDescriptionGroupCollectionProvider;
+    }
+    private IEnumerable<string> GetDocumentNames()
+    {
+        return _generatorOptions.SwaggerDocs.Keys;
+    }
+
+    /// <inheritdoc />
+    public List<OpenApiPermissionTreeSelector> ApiPermissionTreeSelector()
+    {
+        var cacheKey = $"{nameof(ApiPermissionTreeSelector)}-{CultureInfo.CurrentUICulture.Name}";
+        var permissions = App.CacheService.Get<List<OpenApiPermissionTreeSelector>>(cacheKey);
+        if (permissions == null)
+        {
+            permissions = new();
+
+            Dictionary<string, OpenApiPermissionTreeSelector> groupOpenApis = new();
+            foreach (var item in GetDocumentNames())
+            {
+                OpenApiPermissionTreeSelector openApiPermissionTreeSelector = new() { ApiName = item ?? "Default" };
+                groupOpenApis.TryAdd(openApiPermissionTreeSelector.ApiName, openApiPermissionTreeSelector);
+            }
+            var apiDescriptions = _apiDescriptionGroupCollectionProvider.ApiDescriptionGroups.Items;
+
+            // 获取所有需要数据权限的控制器
+            var controllerTypes =
+                App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(RolePermissionAttribute), false));
+
+            foreach (var groupOpenApi in groupOpenApis)
+            {
+
+                foreach (var apiDescriptionGroup in apiDescriptions)
+                {
+
+
+                    var routes = apiDescriptionGroup.Items.Where(api => api.ActionDescriptor is ControllerActionDescriptor);
+
+                    OpenApiPermissionTreeSelector openApiPermissionTreeSelector = groupOpenApi.Value;
+
+                    Dictionary<string, OpenApiPermissionTreeSelector> openApiPermissionTreeSelectorDict = new();
+
+                    foreach (var route in routes)
+                    {
+                        if (!SpecificationDocumentBuilder.CheckApiDescriptionInCurrentGroup(groupOpenApi.Key, route))
+                        {
+                            continue;
+                        }
+
+                        var actionDesc = (ControllerActionDescriptor)route.ActionDescriptor;
+                        if (!actionDesc.ControllerTypeInfo.CustomAttributes.Any(a => a.AttributeType == typeof(RolePermissionAttribute)))
+                            continue;
+                        var controllerDescription = actionDesc.ControllerTypeInfo.GetTypeDisplayName();
+
+                        if (openApiPermissionTreeSelectorDict.TryGetValue(actionDesc.ControllerName, out var openApiControllerGroup))
+                        {
+
+                        }
+                        else
+                        {
+                            openApiControllerGroup = new() { ApiName = controllerDescription, ApiRoute = actionDesc.ControllerName };
+
+                            openApiPermissionTreeSelectorDict.Add(actionDesc.ControllerName, openApiControllerGroup);
+                        }
+
+                        var ignoreRolePermission = actionDesc.MethodInfo.CustomAttributes.Any(a => a.AttributeType == typeof(IgnoreRolePermissionAttribute));
+                        if (ignoreRolePermission)
+                            continue;
+                        var routePath = route.RelativePath;
+                        var methodDesc = actionDesc.MethodInfo.DeclaringType.GetMethodDisplayName(actionDesc.MethodInfo.Name);
+
+                        //添加到权限列表
+                        openApiControllerGroup.Children ??= new();
+                        openApiControllerGroup.Children.Add(new OpenApiPermissionTreeSelector
+                        {
+                            ApiName = methodDesc,
+                            ApiRoute = routePath,
+                        });
+                    }
+
+
+                    openApiPermissionTreeSelector.Children.AddRange(openApiPermissionTreeSelectorDict.Values);
+
+                    if (openApiPermissionTreeSelector.Children.Any(a => a.Children.Count > 0))
+                        permissions.Add(openApiPermissionTreeSelector);
+
+                }
+
+            }
+
+            App.CacheService.Set(cacheKey, permissions);
+        }
+        return permissions;
+    }
+
+
+    /// <summary>
+    /// 获取路由地址名称
+    /// </summary>
+    /// <param name="controllerName">控制器地址</param>
+    /// <param name="template">路由名称</param>
+    /// <returns></returns>
+    public string GetRouteName(string controllerName, string template)
+    {
+        if (!template.StartsWith('/'))
+            template = "/" + template;//如果路由名称不是/开头则加上/防止控制器没写
+        if (template.Contains("[controller]"))
+        {
+            controllerName = controllerName.Replace("Controller", "");//去掉Controller
+            controllerName = controllerName.ToLowerCamelCase();//转首字母小写写
+            template = template.Replace("[controller]", controllerName);//替换[controller]
+        }
+
+        return template;
+    }
+
+    /// <inheritdoc />
+    public IEnumerable<PermissionTreeSelector> PermissionTreeSelector(IEnumerable<string> routes)
+    {
+        List<PermissionTreeSelector> permissions = PermissionTreeSelector();
+        var hashSet = routes.ToHashSet();
+        return permissions.Where(a => hashSet.Contains(a.ApiRoute));
+    }
+
+    /// <inheritdoc />
+    public List<PermissionTreeSelector> PermissionTreeSelector()
+    {
+        var cacheKey = $"{nameof(PermissionTreeSelector)}-{CultureInfo.CurrentUICulture.Name}";
+        var permissions = App.CacheService.GetOrAdd(cacheKey, entry =>
+        {
+            List<PermissionTreeSelector> permissions = new();//权限列表
+
+            // 获取所有需要数据权限的控制器
+            var controllerTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass
+        && u.IsDefined(typeof(AuthorizeAttribute), false)
+        && u.IsDefined(typeof(Microsoft.AspNetCore.Components.RouteAttribute), false));
+
+            foreach (var controller in controllerTypes)
+            {
+                //获取数据权限特性
+                var route = controller.GetCustomAttributes<Microsoft.AspNetCore.Components.RouteAttribute>().FirstOrDefault();
+                if (route == null) continue;
+                var apiRoute = GetRouteName(controller.Name, route.Template);//赋值路由名称
+
+                var desc = controller.GetTypeDisplayName();
+                //添加到权限列表
+                permissions.Add(new PermissionTreeSelector
+                {
+                    ApiName = desc,
+                    ApiRoute = apiRoute,
+                });
+            }
+            return permissions;
+        });
+
+        return permissions;
+    }
+}

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

@@ -0,0 +1,24 @@
+// ------------------------------------------------------------------------------
+// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+// 此代码版权（除特别声明外的代码）归作者本人Diego所有
+// 源代码使用协议遵循本仓库的开源协议及附加协议
+// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+// 使用文档：https://thingsgateway.cn/
+// QQ群：605534569
+// ------------------------------------------------------------------------------
+
+
+using ThingsGateway.Admin.Application;
+
+public interface IApiPermissionService
+{
+    /// <summary>
+    /// 获取API树
+    /// </summary>
+    /// <returns></returns>
+    public List<OpenApiPermissionTreeSelector> ApiPermissionTreeSelector();
+    string GetRouteName(string controllerName, string template);
+    List<PermissionTreeSelector> PermissionTreeSelector();
+    IEnumerable<PermissionTreeSelector> PermissionTreeSelector(IEnumerable<string> routes);
+}

src/Admin/ThingsGateway.Admin.Application/Services/AppService/AppService.cs

@@ -0,0 +1,77 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.WebUtilities;
+
+using System.Security.Claims;
+
+using UAParser;
+
+namespace ThingsGateway.Admin.Application;
+
+public class AppService : IAppService
+{
+    public string GetReturnUrl(string returnUrl)
+    {
+        var url = QueryHelpers.AddQueryString(CookieAuthenticationDefaults.LoginPath, new Dictionary<string, string?>
+        {
+            ["ReturnUrl"] = returnUrl
+        });
+        return url;
+    }
+
+    public async Task LoginOutAsync()
+    {
+        try
+        {
+            await App.HttpContext!.SignOutAsync().ConfigureAwait(false);
+            App.HttpContext!.SignoutToSwagger();
+        }
+        catch
+        {
+        }
+    }
+    public Parser Parser = Parser.GetDefault();
+    public ClientInfo? ClientInfo
+    {
+        get
+        {
+            var str = App.HttpContext?.Request?.Headers?.UserAgent;
+            ClientInfo? clientInfo = null;
+            if (!string.IsNullOrEmpty(str))
+            {
+                clientInfo = Parser.Parse(str);
+            }
+            return clientInfo;
+        }
+    }
+
+
+
+    public async Task LoginAsync(ClaimsIdentity identity, int expire)
+    {
+        var diffTime = DateTime.Now + TimeSpan.FromMinutes(expire);
+        //var diffTime = DateTime.Now.AddMinutes(expire);
+        await App.HttpContext!.SignInAsync(ClaimConst.Scheme, new ClaimsPrincipal(identity), new AuthenticationProperties()
+        {
+            IsPersistent = true,
+            AllowRefresh = true,
+            ExpiresUtc = diffTime,
+        }).ConfigureAwait(false);
+    }
+    public ClaimsPrincipal? User => App.User;
+
+    public string? RemoteIpAddress => App.HttpContext?.GetRemoteIpAddressToIPv4();
+
+    public int LocalPort => App.HttpContext.Connection.LocalPort;
+}

src/Admin/ThingsGateway.Admin.Application/Services/AppService/HybridAppService.cs

@@ -11,12 +11,11 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 
-using System.Net;
 using System.Security.Claims;
 
 using UAParser;
 
-namespace ThingsGateway.Photino;
+namespace ThingsGateway.Admin.Application;
 
 public class HybridAppService : IAppService
 {
@@ -24,10 +23,22 @@ public class HybridAppService : IAppService
     {
         var str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 Edg/127.0.0.0";
         ClientInfo = Parser.GetDefault().Parse(str);
-        RemoteIpAddress = IPAddress.Parse("127.0.0.1");
+        RemoteIpAddress = "127.0.0.1";
     }
     public ClientInfo? ClientInfo { get; }
 
+    private static BlazorHybridAuthenticationStateProvider _authenticationStateProvider;
+    private static BlazorHybridAuthenticationStateProvider AuthenticationStateProvider
+    {
+        get
+        {
+            if (_authenticationStateProvider == null)
+                _authenticationStateProvider = ((BlazorHybridAuthenticationStateProvider)App.RootServices.GetService<AuthenticationStateProvider>());
+
+            return _authenticationStateProvider;
+        }
+    }
+
     private ClaimsPrincipal? user;
 
     public ClaimsPrincipal? User
@@ -35,12 +46,16 @@ public class HybridAppService : IAppService
         get { return user; }
         internal set
         {
+            if (user == value)
+            {
+                return;
+            }
             user = value;
-            ((BlazorHybridAuthenticationStateProvider)App.RootServices.GetService<AuthenticationStateProvider>()).UserChanged();
+            AuthenticationStateProvider.UserChanged(user);
         }
     }
 
-    public IPAddress? RemoteIpAddress { get; }
+    public string? RemoteIpAddress { get; }
 
     public string GetReturnUrl(string returnUrl)
     {
@@ -53,9 +68,10 @@ public class HybridAppService : IAppService
         return Task.CompletedTask;
     }
 
-    public Task LoginAsync(ClaimsIdentity claimsIdentity)
+    public Task LoginAsync(ClaimsIdentity claimsIdentity, int expire)
     {
         User = new ClaimsPrincipal(claimsIdentity);
         return Task.CompletedTask;
     }
+
 }

src/Admin/ThingsGateway.Admin.Application/Services/AppService/IAppService.cs

@@ -0,0 +1,55 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+
+using System.Security.Claims;
+
+using UAParser;
+
+namespace ThingsGateway.Admin.Application;
+
+public interface IAppService
+{
+    /// <summary>
+    /// ClientInfo
+    /// </summary>
+    public ClientInfo? ClientInfo { get; }
+
+    /// <summary>
+    /// ClaimsPrincipal
+    /// </summary>
+    public ClaimsPrincipal? User { get; }
+
+    /// <summary>
+    /// RemoteIpAddress
+    /// </summary>
+    public string? RemoteIpAddress { get; }
+
+    /// <summary>
+    /// GetReturnUrl
+    /// </summary>
+    /// <param name="returnUrl"></param>
+    /// <returns></returns>
+    public string GetReturnUrl(string returnUrl);
+
+    /// <summary>
+    /// LoginOutAsync
+    /// </summary>
+    public Task LoginOutAsync();
+
+    /// <summary>
+    /// LoginAsync
+    /// </summary>
+    /// <returns></returns>
+    public Task LoginAsync(ClaimsIdentity claimsIdentity, int expire);
+
+}
+
+

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

@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using ThingsGateway.NewLife.Json.Extension;
+using ThingsGateway.Razor;
+
+
+namespace ThingsGateway.Admin.Application;
+
+internal sealed class AuthRazorService : IAuthRazorService
+{
+
+    private AjaxService AjaxService { get; set; }
+    public AuthRazorService(AjaxService ajaxService)
+    {
+        AjaxService = ajaxService;
+    }
+    /// <summary>
+    /// 用户登录
+    /// </summary>
+    public async Task<UnifyResult<LoginOutput>> LoginAsync(LoginInput input)
+    {
+        var ajaxOption = new AjaxOption
+        {
+            Url = "/api/auth/login",
+            Method = "POST",
+            ToJson = true,
+            Data = input,
+        };
+        var str = await AjaxService.InvokeAsync(ajaxOption).ConfigureAwait(false);
+        if (str != null)
+        {
+            var ret = str.RootElement.GetRawText().FromJsonNetString<UnifyResult<LoginOutput>>();
+            return ret;
+        }
+        else
+        {
+            throw new ArgumentNullException();
+        }
+    }
+
+    /// <summary>
+    /// 注销当前用户
+    /// </summary>
+    public async Task<UnifyResult<object>> LoginOutAsync()
+    {
+        var ajaxOption = new AjaxOption
+        {
+            Url = "/api/auth/logout",
+            Method = "POST",
+            ToJson = true,
+        };
+        using var str = await AjaxService.InvokeAsync(ajaxOption).ConfigureAwait(false);
+        if (str != null)
+        {
+            var ret = str.RootElement.GetRawText().FromJsonNetString<UnifyResult<object>>();
+            return ret;
+        }
+        else
+        {
+            throw new ArgumentNullException();
+        }
+    }
+}

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

@@ -0,0 +1,409 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Localization;
+
+using SqlSugar;
+
+using System.Security.Claims;
+
+using ThingsGateway.DataEncryption;
+using ThingsGateway.FriendlyException;
+
+namespace ThingsGateway.Admin.Application;
+
+public class AuthService : IAuthService
+{
+    private readonly ISysDictService _configService;
+    private readonly ISysResourceService _sysResourceService;
+    private readonly IUserCenterService _userCenterService;
+    private readonly ISysUserService _sysUserService;
+    private readonly ISysOrgService _sysOrgService;
+    private IStringLocalizer<AuthService> _localizer;
+    private IVerificatInfoService _verificatInfoService;
+    private IAppService _appService;
+
+    public AuthService(ISysDictService configService, ISysResourceService sysResourceService,
+        ISysUserService userService, IUserCenterService userCenterService,
+         ISysOrgService sysOrgService,
+        IVerificatInfoService verificatInfoService, IAppService appService,
+        IStringLocalizer<AuthService> localizer)
+    {
+        _sysOrgService = sysOrgService;
+        _configService = configService;
+        _appService = appService;
+        _sysUserService = userService;
+        _sysResourceService = sysResourceService;
+        _userCenterService = userCenterService;
+        _localizer = localizer;
+        _verificatInfoService = verificatInfoService;
+    }
+
+    /// <summary>
+    /// 登录
+    /// </summary>
+    /// <param name="input">登录参数</param>
+    /// <param name="isCookie">cookie方式登录</param>
+    /// <returns>登录输出</returns>
+    public async Task<LoginOutput> LoginAsync(LoginInput input, bool isCookie = true)
+    {
+        var appConfig = await _configService.GetAppConfigAsync().ConfigureAwait(false);
+
+        //判断是否开启web访问
+        if (!appConfig.WebsitePolicy.WebStatus
+            && input.Account != RoleConst.SuperAdmin)//如果禁用了网站并且不是超级管理员
+        {
+            throw Oops.Bah(appConfig.WebsitePolicy.CloseTip);
+        }
+        string? password = input.Password;
+        if (isCookie) //openApi登录不再需要解密
+        {
+            try
+            {
+                password = DESEncryption.Decrypt(input.Password);//解密
+            }
+            catch (Exception)
+            {
+                throw Oops.Bah(_localizer["MustDesc"]);
+            }
+        }
+
+        await BeforeLoginAsync(appConfig, input).ConfigureAwait(false);//登录前校验
+
+        var userInfo = await _sysUserService.GetUserByAccountAsync(input.Account, input.TenantId).ConfigureAwait(false);//获取用户信息
+        if (userInfo == null)
+            throw Oops.Bah(_localizer["UserNull", input.Account]);//用户不存在
+
+        if (userInfo.Password != password)
+        {
+            LoginError(appConfig.LoginPolicy, input.Account);//登录错误操作
+        }
+        var result = await ExecLogin(appConfig.LoginPolicy, input, userInfo, isCookie).ConfigureAwait(false);// 执行登录
+        return result;
+    }
+
+    /// <summary>
+    /// 注销当前用户
+    /// </summary>
+    public async Task LoginOutAsync()
+    {
+        if (UserManager.UserId == 0)
+            return;
+        var verificatId = UserManager.UserId;
+        //获取用户信息
+        var userinfo = await _sysUserService.GetUserByAccountAsync(UserManager.UserAccount, UserManager.TenantId).ConfigureAwait(false);
+        if (userinfo != null)
+        {
+            var loginEvent = new LoginEvent
+            {
+                Ip = _appService.RemoteIpAddress,
+                SysUser = userinfo,
+                VerificatId = verificatId
+            };
+            RemoveTokenFromCache(loginEvent);//移除verificat
+        }
+        await _appService.LoginOutAsync().ConfigureAwait(false);
+    }
+
+    #region 方法
+
+    /// <summary>
+    /// 登录之前执行的方法
+    /// </summary>
+    /// <param name="appConfig">配置</param>
+    /// <param name="input">input</param>
+    private async Task BeforeLoginAsync(AppConfig appConfig, LoginInput input)
+    {
+        var tenantEnable = App.GetOptions<TenantOptions>()?.Enable ?? false;
+
+        if (tenantEnable)
+        {
+            //如果租户ID为空表示用域名登录
+            if (input.TenantId == null)
+            {
+                //获取域名
+                var origin = App.HttpContext.Request.Headers["Origin"].ToString();
+                // 如果Origin头不存在，可以尝试使用Referer头作为备选
+                if (string.IsNullOrEmpty(origin))
+                    origin = App.HttpContext.Request.Headers["Referer"].ToString();
+                //根据域名获取二级域名
+                var domain = origin.Split("//")[1].Split(".")[0];
+                //根据二级域名获取租户
+                var tenantList = await _sysOrgService.GetTenantListAsync().ConfigureAwait(false);
+                var tenant = tenantList.FirstOrDefault(x => x.Code.Equals(domain, StringComparison.OrdinalIgnoreCase));//获取租户默认是机构编码
+                if (tenant != null)
+                    input.TenantId = tenant.Id;
+                else
+                    input.TenantId = RoleConst.DefaultTenantId;
+            }
+        }
+        else
+        {
+            input.TenantId = RoleConst.DefaultTenantId;
+        }
+
+        var key = CacheConst.Cache_LoginErrorCount + input.Account + input.TenantId;//获取登录错误次数Key值
+        var errorCountCache = App.CacheService.Get<int>(key);//获取登录错误次数
+
+        if (errorCountCache >= appConfig.LoginPolicy.ErrorCount)
+        {
+            App.CacheService.SetExpire(key, TimeSpan.FromMinutes(appConfig.LoginPolicy.ErrorLockTime));//设置缓存
+            throw Oops.Bah(_localizer["PasswordError", appConfig.LoginPolicy.ErrorLockTime]);
+        }
+    }
+
+    /// <summary>
+    /// 执行登录
+    /// </summary>
+    /// <param name="loginPolicy">登录策略</param>
+    /// <param name="input">用户登录参数</param>
+    /// <param name="sysUser">用户信息</param>
+    /// <param name="isCookie">cookie方式登录</param>
+    /// <returns>登录输出结果</returns>
+    private async Task<LoginOutput> ExecLogin(LoginPolicy loginPolicy, LoginInput input, SysUser sysUser, bool isCookie = true)
+    {
+        if (sysUser.Status == false)
+            throw Oops.Bah(_localizer["UserDisable", sysUser.Account]);//账号已停用
+
+        var verificatId = CommonUtils.GetSingleId();
+        var expire = loginPolicy.VerificatExpireTime;
+        string accessToken = string.Empty;
+        string refreshToken = string.Empty;
+        if (!isCookie)
+        {
+            #region Token
+
+            //生成Token
+            accessToken = JWTEncryption.Encrypt(new Dictionary<string, object>
+        {
+            {
+                ClaimConst.UserId, sysUser.Id
+            },
+            {
+                ClaimConst.Account, sysUser.Account
+            },
+            {
+                ClaimConst.SuperAdmin, sysUser.RoleIdList.Contains(RoleConst.SuperAdminRoleId)
+            },
+                                {
+                ClaimConst.VerificatId, verificatId
+            },
+            {
+                ClaimConst.OrgId, sysUser.OrgId
+            },
+             {
+                ClaimConst.TenantId, input.TenantId
+            }
+        });
+            // 生成刷新Token令牌
+            refreshToken = JWTEncryption.GenerateRefreshToken(accessToken, expire * 2);
+            // 设置Swagger自动登录
+            App.HttpContext?.SigninToSwagger(accessToken);
+            // 设置响应报文头
+            App.HttpContext?.SetTokensOfResponseHeaders(accessToken, refreshToken);
+
+            #endregion Token
+        }
+        else
+        {
+            if (sysUser.ModuleList.Count == 0)
+                throw Oops.Bah(_localizer["UserNoModule"]);//未分配模块
+            var org = await _sysOrgService.GetSysOrgByIdAsync(sysUser.OrgId).ConfigureAwait(false);//获取机构
+            if (!org.Status) throw Oops.Bah(_localizer["OrgDisable"]);//机构冻结
+            #region cookie
+
+            var identity = new ClaimsIdentity(CookieAuthenticationDefaults.AuthenticationScheme);
+            identity.AddClaim(new Claim(ClaimConst.VerificatId, verificatId.ToString()));
+            identity.AddClaim(new Claim(ClaimConst.UserId, sysUser.Id.ToString()));
+            identity.AddClaim(new Claim(ClaimConst.Account, sysUser.Account));
+            identity.AddClaim(new Claim(ClaimConst.SuperAdmin, sysUser.RoleIdList.Contains(RoleConst.SuperAdminRoleId).ToString()));
+            identity.AddClaim(new Claim(ClaimConst.OrgId, sysUser.OrgId.ToString()));
+            identity.AddClaim(new Claim(ClaimConst.TenantId, input.TenantId?.ToString() ?? "0"));
+
+            await _appService.LoginAsync(identity, expire).ConfigureAwait(false);
+
+            #endregion cookie
+        }
+        //登录事件参数
+        var logingEvent = new LoginEvent
+        {
+            Ip = _appService.RemoteIpAddress,
+            Device = App.GetService<IAppService>().ClientInfo?.OS?.ToString(),
+            Expire = expire,
+            SysUser = sysUser,
+            VerificatId = verificatId
+        };
+        await WriteTokenToCache(loginPolicy, logingEvent).ConfigureAwait(false);//写入verificat到cache
+        await UpdateUser(logingEvent).ConfigureAwait(false);
+        if (sysUser.Account == RoleConst.SuperAdmin)
+        {
+            var modules = (await _sysResourceService.GetAllAsync().ConfigureAwait(false)).Where(a => a.Category == ResourceCategoryEnum.Module).OrderBy(a => a.SortCode);//获取模块列表
+            sysUser.ModuleList = modules.ToList();//模块列表赋值给用户
+        }
+        //返回结果
+        return new LoginOutput
+        {
+            VerificatId = verificatId,
+            Account = sysUser.Account,
+            Id = sysUser.Id,
+            ModuleList = sysUser.ModuleList,
+            AccessToken = accessToken,
+            RefreshToken = refreshToken
+        };
+    }
+
+    /// <summary>
+    /// 登录错误反馈
+    /// </summary>
+    /// <param name="loginPolicy">登录策略</param>
+    /// <param name="userName">用户名称</param>
+    private void LoginError(LoginPolicy loginPolicy, string userName)
+    {
+        var key = CacheConst.Cache_LoginErrorCount + userName;//获取登录错误次数Key值
+        App.CacheService.Increment(key, 1);// 登录错误次数+1
+        App.CacheService.SetExpire(key, TimeSpan.FromMinutes(loginPolicy.ErrorResetTime));//设置过期时间
+        var errorCountCache = App.CacheService.Get<int>(key);//获取登录错误次数
+        throw Oops.Bah(_localizer["AuthErrorMax", loginPolicy.ErrorCount, loginPolicy.ErrorLockTime, errorCountCache]);//账号密码错误
+    }
+
+    /// <summary>
+    /// 从cache删除用户verificat
+    /// </summary>
+    /// <param name="loginEvent">登录事件参数</param>
+    private void RemoveTokenFromCache(LoginEvent loginEvent)
+    {
+        //更新verificat列表
+        _verificatInfoService.Delete(loginEvent.VerificatId);
+    }
+
+    /// <summary>
+    /// 单用户登录通知用户下线
+    /// </summary>
+    /// <param name="userId">用户Id</param>
+    private async Task SingleLogin(long userId)
+    {
+        var clientIds = _verificatInfoService.GetClientIdListByUserId(userId);
+        await NoticeUtil.UserLoginOut(new UserLoginOutEvent
+        {
+            Message = _localizer["SingleLoginWarn"],
+            ClientIds = clientIds,
+        }).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// 登录事件
+    /// </summary>
+    /// <param name="loginEvent"></param>
+    /// <returns></returns>
+    private async Task UpdateUser(LoginEvent loginEvent)
+    {
+        var sysUser = loginEvent.SysUser;
+
+        #region 登录/密码策略
+
+        var key = CacheConst.Cache_LoginErrorCount + sysUser.Account;//获取登录错误次数Key值
+        App.CacheService.Remove(key);//移除登录错误次数
+
+        //获取用户verificat列表
+        var userToken = _verificatInfoService.GetOne(loginEvent.VerificatId);
+
+        #endregion 登录/密码策略
+
+        #region 重新赋值属性,设置本次登录信息为最新的信息
+
+        sysUser.LastLoginIp = sysUser.LatestLoginIp;
+        sysUser.LastLoginTime = sysUser.LatestLoginTime;
+        sysUser.LatestLoginIp = loginEvent.Ip;
+        sysUser.LatestLoginTime = loginEvent.DateTime;
+
+        #endregion 重新赋值属性,设置本次登录信息为最新的信息
+
+        using var db = DbContext.Db.GetConnectionScopeWithAttr<SysUser>().CopyNew();
+        //更新用户登录信息
+        if (await db.Updateable(sysUser).UpdateColumns(it => new
+        {
+            it.LastLoginIp,
+            it.LastLoginTime,
+            it.LatestLoginIp,
+            it.LatestLoginTime,
+        }).ExecuteCommandAsync().ConfigureAwait(false) > 0)
+            App.CacheService.HashAdd(CacheConst.Cache_SysUser, sysUser.Id.ToString(), sysUser);//更新Cache信息
+    }
+
+    /// <summary>
+    /// 写入用户verificat到cache
+    /// </summary>
+    /// <param name="loginPolicy">登录策略</param>
+    /// <param name="loginEvent">登录事件参数</param>
+    private async Task WriteTokenToCache(LoginPolicy loginPolicy, LoginEvent loginEvent)
+    {
+        //获取verificat列表
+        var tokenTimeout = loginEvent.DateTime.AddMinutes(loginEvent.Expire);
+        //生成verificat信息
+        var verificatInfo = new VerificatInfo
+        {
+            Device = loginEvent.Device,
+            Expire = loginEvent.Expire,
+            VerificatTimeout = tokenTimeout,
+            Id = loginEvent.VerificatId,
+            UserId = loginEvent.SysUser.Id,
+            LoginIp = loginEvent.Ip,
+            LoginTime = loginEvent.DateTime
+        };
+        //判断是否单用户登录
+        if (loginPolicy.SingleOpen)
+        {
+            await SingleLogin(loginEvent.SysUser.Id).ConfigureAwait(false);//单用户登录方法
+        }
+
+        //添加到verificat列表
+        _verificatInfoService.Add(verificatInfo);
+    }
+
+    #endregion 方法
+}
+
+/// <summary>
+/// 登录事件参数
+/// </summary>
+public class LoginEvent
+{
+    /// <summary>
+    /// 时间
+    /// </summary>
+    public DateTime DateTime = DateTime.Now;
+
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    public int Expire { get; set; }
+
+    /// <summary>
+    /// Ip地址
+    /// </summary>
+    public string? Ip { get; set; }
+
+    /// <summary>
+    /// 用户信息
+    /// </summary>
+    public SysUser SysUser { get; set; }
+
+    /// <summary>
+    /// VerificatId
+    /// </summary>
+    public long VerificatId { get; set; }
+
+    /// <summary>
+    /// 登录设备
+    /// </summary>
+    public string Device { get; set; }
+}

src/Admin/ThingsGateway.Admin.Application/Services/Auth/Dto/AuthInput.cs

@@ -0,0 +1,67 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using System.ComponentModel.DataAnnotations;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 登录输入参数
+/// </summary>
+public class OpenApiLoginInput
+{
+    /// <summary>
+    /// 账号
+    ///</summary>
+    /// <example>SuperAdmin</example>
+    [Required]
+    public string Account { get; set; }
+
+    /// <summary>
+    /// 密码
+    ///</summary>
+    ///<example>111111</example>
+    [Required]
+    public string Password { get; set; }
+
+
+    /// <summary>
+    /// 租户Id
+    ///</summary>
+    ///<example>252885263003720</example>
+    [Required]
+    public long TenantId { get; set; }
+}
+
+/// <summary>
+/// 登录输入参数
+/// </summary>
+public class LoginInput
+{
+    /// <summary>
+    /// 账号
+    ///</summary>
+    /// <example>SuperAdmin</example>
+    [Required]
+    public string Account { get; set; }
+
+    /// <summary>
+    /// 密码
+    ///</summary>
+    ///<example>111111</example>
+    [Required]
+    public string Password { get; set; }
+    /// <summary>
+    /// 租户ID
+    /// </summary>
+    ///<example>252885263003720</example>
+    public long? TenantId { get; set; } = RoleConst.DefaultTenantId;
+
+}

src/Admin/ThingsGateway.Admin.Application/Services/Auth/Dto/AuthOutput.cs

@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public class OpenApiLoginOutput
+{
+    /// <summary>
+    /// 令牌Token
+    /// </summary>
+    public string AccessToken { get; set; }
+
+    /// <summary>
+    /// 账号
+    /// </summary>
+    public string Account { get; set; }
+
+    /// <summary>
+    /// 用户Id
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// 刷新Token
+    /// </summary>
+    public string RefreshToken { get; set; }
+
+    /// <summary>
+    /// 验证ID
+    /// </summary>
+    public long VerificatId { get; set; }
+}
+
+public class LoginOutput
+{
+    /// <summary>
+    /// 令牌Token
+    /// </summary>
+    public string AccessToken { get; set; }
+
+    /// <summary>
+    /// 账号
+    /// </summary>
+    public string Account { get; set; }
+
+    /// <summary>
+    /// 用户Id
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// 模块列表
+    /// </summary>
+    public IEnumerable<SysResource> ModuleList { get; set; } = Enumerable.Empty<SysResource>();
+
+    /// <summary>
+    /// 刷新Token
+    /// </summary>
+    public string RefreshToken { get; set; }
+
+    /// <summary>
+    /// 验证ID
+    /// </summary>
+    public long VerificatId { get; set; }
+}

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

@@ -8,9 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using ThingsGateway.Admin.Application;
+using ThingsGateway.Razor;
 
-namespace ThingsGateway.Photino;
+namespace ThingsGateway.Admin.Application;
 
 
 public class HybridAuthRazorService : IAuthRazorService

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

@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using ThingsGateway.Razor;
+
+namespace ThingsGateway.Admin.Application;
+
+public interface IAuthRazorService
+{
+    /// <summary>
+    /// 用户登录
+    /// </summary>
+    Task<UnifyResult<LoginOutput>> LoginAsync(LoginInput input);
+
+    /// <summary>
+    /// 注销当前用户
+    /// </summary>
+    Task<UnifyResult<object>> LoginOutAsync();
+}

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

@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 定义身份验证服务的接口
+/// </summary>
+public interface IAuthService
+{
+    /// <summary>
+    /// 用户登录
+    /// </summary>
+    /// <param name="input">登录参数</param>
+    /// <param name="isCookie">是否使用 cookie 登录方式</param>
+    /// <returns>登录输出</returns>
+    Task<LoginOutput> LoginAsync(LoginInput input, bool isCookie = true);
+
+    /// <summary>
+    /// 注销当前用户
+    /// </summary>
+    Task LoginOutAsync();
+}

src/Admin/ThingsGateway.Admin.Application/Services/Dict/Dto/AppConfig.cs

@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public class AppConfig
+{
+    /// <summary>
+    /// 登录策略
+    /// </summary>
+    public LoginPolicy LoginPolicy { get; set; }
+
+    /// <summary>
+    /// 页面策略
+    /// </summary>
+    public PagePolicy PagePolicy { get; set; }
+
+    /// <summary>
+    /// 密码策略
+    /// </summary>
+    public PasswordPolicy PasswordPolicy { get; set; }
+
+    public WebsitePolicy WebsitePolicy { get; set; }
+}

src/Admin/ThingsGateway.Admin.Application/Services/Dict/Dto/LoginPolicy.cs

@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public class LoginPolicy
+{
+    /// <summary>
+    /// 登录错误次数锁定阈值
+    /// </summary>
+    [MinValue(3)]
+    public int ErrorCount { get; set; }
+
+    /// <summary>
+    /// 登录错误锁定时间(分)
+    /// </summary>
+    [MinValue(1)]
+    public int ErrorLockTime { get; set; }
+
+    /// <summary>
+    ///  登录错误次数过期时间(分)
+    /// </summary>
+    [MinValue(1)]
+    public int ErrorResetTime { get; set; }
+
+    /// <summary>
+    /// 单用户登录开关
+    /// </summary>
+    public bool SingleOpen { get; set; }
+
+    /// <summary>
+    /// 登录过期时间(分)
+    /// </summary>
+    [MinValue(1)]
+    public int VerificatExpireTime { get; set; }
+}

src/Admin/ThingsGateway.Admin.Application/Services/Dict/Dto/PagePolicy.cs

@@ -0,0 +1,19 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public class PagePolicy
+{
+    /// <summary>
+    /// 系统默认快捷方式菜单ID列表
+    /// </summary>
+    public List<long> Shortcuts { get; set; } = new();
+}

src/Admin/ThingsGateway.Admin.Application/Services/Dict/Dto/PasswordPolicy.cs

@@ -0,0 +1,48 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using System.ComponentModel.DataAnnotations;
+
+namespace ThingsGateway.Admin.Application;
+
+public class PasswordPolicy
+{
+    /// <summary>
+    /// 默认用户密码
+    /// </summary>
+    [Required]
+    public string DefaultPassword { get; set; }
+
+    /// <summary>
+    /// 包含特殊字符
+    /// </summary>
+    public bool PasswordContainChar { get; set; }
+
+    /// <summary>
+    /// 包含小写字母
+    /// </summary>
+    public bool PasswordContainLower { get; set; }
+
+    /// <summary>
+    /// 包含数字
+    /// </summary>
+    public bool PasswordContainNum { get; set; }
+
+    /// <summary>
+    /// 包含大写字母
+    /// </summary>
+    public bool PasswordContainUpper { get; set; }
+
+    /// <summary>
+    /// 密码最小长度
+    /// </summary>
+    [MinValue(1)]
+    public int PasswordMinLen { get; set; }
+}

src/Admin/ThingsGateway.Admin.Application/Services/Dict/Dto/WebsitePolicy.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using System.ComponentModel.DataAnnotations;
+
+namespace ThingsGateway.Admin.Application;
+
+public class WebsitePolicy
+{
+    /// <summary>
+    /// 关闭提示
+    /// </summary>
+    [Required]
+    public string CloseTip { get; set; }
+
+    /// <summary>
+    /// 是否开放
+    /// </summary>
+    public bool WebStatus { get; set; }
+}

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

@@ -0,0 +1,92 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 系统字典服务接口，提供对系统字典的操作
+/// </summary>
+public interface ISysDictService
+{
+    /// <summary>
+    /// 删除业务配置
+    /// </summary>
+    /// <param name="ids">待删除配置项的ID列表</param>
+    /// <returns>是否成功删除</returns>
+    Task<bool> DeleteDictAsync(IEnumerable<long> ids);
+
+    /// <summary>
+    /// 修改登录策略
+    /// </summary>
+    /// <param name="input">登录策略</param>
+    Task EditLoginPolicyAsync(LoginPolicy input);
+
+    /// <summary>
+    /// 修改页面策略
+    /// </summary>
+    /// <param name="input">页面策略</param>
+    Task EditPagePolicyAsync(PagePolicy input);
+
+    /// <summary>
+    /// 修改密码策略
+    /// </summary>
+    /// <param name="input">密码策略</param>
+    Task EditPasswordPolicyAsync(PasswordPolicy input);
+
+    /// <summary>
+    /// 修改网站设置
+    /// </summary>
+    /// <param name="input">网站设置</param>
+    Task EditWebsitePolicyAsync(WebsitePolicy input);
+
+    /// <summary>
+    /// 获取系统配置
+    /// </summary>
+    /// <returns>系统配置信息</returns>
+    Task<AppConfig> GetAppConfigAsync();
+
+    /// <summary>
+    /// 根据分类和名称获取系统字典项
+    /// </summary>
+    /// <param name="category">分类</param>
+    /// <param name="name">名称</param>
+    /// <returns>系统字典项</returns>
+    Task<SysDict> GetByKeyAsync(string category, string name);
+
+
+    /// <summary>
+    /// 从缓存/数据库获取自定义配置列表
+    /// </summary>
+    /// <returns>自定义配置列表</returns>
+    Task<IDictionary<string, SysDict>> GetDefineConfigAsync();
+
+    /// <summary>
+    /// 从缓存/数据库获取系统配置列表
+    /// </summary>
+    /// <returns>系统配置列表</returns>
+    Task<List<SysDict>> GetSystemConfigAsync();
+
+    /// <summary>
+    /// 表格查询
+    /// </summary>
+    /// <param name="option">查询选项</param>
+    /// <returns>查询结果</returns>
+    Task<QueryData<SysDict>> PageAsync(QueryPageOptions option);
+
+    /// <summary>
+    /// 修改业务配置
+    /// </summary>
+    /// <param name="input">配置项</param>
+    /// <param name="type">保存类型</param>
+    /// <returns>是否成功保存</returns>
+    Task<bool> SaveDictAsync(SysDict input, ItemChangedType type);
+}