10.11.24

feat: 增加部分demo
feat: 增加管理软件桌面端

.gitignore

@@ -364,6 +364,8 @@ FodyWeavers.xsd
 
 /src/*Pro*/
 /src/*Pro*
+/src/**/*Pro*
 /src/*pro*
 /src/*pro*/
 /src/ThingsGateway.Server/Configuration/GiteeOAuthSettings.json
+/src/.idea/

src/Admin/BlazorSetParametersAsyncGenerator/BlazorSetParametersAsyncGenerator.csproj

@@ -11,6 +11,7 @@
 		<IncludeBuildOutput>false</IncludeBuildOutput>
 		<!-- 避免 DLL 被打包到 lib/ -->
 		<EnableSourceGenerator>true</EnableSourceGenerator>
+		
 		<!-- 可选 -->
 
 		
@@ -26,6 +27,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" PrivateAssets="all" Private="false" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" PrivateAssets="all" Private="false" />
 	</ItemGroup>
 </Project>

src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/SetParametersAsyncGenerator.cs

@@ -122,6 +122,7 @@ using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
+#pragma warning disable CA1849
 #pragma warning disable CA2007
 #pragma warning disable CS0162
 #pragma warning disable CS8632
@@ -276,6 +277,7 @@ namespace {namespaceName}
 #pragma warning restore CS8632
 #pragma warning restore CS0162
 #pragma warning restore CA2007
+#pragma warning restore CA1849
 ");
         var bases = class_symbol.GetTypeHierarchy().Where(t => !SymbolEqualityComparer.Default.Equals(t, class_symbol));
         var members = class_symbol.GetMembers() // members of the type itself
@@ -435,5 +437,4 @@ namespace {namespaceName}
                 m.DeclaredAccessibility == Accessibility.Public &&
                 !m.IsStatic);
     }
-
 }

src/Admin/README.md

@@ -1,5 +1,5 @@
 
-<div align="center"><h1 align="center">ThingsBlazor</a></h1></div>
+<div align="center"><h1 align="center">ThingsBlazor</h1></div>
 <div align="center"><h3 align="center">权限管理框架</h3></div>
 
 

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

@@ -38,9 +38,9 @@ public sealed class OperDescAttribute : MoAttribute
 
     static OperDescAttribute()
     {
-        // 创建长时间运行的后台任务，并将日志消息队列中数据写入存储中
-        Task.Factory.StartNew(ProcessQueue, TaskCreationOptions.LongRunning);
         AppService = App.RootServices.GetService<IAppService>();
+        // 创建长时间运行的后台任务，并将日志消息队列中数据写入存储中
+        Task.Factory.StartNew(ProcessQueueAsync, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default);
     }
 
     public OperDescAttribute(string description, bool isRecordPar = true, object localizerType = null)
@@ -84,7 +84,6 @@ public sealed class OperDescAttribute : MoAttribute
     {
         if (App.HttpContext?.Request.Path.StartsWithSegments("/_blazor") == true)
         {
-
             //插入操作日志
             SysOperateLog log = GetOperLog(LocalizerType, context);
             OperDescAttribute.WriteToQueue(log);
@@ -94,7 +93,7 @@ public sealed class OperDescAttribute : MoAttribute
     /// <summary>
     /// 将日志消息写入数据库中
     /// </summary>
-    private static async Task ProcessQueue()
+    private static async Task ProcessQueueAsync()
     {
         var appLifetime = App.RootServices!.GetService<IHostApplicationLifetime>()!;
         while (!appLifetime.ApplicationStopping.IsCancellationRequested)

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

@@ -18,7 +18,6 @@ public sealed class RolePermissionAttribute : Attribute
 {
 }
 
-
 /// <summary>
 /// 忽略角色授权权限
 /// </summary>

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

@@ -10,7 +10,6 @@
 
 namespace ThingsGateway.Admin.Application;
 
-
 [AttributeUsage(AttributeTargets.Method)]
 public sealed class LoginLogAttribute : Attribute
 {

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

@@ -31,9 +31,7 @@ public class AuthController : ControllerBase
     [LoginLog]
     public Task<LoginOutput> LoginAsync([FromBody] LoginInput input)
     {
-
         return _authService.LoginAsync(input);
-
     }
 
     [HttpGet("oauth-login")]
@@ -48,7 +46,6 @@ public class AuthController : ControllerBase
         return Challenge(props, scheme);
     }
 
-
     [HttpPost("logout")]
     [Authorize]
     [IgnoreRolePermission]

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

@@ -34,17 +34,20 @@ public class FileController : ControllerBase
             return BadRequest("Invalid file name.");
         }
 
-        var filePath = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", fileName);
+        var root = Directory.GetCurrentDirectory();
-
+        var wwwroot = Path.Combine(root, "wwwroot");
-        if (!System.IO.File.Exists(filePath))
+        var filePath = Path.Combine(wwwroot, fileName);
+#pragma warning disable CA3003
+        if ((!(fileName.StartsWith(@"../Logs") || fileName.StartsWith(@"..\Logs")) && filePath.Contains("..")) || !System.IO.File.Exists(filePath))
         {
             return NotFound();
         }
+#pragma warning restore CA3003
 
         var fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 
         Response.Headers.Append("Access-Control-Expose-Headers", "Content-Disposition");
 
-        return File(fileStream, "application/octet-stream", (fileName.Replace('/', '_')));
+        return File(fileStream, "application/octet-stream", (Path.GetFileName(filePath).Replace('/', '_')));
     }
 }

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

@@ -15,7 +15,6 @@ using System.ComponentModel;
 
 namespace ThingsGateway.Admin.Application;
 
-
 /// <summary>
 /// 登录
 /// </summary>

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

@@ -66,12 +66,9 @@ public class SysOrg : BaseEntity
     [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
     public OrgEnum Category { get; set; }
 
-
     [SugarColumn(ColumnName = "Status", ColumnDescription = "启用")]
     [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
     public bool Status { get; set; } = true;
 
 
-
-
 }

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

@@ -10,8 +10,6 @@
 
 using System.ComponentModel.DataAnnotations;
 
-
-
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
@@ -44,7 +42,6 @@ public class SysPosition : BaseEntity
     [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
     public string Code { get; set; }
 
-
     [SugarColumn(ColumnName = "Status", ColumnDescription = "启用")]
     [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
     public bool Status { get; set; } = true;
@@ -55,5 +52,4 @@ public class SysPosition : BaseEntity
     [SugarColumn(ColumnName = "Category", ColumnDescription = "分类")]
     [AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
     public virtual PositionCategoryEnum Category { get; set; }
-
 }

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

@@ -71,8 +71,6 @@ public class SysRole : BaseEntity
     }
 }
 
-
-
 /// <summary>
 /// 默认数据范围
 /// </summary>

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

@@ -225,7 +225,6 @@ public class SysUser : BaseEntity
     [AutoGenerateColumn(Ignore = true)]
     public long? TenantId { get; set; }
 
-
     /// <summary>
     /// 全局用戶
     /// </summary>

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

@@ -15,7 +15,6 @@ namespace ThingsGateway.Admin.Application;
 /// <summary>
 /// 会话信息
 /// </summary>
-
 [SugarTable("verificatinfo", TableDescription = "验证缓存表")]
 [Tenant(SqlSugarConst.DB_TokenCache)]
 public class VerificatInfo : PrimaryIdEntity
@@ -39,6 +38,7 @@ public class VerificatInfo : PrimaryIdEntity
     [AutoGenerateColumn(Filterable = true, Sortable = true)]
     [SugarColumn(ColumnDescription = "Id", IsPrimaryKey = true)]
     [IgnoreExcel]
+    [System.ComponentModel.DataAnnotations.Key]
     public override long Id { get; set; }
 
     /// <summary>
@@ -79,6 +79,4 @@ public class VerificatInfo : PrimaryIdEntity
     /// </summary>
     [AutoGenerateColumn(Filterable = true, Sortable = true, Width = 100)]
     public string Device { get; set; }
-
-
 }

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

@@ -12,7 +12,6 @@ namespace ThingsGateway.Admin.Application;
 
 public enum DataScopeEnum
 {
-
     /// <summary>
     /// 仅自己
     /// </summary>
@@ -37,5 +36,4 @@ public enum DataScopeEnum
     /// 自定义
     /// </summary>
     SCOPE_ORG_DEFINE,
-
 }

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

@@ -16,7 +16,6 @@ namespace ThingsGateway.Admin.Application;
 [ThingsGateway.DependencyInjection.SuppressSniffer]
 public static class SchemeHelper
 {
-
     public static string GetOrCreate()
     {
         var path = "Keys/SchemeKey.txt";
@@ -33,5 +32,4 @@ public static class SchemeHelper
             return data;
         }
     }
-
 }

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

@@ -6,5 +6,4 @@ namespace System;
 [SuppressSniffer, AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
 public sealed class RequestAuditAttribute : Attribute
 {
-
 }

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

@@ -61,7 +61,6 @@ public class RequestAuditData
 
     public long TimeOperationElapsedMilliseconds { get; set; }
 
-
     /// <summary>
     /// 服务端
     /// </summary>
@@ -98,4 +97,3 @@ public class RequestAuditData
     public Validation Validation { get; set; }
     public MethodInfo MethodInfo { get; set; }
 }
-

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

@@ -41,7 +41,6 @@ public class RequestAuditFilter : IAsyncActionFilter, IOrderedFilter
         // 获取动作方法描述器
         var actionMethod = controllerActionDescriptor?.MethodInfo;
 
-
         // 处理 Blazor Server
         if (actionMethod == null)
         {
@@ -61,7 +60,6 @@ public class RequestAuditFilter : IAsyncActionFilter, IOrderedFilter
             return;
         }
 
-
         // 只有方法贴有特性才进行审计
         if (
             !actionMethod.DeclaringType.IsDefined(typeof(RequestAuditAttribute), true)
@@ -71,12 +69,8 @@ public class RequestAuditFilter : IAsyncActionFilter, IOrderedFilter
             return;
         }
 
