更新版本号

优化设备线程启停逻辑
添加winform(blazor) demo
部分页面显示内容优化

framework/Directory.Build.props

@@ -1,19 +0,0 @@
-<Project>
-	<PropertyGroup>
-		
-		<ImplicitUsings>enable</ImplicitUsings>
-		<TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
-		<Version>4.0.0.10</Version>
-		<LangVersion>latest</LangVersion>
-		<Authors>Diego</Authors>
-		<Product>ThingsGateway</Product>
-		<Copyright>© 2023-present Diego</Copyright>
-		<RepositoryUrl>https://gitee.com/diego2098/ThingsGateway</RepositoryUrl>
-		<SignAssembly>False</SignAssembly>
-		<DelaySign>False</DelaySign>
-		<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
-		<GenerateDocumentationFile>False</GenerateDocumentationFile>
-	</PropertyGroup>
-
-
-</Project>

framework/ThingsGateway.sln

@@ -82,7 +82,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{97B23D8B-C6C0-4746-A21F-C7B49354B284}"
 	ProjectSection(SolutionItems) = preProject
 		..\.gitignore = ..\.gitignore
-		Directory.Build.props = Directory.Build.props
 		..\README.md = ..\README.md
 	EndProjectSection
 EndProject

framework/admin/Directory.Build.props

@@ -1,7 +1,17 @@
 <Project>
-	<Import Project="$(SolutionDir)\Directory.Build.props" />
 	<PropertyGroup>
-
+		<ImplicitUsings>enable</ImplicitUsings>
+		<TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+		<Version>4.0.0.3</Version>
+		<LangVersion>latest</LangVersion>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Authors>Diego</Authors>
+		<Product>ThingsGateway</Product>
+		<Copyright>© 2023-present Diego</Copyright>
+		<RepositoryUrl>https://gitee.com/diego2098/ThingsGateway</RepositoryUrl>
+		<SignAssembly>True</SignAssembly>
+		<DelaySign>False</DelaySign>
+		<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
 	</PropertyGroup>
 
 

framework/admin/ThingsGateway.Admin.ApiController/Controllers/AuthController.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Microsoft.AspNetCore.Authorization;
@@ -28,7 +26,6 @@ namespace ThingsGateway.Admin.ApiController;
 public class AuthController : IDynamicApiController
 {
     private readonly IAuthService _authService;
-
     /// <summary>
     /// <inheritdoc cref="AuthController"/>
     /// </summary>

framework/admin/ThingsGateway.Admin.ApiController/Controllers/FileController.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Microsoft.AspNetCore.Mvc;
@@ -26,7 +24,6 @@ public class FileController : IDynamicApiController
 {
     private readonly IOperateLogService _operateLogService;
     private readonly IVisitLogService _visitLogService;
-
     /// <summary>
     /// <inheritdoc cref="FileController"/>
     /// </summary>
@@ -53,7 +50,6 @@ public class FileController : IDynamicApiController
         };
         return data;
     }
-
     /// <summary>
     /// 下载访问日志
     /// </summary>

