2.1.0.8

fix：PeriodicTimer dispose
2.1.0.7
2023-09-05 09:19:58 +08:00 · 2023-09-05 09:17:26 +08:00 · 2023-09-05 09:06:39 +08:00 · 2023-09-05 09:04:34 +08:00 · 2023-09-05 09:03:49 +08:00 · 2023-09-05 08:58:49 +08:00
408 changed files with 9787 additions and 3551 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -360,4 +360,7 @@ MigrationBackup/
 .ionide/

 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+
+
+/framework/*Pro*
--- a/README.md
+++ b/README.md
@@ -5,12 +5,11 @@

 **NetCore** 跨平台边缘采集网关(工业设备采集)

- **ThingsGateway** 存储库同时提供 [**设备采集驱动**](https://www.nuget.org/profiles/KimDiego)
+ **ThingsGateway** 存储库同时提供 [**设备采集驱动**](https://www.nuget.org/packages?q=Tags%3A%22ThingsGateway%22)

 **ThingsGateway** 存储库同时提供 **基于Blazor的权限框架** 查看 [**ThingsGateway.Admin**](https://gitee.com/dotnetchina/ThingsGateway/blob/master/framework/ThingsGateway.Admin.sln)


-
 ## 文档

 [ThingsGateway](https://diego2098.gitee.io/thingsgateway-docs/) 文档。
@@ -23,7 +22,9 @@

 [ThingsGateway演示地址](http://120.24.62.140:5000/)

-账户	:  **superAdmin**	密码 : **111111**
+账户	:  **superAdmin**	
+
+密码 : **111111**

 ## 赞助

--- a/framework/.editorconfig
+++ b/framework/.editorconfig
@@ -81,6 +81,15 @@ dotnet_diagnostic.CA2208.severity = none
 # IDE0057: 使用范围运算符
 dotnet_diagnostic.IDE0057.severity = none

+# IDE0056: 使用索引运算符
+dotnet_diagnostic.IDE0056.severity = none
+
+# CA1830: 最好使用 StringBuilder 的强类型 Append 和 Insert 方法重载
+dotnet_diagnostic.CA1830.severity = none
+
+# CA1847: 将字符型文本用于单个字符查找
+dotnet_diagnostic.CA1847.severity = none
+
 [*.vb]
 #### 命名样式 ####

--- a/framework/Directory.Build.props
+++ b/framework/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<Version>2.0.0.0</Version>
+		<Version>2.1.0.8</Version>
 		<Authors>Diego</Authors>
 		<Product>ThingsGateway</Product>
 		<Copyright>© 2023-present Diego</Copyright>
--- a/framework/ThingsGateway.Admin.ApiController/Controllers/FileController.cs
+++ b/framework/ThingsGateway.Admin.ApiController/Controllers/FileController.cs
@@ -19,7 +19,7 @@ using ThingsGateway.Admin.Core;
 namespace ThingsGateway.Admin.Application;

 /// <summary>
-/// 后台登录控制器
+/// 文件下载
 /// </summary>
 [ApiDescriptionSettings(CateGoryConst.ThingsGatewayAdmin, Order = 200)]
 [Route("file")]
--- a/framework/ThingsGateway.Admin.ApiController/Controllers/SwaggerController.cs
+++ b/framework/ThingsGateway.Admin.ApiController/Controllers/SwaggerController.cs
@@ -46,7 +46,7 @@ namespace ThingsGateway.Admin.Application
        [AllowAnonymous, NonUnify]
        public async Task<int> SwaggerCheckUrlAsync()
        {
-            var enable = (await _configService.GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_SWAGGERLOGIN_OPEN)).ConfigValue.ToBool();
+            var enable = (await _configService.GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_SWAGGERLOGIN_OPEN)).ConfigValue.ToBoolean();
            return enable ? 401 : 200;
        }

--- a/framework/ThingsGateway.Admin.ApiController/ThingsGateway.Admin.ApiController.xml
+++ b/framework/ThingsGateway.Admin.ApiController/ThingsGateway.Admin.ApiController.xml
@@ -30,7 +30,7 @@
        </member>
        <member name="T:ThingsGateway.Admin.Application.FileController">
            <summary>
-            后台登录控制器
+            文件下载
            </summary>
        </member>
        <member name="M:ThingsGateway.Admin.Application.FileController.#ctor(ThingsGateway.Admin.Application.IFileService,ThingsGateway.Admin.Application.IOperateLogService,ThingsGateway.Admin.Application.IVisitLogService)">
--- a/framework/ThingsGateway.Admin.Application/Aop/OperDispatchProxy.cs
+++ b/framework/ThingsGateway.Admin.Application/Aop/OperDispatchProxy.cs
@@ -18,6 +18,7 @@ using System.Reflection;
 using System.Text;

 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;

 using UAParser;

--- a/framework/ThingsGateway.Admin.Application/Helper/PermissionUtil.cs
+++ b/framework/ThingsGateway.Admin.Application/Helper/PermissionUtil.cs
@@ -20,6 +20,7 @@ using System.Globalization;
 using System.Reflection;

 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;

 using Yitter.IdGenerator;

--- a/framework/ThingsGateway.Admin.Application/Helper/SeedDataUtil.cs
+++ b/framework/ThingsGateway.Admin.Application/Helper/SeedDataUtil.cs
@@ -13,6 +13,8 @@
 using System.Text;

 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
+
 namespace ThingsGateway.Admin.Application;

 /// <summary>
--- a/framework/ThingsGateway.Admin.Application/OpenApi/Services/OpenApiAuth/OpenApiAuthService.cs
+++ b/framework/ThingsGateway.Admin.Application/OpenApi/Services/OpenApiAuth/OpenApiAuthService.cs
@@ -149,7 +149,7 @@ public class OpenApiAuthService : IOpenApiAuthService, ITransient
        {
            bool isSingle = false;//默认不开启单用户登录
            var singleConfig = await _configService.GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_SINGLE_OPEN);//获取系统单用户登录选项
-            if (singleConfig != null) isSingle = singleConfig.ConfigValue.ToBool();//如果配置不为空则设置单用户登录选项为系统配置的值
+            if (singleConfig != null) isSingle = singleConfig.ConfigValue.ToBoolean();//如果配置不为空则设置单用户登录选项为系统配置的值

            //判断是否单用户登录
            if (isSingle)
--- a/framework/ThingsGateway.Admin.Application/OpenApi/Services/Session/OpenApiSessionService.cs
+++ b/framework/ThingsGateway.Admin.Application/OpenApi/Services/Session/OpenApiSessionService.cs
@@ -52,8 +52,8 @@ public class OpenApiSessionService : DbRepository<OpenApiUser>, IOpenApiSessionS
        //获取该用户的verificat信息
        List<VerificatInfo> verificatInfos = await _verificatService.GetOpenApiVerificatIdAsync(input.Id);
        //当前需要踢掉用户的verificat
-        var deleteVerificats = verificatInfos.Where(it => input.VerificatIds.Contains(it.Id)).ToList();
-        await _verificatService.SetOpenApiVerificatIdAsync(input.Id, deleteVerificats);//如果还有verificat则更新verificat
+        var setVerificats = verificatInfos.Where(it => !input.VerificatIds.Contains(it.Id)).ToList();
+        await _verificatService.SetOpenApiVerificatIdAsync(input.Id, setVerificats);//如果还有verificat则更新verificat
    }

    /// <summary>
--- a/framework/ThingsGateway.Admin.Application/System/Services/Auth/AuthService.cs
+++ b/framework/ThingsGateway.Admin.Application/System/Services/Auth/AuthService.cs
@@ -79,7 +79,7 @@ public class AuthService : IAuthService

        if (sysBase != null)//如果有这个配置项
        {
-            if (sysBase.ConfigValue.ToBool())//如果需要验证码
+            if (sysBase.ConfigValue.ToBoolean())//如果需要验证码
            {
                //如果没填验证码，提示验证码不能为空
                if (input.ValidCode.IsNullOrEmpty() || input.ValidCodeReqNo == 0) throw Oops.Bah("验证码不能为空").StatusCode(410);
@@ -217,7 +217,7 @@ public class AuthService : IAuthService
            bool isSingle = false;//默认不开启单用户登录

            var singleConfig = await _configService.GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_SINGLE_OPEN);//获取系统单用户登录选项
-            if (singleConfig != null) isSingle = singleConfig.ConfigValue.ToBool();//如果配置不为空则设置单用户登录选项为系统配置的值
+            if (singleConfig != null) isSingle = singleConfig.ConfigValue.ToBoolean();//如果配置不为空则设置单用户登录选项为系统配置的值
            if (isSingle)//判断是否单用户登录
            {
                await _noticeService.LogoutAsync(loginEvent.SysUser.Id, verificatInfos.Where(it => it.Device == loginEvent.Device.ToString()).ToList(), "该账号已在别处登录!");//通知其他用户下线
--- a/framework/ThingsGateway.Admin.Application/System/Services/Button/ButtonService.cs
+++ b/framework/ThingsGateway.Admin.Application/System/Services/Button/ButtonService.cs
@@ -16,6 +16,7 @@ using Furion.FriendlyException;
 using Mapster;

 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;

 namespace ThingsGateway.Admin.Application;

--- a/framework/ThingsGateway.Admin.Application/System/Services/Role/RoleService.cs
+++ b/framework/ThingsGateway.Admin.Application/System/Services/Role/RoleService.cs
@@ -17,6 +17,7 @@ using Furion.FriendlyException;
 using Mapster;

 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;

 using Yitter.IdGenerator;

--- a/framework/ThingsGateway.Admin.Application/System/Services/Session/SessionService.cs
+++ b/framework/ThingsGateway.Admin.Application/System/Services/Session/SessionService.cs
@@ -52,12 +52,11 @@ public class SessionService : DbRepository<SysUser>, ISessionService
    {
        //获取该用户的verificat信息
        List<VerificatInfo> verificatInfos = await _verificatService.GetVerificatIdAsync(input.Id);
-        //当前需要踢掉用户的verificat
-        List<VerificatInfo> deleteVerificats = new();

        //踢掉包含verificat列表的verificat信息
-        deleteVerificats = verificatInfos.Where(it => input.VerificatIds.Contains(it.Id)).ToList();
-        await _verificatService.SetVerificatIdAsync(input.Id, deleteVerificats);//如果还有verificat则更新verificat
+        var setVerificats = verificatInfos.Where(it => !input.VerificatIds.Contains(it.Id)).ToList();
+        var deleteVerificats = verificatInfos.Where(it => input.VerificatIds.Contains(it.Id)).ToList();
+        await _verificatService.SetVerificatIdAsync(input.Id, setVerificats);//如果还有verificat则更新verificat

        var message = "您已被强制下线!";
        await _noticeService.LogoutAsync(input.Id, deleteVerificats, message);//通知下线
--- a/framework/ThingsGateway.Admin.Application/System/Services/User/SysUserService.cs
+++ b/framework/ThingsGateway.Admin.Application/System/Services/User/SysUserService.cs
@@ -19,6 +19,7 @@ using Mapster;
 using SqlSugar;

 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;

 namespace ThingsGateway.Admin.Application;

--- a/framework/ThingsGateway.Admin.Application/System/Services/UserCenter/UserCenterService.cs
+++ b/framework/ThingsGateway.Admin.Application/System/Services/UserCenter/UserCenterService.cs
@@ -17,6 +17,7 @@ using Furion.FriendlyException;
 using Mapster;

 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;

 namespace ThingsGateway.Admin.Application;

--- a/framework/ThingsGateway.Admin.Blazor.Core/BaseComponent/BaseComponentBase.cs
+++ b/framework/ThingsGateway.Admin.Blazor.Core/BaseComponent/BaseComponentBase.cs
@@ -30,7 +30,9 @@ public class BaseComponentBase : ComponentBase, IDisposable
    /// </summary>
    public virtual void Dispose()
    {
+
    }
+
    /// <summary>
    /// InvokeAsync(StateHasChanged)
    /// </summary>
--- a/framework/ThingsGateway.Admin.Blazor.Core/Components/AppBarItems.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/AppBarItems.razor.cs
@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD>룩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD>Diego<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><EFBFBD>Ŀ<EFBFBD>ԴЭ<EFBFBD>鼰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD>
-//  GiteeԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://gitee.com/diego2098/ThingsGateway
-//  GithubԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://github.com/kimdiego2098/ThingsGateway
-//  ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD>https://diego2098.gitee.io/thingsgateway-docs/
-//  QQȺ<EFBFBD><EFBFBD>605534569
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion

@@ -20,19 +20,19 @@ namespace ThingsGateway.Admin.Blazor.Core;
 public partial class AppBarItems
 {
    /// <summary>
-    /// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    /// 链接
    /// </summary>
    [Parameter]
    public string CONFIG_COPYRIGHT_URL { get; set; }

    /// <summary>
-    /// <EFBFBD><EFBFBD>Ȩ
+    /// 版权
    /// </summary>
    [Parameter]
    public string CONFIG_COPYRIGHT { get; set; }

    /// <summary>
-    /// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    /// 标题
    /// </summary>
    [Parameter]
    public string CONFIG_TITLE { get; set; }
--- a/framework/ThingsGateway.Admin.Blazor.Core/Components/AppListGroup.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/AppListGroup.razor.cs
@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD>룩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD>Diego<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><EFBFBD>Ŀ<EFBFBD>ԴЭ<EFBFBD>鼰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD>
-//  GiteeԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://gitee.com/diego2098/ThingsGateway
-//  GithubԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://github.com/kimdiego2098/ThingsGateway
-//  ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD>https://diego2098.gitee.io/thingsgateway-docs/
-//  QQȺ<EFBFBD><EFBFBD>605534569
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion

--- a/framework/ThingsGateway.Admin.Blazor.Core/Components/Breadcrumb.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/Breadcrumb.razor.cs
@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD>룩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD>Diego<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><EFBFBD>Ŀ<EFBFBD>ԴЭ<EFBFBD>鼰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD>
-//  GiteeԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://gitee.com/diego2098/ThingsGateway
-//  GithubԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://github.com/kimdiego2098/ThingsGateway
-//  ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD>https://diego2098.gitee.io/thingsgateway-docs/
-//  QQȺ<EFBFBD><EFBFBD>605534569
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion

--- a/framework/ThingsGateway.Admin.Blazor.Core/Components/EnableChip.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/EnableChip.razor.cs
@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD>룩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD>Diego<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><EFBFBD>Ŀ<EFBFBD>ԴЭ<EFBFBD>鼰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD>
-//  GiteeԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://gitee.com/diego2098/ThingsGateway
-//  GithubԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://github.com/kimdiego2098/ThingsGateway
-//  ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD>https://diego2098.gitee.io/thingsgateway-docs/
-//  QQȺ<EFBFBD><EFBFBD>605534569
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion

@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Components;

 namespace ThingsGateway.Admin.Blazor.Core;
 /// <summary>
-/// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>/ͣ<><CDA3> <20>ı<EFBFBD><C4B1><EFBFBD>ʾ
+/// 启用/停用 文本提示
 /// </summary>
 public partial class EnableChip
 {
@@ -46,5 +46,5 @@ public partial class EnableChip

    private string TextColor => Value ? "green" : "error";
    private string Color => Value ? "green-lighten" : "warning-lighten";
-    private string Label => Value ? EnabledLabel ?? "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>" : DisabledLabel ?? "ͣ<EFBFBD><EFBFBD>";
+    private string Label => Value ? EnabledLabel ?? "启用" : DisabledLabel ?? "停用";
 }
--- a/framework/ThingsGateway.Admin.Blazor.Core/Components/Favorite.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/Favorite.razor.cs
@@ -1,18 +1,18 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD>룩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD>Diego<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><EFBFBD>Ŀ<EFBFBD>ԴЭ<EFBFBD>鼰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD>
-//  GiteeԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://gitee.com/diego2098/ThingsGateway
-//  GithubԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://github.com/kimdiego2098/ThingsGateway
-//  ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD>https://diego2098.gitee.io/thingsgateway-docs/
-//  QQȺ<EFBFBD><EFBFBD>605534569
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion

 namespace ThingsGateway.Admin.Blazor.Core;
 /// <summary>
-/// <EFBFBD>ղ<EFBFBD>/<2F><><EFBFBD>ݷ<EFBFBD>ʽ
+/// 收藏/快捷方式
 /// </summary>
 public partial class Favorite
 {
--- a/framework/ThingsGateway.Admin.Blazor.Core/Components/Foter.razor
+++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/Foter.razor
@@ -19,7 +19,7 @@
 <MSheet>
    <MCard Flat Href=@CONFIG_COPYRIGHT_URL Target="_blank">
        <MLabel Style="background-color:inherit;" Class="text-subtltie-2">@CONFIG_COPYRIGHT</MLabel>
-        <MLabel Style="background-color:inherit;" Class="text-subtltie-2 ml-4">@Version</MLabel>
+        <MLabel Style="background-color:inherit;white-space: pre;" Class="text-subtltie-2 ml-4">@Version</MLabel>
    </MCard>
 </MSheet>

--- a/framework/ThingsGateway.Admin.Blazor.Core/Components/Foter.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/Foter.razor.cs
@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD>룩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD>Diego<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><EFBFBD>Ŀ<EFBFBD>ԴЭ<EFBFBD>鼰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD>
-//  GiteeԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://gitee.com/diego2098/ThingsGateway
-//  GithubԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://github.com/kimdiego2098/ThingsGateway
-//  ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD>https://diego2098.gitee.io/thingsgateway-docs/
-//  QQȺ<EFBFBD><EFBFBD>605534569
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion

@@ -14,6 +14,8 @@ using Microsoft.AspNetCore.Components;

 using System.Reflection;

+using ThingsGateway.Admin.Core;
+
 namespace ThingsGateway.Admin.Blazor.Core;
 /// <summary>
 /// Foter
@@ -22,17 +24,17 @@ public partial class Foter
 {
    private string Version = "";
    /// <summary>
-    /// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    /// 链接
    /// </summary>
    [Parameter]
    public string CONFIG_COPYRIGHT_URL { get; set; }
    /// <summary>
-    /// <EFBFBD><EFBFBD>Ȩ
+    /// 版权
    /// </summary>
    [Parameter]
    public string CONFIG_COPYRIGHT { get; set; }
    /// <summary>
-    /// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    /// 标题
    /// </summary>
    [Parameter]
    public string CONFIG_TITLE { get; set; }
@@ -40,7 +42,12 @@ public partial class Foter
    /// <inheritdoc/>
    protected override async Task OnParametersSetAsync()
    {
-        Version = "v" + Assembly.GetExecutingAssembly().GetName().Version.ToString();
+        var assembly = Assembly.GetEntryAssembly();
+        if (assembly != null)
+        {
+            Version = $"v{assembly.GetName().Version}";
+        }
+
        await base.OnParametersSetAsync();
    }

--- a/framework/ThingsGateway.Admin.Blazor.Core/Components/Logo.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/Logo.razor.cs
@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD>룩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD>Diego<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><EFBFBD>Ŀ<EFBFBD>ԴЭ<EFBFBD>鼰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD>
-//  GiteeԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://gitee.com/diego2098/ThingsGateway
-//  GithubԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://github.com/kimdiego2098/ThingsGateway
-//  ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD>https://diego2098.gitee.io/thingsgateway-docs/
-//  QQȺ<EFBFBD><EFBFBD>605534569
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion

@@ -20,23 +20,23 @@ namespace ThingsGateway.Admin.Blazor.Core;
 public partial class Logo
 {
    /// <summary>
-    /// Logo<EFBFBD>߶<EFBFBD>
+    /// Logo高度
    /// </summary>
    [Parameter]
    public int HeightInt { get; set; }

    /// <summary>
-    /// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    /// 链接
    /// </summary>
    [Parameter]
    public string CONFIG_COPYRIGHT_URL { get; set; }
    /// <summary>
-    /// <EFBFBD><EFBFBD>Ȩ
+    /// 版权
    /// </summary>
    [Parameter]
    public string CONFIG_COPYRIGHT { get; set; }
    /// <summary>
-    /// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    /// 标题
    /// </summary>
    [Parameter]
    public string CONFIG_TITLE { get; set; }
--- a/framework/ThingsGateway.Admin.Blazor.Core/Components/PageTabs.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/PageTabs.razor.cs
@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD>룩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD>Diego<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><EFBFBD>Ŀ<EFBFBD>ԴЭ<EFBFBD>鼰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD>
-//  GiteeԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://gitee.com/diego2098/ThingsGateway
-//  GithubԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://github.com/kimdiego2098/ThingsGateway
-//  ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD>https://diego2098.gitee.io/thingsgateway-docs/
-//  QQȺ<EFBFBD><EFBFBD>605534569
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion

@@ -34,7 +34,7 @@ public partial class PageTabs
        return op;
    }
    /// <summary>
-    /// Tabsʵ<EFBFBD><EFBFBD>
+    /// Tabs实例
    /// </summary>
    public PPageTabs PPageTabs { get; private set; }

@@ -46,7 +46,7 @@ public partial class PageTabs
    [Parameter]
    public IEnumerable<string> SelfPatterns { get; set; }
    /// <summary>
-    /// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    /// 子组件
    /// </summary>
    [Parameter]
    public RenderFragment ChildContent { get; set; }
--- a/framework/ThingsGateway.Admin.Blazor.Core/Components/Search.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/Search.razor.cs
@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD>룩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD>Diego<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><EFBFBD>Ŀ<EFBFBD>ԴЭ<EFBFBD>鼰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD>
-//  GiteeԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://gitee.com/diego2098/ThingsGateway
-//  GithubԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://github.com/kimdiego2098/ThingsGateway
-//  ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD>https://diego2098.gitee.io/thingsgateway-docs/
-//  QQȺ<EFBFBD><EFBFBD>605534569
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion

--- a/framework/ThingsGateway.Admin.Blazor.Core/Components/UserMenu.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/UserMenu.razor.cs
@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD>룩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD>Diego<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><EFBFBD>Ŀ<EFBFBD>ԴЭ<EFBFBD>鼰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD>
-//  GiteeԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://gitee.com/diego2098/ThingsGateway
-//  GithubԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://github.com/kimdiego2098/ThingsGateway
-//  ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD>https://diego2098.gitee.io/thingsgateway-docs/
-//  QQȺ<EFBFBD><EFBFBD>605534569
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion

@@ -17,6 +17,7 @@ using Masa.Blazor;
 using Microsoft.AspNetCore.Components;

 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;

 namespace ThingsGateway.Admin.Blazor.Core;
 /// <summary>
@@ -49,11 +50,11 @@ public partial class UserMenu
        var ret = str?.ToJsonWithT<UnifyResult<string>>();
        if (ret?.Code != 200)
        {
-            await PopupService.EnqueueSnackbarAsync("ע<EFBFBD><EFBFBD>ʧ<EFBFBD><EFBFBD>", AlertTypes.Error);
+            await PopupService.EnqueueSnackbarAsync("注销失败", AlertTypes.Error);
        }
        else
        {
-            await PopupService.EnqueueSnackbarAsync("ע<EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD>", AlertTypes.Success);
+            await PopupService.EnqueueSnackbarAsync("注销成功", AlertTypes.Success);
            await Task.Delay(500);
            NavigationManager.NavigateTo(NavigationManager.Uri);
        }
--- a/framework/ThingsGateway.Admin.Blazor.Core/JS/CookieStorage.cs
+++ b/framework/ThingsGateway.Admin.Blazor.Core/JS/CookieStorage.cs
@@ -0,0 +1,68 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+using Furion.DependencyInjection;
+
+namespace BlazorComponent.I18n;
+/// <summary>
+/// CookieStorage
+/// </summary>
+public class CookieStorage : IScoped
+{
+    private readonly IJSRuntime _jsRuntime;
+    /// <summary>
+    /// CookieStorage
+    /// </summary>
+    /// <param name="jsRuntime"></param>
+    public CookieStorage(IJSRuntime jsRuntime)
+    {
+        _jsRuntime = jsRuntime;
+    }
+    /// <summary>
+    /// GetCookieAsync
+    /// </summary>
+    /// <param name="key"></param>
+    /// <returns></returns>
+    public async Task<string> GetCookieAsync(string key)
+    {
+        return await _jsRuntime.InvokeAsync<string>(JsInteropConstants.GetCookie, key);
+    }
+    /// <summary>
+    /// GetCookie
+    /// </summary>
+    /// <param name="key"></param>
+    /// <returns></returns>
+    public string GetCookie(string key)
+    {
+        if (_jsRuntime is IJSInProcessRuntime jsInProcess)
+        {
+            return jsInProcess.Invoke<string>(JsInteropConstants.GetCookie, key);
+        }
+        return null;
+    }
+    /// <summary>
+    /// SetItemAsync
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="key"></param>
+    /// <param name="value"></param>
+    public async void SetItemAsync<T>(string key, T value)
+    {
+        try
+        {
+            await _jsRuntime.InvokeVoidAsync(JsInteropConstants.SetCookie, key, value?.ToString());
+        }
+        catch
+        {
+        }
+    }
+}
--- a/framework/ThingsGateway.Admin.Blazor.Core/Startup.cs
+++ b/framework/ThingsGateway.Admin.Blazor.Core/Startup.cs
@@ -10,6 +10,8 @@
 //------------------------------------------------------------------------------
 #endregion

+using BlazorComponent;
+
 using Furion;

 using Masa.Blazor;
@@ -61,6 +63,8 @@ public class Startup : AppStartup


            });
+            options.Locale = new Locale("zh-CN", "en-US");
+
        });

        services.AddScoped<InitTimezone>();
--- a/framework/ThingsGateway.Admin.Blazor.Core/ThingsGateway.Admin.Blazor.Core.csproj
+++ b/framework/ThingsGateway.Admin.Blazor.Core/ThingsGateway.Admin.Blazor.Core.csproj
@@ -14,8 +14,8 @@
 	
 	<ItemGroup>

-		<PackageReference Include="Masa.Blazor" Version="1.0.1" />
-		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.9" />
+		<PackageReference Include="Masa.Blazor" Version="1.0.3" />
+		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.10" />

 	</ItemGroup>
 	
--- a/framework/ThingsGateway.Admin.Blazor.Core/ThingsGateway.Admin.Blazor.Core.xml
+++ b/framework/ThingsGateway.Admin.Blazor.Core/ThingsGateway.Admin.Blazor.Core.xml
@@ -857,5 +857,38 @@
            设置深浅主题统一由这个方法为入口
            </summary>
        </member>
+        <member name="T:BlazorComponent.I18n.CookieStorage">
+            <summary>
+            CookieStorage
+            </summary>
+        </member>
+        <member name="M:BlazorComponent.I18n.CookieStorage.#ctor(Microsoft.JSInterop.IJSRuntime)">
+            <summary>
+            CookieStorage
+            </summary>
+            <param name="jsRuntime"></param>
+        </member>
+        <member name="M:BlazorComponent.I18n.CookieStorage.GetCookieAsync(System.String)">
+            <summary>
+            GetCookieAsync
+            </summary>
+            <param name="key"></param>
+            <returns></returns>
+        </member>
+        <member name="M:BlazorComponent.I18n.CookieStorage.GetCookie(System.String)">
+            <summary>
+            GetCookie
+            </summary>
+            <param name="key"></param>
+            <returns></returns>
+        </member>
+        <member name="M:BlazorComponent.I18n.CookieStorage.SetItemAsync``1(System.String,``0)">
+            <summary>
+            SetItemAsync
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="key"></param>
+            <param name="value"></param>
+        </member>
    </members>
 </doc>
--- a/framework/ThingsGateway.Admin.Blazor.Core/UserResoures/UserResoures.cs
+++ b/framework/ThingsGateway.Admin.Blazor.Core/UserResoures/UserResoures.cs
@@ -20,6 +20,7 @@ using Microsoft.AspNetCore.Http;

 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;

 namespace ThingsGateway.Admin.Blazor.Core;

@@ -153,7 +154,7 @@ public class UserResoures : IDisposable
    {
        if (MasaBlazor.Theme.Dark != isDark || isDark == null)
            MasaBlazor.ToggleTheme();
-        _cookieStorage?.SetItemAsync(BlazorResourceConst.ThemeCookieKey, isDark.ToJsonString());
+        _cookieStorage?.SetItemAsync(BlazorResourceConst.ThemeCookieKey, MasaBlazor.Theme.Dark.ToJsonString());
    }

    private void InitCookie(IRequestCookieCollection cookies)
--- a/framework/ThingsGateway.Admin.Blazor/BlazorApp.razor
+++ b/framework/ThingsGateway.Admin.Blazor/BlazorApp.razor
@@ -48,8 +48,7 @@
        var controllerTypes = App.EffectiveTypes.
    Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass
    && u.IsDefined(typeof(Microsoft.AspNetCore.Components.RouteAttribute), false))
-    .Where(it => it.Assembly != typeof(BlazorApp).Assembly)
-    ;
+    .Where(it => it.Assembly != typeof(BlazorApp).Assembly);
        var assemblys = controllerTypes?.Select(it => it.Assembly)?.Distinct();
        return assemblys;
    }
--- a/framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor
+++ b/framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor
@@ -189,7 +189,7 @@
                }
                else
                {
-                    if (ItemColWithDTTemplate!=null)
+                    if (ItemColWithDTTemplate != null)
                    {
                        @ItemColWithDTTemplate(context)
                    }
@@ -220,7 +220,7 @@

                        }
                    }
-                    
+

                }
            </ItemColContent>
@@ -310,16 +310,24 @@
                        {
                            string value = DetailModelPairs[item.Value];
                            {
-                                <tr @key="item.Text">
-                                    <td class="text-start table-minwidth">
-                                        @item.Text
-                                    </td>
-                                    <td class="text-start ">
-                                        <div style="word-break:break-all; white-space:pre-wrap;">
-                                            @value
-                                        </div>
-                                    </td>
-                                </tr>
+                                @if (Detailemplate != null)
+                                {
+                                    @Detailemplate((item,value))
+                                }
+                                else
+                                {
+                                    <tr @key="item.Text">
+                                        <td class="text-start table-minwidth">
+                                            @item.Text
+                                        </td>
+                                        <td class="text-start ">
+                                            <div style="word-break:break-all; white-space:pre-wrap;">
+                                                @value
+                                            </div>
+                                        </td>
+                                    </tr>
+                                }
+                                
                            }
                        }
                    }
--- a/framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor.cs
@@ -72,12 +72,6 @@ public partial class AppDataTable<TItem, SearchItem, AddItem, EditItem> : IAppDa
    [Parameter]
    public bool Dense { get; set; }

-    /// <summary>
-    /// 获得/设置 明细行模板
-    /// </summary>
-    [Parameter]
-    public RenderFragment<TItem> DetailRowTemplate { get; set; }
-
    /// <summary>
    /// 编辑项委托
    /// </summary>
@@ -89,6 +83,11 @@ public partial class AppDataTable<TItem, SearchItem, AddItem, EditItem> : IAppDa
    /// </summary>
    [Parameter]
    public RenderFragment<EditItem> EditTemplate { get; set; }
+    /// <summary>
+    /// 获得/设置 详情模板
+    /// </summary>
+    [Parameter]
+    public RenderFragment<(DataTableHeader<TItem>, string)> Detailemplate { get; set; }

    /// <summary>
    /// 表头过滤，返回DataTableHeader列表，传输参数已包含全部初始表头与表头标题
@@ -283,6 +282,7 @@ public partial class AppDataTable<TItem, SearchItem, AddItem, EditItem> : IAppDa
            {
                SearchModel.Size = PageItems.Total;
            }
+            selectedItem = new List<TItem>();
        }
        catch (Exception ex)
        {
--- a/framework/ThingsGateway.Admin.Blazor/Page/Base.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Base.razor.cs
@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD>룩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD>Diego<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><EFBFBD>Ŀ<EFBFBD>ԴЭ<EFBFBD>鼰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD>
-//  GiteeԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://gitee.com/diego2098/ThingsGateway
-//  GithubԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://github.com/kimdiego2098/ThingsGateway
-//  ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD>https://diego2098.gitee.io/thingsgateway-docs/
-//  QQȺ<EFBFBD><EFBFBD>605534569
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion

--- a/framework/ThingsGateway.Admin.Blazor/Page/Config.razor
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Config.razor
@@ -14,8 +14,7 @@
@using System.Linq.Expressions;
@using Microsoft.AspNetCore.Authorization;
@using ThingsGateway.Admin.Application;
-
-@inject IConfigService ConfigService
+ 
@namespace ThingsGateway.Admin.Blazor
@attribute [Authorize]
@inject UserResoures UserResoures
--- a/framework/ThingsGateway.Admin.Blazor/Page/Config.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Config.razor.cs
@@ -41,26 +41,26 @@ public partial class Config
    MainLayout MainLayout { get; set; }
    private Task AddCallAsync(ConfigAddInput input)
    {
-        return ConfigService.AddAsync(input);
+        return App.GetService<ConfigService>().AddAsync(input);
    }

    private Task DeleteCallAsync(IEnumerable<SysConfig> sysConfigs)
    {
-        return ConfigService.DeleteAsync(sysConfigs.Select(a => a.Id).ToArray());
+        return App.GetService<ConfigService>().DeleteAsync(sysConfigs.Select(a => a.Id).ToArray());
    }
    private Task EditCallAsync(ConfigEditInput sysConfigs)
    {
-        return ConfigService.EditAsync(sysConfigs);
+        return App.GetService<ConfigService>().EditAsync(sysConfigs);
    }

    private async Task OnSaveAsync()
    {
-        await ConfigService.EditBatchAsync(_sysConfig);
+        await App.GetService<ConfigService>().EditBatchAsync(_sysConfig);
        await MainLayout.StateHasChangedAsync();
        await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
    }
    private Task<SqlSugarPagedList<SysConfig>> QueryCallAsync(ConfigPageInput input)
    {
-        return ConfigService.PageAsync(input);
+        return App.GetService<ConfigService>().PageAsync(input);
    }
 }
--- a/framework/ThingsGateway.Admin.Blazor/Page/Index.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Index.razor.cs
@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD>룩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD>Diego<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><EFBFBD>Ŀ<EFBFBD>ԴЭ<EFBFBD>鼰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD>
-//  GiteeԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://gitee.com/diego2098/ThingsGateway
-//  GithubԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://github.com/kimdiego2098/ThingsGateway
-//  ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD>https://diego2098.gitee.io/thingsgateway-docs/
-//  QQȺ<EFBFBD><EFBFBD>605534569
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion

@@ -18,7 +18,7 @@ using ThingsGateway.Admin.Core;

 namespace ThingsGateway.Admin.Blazor;
 /// <summary>
-/// <EFBFBD><EFBFBD>ҳ
+/// 首页
 /// </summary>
 public partial class Index
 {
--- a/framework/ThingsGateway.Admin.Blazor/Page/Menu.razor
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Menu.razor
@@ -16,7 +16,7 @@
@using Masa.Blazor.Presets;
@using Microsoft.AspNetCore.Authorization;
@using ThingsGateway.Admin.Application;
-@inject IMenuService MenuService
+
@namespace ThingsGateway.Admin.Blazor
@attribute [Authorize]
@inherits BaseComponentBase
--- a/framework/ThingsGateway.Admin.Blazor/Page/Menu.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Menu.razor.cs
@@ -29,14 +29,11 @@ public partial class Menu
    long buttonParentId;
    bool IsShowButtonList;
    List<SysResource> MenuCatalog = new();
-    [Inject]
-    IButtonService ButtonService { get; set; }
+

    [CascadingParameter]
    MainLayout MainLayout { get; set; }

-    [Inject]
-    IResourceService ResourceService { get; set; }
    /// <summary>
    /// <inheritdoc/>
    /// </summary>
@@ -52,23 +49,23 @@ public partial class Menu
    private async Task AddCallAsync(MenuAddInput input)
    {
        input.ParentId = search.ParentId;
-        await MenuService.AddAsync(input);
+        await App.GetService<MenuService>().AddAsync(input);
        await NavChangeAsync();
    }
    private async Task ButtonAddCallAsync(ButtonAddInput input)
    {
        input.ParentId = buttonParentId;
-        await ButtonService.AddAsync(input);
+        await App.GetService<ButtonService>().AddAsync(input);
    }

    private Task ButtonDeleteCallAsync(IEnumerable<SysResource> input)
    {
-        return ButtonService.DeleteAsync(input.Select(a => a.Id).ToArray());
+        return App.GetService<ButtonService>().DeleteAsync(input.Select(a => a.Id).ToArray());
    }

    private Task ButtonEditCallAsync(ButtonEditInput input)
    {
-        return ButtonService.EditAsync(input);
+        return App.GetService<ButtonService>().EditAsync(input);

    }

@@ -92,7 +89,7 @@ public partial class Menu
    private async Task<SqlSugarPagedList<SysResource>> ButtonQueryCallAsync(ButtonPageInput input)
    {
        input.ParentId = buttonParentId;
-        var data = await ButtonService.PageAsync(input);
+        var data = await App.GetService<ButtonService>().PageAsync(input);
        return data;
    }

@@ -103,13 +100,13 @@ public partial class Menu

    private async Task DeleteCallAsync(IEnumerable<SysResource> input)
    {
-        await MenuService.DeleteAsync(input.Select(a => a.Id).ToArray());
+        await App.GetService<MenuService>().DeleteAsync(input.Select(a => a.Id).ToArray());
        await NavChangeAsync();

    }
    private async Task EditCallAsync(MenuEditInput input)
    {
-        await MenuService.EditAsync(input);
+        await App.GetService<MenuService>().EditAsync(input);
        await NavChangeAsync();

    }
@@ -117,9 +114,9 @@ public partial class Menu
    private async Task<List<SysResource>> GetMenuCatalogAsync()
    {
        //获取所有菜单
-        List<SysResource> sysResources = await ResourceService.GetListByCategoryAsync(ResourceCategoryEnum.MENU);
+        List<SysResource> sysResources = await App.GetService<ResourceService>().GetListByCategoryAsync(ResourceCategoryEnum.MENU);
        sysResources = sysResources.Where(it => it.TargetType == TargetTypeEnum.None).ToList();
-        MenuCatalog = ResourceService.ResourceListToTree(sysResources);
+        MenuCatalog = App.GetService<ResourceService>().ResourceListToTree(sysResources);
        return MenuCatalog;
    }

@@ -130,7 +127,7 @@ public partial class Menu
    }
    private async Task<SqlSugarPagedList<SysResource>> QueryCallAsync(MenuPageInput input)
    {
-        var data = await MenuService.TreeAsync(input);
+        var data = await App.GetService<MenuService>().TreeAsync(input);
        return data.ToPagedList(input);
    }

--- a/framework/ThingsGateway.Admin.Blazor/Page/OpenApiSession.razor
+++ b/framework/ThingsGateway.Admin.Blazor/Page/OpenApiSession.razor
@@ -15,7 +15,7 @@
@using Masa.Blazor.Presets;
@using Microsoft.AspNetCore.Authorization;
@using ThingsGateway.Admin.Application;
-@inject IOpenApiSessionService SessionService
+ 
@namespace ThingsGateway.Admin.Blazor
@attribute [Authorize]
@inject UserResoures UserResoures
--- a/framework/ThingsGateway.Admin.Blazor/Page/OpenApiSession.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Page/OpenApiSession.razor.cs
@@ -33,13 +33,13 @@ public partial class OpenApiSession
        var confirm = await PopupService.OpenConfirmDialogAsync("警告", "确定 ?");
        if (confirm)
        {
-            await SessionService.ExitSessionAsync(id);
+            await App.GetService<OpenApiSessionService>().ExitSessionAsync(id);
        }
    }

    private Task<SqlSugarPagedList<OpenApiSessionOutput>> SessionQueryCallAsync(OpenApiSessionPageInput input)
    {
-        return SessionService.PageAsync(input);
+        return App.GetService<OpenApiSessionService>().PageAsync(input);
    }

    private async Task ShowVerificatListAsync(List<VerificatInfo> verificatInfos)
@@ -57,7 +57,7 @@ public partial class OpenApiSession
            VerificatIds = verificats.Select(it => it.Id).ToList(),
            Id = verificats.First().UserId
        };
-        await SessionService.ExitVerificatAsync(send);
+        await App.GetService<OpenApiSessionService>().ExitVerificatAsync(send);
        _verificatInfos.RemoveWhere(it => send.VerificatIds.Contains(it.Id));
    }

--- a/framework/ThingsGateway.Admin.Blazor/Page/OpenApiUserR.razor
+++ b/framework/ThingsGateway.Admin.Blazor/Page/OpenApiUserR.razor
@@ -15,7 +15,7 @@
@using Microsoft.AspNetCore.Authorization;
@using ThingsGateway.Admin.Application;
@using Masa.Blazor.Presets;
-@inject IOpenApiUserService OpenApiUserService
+ 
@namespace ThingsGateway.Admin.Blazor
@attribute [Authorize]
@inject UserResoures UserResoures
--- a/framework/ThingsGateway.Admin.Blazor/Page/OpenApiUserR.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Page/OpenApiUserR.razor.cs
@@ -31,21 +31,20 @@ public partial class OpenApiUserR
    bool IsShowRoles;
    List<OpenApiPermissionTreeSelector> RolesChoice = new();
    string SearchName;
-    [Inject]
-    IRoleService SysRoleService { get; set; }
+
    private Task AddCallAsync(OpenApiUserAddInput input)
    {
-        return OpenApiUserService.AddAsync(input);
+        return App.GetService<OpenApiUserService>().AddAsync(input);
    }

    private async Task DeleteCallAsync(IEnumerable<OpenApiUser> users)
    {
-        await OpenApiUserService.DeleteAsync(users.Select(a => a.Id).ToArray());
+        await App.GetService<OpenApiUserService>().DeleteAsync(users.Select(a => a.Id).ToArray());
    }

    private Task EditCallAsync(OpenApiUserEditInput users)
    {
-        return OpenApiUserService.EditAsync(users);
+        return App.GetService<OpenApiUserService>().EditAsync(users);
    }

    private List<OpenApiPermissionTreeSelector> GetRouters()
@@ -61,7 +60,7 @@ public partial class OpenApiUserR
            OpenApiUserGrantPermissionInput userGrantRoleInput = new();
            userGrantRoleInput.Id = ChoiceUserId;
            userGrantRoleInput.PermissionList = RolesChoice.Select(it => it.ApiRoute).ToList();
-            await OpenApiUserService.GrantRoleAsync(userGrantRoleInput);
+            await App.GetService<OpenApiUserService>().GrantRoleAsync(userGrantRoleInput);
            IsShowRoles = false;
            await _datatable?.QueryClickAsync();
        }
@@ -73,7 +72,7 @@ public partial class OpenApiUserR
    }
    private Task<SqlSugarPagedList<OpenApiUser>> QueryCallAsync(OpenApiUserPageInput input)
    {
-        return OpenApiUserService.PageAsync(input);
+        return App.GetService<OpenApiUserService>().PageAsync(input);
    }

    private async Task UserStatusChangeAsync(OpenApiUser context, bool enable)
@@ -81,9 +80,9 @@ public partial class OpenApiUserR
        try
        {
            if (enable)
-                await OpenApiUserService.EnableUserAsync(context.Id);
+                await App.GetService<OpenApiUserService>().EnableUserAsync(context.Id);
            else
-                await OpenApiUserService.DisableUserAsync(context.Id);
+                await App.GetService<OpenApiUserService>().DisableUserAsync(context.Id);
        }
        finally
        {
--- a/framework/ThingsGateway.Admin.Blazor/Page/Oplog.razor
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Oplog.razor
@@ -14,7 +14,7 @@
@using System.Linq.Expressions;
@using Microsoft.AspNetCore.Authorization;
@using ThingsGateway.Admin.Application;
-@inject IOperateLogService OperateLogService
+ 
@namespace ThingsGateway.Admin.Blazor
@attribute [Authorize]
@inject UserResoures UserResoures
--- a/framework/ThingsGateway.Admin.Blazor/Page/Oplog.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Oplog.razor.cs
@@ -44,7 +44,7 @@ public partial class Oplog
        var confirm = await PopupService.OpenConfirmDialogAsync("删除", "确定 ?");
        if (confirm)
        {
-            await OperateLogService.DeleteAsync(CategoryFilters.Select(it => it.Value).ToArray());
+            await App.GetService<OperateLogService>().DeleteAsync(CategoryFilters.Select(it => it.Value).ToArray());
            await _datatable?.QueryClickAsync();
        }
    }
@@ -54,7 +54,7 @@ public partial class Oplog
        input.Account = search.Account;
        input.Category = search.Category;
        input.ExeStatus = search.ExeStatus;
-        return OperateLogService.PageAsync(input);
+        return App.GetService<OperateLogService>().PageAsync(input);
    }
    [Inject]
    AjaxService AjaxService { get; set; }
--- a/framework/ThingsGateway.Admin.Blazor/Page/Role.razor
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Role.razor
@@ -16,7 +16,7 @@
@using Masa.Blazor.Presets;
@using Microsoft.AspNetCore.Authorization;
@using ThingsGateway.Admin.Application;
-@inject IRoleService SysRoleService
+ 
@namespace ThingsGateway.Admin.Blazor
@attribute [Authorize]
@inject UserResoures UserResoures
--- a/framework/ThingsGateway.Admin.Blazor/Page/Role.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Role.razor.cs
@@ -38,27 +38,23 @@ public partial class Role
    [CascadingParameter]
    MainLayout MainLayout { get; set; }

-    [Inject]
-    IResourceService ResourceService { get; set; }
+

    private string SearchKey { get; set; }

-    [Inject]
-    ISysUserService SysUserService { get; set; }
-
    private Task AddCallAsync(RoleAddInput input)
    {
-        return SysRoleService.AddAsync(input);
+        return App.GetService<RoleService>().AddAsync(input);
    }
    private async Task DeleteCallAsync(IEnumerable<SysRole> sysRoles)
    {
-        await SysRoleService.DeleteAsync(sysRoles.Select(a => a.Id).ToArray());
+        await App.GetService<RoleService>().DeleteAsync(sysRoles.Select(a => a.Id).ToArray());
        await MainLayout.StateHasChangedAsync();
    }

    private async Task EditCallAsync(RoleEditInput input)
    {
-        await SysRoleService.EditAsync(input);
+        await App.GetService<RoleService>().EditAsync(input);
        await MainLayout.StateHasChangedAsync();
    }
    private async Task OnRoleHasResuorcesSaveAsync(ModalActionEventArgs args)
@@ -69,7 +65,7 @@ public partial class Role
            var data = new List<SysResource>();
            userGrantRoleInput.Id = ChoiceRoleId;
            userGrantRoleInput.GrantInfoList = RoleHasResuorces;
-            await SysRoleService.GrantResourceAsync(userGrantRoleInput);
+            await App.GetService<RoleService>().GrantResourceAsync(userGrantRoleInput);
            IsShowResuorces = false;
        }
        catch (Exception ex)
@@ -86,7 +82,7 @@ public partial class Role
            GrantUserInput userGrantRoleInput = new();
            userGrantRoleInput.Id = ChoiceRoleId;
            userGrantRoleInput.GrantInfoList = UsersChoice.Select(it => it.Id).ToList();
-            await SysRoleService.GrantUserAsync(userGrantRoleInput);
+            await App.GetService<RoleService>().GrantUserAsync(userGrantRoleInput);
            IsShowUsers = false;
        }
        catch (Exception ex)
@@ -99,19 +95,19 @@ public partial class Role

    private Task<SqlSugarPagedList<SysRole>> QueryCallAsync(RolePageInput input)
    {
-        return SysRoleService.PageAsync(input);
+        return App.GetService<RoleService>().PageAsync(input);
    }

    private async Task ResuorceInitAsync()
    {
-        ResTreeSelectors = (await ResourceService.GetRoleGrantResourceMenusAsync());
-        RoleHasResuorces = (await SysRoleService.OwnResourceAsync(ChoiceRoleId))?.GrantInfoList;
+        ResTreeSelectors = (await App.GetService<ResourceService>().GetRoleGrantResourceMenusAsync());
+        RoleHasResuorces = (await App.GetService<RoleService>().OwnResourceAsync(ChoiceRoleId))?.GrantInfoList;
    }

    private async Task<List<UserSelectorOutput>> UserInitAsync()
    {
-        AllUsers = await SysUserService.UserSelectorAsync(SearchKey);
-        var data = await SysRoleService.OwnUserAsync(ChoiceRoleId);
+        AllUsers = await App.GetService<SysUserService>().UserSelectorAsync(SearchKey);
+        var data = await App.GetService<RoleService>().OwnUserAsync(ChoiceRoleId);
        UsersChoice = AllUsers.Where(a => data.Contains(a.Id)).ToList();
        return AllUsers;
    }
--- a/framework/ThingsGateway.Admin.Blazor/Page/Session.razor
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Session.razor
@@ -15,8 +15,7 @@
@using Masa.Blazor.Presets;
@using Microsoft.AspNetCore.Authorization;
@using ThingsGateway.Admin.Application;
-
-@inject ISessionService SessionService
+ 
@namespace ThingsGateway.Admin.Blazor
@attribute [Authorize]
@inject UserResoures UserResoures
--- a/framework/ThingsGateway.Admin.Blazor/Page/Session.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Session.razor.cs
@@ -33,14 +33,14 @@ public partial class Session
        var confirm = await PopupService.OpenConfirmDialogAsync("警告", "确定 ?");
        if (confirm)
        {
-            await SessionService.ExitSessionAsync(id);
+            await App.GetService<SessionService>().ExitSessionAsync(id);
        }
    }


    private Task<SqlSugarPagedList<SessionOutput>> SessionQueryCallAsync(SessionPageInput input)
    {
-        return SessionService.PageAsync(input);
+        return App.GetService<SessionService>().PageAsync(input);
    }

    private async Task ShowVerificatListAsync(List<VerificatInfo> verificatInfos)
@@ -58,7 +58,7 @@ public partial class Session
            VerificatIds = verificats.Select(it => it.Id).ToList(),
            Id = verificats.First().UserId
        };
-        await SessionService.ExitVerificatAsync(send);
+        await App.GetService<SessionService>().ExitVerificatAsync(send);
        _verificatInfos.RemoveWhere(it => send.VerificatIds.Contains(it.Id));
    }

--- a/framework/ThingsGateway.Admin.Blazor/Page/Spa.razor
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Spa.razor
@@ -16,7 +16,7 @@
@using Masa.Blazor.Presets;
@using Microsoft.AspNetCore.Authorization;
@using ThingsGateway.Admin.Application;
-@inject ISpaService SpaService
+ 
@namespace ThingsGateway.Admin.Blazor
@attribute [Authorize]
@inherits BaseComponentBase
--- a/framework/ThingsGateway.Admin.Blazor/Page/Spa.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Spa.razor.cs
@@ -27,23 +27,23 @@ public partial class Spa

    private async Task AddCallAsync(SpaAddInput input)
    {
-        await SpaService.AddAsync(input);
+        await App.GetService<SpaService>().AddAsync(input);
        await MainLayout.StateHasChangedAsync();
    }
    private async Task DeleteCallAsync(IEnumerable<SysResource> input)
    {
-        await SpaService.DeleteAsync(input.Select(a => a.Id).ToArray());
+        await App.GetService<SpaService>().DeleteAsync(input.Select(a => a.Id).ToArray());
        await MainLayout.StateHasChangedAsync();
    }

    private async Task EditCallAsync(SpaEditInput input)
    {
-        await SpaService.EditAsync(input);
+        await App.GetService<SpaService>().EditAsync(input);
        await MainLayout.StateHasChangedAsync();
    }

    private Task<SqlSugarPagedList<SysResource>> QueryCallAsync(SpaPageInput input)
    {
-        return SpaService.PageAsync(input);
+        return App.GetService<SpaService>().PageAsync(input);
    }
 }
--- a/framework/ThingsGateway.Admin.Blazor/Page/User.razor
+++ b/framework/ThingsGateway.Admin.Blazor/Page/User.razor
@@ -11,7 +11,7 @@
 *@

@page "/admin/user"
-@inject ISysUserService SysUserService
+ 
@namespace ThingsGateway.Admin.Blazor
@using Masa.Blazor.Presets;
@using Microsoft.AspNetCore.Authorization;
--- a/framework/ThingsGateway.Admin.Blazor/Page/User.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Page/User.razor.cs
@@ -34,21 +34,20 @@ public partial class User
    [CascadingParameter]
    MainLayout MainLayout { get; set; }

-    [Inject]
-    IRoleService SysRoleService { get; set; }
+
    private Task AddCallAsync(UserAddInput input)
    {
-        return SysUserService.AddAsync(input);
+        return App.GetService<SysUserService>().AddAsync(input);
    }
    private async Task DeleteCallAsync(IEnumerable<SysUser> users)
    {
-        await SysUserService.DeleteAsync(users.Select(a => a.Id).ToArray());
+        await App.GetService<SysUserService>().DeleteAsync(users.Select(a => a.Id).ToArray());
        await MainLayout.StateHasChangedAsync();
    }

    private async Task EditCallAsync(UserEditInput users)
    {
-        await SysUserService.EditAsync(users);
+        await App.GetService<SysUserService>().EditAsync(users);
        await MainLayout.StateHasChangedAsync();
    }

@@ -59,7 +58,7 @@ public partial class User
            UserGrantRoleInput userGrantRoleInput = new();
            userGrantRoleInput.Id = ChoiceUserId;
            userGrantRoleInput.RoleIdList = RolesChoice.Select(it => it.Id).ToList();
-            await SysUserService.GrantRoleAsync(userGrantRoleInput);
+            await App.GetService<SysUserService>().GrantRoleAsync(userGrantRoleInput);
            IsShowRoles = false;
        }
        catch (Exception ex)
@@ -71,20 +70,20 @@ public partial class User
    }
    private Task<SqlSugarPagedList<SysUser>> QueryCallAsync(UserPageInput input)
    {
-        return SysUserService.PageAsync(input);
+        return App.GetService<SysUserService>().PageAsync(input);
    }

    private async Task ResetPasswordAsync(SysUser sysUser)
    {
-        await SysUserService.ResetPasswordAsync(sysUser.Id);
+        await App.GetService<SysUserService>().ResetPasswordAsync(sysUser.Id);
        await PopupService.EnqueueSnackbarAsync(new("成功", AlertTypes.Success));
        await MainLayout.StateHasChangedAsync();
    }

    private async Task RoleInitAsync()
    {
-        AllRoles = await SysRoleService.RoleSelectorAsync();
-        var data = await SysRoleService.GetRoleIdListByUserIdAsync(ChoiceUserId);
+        AllRoles = await App.GetService<RoleService>().RoleSelectorAsync();
+        var data = await App.GetService<RoleService>().GetRoleIdListByUserIdAsync(ChoiceUserId);
        RolesChoice = AllRoles.Where(a => data.Contains(a.Id)).ToList();
    }
    private async Task UserStatusChangeAsync(SysUser context, bool enable)
@@ -92,9 +91,9 @@ public partial class User
        try
        {
            if (enable)
-                await SysUserService.EnableUserAsync(context.Id);
+                await App.GetService<SysUserService>().EnableUserAsync(context.Id);
            else
-                await SysUserService.DisableUserAsync(context.Id);
+                await App.GetService<SysUserService>().DisableUserAsync(context.Id);
        }
        finally
        {
--- a/framework/ThingsGateway.Admin.Blazor/Page/UserCenter.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Page/UserCenter.razor.cs
@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD>룩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD>Diego<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><EFBFBD>Ŀ<EFBFBD>ԴЭ<EFBFBD>鼰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD>
-//  GiteeԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://gitee.com/diego2098/ThingsGateway
-//  GithubԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://github.com/kimdiego2098/ThingsGateway
-//  ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD>https://diego2098.gitee.io/thingsgateway-docs/
-//  QQȺ<EFBFBD><EFBFBD>605534569
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion

@@ -18,7 +18,7 @@ using ThingsGateway.Admin.Core;

 namespace ThingsGateway.Admin.Blazor;
 /// <summary>
-/// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+/// 个人设置
 /// </summary>
 public partial class UserCenter
 {
@@ -33,8 +33,7 @@ public partial class UserCenter
    [Inject]
    NavigationManager NavigationManager { get; set; }

-    [Inject]
-    IUserCenterService UserCenterService { get; set; }
+

    /// <inheritdoc/>
    protected override async Task OnParametersSetAsync()
@@ -48,27 +47,27 @@ public partial class UserCenter

    async Task OnDefaultRazorSaveAsync()
    {
-        await UserCenterService.UpdateUserDefaultRazorAsync(UserManager.UserId, DefaultMenuId);
+        await App.GetService<UserCenterService>().UpdateUserDefaultRazorAsync(UserManager.UserId, DefaultMenuId);
        await MainLayout.StateHasChangedAsync();
-        await PopupService.EnqueueSnackbarAsync("<EFBFBD>ɹ<EFBFBD>", AlertTypes.Success);
+        await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
    }

    async Task OnShortcutSaveAsync()
    {
-        await UserCenterService.UpdateWorkbenchAsync(_menusChoice);
+        await App.GetService<UserCenterService>().UpdateWorkbenchAsync(_menusChoice);
        await MainLayout.StateHasChangedAsync();
-        await PopupService.EnqueueSnackbarAsync("<EFBFBD>ɹ<EFBFBD>", AlertTypes.Success);
+        await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
    }
    async Task OnUpdatePasswordInfoAsync(FormContext context)
    {
        var success = context.Validate();
        if (success)
        {
-            //<EFBFBD><EFBFBD>֤<EFBFBD>ɹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD>
+            //验证成功，操作业务
            _passwordInfoInput.Id = UserResoures.CurrentUser.Id;
-            await UserCenterService.EditPasswordAsync(_passwordInfoInput);
+            await App.GetService<UserCenterService>().EditPasswordAsync(_passwordInfoInput);
            await MainLayout.StateHasChangedAsync();
-            await PopupService.EnqueueSnackbarAsync("<EFBFBD>ɹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>µ<EFBFBD>¼", AlertTypes.Success);
+            await PopupService.EnqueueSnackbarAsync("成功，将重新登录", AlertTypes.Success);
            await Task.Delay(2000);
            NavigationManager.NavigateTo(NavigationManager.Uri);
        }
@@ -76,8 +75,8 @@ public partial class UserCenter

    async Task OnUpdateUserInfoAsync()
    {
-        await UserCenterService.UpdateUserInfoAsync(_updateInfoInput);
+        await App.GetService<UserCenterService>().UpdateUserInfoAsync(_updateInfoInput);
        await MainLayout.StateHasChangedAsync();
-        await PopupService.EnqueueSnackbarAsync("<EFBFBD>ɹ<EFBFBD>", AlertTypes.Success);
+        await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
    }
 }
--- a/framework/ThingsGateway.Admin.Blazor/Page/Vislog.razor
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Vislog.razor
@@ -14,8 +14,7 @@
@using System.Linq.Expressions;
@using Microsoft.AspNetCore.Authorization;
@using ThingsGateway.Admin.Application;
-
-@inject IVisitLogService VisitLogService
+ 
@namespace ThingsGateway.Admin.Blazor
@attribute [Authorize]
@inject UserResoures UserResoures
--- a/framework/ThingsGateway.Admin.Blazor/Page/Vislog.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Page/Vislog.razor.cs
@@ -51,14 +51,14 @@ public partial class Vislog
        var confirm = await PopupService.OpenConfirmDialogAsync("删除", "确定 ?");
        if (confirm)
        {
-            await VisitLogService.DeleteAsync(CategoryFilters.Select(it => it.Value).ToArray());
+            await App.GetService<VisitLogService>().DeleteAsync(CategoryFilters.Select(it => it.Value).ToArray());
            await _datatable?.QueryClickAsync();
        }
    }

    private async Task<SqlSugarPagedList<SysVisitLog>> QueryCallAsync(VisitLogPageInput input)
    {
-        var data = await VisitLogService.PageAsync(input);
+        var data = await App.GetService<VisitLogService>().PageAsync(input);
        return data;
    }
    [Inject]
--- a/framework/ThingsGateway.Admin.Blazor/Shared/Login.razor.cs
+++ b/framework/ThingsGateway.Admin.Blazor/Shared/Login.razor.cs
@@ -21,6 +21,7 @@ using Microsoft.Extensions.Hosting;
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Blazor.Core;
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;

 namespace ThingsGateway.Admin.Blazor;

@@ -39,10 +40,6 @@ public partial class Login
    AjaxService AjaxService { get; set; }


-    [Inject]
-    IAuthService AuthService { get; set; }
-
-

    string UserLogoUrl { get; set; } = BlazorResourceConst.ResourceUrl + "images/defaultUser.svg";

@@ -64,12 +61,7 @@ public partial class Login
        }
    }
    private PImageCaptcha captcha;
-    [Inject]
-    IUserCenterService UserCenterService { get; set; }
-    [Inject]
-    IResourceService ResourceService { get; set; }
-    [Inject]
-    ISysUserService SysUserService { get; set; }
+
    private async Task LoginAsync()
    {
        loginModel.ValidCodeReqNo = CaptchaInfo.ValidCodeReqNo;
@@ -101,9 +93,9 @@ public partial class Login
            {
                await PopupService.EnqueueSnackbarAsync(new("登录成功", AlertTypes.Success));
                await Task.Delay(500);
-                var userId = await SysUserService.GetIdByAccountAsync(loginModel.Account);
-                var data = await UserCenterService.GetLoginDefaultRazorAsync(userId);
-                var sameLevelMenus = await ResourceService.GetaMenuAndSpaListAsync();
+                var userId = await App.GetService<SysUserService>().GetIdByAccountAsync(loginModel.Account);
+                var data = await App.GetService<UserCenterService>().GetLoginDefaultRazorAsync(userId);
+                var sameLevelMenus = await App.GetService<ResourceService>().GetaMenuAndSpaListAsync();
                if (NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsolutePath == "/Login" || NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsolutePath == "/")
                    await AjaxService.GotoAsync(sameLevelMenus.FirstOrDefault(a => a.Id == data)?.Component ?? "index");
                else
@@ -133,19 +125,19 @@ public partial class Login
        GetCaptchaInfo();
        CONFIG_TITLE = (await App.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_TITLE))?.ConfigValue;
        CONFIG_REMARK = (await App.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_REMARK))?.ConfigValue;
-        _showCaptcha = (await App.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_CAPTCHA_OPEN))?.ConfigValue?.ToBool() == true;
+        _showCaptcha = (await App.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_CAPTCHA_OPEN))?.ConfigValue?.ToBoolean() == true;
        Welcome = "欢迎使用" + CONFIG_TITLE + "!";
        await base.OnParametersSetAsync();
    }

    private void GetCaptchaInfo()
    {
-        CaptchaInfo = AuthService.GetCaptchaInfo();
+        CaptchaInfo = App.GetService<AuthService>().GetCaptchaInfo();
    }

    private Task<string> RefreshCode()
    {
-        CaptchaInfo = AuthService.GetCaptchaInfo();
+        CaptchaInfo = App.GetService<AuthService>().GetCaptchaInfo();
        return Task.FromResult(CaptchaInfo.CodeValue);
    }
 }
--- a/framework/ThingsGateway.Admin.Blazor/ThingsGateway.Admin.Blazor.xml
+++ b/framework/ThingsGateway.Admin.Blazor/ThingsGateway.Admin.Blazor.xml
@@ -43,11 +43,6 @@
            表格紧凑
            </summary>
        </member>
-        <member name="P:ThingsGateway.Admin.Blazor.Core.AppDataTable`4.DetailRowTemplate">
-            <summary>
-            获得/设置 明细行模板
-            </summary>
-        </member>
        <member name="P:ThingsGateway.Admin.Blazor.Core.AppDataTable`4.EditCallAsync">
            <summary>
            编辑项委托
@@ -58,6 +53,11 @@
            获得/设置 编辑模板
            </summary>
        </member>
+        <member name="P:ThingsGateway.Admin.Blazor.Core.AppDataTable`4.Detailemplate">
+            <summary>
+            获得/设置 详情模板
+            </summary>
+        </member>
        <member name="P:ThingsGateway.Admin.Blazor.Core.AppDataTable`4.FilterHeaders">
            <summary>
            表头过滤，返回DataTableHeader列表，传输参数已包含全部初始表头与表头标题
--- a/framework/ThingsGateway.Admin.Core/Const/UserManager.cs
+++ b/framework/ThingsGateway.Admin.Core/Const/UserManager.cs
@@ -22,7 +22,7 @@ public class UserManager
    /// <summary>
    /// 是否超级管理员
    /// </summary>
-    public static bool IsSuperAdmin => (App.User?.FindFirst(ClaimConst.IsSuperAdmin)?.Value).ToBool();
+    public static bool IsSuperAdmin => (App.User?.FindFirst(ClaimConst.IsSuperAdmin)?.Value).ToBoolean();

    /// <summary>
    /// 当前用户账号
--- a/framework/ThingsGateway.Admin.Core/Entity/System/OpenApiUser.cs
+++ b/framework/ThingsGateway.Admin.Core/Entity/System/OpenApiUser.cs
@@ -86,7 +86,7 @@ public class OpenApiUser : BaseEntity
    /// <summary>
    /// 权限码集合
    /// </summary>
-    [SugarColumn(ColumnName = "PermissionCodeList", ColumnDescription = "权限json", IsJson = true, IsNullable = true)]
+    [SugarColumn(ColumnName = "PermissionCodeList", ColumnDescription = "权限json", ColumnDataType = StaticConfig.CodeFirst_BigString, IsJson = true, IsNullable = true)]
    public List<string> PermissionCodeList { get; set; }

    /// <summary>
--- a/framework/ThingsGateway.Admin.Core/Entity/System/SysVerificat.cs
+++ b/framework/ThingsGateway.Admin.Core/Entity/System/SysVerificat.cs
@@ -31,7 +31,7 @@ public class SysVerificat : PrimaryIdEntity
    /// <summary>
    /// 会话信息列表
    /// </summary>
-    [SugarColumn(IsJson = true)]
+    [SugarColumn(ColumnName = "VerificatInfos", ColumnDescription = "会话信息列表", ColumnDataType = StaticConfig.CodeFirst_BigString, IsJson = true, IsNullable = true)]
    public List<VerificatInfo> VerificatInfos { get; set; }
 }

--- a/framework/ThingsGateway.Admin.Core/Extension/JsonExtensions.cs
+++ b/framework/ThingsGateway.Admin.Core/Extension/JsonExtensions.cs
@@ -12,7 +12,7 @@

 using Furion.DependencyInjection;

-namespace ThingsGateway.Admin.Core;
+namespace ThingsGateway.Admin.Core.JsonExtensions;

 /// <summary>
 /// 对象拓展
--- a/framework/ThingsGateway.Admin.Core/Extension/ListExtensions.cs
+++ b/framework/ThingsGateway.Admin.Core/Extension/ListExtensions.cs
@@ -18,6 +18,8 @@ using System.Collections;
 using System.Data;
 using System.Reflection;

+using ThingsGateway.Admin.Core.JsonExtensions;
+
 namespace ThingsGateway.Admin.Core;

 /// <summary>
--- a/framework/ThingsGateway.Admin.Core/Extension/ObjectExtensions.cs
+++ b/framework/ThingsGateway.Admin.Core/Extension/ObjectExtensions.cs
@@ -330,22 +330,53 @@ public static class ObjectExtensions
    /// 转换布尔值
    /// </summary>
    /// <returns></returns>
-    public static bool ToBool(this object value, bool defaultValue = false) => value?.ToString().ToUpper() switch
+    public static bool ToBoolean(this object value, bool defaultValue = false) => value?.ToString().ToUpper() switch
    {
+        "0" or "FALSE" => false,
        "1" or "TRUE" => true,
        _ => defaultValue,
    };
+
    /// <summary>
    /// ToLong
    /// </summary>
    /// <returns></returns>
-    public static long ToLong(this object value, long defaultValue = 0) => value == null || value.ToString().IsNullOrEmpty() ? defaultValue : Int64.TryParse(value.ToString(), out var n) ? n : defaultValue;
+    public static long ToLong(this object value, long defaultValue = 0)
+    {
+        if (value == null || value.ToString().IsNullOrEmpty())
+        {
+            return defaultValue;
+        }
+        else
+        {
+            if (value is bool boolValue)
+            {
+                return boolValue ? 1 : 0;
+            }
+            return Int64.TryParse(value.ToString(), out var n) ? n : defaultValue;
+        }
+    }

    /// <summary>
    /// ToInt
    /// </summary>
    /// <returns></returns>
-    public static int ToInt(this object value, int defaultValue = 0) => value == null || value.ToString().IsNullOrEmpty() ? defaultValue : Int32.TryParse(value.ToString(), out var n) ? n : defaultValue;
+    public static int ToInt(this object value, int defaultValue = 0)
+    {
+        if (value == null || value.ToString().IsNullOrEmpty())
+        {
+            return defaultValue;
+        }
+        else
+        {
+            if (value is bool boolValue)
+            {
+                return boolValue ? 1 : 0;
+            }
+            return int.TryParse(value.ToString(), out int n) ? n : defaultValue;
+        }
+    }
+
    /// <summary>
    /// ToDecimal
    /// </summary>
@@ -356,10 +387,44 @@ public static class ObjectExtensions
        {
            return Double.IsNaN(d) ? defaultValue : (Decimal)d;
        }
-        var str = value.ToString();
-        return str.IsNullOrEmpty() ? defaultValue : Decimal.TryParse(str, out var n) ? n : defaultValue;
+        var str = value?.ToString();
+        if (str.IsNullOrEmpty())
+        {
+            return defaultValue;
+        }
+        else
+        {
+            if (value is bool boolValue)
+            {
+                return boolValue ? 1 : 0;
+            }
+            return Decimal.TryParse(str, out var n) ? n : defaultValue;
+        }
+    }
+    /// <summary>
+    /// ToDecimal
+    /// </summary>
+    /// <returns></returns>
+    public static double ToDouble(this object value, double defaultValue = 0)
+    {
+        if (value is Double d)
+        {
+            return Double.IsNaN(d) ? defaultValue : (Double)d;
+        }
+        var str = value?.ToString();
+        if (str.IsNullOrEmpty())
+        {
+            return (double)defaultValue;
+        }
+        else
+        {
+            if (value is bool boolValue)
+            {
+                return boolValue ? 1 : 0;
+            }
+            return (double)(double.TryParse(str, out var n) ? n : defaultValue);
+        }
    }
-

    /// <summary>
    /// JsonElement 转 Object
--- a/framework/ThingsGateway.Admin.Core/Extension/StringExtensions.cs
+++ b/framework/ThingsGateway.Admin.Core/Extension/StringExtensions.cs
@@ -97,7 +97,7 @@ public static class StringExtensions
    /// 转换布尔值
    /// </summary>
    /// <returns></returns>
-    public static bool ToBool(this string value, bool defaultValue = false) => value?.ToUpper() switch
+    public static bool ToBoolean(this string value, bool defaultValue = false) => value?.ToUpper() switch
    {
        "1" or "TRUE" => true,
        _ => defaultValue,
--- a/framework/ThingsGateway.Admin.Core/SqlSugar/Extension/SqlSugarPageExtension.cs
+++ b/framework/ThingsGateway.Admin.Core/SqlSugar/Extension/SqlSugarPageExtension.cs
@@ -12,6 +12,8 @@

 using SqlSugar;

+using System.Linq.Expressions;
+
 namespace ThingsGateway.Admin.Core;

 /// <summary>
@@ -55,12 +57,14 @@ public static class SqlSugarPageExtension
    /// <param name="whereExpression"></param>
    /// <returns></returns>
    public static async Task<SqlSugarPagedList<TEntity>> ToPagedListAsync<TEntity>(this ISugarQueryable<TEntity> queryable,
-        int pageIndex, int pageSize, Func<TEntity, bool> whereExpression = null)
+        int pageIndex, int pageSize, Expression<Func<TEntity, bool>> whereExpression = null)
    {

        RefAsync<int> totalCount = 0;
+        if (whereExpression != null)
+            queryable = queryable.Where(whereExpression);
        var records = await queryable.ToPageListAsync(pageIndex, pageSize, totalCount);
-        records = whereExpression != null ? records.Where(whereExpression).ToList() : records;
+        //records = whereExpression != null ? records.Where(whereExpression).ToList() : records;
        var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
        return new SqlSugarPagedList<TEntity>
        {
--- a/framework/ThingsGateway.Admin.Core/ThingsGateway.Admin.Core.csproj
+++ b/framework/ThingsGateway.Admin.Core/ThingsGateway.Admin.Core.csproj
@@ -9,13 +9,13 @@
 	</ItemGroup>

 	<ItemGroup>
-		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.40" />
-		<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.40" />
-		<PackageReference Include="Furion.Pure" Version="4.8.8.40" />
-		<PackageReference Include="SqlSugarCore" Version="5.1.4.94" />
+		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.42" />
+		<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.42" />
+		<PackageReference Include="Furion.Pure" Version="4.8.8.42" />
+		<PackageReference Include="SqlSugarCore" Version="5.1.4.104" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
-		<PackageReference Include="MiniExcel" Version="1.31.0" />
+		<PackageReference Include="MiniExcel" Version="1.31.2" />
 	</ItemGroup>
 	
 </Project>
--- a/framework/ThingsGateway.Admin.Core/ThingsGateway.Admin.Core.xml
+++ b/framework/ThingsGateway.Admin.Core/ThingsGateway.Admin.Core.xml
@@ -850,19 +850,19 @@
            <param name="this"></param>
            <param name="values"></param>
        </member>
-        <member name="T:ThingsGateway.Admin.Core.JsonExtensions">
+        <member name="T:ThingsGateway.Admin.Core.JsonExtensions.JsonExtensions">
            <summary>
            对象拓展
            </summary>
        </member>
-        <member name="M:ThingsGateway.Admin.Core.JsonExtensions.ToJsonString(System.Object)">
+        <member name="M:ThingsGateway.Admin.Core.JsonExtensions.JsonExtensions.ToJsonString(System.Object)">
            <summary>
            转换为Json
            </summary>
            <param name="item"></param>
            <returns></returns>
        </member>
-        <member name="M:ThingsGateway.Admin.Core.JsonExtensions.ToJsonWithT``1(System.String)">
+        <member name="M:ThingsGateway.Admin.Core.JsonExtensions.JsonExtensions.ToJsonWithT``1(System.String)">
            <summary>
            从字符串到json
            </summary>
@@ -1026,7 +1026,7 @@
            <param name="str"></param>
            <returns></returns>
        </member>
-        <member name="M:ThingsGateway.Admin.Core.ObjectExtensions.ToBool(System.Object,System.Boolean)">
+        <member name="M:ThingsGateway.Admin.Core.ObjectExtensions.ToBoolean(System.Object,System.Boolean)">
            <summary>
            转换布尔值
            </summary>
@@ -1050,6 +1050,12 @@
            </summary>
            <returns></returns>
        </member>
+        <member name="M:ThingsGateway.Admin.Core.ObjectExtensions.ToDouble(System.Object,System.Double)">
+            <summary>
+            ToDecimal
+            </summary>
+            <returns></returns>
+        </member>
        <member name="M:ThingsGateway.Admin.Core.ObjectExtensions.ToObject(System.Text.Json.JsonElement)">
            <summary>
            JsonElement 转 Object
@@ -1142,7 +1148,7 @@
            <param name="input"></param>
            <returns></returns>
        </member>
-        <member name="M:ThingsGateway.Admin.Core.StringExtensions.ToBool(System.String,System.Boolean)">
+        <member name="M:ThingsGateway.Admin.Core.StringExtensions.ToBoolean(System.String,System.Boolean)">
            <summary>
            转换布尔值
            </summary>
@@ -1489,7 +1495,7 @@
            <param name="size"></param>
            <returns></returns>
        </member>
-        <member name="M:ThingsGateway.Admin.Core.SqlSugarPageExtension.ToPagedListAsync``1(SqlSugar.ISugarQueryable{``0},System.Int32,System.Int32,System.Func{``0,System.Boolean})">
+        <member name="M:ThingsGateway.Admin.Core.SqlSugarPageExtension.ToPagedListAsync``1(SqlSugar.ISugarQueryable{``0},System.Int32,System.Int32,System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
            <summary>
            SqlSugar分页扩展
            </summary>
--- a/framework/ThingsGateway.ApiController/Controllers/FileController.cs
+++ b/framework/ThingsGateway.ApiController/Controllers/FileController.cs
@@ -21,7 +21,7 @@ using ThingsGateway.Application;
 namespace ThingsGateway.ApiController;

 /// <summary>
-/// 后台登录控制器
+/// 文件下载
 /// </summary>
 [ApiDescriptionSettings(CateGoryConst.ThingsGatewayAdmin, Order = 200)]
 [Route("gatewayFile")]
--- a/framework/ThingsGateway.ApiController/Controllers/RpcControler.cs
+++ b/framework/ThingsGateway.ApiController/Controllers/RpcControler.cs
@@ -89,13 +89,8 @@ public class RpcControler : IDynamicApiController
    [Description("写入变量")]
    public async Task<Dictionary<string, OperResult>> WriteDeviceMethods(Dictionary<string, string> objs)
    {
-        Dictionary<string, OperResult> operResultDict = new();
-        foreach (KeyValuePair<string, string> obj in objs)
-        {
-            var result = await RpcCore.InvokeDeviceMethodAsync($"WebApi-{UserManager.UserAccount}-{App.HttpContext.Connection.RemoteIpAddress.MapToIPv4()}", obj);
-            operResultDict.Add(obj.Key, result);
-        }
-        return operResultDict;
+        var result = await RpcCore.InvokeDeviceMethodAsync($"WebApi-{UserManager.UserAccount}-{App.HttpContext.Connection.RemoteIpAddress.MapToIPv4()}", objs);
+        return result;
    }
 }

--- a/framework/ThingsGateway.ApiController/ThingsGateway.ApiController.xml
+++ b/framework/ThingsGateway.ApiController/ThingsGateway.ApiController.xml
@@ -26,7 +26,7 @@
        </member>
        <member name="T:ThingsGateway.ApiController.FileController">
            <summary>
-            后台登录控制器
+            文件下载
            </summary>
        </member>
        <member name="M:ThingsGateway.ApiController.FileController.#ctor(ThingsGateway.Application.IRpcLogService,ThingsGateway.Application.IBackendLogService,ThingsGateway.Application.ICollectDeviceService,ThingsGateway.Application.IUploadDeviceService,ThingsGateway.Application.IVariableService)">
--- a/framework/ThingsGateway.Application/Converter/StringToEncodingConverter.cs
+++ b/framework/ThingsGateway.Application/Converter/StringToEncodingConverter.cs
@@ -80,7 +80,7 @@ public class StringToEncodingConverter : IConverter<string>
    {
        try
        {
-            source = target.ToJson();
+            source = target.ToJsonString();
            return true;
        }
        catch (Exception)
--- a/framework/ThingsGateway.Application/Entity/DeviceVariable.cs
+++ b/framework/ThingsGateway.Application/Entity/DeviceVariable.cs
@@ -31,7 +31,7 @@ public class DeviceVariable : MemoryVariable
    public virtual long DeviceId { get; set; }

    /// <summary>
-    /// 写入表达式
+    /// 单位
    /// </summary>
    [SugarColumn(ColumnName = "Unit", ColumnDescription = "单位", Length = 200, IsNullable = true)]
    [DataTable(Order = 3, IsShow = true, Sortable = true)]
@@ -59,12 +59,7 @@ public class DeviceVariable : MemoryVariable
    [DataTable(Order = 3, IsShow = true, Sortable = true)]
    public string VariableAddress { get; set; }

-    /// <summary>
-    /// 写入表达式
-    /// </summary>
-    [SugarColumn(ColumnName = "WriteExpressions", ColumnDescription = "写入表达式", Length = 200, IsNullable = true)]
-    [DataTable(Order = 7, IsShow = true, Sortable = true)]
-    public string WriteExpressions { get; set; }
+

    /// <summary>
    /// 是否中间变量
--- a/framework/ThingsGateway.Application/Entity/MemoryVariable.cs
+++ b/framework/ThingsGateway.Application/Entity/MemoryVariable.cs
@@ -51,7 +51,12 @@ public class MemoryVariable : BaseEntity
    [SugarColumn(ColumnName = "ReadExpressions", ColumnDescription = "读取表达式", Length = 200, IsNullable = true)]
    [DataTable(Order = 7, IsShow = true, Sortable = true, CellClass = " table-text-truncate ")]
    public string ReadExpressions { get; set; }
-
+    /// <summary>
+    /// 写入表达式
+    /// </summary>
+    [SugarColumn(ColumnName = "WriteExpressions", ColumnDescription = "写入表达式", Length = 200, IsNullable = true)]
+    [DataTable(Order = 7, IsShow = true, Sortable = true)]
+    public string WriteExpressions { get; set; }
    /// <summary>
    /// 是否中间变量
    /// </summary>
@@ -67,7 +72,7 @@ public class MemoryVariable : BaseEntity
    /// <summary>
    /// 变量额外属性Json，通常使用为上传设备,List属性
    /// </summary>
-    [SugarColumn(IsJson = true, ColumnName = "VariablePropertys", ColumnDescription = "变量属性Json", IsNullable = true)]
+    [SugarColumn(IsJson = true, ColumnName = "VariablePropertys", ColumnDataType = StaticConfig.CodeFirst_BigString, ColumnDescription = "变量属性Json", IsNullable = true)]
    [IgnoreExcel]
    public ConcurrentDictionary<long, List<DependencyProperty>> VariablePropertys { get; set; } = new();
    /// <summary>
--- a/framework/ThingsGateway.Application/Entity/UploadDevice.cs
+++ b/framework/ThingsGateway.Application/Entity/UploadDevice.cs
@@ -65,7 +65,7 @@ public class UploadDevice : BaseEntity
    /// <summary>
    /// 设备属性Json
    /// </summary>
-    [SugarColumn(IsJson = true, ColumnName = "DevicePropertys", ColumnDescription = "设备属性Json", IsNullable = true)]
+    [SugarColumn(IsJson = true, ColumnName = "DevicePropertys", ColumnDataType = StaticConfig.CodeFirst_BigString, ColumnDescription = "设备属性Json", IsNullable = true)]
    [IgnoreExcel]
    public List<DependencyProperty> DevicePropertys { get; set; }

--- a/framework/ThingsGateway.Application/Extensions/CSharpScriptEngineExtension.cs
+++ b/framework/ThingsGateway.Application/Extensions/CSharpScriptEngineExtension.cs
@@ -21,7 +21,7 @@ using Newtonsoft.Json.Converters;
 using System.Dynamic;
 using System.Text;

-using TouchSocket.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;

 namespace ThingsGateway.Application;
 /// <summary>
@@ -76,7 +76,7 @@ public class CSharpScriptEngine : ISingleton
        var expConverter = new ExpandoObjectConverter();
        dynamic obj = JsonConvert.DeserializeObject<List<ExpandoObject>>(input, expConverter);
        object result = runscript(obj);
-        var json = result.ToJson();
+        var json = result.ToJsonString();
        return json;
    }

@@ -116,7 +116,7 @@ public class CSharpScriptEngine : ISingleton
        var expConverter = new ExpandoObjectConverter();
        dynamic obj = JsonConvert.DeserializeObject<ExpandoObject>(input, expConverter);
        object result = runscript(obj);
-        var json = result.ToJson();
+        var json = result.ToJsonString();
        return json;
    }

@@ -136,7 +136,7 @@ public static class CSharpScriptEngineExtension
    /// </summary>
    public static string GetSciptListValue<T>(this T datas, string script) where T : class
    {
-        var inPut = datas.ToJson();
+        var inPut = datas.ToJsonString();
        if (!string.IsNullOrEmpty(script))
        {
            //执行脚本，获取新实体
@@ -154,7 +154,7 @@ public static class CSharpScriptEngineExtension
    /// </summary>
    public static string GetSciptValue<T>(this T datas, string script) where T : class
    {
-        var inPut = datas.ToJson();
+        var inPut = datas.ToJsonString();
        if (!string.IsNullOrEmpty(script))
        {
            //执行脚本，获取新实体
--- a/framework/ThingsGateway.Application/HardwareInfo/HardwareInfoService.cs
+++ b/framework/ThingsGateway.Application/HardwareInfo/HardwareInfoService.cs
@@ -113,8 +113,9 @@ public class HardwareInfoService : ISingleton
        try
        {
            var url = "http://myip.ipip.net";
-            var stream = await new HttpClient().GetStreamAsync(url);
-            var streamReader = new StreamReader(stream, Encoding.UTF8);
+            using var httpClient = new HttpClient();
+            using var stream = await httpClient.GetStreamAsync(url);
+            using var streamReader = new StreamReader(stream, Encoding.UTF8);
            var html = streamReader.ReadToEnd();
            return html.Replace("当前 IP：", "").Replace("来自于：", "");
        }
--- a/framework/ThingsGateway.Application/ManageGateway/ManageGatewayConfig.cs
+++ b/framework/ThingsGateway.Application/ManageGateway/ManageGatewayConfig.cs
@@ -0,0 +1,144 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+
+using ThingsGateway.Foundation;
+
+namespace ThingsGateway.Application;
+
+/// <summary>
+/// ManageGatewayConfig
+/// </summary>
+public class ManageGatewayConfig
+{
+    /// <summary>
+    /// 启用
+    /// </summary>
+    public bool Enable { get; set; }
+    /// <summary>
+    /// MqttBrokerIP
+    /// </summary>
+    public string MqttBrokerIP { get; set; }
+
+    /// <summary>
+    /// MqttBrokerPort
+    /// </summary>
+    public int MqttBrokerPort { get; set; }
+
+    /// <summary>
+    /// UserName
+    /// </summary>
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// Password
+    /// </summary>
+    public string Password { get; set; }
+
+
+    /// <summary>
+    /// DBDownTopic，Rpc返回为{DBDownTopic}/Return
+    /// </summary>
+    public string DBDownTopic { get; set; }
+
+    /// <summary>
+    /// DBUploadTopic，Rpc返回为{DBUploadTopic}/Return
+    /// </summary>
+    public string DBUploadTopic { get; set; }
+
+    /// <summary>
+    /// WriteRpcTopic，Rpc返回为{WriteRpcTopic}/Return
+    /// </summary>
+    public string WriteRpcTopic { get; set; }
+}
+
+
+/// <summary>
+/// 用于Mqtt Json传输，上传/下载配置信息
+/// </summary>
+public class MqttDB
+{
+    /// <summary>
+    /// 标识
+    /// </summary>
+    public string GatewayId { get; set; }
+    /// <summary>
+    /// 采集设备
+    /// </summary>
+    public List<CollectDevice> CollectDevices { get; set; }
+    /// <summary>
+    /// true=>删除全部后增加
+    /// </summary>
+    public bool IsCollectDevicesFullUp { get; set; }
+    /// <summary>
+    /// 上传设备
+    /// </summary>
+    public List<UploadDevice> UploadDevices { get; set; }
+    /// <summary>
+    /// true=>删除全部后增加
+    /// </summary>
+    public bool IsUploadDevicesFullUp { get; set; }
+    /// <summary>
+    /// 变量
+    /// </summary>
+    public List<DeviceVariable> DeviceVariables { get; set; }
+    /// <summary>
+    /// true=>删除全部后增加
+    /// </summary>
+    public bool IsDeviceVariablesFullUp { get; set; }
+    /// <summary>
+    /// 配置项
+    /// </summary>
+    public List<SysConfig> SysConfigs { get; set; }
+}
+
+
+/// <summary>
+/// MqttRpc传入
+/// </summary>
+public class ManageMqttRpcFrom
+{
+    /// <summary>
+    /// 标识
+    /// </summary>
+    public string GatewayId { get; set; }
+    /// <summary>
+    /// 标识
+    /// </summary>
+    public string RpcId { get; set; }
+    /// <summary>
+    /// "WriteInfos":{"test":"1"}
+    /// </summary>
+    public Dictionary<string, string> WriteInfos { get; set; } = new();
+}
+/// <summary>
+/// MqttRpc输出
+/// </summary>
+public class ManageMqttRpcResult
+{
+    /// <summary>
+    /// 标识
+    /// </summary>
+    public string GatewayId { get; set; }
+    /// <summary>
+    /// 标识
+    /// </summary>
+    public string RpcId { get; set; }
+    /// <summary>
+    /// 消息
+    /// </summary>
+    public Dictionary<string, OperResult> Message { get; set; } = new();
+    /// <summary>
+    /// 是否成功
+    /// </summary>
+    public bool Success { get; set; }
+}
--- a/framework/ThingsGateway.Application/ManageGateway/ManageGatewayWorker.cs
+++ b/framework/ThingsGateway.Application/ManageGateway/ManageGatewayWorker.cs
@@ -0,0 +1,289 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+using Furion;
+using Furion.Logging.Extensions;
+
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+using MQTTnet;
+using MQTTnet.Client;
+using MQTTnet.Server;
+
+using System.Net;
+
+using ThingsGateway.Foundation;
+
+using TouchSocket.Core;
+
+namespace ThingsGateway.Application;
+
+/// <summary>
+/// 设备采集报警后台服务
+/// </summary>
+public class ManageGatewayWorker : BackgroundService
+{
+    private readonly ILogger _logger;
+    private readonly ILogger _manageLogger;
+    private readonly ILogger _clientLogger;
+    /// <inheritdoc cref="ManageGatewayWorker"/>
+    public ManageGatewayWorker(ILoggerFactory loggerFactory)
+    {
+        _logger = loggerFactory.CreateLogger("ManageGatewayWorker");
+        _manageLogger = loggerFactory.CreateLogger("管理网关(mqttBroker)");
+        _clientLogger = loggerFactory.CreateLogger("子网关(mqttClient)");
+    }
+    /// <summary>
+    /// 服务状态
+    /// </summary>
+    public OperResult RealAlarmStatuString { get; set; } = new OperResult("初始化");
+    /// <summary>
+    /// 服务状态
+    /// </summary>
+    public OperResult HisAlarmStatuString { get; set; } = new OperResult("初始化");
+    /// <summary>
+    /// 服务状态
+    /// </summary>
+    public OperResult ReadAlarmStatuString { get; set; } = new OperResult("初始化");
+    private MqttServer _mqttServer;
+    private IMqttClient _mqttClient;
+
+
+    #region worker服务
+    /// <inheritdoc/>
+    public override async Task StartAsync(CancellationToken token)
+    {
+        _logger?.LogInformation("ManageGatewayWorker启动");
+        await RestartAsync();
+        await base.StartAsync(token);
+    }
+
+    /// <inheritdoc/>
+    public override Task StopAsync(CancellationToken token)
+    {
+        _logger?.LogInformation("ManageGatewayWorker停止");
+        return base.StopAsync(token);
+    }
+
+    /// <inheritdoc/>
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        await Task.Delay(5000, stoppingToken);
+
+        while (!stoppingToken.IsCancellationRequested)
+        {
+            try
+            {
+                await Task.Delay(60000, stoppingToken);
+            }
+            catch (TaskCanceledException)
+            {
+
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+    }
+
+
+    #endregion
+
+    #region 核心实现
+
+    /// <summary>
+    /// 全部重启锁
+    /// </summary>
+    private readonly EasyLock restartLock = new();
+
+    /// <summary>
+    /// 重启
+    /// </summary>
+    /// <returns></returns>
+    public async Task RestartAsync()
+    {
+        await StopAsync();
+        await StartAsync();
+    }
+
+    internal async Task StartAsync()
+    {
+        try
+        {
+            //重启操作在未完全之前直接取消
+            if (restartLock.IsWaitting)
+            {
+                return;
+            }
+            await restartLock.WaitAsync();
+
+            await InitAsync();
+
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "启动错误");
+        }
+        finally
+        {
+            restartLock.Release();
+        }
+    }
+    internal async Task StopAsync()
+    {
+        try
+        {
+            //重启操作在未完全之前直接取消
+            if (restartLock.IsWaitting)
+            {
+                return;
+            }
+            await restartLock.WaitAsync();
+            _mqttClient?.SafeDispose();
+            _mqttServer?.SafeDispose();
+            _mqttClient = null;
+            _mqttServer = null;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "停止错误");
+        }
+        finally
+        {
+            restartLock.Release();
+        }
+    }
+
+    /// <summary>
+    /// 初始化
+    /// </summary>
+    private async Task InitAsync()
+    {
+        try
+        {
+            var manageGatewayConfig = App.GetConfig<ManageGatewayConfig>("ManageGatewayConfig");
+            if (manageGatewayConfig?.Enable != true)
+            {
+                HisAlarmStatuString = new OperResult($"已退出：不启用管理功能");
+                return;
+            }
+            else
+            {
+                var mqttFactory = new MqttFactory(new MqttNetLogger(_manageLogger));
+                var mqttServerOptions = mqttFactory.CreateServerOptionsBuilder()
+                    .WithDefaultEndpointBoundIPAddress(string.IsNullOrEmpty(manageGatewayConfig.MqttBrokerIP) ? null : IPAddress.Parse(manageGatewayConfig.MqttBrokerIP))
+                    .WithDefaultEndpointPort(manageGatewayConfig.MqttBrokerPort)
+                    .WithDefaultEndpoint()
+                    .Build();
+                _mqttServer = mqttFactory.CreateMqttServer(mqttServerOptions);
+                if (_mqttServer != null)
+                {
+                    _mqttServer.ValidatingConnectionAsync += MqttServer_ValidatingConnectionAsync;
+                    _mqttServer.InterceptingPublishAsync += MqttServer_InterceptingPublishAsync;
+                    _mqttServer.LoadingRetainedMessageAsync += MqttServer_LoadingRetainedMessageAsync;
+                    _mqttServer.InterceptingSubscriptionAsync += MqttServer_InterceptingSubscriptionAsync; ;
+                    await _mqttServer.StartAsync();
+                }
+
+            }
+        }
+        catch (Exception ex)
+        {
+            _manageLogger.LogError(ex, "初始化失败");
+        }
+
+        try
+        {
+            var clientGatewayConfig = App.GetConfig<ManageGatewayConfig>("ClientGatewayConfig");
+            if (clientGatewayConfig?.Enable != true)
+            {
+                RealAlarmStatuString = new OperResult($"已退出：不启用子网关功能");
+                return;
+            }
+            else
+            {
+                var mqttFactory = new MqttFactory(new MqttNetLogger(_clientLogger));
+                var _mqttClientOptions = mqttFactory.CreateClientOptionsBuilder()
+                   .WithCredentials(clientGatewayConfig.UserName, clientGatewayConfig.Password)//账密
+                   .WithTcpServer(clientGatewayConfig.MqttBrokerIP, clientGatewayConfig.MqttBrokerPort)//服务器
+                   .WithCleanSession(true)
+                   .WithKeepAlivePeriod(TimeSpan.FromSeconds(120.0))
+                   .WithoutThrowOnNonSuccessfulConnectResponse()
+                   .Build();
+                var _mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder()
+                     .WithTopicFilter(
+                         f =>
+                         {
+                             f.WithTopic(clientGatewayConfig.WriteRpcTopic);
+                             f.WithAtMostOnceQoS();
+                         })
+                       .WithTopicFilter(
+                         f =>
+                         {
+                             f.WithTopic(clientGatewayConfig.DBDownTopic);
+                             f.WithAtMostOnceQoS();
+                         })
+                                         .WithTopicFilter(
+                         f =>
+                         {
+                             f.WithTopic(clientGatewayConfig.DBUploadTopic);
+                             f.WithAtMostOnceQoS();
+                         })
+                     .Build();
+                _mqttClient = mqttFactory.CreateMqttClient();
+                _mqttClient.ConnectedAsync += MqttClient_ConnectedAsync;
+                _mqttClient.ApplicationMessageReceivedAsync += MqttClient_ApplicationMessageReceivedAsync;
+
+            }
+        }
+        catch (Exception ex)
+        {
+            _clientLogger.LogError(ex, "初始化失败");
+        }
+
+
+    }
+
+    private Task MqttClient_ApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs args)
+    {
+        throw new NotImplementedException();
+    }
+
+    private Task MqttClient_ConnectedAsync(MqttClientConnectedEventArgs args)
+    {
+        throw new NotImplementedException();
+    }
+
+    private Task MqttServer_InterceptingSubscriptionAsync(InterceptingSubscriptionEventArgs args)
+    {
+        throw new NotImplementedException();
+    }
+
+    private Task MqttServer_LoadingRetainedMessageAsync(LoadingRetainedMessagesEventArgs args)
+    {
+        throw new NotImplementedException();
+    }
+
+    private Task MqttServer_InterceptingPublishAsync(InterceptingPublishEventArgs args)
+    {
+        throw new NotImplementedException();
+    }
+
+    private Task MqttServer_ValidatingConnectionAsync(ValidatingConnectionEventArgs args)
+    {
+        throw new NotImplementedException();
+    }
+    #endregion
+}
+
+
--- a/framework/ThingsGateway.Application/ManageGateway/MqttNetLogger.cs
+++ b/framework/ThingsGateway.Application/ManageGateway/MqttNetLogger.cs
@@ -0,0 +1,50 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+using Microsoft.Extensions.Logging;
+
+using MQTTnet.Diagnostics;
+
+
+namespace ThingsGateway.Application;
+
+internal class MqttNetLogger : IMqttNetLogger
+{
+    readonly ILogger LogMessage;
+    public MqttNetLogger(ILogger logger)
+    {
+        LogMessage = logger;
+    }
+
+    public bool IsEnabled => true;
+    public void Publish(MqttNetLogLevel logLevel, string source, string message, object[] parameters, Exception exception)
+    {
+        switch (logLevel)
+        {
+            case MqttNetLogLevel.Verbose:
+                LogMessage?.Log(LogLevel.Trace, source, message != null ? (parameters != null ? message != null ? (parameters != null ? string.Format(message, parameters) : message) : string.Empty : message) : string.Empty, exception);
+                break;
+
+            case MqttNetLogLevel.Info:
+                LogMessage?.Log(LogLevel.Information, source, message != null ? (parameters != null ? string.Format(message, parameters) : message) : string.Empty, exception);
+                break;
+
+            case MqttNetLogLevel.Warning:
+                LogMessage?.Log(LogLevel.Warning, source, message != null ? (parameters != null ? string.Format(message, parameters) : message) : string.Empty, exception);
+                break;
+
+            case MqttNetLogLevel.Error:
+                LogMessage?.Log(LogLevel.Warning, source, message != null ? (parameters != null ? string.Format(message, parameters) : message) : string.Empty, exception);
+                break;
+        }
+    }
+}
--- a/framework/ThingsGateway.Application/Model/DeviceVariableRunTime.cs
+++ b/framework/ThingsGateway.Application/Model/DeviceVariableRunTime.cs
@@ -82,18 +82,15 @@ public class DeviceVariableRunTime : DeviceVariable
    /// </summary>
    /// <param name="value"></param>
    /// <param name="dateTime"></param>
-    public OperResult SetValue(object value, DateTime dateTime = default)
+    /// <param name="isOnline"></param>
+    public OperResult SetValue(object value, DateTime dateTime = default, bool isOnline = true)
    {
        try
        {
+            IsOnline = isOnline;

-            if (value != null)
+            if (!IsOnline)
            {
-                IsOnline = true;
-            }
-            else
-            {
-                IsOnline = false;
                RawValue = value;
                Set(value);
                return OperResult.CreateSuccessResult();
--- a/framework/ThingsGateway.Application/Model/VariableData.cs
+++ b/framework/ThingsGateway.Application/Model/VariableData.cs
@@ -20,6 +20,8 @@ public class VariableData
    public long Id { get; set; }
    /// <inheritdoc cref="MemoryVariable.Name"/>
    public string Name { get; set; }
+    /// <inheritdoc cref="DeviceVariable.Unit"/>
+    public string Unit { get; set; }
    /// <inheritdoc cref="MemoryVariable.Description"/>
    public string Description { get; set; }
    /// <inheritdoc cref="DeviceVariableRunTime.DeviceName"/>
@@ -36,7 +38,7 @@ public class VariableData
    public bool IsOnline { get; set; }
    /// <inheritdoc cref="MemoryVariable.ReadExpressions"/>
    public string ReadExpressions { get; set; }
-    /// <inheritdoc cref="DeviceVariable.WriteExpressions"/>
+    /// <inheritdoc cref="MemoryVariable.WriteExpressions"/>
    public string WriteExpressions { get; set; }
    /// <inheritdoc cref="DeviceVariable.IntervalTime"/>
    public int IntervalTime { get; set; }
--- a/framework/ThingsGateway.Application/Plugin/CollectBase.cs
+++ b/framework/ThingsGateway.Application/Plugin/CollectBase.cs
@@ -10,6 +10,8 @@
 //------------------------------------------------------------------------------
 #endregion

+using Furion;
+
 using Microsoft.Extensions.Logging;

 using Newtonsoft.Json.Linq;
@@ -17,8 +19,6 @@ using Newtonsoft.Json.Linq;
 using ThingsGateway.Foundation;
 using ThingsGateway.Foundation.Serial;

-using TouchSocket.Core;
-
 namespace ThingsGateway.Application;
 /// <summary>
 /// <para></para>
@@ -38,6 +38,10 @@ public abstract class CollectBase : DriverBase
    /// </summary>
    /// <returns></returns>
    public abstract bool IsSupportRequest { get; }
+    /// <summary>
+    /// 一般底层驱动，也有可能为null
+    /// </summary>
+    protected abstract IReadWriteDevice PLC { get; }

    /// <summary>
    /// 数据转换器
@@ -100,9 +104,9 @@ public abstract class CollectBase : DriverBase
                        StopBits = config.StopBits,
                    };
                    FoundataionConfig.SetValue(SerialConfigExtension.SerialProperty, data);
-                    var serialClient = new SerialClient();
-                    (serialClient).Setup(FoundataionConfig);
-                    return OperResult.CreateSuccessResult((object)serialClient);
+                    var serialSession = new SerialsSession();
+                    (serialSession).Setup(FoundataionConfig);
+                    return OperResult.CreateSuccessResult((object)serialSession);
                case ShareChannelEnum.TcpClientEx:
                    FoundataionConfig.SetRemoteIPHost(new IPHost($"{config.IP}:{config.Port}"));
                    var tcpClient = new TcpClientEx();
@@ -155,7 +159,7 @@ public abstract class CollectBase : DriverBase
            {
                deviceVariableSourceRead.DeviceVariables.ForEach(it =>
                {
-                    var operResult = it.SetValue(null);
+                    var operResult = it.SetValue(null, isOnline: false);
                    if (!operResult.IsSuccess)
                    {
                        _logger.LogWarning("变量值更新失败：" + operResult.Message);
@@ -179,10 +183,22 @@ public abstract class CollectBase : DriverBase
    }

    /// <summary>
-    /// 写入变量值
+    /// 批量写入变量值,需返回变量名称/结果
    /// </summary>
    /// <returns></returns>
-    public abstract Task<OperResult> WriteValueAsync(DeviceVariableRunTime deviceVariable, JToken value, CancellationToken token);
+    public virtual async Task<Dictionary<string, OperResult>> WriteValuesAsync(Dictionary<DeviceVariableRunTime, JToken> writeInfoLists, CancellationToken token)
+    {
+        if (PLC == null)
+            throw new("未初始化成功");
+        Dictionary<string, OperResult> operResults = new();
+        foreach (var writeInfo in writeInfoLists)
+        {
+            var result = await PLC.WriteAsync(writeInfo.Key.VariableAddress, writeInfo.Key.DataType, writeInfo.Value.ToString(), token);
+            await Task.Delay(10, token); //防止密集写入
+            operResults.Add(writeInfo.Key.Name, result);
+        }
+        return operResults;
+    }

    /// <summary>
    /// 初始化
@@ -206,6 +222,31 @@ public abstract class CollectBase : DriverBase
        }
    }

+    internal override void NewMessage(TouchSocket.Core.LogLevel arg1, object arg2, string arg3, Exception arg4)
+    {
+        if (IsSaveLog)
+        {
+            if (arg3.StartsWith(FoundationConst.LogMessageHeader))
+            {
+                var customLevel = App.GetConfig<Microsoft.Extensions.Logging.LogLevel?>("Logging:LogLevel:BackendLog") ?? Microsoft.Extensions.Logging.LogLevel.Trace;
+                if ((byte)arg1 < (byte)customLevel)
+                {
+                    var logRuntime = new BackendLog
+                    {
+                        LogLevel = (Microsoft.Extensions.Logging.LogLevel)arg1,
+                        LogMessage = arg3,
+                        LogSource = "采集设备:" + CurDevice.Name,
+                        LogTime = SysDateTimeExtensions.CurrentDateTime,
+                        Exception = null,
+                    };
+                    _logQueues.Enqueue(logRuntime);
+                }
+            }
+
+        }
+        base.NewMessage(arg1, arg2, arg3, arg4);
+    }
+
    /// <summary>
    /// 返回全部内容字节数组
    /// <br></br>
--- a/framework/ThingsGateway.Application/Plugin/DriverBase.cs
+++ b/framework/ThingsGateway.Application/Plugin/DriverBase.cs
@@ -12,7 +12,10 @@

 using Microsoft.Extensions.Logging;

+using System.Collections.Concurrent;
+
 using ThingsGateway.Foundation;
+using ThingsGateway.Foundation.Extension.ConcurrentQueue;

 using TouchSocket.Core;

@@ -40,6 +43,7 @@ public abstract class DriverBase : DisposableObject
        LogMessage = new LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
        LogMessage.AddLogger(new EasyLogger(Log_Out) { LogLevel = TouchSocket.Core.LogLevel.Trace });
        FoundataionConfig.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));
+        Task.Factory.StartNew(LogInsertAsync);
    }
    /// <inheritdoc/>
    protected override void Dispose(bool disposing)
@@ -67,6 +71,12 @@ public abstract class DriverBase : DisposableObject
    /// </summary>
    public bool IsLogOut { get; set; }

+
+    /// <summary>
+    /// 是否存储报文
+    /// </summary>
+    public bool IsSaveLog { get; set; }
+
    /// <summary>
    /// 报文信息
    /// </summary>
@@ -82,11 +92,14 @@ public abstract class DriverBase : DisposableObject
    /// </summary>
    /// <returns></returns>
    public abstract bool IsConnected();
-
+    /// <summary>
+    /// 存储日志队列
+    /// </summary>
+    protected ConcurrentQueue<BackendLog> _logQueues = new();
    /// <summary>
    /// 设备报文
    /// </summary>
-    internal void NewMessage(TouchSocket.Core.LogLevel arg1, object arg2, string arg3, Exception arg4)
+    internal virtual void NewMessage(TouchSocket.Core.LogLevel arg1, object arg2, string arg3, Exception arg4)
    {
        if (IsLogOut)
        {
@@ -102,6 +115,27 @@ public abstract class DriverBase : DisposableObject
        }

    }
+    private async Task LogInsertAsync()
+    {
+        var db = DbContext.Db.CopyNew();
+        while (!DisposedValue)
+        {
+            if (_logQueues.Count > 0)
+            {
+                try
+                {
+                    var data = _logQueues.ToListWithDequeue();
+                    await db.InsertableWithAttr(data).ExecuteCommandAsync();//入库
+                }
+                catch
+                {
+                }
+
+            }
+
+            await Task.Delay(5000);
+        }
+    }

    /// <summary>
    /// 底层日志输出
--- a/framework/ThingsGateway.Application/Plugin/UpLoadBase.cs
+++ b/framework/ThingsGateway.Application/Plugin/UpLoadBase.cs
@@ -14,6 +14,8 @@ using Furion;

 using Microsoft.Extensions.Logging;

+using ThingsGateway.Foundation;
+
 using TouchSocket.Core;

 namespace ThingsGateway.Application;
@@ -153,6 +155,32 @@ public abstract class UpLoadBase : DriverBase
            _logger.Log_Out(arg1, arg2, arg3, arg4);
        }
    }
+
+    internal override void NewMessage(TouchSocket.Core.LogLevel arg1, object arg2, string arg3, Exception arg4)
+    {
+        if (IsSaveLog)
+        {
+            if (arg3.StartsWith(FoundationConst.LogMessageHeader))
+            {
+                var customLevel = App.GetConfig<Microsoft.Extensions.Logging.LogLevel?>("Logging:LogLevel:BackendLog") ?? Microsoft.Extensions.Logging.LogLevel.Trace;
+                if ((byte)arg1 < (byte)customLevel)
+                {
+                    var logRuntime = new BackendLog
+                    {
+                        LogLevel = (Microsoft.Extensions.Logging.LogLevel)arg1,
+                        LogMessage = arg3,
+                        LogSource = "上传设备:" + CurDevice.Name,
+                        LogTime = SysDateTimeExtensions.CurrentDateTime,
+                        Exception = null,
+                    };
+                    _logQueues.Enqueue(logRuntime);
+                }
+            }
+
+        }
+        base.NewMessage(arg1, arg2, arg3, arg4);
+    }
+
 }


--- a/framework/ThingsGateway.Application/Rpc/RpcSingletonService.cs
+++ b/framework/ThingsGateway.Application/Rpc/RpcSingletonService.cs
@@ -19,6 +19,7 @@ using Newtonsoft.Json.Linq;

 using System.Collections.Concurrent;

+using ThingsGateway.Admin.Core.JsonExtensions;
 using ThingsGateway.Foundation;
 using ThingsGateway.Foundation.Extension.ConcurrentQueue;

@@ -48,92 +49,172 @@ public class RpcSingletonService : ISingleton
    /// 反向RPC入口方法
    /// </summary>
    /// <param name="sourceDes">触发该方法的源说明</param>
-    /// <param name="item">指定键为变量名称，值为附带方法参数或写入值</param>
+    /// <param name="items">指定键为变量名称，值为附带方法参数或写入值</param>
    /// <param name="isBlazor">如果是true，不检查<see cref="MemoryVariable.RpcWriteEnable"/>字段</param>
    /// <param name="token"><see cref="CancellationToken"/> 取消源</param>
    /// <returns></returns>
-    public async Task<OperResult> InvokeDeviceMethodAsync(string sourceDes, KeyValuePair<string, string> item, bool isBlazor = false, CancellationToken token = default)
+    public async Task<Dictionary<string, OperResult>> InvokeDeviceMethodAsync(string sourceDes, Dictionary<string, string> items, bool isBlazor = false, CancellationToken token = default)
    {
-        //避免并发过高，这里延时10ms
-        await Task.Delay(10, token);
-        OperResult data = new();
-        var tag = _globalDeviceData.AllVariables.FirstOrDefault(it => it.Name == item.Key);
-        if (tag == null) return new OperResult("不存在变量:" + item.Key);
-        if (tag.ProtectTypeEnum == ProtectTypeEnum.ReadOnly) return new OperResult("只读变量");
-        if (!tag.RpcWriteEnable && !isBlazor) return new OperResult("不允许远程写入");
-
-        if (tag.IsMemoryVariable == true)
+        Dictionary<CollectDeviceCore, Dictionary<DeviceVariableRunTime, JToken>> WriteVariables = new();
+        Dictionary<CollectDeviceCore, Dictionary<DeviceVariableRunTime, string>> WriteMethods = new();
+        Dictionary<string, OperResult> results = new();
+        foreach (var item in items)
        {
-            return tag.SetValue(item.Value);
-        }
-        var dev = _collectDeviceHostService.CollectDeviceCores.FirstOrDefault(it => it.Device.Id == tag.DeviceId);
-        if (dev == null) return new OperResult("系统错误，不存在对应采集设备，请稍候重试");
-        if (dev.Device.DeviceStatus == DeviceStatusEnum.OffLine) return new OperResult("设备已离线");
-        if (dev.Device.DeviceStatus == DeviceStatusEnum.Pause) return new OperResult("设备已暂停");
-        if (string.IsNullOrEmpty(tag.OtherMethod))
-        {
-            //写入变量
-            JToken tagValue;
-            try
-            {
-                tagValue = JToken.Parse(item.Value);
-            }
-            catch (Exception)
-            {
-                tagValue = JToken.Parse("\"" + item.Value + "\"");
-            }

-            data = await dev.InVokeWriteAsync(tag, tagValue, token);
-            _logQueues.Enqueue(
-                new RpcLog()
+            OperResult data = new();
+            var tag = _globalDeviceData.AllVariables.FirstOrDefault(it => it.Name == item.Key);
+            if (tag == null)
+                results.Add(item.Key, new("不存在变量:" + item.Key));
+            if (tag.ProtectTypeEnum == ProtectTypeEnum.ReadOnly)
+                results.Add(item.Key, new("只读变量:" + item.Key));
+            if (!tag.RpcWriteEnable && !isBlazor)
+                results.Add(item.Key, new("不允许远程写入:" + item.Key));
+
+            if (tag.IsMemoryVariable == true)
+            {
+                results.Add(item.Key, tag.SetValue(item.Value));
+            }
+            var dev = _collectDeviceHostService.CollectDeviceCores.FirstOrDefault(it => it.Device.Id == tag.DeviceId);
+            if (dev == null)
+                results.Add(item.Key, new OperResult("系统错误，不存在对应采集设备，请稍候重试"));
+            if (dev.Device.DeviceStatus == DeviceStatusEnum.OffLine)
+                results.Add(item.Key, new OperResult("设备已离线"));
+            if (dev.Device.DeviceStatus == DeviceStatusEnum.Pause)
+                results.Add(item.Key, new OperResult("设备已暂停"));
+
+            if (!results.ContainsKey(item.Key))
+            {
+                if (string.IsNullOrEmpty(tag.OtherMethod))
                {
-                    LogTime = SysDateTimeExtensions.CurrentDateTime,
-                    OperateMessage = data.Exception,
-                    IsSuccess = data.IsSuccess,
-                    OperateMethod = WriteVariable,
-                    OperateObject = tag.Name,
-                    OperateSource = sourceDes,
-                    ParamJson = item.Value,
-                    ResultJson = data.Message
+                    //写入变量
+                    JToken tagValue;
+                    try
+                    {
+                        tagValue = JToken.Parse(item.Value);
+                    }
+                    catch (Exception)
+                    {
+                        tagValue = JToken.Parse("\"" + item.Value + "\"");
+                    }
+                    if (WriteVariables.ContainsKey(dev))
+                    {
+
+                        WriteVariables[dev].Add(tag, tagValue);
+
+                    }
+                    else
+                    {
+                        WriteVariables.Add(dev, new());
+                        WriteVariables[dev].Add(tag, tagValue);
+                    }
+                }
+                else
+                {
+                    if (WriteMethods.ContainsKey(dev))
+                    {
+
+                        WriteMethods[dev].Add(tag, item.Value);
+
+                    }
+                    else
+                    {
+                        WriteVariables.Add(dev, new());
+                        WriteVariables[dev].Add(tag, item.Value);
+                    }
                }
-                );
-            if (!data.IsSuccess)
-            {
-                _logger.LogWarning($"写入变量[{tag.Name}]失败：{data.Message}");
            }
        }
-        else
+
+        foreach (var item in WriteVariables)
        {
-            //执行变量附带的方法
-            var method = dev.DeviceVariableMethodSources.FirstOrDefault(it => it.DeviceVariable == tag);
            try
            {
-                data = await dev.InvokeMethodAsync(method, false, item.Value, token);
+                var result = await item.Key.InVokeWriteAsync(item.Value, token);
+                foreach (var resultItem in result)
+                {
+                    string operObj;
+                    string parJson;
+                    if (resultItem.Key.IsNullOrEmpty())
+                    {
+                        operObj = items.Select(x => x.Key).ToJsonString();
+                        parJson = items.Select(x => x.Value).ToJsonString();
+                    }
+                    else
+                    {
+                        operObj = resultItem.Key;
+                        parJson = items[resultItem.Key];
+
+                    }
+                    _logQueues.Enqueue(
+          new RpcLog()
+          {
+              LogTime = SysDateTimeExtensions.CurrentDateTime,
+              OperateMessage = resultItem.Value.Exception,
+              IsSuccess = resultItem.Value.IsSuccess,
+              OperateMethod = WriteVariable,
+              OperateObject = operObj,
+              OperateSource = sourceDes,
+              ParamJson = parJson,
+              ResultJson = resultItem.Value.Message
+          }
+          );
+                    if (!resultItem.Value.IsSuccess)
+                    {
+                        _logger.LogWarning($"写入变量[{resultItem.Key}]失败：{resultItem.Value.Message}");
+                    }
+                }
+
+                results.AddRange(result);
            }
            catch (Exception ex)
            {
-                data = new OperResult<string>(ex);
-            }
-            _logQueues.Enqueue(
-new RpcLog()
-{
-    LogTime = SysDateTimeExtensions.CurrentDateTime,
-    OperateMessage = data.Exception,
-    IsSuccess = data.IsSuccess,
-    OperateMethod = tag.OtherMethod,
-    OperateObject = tag.Name,
-    OperateSource = sourceDes,
-    ParamJson = item.Value?.ToString(),
-    ResultJson = data.Message
-}
-);
-            if (!data.IsSuccess)
-            {
-                _logger.LogWarning($"执行变量[{tag.Name}]方法[{tag.OtherMethod}]失败：{data.Message}");
+                _logger.LogWarning($"写入变量异常：{ex.Message + Environment.NewLine + ex.StackTrace}");
            }
        }
-        return data;
+        foreach (var item in WriteMethods)
+        {
+            foreach (var writeMethod in item.Value)
+            {
+
+                //执行变量附带的方法
+                var method = item.Key.DeviceVariableMethodSources.FirstOrDefault(it => it.DeviceVariable == writeMethod.Key);
+                OperResult<string> result;
+                try
+                {
+                    result = await item.Key.InvokeMethodAsync(method, false, writeMethod.Value, token);
+                    results.Add(writeMethod.Key.Name, result);
+                }
+                catch (Exception ex)
+                {
+                    result = new OperResult<string>(ex);
+                    results.Add(writeMethod.Key.Name, result);
+                }
+                _logQueues.Enqueue(
+    new RpcLog()
+    {
+        LogTime = SysDateTimeExtensions.CurrentDateTime,
+        OperateMessage = result.Exception,
+        IsSuccess = result.IsSuccess,
+        OperateMethod = writeMethod.Key.OtherMethod,
+        OperateObject = writeMethod.Key.Name,
+        OperateSource = sourceDes,
+        ParamJson = writeMethod.Value?.ToString(),
+        ResultJson = result.Message
    }
+    );
+                if (!result.IsSuccess)
+                {
+                    _logger.LogWarning($"执行变量[{writeMethod.Key.Name}]方法[{writeMethod.Key.OtherMethod}]失败：{result.Message}");
+                }
+
+
+            }
+
+        }
+        return results;
+    }
+
+

    private async Task RpcLogInsertAsync()
    {
--- a/framework/ThingsGateway.Application/SeedData/DriverPluginSeedData.cs
+++ b/framework/ThingsGateway.Application/SeedData/DriverPluginSeedData.cs
@@ -22,6 +22,9 @@ public class DriverPluginSeedData : ISqlSugarEntitySeedData<DriverPlugin>
    /// <inheritdoc/>
    public IEnumerable<DriverPlugin> SeedData()
    {
-        return SeedDataUtil.GetSeedData<DriverPlugin>("driver_plugin.json");
+        return SeedDataUtil.GetSeedData<DriverPlugin>("driver_plugin.json")
+            .Concat(SeedDataUtil.GetSeedData<DriverPlugin>("pro_driver_plugin.json"))
+            .Concat(SeedDataUtil.GetSeedData<DriverPlugin>("custom_driver_plugin.json"))
+            ;
    }
 }
--- a/framework/ThingsGateway.Application/SeedData/Json/driver_plugin.json
+++ b/framework/ThingsGateway.Application/SeedData/Json/driver_plugin.json
@@ -319,6 +319,39 @@
      "UpdateUserId": null,
      "SortCode": 0,
      "ExtJson": null
+    },
+
+    {
+      "Id": 442505,
+      "FileName": "ThingsGateway.DLT645",
+      "AssembleName": "DLT645_2007",
+      "DriverTypeEnum": "Collect",
+      "FilePath": "Plugins/ThingsGateway.DLT645/ThingsGateway.DLT645.dll",
+      "CreateTime": "2023/8/6 18:22:33",
+      "CreateUser": "superAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": 0,
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 442506,
+      "FileName": "ThingsGateway.DLT645",
+      "AssembleName": "DLT645_2007OverTcp",
+      "DriverTypeEnum": "Collect",
+      "FilePath": "Plugins/ThingsGateway.DLT645/ThingsGateway.DLT645.dll",
+      "CreateTime": "2023/8/6 18:22:33",
+      "CreateUser": "superAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": 0,
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
    }
  ]
 }
--- a/framework/ThingsGateway.Application/SeedData/Json/gateway_openapi_user.json
+++ b/framework/ThingsGateway.Application/SeedData/Json/gateway_openapi_user.json
--- a/framework/ThingsGateway.Application/SeedData/OpenApiUserSeedData.cs
+++ b/framework/ThingsGateway.Application/SeedData/OpenApiUserSeedData.cs
@@ -22,6 +22,6 @@ public class OpenApiUserSeedData : ISqlSugarEntitySeedData<OpenApiUser>
    /// <inheritdoc/>
    public IEnumerable<OpenApiUser> SeedData()
    {
-        return SeedDataUtil.GetSeedData<OpenApiUser>("gatewayopenapi_user.json");
+        return SeedDataUtil.GetSeedData<OpenApiUser>("gateway_openapi_user.json");
    }
 }
--- a/framework/ThingsGateway.Application/Services/GatewayLogs/BackendLogService.cs
+++ b/framework/ThingsGateway.Application/Services/GatewayLogs/BackendLogService.cs
@@ -86,6 +86,8 @@ public class BackendLogService : DbRepository<BackendLog>, IBackendLogService
    private ISugarQueryable<BackendLog> GetPage(BackendLogPageInput input)
    {
        var query = Context.Queryable<BackendLog>()
+                           .WhereIF(input.StartTime != null, a => a.LogTime >= input.StartTime.Value.ToLocalTime())
+                           .WhereIF(input.EndTime != null, a => a.LogTime <= input.EndTime.Value.ToLocalTime())
                           .WhereIF(!string.IsNullOrEmpty(input.Source), it => it.LogSource.Contains(input.Source))
                           .WhereIF(!string.IsNullOrEmpty(input.Level), it => it.LogLevel.ToString().Contains(input.Level));
        for (int i = 0; i < input.SortField.Count; i++)
--- a/framework/ThingsGateway.Application/Services/GatewayLogs/Dto/LogInput.cs
+++ b/framework/ThingsGateway.Application/Services/GatewayLogs/Dto/LogInput.cs
@@ -19,6 +19,15 @@ namespace ThingsGateway.Application;
 /// </summary>
 public class BackendLogPageInput : BasePageInput
 {
+    /// <summary>
+    /// 开始时间
+    /// </summary>
+    public DateTime? StartTime { get; set; } = DateTime.UtcNow.AddDays(-1);
+    /// <summary>
+    /// 结束时间
+    /// </summary>
+    public DateTime? EndTime { get; set; } = DateTime.UtcNow.AddDays(1);
+
    /// <summary>
    /// 日志源
    /// </summary>
@@ -55,6 +64,14 @@ public class BackendLogInput
 /// </summary>
 public class RpcLogPageInput : BasePageInput
 {
+    /// <summary>
+    /// 开始时间
+    /// </summary>
+    public DateTime? StartTime { get; set; } = DateTime.UtcNow.AddDays(-1);
+    /// <summary>
+    /// 结束时间
+    /// </summary>
+    public DateTime? EndTime { get; set; } = DateTime.UtcNow.AddDays(1);
    /// <summary>
    /// 操作源
    /// </summary>
--- a/framework/ThingsGateway.Application/Services/GatewayLogs/RpcLogService.cs
+++ b/framework/ThingsGateway.Application/Services/GatewayLogs/RpcLogService.cs
@@ -44,6 +44,8 @@ public class RpcLogService : DbRepository<RpcLog>, IRpcLogService
    private ISugarQueryable<RpcLog> GetPage(RpcLogPageInput input)
    {
        var query = Context.Queryable<RpcLog>()
+                           .WhereIF(input.StartTime != null, a => a.LogTime >= input.StartTime.Value.ToLocalTime())
+                           .WhereIF(input.EndTime != null, a => a.LogTime <= input.EndTime.Value.ToLocalTime())
                           .WhereIF(!string.IsNullOrEmpty(input.Source), it => it.OperateSource.Contains(input.Source))
                           .WhereIF(!string.IsNullOrEmpty(input.Object), it => it.OperateObject.Contains(input.Object))
                           .WhereIF(!string.IsNullOrEmpty(input.Method), it => it.OperateMethod.Contains(input.Method));
--- a/framework/ThingsGateway.Application/Services/UploadDevice/UploadDeviceService.cs
+++ b/framework/ThingsGateway.Application/Services/UploadDevice/UploadDeviceService.cs
@@ -64,10 +64,10 @@ public class UploadDeviceService : DbRepository<UploadDevice>, IUploadDeviceServ
    [OperDesc("复制上传设备")]
    public async Task CopyDevAsync(IEnumerable<UploadDevice> input)
    {
-        var newId = YitIdHelper.NextId();
        var newDevs = input.Adapt<List<UploadDevice>>();
        newDevs.ForEach(a =>
        {
+            var newId = YitIdHelper.NextId();
            a.Id = newId;
            a.Name = "Copy-" + a.Name + "-" + newId.ToString();
        });
--- a/framework/ThingsGateway.Application/Services/Variable/IVariableService.cs
+++ b/framework/ThingsGateway.Application/Services/Variable/IVariableService.cs
@@ -55,7 +55,7 @@ public interface IVariableService : ITransient
    /// <summary>
    /// 导出
    /// </summary>
-    Task<MemoryStream> ExportFileAsync(List<DeviceVariable> collectDeviceVariables = null);
+    Task<MemoryStream> ExportFileAsync(List<DeviceVariable> collectDeviceVariables = null, string deviceName = null);
    /// <summary>
    /// 导出
    /// </summary>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kimdiego2098	cf794569ed	2.1.0.8	2023-09-05 09:19:58 +08:00
Kimdiego2098	51e5bbab0d	fix：PeriodicTimer dispose	2023-09-05 09:17:26 +08:00
Kimdiego2098	2c197ed2b2	2.1.0.7	2023-09-05 09:06:39 +08:00
Kimdiego2098	d8fc6665b3	fix：error!the stream dispose	2023-09-05 09:04:34 +08:00
Kimdiego2098	c671a79822	Revert "fix：error!the stearm dispose" This reverts commit `a6d99fe227`.	2023-09-05 09:03:49 +08:00
Kimdiego2098	9d93ce4c41	feat：mqttBroker part	2023-09-05 08:58:49 +08:00
Kimdiego2098	a6d99fe227	fix：error!the stearm dispose	2023-09-05 08:57:42 +08:00
Diego2098	923b8bca31	feat：mqttBroker part	2023-09-04 22:34:31 +08:00
Diego2098	e2c30d1c88	fix：uploadDeivce复制多个，ID重复问题	2023-09-04 22:11:50 +08:00
Diego2098	b6d9f2a04e	刷新后选择行清空	2023-09-04 22:09:26 +08:00
Diego2098	57306ea664	fix：采集设备线程初始化时更新活跃时间	2023-09-04 20:13:49 +08:00
Diego2098	cd7f3fd02f	fix：特殊情况下无法获取程序集文件修改日期，所以去除页脚-编译时间显示	2023-09-04 19:49:17 +08:00
Kimdiego2098	0482e077a8	fix：sqlsugar json支持类型改为bigstring	2023-09-04 17:09:38 +08:00
Kimdiego2098	5f986a45ca	更新文档	2023-09-04 15:03:03 +08:00
Kimdiego2098	ca7b49c0d5	恢复Sqlite默认数据库	2023-09-02 19:17:32 +08:00
Kimdiego2098	52dd555e6c	fix: page取消注入瞬时服务，改为App.GetService	2023-09-02 19:13:57 +08:00
Kimdiego2098	579b1a59f9	feat：mqttBroker part	2023-09-02 13:55:21 +08:00
Kimdiego2098	5299c5c4be	更新文档	2023-08-31 09:17:59 +08:00
Kimdiego2098	f7756bccef	更新变量管理-上传设备筛选功能	2023-08-31 08:58:30 +08:00
Kimdiego2098	a6b874d160	2.1.0.6	2023-08-30 17:19:18 +08:00
Kimdiego2098	3e5fb3ddcf	add windows service create/delete bat	2023-08-30 17:18:35 +08:00
Kimdiego2098	5e6bcb12d3	update statusPage;	2023-08-30 14:12:50 +08:00
Kimdiego2098	14303f1429	默认检测重连频率为10分钟	2023-08-29 17:56:59 +08:00
Kimdiego2098	96711ba022	2.1.0.5	2023-08-29 17:44:28 +08:00
Kimdiego2098	cbfc0fdbdc	添加报文日志入库选项	2023-08-29 17:42:56 +08:00
Kimdiego2098	6e81886c0e	添加页脚编译时间显示	2023-08-29 17:01:46 +08:00
Kimdiego2098	2d976bc132	调整导入excel错误提示	2023-08-29 16:45:54 +08:00
Kimdiego2098	57f6a476af	update opcdaclient null error	2023-08-29 15:24:29 +08:00
Kimdiego2098	8491ed296e	update GetBoolValue	2023-08-29 12:40:21 +08:00
Kimdiego2098	cd1288afdc	调整种子文件，增加Pro版本种子文件录入	2023-08-29 09:42:54 +08:00
Kimdiego2098	ec6c830cb0	更新2.1.0.4	2023-08-28 19:31:00 +08:00
Kimdiego2098	2f86ccc4bf	修复串口基类缓存包失效错误；完善modbusrtu长度校验	2023-08-28 19:25:22 +08:00
Kimdiego2098	8ca445aec0	更新touchsocket版本，更新2.1.0.3	2023-08-28 18:12:18 +08:00
Kimdiego2098	1e1f27c8a5	修复浏览大量节点空间时，BrowseNext方法参数releaseContinuationPoints改为false	2023-08-28 17:44:02 +08:00
Kimdiego2098	2b84bde367	修复调试界面-opcuaclient浏览节点展开逻辑错误	2023-08-28 10:51:35 +08:00
Kimdiego2098	b52e58551d	更新小版本2.1.0.2	2023-08-27 17:17:37 +08:00
Kimdiego2098	9aceed00bf	更新dlt645地址说明	2023-08-27 17:16:59 +08:00
Kimdiego2098	58814f7f74	添加日志查询时间区间条件	2023-08-27 16:58:45 +08:00
Kimdiego2098	6a70ef9f31	2.1.0.1	2023-08-27 16:31:03 +08:00
Kimdiego2098	82cc4ca500	dlt645添加数据标识校验	2023-08-27 16:30:32 +08:00
Kimdiego2098	4567fa04ed	更新dlt645,添加地址/控制码的校验规则	2023-08-27 16:15:51 +08:00
Kimdiego2098	8b98b5d818	更新touchsocket	2023-08-27 15:59:57 +08:00
Kimdiego2098	176d0351af	更新 Opc.Ua Version="1.4.372.56"	2023-08-27 14:33:24 +08:00
Kimdiego2098	d63dc3384b	opcda/ua浏览地址空间初始只加载首层节点	2023-08-27 14:14:47 +08:00
Kimdiego2098	1ccd704e30	opcuaclient浏览地址空间初始只加载首层节点	2023-08-27 13:06:03 +08:00
Diego2098	f5d23dbe79	update MqttNetLogger	2023-08-26 21:38:14 +08:00
Diego2098	75bfe53ac3	update MqttNetLogger	2023-08-26 20:40:23 +08:00
Diego2098	3308f916dd	添加在线/离线方法参数	2023-08-26 17:18:47 +08:00
Diego2098	e7140279ca	更新opcuaclient	2023-08-26 15:38:22 +08:00
Diego2098	1034719f5e	更新opcuaclient,添加checkDomain属性，去除多余代码，更新SelectEndpoint方法	2023-08-26 15:33:03 +08:00
Kimdiego2098	2c00043a7f	更新文档	2023-08-25 19:49:02 +08:00
Kimdiego2098	65c695d9ce	更新版本2.1.0	2023-08-25 19:45:28 +08:00
Kimdiego2098	57253fe46a	更新解决方案	2023-08-25 19:38:47 +08:00
Kimdiego2098	4e5c443440	更新DLT645文档	2023-08-25 19:33:33 +08:00
Kimdiego2098	0b3b73d8ec	添加DLT645_2007协议插件	2023-08-25 19:33:08 +08:00
Kimdiego2098	921eabc134	调整Test位置	2023-08-25 19:32:27 +08:00
Kimdiego2098	0faa428751	调整非主从协议的状态判断策略;OPCUA去除主动连接	2023-08-25 17:23:00 +08:00
Kimdiego2098	f71a2fdd63	crc校验优化	2023-08-22 17:01:10 +08:00
Kimdiego2098	4eb9ed8aba	OPCUAClient添加是否使用SourceTime的选项	2023-08-22 16:15:34 +08:00
Kimdiego2098	d7b549abb8	更新文档	2023-08-22 12:21:45 +08:00
Kimdiego2098	95d723c578	2.0.9.3	2023-08-22 11:31:36 +08:00
Kimdiego2098	2fcd853e86	去除mqtt throw an _MqttConnectingFailedException_.报错信息	2023-08-22 11:26:22 +08:00
Kimdiego2098	07eef7c812	更新批量写入方法，注意rpc入口参数变化，mqtt等RPC接口参数变化	2023-08-22 11:23:03 +08:00
Kimdiego2098	b01e0757fa	修正部分代码格式	2023-08-21 19:59:07 +08:00
Kimdiego2098	32844a20c6	2.0.9.2	2023-08-19 12:08:49 +08:00
Kimdiego2098	5b6532c601	xml	2023-08-19 11:06:05 +08:00
Kimdiego2098	2c5b4b4027	修复TcpClient重复释放导致锁异常	2023-08-19 11:05:29 +08:00
Kimdiego2098	72d7ecf195	mas1.0.2默认中文	2023-08-18 18:36:30 +08:00
Kimdiego2098	2cfa6b4306	更新masa1.0.2	2023-08-18 13:59:17 +08:00
Kimdiego2098	6f6ffde0ab	2.0.9.1	2023-08-18 13:33:45 +08:00
Kimdiego2098	1694739a16	修改锁为EasyLock	2023-08-18 12:07:01 +08:00
Kimdiego2098	95d1e8bfca	代码文件编码统一utf-8	2023-08-18 09:57:03 +08:00
Kimdiego2098	60dec08e3c	更换DEMO Include为PackageReference	2023-08-17 15:30:35 +08:00
Kimdiego2098	a99d71be93	底层驱动添加netstandard输出	2023-08-17 15:24:07 +08:00
Kimdiego2098	f1331b6a0c	2.0.8	2023-08-17 10:58:48 +08:00
Kimdiego2098	10d66b642b	调整readme，方便copy账密	2023-08-17 10:28:47 +08:00
Kimdiego2098	cd2310e4a8	优化变量地址输入分割方法;s7读写字符串添加默认编码	2023-08-17 09:50:10 +08:00
Kimdiego2098	1b399cf6b0	优化s7读写字符串，更改特殊方法为读写共用	2023-08-16 17:20:20 +08:00
Kimdiego2098	877445bc0a	修复写入返回结果时的解析，0XFF为成功	2023-08-16 15:56:25 +08:00
Kimdiego2098	9a5b345bde	修复s7字符串打包读取	2023-08-16 15:47:37 +08:00
Kimdiego2098	fc9e8ea7b3	修复s7字符串读取	2023-08-16 15:35:15 +08:00
Kimdiego2098	32be6fcfc1	主动释放锁	2023-08-16 14:56:47 +08:00
Kimdiego2098	49847236c2	OPCUA死区不再固定传入	2023-08-16 14:21:19 +08:00
Kimdiego2098	d8424443e6	fix: 优化JsonUtils中的获取type语句顺序	2023-08-16 08:59:18 +08:00
Kimdiego2098	f3b571ec3f	OPC系列增加导出excel/导入系统双选项	2023-08-15 17:38:40 +08:00
Kimdiego2098	99318bb5d7	OPCUA采集设备写入字符串，不再需要传入双引号	2023-08-15 14:15:39 +08:00
Kimdiego2098	1aa154c9aa	历史数据/报警线程初始化时不再阻塞	2023-08-15 12:12:00 +08:00
Kimdiego2098	c65d8a445b	更改ItemGroup Condition条件	2023-08-14 17:36:59 +08:00
Kimdiego2098	80f4f85570	传播token; 更新admin解决方案	2023-08-14 16:43:30 +08:00
Kimdiego2098	5beee43a6b	优化适配器解析代码	2023-08-14 14:21:00 +08:00
Kimdiego2098	8d6ae203a0	2.0.6	2023-08-13 16:57:12 +08:00
Kimdiego2098	4353479a5c	OPCUACClient订阅初始化添加trycatch	2023-08-13 16:29:59 +08:00
Kimdiego2098	34d7687f9e	Merge branch 'master' of https://gitee.com/dotnetchina/ThingsGateway	2023-08-13 15:53:33 +08:00
Kimdiego2098	b1dc3cf4af	更新opcuaclient，初始读取server类型改为动态读取	2023-08-13 15:50:47 +08:00
Diego2098	6a58b95933	更新nuget包	2023-08-12 12:09:50 +08:00
Kimdiego2098	d3badfd02b	修复批量令牌强退失效	2023-08-11 15:15:50 +08:00
Kimdiego2098	0098be057b	中间变量导入时添加标识	2023-08-11 14:15:22 +08:00
Kimdiego2098	6f972aa515	2.0.5	2023-08-10 18:23:40 +08:00
Kimdiego2098	7407ba6313	去除不需要的模板	2023-08-10 16:28:52 +08:00
Kimdiego2098	1c79de207b	修改详情模板	2023-08-10 11:23:18 +08:00
Kimdiego2098	257c79db92	添加自定义详情模板	2023-08-10 10:35:19 +08:00
Kimdiego2098	9d1934a308	底层修改:如果连接端口断开，停止等待返回	2023-08-10 10:35:01 +08:00
Kimdiego2098	d70f959902	上传DTO添加单位参数	2023-08-10 09:09:09 +08:00
Kimdiego2098	e4d810222f	调整调试页面	2023-08-09 23:45:53 +08:00
Kimdiego2098	bc1af4ae07	添加单文件发布配置	2023-08-09 15:12:55 +08:00
Kimdiego2098	6e688ef43f	去除页面多余引号	2023-08-09 13:45:27 +08:00
Kimdiego2098	f0fe1b23dc	更新2.0.4	2023-08-09 13:00:10 +08:00
Kimdiego2098	aaf2006401	更新opcua写入	2023-08-09 12:43:05 +08:00
Kimdiego2098	b821e26935	更新opcua调试页面	2023-08-09 12:01:23 +08:00
Kimdiego2098	7ae4287157	更新opcua	2023-08-09 11:47:04 +08:00
Kimdiego2098	c6fcc38a65	修复中间变量导入错误	2023-08-09 09:00:49 +08:00
Kimdiego2098	ab2d5c8853	修正错误注释	2023-08-08 18:09:23 +08:00
Kimdiego2098	5e557ff0bc	opcua添加初始化连接错误重试	2023-08-08 18:04:24 +08:00
Kimdiego2098	918ca449a1	更新readme	2023-08-08 16:14:06 +08:00
Kimdiego2098	8e73368008	优化大量设备线程重启的耗时	2023-08-08 14:02:00 +08:00
Kimdiego2098	f3c1faf672	2.0.3	2023-08-08 12:59:14 +08:00
Kimdiego2098	d6df04dd6a	底层部分方法更改	2023-08-08 12:31:42 +08:00