-
-
-
         var logData = new RequestAuditData();
 
-
         logData.TimeOperationElapsedMilliseconds = timeOperation.ElapsedMilliseconds;
 
         var resultHttpContext = (resultContext as Microsoft.AspNetCore.Mvc.Filters.FilterContext).HttpContext;
@@ -145,8 +139,6 @@ public class RequestAuditFilter : IAsyncActionFilter, IOrderedFilter
             });
         }
 
-
-
         logData.LocalIPv4 = httpContext.GetLocalIpAddressToIPv4();
         logData.LogDateTime = DateTimeOffset.Now;
         var parameterValues = context.ActionArguments;
@@ -167,7 +159,6 @@ public class RequestAuditFilter : IAsyncActionFilter, IOrderedFilter
 
             _ = parameterValues.TryGetValue(name, out var value);
 
-
             var par = new Parameters()
             {
                 Name = name,
@@ -233,7 +224,6 @@ public class RequestAuditFilter : IAsyncActionFilter, IOrderedFilter
             par.Value = rawValue;
         }
 
-
         // 获取异常对象情况
         Exception exception = resultContext.Exception;
         if (exception is AppFriendlyException friendlyException)
@@ -249,8 +239,6 @@ public class RequestAuditFilter : IAsyncActionFilter, IOrderedFilter
             logData.Exception.Type = HandleGenericType(exception.GetType());
         }
 
-
-
         // 创建日志记录器
         var logger = httpContext.RequestServices.GetRequiredService<ILogger<RequestAudit>>();
 
@@ -296,6 +284,4 @@ public class RequestAuditFilter : IAsyncActionFilter, IOrderedFilter
     }
 
 
-
-
 }

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

@@ -6,5 +6,4 @@ namespace System;
 [SuppressSniffer, AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
 public sealed class SuppressRequestAuditAttribute : Attribute
 {
-
 }

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

@@ -58,7 +58,7 @@ public class HardwareJob : IJob, IHardwareJob
         var historyHardwareInfos = MemoryCache.Get<List<HistoryHardwareInfo>>(CacheKey);
         if (historyHardwareInfos == null)
         {
-            using var db = DbContext.GetDB<HistoryHardwareInfo>(); ;
+            using var db = DbContext.GetDB<HistoryHardwareInfo>();
             historyHardwareInfos = await db.Queryable<HistoryHardwareInfo>().Where(a => a.Date > DateTime.Now.AddDays(-3)).Take(1000).ToListAsync().ConfigureAwait(false);
 
             MemoryCache.Set(CacheKey, historyHardwareInfos);
@@ -92,7 +92,6 @@ public class HardwareJob : IJob, IHardwareJob
                     HardwareInfo.UUID = HardwareInfo.MachineInfo.UUID;
 
                     HardwareInfo.UpdateTime = TimerX.Now.ToDefaultDateTimeFormat();
-
                 }
             }
             catch
@@ -129,7 +128,7 @@ public class HardwareJob : IJob, IHardwareJob
                                 CpuUsage = (HardwareInfo.MachineInfo.CpuRate * 100).ToInt(),
                                 Temperature = (HardwareInfo.MachineInfo.Temperature).ToInt(),
                             };
-                            await _db.Insertable(his).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
+                            await _db.InsertableT(his).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
                             MemoryCache.Remove(CacheKey);
                         }
                         var sevenDaysAgo = TimerX.Now.AddDays(-HardwareInfoOptions.DaysAgo);
@@ -154,5 +153,4 @@ public class HardwareJob : IJob, IHardwareJob
             }
         }
     }
-
 }

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

@@ -17,7 +17,6 @@ namespace ThingsGateway.Admin.Application;
 /// </summary>
 public class JobPersistence : IJobPersistence
 {
-
     /// <summary>
     /// 作业调度服务启动时
     /// </summary>
@@ -61,7 +60,6 @@ public class JobPersistence : IJobPersistence
     public async Task OnTriggerChangedAsync(PersistenceTriggerContext context)
     {
         await Task.CompletedTask.ConfigureAwait(false);
-
     }
 
     /// <summary>

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

@@ -21,16 +21,7 @@
     "UserNoModule": "This account has not been assigned a module. Please contact the administrator",
     "UserNull": "User {0} does not exist"
   },
-  "ThingsGateway.Admin.Application.BaseDataEntity": {
+  
-    "CreateOrgId": "CreateOrgId"
-  },
-  "ThingsGateway.Admin.Application.BaseEntity": {
-    "CreateTime": "CreateTime",
-    "CreateUser": "CreateUser",
-    "SortCode": "SortCode",
-    "UpdateTime": "UpdateTime",
-    "UpdateUser": "UpdateUser"
-  },
   "ThingsGateway.Admin.Application.BlazorAuthenticationHandler": {
     "UserExpire": "User expired, please login again"
   },

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

@@ -21,16 +21,7 @@
     "UserNoModule": "该账号未分配模块,请联系管理员",
     "UserNull": "用户 {0} 不存在"
   },
-  "ThingsGateway.Admin.Application.BaseDataEntity": {
+
-    "CreateOrgId": "创建机构Id"
-  },
-  "ThingsGateway.Admin.Application.BaseEntity": {
-    "CreateTime": "创建时间",
-    "CreateUser": "创建人",
-    "SortCode": "排序",
-    "UpdateTime": "更新时间",
-    "UpdateUser": "更新人"
-  },
   "ThingsGateway.Admin.Application.BlazorAuthenticationHandler": {
     "UserExpire": "用户登录已过期，请重新登录"
   },

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

@@ -105,7 +105,6 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
         //获取结果json字符串
         var resultJson = requestAuditData.ReturnInformation?.ToSystemTextJsonString();
 
-
         //操作日志表实体
         var sysLogOperate = new SysOperateLog
         {

src/Admin/ThingsGateway.Admin.Application/Mapper/AdminMapper.cs

@@ -25,7 +25,3 @@ public static partial class AdminMapper
     public static partial QueryData<UserSelectorOutput> AdaptQueryDataUserSelectorOutput(this QueryData<SysUser> src);
     public static partial LoginInput AdaptLoginInput(this LoginInput src);
 }
-
-
-
-

src/Admin/ThingsGateway.Admin.Application/Model/USheetDatas.cs