framework/admin/ThingsGateway.Admin.ApiController/Controllers/OpenApiAuthController.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Microsoft.AspNetCore.Authorization;
@@ -30,7 +28,6 @@ namespace ThingsGateway.Admin.ApiController;
 public class OpenApiAuthController : IDynamicApiController
 {
     private readonly IOpenApiAuthService _authService;
-
     /// <summary>
     /// <inheritdoc cref="OpenApiAuthController"/>
     /// </summary>

framework/admin/ThingsGateway.Admin.ApiController/Controllers/SwaggerController.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -29,13 +27,12 @@ namespace ThingsGateway.Admin.ApiController;
 [Route("Swagger")]
 public class SwaggerController : IDynamicApiController, IScoped
 {
-    private readonly IConfigService _configService;
+    private readonly ConfigService _configService;
-
     /// <summary>
     /// <inheritdoc cref="SwaggerController"/>
     /// </summary>
     /// <param name="sysConfigService"></param>
-    public SwaggerController(IConfigService sysConfigService)
+    public SwaggerController(ConfigService sysConfigService)
     {
         _configService = sysConfigService;
     }

framework/admin/ThingsGateway.Admin.ApiController/GlobalUsings.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 global using Furion.DynamicApiController;
@@ -18,4 +16,4 @@ global using System;
 global using System.Threading.Tasks;
 
 global using ThingsGateway.Admin.Application;
-global using ThingsGateway.Foundation.Core;
+global using ThingsGateway.Foundation.Core;

framework/admin/ThingsGateway.Admin.ApiController/ThingsGateway.Admin.ApiController.xml

@@ -79,7 +79,7 @@
             Swagger登录授权服务
             </summary>
         </member>
-        <member name="M:ThingsGateway.Admin.ApiController.SwaggerController.#ctor(ThingsGateway.Admin.Application.IConfigService)">
+        <member name="M:ThingsGateway.Admin.ApiController.SwaggerController.#ctor(ThingsGateway.Admin.Application.ConfigService)">
             <summary>
             <inheritdoc cref="T:ThingsGateway.Admin.ApiController.SwaggerController"/>
             </summary>

framework/admin/ThingsGateway.Admin.Application/Aop/OperDescAttribute.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;
@@ -30,17 +28,14 @@ public class OperDescAttribute : Attribute
         Description = description;
         Catcategory = catcategory;
     }
-
     /// <summary>
     /// 分类
     /// </summary>
     public string Catcategory { get; }
-
     /// <summary>
     /// 说明
     /// </summary>
     public string Description { get; }
-
     /// <summary>
     /// 记录参数，默认true
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/Aop/OperDispatchProxy.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.Reflection;
@@ -98,7 +96,7 @@ public class OperDispatchProxy : AspectDispatchProxy, IDispatchProxy
     /// <exception cref="NotImplementedException"></exception>
     public override async Task InvokeAsync(MethodInfo method, object[] args)
     {
-        var desc = method.GetActualCustomAttribute<OperDescAttribute>(Target, true);
+        var desc = method.GetActualCustomAttribute<OperDescAttribute>(Target);
         if (desc == null)
         {
             var task = method.Invoke(Target, args) as Task;
@@ -136,7 +134,7 @@ public class OperDispatchProxy : AspectDispatchProxy, IDispatchProxy
     /// <exception cref="NotImplementedException"></exception>
     public override async Task<T> InvokeAsyncT<T>(MethodInfo method, object[] args)
     {
-        var desc = method.GetActualCustomAttribute<OperDescAttribute>(Target, true);
+        var desc = method.GetActualCustomAttribute<OperDescAttribute>(Target);
         if (desc == null)
         {
             var taskT = method.Invoke(Target, args) as Task<T>;
@@ -169,6 +167,7 @@ public class OperDispatchProxy : AspectDispatchProxy, IDispatchProxy
         }
     }
 
+
     private void WriteOperLog(MethodInfo method, object[] args, OperDescAttribute desc, object result, Exception exception)
     {
         //写入操作日志
@@ -217,5 +216,9 @@ public class OperDispatchProxy : AspectDispatchProxy, IDispatchProxy
             log.ExeMessage = exception.Source + ":" + exception.Message + Environment.NewLine + exception.StackTrace;
         }
         DbContext.Db.CopyNew().InsertableWithAttr(log).ExecuteCommand();//入库
+
     }
+
+
+
 }

framework/admin/ThingsGateway.Admin.Application/Const/AdminConst.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;

framework/admin/ThingsGateway.Admin.Application/Const/CacheConst.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;
@@ -19,6 +17,7 @@ namespace ThingsGateway.Admin.Application;
 /// </summary>
 public class CacheConst
 {
+
     /// <summary>
     /// 登录验证码缓存Key
     /// </summary>
@@ -29,6 +28,7 @@ public class CacheConst
     /// </summary>
     public const string SYS_CONFIGCATEGORY = "SYS_CONFIGCATEGORY";
 
+
     #region OpenApi
 
     /// <summary>
@@ -51,6 +51,7 @@ public class CacheConst
     /// </summary>
     public const string CACHE_USERVERIFICAT = "CACHE_USERVERIFICAT";
 
+
     #endregion OpenApi
 
     /// <summary>
@@ -77,4 +78,6 @@ public class CacheConst
     /// 角色表缓存Key
     /// </summary>
     public const string CACHE_SYSROLE = "CACHE_SYSROLE";
+
+
 }

framework/admin/ThingsGateway.Admin.Application/Const/CateGoryConst.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;
@@ -19,16 +17,19 @@ namespace ThingsGateway.Admin.Application;
 /// </summary>
 public static class CateGoryConst
 {
+
     /// <summary>
     /// ThingsGateway.Admin
     /// </summary>
     public const string ThingsGatewayAdmin = "ThingsGateway.Admin";
-
     /// <summary>
     /// ThingsGateway.OpenApi
     /// </summary>
     public const string ThingsGatewayOpenApi = "ThingsGateway.OpenApi";
 
+
+
+
     #region 关系表
 
     /// <summary>
@@ -55,6 +56,6 @@ public static class CateGoryConst
     /// 用户有哪些角色
     /// </summary>
     public const string Relation_SYS_USER_HAS_ROLE = "SYS_USER_HAS_ROLE";
-
     #endregion 关系表
+
 }

framework/admin/ThingsGateway.Admin.Application/Const/ConfigConst.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;
@@ -29,8 +27,10 @@ public static class ConfigConst
     /// </summary>
     public const string SYS_CONFIGOTHER = "SYS_CONFIGOTHER";
 
+
     #region config
 
+
     /// <summary>
     /// 版权标识
     /// </summary>
@@ -40,7 +40,6 @@ public static class ConfigConst
     /// 版权跳转url
     /// </summary>
     public const string CONFIG_COPYRIGHT_URL = "CONFIG_COPYRIGHT_URL";
-
     /// <summary>
     /// 是否启用PageTab
     /// </summary>
@@ -92,4 +91,6 @@ public static class ConfigConst
     public const string CONFIG_SWAGGERLOGIN_OPEN = "CONFIG_SWAGGERLOGIN_OPEN";
 
     #endregion
+
+
 }

framework/admin/ThingsGateway.Admin.Application/Const/EventSubscriberConst.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;
@@ -43,4 +41,7 @@ public class EventSubscriberConst
     /// OpenApi登出
     /// </summary>
     public const string LogoutOpenApi = "OpenApi退出";
+
+
+
 }

framework/admin/ThingsGateway.Admin.Application/Const/HubConst.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;

framework/admin/ThingsGateway.Admin.Application/Const/LogConst.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;
@@ -31,6 +29,7 @@ public class LogConst
     /// </summary>
     public const string LOG_LOGOUT = "LOGOUT";
 
+
     /// <summary>
     /// 第三方登录
     /// </summary>
@@ -61,10 +60,10 @@ public class LogConst
     /// </summary>
     public const string LOG_SUCCESS = "SUCCESS";
 
+
     /// <summary>
     /// 操作失败
     /// </summary>
     public const string LOG_FAIL = "FAIL";
-
     #endregion 日志表
 }

framework/admin/ThingsGateway.Admin.Application/Const/ResourceConst.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Core;

framework/admin/ThingsGateway.Admin.Application/Const/RoleConst.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;
@@ -42,4 +40,5 @@ public class RoleConst
     public const string Relation_SYS_USER_HAS_ROLE = "SYS_USER_HAS_ROLE";
 
     #endregion 关系表
+
 }

framework/admin/ThingsGateway.Admin.Application/GlobalUsings.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 global using Furion;
@@ -23,4 +21,4 @@ global using System.Threading.Tasks;
 
 global using ThingsGateway.Admin.Core;
 global using ThingsGateway.Core;
-global using ThingsGateway.Foundation.Core;
+global using ThingsGateway.Foundation.Core;

framework/admin/ThingsGateway.Admin.Application/Job/JobPersistence.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.Schedule;
@@ -38,6 +36,7 @@ public class JobPersistence : IJobPersistence
     /// <inheritdoc/>
     public void OnChanged(PersistenceContext context)
     {
+
     }
 
     /// <summary>
@@ -53,6 +52,7 @@ public class JobPersistence : IJobPersistence
     /// <inheritdoc/>
     public void OnTriggerChanged(PersistenceTriggerContext context)
     {
+
     }
 
     /// <summary>

framework/admin/ThingsGateway.Admin.Application/Job/LogJob.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.Schedule;

framework/admin/ThingsGateway.Admin.Application/OpenApi/EventSubscriber/Dto/LoginOpenApiEvent.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;

