oauth增加scope参数

.gitignore

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

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;
 
@@ -29,9 +30,23 @@ public class AuthController : ControllerBase
     [AllowAnonymous]
     public Task<LoginOutput> LoginAsync([FromBody] LoginInput input)
     {
+
         return _authService.LoginAsync(input);
+
     }
 
+    [HttpGet("oauth-login")]
+    [AllowAnonymous]
+    public IActionResult OAuthLogin(string scheme = "Gitee", string returnUrl = "/")
+    {
+        var props = new AuthenticationProperties
+        {
+            RedirectUri = returnUrl
+        };
+        return Challenge(props, scheme);
+    }
+
+
     [HttpPost("logout")]
     [Authorize]
     [IgnoreRolePermission]

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

@@ -0,0 +1,212 @@
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.OAuth;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+using System.Net.Http.Headers;
+using System.Security.Claims;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
+
+namespace ThingsGateway.Admin.Application;
+
+/// <summary>
+/// 只适合 Demo 登录，会直接授权超管的权限
+/// </summary>
+public class AdminOAuthHandler<TOptions>(
+   IVerificatInfoService verificatInfoService,
+   IAppService appService,
+   ISysUserService sysUserService,
+   ISysDictService configService,
+    IOptionsMonitor<TOptions> options,
+    ILoggerFactory logger,
+    UrlEncoder encoder
+) : OAuthHandler<TOptions>(options, logger, encoder)
+    where TOptions : AdminOAuthOptions, new()
+{
+    private async Task<LoginEvent> GetLogin()
+    {
+        var sysUser = await sysUserService.GetUserByIdAsync(RoleConst.SuperAdminId).ConfigureAwait(false);//获取用户信息
+
+        var appConfig = await configService.GetAppConfigAsync().ConfigureAwait(false);
+
+
+        var expire = appConfig.LoginPolicy.VerificatExpireTime;
+
+        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信息
+    }
+
+    protected override async Task<AuthenticationTicket> CreateTicketAsync(
+        ClaimsIdentity identity,
+        AuthenticationProperties properties,
+        OAuthTokenResponse tokens)
+    {
+        properties.RedirectUri = Options.HomePath;
+        properties.IsPersistent = true;
+
+        if (!string.IsNullOrEmpty(tokens.ExpiresIn) && int.TryParse(tokens.ExpiresIn, out var result))
+        {
+            properties.ExpiresUtc = TimeProvider.System.GetUtcNow().AddSeconds(result);
+        }
+        var user = await HandleUserInfoAsync(tokens).ConfigureAwait(false);
+
+        var sysUser = await GetLogin().ConfigureAwait(false);
+        await UpdateUser(sysUser).ConfigureAwait(false);
+        identity.AddClaim(new Claim(ClaimConst.VerificatId, sysUser.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);
+
+        return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+    }
+
+    /// <summary>刷新 Token 方法</summary>
+    protected virtual async Task<OAuthTokenResponse> RefreshTokenAsync(OAuthTokenResponse oAuthToken)
+    {
+        var query = new Dictionary<string, string>
+        {
+            { "refresh_token", oAuthToken.RefreshToken },
+            { "grant_type", "refresh_token" }
+        };
+
+        var request = new HttpRequestMessage(HttpMethod.Post, QueryHelpers.AddQueryString(Options.TokenEndpoint, query));
+        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 OAuthTokenResponse.Success(JsonDocument.Parse(content));
+        }
+
+        return OAuthTokenResponse.Failed(new OAuthTokenException($"OAuth token endpoint failure: {await Display(response).ConfigureAwait(false)}"));
+    }
+
+    /// <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();
+    }
+}
+
+/// <summary>自定义 Token 异常</summary>
+public class OAuthTokenException(string message) : Exception(message);

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

@@ -0,0 +1,34 @@
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.OAuth;
+using Microsoft.AspNetCore.Identity;
+
+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()
+    {
+
+    }
+
+    /// <summary>获得/设置 登陆后首页</summary>
+    public string HomePath { get; set; } = "/";
+
+}

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