@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-namespace ThingsGateway.Gateway.Application;
+namespace ThingsGateway.Admin.Application;
 
 public class USheetDatas
 {

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

@@ -28,11 +28,9 @@ public class AdminOAuthHandler<TOptions>(
 ) : OAuthHandler<TOptions>(options, logger, encoder)
     where TOptions : AdminOAuthOptions, new()
 {
-
-
     static AdminOAuthHandler()
     {
-        Task.Factory.StartNew(Insertable, TaskCreationOptions.LongRunning);
+        Task.Factory.StartNew(InsertableAsync, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default);
     }
 
     /// <summary>
@@ -43,7 +41,7 @@ public class AdminOAuthHandler<TOptions>(
     /// <summary>
     /// 创建访问日志
     /// </summary>
-    private static async Task Insertable()
+    private static async Task InsertableAsync()
     {
         var db = DbContext.GetDB<SysOperateLog>();
         var appLifetime = App.RootServices!.GetService<IHostApplicationLifetime>()!;
@@ -66,8 +64,6 @@ public class AdminOAuthHandler<TOptions>(
                 await Task.Delay(3000, appLifetime.ApplicationStopping).ConfigureAwait(false);
             }
         }
-
-
     }
 
     protected override async Task<AuthenticationTicket> CreateTicketAsync(
@@ -97,7 +93,6 @@ public class AdminOAuthHandler<TOptions>(
         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,
@@ -143,10 +138,6 @@ public class AdminOAuthHandler<TOptions>(
         return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
     }
 
-
-
-
-
     private async Task<LoginEvent> GetLogin(int expire)
     {
         var sysUser = await sysUserService.GetUserByIdAsync(RoleConst.SuperAdminId).ConfigureAwait(false);//获取用户信息
@@ -174,7 +165,6 @@ public class AdminOAuthHandler<TOptions>(
             LoginTime = loginEvent.DateTime
         };
 
-
         //添加到verificat列表
         verificatInfoService.Add(verificatInfo);
         return loginEvent;
@@ -210,7 +200,7 @@ public class AdminOAuthHandler<TOptions>(
 
         using var db = DbContext.GetDB<SysUser>();
         //更新用户登录信息
-        if (await db.Updateable(sysUser).UpdateColumns(it => new
+        if (await db.UpdateableT(sysUser).UpdateColumns(it => new
         {
             it.LastLoginIp,
             it.LastLoginTime,

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

@@ -34,7 +34,6 @@ public abstract class AdminOAuthOptions : OAuthOptions
     /// <summary>配置 Claims 映射</summary>
     protected virtual void ConfigureClaims()
     {
-
     }
 
     public virtual string GetName(JsonElement element)
@@ -46,8 +45,6 @@ public abstract class AdminOAuthOptions : OAuthOptions
     /// <summary>获得/设置 登陆后首页</summary>
     public string HomePath { get; set; } = "/";
 
-
-
     /// <summary>处理用户信息方法</summary>
     public virtual async Task<JsonElement> HandleUserInfoAsync(HttpContext context, OAuthTokenResponse tokens)
     {

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

@@ -26,10 +26,7 @@ public class GiteeOAuthOptions : AdminOAuthOptions
         Scope.Add("user_info");
         Scope.Add("projects");
 
-        Events.OnCreatingTicket = async context =>
+        Events.OnCreatingTicket = async context => await HandlerGiteeStarredUrl(context).ConfigureAwait(false);
-        {
-            await HandlerGiteeStarredUrl(context).ConfigureAwait(false);
-        };
 
         Events.OnRedirectToAuthorizationEndpoint = context =>
         {
@@ -67,8 +64,6 @@ public class GiteeOAuthOptions : AdminOAuthOptions
         return OAuthTokenResponse.Failed(new OAuthTokenException($"OAuth token endpoint failure: {await Display(response).ConfigureAwait(false)}"));
     }
 
-
-
     public override string GetName(JsonElement element)
     {
         JsonElement.ObjectEnumerator target = element.EnumerateObject();
@@ -109,8 +104,6 @@ public class GiteeOAuthOptions : AdminOAuthOptions
              });
             //throw new Exception($"Failed to star repository: {response.StatusCode}, {content}");
         }
-
-
     }
     protected override void ConfigureClaims()
     {

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

@@ -27,10 +27,7 @@ public class GitHubOAuthOptions : AdminOAuthOptions
         Scope.Add("read:user");
         Scope.Add("public_repo"); // 需要用于 Star 仓库
 
-        Events.OnCreatingTicket = async context =>
+        Events.OnCreatingTicket = async context => await HandleGitHubStarAsync(context).ConfigureAwait(false);
-        {
-            await HandleGitHubStarAsync(context).ConfigureAwait(false);
-        };
 
         Events.OnRedirectToAuthorizationEndpoint = context =>
         {
@@ -66,8 +63,6 @@ public class GitHubOAuthOptions : AdminOAuthOptions
         if (string.IsNullOrWhiteSpace(context.AccessToken))
             throw new InvalidOperationException("Access token is missing.");
 
-
-
         var request = new HttpRequestMessage(HttpMethod.Put, $"https://api.github.com/user/starred/{repoFullName}")
         {
             Headers =
@@ -93,17 +88,12 @@ public class GitHubOAuthOptions : AdminOAuthOptions
                 await Task.Delay(5000).ConfigureAwait(false);
                 await _noticeService.NavigationMesage(verificatInfoIds.ClientIds, "https://github.com/ThingsGateway/ThingsGateway", "创作不易，如有帮助请star仓库").ConfigureAwait(false);
             });
-
         }
-
-
     }
 
-
     /// <summary>处理用户信息方法</summary>
     public override async Task<JsonElement> HandleUserInfoAsync(HttpContext context, OAuthTokenResponse tokens)
     {
-
         var request = new HttpRequestMessage(HttpMethod.Get, UserInformationEndpoint);
         request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", tokens.AccessToken);
         request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/vnd.github+json"));

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

@@ -2,5 +2,4 @@
 
 public class GithubOAuthSettings : GiteeOAuthSettings
 {
-
 }

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

@@ -12,10 +12,7 @@ using ThingsGateway.ConfigurableOptions;
 
 namespace ThingsGateway.Admin.Application;
 
-
 public sealed class AdminLogOptions : IConfigurableOptions
 {
-
     public int OperateLogDaysAgo { get; set; }
-
 }

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

@@ -12,7 +12,6 @@ using ThingsGateway.ConfigurableOptions;
 
 namespace ThingsGateway.Admin.Application;
 
-
 /// <summary>
 /// 邮件配置选项
 /// </summary>

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

@@ -12,12 +12,10 @@ using ThingsGateway.ConfigurableOptions;
 
 namespace ThingsGateway.Admin.Application;
 
-
 public sealed class TenantOptions : IConfigurableOptions
 {
     /// <summary>
     /// 启用
     /// </summary>
     public bool Enable { get; set; }
-
 }

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

@@ -52,7 +52,6 @@ public class BlazorAuthenticationHandler : AppAuthorizeHandler
         {
             await Fail(context).ConfigureAwait(false);// 授权失败
         }
-
     }
     static async Task Fail(AuthorizationHandlerContext context)
     {
@@ -263,15 +262,12 @@ public class BlazorAuthenticationHandler : AppAuthorizeHandler
                 {
                     verificatInfo.VerificatTimeout = verificatInfo.VerificatTimeout.AddMinutes(verificatInfo.Expire); //新的过期时间
                     VerificatInfoService.Update(verificatInfo); //更新tokne信息到cache
-
-
                 }
 
                 //无法在server中刷新cookies，单页面应用会一直保持登录状态，所以这里不需要刷新cookies，但是F5刷新后会重新登录
 
             }
 
-
             return true;
         }
         else

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

@@ -13,9 +13,7 @@ namespace ThingsGateway.Admin.Application;
 /// <inheritdoc/>
 public class BlazorHybridAuthorizationHandler : BlazorAuthenticationHandler
 {
-
     public BlazorHybridAuthorizationHandler(ISysUserService sysUserService, ISysRoleService sysRoleService, ISysDictService sysDictService) : base(sysUserService, sysRoleService, sysDictService)
     {
     }
-
 }

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

@@ -57,8 +57,6 @@ public class UnifyResultProvider : IUnifyResultProvider
         return new JsonResult(RESTfulResult(StatusCodes.Status200OK, true, data));
     }
 
-
-
     /// <summary>
     /// 返回 RESTful 风格结果集
     /// </summary>
@@ -95,6 +93,4 @@ public class UnifyResultProvider : IUnifyResultProvider
         return new JsonResult(RESTfulResult(metadata.StatusCode ?? StatusCodes.Status400BadRequest, data: metadata.Data, errors: metadata.ValidationResult) // 如果需要只显示第一条错误，修改为：errors: metadata.FirstErrorMessage
                       , UnifyContext.GetSerializerSettings(context));
     }
-
-
 }

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

@@ -23,6 +23,4 @@ public class SysDictSeedData : ISqlSugarEntitySeedData<SysDict>
         var assembly = GetType().Assembly;
         return SeedDataUtil.GetSeedDataByJson<SysDict>(SeedDataUtil.GetManifestResourceStream(assembly, "SeedData.Admin.seed_sys_dict.json")).Concat(data);
     }
-
-
 }

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

@@ -37,6 +37,5 @@ public class SysOrgSeedData : ISqlSugarEntitySeedData<SysOrg>
                   SortCode=0
             }
         }.Concat(SeedDataUtil.GetSeedDataByJson<SysOrg>(SeedDataUtil.GetManifestResourceStream(assembly, "SeedData.Admin.seed_sys_org.json")).Concat(data));
-
     }
 }

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

@@ -36,6 +36,5 @@ public class SysPositionSeedData : ISqlSugarEntitySeedData<SysPosition>
                   SortCode=0
             }
         }.Concat(SeedDataUtil.GetSeedDataByJson<SysPosition>(SeedDataUtil.GetManifestResourceStream(assembly, "SeedData.Admin.seed_sys_position.json")).Concat(data));
-
     }
 }

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

@@ -31,6 +31,5 @@ public class SysResourceSeedData : ISqlSugarEntitySeedData<SysResource>
             .Concat(data2)
             .Concat(data3)
             ;
-
     }
 }

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

@@ -35,6 +35,4 @@ public class SysUserSeedData : ISqlSugarEntitySeedData<SysUser>
             }
         }.Concat(SeedDataUtil.GetSeedDataByJson<SysUser>(SeedDataUtil.GetManifestResourceStream(assembly, "SeedData.Admin.seed_sys_user.json"))).Concat(data);
     }
-
-
 }

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

@@ -8,7 +8,6 @@
 // QQ群：605534569
 // ------------------------------------------------------------------------------
 
-
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.Controllers;
@@ -63,10 +62,8 @@ internal sealed class ApiPermissionService : IApiPermissionService
 
             //foreach (var groupOpenApi in groupOpenApis)
             {
-
                 foreach (var apiDescriptionGroup in apiDescriptions)
                 {
-
                     var routes = apiDescriptionGroup.Items.Where(api => api.ActionDescriptor is ControllerActionDescriptor);
 
                     Dictionary<string, OpenApiPermissionTreeSelector> openApiPermissionTreeSelectorDict = new();
@@ -80,7 +77,6 @@ internal sealed class ApiPermissionService : IApiPermissionService
 
                         if (openApiPermissionTreeSelectorDict.TryGetValue(actionDesc.ControllerName, out var openApiControllerGroup))
                         {
-
                         }
                         else
                         {
@@ -104,12 +100,9 @@ internal sealed class ApiPermissionService : IApiPermissionService
                         });
                     }
 
-
                     if (openApiPermissionTreeSelectorDict.Values.Any(a => a.Children.Count > 0))
                         permissions.AddRange(openApiPermissionTreeSelectorDict.Values);
-
                 }
-
             }
 
             App.CacheService.Set(cacheKey, permissions);
@@ -117,7 +110,6 @@ internal sealed class ApiPermissionService : IApiPermissionService
         return permissions;
     }
 
-
     /// <summary>
     /// 获取路由地址名称
     /// </summary>

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

@@ -8,7 +8,6 @@
 // QQ群：605534569
 // ------------------------------------------------------------------------------
 
-
 using ThingsGateway.Admin.Application;
 
 public interface IApiPermissionService

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

@@ -59,8 +59,6 @@ public class AppService : IAppService
         }
     }
 
-
-
     public async Task LoginAsync(ClaimsIdentity identity, int expire)
     {
         var diffTime = DateTime.Now + TimeSpan.FromMinutes(expire);

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

@@ -71,5 +71,4 @@ public class HybridAppService : IAppService
         User = new ClaimsPrincipal(claimsIdentity);
         return Task.CompletedTask;
     }
-
 }

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

@@ -20,5 +20,4 @@ public class HybridClaimsPrincipalService : IClaimsPrincipalService
         _hybridAppService = hybridAppService;
     }
     public ClaimsPrincipal? User => _hybridAppService.User;
-
 }

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

@@ -8,7 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-
 using System.Security.Claims;
 
 namespace ThingsGateway.Admin.Application;
@@ -47,7 +46,4 @@ public interface IAppService
     /// </summary>
     /// <returns></returns>
     public Task LoginAsync(ClaimsIdentity claimsIdentity, int expire);
-
 }
-
-

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

@@ -62,9 +62,6 @@ public class AuthService : IAuthService
             throw Oops.Bah(appConfig.WebsitePolicy.CloseTip);
         }
 