framework/admin/ThingsGateway.Admin.Application/OpenApi/EventSubscriber/OpenApiAuthEventSubscriber.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -33,7 +31,6 @@ public class OpenApiAuthEventSubscriber : IEventSubscriber, ISingleton
         LoginOpenApiEvent loginEvent = (LoginOpenApiEvent)context.Source.Payload;//获取参数
         OpenApiUser openApiUser = loginEvent.OpenApiUser;
         var db = DbContext.Db.CopyNew();
-
         #region 重新赋值属性,设置本次登录信息为最新的信息
 
         db.Tracking(openApiUser);//创建跟踪,只更新修改字段

framework/admin/ThingsGateway.Admin.Application/OpenApi/Services/OpenApiAuth/Dto/LoginOpenApiInput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using System.ComponentModel.DataAnnotations;

framework/admin/ThingsGateway.Admin.Application/OpenApi/Services/OpenApiAuth/Dto/LoginOpenApiOutput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;

framework/admin/ThingsGateway.Admin.Application/OpenApi/Services/OpenApiAuth/IOpenApiAuthService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -27,7 +25,6 @@ public interface IOpenApiAuthService : ITransient
     /// <param name="input">登录参数</param>
     /// <returns>Token信息</returns>
     Task<LoginOpenApiOutput> LoginOpenApiAsync(LoginOpenApiInput input);
-
     /// <summary>
     /// 登出
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/OpenApi/Services/OpenApiAuth/OpenApiAuthService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DataEncryption;

framework/admin/ThingsGateway.Admin.Application/OpenApi/Services/Session/Dto/OpenApiSessionInput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using System.ComponentModel;
@@ -27,7 +25,6 @@ public class OpenApiSessionPageInput : BasePageInput
     /// </summary>
     [Description("账号")]
     public string Account { get; set; }
-
     /// <summary>
     /// 最新登录IP
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/OpenApi/Services/Session/Dto/OpenApiSessionOutput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using System.ComponentModel;

framework/admin/ThingsGateway.Admin.Application/OpenApi/Services/Session/IOpenApiSessionService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;

framework/admin/ThingsGateway.Admin.Application/OpenApi/Services/Session/OpenApiSessionService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -24,14 +22,19 @@ namespace ThingsGateway.Admin.Application;
 [Injection(Proxy = typeof(OperDispatchProxy))]
 public class OpenApiSessionService : DbRepository<OpenApiUser>, IOpenApiSessionService
 {
+
     private readonly IVerificatService _verificatService;
 
+
+
     /// <inheritdoc cref="IOpenApiSessionService"/>
     public OpenApiSessionService(IVerificatService verificatService)
     {
         _verificatService = verificatService;
     }
 
+
+
     /// <inheritdoc/>
     [OperDesc("强退OPENAPI会话")]
     public async Task ExitSessionAsync(long input)
@@ -80,7 +83,7 @@ public class OpenApiSessionService : DbRepository<OpenApiUser>, IOpenApiSessionS
                 var verificatInfos = await _verificatService.GetVerificatIdAsync(it.Id);
                 if (verificatInfos != null)
                 {
-                    GetVerificatInfos(ref verificatInfos);//获取剩余时间
+                    OpenApiSessionService.GetVerificatInfos(ref verificatInfos);//获取剩余时间
                     it.VerificatCount = verificatInfos.Count;//令牌数量
                     it.VerificatSignList = verificatInfos;//令牌列表
                 }
@@ -88,6 +91,7 @@ public class OpenApiSessionService : DbRepository<OpenApiUser>, IOpenApiSessionS
                 {
                     it.VerificatSignList = new();
                 }
+
             });
         for (int i = input.SortField.Count - 1; i >= 0; i--)
         {
@@ -98,4 +102,5 @@ public class OpenApiSessionService : DbRepository<OpenApiUser>, IOpenApiSessionS
         pageInfo.Records = pageInfo.Records.OrderByDescending(it => it.VerificatCount);
         return pageInfo;
     }
+
 }

framework/admin/ThingsGateway.Admin.Application/OpenApi/Services/User/Dto/OpenApiUserInput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using SqlSugar;
@@ -35,17 +33,14 @@ public class OpenApiPermissionTreeSelector
     /// </summary>
     [Description("Api路径")]
     public string ApiRoute { get; set; }
-
     /// <summary>
     /// 子节点
     /// </summary>
     public List<OpenApiPermissionTreeSelector> Children { get; set; } = new();
-
     /// <summary>
     /// ID
     /// </summary>
     public long Id { get; set; }
-
     /// <summary>
     /// 父ID
     /// </summary>
@@ -73,6 +68,7 @@ public class OpenApiPermissionTreeSelector
         }
         return list;
     }
+
 }
 
 /// <summary>
@@ -85,7 +81,6 @@ public class OpenApiUserAddInput : OpenApiUser
     /// </summary>
     [Required(ErrorMessage = "账号不能为空"), MinLength(3, ErrorMessage = "账号不能少于4个字符")]
     public override string Account { get; set; }
-
     /// <summary>
     /// 密码
     /// </summary>
@@ -96,6 +91,8 @@ public class OpenApiUserAddInput : OpenApiUser
     /// <inheritdoc/>
     /// </summary>
     public override bool UserEnable { get; set; } = true;
+
+
 }
 
 /// <summary>
@@ -114,7 +111,6 @@ public class OpenApiUserEditInput : OpenApiUser
     /// </summary>
     [MinValue(1, ErrorMessage = "Id不能为空")]
     public override long Id { get; set; }
-
     /// <summary>
     /// 密码
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/OpenApi/Services/User/IOpenApiUserService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -55,6 +53,7 @@ public interface IOpenApiUserService : ITransient
     /// <returns></returns>
     Task EditAsync(OpenApiUserEditInput input);
 
+
     /// <summary>
     /// 启用用户
     /// </summary>
@@ -75,7 +74,6 @@ public interface IOpenApiUserService : ITransient
     /// <param name="account">用户名</param>
     /// <returns>用户信息</returns>
     Task<OpenApiUser> GetUserByAccountAsync(string account);