@@ -0,0 +1,68 @@
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.OAuth;
+using Microsoft.AspNetCore.WebUtilities;
+
+using System.Net.Http.Headers;
+
+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;
+        };
+    }
+    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/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/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.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/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.AdminServer/GlobalUsings.cs

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

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

@@ -12,10 +12,15 @@
 
 #pragma warning disable CA2007 // 考虑对等待的任务调用 ConfigureAwait
 
+using BootstrapBlazor.Components;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 
+using ThingsGateway.Admin.Razor;
+using ThingsGateway.Extension;
+
 namespace ThingsGateway.AdminServer;
 
 

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

@@ -9,6 +9,10 @@
 //------------------------------------------------------------------------------
 
 #pragma warning disable CA2007 // 考虑对等待的任务调用 ConfigureAwait
+using BootstrapBlazor.Components;
+
+using Mapster;
+
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Localization;
@@ -16,6 +20,11 @@ using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
+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

@@ -9,50 +9,23 @@
 //------------------------------------------------------------------------------
 
 #pragma warning disable CA2007 // 考虑对等待的任务调用 ConfigureAwait
+using BootstrapBlazor.Components;
+
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.Admin.Razor;
+using ThingsGateway.Razor;
+
 namespace ThingsGateway.AdminServer;
 
 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/Program.cs

@@ -13,6 +13,8 @@ using Microsoft.AspNetCore.ResponseCompression;
 using System.Runtime.InteropServices;
 using System.Text;
 
+using ThingsGateway.NewLife.Log;
+
 namespace ThingsGateway.AdminServer;
 
 public class Program

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

@@ -18,11 +18,17 @@ using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 
+using Newtonsoft.Json;
+
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
 
+using ThingsGateway.Admin.Razor;
+using ThingsGateway.Extension;
+using ThingsGateway.NewLife.Caching;
+
 namespace ThingsGateway.AdminServer;
 
 [AppStartup(-99999)]
@@ -362,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.SqlSugar/Const/ClaimConst.cs

@@ -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.SqlSugar/Static/UserManager.cs

@@ -27,11 +27,17 @@ public static class UserManager
     /// </summary>
     public static bool SuperAdmin => (_claimsPrincipalService.User?.FindFirst(ClaimConst.SuperAdmin)?.Value).ToBoolean(false);
 
+
     /// <summary>
     /// 当前用户账号
     /// </summary>
     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>

src/Directory.Build.props

@@ -1,9 +1,9 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.6.35</PluginVersion>
+		<PluginVersion>10.7.15</PluginVersion>
-		<ProPluginVersion>10.6.35</ProPluginVersion>
+		<ProPluginVersion>10.7.15</ProPluginVersion>
-		<AuthenticationVersion>2.1.8</AuthenticationVersion>
+		<AuthenticationVersion>2.2.0</AuthenticationVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>

src/Foundation/ThingsGateway.Foundation/Channel/Plugin/DtuPlugin.cs

@@ -28,11 +28,12 @@ public class DtuPlugin : PluginBase, ITcpReceivingPlugin
         set
         {
             _heartbeat = value;
-            HeartbeatByte = new ArraySegment<byte>(Encoding.UTF8.GetBytes(value));
+            if (!_heartbeat.IsNullOrEmpty())
+                HeartbeatByte = new ArraySegment<byte>(Encoding.UTF8.GetBytes(value));
         }
     }
     private string _heartbeat;
-    private ArraySegment<byte> HeartbeatByte;
+    private ArraySegment<byte> HeartbeatByte = new();
 
     /// <inheritdoc/>
     public async Task OnTcpReceiving(ITcpSession client, ByteBlockEventArgs e)

src/Foundation/ThingsGateway.Foundation/Channel/Plugin/PluginUtil.cs

@@ -47,7 +47,7 @@ public static class PluginUtil
         Action<IPluginManager> action = a => { };
 
         action += GetTcpServicePlugin(channelOptions);