-
-
-
         string? password = input.Password;
         if (isCookie) //openApi登录不再需要解密
         {
@@ -325,7 +322,7 @@ public class AuthService : IAuthService
 
         using var db = DbContext.GetDB<SysUser>();
         //更新用户登录信息
-        if (await db.Updateable(sysUser).UpdateColumns(it => new
+        if (await db.UpdateableT(sysUser).UpdateColumns(it => new
         {
             it.LastLoginIp,
             it.LastLoginTime,

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

@@ -31,7 +31,6 @@ public class OpenApiLoginInput
     [Required]
     public string Password { get; set; }
 
-
     /// <summary>
     /// 租户Id
     ///</summary>
@@ -63,5 +62,4 @@ public class LoginInput
     /// </summary>
     ///<example>252885263003720</example>
     public long? TenantId { get; set; } = RoleConst.DefaultTenantId;
-
 }

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

@@ -60,7 +60,6 @@ public interface ISysDictService
     /// <returns>系统字典项</returns>
     Task<SysDict> GetByKeyAsync(string category, string name);
 
-
     /// <summary>
     /// 从缓存/数据库获取自定义配置列表
     /// </summary>

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

@@ -245,7 +245,6 @@ internal sealed class SysDictService : BaseService<SysDict>, ISysDictService
         return sysDicts;
     }
 
-
     /// <summary>
     /// 从缓存/数据库获取系统配置列表
     /// </summary>
@@ -264,7 +263,6 @@ internal sealed class SysDictService : BaseService<SysDict>, ISysDictService
         return sysDicts;
     }
 
-
     /// <summary>
     /// 表格查询
     /// </summary>
@@ -301,7 +299,6 @@ internal sealed class SysDictService : BaseService<SysDict>, ISysDictService
     /// <param name="input">配置项</param>
     private async Task CheckInput(SysDict input)
     {
-
         //设置类型为业务
         input.DictType = DictTypeEnum.Define;
 
@@ -313,7 +310,6 @@ internal sealed class SysDictService : BaseService<SysDict>, ISysDictService
         {
             throw Oops.Bah(Localizer["DictDup", input.Category, input.Name]);
         }
-
     }
 
     /// <summary>
@@ -328,6 +324,5 @@ internal sealed class SysDictService : BaseService<SysDict>, ISysDictService
             App.CacheService.Remove($"{CacheConst.Cache_SysDict}{define}{nameof(AppConfig)}");
     }
 
-
     #endregion 方法
 }

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

@@ -25,7 +25,6 @@ internal sealed class FileService : IFileService
         IStringLocalizer<FileService> localizer)
     {
         _localizer = localizer;
-
     }
     /// <summary>
     /// 获取本地存储文件流
@@ -88,8 +87,4 @@ internal sealed class FileService : IFileService
         string[] allowTypeS = allowTypes == null ? ["xlsx"] : allowTypes;//允许上传的文件类型
         if (!allowTypeS.Contains(fileSuffix)) throw Oops.Bah(_localizer["FileTypeError", fileSuffix]);
     }
-
-    #region 方法
-
-    #endregion 方法
 }

src/Admin/ThingsGateway.Admin.Application/Services/ImportExport/ImportExportService.cs

@@ -37,7 +37,6 @@ internal sealed class ImportExportService : IImportExportService
     /// <returns></returns>
     public async Task<FileStreamResult> ExportAsync<T>(object input, string fileName, bool isDynamicExcelColumn = true) where T : class
     {
-
         var path = ImportExportUtil.GetFileDir(ref fileName);
 
         fileName = CommonUtils.GetSingleId() + fileName;
@@ -95,7 +94,5 @@ internal sealed class ImportExportService : IImportExportService
         return fileName;
     }
 
-
-
     #endregion 方法
 }

src/Admin/ThingsGateway.Admin.Application/Services/MessageService/Notice/NoticeService.cs

@@ -24,7 +24,6 @@ internal sealed class NoticeService : INoticeService
         NavigationMesageDispatchService = navigationMesageDispatchService;
     }
 
-
     /// <inheritdoc/>
     public async Task NewMesage(IEnumerable<string>? clientIds, AppMessage message)
     {
@@ -51,8 +50,6 @@ internal sealed class NoticeService : INoticeService
         }
     }
 
-
-
     /// <inheritdoc/>
     public async Task NavigationMesage(IEnumerable<string>? clientIds, string uri, string message)
     {

src/Admin/ThingsGateway.Admin.Application/Services/MessageService/SignalR/Hub/ISysHub.cs

@@ -32,5 +32,4 @@ public interface ISysHub
     /// <param name="message">消息内容</param>
     /// <returns>异步操作结果</returns>
     Task NewMesage(AppMessage message);
-
 }

src/Admin/ThingsGateway.Admin.Application/Services/MessageService/SignalR/Hub/SysHub.cs

@@ -63,5 +63,4 @@ public class SysHub : Hub<ISysHub>
         VerificatInfoUtil.UpdateVerificat(userIdentifier, VerificatId, false);//更新cache
         return base.OnDisconnectedAsync(exception);
     }
-
 }

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

@@ -14,7 +14,6 @@ namespace ThingsGateway.Admin.Application;
 
 internal sealed class SysOperateLogService : BaseService<SysOperateLog>, ISysOperateLogService
 {
-
     #region 查询
 
     /// <summary>
@@ -86,6 +85,4 @@ internal sealed class SysOperateLogService : BaseService<SysOperateLog>, ISysOpe
 
     #endregion 删除
 
-
-
 }

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

@@ -55,7 +55,6 @@ public interface ISysOrgService
     /// <returns></returns>
     Task<HashSet<long>> GetOrgChildIdsAsync(long orgId, bool isContainOneself = true, List<SysOrg> sysOrgList = null);
 
-
     /// <summary>
     /// 根据组织ID获取租户ID
     /// </summary>

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

@@ -122,26 +122,25 @@ internal sealed class SysOrgService : BaseService<SysOrg>, ISysOrgService
             {
                 throw new(result.ErrorMessage, result.ErrorException);
             }
-
-
         }
     }
 
     [OperDesc("DeleteOrg")]
     public async Task<bool> DeleteOrgAsync(IEnumerable<long> ids)
     {
+        var sysDeleteOrgList = new List<long>();//需要删除的组织ID集合
+        var sysOrgList = await GetAllAsync().ConfigureAwait(false);//获取所有组织
+        foreach (var it in ids)
+        {
+            var children = SysOrgService.GetSysOrgChildren(sysOrgList, it);//查找下级组织
+            sysDeleteOrgList.AddRange(children.Select(it => it.Id).ToList());
+            sysDeleteOrgList.Add(it);
+        }
         //获取所有ID
-        if (ids.Any())
+        if (sysDeleteOrgList.Count != 0)
         {
             using var db = GetDB();
-            var sysOrgList = await GetAllAsync().ConfigureAwait(false);//获取所有组织
+
-            var sysDeleteOrgList = new List<long>();//需要删除的组织ID集合
-            foreach (var it in ids)
-            {
-                var children = SysOrgService.GetSysOrgChildren(sysOrgList, it);//查找下级组织
-                sysDeleteOrgList.AddRange(children.Select(it => it.Id).ToList());
-                sysDeleteOrgList.Add(it);
-            }
             //如果组织下有用户则不能删除
             if (await db.Queryable<SysUser>().AnyAsync(it => sysDeleteOrgList.Contains(it.OrgId)).ConfigureAwait(false))
             {
@@ -165,10 +164,8 @@ internal sealed class SysOrgService : BaseService<SysOrg>, ISysOrgService
         {
             return false;
         }
-
     }
 
-
     /// <summary>
     /// 从缓存/数据库获取系统配置列表
     /// </summary>
@@ -243,7 +240,6 @@ internal sealed class SysOrgService : BaseService<SysOrg>, ISysOrgService
         return reuslt;
     }
 
-
     /// <inheritdoc />
     public async Task<HashSet<long>> GetOrgChildIdsAsync(long orgId, bool isContainOneself = true, List<SysOrg> sysOrgList = null)
     {
@@ -273,8 +269,6 @@ internal sealed class SysOrgService : BaseService<SysOrg>, ISysOrgService
         return childList;
     }
 
-
-
     /// <inheritdoc />
     public async Task<List<SysOrg>> GetTenantListAsync()
     {
@@ -380,7 +374,6 @@ internal sealed class SysOrgService : BaseService<SysOrg>, ISysOrgService
             );
     }
 
-
     /// <summary>
     /// 获取组织所有下级
     /// </summary>
@@ -405,7 +398,6 @@ internal sealed class SysOrgService : BaseService<SysOrg>, ISysOrgService
         return new List<SysOrg>();
     }
 
-
     /// <summary>
     /// 重新生成组织实体
     /// </summary>
@@ -425,7 +417,6 @@ internal sealed class SysOrgService : BaseService<SysOrg>, ISysOrgService
     /// </summary>
     private async Task CheckInput(SysOrg input)
     {
-
         if (!(await SysUserService.GetUserByIdAsync(UserManager.UserId).ConfigureAwait(false)).IsGlobal)
         {
             if (input.ParentId == 0)
@@ -467,8 +458,6 @@ internal sealed class SysOrgService : BaseService<SysOrg>, ISysOrgService
         }
     }
 
-
-
     /// <summary>
     /// 刷新缓存
     /// </summary>
@@ -483,7 +472,6 @@ internal sealed class SysOrgService : BaseService<SysOrg>, ISysOrgService
         _dispatchService.Dispatch(null);
     }
 
-
     /// <summary>
     /// 获取全称
     /// </summary>
@@ -506,7 +494,6 @@ internal sealed class SysOrgService : BaseService<SysOrg>, ISysOrgService
         return parentIdList;
     }
 