-
     /// <summary>
     /// 根据ID获取用户信息
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/OpenApi/Services/User/OpenApiUserService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DataEncryption;
@@ -60,6 +58,7 @@ public class OpenApiUserService : DbRepository<OpenApiUser>, IOpenApiUserService
     [OperDesc("删除用户")]
     public async Task DeleteAsync(params long[] ids)
     {
+
         //获取所有ID
         if (ids.Length > 0)
         {
@@ -76,6 +75,7 @@ public class OpenApiUserService : DbRepository<OpenApiUser>, IOpenApiUserService
         }
     }
 
+
     /// <inheritdoc />
     public void DeleteUserFromCache(params long[] ids)
     {
@@ -140,6 +140,7 @@ public class OpenApiUserService : DbRepository<OpenApiUser>, IOpenApiUserService
         //编辑操作可能会修改用户密码等信息，认证时需要实时获取用户并验证
     }
 
+
     /// <inheritdoc/>
     [OperDesc("启用用户")]
     public async Task EnableUserAsync(long input)
@@ -248,6 +249,7 @@ public class OpenApiUserService : DbRepository<OpenApiUser>, IOpenApiUserService
         query = query.OrderBy(it => it.SortCode);//排序
         query = query.OrderBy(u => u.Id);//排序
 
+
         var pageInfo = await query.ToPagedListAsync(input.Current, input.Size);//分页
         return pageInfo;
     }

framework/admin/ThingsGateway.Admin.Application/SeedData/Json/sys_resource.json

@@ -559,6 +559,6 @@
       "UpdateUser": "superAdmin",
       "UpdateUserId": "212725263002001"
     }
-
+    
   ]
 }

framework/admin/ThingsGateway.Admin.Application/SeedData/SysConfigSeedData.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;

framework/admin/ThingsGateway.Admin.Application/SeedData/SysRelationSeedData.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;

framework/admin/ThingsGateway.Admin.Application/SeedData/SysResourceSeedData.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;

framework/admin/ThingsGateway.Admin.Application/SeedData/SysRoleSeedData.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;

framework/admin/ThingsGateway.Admin.Application/SeedData/SysUserSeedData.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;

framework/admin/ThingsGateway.Admin.Application/SignalR/Hub/ISysHub.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;

framework/admin/ThingsGateway.Admin.Application/SignalR/Hub/SysHub.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.InstantMessaging;
@@ -36,14 +34,12 @@ public class SysHub : Hub<ISysHub>
 
     private readonly ILogger<ISysHub> _logger;
     private readonly IServiceScope _serviceScope;
-
     /// <inheritdoc cref="ISysHub"/>
     public SysHub(IServiceScopeFactory scopeFactory, ILogger<ISysHub> logger)
     {
         _serviceScope = scopeFactory.CreateScope();
         _logger = logger;
     }
-
     /// <summary>
     /// 连接
     /// </summary>
@@ -57,7 +53,6 @@ public class SysHub : Hub<ISysHub>
         await UpdateVerificatAsync(userIdentifier, verificat: VerificatId);//更新cache
         await base.OnConnectedAsync();
     }
-
     /// <summary>
     /// 断开连接
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/SignalR/Provider/UserIdProvider.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Microsoft.AspNetCore.Http.Connections.Features;

framework/admin/ThingsGateway.Admin.Application/Startup.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Microsoft.Extensions.DependencyInjection;
@@ -27,6 +25,7 @@ public class Startup : AppStartup
     /// </summary>
     public void ConfigureServices(IServiceCollection services)
     {
+
         // 任务调度
         services.AddSchedule(options =>
         {
@@ -35,5 +34,6 @@ public class Startup : AppStartup
 
         //事件总线
         services.AddEventBus();
+
     }
 }

framework/admin/ThingsGateway.Admin.Application/System/EventSubscriber/AuthEventSubscriber.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;

framework/admin/ThingsGateway.Admin.Application/System/EventSubscriber/UserEventSubscriber.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -25,7 +23,6 @@ namespace ThingsGateway.Admin.Application;
 public class UserEventSubscriber : IEventSubscriber, ISingleton
 {
     private readonly IServiceProvider _services;
-
     /// <summary>
     /// <inheritdoc cref="UserEventSubscriber"/>
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/Auth/AuthService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DataEncryption;
@@ -38,7 +36,6 @@ public class AuthService : IAuthService
     private readonly IServiceScope _serviceScope;
     private readonly ISysUserService _userService;
     private readonly IVerificatService _verificatService;
-
     /// <inheritdoc cref="IAuthService"/>
     public AuthService(
                        IEventPublisher eventPublisher,
@@ -178,6 +175,7 @@ public class AuthService : IAuthService
         return new LoginOutput { VerificatId = sessionid, Account = sysUser.Account };
     }
 
+
     private async Task RemoveVerificatAsync(LoginEvent loginEvent)
     {
         //获取verificat列表

framework/admin/ThingsGateway.Admin.Application/System/Services/Auth/Dto/AuthInput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using System.ComponentModel;
@@ -40,7 +38,6 @@ public class LoginInput : ValidCodeInput
     [Required(ErrorMessage = "密码不能为空"), MinLength(3, ErrorMessage = "密码不能少于3个字符")]
     public string Password { get; set; }
 }
-
 /// <summary>
 /// 验证码输入
 /// </summary>
@@ -56,7 +53,6 @@ public class ValidCodeInput
     /// </summary>
     public long ValidCodeReqNo { get; set; }
 }
-
 /// <summary>
 /// 登录设备类型枚举
 /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/Auth/Dto/AuthOutput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;
@@ -23,7 +21,6 @@ public class BaseLoginOutput
     /// 账号
     /// </summary>
     public string Account { get; set; }
-
     /// <summary>
     /// 验证ID
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/Auth/Dto/LoginEvent.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;

framework/admin/ThingsGateway.Admin.Application/System/Services/Auth/IAuthService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;

framework/admin/ThingsGateway.Admin.Application/System/Services/Button/ButtonService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -159,5 +157,7 @@ public class ButtonService : DbRepository<SysResource>, IButtonService
         sysResource.Category = ResourceCategoryEnum.BUTTON;//设置分类为按钮
     }
 
+
+
     #endregion 方法
 }

framework/admin/ThingsGateway.Admin.Application/System/Services/Button/Dto/ButtonInput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using System.ComponentModel.DataAnnotations;
@@ -39,7 +37,6 @@ public class ButtonAddInput : SysResource
     [Required(ErrorMessage = "Title不能为空")]
     public override string Title { get; set; }
 }