-        if (!channelOptions.Heartbeat.IsNullOrWhiteSpace())
+        //if (!channelOptions.Heartbeat.IsNullOrWhiteSpace())
         {
             action += a =>
             {

src/Foundation/ThingsGateway.Foundation/Logger/TextFileReader.cs

@@ -8,17 +8,13 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using System.Buffers;
 using System.Text;
 
 using ThingsGateway.NewLife.Caching;
 
 namespace ThingsGateway.Foundation;
 
-public class LogDataCache
-{
-    public List<LogData> LogDatas { get; set; }
-    public long Length { get; set; }
-}
 /// <summary>
 /// 日志数据
 /// </summary>
@@ -47,8 +43,19 @@ public class LogData
 
 
 /// <summary>日志文本文件倒序读取</summary>
+
+public class LogDataCache
+{
+    public List<LogData> LogDatas { get; set; }
+    public long Length { get; set; }
+}
+
+/// <summary>高性能日志文件读取器（支持倒序读取）</summary>
 public class TextFileReader
 {
+    private static readonly MemoryCache _cache = new() { Expire = 30 };
+    private static readonly MemoryCache _fileLocks = new();
+    private static readonly ArrayPool<byte> _bytePool = ArrayPool<byte>.Shared;
     /// <summary>
     /// 获取指定目录下所有文件信息
     /// </summary>
@@ -86,159 +93,167 @@ public class TextFileReader
         return result;
     }
 
-    static MemoryCache _cache = new() { Expire = 30 };
+
     public static OperResult<List<LogData>> LastLog(string file, int lineCount = 200)
     {
-        lock (_cache)
+        if (!File.Exists(file))
-        {
+            return new OperResult<List<LogData>>("The file path is invalid");
 
-            OperResult<List<LogData>> result = new(); // 初始化结果对象
+        _fileLocks.SetExpire(file, TimeSpan.FromSeconds(30));
+        var fileLock = _fileLocks.GetOrAdd(file, _ => new object());
+        lock (fileLock)
+        {
             try
             {
-                if (!File.Exists(file)) // 检查文件是否存在
+                var fileInfo = new FileInfo(file);
+                var length = fileInfo.Length;
+                var cacheKey = $"{nameof(TextFileReader)}_{nameof(LastLog)}_{file})";
+                if (_cache.TryGetValue<LogDataCache>(cacheKey, out var cachedData))
                 {
-                    result.OperCode = 999;
+                    if (cachedData != null && cachedData.Length == length)
-                    result.ErrorMessage = "The file path is invalid";
-                    return result;
-                }
-
-                List<string> txt = new(); // 存储读取的文本内容
-                long ps = 0; // 保存起始位置
-                var key = $"{nameof(TextFileReader)}_{nameof(LastLog)}_{file})";
-                long length = 0;
-                using (var fs = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
-                {
-                    length = fs.Length;
-                    var dataCache = _cache.Get<LogDataCache>(key);
-                    if (dataCache != null && dataCache.Length == length)
                     {
-                        result.Content = dataCache.LogDatas;
+                        return new OperResult<List<LogData>>() { Content = cachedData.LogDatas };
-                        result.OperCode = 0; // 操作状态设为成功
-                        return result; // 返回解析结果
                     }
-
+                    else
-                    if (ps <= 0) // 如果起始位置小于等于0，将起始位置设置为文件长度
-                        ps = length - 1;
-
-                    // 循环读取指定行数的文本内容
-                    for (int i = 0; i < lineCount; i++)
                     {
-                        ps = InverseReadRow(fs, ps, out var value); // 使用逆序读取
+                        _cache.Remove(cacheKey);
-                        txt.Add(value);
-                        if (ps <= 0) // 如果已经读取到文件开头则跳出循环
-                            break;
                     }
                 }
 
-                // 使用单次 LINQ 操作进行过滤和解析
+                using var fs = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, 4096, FileOptions.SequentialScan);
-                result.Content = txt
+                var result = ReadLogsInverse(fs, lineCount, fileInfo.Length);
-                    .Select(a => ParseCSV(a))
-                    .Where(data => data.Count >= 3)
-                    .Select(data =>
-                    {
-                        var log = new LogData
-                        {
-                            LogTime = data[0].Trim(),
-                            LogLevel = Enum.TryParse(data[1].Trim(), out LogLevel level) ? level : LogLevel.Info,
-                            Message = data[2].Trim(),
-                            ExceptionString = data.Count > 3 ? data[3].Trim() : null
-                        };
-                        return log;
-                    })
-                    .ToList();
 
-                result.OperCode = 0; // 操作状态设为成功
+                _cache.Set(cacheKey, new LogDataCache
-                var data = _cache.Set<LogDataCache>(key, new LogDataCache() { Length = length, LogDatas = result.Content });
+                {
+                    LogDatas = result,
+                    Length = fileInfo.Length,
+                });
 
-                return result; // 返回解析结果
+                return new OperResult<List<LogData>>() { Content = result };
             }
-            catch (Exception ex) // 捕获异常
+            catch (Exception ex)
             {
-                result = new(ex); // 创建包含异常信息的结果对象
+                return new OperResult<List<LogData>>(ex);
-                return result; // 返回异常结果
             }
         }
     }
 
+    private static List<LogData> ReadLogsInverse(FileStream fs, int lineCount, long length)
+    {
+        length = fs.Length;
+        long ps = 0; // 保存起始位置
+        List<string> txt = new(); // 存储读取的文本内容
+
+        if (ps <= 0) // 如果起始位置小于等于0，将起始位置设置为文件长度
+            ps = length - 1;
+
+        // 循环读取指定行数的文本内容
+        for (int i = 0; i < lineCount; i++)
+        {
+            ps = InverseReadRow(fs, ps, out var value); // 使用逆序读取
+            txt.Add(value);
+            if (ps <= 0) // 如果已经读取到文件开头则跳出循环
+                break;
+        }
+
+        // 使用单次 LINQ 操作进行过滤和解析
+        var result = txt
+              .Select(a => ParseCSV(a))
+                  .Where(data => data.Count >= 3)
+                  .Select(data =>
+                  {
+                      var log = new LogData
+                      {
+                          LogTime = data[0].Trim(),
+                          LogLevel = Enum.TryParse(data[1].Trim(), out LogLevel level) ? level : LogLevel.Info,
+                          Message = data[2].Trim(),
+                          ExceptionString = data.Count > 3 ? data[3].Trim() : null
+                      };
+                      return log;
+                  })
+                  .ToList();
+
+
+        return result; // 返回解析结果
+    }
+
     private static long InverseReadRow(FileStream fs, long position, out string value, int maxRead = 102400)
     {
-        byte n = 0xD; // 换行符
+        byte n = 0xD;
-        byte a = 0xA; // 回车符
+        byte a = 0xA;
         value = string.Empty;
-        if (fs.Length == 0) return 0; // 若文件长度为0，则直接返回0作为新的位置
+
+        if (fs.Length == 0) return 0;
 
         var newPos = position;
-        List<byte> buffer = new List<byte>(maxRead); // 缓存读取的数据
+        byte[] buffer = _bytePool.Rent(maxRead); // 从池中租借字节数组
+        int index = 0;
 
         try
         {
-            var readLength = 0;
+            while (true)
-
-            while (true) // 循环读取一行数据，TextFileLogger.Separator行判定
             {
-                readLength++;
                 if (newPos <= 0)
                     newPos = 0;
 
                 fs.Position = newPos;
                 int byteRead = fs.ReadByte();
 
-                if (byteRead == -1) break; // 到达文件开头时跳出循环
+                if (byteRead == -1) break;
 
-                buffer.Add((byte)byteRead);
+                if (index >= maxRead)
-
-                if (byteRead == n || byteRead == a)//判断当前字符是换行符 // TextFileLogger.Separator
-                {
-                    if (MatchSeparator(buffer))
-                    {
-                        // 去掉匹配的指定字符串
-                        buffer.RemoveRange(buffer.Count - TextFileLogger.SeparatorBytes.Length, TextFileLogger.SeparatorBytes.Length);
-                        break;
-                    }
-                }
-
-                if (buffer.Count > maxRead) // 超过最大字节数限制时丢弃数据
                 {
                     newPos = -1;
                     return newPos;
                 }
+
+                buffer[index++] = (byte)byteRead;
+
+                if (byteRead == n || byteRead == a)
+                {
+                    if (MatchSeparator(buffer, index))
+                    {
+                        index -= TextFileLogger.SeparatorBytes.Length;
+                        break;
+                    }
+                }
+
                 newPos--;
                 if (newPos <= -1)
                     break;
             }
 
-            if (buffer.Count >= 10)
+            if (index >= 10)
             {
-                buffer.Reverse();
+                Array.Reverse(buffer, 0, index); // 倒序
-                value = Encoding.UTF8.GetString(buffer.ToArray()); // 转换为字符串
+                value = Encoding.UTF8.GetString(buffer, 0, index);
             }
 
-            return newPos; // 返回新的读取位置
+            return newPos;
         }
         finally
         {
+            _bytePool.Return(buffer); // 归还数组
         }
     }
 
 
-    private static bool MatchSeparator(List<byte> arr)
+    private static bool MatchSeparator(byte[] arr, int length)
     {
-        if (arr.Count < TextFileLogger.SeparatorBytes.Length)
+        if (length < TextFileLogger.SeparatorBytes.Length)
-        {
             return false;
-        }
+
-        var pos = arr.Count - 1;
+        int pos = length - 1;
         for (int i = 0; i < TextFileLogger.SeparatorBytes.Length; i++)
         {
             if (arr[pos] != TextFileLogger.SeparatorBytes[i])
-            {
                 return false;
-            }
             pos--;
         }
         return true;
     }
 
+
     private static List<string> ParseCSV(string data)
     {
         List<string> items = new List<string>();

src/Gateway/ThingsGateway.Gateway.Application/Common/SmartTriggerScheduler.cs

@@ -75,7 +75,6 @@ public class SmartTriggerScheduler
                     return;
                 }
 
-                // 有新的触发，继续下一轮循环（再执行一次）
             }
         }
     }