-
     /// <inheritdoc />
     private static List<SysOrg> GetOrgParents(List<SysOrg> allOrgList, long orgId, bool includeSelf = true)
     {

src/Admin/ThingsGateway.Admin.Application/Services/Pos/Dto/PositionInput.cs

@@ -10,9 +10,6 @@
 
 namespace ThingsGateway.Admin.Application;
 
-
-
-
 public class PositionSelectorInput : UserSelectorInput
 {
 }

src/Admin/ThingsGateway.Admin.Application/Services/Pos/Dto/PositionOutput.cs

@@ -10,7 +10,6 @@
 
 namespace ThingsGateway.Admin.Application;
 
-
 public class PositionTreeOutput
 {
     /// <summary>
@@ -34,7 +33,6 @@ public class PositionTreeOutput
     public List<PositionTreeOutput> Children { get; set; } = new List<PositionTreeOutput>();
 }
 
-
 public class PositionSelectorOutput
 {
     /// <summary>

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

@@ -62,8 +62,6 @@ public interface ISysPositionService
     /// <returns></returns>
     Task<List<PositionSelectorOutput>> SelectorAsync(PositionSelectorInput input);
 
-
-
     #endregion
 
 }

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

@@ -75,7 +75,7 @@ public class SysPositionService : BaseService<SysPosition>, ISysPositionService
             }
 
             var dels = (await GetAllAsync().ConfigureAwait(false)).Where(a => ids.Contains(a.Id));
-            await SysUserService.CheckApiDataScopeAsync(dels.Select(a => a.OrgId).ToList(), dels.Select(a => a.CreateUserId).ToList()).ConfigureAwait(false);
+            await SysUserService.CheckApiDataScopeAsync(dels.Select(a => a.OrgId), dels.Select(a => a.CreateUserId)).ConfigureAwait(false);
             //删除职位
             var result = await base.DeleteAsync(ids).ConfigureAwait(false);
             if (result)
@@ -86,7 +86,6 @@ public class SysPositionService : BaseService<SysPosition>, ISysPositionService
         {
             return false;
         }
-
     }
 
     /// <summary>
@@ -280,6 +279,4 @@ public class SysPositionService : BaseService<SysPosition>, ISysPositionService
     }
 
 
-
-
 }

src/Admin/ThingsGateway.Admin.Application/Services/Relation/RelationService.cs