-
 /// <summary>
 /// 按钮分页
 /// </summary>
@@ -51,7 +48,6 @@ public class ButtonPageInput : BasePageInput
     [Required(ErrorMessage = "ParentId不能为空")]
     public long? ParentId { get; set; }
 }
-
 /// <summary>
 /// 按钮编辑
 /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/Button/IButtonService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -21,6 +19,8 @@ namespace ThingsGateway.Admin.Application;
 /// </summary>
 public interface IButtonService : ITransient
 {
+
+
     /// <summary>
     /// 添加按钮
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/Config/ConfigService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -26,12 +24,10 @@ namespace ThingsGateway.Admin.Application;
 public class ConfigService : DbRepository<SysConfig>, IConfigService
 {
     private readonly IServiceScope _serviceScope;
-
     public ConfigService(IServiceScopeFactory serviceScopeFactory)
     {
         _serviceScope = serviceScopeFactory.CreateScope();
     }
-
     /// <inheritdoc/>
     [OperDesc("编辑网关系统配置")]
     public async Task EditBatchAsync(List<SysConfig> sysConfigs)

framework/admin/ThingsGateway.Admin.Application/System/Services/Config/Dto/ConfigInput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using System.ComponentModel;
@@ -63,4 +61,5 @@ public class ConfigPageInput : BasePageInput
     /// </summary>
     [Description("分类")]
     public string Category { get; set; }
-}
+}
+

framework/admin/ThingsGateway.Admin.Application/System/Services/Config/IConfigService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -27,7 +25,6 @@ public interface IConfigService : ITransient
     /// <param name="configs">配置列表</param>
     /// <returns></returns>
     Task EditBatchAsync(List<SysConfig> configs);
-
     /// <summary>
     /// 新增自定义配置
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/File/FileService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.FriendlyException;
@@ -23,13 +21,18 @@ namespace ThingsGateway.Admin.Application;
 /// </summary>
 public class FileService : IFileService
 {
+
     /// <inheritdoc/>
     public void ImportVerification(IBrowserFile file, int maxSzie = 300, string[] allowTypes = null)
     {
+
         if (file == null) throw Oops.Bah("文件不能为空");
         if (file.Size > maxSzie * 1024 * 1024) throw Oops.Bah($"文件大小不允许超过{maxSzie}M");
         var fileSuffix = Path.GetExtension(file.Name).ToLower().Split(".")[1]; // 文件后缀
         string[] allowTypeS = allowTypes ?? new string[] { "xlsx" };//允许上传的文件类型
         if (!allowTypeS.Contains(fileSuffix)) throw Oops.Bah(errorMessage: "文件格式错误");
+
     }
-}
+
+
+}

framework/admin/ThingsGateway.Admin.Application/System/Services/File/IFileService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -23,6 +21,7 @@ namespace ThingsGateway.Admin.Application;
 /// </summary>
 public interface IFileService : ITransient
 {
+
     /// <summary>
     /// 验证上传文件
     /// </summary>
@@ -30,4 +29,7 @@ public interface IFileService : ITransient
     /// <param name="maxSzie">最大体积(M)</param>
     /// <param name="allowTypes">允许上传类型</param>
     void ImportVerification(IBrowserFile file, int maxSzie = 30, string[] allowTypes = null);
-}
+
+
+
+}

framework/admin/ThingsGateway.Admin.Application/System/Services/Menu/Dto/MenuInput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using System.ComponentModel.DataAnnotations;

framework/admin/ThingsGateway.Admin.Application/System/Services/Menu/IMenuService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;

framework/admin/ThingsGateway.Admin.Application/System/Services/Menu/MenuService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -30,7 +28,6 @@ public class MenuService : DbRepository<SysResource>, IMenuService
     private readonly IRelationService _relationService;
     private readonly IResourceService _resourceService;
     private readonly IRoleService _roleService;
-
     /// <inheritdoc cref="IMenuService"/>
     public MenuService(IResourceService resourceService, IRelationService relationService, IRoleService roleService)
     {
@@ -50,6 +47,7 @@ public class MenuService : DbRepository<SysResource>, IMenuService
             _resourceService.RefreshCache(ResourceCategoryEnum.MENU);//刷新菜单缓存
     }
 
+
     /// <inheritdoc />
     [OperDesc("删除菜单")]
     public async Task DeleteAsync(params long[] input)

framework/admin/ThingsGateway.Admin.Application/System/Services/Notice/INoticeService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;

