10.7.32

* 修复缺少引用编译错误

.gitignore

@@ -365,4 +365,5 @@ FodyWeavers.xsd
 /src/*Pro*/
 /src/*Pro*
 /src/*pro*
-/src/*pro*/
+/src/*pro*/
+/src/ThingsGateway.Server/Configuration/GiteeOAuthSettings.json

src/.editorconfig

@@ -126,35 +126,8 @@ dotnet_style_qualification_for_property = false:silent
 dotnet_style_qualification_for_method = false:silent
 dotnet_style_qualification_for_event = false:silent
 
-
-dotnet_diagnostic.CA2208.severity = none
-dotnet_diagnostic.CA2008.severity = none
-dotnet_diagnostic.CA1812.severity = none
-dotnet_diagnostic.CA1508.severity = none
-dotnet_diagnostic.CA1512.severity = none
-dotnet_diagnostic.CA1513.severity = none
-dotnet_diagnostic.CA1810.severity = none
-dotnet_diagnostic.CA1814.severity = none
-dotnet_diagnostic.CA1815.severity = none
-dotnet_diagnostic.CA1835.severity = none
-dotnet_diagnostic.CA1819.severity = none
-dotnet_diagnostic.CA1823.severity = none
-dotnet_diagnostic.CA2002.severity = none
-dotnet_diagnostic.CA5350.severity = none
-dotnet_diagnostic.CA5351.severity = none
-dotnet_diagnostic.CA5358.severity = none
-dotnet_diagnostic.CA5384.severity = none
-dotnet_diagnostic.CA5392.severity = none
-dotnet_diagnostic.CA1805.severity = none
-dotnet_diagnostic.CA1851.severity = none
-dotnet_diagnostic.CA1510.severity = none
-dotnet_diagnostic.CA5401.severity = none
-dotnet_diagnostic.CA2022.severity = none
-dotnet_diagnostic.CA1848.severity = none
-dotnet_diagnostic.CA2000.severity = none
-dotnet_diagnostic.CA5394.severity = none
-dotnet_diagnostic.CA3003.severity = none
-dotnet_diagnostic.CA1515.severity = none
-dotnet_diagnostic.CA1849.severity = none
+dotnet_diagnostic.RCS1146.severity = warning
+dotnet_diagnostic.RCS1059.severity = none
+dotnet_diagnostic.RCS1138.severity = suggestion
 
 dotnet_code_quality.CA1822.api_surface = private, internal

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

@@ -13,14 +13,16 @@ namespace ThingsGateway.Admin.Application;
 /// <summary>
 /// 需要角色授权权限
 /// </summary>
-[AttributeUsage(AttributeTargets.Class)]
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
 public sealed class RolePermissionAttribute : Attribute
 {
 }
 
+
 /// <summary>
 /// 忽略角色授权权限
 /// </summary>
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false)]
 public sealed class IgnoreRolePermissionAttribute : Attribute
 {
 }

src/Admin/ThingsGateway.Admin.Application/Attributes/LoginLogAttribute.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;
+
+
+[AttributeUsage(AttributeTargets.Method)]
+public sealed class LoginLogAttribute : Attribute
+{
+}
+[AttributeUsage(AttributeTargets.Method)]
+public sealed class LogoutLogAttribute : Attribute
+{
+}

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