src/Gateway/ThingsGateway.Gateway.Application/Driver/DriverBase.cs

@@ -352,7 +352,12 @@ public abstract class DriverBase : DisposableObject, IDriver
 
     public string GetAuthString()
     {
-        return PluginServiceUtil.IsEducation(GetType()) ? ThingsGateway.Authentication.ProAuthentication.TryGetAuthorizeInfo(out _) ? Localizer["Authorized"] : Localizer["Unauthorized"] : string.Empty;
+        if (PluginServiceUtil.IsEducation(GetType()))
+        {
+            ThingsGateway.Authentication.ProAuthentication.TryGetAuthorizeInfo(out var authorizeInfo);
+            return authorizeInfo.Auth ? Localizer["Authorized"] : Localizer["Unauthorized"];
+        }
+        return string.Empty;
     }
 
     /// <summary>

src/Gateway/ThingsGateway.Gateway.Razor/Components/GatewayAbout.razor.cs

@@ -10,8 +10,6 @@
 
 using Microsoft.Extensions.Options;
 
-using ThingsGateway.Authentication;
-
 namespace ThingsGateway.Gateway.Razor;
 
 /// <inheritdoc/>
@@ -27,39 +25,5 @@ public partial class GatewayAbout
     [NotNull]
     private IOptions<WebsiteOptions>? WebsiteOption { get; set; }
 