framework/admin/ThingsGateway.Admin.Application/System/Services/Notice/NoticeService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Microsoft.AspNetCore.SignalR;
@@ -23,12 +21,10 @@ namespace ThingsGateway.Admin.Application;
 public class NoticeService : INoticeService
 {
     private readonly IServiceScope _serviceScope;
-
     public NoticeService(IServiceScopeFactory serviceScopeFactory)
     {
         _serviceScope = serviceScopeFactory.CreateScope();
     }
-
     /// <inheritdoc/>
     public async Task LogoutAsync(long userId, List<VerificatInfo> verificatInfos, string message)
     {

framework/admin/ThingsGateway.Admin.Application/System/Services/OperateLog/Dto/OperateLogInput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;
@@ -20,10 +18,10 @@ namespace ThingsGateway.Admin.Application;
 public class OperateLogPageInput : VisitLogPageInput
 {
 }
-
 /// <summary>
 /// 操作日志分页输入
 /// </summary>
 public class OperateLogInput : VisitLogInput
 {
+
 }

framework/admin/ThingsGateway.Admin.Application/System/Services/OperateLog/IOperateLogService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -27,14 +25,12 @@ public interface IOperateLogService : ITransient
     /// <param name="category">分类名称</param>
     /// <returns></returns>
     Task DeleteAsync(params string[] category);
-
     /// <summary>
     /// 导出后台日志
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
     Task<MemoryStream> ExportFileAsync(List<SysOperateLog> input = null);
-
     /// <summary>
     /// 导出后台日志
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/OperateLog/OperateLogService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -34,7 +32,6 @@ public class OperateLogService : DbRepository<SysOperateLog>, IOperateLogService
     {
         await AsDeleteable().Where(it => category.Contains(it.Category)).ExecuteCommandAsync();
     }
-
     /// <inheritdoc/>
     [OperDesc("导出操作日志", IsRecordPar = false)]
     public async Task<MemoryStream> ExportFileAsync(List<SysOperateLog> input = null)
@@ -47,7 +44,6 @@ public class OperateLogService : DbRepository<SysOperateLog>, IOperateLogService
         foreach (var devData in input)
         {
             #region sheet
-
             //变量页
             var data = devData.GetType().GetProperties();
             Dictionary<string, object> devExport = new();
@@ -80,7 +76,6 @@ public class OperateLogService : DbRepository<SysOperateLog>, IOperateLogService
         var data = await query.ToListAsync();
         return await ExportFileAsync(data);
     }
-
     /// <inheritdoc />
     public async Task<ISqlSugarPagedList<SysOperateLog>> PageAsync(OperateLogPageInput input)
     {
@@ -99,6 +94,7 @@ public class OperateLogService : DbRepository<SysOperateLog>, IOperateLogService
                            .WhereIF(!string.IsNullOrEmpty(input.ExeStatus), it => it.ExeStatus == input.ExeStatus)//根据结果查询
                            .WhereIF(!string.IsNullOrEmpty(input.SearchKey), it => it.Name.Contains(input.SearchKey) || it.OpIp.Contains(input.SearchKey));//根据关键字查询
 
+
         for (int i = input.SortField.Count - 1; i >= 0; i--)
         {
             query = query.OrderByIF(!string.IsNullOrEmpty(input.SortField[i]), $"{input.SortField[i]} {(input.SortDesc[i] ? "desc" : "asc")}");

framework/admin/ThingsGateway.Admin.Application/System/Services/Relation/IRelationService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;

framework/admin/ThingsGateway.Admin.Application/System/Services/Relation/RelationService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.FriendlyException;
@@ -22,12 +20,10 @@ namespace ThingsGateway.Admin.Application;
 public class RelationService : DbRepository<SysRelation>, IRelationService
 {
     private readonly IServiceScope _serviceScope;
-
     public RelationService(IServiceScopeFactory serviceScopeFactory)
     {
         _serviceScope = serviceScopeFactory.CreateScope();
     }
-
     /// <inheritdoc/>
     public async Task<List<SysRelation>> GetRelationByCategoryAsync(string category)
     {

framework/admin/ThingsGateway.Admin.Application/System/Services/Resource/Dto/ResourceOutput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,11 +8,11 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;
 
+
 /// <summary>
 /// 角色按钮资源
 /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/Resource/IResourceService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -26,7 +24,6 @@ public interface IResourceService : ITransient
     /// </summary>
     /// <returns>所有的菜单和模块以及单页面列表</returns>
     Task<List<SysResource>> GetaMenuAndSpaListAsync();
-
     /// <summary>
     /// 获取子资源
     /// </summary>
@@ -57,7 +54,6 @@ public interface IResourceService : ITransient
     /// <param name="categorys">资源分类列表</param>
     /// <returns></returns>
     Task<List<SysResource>> GetListByCategorysAsync(List<ResourceCategoryEnum> categorys = null);
-
     /// <summary>
     /// 获取资源所有下级
     /// </summary>
@@ -93,10 +89,10 @@ public interface IResourceService : ITransient
     /// <returns>菜单形结构</returns>
     /// <inheritdoc/>
     List<SysResource> ResourceListToTree(List<SysResource> resourceList, long parentId = 0);
-
     /// <summary>
     /// 多个树转列表
     /// </summary>
     /// <param name="data"></param>
     List<SysResource> ResourceTreeToList(List<SysResource> data);
+
 }

framework/admin/ThingsGateway.Admin.Application/System/Services/Resource/ResourceService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Mapster;
@@ -18,16 +16,15 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace ThingsGateway.Admin.Application;
 
+
 /// <inheritdoc cref="IResourceService"/>
 public class ResourceService : DbRepository<SysResource>, IResourceService
 {
     private readonly IServiceScope _serviceScope;
-
     public ResourceService(IServiceScopeFactory serviceScopeFactory)
     {
         _serviceScope = serviceScopeFactory.CreateScope();
     }
-
     /// <inheritdoc/>
     public async Task<List<SysResource>> GetaMenuAndSpaListAsync()
     {

framework/admin/ThingsGateway.Admin.Application/System/Services/Role/Dto/RoleInput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using System.ComponentModel.DataAnnotations;

framework/admin/ThingsGateway.Admin.Application/System/Services/Role/IRoleService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -69,7 +67,6 @@ public interface IRoleService : ITransient
     /// <param name="input">授权信息</param>
     /// <returns></returns>
     Task GrantUserAsync(GrantUserInput input);
-
     /// <summary>
     /// 角色拥有资源
     /// </summary>
@@ -101,7 +98,6 @@ public interface IRoleService : ITransient
     /// 角色刷新资源
     /// </summary>
     Task RefreshResourceAsync(long? menuId = null);
-
     /// <summary>
     /// 角色选择器
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/Role/RoleService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -84,6 +82,7 @@ namespace ThingsGateway.Admin.Application
                     await Context.Deleteable<SysRelation>().Where(it => ids.Contains(it.ObjectId) && delRelations.Contains(it.Category)).ExecuteCommandAsync();
                     //删除关系表角色与用户关系
                     await Context.Deleteable<SysRelation>().Where(it => targetIds.Contains(it.TargetId) && it.Category == CateGoryConst.Relation_SYS_USER_HAS_ROLE).ExecuteCommandAsync();
+
                 });
                 if (result.IsSuccess)//如果成功了
                 {
@@ -289,6 +288,7 @@ namespace ThingsGateway.Admin.Application
                 //删除老的
                 await Context.Deleteable<SysRelation>().Where(it => it.TargetId == input.Id.ToString() && it.Category == CateGoryConst.Relation_SYS_USER_HAS_ROLE).ExecuteCommandAsync();
                 await Context.Insertable(sysRelations).ExecuteCommandAsync();//添加新的
+
             });
             if (result.IsSuccess)//如果成功了
             {
@@ -361,6 +361,8 @@ namespace ThingsGateway.Admin.Application
                     await GrantResourceAsync(new GrantResourceInput() { Id = item.Id, GrantInfoList = r1.GrantInfoList });
                 }
             }
+
+
         }
 
         /// <inheritdoc />

framework/admin/ThingsGateway.Admin.Application/System/Services/Session/Dto/SessionInput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using System.ComponentModel;
@@ -27,7 +25,6 @@ public class SessionPageInput : BasePageInput
     /// </summary>
     [Description("账号")]
     public string Account { get; set; }
-
     /// <summary>
     /// 最新登录IP
     /// </summary>
@@ -51,7 +48,6 @@ public class ExitVerificatInput : BaseIdInput
     /// </summary>
     [Required(ErrorMessage = "VerificatIds不能为空")]
     public List<long> VerificatIds { get; set; }
-
     /// <summary>
     /// 用户Id
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/Session/Dto/SessionOutput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using System.ComponentModel;

framework/admin/ThingsGateway.Admin.Application/System/Services/Session/ISessionService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;

framework/admin/ThingsGateway.Admin.Application/System/Services/Session/SessionService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -75,7 +73,7 @@ public class SessionService : DbRepository<SysUser>, ISessionService
                   var verificatInfos = await _verificatService.GetVerificatIdAsync(it.Id);
                   if (verificatInfos != null)
                   {
-                      GetVerificatInfos(ref verificatInfos);//获取剩余时间
+                      SessionService.GetVerificatInfos(ref verificatInfos);//获取剩余时间
                       it.VerificatCount = verificatInfos.Count;//令牌数量
                       it.VerificatSignList = verificatInfos;//令牌列表
 
@@ -86,12 +84,14 @@ public class SessionService : DbRepository<SysUser>, ISessionService
                   {
                       it.VerificatSignList = new();
                   }
+
               });
         for (int i = input.SortField.Count - 1; i >= 0; i--)
         {
             query = query.OrderByIF(!string.IsNullOrEmpty(input.SortField[i]), $"{input.SortField[i]} {(input.SortDesc[i] ? "desc" : "asc")}");
         }
 
+
         var pageInfo = await query.ToPagedListAsync(input.Current, input.Size);//分页
         return pageInfo;
     }