@@ -11,7 +11,7 @@
 namespace ThingsGateway.Admin.Application;
 
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class CacheConst
+public static class CacheConst
 {
     /// <summary>
     /// Token表缓存Key

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

@@ -13,7 +13,7 @@ namespace ThingsGateway.Admin.Application;
 /// <summary>
 /// 通讯器常量
 /// </summary>
-public class HubConst
+public static class HubConst
 {
     /// <summary>
     /// 系统HubUrl

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

@@ -14,7 +14,7 @@ namespace ThingsGateway.Admin.Application;
 /// 资源表常量
 /// </summary>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class ResourceConst
+public static class ResourceConst
 {
     /// <summary>
     /// 系统内置编码

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

@@ -14,7 +14,7 @@ namespace ThingsGateway.Admin.Application;
 /// 角色常量
 /// </summary>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class RoleConst
+public static class RoleConst
 {
     /// <summary>
     /// api角色

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

@@ -14,7 +14,7 @@ namespace ThingsGateway.Admin.Application;
 /// SqlSugar系统常量
 /// </summary>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class SqlSugarConst
+public static class SqlSugarConst
 {
     /// <summary>
     /// DB_Admin

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

@@ -8,6 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -27,14 +28,31 @@ public class AuthController : ControllerBase
 
     [HttpPost("login")]
     [AllowAnonymous]
+    [LoginLog]
     public Task<LoginOutput> LoginAsync([FromBody] LoginInput input)
     {
+
         return _authService.LoginAsync(input);
+
     }
 
+    [HttpGet("oauth-login")]
+    [AllowAnonymous]
+    [SuppressRequestAudit]
+    public IActionResult OAuthLogin(string scheme = "Gitee", string returnUrl = "/")
+    {
+        var props = new AuthenticationProperties
+        {
+            RedirectUri = returnUrl
+        };
+        return Challenge(props, scheme);
+    }
+
+
     [HttpPost("logout")]
     [Authorize]
     [IgnoreRolePermission]
+    [LogoutLog]
     public Task LogoutAsync()
     {
         return _authService.LoginOutAsync();

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

@@ -1,14 +1,4 @@
-// ------------------------------------------------------------------------
-// 版权信息
-// 版权归百小僧及百签科技（广东）有限公司所有。
-// 所有权利保留。
-// 官方网站：https://baiqian.com
-//
-// 许可证信息
-// 项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。
-// 许可证的完整文本可以在源代码树根目录中的 LICENSE-APACHE 和 LICENSE-MIT 文件中找到。
-// ------------------------------------------------------------------------
-
+
 using ThingsGateway.DependencyInjection;
 
 namespace System;

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

@@ -8,6 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using System.Reflection;
+
 namespace ThingsGateway.Admin.Application;
 
 public class RequestAuditData
@@ -94,5 +96,6 @@ public class RequestAuditData
     /// 验证错误信息
     /// </summary>
     public Validation Validation { get; set; }
+    public MethodInfo MethodInfo { get; set; }
 }
 

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

@@ -21,29 +21,36 @@ using System.Logging;
 using ThingsGateway.FriendlyException;
 using ThingsGateway.Logging;
 using ThingsGateway.NewLife.Json.Extension;
+using ThingsGateway.UnifyResult;
 
 namespace ThingsGateway.Admin.Application;
 
-public class RequestAuditFilter : IAsyncActionFilter
+public class RequestAuditFilter : IAsyncActionFilter, IOrderedFilter
 {
+    private const int FilterOrder = -3000;
+    public int Order => FilterOrder;
+
     public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
     {
+        var timeOperation = Stopwatch.StartNew();
+        var resultContext = await next().ConfigureAwait(false);
+        // 计算接口执行时间
+        timeOperation.Stop();
 
         var controllerActionDescriptor = (context.ActionDescriptor as ControllerActionDescriptor);
         // 获取动作方法描述器
         var actionMethod = controllerActionDescriptor?.MethodInfo;
 
+
         // 处理 Blazor Server
         if (actionMethod == null)
         {
-            _ = await next.Invoke().ConfigureAwait(false);
             return;
         }
 
         // 排除 WebSocket 请求处理
         if (context.HttpContext.IsWebSocketRequest())
         {
-            _ = await next().ConfigureAwait(false);
             return;
         }
 
@@ -51,7 +58,6 @@ public class RequestAuditFilter : IAsyncActionFilter
         if (actionMethod.IsDefined(typeof(SuppressRequestAuditAttribute), true)
             || actionMethod.DeclaringType.IsDefined(typeof(SuppressRequestAuditAttribute), true))
         {
-            _ = await next().ConfigureAwait(false);
             return;
         }
 
@@ -65,10 +71,7 @@ public class RequestAuditFilter : IAsyncActionFilter
             return;
         }
 
-        // 计算接口执行时间
-        var timeOperation = Stopwatch.StartNew();
-        var resultContext = await next().ConfigureAwait(false);
-        timeOperation.Stop();
+
 
 
         var logData = new RequestAuditData();
@@ -88,21 +91,29 @@ public class RequestAuditFilter : IAsyncActionFilter
         var requestUrl = Uri.UnescapeDataString(httpRequest.GetRequestUrlAddress());
         logData.RequestUrl = requestUrl;
 
-
+        object returnValue = null;
+        Type finalReturnType;
         var result = resultContext.Result as IActionResult;
-        var data = result switch
+        // 解析返回值
+        if (UnifyContext.CheckVaildResult(result, out var data))
         {
-            // 处理内容结果
-            ContentResult content => content.Content,
-            // 处理对象结果
-            ObjectResult obj => obj.Value,
-            // 处理 JSON 对象
-            JsonResult json => json.Value,
-            _ => null,
-        };
-        logData.ReturnInformation = data;
-
+            returnValue = data;
+            finalReturnType = data?.GetType();
+        }
+        // 处理文件类型
+        else if (result is FileResult fresult)
+        {
+            returnValue = new
+            {
+                FileName = fresult.FileDownloadName,
+                fresult.ContentType,
+                Length = fresult is FileContentResult cresult ? (object)cresult.FileContents.Length : null
+            };
+            finalReturnType = fresult?.GetType();
+        }
+        else finalReturnType = result?.GetType();
 
+        logData.ReturnInformation = returnValue;
 
         //获取客户端信息
         var client = App.GetService<IAppService>().UserAgent;
@@ -112,12 +123,12 @@ public class RequestAuditFilter : IAsyncActionFilter
         var desc = App.CreateLocalizerByType(controllerActionDescriptor.ControllerTypeInfo.AsType())[actionMethod.Name];
         //获取特性
 
-
         logData.CateGory = desc.Value;//传操作名称
         logData.Operation = desc.Value;//传操作名称
         logData.Client = client;
         logData.Path = httpContext.Request.Path.Value;//请求地址
         logData.Method = httpContext.Request.Method;//请求方法
+        logData.MethodInfo = actionMethod;//请求方法
 
         logData.ControllerName = controllerActionDescriptor.ControllerName;
         logData.ActionName = controllerActionDescriptor.ActionName;

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

@@ -1,14 +1,4 @@
-// ------------------------------------------------------------------------
-// 版权信息
-// 版权归百小僧及百签科技（广东）有限公司所有。
-// 所有权利保留。
-// 官方网站：https://baiqian.com
-//
-// 许可证信息
-// 项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。
-// 许可证的完整文本可以在源代码树根目录中的 LICENSE-APACHE 和 LICENSE-MIT 文件中找到。
-// ------------------------------------------------------------------------
-
+
 using ThingsGateway.DependencyInjection;
 
 namespace System;

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

@@ -0,0 +1,277 @@
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.OAuth;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+using System.Collections.Concurrent;
+using System.Net.Http.Headers;
+using System.Security.Claims;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
+
+using ThingsGateway.Extension;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 只适合 Demo 登录，会直接授权超管的权限
+/// </summary>
+public class AdminOAuthHandler<TOptions>(
+   IVerificatInfoService verificatInfoService,
+   IAppService appService,
+   ISysUserService sysUserService,
+   ISysDictService configService,
+    IOptionsMonitor<TOptions> options,
+    ILoggerFactory logger,
+    IUserAgentService userAgentService,
+    UrlEncoder encoder
+) : OAuthHandler<TOptions>(options, logger, encoder)
+    where TOptions : AdminOAuthOptions, new()
+{
+
+
+    static AdminOAuthHandler()
+    {
+        Task.Factory.StartNew(Insertable, TaskCreationOptions.LongRunning);
+    }
+
+    /// <summary>
+    /// 日志消息队列（线程安全）
+    /// </summary>
+    protected static readonly ConcurrentQueue<SysOperateLog> _operateLogMessageQueue = new();
+
+    /// <summary>
+    /// 创建访问日志
+    /// </summary>
+    private static async Task Insertable()
+    {
+        var db = DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
+        var appLifetime = App.RootServices!.GetService<IHostApplicationLifetime>()!;
+        while (!appLifetime.ApplicationStopping.IsCancellationRequested)
+        {
+            try
+            {
+                var data = _operateLogMessageQueue.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);
+            }
+        }
+
+
+    }
+
+    protected override async Task<AuthenticationTicket> CreateTicketAsync(
+        ClaimsIdentity identity,
+        AuthenticationProperties properties,
+        OAuthTokenResponse tokens)
+    {
+        properties.RedirectUri = Options.HomePath;
+        properties.IsPersistent = true;
+        var appConfig = await configService.GetAppConfigAsync().ConfigureAwait(false);
+
+        int expire = appConfig.LoginPolicy.VerificatExpireTime;
+        if (!string.IsNullOrEmpty(tokens.ExpiresIn) && int.TryParse(tokens.ExpiresIn, out var result))
+        {
+            properties.ExpiresUtc = TimeProvider.System.GetUtcNow().AddSeconds(result);
+            expire = (int)(result / 60.0);
+        }
+        var user = await HandleUserInfoAsync(tokens).ConfigureAwait(false);
+
+        var loginEvent = await GetLogin(expire).ConfigureAwait(false);
+        await UpdateUser(loginEvent).ConfigureAwait(false);
+        identity.AddClaim(new Claim(ClaimConst.VerificatId, loginEvent.VerificatId.ToString()));
+        identity.AddClaim(new Claim(ClaimConst.UserId, RoleConst.SuperAdminId.ToString()));
+
+        identity.AddClaim(new Claim(ClaimConst.SuperAdmin, "true"));
+        identity.AddClaim(new Claim(ClaimConst.OrgId, RoleConst.DefaultTenantId.ToString()));
+        identity.AddClaim(new Claim(ClaimConst.TenantId, RoleConst.DefaultTenantId.ToString()));
+
+
+        var context = new OAuthCreatingTicketContext(
+            new ClaimsPrincipal(identity),
+            properties,
+            Context,
+            Scheme,
+            Options,
+            Backchannel,
+            tokens,
+            user
+        );
+
+        context.RunClaimActions();
+        await Events.CreatingTicket(context).ConfigureAwait(false);
+
+        var httpContext = context.HttpContext;
+        UserAgent? userAgent = null;
+        var str = httpContext?.Request?.Headers?.UserAgent;
+        if (!string.IsNullOrEmpty(str))
+        {
+            userAgent = userAgentService.Parse(str);
+        }
+
+        var sysOperateLog = new SysOperateLog()
+        {
+            Name = this.Scheme.Name,
+            Category = LogCateGoryEnum.Login,
+            ExeStatus = true,
+            OpIp = httpContext.GetRemoteIpAddressToIPv4(),
+            OpBrowser = userAgent?.Browser,
+            OpOs = userAgent?.Platform,
+            OpTime = DateTime.Now,
+            VerificatId = loginEvent.VerificatId,
+            OpAccount = Options.GetName(user),
+
+            ReqMethod = "OAuth",
+            ReqUrl = string.Empty,
+            ResultJson = string.Empty,
+            ClassName = nameof(AdminOAuthHandler<TOptions>),
+            MethodName = string.Empty,
+            ParamJson = string.Empty,
+        };
+        _operateLogMessageQueue.Enqueue(sysOperateLog);
+        return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+    }
+
+
+    /// <summary>处理用户信息方法</summary>
+    protected virtual async Task<JsonElement> HandleUserInfoAsync(OAuthTokenResponse tokens)
+    {
+        var request = new HttpRequestMessage(HttpMethod.Get, BuildUserInfoUrl(tokens));
+        request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+        var response = await Backchannel.SendAsync(request, Context.RequestAborted).ConfigureAwait(false);
+
+        var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+        if (response.IsSuccessStatusCode)
+        {
+            return JsonDocument.Parse(content).RootElement;
+        }
+
+        throw new OAuthTokenException($"OAuth user info endpoint failure: {await Display(response).ConfigureAwait(false)}");
+    }
+
+    /// <summary>生成用户信息请求地址方法</summary>
+    protected virtual string BuildUserInfoUrl(OAuthTokenResponse tokens)
+    {
+        return QueryHelpers.AddQueryString(Options.UserInformationEndpoint, new Dictionary<string, string>
+        {
+            { "access_token", tokens.AccessToken }
+        });
+    }
+
+    /// <summary>生成错误信息方法</summary>
+    protected static async Task<string> Display(HttpResponseMessage response)
+    {
+        var output = new StringBuilder();
+        output.Append($"Status: {response.StatusCode}; ");
+        output.Append($"Headers: {response.Headers}; ");
+        output.Append($"Body: {await response.Content.ReadAsStringAsync().ConfigureAwait(false)};");
+
+        return output.ToString();
+    }
+
+    private async Task<LoginEvent> GetLogin(int expire)
+    {
+        var sysUser = await sysUserService.GetUserByIdAsync(RoleConst.SuperAdminId).ConfigureAwait(false);//获取用户信息
+
+        var loginEvent = new LoginEvent
+        {
+            Ip = appService.RemoteIpAddress,
+            Device = appService.UserAgent?.Platform,
+            Expire = expire,
+            SysUser = sysUser,
+            VerificatId = CommonUtils.GetSingleId()
+        };
+
+        //获取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
+        };
+
+
+        //添加到verificat列表
+        verificatInfoService.Add(verificatInfo);
+        return loginEvent;
+    }
+
+    /// <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>自定义 Token 异常</summary>
+public class OAuthTokenException : Exception
+{
+    public OAuthTokenException() : base()
+    {
+    }
+
+    public OAuthTokenException(string? message, Exception? innerException) : base(message, innerException)
+    {
+    }
+
+    public OAuthTokenException(string? message) : base(message)
+    {
+    }
+}

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

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

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

@@ -0,0 +1,114 @@
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.OAuth;
+using Microsoft.AspNetCore.WebUtilities;
+
+using System.Net.Http.Headers;
+using System.Text;
+using System.Text.Json;
+
+namespace ThingsGateway.Admin.Application;
+
+public class GiteeOAuthOptions : AdminOAuthOptions
+{
+
+    public GiteeOAuthOptions() : base()
+    {
+        this.SignInScheme = ClaimConst.Scheme;
+        this.AuthorizationEndpoint = "https://gitee.com/oauth/authorize";
+        this.TokenEndpoint = "https://gitee.com/oauth/token";
+        this.UserInformationEndpoint = "https://gitee.com/api/v5/user";
+        this.HomePath = "/";
+        this.CallbackPath = "/signin-gitee";
+        Scope.Add("user_info");
+        Scope.Add("projects");
+
+        Events.OnCreatingTicket = async context =>
+        {
+            await HandlerGiteeStarredUrl(context).ConfigureAwait(false);
+        };
+
+        Events.OnRedirectToAuthorizationEndpoint = context =>
+        {
+            //context.RedirectUri = context.RedirectUri.Replace("http%3A%2F%2F", "https%3A%2F%2F"); // 强制替换
+            context.Response.Redirect(context.RedirectUri);
+            return Task.CompletedTask;
+        };
+
+    }
+
+    /// <summary>刷新 Token 方法</summary>
+    protected virtual async Task<OAuthTokenResponse> RefreshTokenAsync(TicketReceivedContext ticketReceivedContext, string refreshToken)
+    {
+        var query = new Dictionary<string, string>
+        {
+            { "refresh_token", refreshToken },
+            { "grant_type", "refresh_token" }
+        };
+
+        var request = new HttpRequestMessage(HttpMethod.Post, QueryHelpers.AddQueryString(TokenEndpoint, query));
+        request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+        var response = await Backchannel.SendAsync(request, ticketReceivedContext.HttpContext.RequestAborted).ConfigureAwait(false);
+
+        var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+        if (response.IsSuccessStatusCode)
+        {
+            return OAuthTokenResponse.Success(JsonDocument.Parse(content));
+        }
+
+        return OAuthTokenResponse.Failed(new OAuthTokenException($"OAuth token endpoint failure: {await Display(response).ConfigureAwait(false)}"));
+    }
+
+    /// <summary>生成错误信息方法</summary>
+    protected static async Task<string> Display(HttpResponseMessage response)
+    {
+        var output = new StringBuilder();
+        output.Append($"Status: {response.StatusCode}; ");
+        output.Append($"Headers: {response.Headers}; ");
+        output.Append($"Body: {await response.Content.ReadAsStringAsync().ConfigureAwait(false)};");
+
+        return output.ToString();
+    }
+
+    public override string GetName(JsonElement element)
+    {
+        JsonElement.ObjectEnumerator target = element.EnumerateObject();
+        return target.TryGetValue("name");
+    }
+
+    private static async Task HandlerGiteeStarredUrl(OAuthCreatingTicketContext context, string repoFullName = "ThingsGateway/ThingsGateway")
+    {
+        if (string.IsNullOrWhiteSpace(context.AccessToken))
+            throw new InvalidOperationException("Access token is missing.");
+
+        var uri = $"https://gitee.com/api/v5/user/starred/{repoFullName}";
+
+        var queryString = new Dictionary<string, string>
+        {
+            { "access_token", context.AccessToken }
+        };
+
+        var request = new HttpRequestMessage(HttpMethod.Put, QueryHelpers.AddQueryString(uri, queryString))
+        {
+            Headers = { Accept = { new MediaTypeWithQualityHeaderValue("application/json") } }
+        };
+
+        var response = await context.Backchannel.SendAsync(request, context.HttpContext.RequestAborted).ConfigureAwait(false);
+
+        if (!response.IsSuccessStatusCode)
+        {
+            var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+            throw new Exception($"Failed to star repository: {response.StatusCode}, {content}");
+        }
+
+
+    }
+    protected override void ConfigureClaims()
+    {
+        ClaimActions.MapJsonKey(ClaimConst.AvatarUrl, "avatar_url");
+        ClaimActions.MapJsonKey(ClaimConst.Account, "name");
+
+        base.ConfigureClaims();
+    }
+}

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

@@ -0,0 +1,7 @@
+namespace ThingsGateway.Admin.Application;
+
+public class GiteeOAuthSettings
+{
+    public string ClientId { get; set; }
+    public string ClientSecret { get; set; }
+}

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

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

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

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

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

@@ -11,6 +11,7 @@
 using SqlSugar;
 
 using System.Collections.Concurrent;
+using System.Reflection;
 
 using ThingsGateway.Extension;
 using ThingsGateway.FriendlyException;
@@ -52,13 +53,18 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
             var client = requestAuditData.Client;//获取客户端信息
             var path = requestAuditData.Path;//获取操作名称
             var method = requestAuditData.Method;//获取方法
+            var methodInfo = requestAuditData.MethodInfo;
+            var login = methodInfo.GetCustomAttribute(typeof(LoginLogAttribute));
+            var logout = methodInfo.GetCustomAttribute(typeof(LogoutLogAttribute));
+
             //表示访问日志
-            if (path == "/api/auth/login" || path == "/api/auth/logout")
+            if (login != null || logout != null)
             {
                 //如果没有异常信息
                 if (requestAuditData.Exception == null)
                 {
-                    save = await CreateVisitLog(operation, path, requestAuditData, client, flush).ConfigureAwait(false);//添加到访问日志
+                    LogCateGoryEnum logCateGoryEnum = login != null ? LogCateGoryEnum.Login : LogCateGoryEnum.Logout;
+                    save = await CreateVisitLog(operation, path, requestAuditData, client, logCateGoryEnum, flush).ConfigureAwait(false);//添加到访问日志
                 }
                 else
                 {
@@ -152,18 +158,20 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
     /// <param name="path"></param>
     /// <param name="requestAuditData">requestAuditData</param>
     /// <param name="userAgent">客户端信息</param>
+    /// <param name="logCateGoryEnum">logCateGory</param>
     /// <param name="flush"></param>
-    private async Task<bool> CreateVisitLog(string operation, string path, RequestAuditData requestAuditData, UserAgent userAgent, bool flush)
+    private async Task<bool> CreateVisitLog(string operation, string path, RequestAuditData requestAuditData, UserAgent userAgent, LogCateGoryEnum logCateGoryEnum, bool flush)
     {
         long verificatId = 0;//验证Id
         var opAccount = "";//用户账号
-        if (path == "/api/auth/login")
+        if (logCateGoryEnum == LogCateGoryEnum.Login)
         {
             //如果是登录，用户信息就从返回值里拿
-            var result = requestAuditData.ReturnInformation?.ToSystemTextJsonString();//返回值转json
-            var userInfo = result.FromJsonNetString<UnifyResult<LoginOutput>>();//格式化成user表
-            opAccount = userInfo.Data.Account;//赋值账号
-            verificatId = userInfo.Data.VerificatId;
+            if (requestAuditData.ReturnInformation is UnifyResult<LoginOutput> userInfo)
+            {
+                opAccount = userInfo.Data.Account;//赋值账号
+                verificatId = userInfo.Data.VerificatId;
+            }
         }
         else
         {
@@ -175,7 +183,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
         var sysLogVisit = new SysOperateLog
         {
             Name = operation,
-            Category = path == "/api/auth/login" ? LogCateGoryEnum.Login : LogCateGoryEnum.Logout,
+            Category = logCateGoryEnum,
             ExeStatus = true,
             OpIp = requestAuditData.RemoteIPv4,
             OpBrowser = userAgent?.Browser,

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

@@ -13,7 +13,7 @@ namespace ThingsGateway.Admin.Application;
 /// <summary>
 /// 日志常量
 /// </summary>
-public class LoggingConst
+public static class LoggingConst
 {
     /// <summary>
     /// 分类

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

@@ -87,7 +87,7 @@ public class BlazorAuthenticationHandler : AppAuthorizeHandler
             var roles = await _sysRoleService.GetRoleListByUserIdAsync(userId).ConfigureAwait(false);
 
             //这里鉴别用户使能状态
-            if (user == null || !user.Status)
+            if (user?.Status != true)
             {
                 return false;
             }
@@ -137,7 +137,7 @@ public class BlazorAuthenticationHandler : AppAuthorizeHandler
         else
         {
             //这里鉴别用户使能状态
-            if (user == null || !user.Status)
+            if (user?.Status != true)
             {
                 return false;
             }

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

@@ -20,9 +20,11 @@ namespace ThingsGateway.Admin.Application;
 public class AppService : IAppService
 {
     private readonly IUserAgentService UserAgentService;
-    public AppService(IUserAgentService userAgentService)
+    private readonly IClaimsPrincipalService ClaimsPrincipalService;
+    public AppService(IUserAgentService userAgentService, IClaimsPrincipalService claimsPrincipalService)
     {
         UserAgentService = userAgentService;
+        ClaimsPrincipalService = claimsPrincipalService;
     }
     public string GetReturnUrl(string returnUrl)
     {
@@ -70,7 +72,7 @@ public class AppService : IAppService
             ExpiresUtc = diffTime,
         }).ConfigureAwait(false);
     }
-    public ClaimsPrincipal? User => App.User;
+    public ClaimsPrincipal? User => ClaimsPrincipalService.User;
 
     public string? RemoteIpAddress => App.HttpContext?.GetRemoteIpAddressToIPv4();
 

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

@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using System.Security.Claims;
+
+namespace ThingsGateway.Admin.Application;
+
+public class HybridClaimsPrincipalService : IClaimsPrincipalService
+{
+    HybridAppService _hybridAppService;
+    public HybridClaimsPrincipalService(HybridAppService hybridAppService)
+    {
+        _hybridAppService = hybridAppService;
+    }
+    public ClaimsPrincipal? User => _hybridAppService.User;
+
+}

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

@@ -12,8 +12,6 @@ using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Localization;
 
-using SqlSugar;
-
 using System.Security.Claims;
 
 using ThingsGateway.DataEncryption;
@@ -64,6 +62,10 @@ public class AuthService : IAuthService
         {
             throw Oops.Bah(appConfig.WebsitePolicy.CloseTip);
         }
+
+
+
+
         string? password = input.Password;
         if (isCookie) //openApi登录不再需要解密
         {
@@ -237,25 +239,20 @@ public class AuthService : IAuthService
         var logingEvent = new LoginEvent
         {
             Ip = _appService.RemoteIpAddress,
-            Device = App.GetService<IAppService>().UserAgent?.Platform,
+            Device = _appService.UserAgent?.Platform,
             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
         };

src/Admin/ThingsGateway.Admin.Application/Services/MessageService/SignalR/Provider/UserIdProvider.cs

@@ -11,8 +11,6 @@
 using Microsoft.AspNetCore.Http.Connections.Features;
 using Microsoft.AspNetCore.SignalR;
 
-using Yitter.IdGenerator;
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
@@ -28,7 +26,7 @@ public class UserIdProvider : IUserIdProvider
 
         if (UserId > 0)
         {
-            return $"{UserId}{SysHub.Separate}{YitIdHelper.NextId()}";//返回用户ID
+            return $"{UserId}{SysHub.Separate}{CommonUtils.GetSingleId()}";//返回用户ID
         }
 
         return connection.ConnectionId;

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

@@ -334,7 +334,7 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
             flatList.Add(node);
 
             // 如果当前节点有子节点，则递归处理每个子节点
-            if (node.Children != null && node.Children.Count > 0)
+            if (node.Children?.Count > 0)
             {
                 foreach (var child in node.Children)
                 {

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

@@ -466,7 +466,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
             var exist = await GetUserByIdAsync(input.Id).ConfigureAwait(false);//获取用户信息
             if (exist != null)
             {
-                var isSuperAdmin = exist.Account == RoleConst.SuperAdmin;//判断是否有超管
+                var isSuperAdmin = exist.Id == RoleConst.SuperAdminId;//判断是否有超管
                 if (isSuperAdmin && !UserManager.SuperAdmin)
                     throw Oops.Bah(Localizer["CanotEditAdminUser"]);
 
@@ -540,7 +540,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
         await CheckApiDataScopeAsync(sysUser.OrgId, sysUser.CreateUserId).ConfigureAwait(false);
         if (sysUser != null)
         {
-            var isSuperAdmin = (sysUser.Account == RoleConst.SuperAdmin || input.GrantInfoList.Any(a => a == RoleConst.SuperAdminRoleId)) && !UserManager.SuperAdmin;//判断是否有超管
+            var isSuperAdmin = (sysUser.Id == RoleConst.SuperAdminId || input.GrantInfoList.Any(a => a == RoleConst.SuperAdminRoleId)) && !UserManager.SuperAdmin;//判断是否有超管
             if (isSuperAdmin)
                 throw Oops.Bah(Localizer["CanotGrantAdmin"]);
 
@@ -660,7 +660,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
     public async Task<bool> DeleteUserAsync(IEnumerable<long> ids)
     {
         using var db = GetDB();
-        var containsSuperAdmin = await db.Queryable<SysUser>().Where(it => it.Account == RoleConst.SuperAdmin && ids.Contains(it.Id)).AnyAsync().ConfigureAwait(false);//判断是否有超管
+        var containsSuperAdmin = await db.Queryable<SysUser>().Where(it => it.Id == RoleConst.SuperAdminId && ids.Contains(it.Id)).AnyAsync().ConfigureAwait(false);//判断是否有超管
         if (containsSuperAdmin)
             throw Oops.Bah(Localizer["CanotDeleteAdminUser"]);
         if (ids.Contains(UserManager.UserId))
@@ -899,7 +899,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
             var tenantId = await _sysOrgService.GetTenantIdByOrgIdAsync(sysUser.OrgId, sysOrgList).ConfigureAwait(false);
             sysUser.TenantId = tenantId;
 
-            if (sysUser.Account == RoleConst.SuperAdmin)
+            if (sysUser.Id == RoleConst.SuperAdminId)
             {
                 var modules = (await _sysResourceService.GetAllAsync().ConfigureAwait(false)).Where(a => a.Category == ResourceCategoryEnum.Module).OrderBy(a => a.SortCode);
                 sysUser.ModuleList = modules.ToList();//模块列表赋值给用户

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

@@ -13,8 +13,6 @@ using BootstrapBlazor.Components;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-using SqlSugar;
-
 using System.Reflection;
 
 using ThingsGateway.UnifyResult;
@@ -28,19 +26,12 @@ public class Startup : AppStartup
     {
         Directory.CreateDirectory("DB");
 
-        services.AddConfigurableOptions<SqlSugarOptions>();
         services.AddConfigurableOptions<AdminLogOptions>();
         services.AddConfigurableOptions<TenantOptions>();
 
-        services.AddSingleton(typeof(IDataService<>), typeof(BaseService<>));
-        services.AddSingleton<ISugarAopService, SugarAopService>();
-        services.AddSingleton<ISugarConfigAopService, SugarConfigAopService>();
-
         services.AddSingleton<IUserAgentService, UserAgentService>();
         services.AddSingleton<IAppService, AppService>();
 
-        StaticConfig.EnableAllWhereIF = true;
-
         services.AddConfigurableOptions<EmailOptions>();
         services.AddConfigurableOptions<HardwareInfoOptions>();
 
@@ -57,7 +48,6 @@ public class Startup : AppStartup
 
         services.AddSingleton<IVerificatInfoService, VerificatInfoService>();
         services.AddSingleton<IUserCenterService, UserCenterService>();
-        services.AddSingleton<ISugarAopService, SugarAopService>();
         services.AddSingleton<ISysDictService, SysDictService>();
         services.AddSingleton<ISysOperateLogService, SysOperateLogService>();
         services.AddSingleton<IRelationService, RelationService>();
@@ -98,6 +88,21 @@ public class Startup : AppStartup
         CodeFirstUtils.CodeFirst(fullName!);//CodeFirst
 
 
+        try
+        {
+            using var db = DbContext.GetDB<SysOperateLog>();
+            if (db.CurrentConnectionConfig.DbType == SqlSugar.DbType.Sqlite)
+            {
+                if (!db.DbMaintenance.IsAnyIndex("idx_operatelog_optime_date"))
+                {
+                    var indexsql = "CREATE INDEX idx_operatelog_optime_date ON sys_operatelog(strftime('%Y-%m-%d', OpTime));";
+                    db.Ado.ExecuteCommand(indexsql);
+                }
+            }
+        }
+        catch { }
+
+
         //删除在线用户统计
         var verificatInfoService = App.RootServices.GetService<IVerificatInfoService>();
         verificatInfoService.RemoveAllClientId();

src/Admin/ThingsGateway.Admin.Application/ThingsGateway.Admin.Application.csproj

@@ -18,9 +18,7 @@
 	</ItemGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.5" />
 		<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
-		<PackageReference Include="SqlSugarCore" Version="5.1.4.193" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
@@ -49,6 +47,7 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />
+		<ProjectReference Include="..\ThingsGateway.DB\ThingsGateway.DB.csproj" />
 	</ItemGroup>
 
 </Project>

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

@@ -13,7 +13,7 @@ using Microsoft.Extensions.DependencyInjection;
 namespace ThingsGateway.Admin.Application;
 
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class ClearTokenUtil
+public static class ClearTokenUtil
 {
     private static IRelationService RelationService;
     private static ISysUserService SysUserService;

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

@@ -13,7 +13,7 @@ using Microsoft.Extensions.DependencyInjection;
 namespace ThingsGateway.Admin.Application;
 
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class NoticeUtil
+public static class NoticeUtil
 {
     private static INoticeService NoticeService;
 

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

@@ -14,7 +14,7 @@ namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class OpenApiUtil
+public static class OpenApiUtil
 {
     /// <summary>
     /// 构建树节点，传入的列表已经是树结构

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

@@ -14,7 +14,7 @@ namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class OrgUtil
+public static class OrgUtil
 {
     /// <summary>
     /// 构造选择项，ID/TITLE

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

@@ -14,7 +14,7 @@ namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class PositionUtil
+public static class PositionUtil
 {
 
     /// <summary>

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

@@ -14,7 +14,7 @@ namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class RoleUtil
+public static class RoleUtil
 {
 
 

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

@@ -14,7 +14,7 @@ namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class UserUtil
+public static class UserUtil
 {
 
     /// <summary>

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

@@ -14,7 +14,7 @@ using ThingsGateway.Extension.Generic;
 
 namespace ThingsGateway.Admin.Application;
 
-public class VerificatInfoUtil
+public static class VerificatInfoUtil
 {
     private static IVerificatInfoService VerificatInfoService { get; set; }
     static VerificatInfoUtil()

src/Admin/ThingsGateway.Admin.Razor/Const/AdminOperConst.cs

@@ -11,7 +11,7 @@
 namespace ThingsGateway.Admin.Razor;
 
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class AdminOperConst
+public static class AdminOperConst
 {
     public const string Add = "新增";
     public const string Delete = "删除";

src/Admin/ThingsGateway.Admin.Razor/Context/BlazorAppContext.cs

@@ -40,6 +40,8 @@ public class BlazorAppContext
     /// </summary>
     public SysUser CurrentUser { get; private set; }
 
+    public string? Avatar => UserManager.AvatarUrl.IsNullOrEmpty() ? CurrentUser.Avatar : UserManager.AvatarUrl;
+
     /// <summary>
     /// 用户个人菜单
     /// </summary>

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

@@ -48,7 +48,7 @@ public partial class SysUserAvatarEdit : IDisposable
 
     private async Task OnAvatarUpload(UploadFile file)
     {
-        if (file != null && file.File != null)
+        if (file?.File != null)
         {
             var format = file.File.ContentType;
             ReadAvatarToken ??= new CancellationTokenSource();

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

@@ -38,7 +38,7 @@ public partial class UserCenterPage
     protected override async Task OnParametersSetAsync()
     {
         SysUser = AppContext.CurrentUser.Adapt<SysUser>();
-        SysUser.Avatar = AppContext.CurrentUser.Avatar;
+        SysUser.Avatar = AppContext.Avatar;
         WorkbenchInfo = (await UserCenterService.GetLoginWorkbenchAsync(SysUser.Id)).Adapt<WorkbenchInfo>();
 
         await base.OnParametersSetAsync();

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

@@ -48,7 +48,7 @@ public partial class UserInfoEditComponent
 
     private async Task OnAvatarUpload(UploadFile file)
     {
-        if (file != null && file.File != null)
+        if (file?.File != null)
         {
             var format = file.File.ContentType;
             ReadAvatarToken ??= new CancellationTokenSource();

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

@@ -16,7 +16,7 @@ namespace ThingsGateway.Admin.Razor;
 
 /// <inheritdoc/>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class ResourceUtil
+public static class ResourceUtil
 {
 
     /// <summary>

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

@@ -11,6 +11,7 @@
 
     // nuget动态加载的程序集
     "SupportPackageNamePrefixs": [
+      "ThingsGateway.SqlSugar",
       "ThingsGateway.Admin.Application",
       "ThingsGateway.Admin.Razor",
       "ThingsGateway.Razor"

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

@@ -11,6 +11,7 @@
 
     // nuget动态加载的程序集
     "SupportPackageNamePrefixs": [
+      "ThingsGateway.SqlSugar",
       "ThingsGateway.Admin.Application",
       "ThingsGateway.Admin.Razor",
       "ThingsGateway.Razor"

src/Admin/ThingsGateway.AdminServer/GlobalUsings.cs

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

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

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

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

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

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

@@ -20,11 +20,11 @@ using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
-using ThingsGateway.Admin.Application;
 using ThingsGateway.DataEncryption;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.Razor;
 
+
 namespace ThingsGateway.AdminServer;
 
 public partial class Login

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

@@ -48,7 +48,7 @@
                         <CultureChooser />
                     </div>
 
-                    <Logout ImageUrl="@(AppContext.CurrentUser.Avatar??$"{WebsiteConst.DefaultResourceUrl}images/defaultUser.svg")" ShowUserName=false DisplayName="@UserManager.UserAccount" UserName="@UserManager.VerificatId.ToString()" PrefixUserNameText=@AdminLocalizer["CurrentVerificat"]>
+                    <Logout ImageUrl="@(AppContext.Avatar??$"{WebsiteConst.DefaultResourceUrl}images/defaultUser.svg")" ShowUserName=false DisplayName="@UserManager.UserAccount" UserName="@UserManager.VerificatId.ToString()" PrefixUserNameText=@AdminLocalizer["CurrentVerificat"]>
                         <LinkTemplate>
                             <a href=@("/") class="h6"><i class="fa-solid fa-suitcase me-2"></i>@Localizer["系统首页"]</a>
 

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

@@ -17,7 +17,6 @@ using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
-using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Razor;
 
@@ -27,38 +26,6 @@ public partial class MainLayout : IDisposable
 {
     [Inject]
     IStringLocalizer<ThingsGateway.Razor._Imports> RazorLocalizer { get; set; }
-    private Task OnRefresh(ContextMenuItem item, object? context)
-    {
-        if (context is TabItem tabItem)
-        {
-            _tab.Refresh(tabItem);
-        }
-        return Task.CompletedTask;
-    }
-
-    private async Task OnClose(ContextMenuItem item, object? context)
-    {
-        if (context is TabItem tabItem)
-        {
-            await _tab.RemoveTab(tabItem);
-        }
-    }
-
-    private Task OnCloseOther(ContextMenuItem item, object? context)
-    {
-        if (context is TabItem tabItem)
-        {
-            _tab.ActiveTab(tabItem);
-        }
-        _tab.CloseOtherTabs();
-        return Task.CompletedTask;
-    }
-
-    private Task OnCloseAll(ContextMenuItem item, object? context)
-    {
-        _tab.CloseAllTabs();
-        return Task.CompletedTask;
-    }
 
     #region 全局通知
 

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

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

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

@@ -25,11 +25,9 @@ using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
 
-using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Extension;
 using ThingsGateway.NewLife.Caching;
-using ThingsGateway.NewLife.Extension;
 
 namespace ThingsGateway.AdminServer;
 
@@ -88,6 +86,7 @@ public class Startup : AppStartup
         }
         ;
 
+        services.AddMvcFilter<RequestAuditFilter>();
         services.AddControllers()
             .AddNewtonsoftJson(options => SetNewtonsoftJsonSetting(options.SerializerSettings))
             //.AddXmlSerializerFormatters()
@@ -160,7 +159,8 @@ public class Startup : AppStartup
         {
             options.WriteFilter = (logMsg) =>
             {
-                if (logMsg.Message.IsNullOrEmpty()) return false;
+                if (App.HostApplicationLifetime.ApplicationStopping.IsCancellationRequested && logMsg.LogLevel >= LogLevel.Warning) return false;
+                if (string.IsNullOrEmpty(logMsg.Message)) return false;
                 else return true;
             };
 
@@ -237,7 +237,6 @@ public class Startup : AppStartup
         //        logContext.Set(LoggingConst.Method, httpContext.Request.Method);//请求方法
         //    });
         //});
-        services.AddMvcFilter<RequestAuditFilter>();
 
         //日志写入数据库配置
         services.AddDatabaseLogging<DatabaseLoggingWriter>(options =>
@@ -369,12 +368,6 @@ public class Startup : AppStartup
         app.UseStaticFiles(new StaticFileOptions { ContentTypeProvider = provider });
         app.UseStaticFiles();
 
-        app.Use(async (context, next) =>
-        {
-            context.Response.Headers.Append("ThingsGateway", "ThingsGateway");
-            await next().ConfigureAwait(false);
-        });
-
 
         // 特定文件类型（文件后缀）处理
         var contentTypeProvider = GetFileExtensionContentTypeProvider();

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

@@ -14,7 +14,7 @@ namespace ThingsGateway.Admin.Application;
 /// 授权用户常量
 /// </summary>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class ClaimConst
+public static class ClaimConst
 {
     /// <summary>
     /// 账号
@@ -31,6 +31,11 @@ public class ClaimConst
     /// </summary>
     public const string UserId = "UserId";
 
+    /// <summary>
+    /// AvatarUrl
+    /// </summary>
+    public const string AvatarUrl = "AvatarUrl";
+
     /// <summary>
     /// 验证Id
     /// </summary>

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

@@ -225,7 +225,7 @@ public static class SqlSugarExtensions
 
     private static IEnumerable<T> Sort<T>(this IEnumerable<T> list, BasePageInput basePageInput)
     {
-        if (basePageInput != null && basePageInput.SortField != null)
+        if (basePageInput?.SortField != null)
         {
             for (int i = 0; i < basePageInput.SortField.Count; i++)
             {

src/Admin/ThingsGateway.DB/GlobalUsings.cs

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

src/Admin/ThingsGateway.DB/Services/AppService/ClaimsPrincipalService.cs

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

src/Admin/ThingsGateway.DB/Services/AppService/IClaimsPrincipalService.cs

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

src/Admin/ThingsGateway.DB/Services/SugarAopService/SugarAopService.cs

@@ -17,10 +17,10 @@ namespace ThingsGateway.Admin.Application;
 
 public class SugarAopService : ISugarAopService
 {
-    private IAppService _appService;
-    public SugarAopService(IAppService appService)
+    private IClaimsPrincipalService _claimsPrincipalService;
+    public SugarAopService(IClaimsPrincipalService appService)
     {
-        _appService = appService;
+        _claimsPrincipalService = appService;
     }
     /// <summary>
     /// Aop设置
@@ -85,7 +85,7 @@ public class SugarAopService : ISugarAopService
                 if (entityInfo.PropertyName == nameof(BaseEntity.CreateTime))
                     entityInfo.SetValue(DateTime.Now);
 
-                if (_appService.User != null)
+                if (_claimsPrincipalService.User != null)
                 {
                     //创建人
                     if (entityInfo.PropertyName == nameof(BaseEntity.CreateUserId))
@@ -103,7 +103,7 @@ public class SugarAopService : ISugarAopService
                 if (entityInfo.PropertyName == nameof(BaseEntity.UpdateTime))
                     entityInfo.SetValue(DateTime.Now);
                 //更新人
-                if (_appService.User != null)
+                if (_claimsPrincipalService.User != null)
                 {
                     if (entityInfo.PropertyName == nameof(BaseEntity.UpdateUserId))
                         entityInfo.SetValue(UserManager.UserId);
@@ -117,6 +117,25 @@ public class SugarAopService : ISugarAopService
         db.Aop.DataExecuted = (value, entity) =>
         {
         };
+
+
+        db.Aop.OnLogExecuted = (sql, pars) =>
+        {
+            //执行时间超过1秒
+            if (db.Ado.SqlExecutionTime.TotalSeconds > 1)
+            {
+                //代码CS文件名
+                var fileName = db.Ado.SqlStackTrace.FirstFileName;
+                //代码行数
+                var fileLine = db.Ado.SqlStackTrace.FirstLine;
+                //方法名
+                var FirstMethodName = db.Ado.SqlStackTrace.FirstMethodName;
+
+                DbContext.WriteLog($"{fileName}-{FirstMethodName}-{fileLine} 执行时间超过1秒");
+                DbContext.WriteLogWithSql(UtilMethods.GetNativeSql(sql, pars));
+
+            }
+        };
     }
 
 }

src/Admin/ThingsGateway.DB/SqlSugar/SeedDataUtil.cs

@@ -25,7 +25,7 @@ namespace ThingsGateway.Admin.Application;
 /// 种子数据工具类
 /// </summary>
 [ThingsGateway.DependencyInjection.SuppressSniffer]
-public class SeedDataUtil
+public static class SeedDataUtil
 {
     /// <summary>
     /// 获取List列表

src/Admin/ThingsGateway.DB/SqlSugar/SqlSugarOptions.cs

@@ -37,7 +37,7 @@ public sealed class SqlSugarOption : ConnectionConfig
     /// <summary>
     /// 是否控制台显示Sql语句
     /// </summary>
-    public bool IsShowSql { get; set; }
+    public bool? IsShowSql { get; set; }
 
     /// <summary>
     /// 更新数据

src/Admin/ThingsGateway.DB/Startup.cs

@@ -0,0 +1,44 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+using BootstrapBlazor.Components;
+
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+using SqlSugar;
+
+namespace ThingsGateway.Admin.Application;
+
+[AppStartup(1000000000)]
+public class Startup : AppStartup
+{
+    public void Configure(IServiceCollection services)
+    {
+        services.AddConfigurableOptions<SqlSugarOptions>();
+
+        services.AddSingleton(typeof(IDataService<>), typeof(BaseService<>));
+        services.AddSingleton<ISugarAopService, SugarAopService>();
+        services.AddSingleton<ISugarConfigAopService, SugarConfigAopService>();
+
+        services.AddSingleton<IClaimsPrincipalService, ClaimsPrincipalService>();
+
+        StaticConfig.EnableAllWhereIF = true;
+
+        services.AddSingleton<ISugarAopService, SugarAopService>();
+
+    }
+
+    public void Use(IApplicationBuilder applicationBuilder)
+    {
+
+
+    }
+}

src/Admin/ThingsGateway.DB/Static/UserManager.cs

@@ -17,33 +17,39 @@ namespace ThingsGateway.Admin.Application;
 /// </summary>
 public static class UserManager
 {
-    private static readonly IAppService _appService;
+    private static readonly IClaimsPrincipalService _claimsPrincipalService;
     static UserManager()
     {
-        _appService = App.RootServices.GetService<IAppService>();
+        _claimsPrincipalService = App.RootServices.GetService<IClaimsPrincipalService>();
     }
     /// <summary>
     /// 是否超级管理员
     /// </summary>
-    public static bool SuperAdmin => (_appService.User?.FindFirst(ClaimConst.SuperAdmin)?.Value).ToBoolean(false);
+    public static bool SuperAdmin => (_claimsPrincipalService.User?.FindFirst(ClaimConst.SuperAdmin)?.Value).ToBoolean(false);
+
 
     /// <summary>
     /// 当前用户账号
     /// </summary>
-    public static string UserAccount => _appService.User?.FindFirst(ClaimConst.Account)?.Value;
+    public static string UserAccount => _claimsPrincipalService.User?.FindFirst(ClaimConst.Account)?.Value;
+
+    /// <summary>
+    /// AvatarUrl
+    /// </summary>
+    public static string AvatarUrl => (_claimsPrincipalService.User?.FindFirst(ClaimConst.AvatarUrl)?.Value);
 
     /// <summary>
     /// 当前用户Id
     /// </summary>
-    public static long UserId => (_appService.User?.FindFirst(ClaimConst.UserId)?.Value).ToLong();
+    public static long UserId => (_claimsPrincipalService.User?.FindFirst(ClaimConst.UserId)?.Value).ToLong();
 
     /// <summary>
     /// 当前验证Id
     /// </summary>
-    public static long VerificatId => (_appService.User?.FindFirst(ClaimConst.VerificatId)?.Value).ToLong();
+    public static long VerificatId => (_claimsPrincipalService.User?.FindFirst(ClaimConst.VerificatId)?.Value).ToLong();
 
-    public static long OrgId => (_appService.User?.FindFirst(ClaimConst.OrgId)?.Value).ToLong();
+    public static long OrgId => (_claimsPrincipalService.User?.FindFirst(ClaimConst.OrgId)?.Value).ToLong();
 
-    public static long TenantId => (_appService.User?.FindFirst(ClaimConst.TenantId)?.Value)?.ToLong() ?? 0;
+    public static long TenantId => (_claimsPrincipalService.User?.FindFirst(ClaimConst.TenantId)?.Value)?.ToLong() ?? 0;
 
 }

src/Admin/ThingsGateway.DB/ThingsGateway.DB.csproj

@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="$(SolutionDir)PackNuget.props" />
+
+	<PropertyGroup>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+	</PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
+	</PropertyGroup>
+	
+	<ItemGroup>
+		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.5" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Include="..\README.md" Pack="true" PackagePath="\" />
+		<None Include="..\README.zh-CN.md" Pack="true" PackagePath="\" />
+		<None Remove="$(SolutionDir)..\README.md" Pack="false" PackagePath="\" />
+		<None Remove="$(SolutionDir)..\README.zh-CN.md" Pack="false" PackagePath="\" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />
+		<ProjectReference Include="..\ThingsGateway.SqlSugar\ThingsGateway.SqlSugar.csproj" />
+		<!--<PackageReference Include="SqlSugarCore" Version="5.1.4.195" />-->
+	</ItemGroup>
+
+
+
+
+</Project>

src/Admin/ThingsGateway.Furion/App/App.cs

@@ -71,13 +71,25 @@ public static class App
     /// </summary>
     public static IServiceProvider RootServices => InternalApp.RootServices;
 
+    private static IHostApplicationLifetime hostApplicationLifetime;
+    public static IHostApplicationLifetime HostApplicationLifetime
+    {
+        get
+        {
+            if ((hostApplicationLifetime == null))
+            {
+                hostApplicationLifetime = RootServices?.GetService<IHostApplicationLifetime>();
+            }
+            return hostApplicationLifetime;
+        }
+    }
+
     private static IStringLocalizerFactory? stringLocalizerFactory;
 
     /// <summary>
     /// 本地化服务工厂
     /// </summary>
     public static IStringLocalizerFactory? StringLocalizerFactory
-
     {
         get
         {
@@ -459,7 +471,7 @@ public static class App
         IEnumerable<string> pathOfExternalAssemblies = Array.Empty<string>();
 
         // 加载 appsettings.json 配置的外部程序集
-        if (Settings.ExternalAssemblies != null && Settings.ExternalAssemblies.Length > 0)
+        if (Settings.ExternalAssemblies?.Length > 0)
         {
             var externalDlls = new List<string>();
             foreach (var item in Settings.ExternalAssemblies)
@@ -540,7 +552,7 @@ public static class App
         }
 
         // 处理排除的程序集
-        if (Settings.ExcludeAssemblies != null && Settings.ExcludeAssemblies.Length > 0)
+        if (Settings.ExcludeAssemblies?.Length > 0)
         {
             scanAssemblies = scanAssemblies.Where(ass => !Settings.ExcludeAssemblies.Contains(ass.GetName().Name, StringComparer.OrdinalIgnoreCase));
         }

src/Admin/ThingsGateway.Furion/App/Extensions/ObjectExtensions.cs

@@ -455,7 +455,7 @@ public static class ObjectExtensions
                 foreach (var property in propertys)
                 {
                     var p = oldType.GetProperty(property.Name);
-                    if (property.CanWrite && p != null && p.CanRead)
+                    if (property.CanWrite && p?.CanRead == true)
                     {
                         property.SetValue(o, ChangeType(p.GetValue(obj, null), property.PropertyType), null);
                     }
@@ -647,7 +647,7 @@ public static class ObjectExtensions
     /// <returns><see cref="bool"/> 实例，true 表示空集合，false 表示非空集合</returns>
     internal static bool IsEmpty<T>(this IEnumerable<T> collection)
     {
-        return collection == null || !collection.Any();
+        return collection?.Any() != true;
     }
 
 

src/Admin/ThingsGateway.Furion/AspNetCore/ModelBinders/Binders/FromConvertBinderProvider.cs

@@ -54,8 +54,7 @@ public class FromConvertBinderProvider : IModelBinderProvider
 
         // 判断是否定义 [FromConvert] 特性
         if (context.Metadata is DefaultModelMetadata actMetadata
-            && actMetadata.Attributes.ParameterAttributes != null
-            && actMetadata.Attributes.ParameterAttributes.Count > 0
+            && actMetadata.Attributes.ParameterAttributes?.Count > 0
             && actMetadata.Attributes.ParameterAttributes.Any(u => u.GetType() == typeof(FromConvertAttribute)))
         {
             return new FromConvertBinder(_modelBinderConverts);

src/Admin/ThingsGateway.Furion/Authorization/Attributes/AppAuthorizeAttribute.cs

@@ -25,7 +25,7 @@ public sealed class AppAuthorizeAttribute : AuthorizeAttribute
     /// <param name="policies">多个策略</param>
     public AppAuthorizeAttribute(params string[] policies)
     {
-        if (policies != null && policies.Length > 0) Policies = policies;
+        if (policies?.Length > 0) Policies = policies;
     }
 
     /// <summary>

src/Admin/ThingsGateway.Furion/Components/Attributes/DependsOnAttribute.cs

@@ -47,7 +47,7 @@ public sealed class DependsOnAttribute : Attribute
         var components = new List<Type>();
 
         // 遍历所有依赖组件
-        if (dependComponents != null && dependComponents.Length > 0)
+        if (dependComponents?.Length > 0)
         {
             foreach (var component in dependComponents)
             {
@@ -102,7 +102,7 @@ public sealed class DependsOnAttribute : Attribute
             var components = new List<Type>();
 
             // 遍历所有依赖组件
-            if (value != null && value.Length > 0)
+            if (value?.Length > 0)
             {
                 foreach (var component in value)
                 {

src/Admin/ThingsGateway.Furion/CorsAccessor/Internal/Penetrates.cs

@@ -65,7 +65,7 @@ internal static class Penetrates
         IEnumerable<string> exposedHeaders = corsAccessorSettings.FixedClientToken == true
             ? _defaultExposedHeaders
             : Array.Empty<string>();
-        if (corsAccessorSettings.WithExposedHeaders != null && corsAccessorSettings.WithExposedHeaders.Length > 0)
+        if (corsAccessorSettings.WithExposedHeaders?.Length > 0)
         {
             exposedHeaders = exposedHeaders.Concat(corsAccessorSettings.WithExposedHeaders).Distinct(StringComparer.OrdinalIgnoreCase);
         }

src/Admin/ThingsGateway.Furion/DataEncryption/Encryptions/AESEncryption.cs

@@ -19,7 +19,7 @@ namespace ThingsGateway.DataEncryption;
 /// AES 加解密
 /// </summary>
 [SuppressSniffer]
-public class AESEncryption
+public static class AESEncryption
 {
     /// <summary>
     /// 加密

src/Admin/ThingsGateway.Furion/DataEncryption/Encryptions/DESEncryption.cs

@@ -20,7 +20,7 @@ namespace ThingsGateway.DataEncryption;
 /// DES 加解密
 /// </summary>
 [SuppressSniffer]
-public class DESEncryption
+public static class DESEncryption
 {
     /// <summary>
     /// 加密

src/Admin/ThingsGateway.Furion/DataEncryption/Encryptions/KSortEncryption.cs

@@ -18,7 +18,7 @@ namespace ThingsGateway.DataEncryption;
 /// KSort 加密（数据签名）
 /// </summary>
 [SuppressSniffer]
-public class KSortEncryption
+public static class KSortEncryption
 {
     private static DateTime _timeStampStartTime = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 

src/Admin/ThingsGateway.Furion/DataEncryption/Encryptions/PBKDF2Encryption.cs

@@ -17,7 +17,7 @@ namespace ThingsGateway.DataEncryption;
 /// PBKDF2 加密
 /// </summary>
 [SuppressSniffer]
-public class PBKDF2Encryption
+public static class PBKDF2Encryption
 {
     private const string SaltHashSeparator = ":";
 

src/Admin/ThingsGateway.Furion/DataEncryption/Encryptions/SHA1Encryption.cs

@@ -18,7 +18,7 @@ namespace ThingsGateway.DataEncryption;
 /// SHA1 加密
 /// </summary>
 [SuppressSniffer]
-public class SHA1Encryption
+public static class SHA1Encryption
 {
     /// <summary>
     /// SHA1 加密

src/Admin/ThingsGateway.Furion/DataValidation/Attributes/DataValidationAttribute.cs

@@ -18,6 +18,7 @@ namespace System.ComponentModel.DataAnnotations;
 /// 数据类型验证特性
 /// </summary>
 [SuppressSniffer]
+[AttributeUsage(AttributeTargets.All, AllowMultiple = false)]
 public sealed class DataValidationAttribute : ValidationAttribute
 {
     /// <summary>

src/Admin/ThingsGateway.Furion/DependencyInjection/Extensions/DependencyInjectionServiceCollectionExtensions.cs

@@ -215,7 +215,7 @@ public static class DependencyInjectionServiceCollectionExtensions
     private static void AddDispatchProxy(IServiceCollection services, Type dependencyType, Type type, Type proxyType, Type inter, bool hasTarget = true)
     {
         proxyType ??= GlobalServiceProxyType;
-        if (proxyType == null || (type != null && type.IsDefined(typeof(SuppressProxyAttribute), true))) return;
+        if (proxyType == null || (type?.IsDefined(typeof(SuppressProxyAttribute), true) == true)) return;
 
         var lifetime = TryGetServiceLifetime(dependencyType);
 

src/Admin/ThingsGateway.Furion/DynamicApiController/Conventions/DynamicApiControllerApplicationModelConvention.cs

@@ -220,8 +220,7 @@ internal sealed class DynamicApiControllerApplicationModelConvention : IApplicat
         // 解决 Gitee 该 Issue：https://gitee.com/dotnetchina/Furion/issues/I59B74
         if (CheckIsForceWithDefaultRoute(controllerApiDescriptionSettings)
             && !string.IsNullOrWhiteSpace(_dynamicApiControllerSettings.DefaultRoutePrefix)
-            && controller.Selectors[0] != null
-            && controller.Selectors[0].AttributeRouteModel != null
+            && controller.Selectors[0]?.AttributeRouteModel != null
             && !ForceWithDefaultPrefixRouteControllerTypes.Contains(controller.ControllerType))
         {
             // 读取模块

src/Admin/ThingsGateway.Furion/DynamicApiController/Extensions/DynamicApiControllerServiceCollectionExtensions.cs

@@ -126,7 +126,7 @@ public static class DynamicApiControllerServiceCollectionExtensions
     {
         var partManager = mvcBuilder.PartManager;
         // 载入程序集部件
-        if (partManager != null && assemblies != null && assemblies.Any())
+        if (partManager != null && assemblies?.Any() == true)
         {
             foreach (var assembly in assemblies)
             {

src/Admin/ThingsGateway.Furion/DynamicApiController/Runtimes/DynamicApiRuntimeChangeProvider.cs

@@ -48,7 +48,7 @@ internal sealed class DynamicApiRuntimeChangeProvider : IDynamicApiRuntimeChange
     /// <param name="assemblies">程序集</param>
     public void AddAssemblies(params Assembly[] assemblies)
     {
-        if (assemblies != null && assemblies.Length > 0)
+        if (assemblies?.Length > 0)
         {
             foreach (var assembly in assemblies)
             {
@@ -63,7 +63,7 @@ internal sealed class DynamicApiRuntimeChangeProvider : IDynamicApiRuntimeChange
     /// <param name="assemblies">程序集</param>
     public void AddAssembliesWithNotifyChanges(params Assembly[] assemblies)
     {
-        if (assemblies != null && assemblies.Length > 0)
+        if (assemblies?.Length > 0)
         {
             AddAssemblies(assemblies);
             NotifyChanges();
@@ -76,7 +76,7 @@ internal sealed class DynamicApiRuntimeChangeProvider : IDynamicApiRuntimeChange
     /// <param name="assemblyNames">程序集名称</param>
     public void RemoveAssemblies(params string[] assemblyNames)
     {
-        if (assemblyNames != null && assemblyNames.Length > 0)
+        if (assemblyNames?.Length > 0)
         {
             foreach (var assemblyName in assemblyNames)
             {
@@ -93,7 +93,7 @@ internal sealed class DynamicApiRuntimeChangeProvider : IDynamicApiRuntimeChange
     /// <param name="assemblies">程序集</param>
     public void RemoveAssemblies(params Assembly[] assemblies)
     {
-        if (assemblies != null && assemblies.Length > 0)
+        if (assemblies?.Length > 0)
         {
             RemoveAssemblies(assemblies.Select(ass => ass.GetName().Name).ToArray());
         }
@@ -105,7 +105,7 @@ internal sealed class DynamicApiRuntimeChangeProvider : IDynamicApiRuntimeChange
     /// <param name="assemblyNames">程序集名称</param>
     public void RemoveAssembliesWithNotifyChanges(params string[] assemblyNames)
     {
-        if (assemblyNames != null && assemblyNames.Length > 0)
+        if (assemblyNames?.Length > 0)
         {
             RemoveAssemblies(assemblyNames);
             NotifyChanges();
@@ -118,7 +118,7 @@ internal sealed class DynamicApiRuntimeChangeProvider : IDynamicApiRuntimeChange
     /// <param name="assemblies">程序集</param>
     public void RemoveAssembliesWithNotifyChanges(params Assembly[] assemblies)
     {
-        if (assemblies != null && assemblies.Length > 0)
+        if (assemblies?.Length > 0)
         {
             RemoveAssemblies(assemblies);
             NotifyChanges();

src/Admin/ThingsGateway.Furion/FriendlyException/Exceptions/AppFriendlyException.cs

@@ -49,6 +49,14 @@ public class AppFriendlyException : Exception
         ErrorCode = OriginErrorCode = errorCode;
     }
 
+    public AppFriendlyException(string? message) : base(message)
+    {
+    }
+
+    public AppFriendlyException(string? message, Exception? innerException) : base(message, innerException)
+    {
+    }
+
     /// <summary>
     /// 错误码
     /// </summary>

src/Admin/ThingsGateway.Furion/FriendlyException/Retry.cs

@@ -102,7 +102,7 @@ public sealed class Retry
                 }
 
                 // 如果填写了 exceptionTypes 且异常类型不在 exceptionTypes 之内，则终止重试
-                if (exceptionTypes != null && exceptionTypes.Length > 0 && !exceptionTypes.Any(u => u.IsAssignableFrom(ex.GetType())))
+                if (exceptionTypes?.Length > 0 && !exceptionTypes.Any(u => u.IsAssignableFrom(ex.GetType())))
                 {
                     if (finalThrow)
                     {

src/Admin/ThingsGateway.Furion/Logging/Extensions/ILoggerExtensions.cs

@@ -25,7 +25,7 @@ public static class ILoggerExtensions
     /// <param name="logger"></param>
     /// <param name="properties">建议使用 ConcurrentDictionary 类型</param>
     /// <returns></returns>
-    public static IDisposable ScopeContext(this ILogger logger, IDictionary<object, object> properties)
+    public static IDisposable ScopeContext(this ILogger logger, IDictionary<string, object> properties)
     {
         if (logger == null) throw new ArgumentNullException(nameof(logger));
 

src/Admin/ThingsGateway.Furion/Logging/Extensions/LogContextExtensions.cs

@@ -26,11 +26,11 @@ public static class LogContextExtensions
     /// <param name="key">键</param>
     /// <param name="value">值</param>
     /// <returns></returns>
-    public static LogContext Set(this LogContext logContext, object key, object value)
+    public static LogContext Set(this LogContext logContext, string key, object value)
     {
         if (logContext == null || key == null) return logContext;
 
-        logContext.Properties ??= new Dictionary<object, object>();
+        logContext.Properties ??= new Dictionary<string, object>();
 
         logContext.Properties.Remove(key);
         logContext.Properties.Add(key, value);
@@ -43,7 +43,7 @@ public static class LogContextExtensions
     /// <param name="logContext"></param>
     /// <param name="properties"></param>
     /// <returns></returns>
-    public static LogContext SetRange(this LogContext logContext, IDictionary<object, object> properties)
+    public static LogContext SetRange(this LogContext logContext, IDictionary<string, object> properties)
     {
         if (logContext == null
             || properties == null
@@ -63,7 +63,7 @@ public static class LogContextExtensions
     /// <param name="logContext"></param>
     /// <param name="key">键</param>
     /// <returns></returns>
-    public static object Get(this LogContext logContext, object key)
+    public static object Get(this LogContext logContext, string key)
     {
         if (logContext == null
             || key == null
@@ -80,7 +80,7 @@ public static class LogContextExtensions
     /// <param name="logContext"></param>
     /// <param name="key">键</param>
     /// <returns></returns>
-    public static T Get<T>(this LogContext logContext, object key)
+    public static T Get<T>(this LogContext logContext, string key)
     {
         var value = logContext.Get(key);
         return value.ChangeType<T>();

src/Admin/ThingsGateway.Furion/Logging/Extensions/StringLoggingExtensions.cs

@@ -84,7 +84,7 @@ public static class StringLoggingExtensions
     /// <param name="message"></param>
     /// <param name="properties">建议使用 ConcurrentDictionary 类型</param>
     /// <returns></returns>
-    public static StringLoggingPart ScopeContext(this string message, IDictionary<object, object> properties)
+    public static StringLoggingPart ScopeContext(this string message, IDictionary<string, object> properties)
     {
         return StringLoggingPart.Default().SetMessage(message).ScopeContext(properties);
     }

src/Admin/ThingsGateway.Furion/Logging/Implantations/LogContext.cs

@@ -20,7 +20,7 @@ public sealed class LogContext : IDisposable
     /// <summary>
     /// 日志上下文数据
     /// </summary>
-    public IDictionary<object, object> Properties { get; set; }
+    public IDictionary<string, object> Properties { get; set; }
 
     /// <summary>
     /// 原生日志上下文数据