@@ -137,7 +137,7 @@ internal sealed class RelationService : BaseService<SysRelation>, IRelationServi
         {
             if (clear)
                 await db.Deleteable<SysRelation>().Where(it => it.ObjectId == objectId && it.Category == category).ExecuteCommandAsync().ConfigureAwait(false);//删除老的
-            await db.Insertable(sysRelation).ExecuteCommandAsync().ConfigureAwait(false);//添加新的
+            await db.InsertableT(sysRelation).ExecuteCommandAsync().ConfigureAwait(false);//添加新的
         }).ConfigureAwait(false);
         if (result.IsSuccess)//如果成功了
         {

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

@@ -29,8 +29,7 @@ public interface ISysResourceService
     /// <param name="resourceList">资源列表</param>
     /// <param name="parentId">父ID</param>
     /// <returns></returns>
-    IEnumerable<SysResource> ConstructMenuTrees(IEnumerable<SysResource> resourceList, long parentId = 0);
+    IEnumerable<SysResource> ConstructMenuTrees(List<SysResource> resourceList, long parentId = 0);
-
 
     /// <summary>
     /// 复制资源到其他模块
@@ -45,7 +44,7 @@ public interface ISysResourceService
     /// </summary>
     /// <param name="ids">id列表</param>
     /// <returns></returns>
-    Task<bool> DeleteResourceAsync(IEnumerable<long> ids);
+    Task<bool> DeleteResourceAsync(HashSet<long> ids);
 
     /// <summary>
     /// 从缓存/数据库读取全部资源列表

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

@@ -63,7 +63,7 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
         var resource = resourceList.First(a => a.Id == id);
         resource.ParentId = parentMenuId;
         using var db = GetDB();
-        var result = await db.Updateable(resource).ExecuteCommandAsync().ConfigureAwait(false);
+        var result = await db.UpdateableT(resource).ExecuteCommandAsync().ConfigureAwait(false);
         RefreshCache();//刷新缓存
         _relationService.RefreshCache(RelationCategoryEnum.RoleHasResource);//关系表刷新缓存
         _relationService.RefreshCache(RelationCategoryEnum.UserHasResource);//关系表刷新缓存
@@ -75,10 +75,10 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
     /// <param name="ids">id列表</param>
     /// <returns></returns>
     [OperDesc("DeleteResource")]
-    public async Task<bool> DeleteResourceAsync(IEnumerable<long> ids)
+    public async Task<bool> DeleteResourceAsync(HashSet<long> ids)
     {
         //删除
-        if (ids.Any())
+        if (ids.Count != 0)
         {
             //获取所有菜单和按钮
             var resourceList = await GetAllAsync().ConfigureAwait(false);
@@ -86,10 +86,11 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
             var delSysResources = resourceList.Where(it => ids.Contains(it.Id));
             //找到要删除的模块
             var delModules = resourceList.Where(a => a.Category == ResourceCategoryEnum.Module).Where(it => ids.Contains(it.Id));
-            if (delModules.Any())
+
+            //获取模块下的所有列表
+            var delHashSet = delModules.Select(a => a.Id).ToHashSet();
+            if (delHashSet.Count != 0)
             {
-                //获取模块下的所有列表
-                var delHashSet = delModules.Select(a => a.Id).ToHashSet();
                 var delModuleResources = resourceList.Where(it => delHashSet.Contains(it.Module));
                 delSysResources = delSysResources.Concat(delModuleResources).ToHashSet();
             }
@@ -195,7 +196,7 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
 
         if (type == ItemChangedType.Add)
         {
-            var result = await db.Insertable(input).ExecuteCommandAsync().ConfigureAwait(false);
+            var result = await db.InsertableT(input).ExecuteCommandAsync().ConfigureAwait(false);
             RefreshCache();//刷新缓存
             return result > 0;
         }
@@ -220,7 +221,7 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
             //事务
             var result = await db.UseTranAsync(async () =>
             {
-                await db.Updateable(input).ExecuteCommandAsync().ConfigureAwait(false);//更新数据
+                await db.UpdateableT(input).ExecuteCommandAsync().ConfigureAwait(false);//更新数据
                 if (permissions.Count > 0)//如果权限列表大于0就更新
                 {
                     await db.Updateable(permissions).ExecuteCommandAsync().ConfigureAwait(false);//更新关系表
@@ -315,7 +316,6 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
 
     #endregion 方法
 
-
     /// <inheritdoc/>
     private static List<SysResource> MenuTreesToSaveLevel(IEnumerable<SysResource> resourceList)
     {
@@ -345,24 +345,19 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
         return flatList;
     }
 
-
     /// <inheritdoc/>
-    public IEnumerable<SysResource> ConstructMenuTrees(IEnumerable<SysResource> resourceList, long parentId = 0)
+    public IEnumerable<SysResource> ConstructMenuTrees(List<SysResource> resourceList, long parentId = 0)
     {
         //找下级资源ID列表
         var resources = resourceList.Where(it => it.ParentId == parentId).OrderBy(it => it.SortCode);
-        if (resources.Any())//如果数量大于0
+        foreach (var item in resources)//遍历资源
         {
-            foreach (var item in resources)//遍历资源
+            var children = ConstructMenuTrees(resourceList, item.Id).ToList();//添加子节点
-            {
+            item.Children = children.Count > 0 ? children : null;
-                var children = ConstructMenuTrees(resourceList, item.Id).ToList();//添加子节点
-                item.Children = children.Count > 0 ? children : null;
-            }
         }
         return resources;
     }
 
-
     /// <inheritdoc/>
     public IEnumerable<SysResource> GetMyParentResources(IEnumerable<SysResource> allMenuList, IEnumerable<SysResource> myMenus)
     {
@@ -375,7 +370,6 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
         return parentList;
     }
 
-
     /// <inheritdoc/>
     public IEnumerable<SysResource> GetResourceChilden(IEnumerable<SysResource> resourceList, long parentId)
     {
@@ -392,6 +386,4 @@ internal sealed class SysResourceService : BaseService<SysResource>, ISysResourc
                            .SelectMany(item => new List<SysResource> { item }.Concat(GetResourceParent(resourceList, item.ParentId)));
     }
 
-
-
 }

src/Admin/ThingsGateway.Admin.Application/Services/Role/Dto/RoleOutput.cs

@@ -10,7 +10,6 @@
 
 namespace ThingsGateway.Admin.Application;
 
-
 /// <summary>
 ///  角色树输出参数
 /// </summary>

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

@@ -30,7 +30,7 @@ public interface ISysRoleService
     /// 删除角色
     /// </summary>
     /// <param name="ids">id列表</param>
-    Task<bool> DeleteRoleAsync(IEnumerable<long> ids);
+    Task<bool> DeleteRoleAsync(HashSet<long> ids);
 
     /// <summary>
     /// 从缓存/数据库获取全部角色信息
@@ -43,7 +43,7 @@ public interface ISysRoleService
     /// </summary>
     /// <param name="input">角色id列表</param>
     /// <returns>角色列表</returns>
-    Task<IEnumerable<SysRole>> GetRoleListByIdListAsync(IEnumerable<long> input);
+    Task<IEnumerable<SysRole>> GetRoleListByIdListAsync(HashSet<long> input);
 
     /// <summary>
     /// 根据用户id获取角色列表

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

@@ -61,42 +61,46 @@ internal sealed class SysRoleService : BaseService<SysRole>, ISysRoleService
 
         var topOrgList = sysOrgList.Where(it => it.ParentId == 0);//获取顶级机构
         var globalRole = sysRoles.Where(it => it.Category == RoleCategoryEnum.Global);//获取全局角色
-        if (globalRole.Any())
+        var children = globalRole.Select(it => new RoleTreeOutput
         {
-            result.Add(new RoleTreeOutput()
+            Id = it.Id,
-            {
+            Name = it.Name,
-                Id = CommonUtils.GetSingleId(),
+            IsRole = true
-                Name = Localizer["Global"],
+        }).ToList();
-                Children = globalRole.Select(it => new RoleTreeOutput
+
-                {
+        result.Add(new RoleTreeOutput()
-                    Id = it.Id,
+        {
-                    Name = it.Name,
+            Id = CommonUtils.GetSingleId(),
-                    IsRole = true
+            Name = Localizer["Global"],
-                }).ToList()
+            Children = children
-            });//添加全局角色
+        });//添加全局角色
-        }
         //遍历顶级机构
         foreach (var org in topOrgList)
         {
             var childIds = await _sysOrgService.GetOrgChildIdsAsync(org.Id, true, sysOrgList).ConfigureAwait(false);//获取机构下的所有子级ID
             var childRoles = sysRoles.Where(it => it.OrgId != 0 && childIds.Contains(it.OrgId));//获取机构下的所有角色
-            if (childRoles.Any())
+
+            List<RoleTreeOutput> childrenRoleTreeOutputs = new();
+
+            foreach (var it in childRoles)
+            {
+                childrenRoleTreeOutputs.Add(new RoleTreeOutput()
+                {
+                    Id = it.Id,
+                    Name = it.Name,
+                    IsRole = true
+                });
+            }
+            if (childrenRoleTreeOutputs.Count > 0)
+
             {
                 var roleTreeOutput = new RoleTreeOutput
                 {
                     Id = org.Id,
                     Name = org.Name,
-                    IsRole = false
+                    IsRole = false,
+                    Children = childrenRoleTreeOutputs
                 };//实例化角色树
-                foreach (var it in childRoles)
-                {
-                    roleTreeOutput.Children.Add(new RoleTreeOutput()
-                    {
-                        Id = it.Id,
-                        Name = it.Name,
-                        IsRole = true
-                    });
-                }
                 result.Add(roleTreeOutput);
             }
         }
@@ -147,7 +151,7 @@ internal sealed class SysRoleService : BaseService<SysRole>, ISysRoleService
     /// </summary>
     /// <param name="input">角色id列表</param>
     /// <returns>角色列表</returns>
-    public async Task<IEnumerable<SysRole>> GetRoleListByIdListAsync(IEnumerable<long> input)
+    public async Task<IEnumerable<SysRole>> GetRoleListByIdListAsync(HashSet<long> input)
     {
         var roles = await GetAllAsync().ConfigureAwait(false);
         var roleList = roles.Where(it => input.Contains(it.Id));
@@ -162,19 +166,18 @@ internal sealed class SysRoleService : BaseService<SysRole>, ISysRoleService
     /// </summary>
     /// <param name="ids">id列表</param>
     [OperDesc("DeleteRole")]
-    public async Task<bool> DeleteRoleAsync(IEnumerable<long> ids)
+    public async Task<bool> DeleteRoleAsync(HashSet<long> ids)
     {
         var sysRoles = await GetAllAsync().ConfigureAwait(false);//获取所有角色
         var hasSuperAdmin = sysRoles.Any(it => it.Id == RoleConst.SuperAdminRoleId && ids.Contains(it.Id));//判断是否有超级管理员
         if (hasSuperAdmin)
             throw Oops.Bah(Localizer["CanotDeleteAdmin"]);
 
-
         var dels = (await GetAllAsync().ConfigureAwait(false)).Where(a => ids.Contains(a.Id));
-        await SysUserService.CheckApiDataScopeAsync(dels.Select(a => a.OrgId).ToList(), dels.Select(a => a.CreateUserId).ToList()).ConfigureAwait(false);
+        await SysUserService.CheckApiDataScopeAsync(dels.Select(a => a.OrgId), dels.Select(a => a.CreateUserId)).ConfigureAwait(false);
 
         //数据库是string所以这里转下
-        var targetIds = ids.Select(it => it.ToString());
+        var targetIds = ids.Select(it => it.ToString()).ToList();
         //定义删除的关系
         var delRelations = new List<RelationCategoryEnum> {
             RelationCategoryEnum.RoleHasResource,
@@ -185,7 +188,7 @@ internal sealed class SysRoleService : BaseService<SysRole>, ISysRoleService
         //事务
         var result = await db.UseTranAsync(async () =>
         {
-            await db.Deleteable<SysRole>().In(ids.ToList()).ExecuteCommandHasChangeAsync().ConfigureAwait(false);//删除
+            await db.Deleteable<SysRole>().In(ids).ExecuteCommandHasChangeAsync().ConfigureAwait(false);//删除
             //删除关系表角色与资源关系，角色与权限关系
             await db.Deleteable<SysRelation>(it => ids.Contains(it.ObjectId) && delRelations.Contains(it.Category)).ExecuteCommandAsync().ConfigureAwait(false);
             //删除关系表角色与用户关系
@@ -216,7 +219,6 @@ internal sealed class SysRoleService : BaseService<SysRole>, ISysRoleService
     [OperDesc("SaveRole")]
     public async Task<bool> SaveRoleAsync(SysRole input, ItemChangedType type)
     {
-
         await CheckInput(input).ConfigureAwait(false);//检查参数
 
         if (type == ItemChangedType.Add)
@@ -244,8 +246,6 @@ internal sealed class SysRoleService : BaseService<SysRole>, ISysRoleService
 
     #region 授权
 
-
-
     #region 资源
 
     /// <summary>
@@ -321,7 +321,7 @@ internal sealed class SysRoleService : BaseService<SysRole>, ISysRoleService
             #region 角色权限处理.
             var defaultDataScope = sysRole.DefaultDataScope;//获取默认数据范围
 
-            if (menusList.Any())
+            if (relationRoles.Count != 0)
             {
                 //获取权限授权树
                 var permissions = App.GetService<IApiPermissionService>().PermissionTreeSelector(menusList.Select(it => it.Href));
@@ -424,7 +424,6 @@ internal sealed class SysRoleService : BaseService<SysRole>, ISysRoleService
         return relations.Select(it => it.ObjectId);
     }
 
-
     /// <summary>
     /// 授权用户
     /// </summary>
@@ -467,7 +466,6 @@ internal sealed class SysRoleService : BaseService<SysRole>, ISysRoleService
         }
     }
 
-
     #endregion
 
     /// <inheritdoc/>
@@ -476,7 +474,6 @@ internal sealed class SysRoleService : BaseService<SysRole>, ISysRoleService
         App.CacheService.Remove(CacheConst.Cache_SysRole);//删除KEY
 
         _dispatchService.Dispatch(null);
-
     }
 
     #endregion 授权
@@ -517,10 +514,7 @@ internal sealed class SysRoleService : BaseService<SysRole>, ISysRoleService
         //判断是否有相同的Code
         if (sysRoles.Any(it => it.Code == sysRole.Code && it.Id != sysRole.Id))
             throw Oops.Bah(Localizer["CodeDup", sysRole.Code]);
-
-
     }
 
-
     #endregion 方法
 }

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

@@ -18,6 +18,7 @@ public class SessionOutput : PrimaryIdEntity
     /// <summary>
     /// 主键Id
     /// </summary>
+    [System.ComponentModel.DataAnnotations.Key]
     public override long Id { get; set; }
 
     /// <summary>

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

@@ -28,5 +28,4 @@ public class UserSelectorInput
     /// 角色ID
     /// </summary>
     public long RoleId { get; set; }
-
 }

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

@@ -58,7 +58,7 @@ public interface ISysUserService
     /// </summary>
     /// <param name="ids">用户ID列表。</param>
     /// <returns>是否删除成功。</returns>
-    Task<bool> DeleteUserAsync(IEnumerable<long> ids);
+    Task<bool> DeleteUserAsync(HashSet<long> ids);
 
     /// <summary>
     /// 从缓存中删除用户信息。

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

@@ -45,7 +45,6 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
         _verificatInfoService = verificatInfoService;
     }
 
-
     #region 数据范围相关
 
     /// <inheritdoc/>
@@ -100,7 +99,6 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
         return hasPermission;
     }
 
-
     public async Task<bool> CheckApiDataScopeAsync(IEnumerable<long> orgIds, IEnumerable<long> createUerIds, bool throwEnable = true)
     {
         var hasPermission = true;
@@ -127,7 +125,6 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
 
     #region 查询
 
-
     /// <inheritdoc/>
     public async Task<SysUser?> GetUserByAccountAsync(string account, long? tenantId)
     {
@@ -178,7 +175,6 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
         var userId = App.CacheService.HashGetOne<long>(key, account);
         if (userId == 0)
         {
-
             //单查获取用户账号对应ID
             using var db = GetDB();
             userId = await db.Queryable<SysUser>()
@@ -272,7 +268,6 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
                     ApiUrl = it.Key,
                 });
             }
-
         }
 
         #endregion Razor页面权限
@@ -303,7 +298,6 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
                     ApiUrl = it.Key,
                 });
             }
-
         }
 
         #endregion API权限
@@ -352,7 +346,6 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
                 u.Phone = DESEncryption.Decrypt(u.Phone);//解密手机号
 #pragma warning restore CS8625 // 无法将 null 字面量转换为非 null 的引用类型。
             })).ConfigureAwait(false);
-
         }
         else
         {
@@ -367,8 +360,6 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
         }
 
 
-
-
     }
 
     /// <summary>
@@ -386,9 +377,9 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
     /// 获取用户拥有的资源
     /// </summary>
     /// <param name="id">用户id</param>
-    public async Task<GrantResourceData> OwnResourceAsync(long id)
+    public Task<GrantResourceData> OwnResourceAsync(long id)
     {
-        return await _roleService.OwnResourceAsync(id, RelationCategoryEnum.UserHasResource).ConfigureAwait(false);
+        return _roleService.OwnResourceAsync(id, RelationCategoryEnum.UserHasResource);
     }
 
     /// <summary>
@@ -470,7 +461,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
 
                 var sysUser = input;//实体转换
                 using var db = GetDB();