framework/admin/ThingsGateway.Admin.Application/System/Services/Spa/Dto/SpaInput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using System.ComponentModel.DataAnnotations;

framework/admin/ThingsGateway.Admin.Application/System/Services/Spa/ISpaService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;

framework/admin/ThingsGateway.Admin.Application/System/Services/Spa/SpaService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;

framework/admin/ThingsGateway.Admin.Application/System/Services/User/Dto/UserInput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using SqlSugar;

framework/admin/ThingsGateway.Admin.Application/System/Services/User/Dto/UserOutput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Application;
@@ -33,4 +31,5 @@ public class UserSelectorOutput
     /// 姓名
     /// </summary>
     public string Name { get; set; }
-}
+}
+

framework/admin/ThingsGateway.Admin.Application/System/Services/User/ISysUserService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -41,6 +39,7 @@ public interface ISysUserService : ITransient
     /// <param name="ids">用户ID列表</param>
     void DeleteUserFromCache(params long[] ids);
 
+
     /// <summary>
     /// 禁用用户
     /// </summary>
@@ -82,7 +81,6 @@ public interface ISysUserService : ITransient
     /// <param name="account">用户名</param>
     /// <returns>用户信息</returns>
     Task<SysUser> GetUserByAccountAsync(string account);
-
     /// <summary>
     /// 根据ID获取用户信息
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/User/SysUserService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DataEncryption;
@@ -36,7 +34,6 @@ public class SysUserService : DbRepository<SysUser>, ISysUserService
     private readonly IRoleService _roleService;
     private readonly IVerificatService _verificatService;
     private readonly IServiceScope _serviceScope;
-
     /// <inheritdoc cref="ISysUserService"/>
     public SysUserService(
                        IRelationService relationService,
@@ -386,6 +383,7 @@ public class SysUserService : DbRepository<SysUser>, ISysUserService
             if (!sysUser.Phone.MatchPhoneNumber())//验证手机格式
                 throw Oops.Bah($"手机号码：{sysUser.Phone} 格式错误");
             sysUser.Phone = DESCEncryption.Encrypt(sysUser.Phone, DESCKeyConst.DESCKey);
+
         }
         //如果邮箱不是空
         if (!string.IsNullOrEmpty(sysUser.Email))

framework/admin/ThingsGateway.Admin.Application/System/Services/UserCenter/Dto/UserCenterInput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using System.ComponentModel;
@@ -28,7 +26,6 @@ public class UpdateInfoInput : SysUser
     [MinValue(1, ErrorMessage = "Id不能为空")]
     public override long Id { get; set; }
 }
-
 /// <summary>
 /// 修改密码
 /// </summary>
@@ -40,14 +37,12 @@ public class PasswordInfoInput : BaseIdInput, IValidatableObject
     [Description("旧密码")]
     [Required(ErrorMessage = "不能为空")]
     public string OldPassword { get; set; }
-
     /// <summary>
     /// 新密码
     /// </summary>
     [Description("新密码")]
     [Required(ErrorMessage = "不能为空")]
     public string NewPassword { get; set; }
-
     /// <summary>
     /// 确认密码
     /// </summary>
@@ -61,4 +56,4 @@ public class PasswordInfoInput : BaseIdInput, IValidatableObject
         if (NewPassword != ConfirmPassword)
             yield return new ValidationResult("两次密码不一致", new[] { nameof(ConfirmPassword) });
     }
-}
+}

framework/admin/ThingsGateway.Admin.Application/System/Services/UserCenter/IUserCenterService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -27,7 +25,6 @@ public interface IUserCenterService : ITransient
     /// <param name="input"></param>
     /// <returns></returns>
     Task EditPasswordAsync(PasswordInfoInput input);
-
     /// <summary>
     /// 获取个人主页
     /// </summary>
@@ -61,7 +58,6 @@ public interface IUserCenterService : ITransient
     /// <param name="input">信息参数</param>
     /// <returns></returns>
     Task UpdateUserInfoAsync(UpdateInfoInput input);
-
     /// <summary>
     /// 编辑个人工作台
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/UserCenter/UserCenterService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DataEncryption;
@@ -22,6 +20,7 @@ using ThingsGateway.Foundation.Extension.String;
 
 namespace ThingsGateway.Admin.Application;
 
+
 /// <inheritdoc cref="IUserCenterService"/>
 [Injection(Proxy = typeof(OperDispatchProxy))]
 public class UserCenterService : DbRepository<SysUser>, IUserCenterService