-    private string Password { get; set; }
-    private AuthorizeInfo AuthorizeInfo { get; set; }
-    [Inject]
-    ToastService ToastService { get; set; }
-
-    protected override void OnParametersSet()
-    {
-        ProAuthentication.TryGetAuthorizeInfo(out var authorizeInfo);
-        AuthorizeInfo = authorizeInfo;
-        base.OnParametersSet();
-    }
-
-    private async Task Register()
-    {
-        var result = ProAuthentication.TryAuthorize(Password, out var authorizeInfo);
-        if (result)
-        {
-            AuthorizeInfo = authorizeInfo;
-            await ToastService.Default();
-        }
-        else
-            await ToastService.Default(false);
-
-        Password = string.Empty;
-        await InvokeAsync(StateHasChanged);
-    }
-    private async Task Unregister()
-    {
-        ProAuthentication.UnAuthorize();
-        var result = ProAuthentication.TryGetAuthorizeInfo(out var authorizeInfo);
-        AuthorizeInfo = authorizeInfo;
-
-        await InvokeAsync(StateHasChanged);
-    }
 
 }

src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRuntimeInfo.razor.cs

@@ -35,6 +35,15 @@ public partial class VariableRuntimeInfo : IDisposable
 
     [Parameter]
     public IEnumerable<VariableRuntime>? Items { get; set; } = Enumerable.Empty<VariableRuntime>();