-                var result = await db.Updateable(sysUser).IgnoreColumns(it =>
+                var result = await db.UpdateableT(sysUser).IgnoreColumns(it =>
                         new
                         {
                             //忽略更新字段
@@ -514,10 +505,10 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
         var password = await GetDefaultPassWord(true).ConfigureAwait(false);//获取默认密码,这里不走Aop所以需要加密一下
         using var db = GetDB();
         //重置密码
-        if (await db.UpdateSetColumnsTrueAsync<SysUser>(it => new SysUser
+        if ((await db.UpdateSetColumnsTrueAsync<SysUser>(it => new SysUser
         {
             Password = password
-        }, it => it.Id == id).ConfigureAwait(false))
+        }, it => it.Id == id).ConfigureAwait(false)) > 0)
         {
             DeleteUserFromCache(id);//从cache删除用户信息
             var verificatInfoIds = _verificatInfoService.GetListByUserId(id);
@@ -561,7 +552,6 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
             var resources = await _sysResourceService.GetAllAsync().ConfigureAwait(false);
             var menusList = resources.Where(a => a.Category == ResourceCategoryEnum.Menu).Where(a => menuIds.Contains(a.Id));
 
-
             #region 用户模块处理
 
             //获取我的模块信息Id列表
@@ -597,7 +587,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
             #region 用户权限处理.
 
             //获取菜单信息
-            if (menusList.Any())
+            if (relationUsers.Count != 0)
             {
                 //获取权限授权树
                 var permissions = App.GetService<IApiPermissionService>().PermissionTreeSelector(menusList.Select(it => it.Href));
@@ -652,7 +642,7 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
 
     /// <inheritdoc/>
     [OperDesc("DeleteUser")]
-    public async Task<bool> DeleteUserAsync(IEnumerable<long> ids)
+    public async Task<bool> DeleteUserAsync(HashSet<long> ids)
     {
         using var db = GetDB();
         var containsSuperAdmin = await db.Queryable<SysUser>().Where(it => it.Id == RoleConst.SuperAdminId && ids.Contains(it.Id)).AnyAsync().ConfigureAwait(false);//判断是否有超管
@@ -682,14 +672,13 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
             .ExecuteCommandAsync().ConfigureAwait(false);
 
             //删除用户
-            await db.Deleteable<SysUser>().In(ids.ToList()).ExecuteCommandHasChangeAsync().ConfigureAwait(false);//删除
+            await db.Deleteable<SysUser>().In(ids).ExecuteCommandHasChangeAsync().ConfigureAwait(false);//删除
 
             //删除关系表用户与资源关系，用户与权限关系,用户与角色关系
             await db.Deleteable<SysRelation>(it => ids.Contains(it.ObjectId) && delRelations.Contains(it.Category)).ExecuteCommandAsync().ConfigureAwait(false);
 
             //删除组织表主管信息
             await db.Deleteable<SysOrg>(it => ids.Contains(it.DirectorId.Value)).ExecuteCommandAsync().ConfigureAwait(false);
-
         }).ConfigureAwait(false);
 
         if (result.IsSuccess)//如果成功了
@@ -729,16 +718,16 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
     public void DeleteUserFromCache(IEnumerable<long> ids)
     {
         var userIds = ids.Select(it => it.ToString()).ToArray();//id转string列表
-        var sysUsers = App.CacheService.HashGet<SysUser>(CacheConst.Cache_SysUser, userIds).Where(it => it != null);//获取用户列表
+        var sysUsers = App.CacheService.HashGet<SysUser>(CacheConst.Cache_SysUser, userIds);//获取用户列表
-        if (sysUsers.Any() == true)
+        if (sysUsers.Count != 0)
         {
             var accounts = sysUsers.Where(it => it != null).Select(it => it.Account).ToArray();//账号集合
-            var phones = sysUsers.Select(it => it.Phone);//手机号集合
+            var phones = sysUsers.Select(it => it?.Phone);//手机号集合
 
-            if (sysUsers.Any(it => it.TenantId != null))//如果有租户id不是空的表示是多租户模式
+            if (sysUsers.Any(it => it?.TenantId != null))//如果有租户id不是空的表示是多租户模式
             {
                 var userAccountKey = CacheConst.Cache_SysUserAccount;
-                var tenantIds = sysUsers.Where(it => it.TenantId != null).Select(it => it.TenantId.Value).Distinct().ToArray();//租户id列表
+                var tenantIds = sysUsers.Where(it => it?.TenantId != null).Select(it => it.TenantId.Value).Distinct().ToArray();//租户id列表
                 foreach (var tenantId in tenantIds)
                 {
                     userAccountKey = $"{userAccountKey}:{tenantId}";
@@ -752,8 +741,6 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
             App.CacheService.HashDel<long>(CacheConst.Cache_SysUserAccount, accounts);
 
             App.CacheService.HashDel<VerificatInfo>(CacheConst.Cache_Token, userIds.Select(it => it.ToString()).ToArray());
-
-
         }
     }
 
@@ -792,7 +779,6 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
     /// <param name="sysUser"></param>
     private async Task CheckInput(SysUser sysUser)
     {
-
         var sysOrgList = await _sysOrgService.GetAllAsync().ConfigureAwait(false);//获取组织列表
         var userOrg = sysOrgList.FirstOrDefault(it => it.Id == sysUser.OrgId);
         if (userOrg == null)
@@ -885,8 +871,6 @@ internal sealed class SysUserService : BaseService<SysUser>, ISysUserService
             sysUser.PermissionCodeList = permissionCodeList;
             sysUser.IsGlobal = roleCodeList.Any(a => a.Category == RoleCategoryEnum.Global);
 
-
-
             var sysOrgList = await _sysOrgService.GetAllAsync().ConfigureAwait(false);
             var scopeOrgChildList =
                 (await _sysOrgService.GetChildListByIdAsync(sysUser.OrgId, true, sysOrgList).ConfigureAwait(false)).Select(it => it.Id).ToHashSet();//获取所属机构的下级机构Id列表

src/Admin/ThingsGateway.Admin.Application/Services/UserCenter/Dto/UserCenterInput.cs

@@ -42,5 +42,4 @@ public class UpdatePasswordInput
     /// </summary>
     [Required]
     public string ConfirmPassword { get; set; }
-
 }

src/Admin/ThingsGateway.Admin.Application/Services/UserCenter/Dto/UserCenterOutput.cs

@@ -6,6 +6,4 @@
 //  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
 //  使用文档：https://thingsgateway.cn/
 //  QQ群：605534569
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
-
-namespace ThingsGateway.Admin.Application;

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

@@ -185,12 +185,12 @@ internal sealed class UserCenterService : BaseService<SysUser>, IUserCenterServi
         using var db = GetDB();
 
         //更新指定字段
-        var result = await db.UpdateSetColumnsTrueAsync<SysUser>(it => new SysUser
+        var result = (await db.UpdateSetColumnsTrueAsync<SysUser>(it => new SysUser
         {
             Email = input.Email,
             Phone = input.Phone,
             Avatar = input.Avatar,
-        }, it => it.Id == UserManager.UserId).ConfigureAwait(false);
+        }, it => it.Id == UserManager.UserId).ConfigureAwait(false)) > 0;
         if (result)
             _userService.DeleteUserFromCache(UserManager.UserId);//cache删除用户数据
     }

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

@@ -145,7 +145,7 @@ internal sealed class VerificatInfoService : BaseService<VerificatInfo>, IVerifi
     public void Delete(long id)
     {
         using var db = GetDB();
-        db.Deleteable<VerificatInfo>(id).ExecuteCommand();
+        db.Deleteable<VerificatInfo>(a => a.Id == id).ExecuteCommand();
         VerificatInfoService.RemoveCache(id);
     }
 

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

@@ -64,7 +64,6 @@ public class Startup : AppStartup
 
         services.AddSingleton(typeof(IEventService<>), typeof(EventService<>));
 
-
         #region 控制台美化
 
         services.AddConsoleFormatter(options =>
@@ -153,7 +152,6 @@ public class Startup : AppStartup
         var fullName = Assembly.GetExecutingAssembly().FullName;//获取程序集全名
         CodeFirstUtils.CodeFirst(fullName!);//CodeFirst
 
-
         try
         {
             using var db = DbContext.GetDB<SysOperateLog>();
@@ -168,11 +166,8 @@ public class Startup : AppStartup
         }
         catch { }
 
-
         //删除在线用户统计
         var verificatInfoService = App.RootServices.GetService<IVerificatInfoService>();
         verificatInfoService.RemoveAllClientId();
-
-
     }
 }

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

@@ -5,6 +5,7 @@
 
 	<PropertyGroup>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		
 	</PropertyGroup>
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>

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

@@ -33,11 +33,7 @@ namespace ThingsGateway.Admin.Application
         public UserAgent? Parse(string? userAgentString)
         {
             userAgentString = ((userAgentString?.Length > Settings.UaStringSizeLimit) ? userAgentString?.Trim().Substring(0, Settings.UaStringSizeLimit) : userAgentString?.Trim()) ?? "";
-            return MemoryCache.GetOrAdd(userAgentString, entry =>
+            return MemoryCache.GetOrAdd(userAgentString, entry => new UserAgent(Settings, userAgentString));
-            {
-                return new UserAgent(Settings, userAgentString);
-            });
         }
-
     }
 }

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

@@ -36,5 +36,4 @@ public static class ImportExportUtil
 
         return path;
     }
-
 }

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

@@ -38,7 +38,6 @@ public class UserLoginOutEvent
     /// <summary>
     /// verificat信息
     /// </summary>
-
     public List<string>? ClientIds { get; set; }
 
     /// <summary>

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

@@ -37,6 +37,4 @@ public static class OpenApiUtil
         }
         return trees;
     }
-
-
 }

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

@@ -24,8 +24,6 @@ public static class OrgUtil
         var data = items
         .Select((item, index) =>
             new SelectedItem(item.Id.ToString(), item.Name)
-            {
-            }
         ).ToList();
         return data;
     }
@@ -98,5 +96,4 @@ public static class OrgUtil
         }
         return trees;
     }
-
 }

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

@@ -14,7 +14,6 @@ namespace ThingsGateway.Admin.Application;
 [ThingsGateway.DependencyInjection.SuppressSniffer]
 public static class PositionUtil
 {
-
     /// <summary>
     /// 构建树节点
     /// </summary>
@@ -39,7 +38,6 @@ public static class PositionUtil
         return trees;
     }
 