@@ -87,7 +86,6 @@ public class UserCenterService : DbRepository<SysUser>, IUserCenterService
         else
             return 0;
     }
-
     /// <inheritdoc />
     public async Task UpdateUserDefaultRazorAsync(long userId, long defaultRazor)
     {
@@ -150,7 +148,6 @@ public class UserCenterService : DbRepository<SysUser>, IUserCenterService
         }
         return result;
     }
-
     /// <inheritdoc />
     [OperDesc("用户更新个人信息")]
     public async Task UpdateUserInfoAsync(UpdateInfoInput input)
@@ -189,9 +186,9 @@ public class UserCenterService : DbRepository<SysUser>, IUserCenterService
         //关系表保存个人工作台
         await _relationService.SaveRelationAsync(CateGoryConst.Relation_SYS_USER_WORKBENCH_DATA, UserManager.UserId, null, input.ToJsonString(), true);
     }
-
     #region 方法
 
+
     /// <summary>
     /// 获取父菜单集合，已过滤掉同时存在的父节点
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/Verificat/IVerificatService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -34,7 +32,6 @@ public interface IVerificatService : ITransient
     /// <param name="userId"></param>
     /// <returns></returns>
     Task<List<VerificatInfo>> GetVerificatIdAsync(long userId);
-
     /// <summary>
     /// 设置验证ID
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/Verificat/VerificatService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Microsoft.Extensions.DependencyInjection;
@@ -20,12 +18,10 @@ namespace ThingsGateway.Admin.Application;
 public class VerificatService : DbRepository<SysVerificat>, IVerificatService
 {
     private readonly IServiceScope _serviceScope;
-
     public VerificatService(IServiceScopeFactory serviceScopeFactory)
     {
         _serviceScope = serviceScopeFactory.CreateScope();
     }
-
     /// <inheritdoc/>
     public async Task<List<VerificatInfo>> GetOpenApiVerificatIdAsync(long userId)
     {

framework/admin/ThingsGateway.Admin.Application/System/Services/VisitLog/Dto/VisitLogInput.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using System.ComponentModel;
@@ -25,12 +23,10 @@ public class VisitLogPageInput : BasePageInput
     /// 开始时间
     /// </summary>
     public DateTime? StartTime { get; set; } = DateTime.UtcNow.AddDays(-1);
-
     /// <summary>
     /// 结束时间
     /// </summary>
     public DateTime? EndTime { get; set; } = DateTime.UtcNow.AddDays(1);
-
     /// <summary>
     /// 账号
     /// </summary>
@@ -59,7 +55,6 @@ public class VisitLogInput
     /// 开始时间
     /// </summary>
     public DateTime? StartTime { get; set; } = DateTime.UtcNow.AddDays(-1);
-
     /// <summary>
     /// 结束时间
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/VisitLog/IVisitLogService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -28,14 +26,12 @@ public interface IVisitLogService : ITransient
     /// <param name="category">分类名称</param>
     /// <returns></returns>
     Task DeleteAsync(params string[] category);
-
     /// <summary>
     /// 导出访问日志
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
     Task<MemoryStream> ExportFileAsync(VisitLogInput input);
-
     /// <summary>
     /// 导出访问日志
     /// </summary>

framework/admin/ThingsGateway.Admin.Application/System/Services/VisitLog/VisitLogService.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Furion.DependencyInjection;
@@ -74,7 +72,6 @@ public class VisitLogService : DbRepository<SysVisitLog>, IVisitLogService
         foreach (var devData in input)
         {
             #region sheet
-
             //变量页
             var data = devData.GetType().GetProperties();
             Dictionary<string, object> devExport = new();
@@ -107,4 +104,5 @@ public class VisitLogService : DbRepository<SysVisitLog>, IVisitLogService
         var data = await query.ToListAsync();
         return await ExportFileAsync(data);
     }
+
 }

framework/admin/ThingsGateway.Admin.Application/ThingsGateway.Admin.Application.csproj

@@ -12,7 +12,7 @@
 	<ItemGroup>
 		<ProjectReference Include="..\ThingsGateway.Admin.Core\ThingsGateway.Admin.Core.csproj" />
 		<PackageReference Include="MiniExcel" Version="1.31.2" />
-		<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.7" />
+		<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.6" />
 	</ItemGroup>
 
 </Project>

framework/admin/ThingsGateway.Admin.Application/Util/PermissionUtil.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,7 +8,6 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 using Microsoft.AspNetCore.Authorization;

framework/admin/ThingsGateway.Admin.Application/Util/SeedDataUtil.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,11 +8,8 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
-using System.Text.RegularExpressions;
-
 using ThingsGateway.Foundation.Extension.String;
 
 namespace ThingsGateway.Admin.Application;
@@ -38,11 +34,11 @@ public class SeedDataUtil
         if (!string.IsNullOrEmpty(dataString))//如果有内容
         {
             //字段没有数据的替换成null
-            dataString = Regex.Replace(dataString, "\\\"[^\"]+?\\\": \\\"\\\"", match => match.Value.Replace("\"\"", "null"));
+            dataString = dataString.Replace("\"\"", "null");
-            //dataString = dataString.Replace("\"\"", "null");
             //将json字符串转为实体，这里extjson可以正常转换为字符串
             var seedDataRecord = Newtonsoft.Json.JsonConvert.DeserializeObject<SeedDataRecords<T>>(dataString);
 
+
             //遍历seedDataRecord
             for (int i = 0; i < seedDataRecord.Records.Count; i++)
             {
@@ -92,6 +88,7 @@ public class SeedDataUtil
 
         return seedData;
     }
+
 }
 
 /// <summary>

framework/admin/ThingsGateway.Admin.Blazor/Extension/NavItemExtensions.cs

@@ -1,5 +1,4 @@
 #region copyright
-
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -9,11 +8,9 @@
 //  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
 //  QQ群：605534569
 //------------------------------------------------------------------------------
-
 #endregion
 
 namespace ThingsGateway.Admin.Blazor;
-
 /// <summary>
 /// NavItemExtensions
 /// </summary>
@@ -72,4 +69,6 @@ public static class NavItemExtensions
         Href = menu.Component,
         Target = menu.TargetType == TargetTypeEnum.SELF ? "_self" : "_blank",
     };
+
+
 }