+    private IEnumerable<VariableRuntime>? _previousItemsRef;
+    protected override async Task OnParametersSetAsync()
+    {
+        if (!ReferenceEquals(_previousItemsRef, Items))
+        {
+            _previousItemsRef = Items;
+            await Refresh(null);
+        }
+    }
 
     public void Dispose()
     {
@@ -47,7 +56,7 @@ public partial class VariableRuntimeInfo : IDisposable
     {
         VariableRuntimeDispatchService.Subscribe(Refresh);
 
-        scheduler = new SmartTriggerScheduler(Notify, TimeSpan.FromMilliseconds(3000));
+        scheduler = new SmartTriggerScheduler(Notify, TimeSpan.FromMilliseconds(1000));
 
         _ = RunTimerAsync();
         base.OnInitialized();

src/Gateway/ThingsGateway.Management/Pages/Authentication.razor

@@ -40,7 +40,7 @@
                         </label>
 
                         <label class="form-control">
-                            @(AuthorizeInfo != null ? Localizer["Authorized"] : Localizer["Unauthorized"])
+                            @(AuthorizeInfo?.Auth==true ? Localizer["Authorized"] : Localizer["Unauthorized"])
                         </label>
                     </div>
                 </div>
@@ -50,6 +50,7 @@
                 @if (AuthorizeInfo != null)
                 {
                     <div class="row g-3 form-inline">
+
                         <div class="col-12 col-sm-12">
 
                             <label class="form-label">
@@ -70,7 +71,7 @@
                             </label>
 
                             <label class="form-control">
-                                @AuthorizeInfo?.ExpireTime
+                                @AuthorizeInfo?.RealExpireTime
                             </label>
                         </div>
 

src/Gateway/ThingsGateway.Management/Pages/Authentication.razor.cs

@@ -55,7 +55,7 @@ public partial class Authentication
     private async Task Unregister()
     {
         ProAuthentication.UnAuthorize();
-        var result = ProAuthentication.TryGetAuthorizeInfo(out var authorizeInfo);
+        _ = ProAuthentication.TryGetAuthorizeInfo(out var authorizeInfo);
         AuthorizeInfo = authorizeInfo;
 
         await InvokeAsync(StateHasChanged);

src/Plugin/ThingsGateway.Debug.Photino/MainLayout.razor.cs

@@ -25,39 +25,6 @@ public partial class MainLayout
 {
     [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;
-    }
-
 
     private Tab _tab { get; set; }
 

src/ThingsGateway.Photino/Startup.cs

@@ -15,7 +15,6 @@ using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.DependencyInjection;
@@ -52,6 +51,7 @@ public class Startup : AppStartup
         services.AddSingleton<IAuthRazorService, HybridAuthRazorService>();
         services.AddSingleton<HybridAppService>();
         services.AddSingleton<IAppService, HybridAppService>(a => a.GetService<HybridAppService>());
+        services.AddSingleton<IClaimsPrincipalService, HybridClaimsPrincipalService>();
 
         services.AddScoped<IPlatformService, HybridPlatformService>();
         services.AddScoped<IGatewayExportService, HybridGatewayExportService>();
@@ -351,12 +351,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/ThingsGateway.Server/Layout/Login.razor.cs

@@ -64,43 +64,51 @@ public partial class Login
         _versionString = $"v{VersionService.Version}";
         return base.OnInitializedAsync();
     }
-
+    [Inject]
+    NavigationManager NavigationManager { get; set; }
     private async Task LoginAsync(EditContext context)
     {
-        var model = loginModel.Adapt<LoginInput>();
-        model.Password = DESEncryption.Encrypt(model.Password);
 
-        try
+        var websiteOptions = App.GetOptions<WebsiteOptions>()!;
+        if (websiteOptions.Demo)
         {
+            NavigationManager.NavigateTo("/api/auth/oauth-login", forceLoad: true);
+        }
+        else
+        {
+            var model = loginModel.Adapt<LoginInput>();
+            model.Password = DESEncryption.Encrypt(model.Password);
 
-            var ret = await AuthRazorService.LoginAsync(model);
+            try
-
-            if (ret.Code != 200)
             {
-                await ToastService.Error(Localizer["LoginErrorh1"], $"{ret.Msg}");
-            }
-            else
-            {
-                await ToastService.Information(Localizer["LoginSuccessh1"], Localizer["LoginSuccessc1"]);
-                await Task.Delay(1000);
 
-                if (ReturnUrl.IsNullOrWhiteSpace() || ReturnUrl == @"/")
+                var ret = await AuthRazorService.LoginAsync(model);
+
+                if (ret.Code != 200)
                 {
-                    await AjaxService.Goto(ReturnUrl ?? "/");
+                    await ToastService.Error(Localizer["LoginErrorh1"], $"{ret.Msg}");
                 }
                 else
                 {
-                    await AjaxService.Goto(ReturnUrl);
+                    await ToastService.Information(Localizer["LoginSuccessh1"], Localizer["LoginSuccessc1"]);
+                    await Task.Delay(1000);
+
+                    if (ReturnUrl.IsNullOrWhiteSpace() || ReturnUrl == @"/")
+                    {
+                        await AjaxService.Goto(ReturnUrl ?? "/");
+                    }
+                    else
+                    {
+                        await AjaxService.Goto(ReturnUrl);
+                    }
                 }
             }
-        }
+            catch
-        catch
+            {
-        {
+                await ToastService.Error(Localizer["LoginErrorh2"], Localizer["LoginErrorc2"]);
-            await ToastService.Error(Localizer["LoginErrorh2"], Localizer["LoginErrorc2"]);
+            }
         }
     }
 
 
-
-
 }

src/ThingsGateway.Server/Layout/MainLayout.razor

@@ -47,7 +47,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/ThingsGateway.Server/Layout/MainLayout.razor.cs

@@ -28,39 +28,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/ThingsGateway.Server/Program/Startup.cs

@@ -29,6 +29,7 @@ using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Extension;
 using ThingsGateway.NewLife.Caching;
+using ThingsGateway.Razor;
 
 namespace ThingsGateway.Server;
 
@@ -287,6 +288,18 @@ public class Startup : AppStartup
             a.LoginPath = "/Account/Login/";
         });
 
+        var websiteOptions = App.GetOptions<WebsiteOptions>()!;
+        if (websiteOptions.Demo)
+        {
+            authenticationBuilder.AddOAuth<GiteeOAuthOptions, AdminOAuthHandler<GiteeOAuthOptions>>("Gitee", "Gitee", options =>
+        {
+            var data = App.GetConfig<GiteeOAuthSettings>("GiteeOAuthSettings");
+            options.ClientId = data.ClientId;
+            options.ClientSecret = data.ClientSecret;
+
+        });
+        }
+
         // 添加jwt授权
         authenticationBuilder.AddJwt();
 
@@ -371,13 +384,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();
         // contentTypeProvider.Mappings[".文件后缀"] = "MIME 类型";

src/Upgrade/ThingsGateway.UpgradeServer/Controler/AutoUpdateControler.cs

@@ -11,8 +11,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-using ThingsGateway.Admin.Application;
-
 namespace ThingsGateway.Upgrade;
 
 /// <summary>

src/Upgrade/ThingsGateway.UpgradeServer/Index/AdminIndex.razor.cs

@@ -12,16 +12,10 @@
 
 #pragma warning disable CA2007 // 考虑对等待的任务调用 ConfigureAwait
 
-using BootstrapBlazor.Components;
-
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 
-using ThingsGateway.Admin.Application;
-using ThingsGateway.Admin.Razor;
-using ThingsGateway.Extension;
-
 namespace ThingsGateway.UpgradeServer;
 
 

src/Upgrade/ThingsGateway.UpgradeServer/Layout/AccessDenied.razor.cs

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

src/Upgrade/ThingsGateway.UpgradeServer/Layout/Login.razor.cs

@@ -9,10 +9,6 @@
 //------------------------------------------------------------------------------
 
 #pragma warning disable CA2007 // 考虑对等待的任务调用 ConfigureAwait
-using BootstrapBlazor.Components;
-
-using Mapster;
-
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Localization;
@@ -20,11 +16,6 @@ using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
-using ThingsGateway.Admin.Application;
-using ThingsGateway.DataEncryption;
-using ThingsGateway.NewLife.Extension;
-using ThingsGateway.Razor;
-
 namespace ThingsGateway.UpgradeServer;
 
 public partial class Login

src/Upgrade/ThingsGateway.UpgradeServer/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/Upgrade/ThingsGateway.UpgradeServer/Layout/MainLayout.razor.cs

@@ -9,57 +9,18 @@
 //------------------------------------------------------------------------------
 
 #pragma warning disable CA2007 // 考虑对等待的任务调用 ConfigureAwait
-using BootstrapBlazor.Components;
-
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
-using ThingsGateway.Admin.Application;
-using ThingsGateway.Admin.Razor;
-using ThingsGateway.Razor;
-
 namespace ThingsGateway.UpgradeServer;
 
 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/Upgrade/ThingsGateway.UpgradeServer/Program/Program.cs

@@ -13,8 +13,6 @@ using Microsoft.AspNetCore.ResponseCompression;
 using System.Runtime.InteropServices;
 using System.Text;
 
-using ThingsGateway.NewLife.Log;
-
 
 namespace ThingsGateway.UpgradeServer;
 

src/Upgrade/ThingsGateway.UpgradeServer/Program/Startup.cs

@@ -18,17 +18,11 @@ using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 
-using Newtonsoft.Json;
-
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
 
-using ThingsGateway.Admin.Application;
-using ThingsGateway.Admin.Razor;
-using ThingsGateway.Extension;
-
 namespace ThingsGateway.UpgradeServer;
 
 [AppStartup(-99999)]
@@ -366,12 +360,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/Upgrade/ThingsGateway.UpgradeServer/Program/Startup1.cs

@@ -10,8 +10,6 @@
 
 using System.Reflection;
 
-using ThingsGateway.Admin.Application;
-
 namespace ThingsGateway.Upgrade;
 
 [AppStartup(100000000)]

src/Upgrade/ThingsGateway.UpgradeServer/SeedData/SysRelationSeedData.cs

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

src/Upgrade/ThingsGateway.UpgradeServer/SeedData/SysResourceSeedData.cs

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

src/Version.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>10.6.35</Version>
+    <Version>10.7.15</Version>
   </PropertyGroup>
 
   <ItemGroup>