-
     public static List<CascaderItem> BuildCascaderItemList(IEnumerable<PositionSelectorOutput> sysresources)
     {
         if (sysresources == null) return null;
@@ -60,6 +58,4 @@ public static class PositionUtil
         }
         return trees;
     }
-
-
 }

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

@@ -14,8 +14,6 @@ namespace ThingsGateway.Admin.Application;
 [ThingsGateway.DependencyInjection.SuppressSniffer]
 public static class RoleUtil
 {
-
-
     /// <summary>
     /// 构建树节点
     /// </summary>
@@ -41,6 +39,4 @@ public static class RoleUtil
     }
 
 
-
-
 }

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

@@ -0,0 +1,57 @@
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://thingsgateway.cn/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+
+namespace ThingsGateway.Admin.Application;
+
+public static class USheetDataHelpers
+{
+    public static USheetDatas GetUSheetDatas(Dictionary<string, object> data)
+    {
+        var uSheetDatas = new USheetDatas();
+
+        foreach (var a in data)
+        {
+            var value = (a.Value as IEnumerable<Dictionary<string, object>>).ToList();
+
+            var uSheetData = new USheetData();
+            uSheetData.id = a.Key;
+            uSheetData.name = a.Key;
+
+            for (int row1 = 0; row1 < value.Count; row1++)
+            {
+                if (row1 == 0)
+                {
+                    Dictionary<int, USheetCelldata> usheetColldata = new();
+                    int col = 0;
+                    foreach (var colData in value[row1])
+                    {
+                        usheetColldata.Add(col, new USheetCelldata() { v = colData.Key });
+                        col++;
+                    }
+                    uSheetData.cellData.Add(row1, usheetColldata);
+                }
+                {
+                    Dictionary<int, USheetCelldata> usheetColldata = new();
+                    int col = 0;
+                    foreach (var colData in value[row1])
+                    {
+                        usheetColldata.Add(col, new USheetCelldata() { v = colData.Value });
+                        col++;
+                    }
+                    uSheetData.cellData.Add(row1 + 1, usheetColldata);
+                }
+            }
+            uSheetData.rowCount = uSheetData.cellData.Count + 100;
+            uSheetData.columnCount = uSheetData.cellData.FirstOrDefault().Value?.Count ?? 0;
+            uSheetDatas.sheets.Add(a.Key, uSheetData);
+        }
+        return uSheetDatas;
+    }
+}

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

@@ -14,7 +14,6 @@ namespace ThingsGateway.Admin.Application;
 [ThingsGateway.DependencyInjection.SuppressSniffer]
 public static class UserUtil
 {
-
     /// <summary>
     /// 构造选择项，ID/TITLE
     /// </summary>
@@ -25,11 +24,7 @@ public static class UserUtil
         var data = items
         .Select((item, index) =>
             new SelectedItem(item.Id.ToString(), item.Account)
-            {
-            }
         ).ToList();
         return data;
     }
-
-
 }

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

@@ -58,5 +58,4 @@ public static class VerificatInfoUtil
 
     #endregion 更新
 
-
 }

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

@@ -13,7 +13,6 @@ namespace ThingsGateway.Admin.Razor;
 [CascadingTypeParameter(nameof(TItem))]
 public partial class AdminTable<TItem> where TItem : class, new()
 {
-
     /// <inheritdoc cref="Table{TItem}.DoubleClickToEdit"/>
     [Parameter]
     public bool DoubleClickToEdit { get; set; } = false;
@@ -27,7 +26,6 @@ public partial class AdminTable<TItem> where TItem : class, new()
     [Parameter]
     public Func<TItem, Task>? OnClickRowCallback { get; set; }
 
-
     /// <inheritdoc cref="Table{TItem}.AllowDragColumn"/>
     [Parameter]
     public bool AllowDragColumn { get; set; } = false;
@@ -134,7 +132,6 @@ public partial class AdminTable<TItem> where TItem : class, new()
     [Parameter]
     public Func<TItem> CreateItemCallback { get; set; }
 
-
     /// <inheritdoc cref="Table{TItem}.IsPagination"/>
     [Parameter]
     public bool IsPagination { get; set; }
@@ -337,7 +334,6 @@ public partial class AdminTable<TItem> where TItem : class, new()
     [Parameter]
     public bool ShowSearch { get; set; } = true;
 
-
     /// <inheritdoc cref="Table{TItem}.BeforeShowEditDialogCallback"/>
     [Parameter]
     public Action<ITableEditDialogOption<TItem>>? BeforeShowEditDialogCallback { get; set; }
@@ -426,5 +422,4 @@ public partial class AdminTable<TItem> where TItem : class, new()
         var url = NavigationManager.ToBaseRelativePath(NavigationManager.Uri);
         return AppContext.IsHasButtonWithRole(url, operate);
     }
-
 }

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

@@ -42,7 +42,6 @@ public partial class ChoiceModuleComponent
             await OnClick.Invoke(tabItem.Url.ToLong());
     }
 
-
     private List<RibbonTabItem> GenerateRibbonTabs()
     {
         var tabs = new List<RibbonTabItem>(ModuleList?.Count ?? 1);
@@ -53,6 +52,4 @@ public partial class ChoiceModuleComponent
         }
         return tabs;
     }
-
-
 }

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

@@ -31,12 +31,13 @@ public partial class ChoiceTable<TItem> where TItem : class, new()
 
     public async Task OnAddAsync(IEnumerable<TItem> selectorOutputs)
     {
-        if (MaxCount > 0 && selectorOutputs.Count() + SelectedRows.Count > MaxCount)
+        var data = selectorOutputs is IReadOnlyCollection<TItem> list ? list : selectorOutputs.ToList();
+        if (MaxCount > 0 && data.Count + SelectedRows.Count > MaxCount)
         {
             await ToastService.Warning(AdminLocalizer["MaxCount"]);
             return;
         }
-        foreach (var item in selectorOutputs)
+        foreach (var item in data)
         {
             SelectedRows.Add(item);
             await table2.QueryAsync();
@@ -60,6 +61,4 @@ public partial class ChoiceTable<TItem> where TItem : class, new()
     }
 
 
-
-
 }

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

@@ -8,7 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-
 using ThingsGateway.Admin.Application;
 
 namespace ThingsGateway.Admin.Razor;
@@ -59,10 +58,7 @@ public partial class LoginConnectionHub : ComponentBase, IDisposable
                 else
                     await InvokeAsync(async () => await ToastService.Warning(message.Data));
             });
-            NavigationUri.Subscribe(ClientId, async (message) =>
+            NavigationUri.Subscribe(ClientId, async (message) => await ShowMessage(message));
-            {
-                await ShowMessage(message);
-            });
             VerificatInfoUtil.UpdateVerificat(ClientId, VerificatId, isConnect: true);
         }
         catch (OperationCanceledException)
@@ -88,12 +84,7 @@ public partial class LoginConnectionHub : ComponentBase, IDisposable
             ShowDismiss = true,
             IsAutoHide = false,
             ChildContent = RenderItem(navigationUri),
-            OnDismiss = () =>
+            OnDismiss = () => Task.CompletedTask
-            {
-                return Task.CompletedTask;
-            }
         });
     }
-
-
 }

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

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-
-
 using Microsoft.AspNetCore.SignalR.Client;
 
 using System.Security.Claims;
@@ -50,12 +48,9 @@ public partial class SysSignalRLoginConnectionHub : ComponentBase, IAsyncDisposa
                         if (message is HttpClientHandler clientHandler)
                         {
                             // 绕过SSL证书
-                            clientHandler.ServerCertificateCustomValidationCallback += (sender, certificate, chain, sslPolicyErrors) =>
+                            clientHandler.ServerCertificateCustomValidationCallback += (sender, certificate, chain, sslPolicyErrors) => true;
-                            {
-                                return true;
-                            };
                         }
-                        ;
+
                         return message;
                     };
                     foreach (var item in App.User?.Claims ?? new List<Claim>())
@@ -80,16 +75,12 @@ public partial class SysSignalRLoginConnectionHub : ComponentBase, IAsyncDisposa
                         await InvokeAsync(async () => await ToastService.Warning(message.Data));
                 });
 
-                _hubConnection.On<string, string>(nameof(ISysHub.NavigationMesage), async (url, message) =>
+                _hubConnection.On<string, string>(nameof(ISysHub.NavigationMesage), async (url, message) => await ShowMessage(new(url, message)));
-                {
-                    await ShowMessage(new(url, message));
-                });
 
                 await _hubConnection.StartAsync();
             }
             catch
             {
-
             }
             await base.OnAfterRenderAsync(firstRender);
         }
@@ -100,7 +91,6 @@ public partial class SysSignalRLoginConnectionHub : ComponentBase, IAsyncDisposa
     [Inject]
     private MessageService MessageService { get; set; }
 
-
     private async Task ShowMessage(NavigationUri navigationUri)
     {
         await MessageService.Show(new MessageOption()
@@ -109,11 +99,7 @@ public partial class SysSignalRLoginConnectionHub : ComponentBase, IAsyncDisposa
             ShowDismiss = true,
             IsAutoHide = false,
             ChildContent = RenderItem(navigationUri),
-            OnDismiss = () =>
+            OnDismiss = () => Task.CompletedTask
-            {
-                return Task.CompletedTask;
-            }
         });
     }
-
 }

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

@@ -1,7 +1,6 @@
-@namespace ThingsGateway.Gateway.Razor
+@namespace ThingsGateway.Admin.Razor
 @using ThingsGateway.Admin.Application
 @using ThingsGateway.Admin.Razor
-@using ThingsGateway.Gateway.Application
 
 <div class="h-600px">
     <UniverSheet @ref="_sheetExcel" OnReadyAsync="OnReadyAsync"></UniverSheet>

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

@@ -8,13 +8,13 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.NewLife.Json.Extension;
 
-namespace ThingsGateway.Gateway.Razor;
+namespace ThingsGateway.Admin.Razor;
 
 public partial class USheet
 {
-
     private UniverSheet? _sheetExcel = null;
     private Task OnReadyAsync() => OnPushExcelData();