更新版本号

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

framework/Directory.Build.props

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

framework/ThingsGateway.sln

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

framework/admin/Directory.Build.props

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

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

@@ -27,12 +27,12 @@ namespace ThingsGateway.Admin.ApiController;
 [Route("Swagger")]
 public class SwaggerController : IDynamicApiController, IScoped
 {
-    private readonly ConfigService _configService;
+    private readonly IConfigService _configService;
     /// <summary>
     /// <inheritdoc cref="SwaggerController"/>
     /// </summary>
     /// <param name="sysConfigService"></param>
-    public SwaggerController(ConfigService sysConfigService)
+    public SwaggerController(IConfigService sysConfigService)
     {
         _configService = sysConfigService;
     }

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

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

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

@@ -96,7 +96,7 @@ public class OperDispatchProxy : AspectDispatchProxy, IDispatchProxy
     /// <exception cref="NotImplementedException"></exception>
     public override async Task InvokeAsync(MethodInfo method, object[] args)
     {
-        var desc = method.GetActualCustomAttribute<OperDescAttribute>(Target);
+        var desc = method.GetActualCustomAttribute<OperDescAttribute>(Target, true);
         if (desc == null)
         {
             var task = method.Invoke(Target, args) as Task;
@@ -134,7 +134,7 @@ public class OperDispatchProxy : AspectDispatchProxy, IDispatchProxy
     /// <exception cref="NotImplementedException"></exception>
     public override async Task<T> InvokeAsyncT<T>(MethodInfo method, object[] args)
     {
-        var desc = method.GetActualCustomAttribute<OperDescAttribute>(Target);
+        var desc = method.GetActualCustomAttribute<OperDescAttribute>(Target, true);
         if (desc == null)
         {
             var taskT = method.Invoke(Target, args) as Task<T>;

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

@@ -83,7 +83,7 @@ public class OpenApiSessionService : DbRepository<OpenApiUser>, IOpenApiSessionS
                 var verificatInfos = await _verificatService.GetVerificatIdAsync(it.Id);
                 if (verificatInfos != null)
                 {
-                    OpenApiSessionService.GetVerificatInfos(ref verificatInfos);//获取剩余时间
+                    GetVerificatInfos(ref verificatInfos);//获取剩余时间
                     it.VerificatCount = verificatInfos.Count;//令牌数量
                     it.VerificatSignList = verificatInfos;//令牌列表
                 }

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

@@ -73,7 +73,7 @@ public class SessionService : DbRepository<SysUser>, ISessionService
                   var verificatInfos = await _verificatService.GetVerificatIdAsync(it.Id);
                   if (verificatInfos != null)
                   {
-                      SessionService.GetVerificatInfos(ref verificatInfos);//获取剩余时间
+                      GetVerificatInfos(ref verificatInfos);//获取剩余时间
                       it.VerificatCount = verificatInfos.Count;//令牌数量
                       it.VerificatSignList = verificatInfos;//令牌列表
 

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

@@ -10,6 +10,8 @@
 //------------------------------------------------------------------------------
 #endregion
 
+using System.Text.RegularExpressions;
+
 using ThingsGateway.Foundation.Extension.String;
 
 namespace ThingsGateway.Admin.Application;
@@ -34,7 +36,8 @@ public class SeedDataUtil
         if (!string.IsNullOrEmpty(dataString))//如果有内容
         {
             //字段没有数据的替换成null
-            dataString = dataString.Replace("\"\"", "null");
+            dataString = Regex.Replace(dataString, "\\\"[^\"]+?\\\": \\\"\\\"", match => match.Value.Replace("\"\"", "null"));
+            //dataString = dataString.Replace("\"\"", "null");
             //将json字符串转为实体，这里extjson可以正常转换为字符串
             var seedDataRecord = Newtonsoft.Json.JsonConvert.DeserializeObject<SeedDataRecords<T>>(dataString);
 

framework/admin/ThingsGateway.Admin.Blazor/Page/Base.razor.cs

@@ -37,7 +37,7 @@ namespace ThingsGateway.Admin.Blazor
             {
                 try
                 {
-                    var data = await _serviceScope.ServiceProvider.GetService<UserCenterService>().GetLoginDefaultRazorAsync(UserManager.UserId);
+                    var data = await _serviceScope.ServiceProvider.GetService<IUserCenterService>().GetLoginDefaultRazorAsync(UserManager.UserId);
                     var sameLevelMenus = await _serviceScope.ServiceProvider.GetService<IResourceService>().GetaMenuAndSpaListAsync();
                     if (NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsolutePath == "/Login" || NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsolutePath == "/")
                         NavigationManager.NavigateTo(sameLevelMenus.FirstOrDefault(a => a.Id == data)?.Component ?? "index", true);

framework/admin/ThingsGateway.Admin.Blazor/Page/Config.razor.cs

@@ -39,26 +39,26 @@ public partial class Config
     }
     private async Task AddCallAsync(ConfigAddInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<ConfigService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<IConfigService>().AddAsync(input);
     }
 
     private async Task DeleteCallAsync(IEnumerable<SysConfig> sysConfigs)
     {
-        await _serviceScope.ServiceProvider.GetService<ConfigService>().DeleteAsync(sysConfigs.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<IConfigService>().DeleteAsync(sysConfigs.Select(a => a.Id).ToArray());
     }
     private async Task EditCallAsync(ConfigEditInput sysConfigs)
     {
-        await _serviceScope.ServiceProvider.GetService<ConfigService>().EditAsync(sysConfigs);
+        await _serviceScope.ServiceProvider.GetService<IConfigService>().EditAsync(sysConfigs);
     }
 
     private async Task OnSaveAsync()
     {
-        await _serviceScope.ServiceProvider.GetService<ConfigService>().EditBatchAsync(_sysConfig);
+        await _serviceScope.ServiceProvider.GetService<IConfigService>().EditBatchAsync(_sysConfig);
         await _mainLayout.StateHasChangedAsync();
         await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
     }
     private async Task<ISqlSugarPagedList<SysConfig>> QueryCallAsync(ConfigPageInput input)
     {
-        return await _serviceScope.ServiceProvider.GetService<ConfigService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<IConfigService>().PageAsync(input);
     }
 }

framework/admin/ThingsGateway.Admin.Blazor/Page/Menu.razor.cs

@@ -45,23 +45,23 @@ public partial class Menu
     private async Task AddCallAsync(MenuAddInput input)
     {
         input.ParentId = _search.ParentId;
-        await _serviceScope.ServiceProvider.GetService<MenuService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<IMenuService>().AddAsync(input);
         await NavChangeAsync();
     }
     private async Task ButtonAddCallAsync(ButtonAddInput input)
     {
         input.ParentId = _buttonParentId;
-        await _serviceScope.ServiceProvider.GetService<ButtonService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<IButtonService>().AddAsync(input);
     }
 
     private async Task ButtonDeleteCallAsync(IEnumerable<SysResource> input)
     {
-        await _serviceScope.ServiceProvider.GetService<ButtonService>().DeleteAsync(input.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<IButtonService>().DeleteAsync(input.Select(a => a.Id).ToArray());
     }
 
     private async Task ButtonEditCallAsync(ButtonEditInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<ButtonService>().EditAsync(input);
+        await _serviceScope.ServiceProvider.GetService<IButtonService>().EditAsync(input);
 
     }
 
@@ -85,7 +85,7 @@ public partial class Menu
     private async Task<ISqlSugarPagedList<SysResource>> ButtonQueryCallAsync(ButtonPageInput input)
     {
         input.ParentId = _buttonParentId;
-        var data = await _serviceScope.ServiceProvider.GetService<ButtonService>().PageAsync(input);
+        var data = await _serviceScope.ServiceProvider.GetService<IButtonService>().PageAsync(input);
         return data;
     }
 
@@ -96,13 +96,13 @@ public partial class Menu
 
     private async Task DeleteCallAsync(IEnumerable<SysResource> input)
     {
-        await _serviceScope.ServiceProvider.GetService<MenuService>().DeleteAsync(input.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<IMenuService>().DeleteAsync(input.Select(a => a.Id).ToArray());
         await NavChangeAsync();
 
     }
     private async Task EditCallAsync(MenuEditInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<MenuService>().EditAsync(input);
+        await _serviceScope.ServiceProvider.GetService<IMenuService>().EditAsync(input);
         await NavChangeAsync();
 
     }
@@ -123,7 +123,7 @@ public partial class Menu
     }
     private async Task<ISqlSugarPagedList<SysResource>> QueryCallAsync(MenuPageInput input)
     {
-        var data = await _serviceScope.ServiceProvider.GetService<MenuService>().TreeAsync(input);
+        var data = await _serviceScope.ServiceProvider.GetService<IMenuService>().TreeAsync(input);
         return data.ToPagedList(input);
     }
 

framework/admin/ThingsGateway.Admin.Blazor/Page/OpenApiSession.razor.cs

@@ -32,13 +32,13 @@ public partial class OpenApiSession
         var confirm = await PopupService.OpenConfirmDialogAsync("警告", "确定 ?");
         if (confirm)
         {
-            await _serviceScope.ServiceProvider.GetService<OpenApiSessionService>().ExitSessionAsync(id);
+            await _serviceScope.ServiceProvider.GetService<IOpenApiSessionService>().ExitSessionAsync(id);
         }
     }
 
     private async Task<ISqlSugarPagedList<OpenApiSessionOutput>> SessionQueryCallAsync(OpenApiSessionPageInput input)
     {
-        return await _serviceScope.ServiceProvider.GetService<OpenApiSessionService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<IOpenApiSessionService>().PageAsync(input);
     }
 
     private async Task ShowVerificatListAsync(List<VerificatInfo> verificatInfos)
@@ -56,7 +56,7 @@ public partial class OpenApiSession
             VerificatIds = verificats.Select(it => it.Id).ToList(),
             Id = verificats.First().UserId
         };
-        await _serviceScope.ServiceProvider.GetService<OpenApiSessionService>().ExitVerificatAsync(send);
+        await _serviceScope.ServiceProvider.GetService<IOpenApiSessionService>().ExitVerificatAsync(send);
         _verificatInfos.RemoveWhere(it => send.VerificatIds.Contains(it.Id));
     }
 

framework/admin/ThingsGateway.Admin.Blazor/Page/OpenApiUserR.razor.cs

@@ -32,17 +32,17 @@ public partial class OpenApiUserR
 
     private async Task AddCallAsync(OpenApiUserAddInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<OpenApiUserService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<IOpenApiUserService>().AddAsync(input);
     }
 
     private async Task DeleteCallAsync(IEnumerable<OpenApiUser> users)
     {
-        await _serviceScope.ServiceProvider.GetService<OpenApiUserService>().DeleteAsync(users.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<IOpenApiUserService>().DeleteAsync(users.Select(a => a.Id).ToArray());
     }
 
     private async Task EditCallAsync(OpenApiUserEditInput users)
     {
-        await _serviceScope.ServiceProvider.GetService<OpenApiUserService>().EditAsync(users);
+        await _serviceScope.ServiceProvider.GetService<IOpenApiUserService>().EditAsync(users);
     }
 
     private List<OpenApiPermissionTreeSelector> GetRouters()
@@ -58,7 +58,7 @@ public partial class OpenApiUserR
             OpenApiUserGrantPermissionInput userGrantRoleInput = new();
             userGrantRoleInput.Id = _choiceUserId;
             userGrantRoleInput.PermissionList = _rolesChoice.Select(it => it.ApiRoute).ToList();
-            await _serviceScope.ServiceProvider.GetService<OpenApiUserService>().GrantRoleAsync(userGrantRoleInput);
+            await _serviceScope.ServiceProvider.GetService<IOpenApiUserService>().GrantRoleAsync(userGrantRoleInput);
             _isShowRoles = false;
             await _datatable?.QueryClickAsync();
         }
@@ -70,7 +70,7 @@ public partial class OpenApiUserR
     }
     private async Task<ISqlSugarPagedList<OpenApiUser>> QueryCallAsync(OpenApiUserPageInput input)
     {
-        return await _serviceScope.ServiceProvider.GetService<OpenApiUserService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<IOpenApiUserService>().PageAsync(input);
     }
 
     private async Task UserStatusChangeAsync(OpenApiUser context, bool enable)
@@ -78,9 +78,9 @@ public partial class OpenApiUserR
         try
         {
             if (enable)
-                await _serviceScope.ServiceProvider.GetService<OpenApiUserService>().EnableUserAsync(context.Id);
+                await _serviceScope.ServiceProvider.GetService<IOpenApiUserService>().EnableUserAsync(context.Id);
             else
-                await _serviceScope.ServiceProvider.GetService<OpenApiUserService>().DisableUserAsync(context.Id);
+                await _serviceScope.ServiceProvider.GetService<IOpenApiUserService>().DisableUserAsync(context.Id);
         }
         finally
         {

framework/admin/ThingsGateway.Admin.Blazor/Page/Oplog.razor.cs

@@ -47,7 +47,7 @@ public partial class Oplog
         var confirm = await PopupService.OpenConfirmDialogAsync("删除", "确定 ?");
         if (confirm)
         {
-            await _serviceScope.ServiceProvider.GetService<OperateLogService>().DeleteAsync(_categoryFilters.Select(it => it.Value).ToArray());
+            await _serviceScope.ServiceProvider.GetService<IOperateLogService>().DeleteAsync(_categoryFilters.Select(it => it.Value).ToArray());
             await _datatable?.QueryClickAsync();
         }
     }
@@ -68,6 +68,6 @@ public partial class Oplog
         input.Account = _search.Account;
         input.Category = _search.Category;
         input.ExeStatus = _search.ExeStatus;
-        return await _serviceScope.ServiceProvider.GetService<OperateLogService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<IOperateLogService>().PageAsync(input);
     }
 }

framework/admin/ThingsGateway.Admin.Blazor/Page/Role.razor.cs

@@ -41,17 +41,17 @@ public partial class Role
 
     private async Task AddCallAsync(RoleAddInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<RoleService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<IRoleService>().AddAsync(input);
     }
     private async Task DeleteCallAsync(IEnumerable<SysRole> sysRoles)
     {
-        await _serviceScope.ServiceProvider.GetService<RoleService>().DeleteAsync(sysRoles.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<IRoleService>().DeleteAsync(sysRoles.Select(a => a.Id).ToArray());
         await _mainLayout.StateHasChangedAsync();
     }
 
     private async Task EditCallAsync(RoleEditInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<RoleService>().EditAsync(input);
+        await _serviceScope.ServiceProvider.GetService<IRoleService>().EditAsync(input);
         await _mainLayout.StateHasChangedAsync();
     }
     private async Task OnRoleHasResuorcesSaveAsync(ModalActionEventArgs args)
@@ -62,7 +62,7 @@ public partial class Role
             var data = new List<SysResource>();
             userGrantRoleInput.Id = _choiceRoleId;
             userGrantRoleInput.GrantInfoList = _roleHasResuorces;
-            await _serviceScope.ServiceProvider.GetService<RoleService>().GrantResourceAsync(userGrantRoleInput);
+            await _serviceScope.ServiceProvider.GetService<IRoleService>().GrantResourceAsync(userGrantRoleInput);
             _isShowResuorces = false;
         }
         catch (Exception ex)
@@ -79,7 +79,7 @@ public partial class Role
             GrantUserInput userGrantRoleInput = new();
             userGrantRoleInput.Id = _choiceRoleId;
             userGrantRoleInput.GrantInfoList = _usersChoice.Select(it => it.Id).ToList();
-            await _serviceScope.ServiceProvider.GetService<RoleService>().GrantUserAsync(userGrantRoleInput);
+            await _serviceScope.ServiceProvider.GetService<IRoleService>().GrantUserAsync(userGrantRoleInput);
             _isShowUsers = false;
         }
         catch (Exception ex)
@@ -92,19 +92,19 @@ public partial class Role
 
     private async Task<ISqlSugarPagedList<SysRole>> QueryCallAsync(RolePageInput input)
     {
-        return await _serviceScope.ServiceProvider.GetService<RoleService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<IRoleService>().PageAsync(input);
     }
 
     private async Task ResuorceInitAsync()
     {
         _resTreeSelectors = (await _serviceScope.ServiceProvider.GetService<ResourceService>().GetRoleGrantResourceMenusAsync());
-        _roleHasResuorces = (await _serviceScope.ServiceProvider.GetService<RoleService>().OwnResourceAsync(_choiceRoleId))?.GrantInfoList;
+        _roleHasResuorces = (await _serviceScope.ServiceProvider.GetService<IRoleService>().OwnResourceAsync(_choiceRoleId))?.GrantInfoList;
     }
 
     private async Task<List<UserSelectorOutput>> UserInitAsync()
     {
-        _allUsers = await _serviceScope.ServiceProvider.GetService<SysUserService>().UserSelectorAsync(_searchKey);
-        var data = await _serviceScope.ServiceProvider.GetService<RoleService>().OwnUserAsync(_choiceRoleId);
+        _allUsers = await _serviceScope.ServiceProvider.GetService<ISysUserService>().UserSelectorAsync(_searchKey);
+        var data = await _serviceScope.ServiceProvider.GetService<IRoleService>().OwnUserAsync(_choiceRoleId);
         _usersChoice = _allUsers.Where(a => data.Contains(a.Id)).ToList();
         return _allUsers;
     }

framework/admin/ThingsGateway.Admin.Blazor/Page/Session.razor.cs

@@ -37,14 +37,14 @@ public partial class Session
         var confirm = await PopupService.OpenConfirmDialogAsync("警告", "确定 ?");
         if (confirm)
         {
-            await _serviceScope.ServiceProvider.GetService<SessionService>().ExitSessionAsync(id);
+            await _serviceScope.ServiceProvider.GetService<ISessionService>().ExitSessionAsync(id);
         }
     }
 
 
     private async Task<ISqlSugarPagedList<SessionOutput>> SessionQueryCallAsync(SessionPageInput input)
     {
-        return await _serviceScope.ServiceProvider.GetService<SessionService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<ISessionService>().PageAsync(input);
     }
 
     private async Task ShowVerificatListAsync(List<VerificatInfo> verificatInfos)
@@ -62,7 +62,7 @@ public partial class Session
             VerificatIds = verificats.Select(it => it.Id).ToList(),
             Id = verificats.First().UserId
         };
-        await _serviceScope.ServiceProvider.GetService<SessionService>().ExitVerificatAsync(send);
+        await _serviceScope.ServiceProvider.GetService<ISessionService>().ExitVerificatAsync(send);
         _verificatInfos.RemoveWhere(it => send.VerificatIds.Contains(it.Id));
     }
 

framework/admin/ThingsGateway.Admin.Blazor/Page/Spa.razor.cs

@@ -28,23 +28,23 @@ public partial class Spa
 
     private async Task AddCallAsync(SpaAddInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<SpaService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<ISpaService>().AddAsync(input);
         await _mainLayout.StateHasChangedAsync();
     }
     private async Task DeleteCallAsync(IEnumerable<SysResource> input)
     {
-        await _serviceScope.ServiceProvider.GetService<SpaService>().DeleteAsync(input.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<ISpaService>().DeleteAsync(input.Select(a => a.Id).ToArray());
         await _mainLayout.StateHasChangedAsync();
     }
 
     private async Task EditCallAsync(SpaEditInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<SpaService>().EditAsync(input);
+        await _serviceScope.ServiceProvider.GetService<ISpaService>().EditAsync(input);
         await _mainLayout.StateHasChangedAsync();
     }
 
     private async Task<ISqlSugarPagedList<SysResource>> QueryCallAsync(SpaPageInput input)
     {
-        return await _serviceScope.ServiceProvider.GetService<SpaService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<ISpaService>().PageAsync(input);
     }
 }

framework/admin/ThingsGateway.Admin.Blazor/Page/User.razor.cs

@@ -35,17 +35,17 @@ public partial class User
 
     private async Task AddCallAsync(UserAddInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<SysUserService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<ISysUserService>().AddAsync(input);
     }
     private async Task DeleteCallAsync(IEnumerable<SysUser> users)
     {
-        await _serviceScope.ServiceProvider.GetService<SysUserService>().DeleteAsync(users.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<ISysUserService>().DeleteAsync(users.Select(a => a.Id).ToArray());
         await _mainLayout.StateHasChangedAsync();
     }
 
     private async Task EditCallAsync(UserEditInput users)
     {
-        await _serviceScope.ServiceProvider.GetService<SysUserService>().EditAsync(users);
+        await _serviceScope.ServiceProvider.GetService<ISysUserService>().EditAsync(users);
         await _mainLayout.StateHasChangedAsync();
     }
 
@@ -56,7 +56,7 @@ public partial class User
             UserGrantRoleInput userGrantRoleInput = new();
             userGrantRoleInput.Id = _choiceUserId;
             userGrantRoleInput.RoleIdList = _rolesChoice.Select(it => it.Id).ToList();
-            await _serviceScope.ServiceProvider.GetService<SysUserService>().GrantRoleAsync(userGrantRoleInput);
+            await _serviceScope.ServiceProvider.GetService<ISysUserService>().GrantRoleAsync(userGrantRoleInput);
             _isShowRoles = false;
         }
         catch (Exception ex)
@@ -68,20 +68,20 @@ public partial class User
     }
     private async Task<ISqlSugarPagedList<SysUser>> QueryCallAsync(UserPageInput input)
     {
-        return await _serviceScope.ServiceProvider.GetService<SysUserService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<ISysUserService>().PageAsync(input);
     }
 
     private async Task ResetPasswordAsync(SysUser sysUser)
     {
-        await _serviceScope.ServiceProvider.GetService<SysUserService>().ResetPasswordAsync(sysUser.Id);
+        await _serviceScope.ServiceProvider.GetService<ISysUserService>().ResetPasswordAsync(sysUser.Id);
         await PopupService.EnqueueSnackbarAsync(new("成功", AlertTypes.Success));
         await _mainLayout.StateHasChangedAsync();
     }
 
     private async Task RoleInitAsync()
     {
-        _allRoles = await _serviceScope.ServiceProvider.GetService<RoleService>().RoleSelectorAsync();
-        var data = await _serviceScope.ServiceProvider.GetService<RoleService>().GetRoleIdListByUserIdAsync(_choiceUserId);
+        _allRoles = await _serviceScope.ServiceProvider.GetService<IRoleService>().RoleSelectorAsync();
+        var data = await _serviceScope.ServiceProvider.GetService<IRoleService>().GetRoleIdListByUserIdAsync(_choiceUserId);
         _rolesChoice = _allRoles.Where(a => data.Contains(a.Id)).ToList();
     }
     private async Task UserStatusChangeAsync(SysUser context, bool enable)
@@ -89,9 +89,9 @@ public partial class User
         try
         {
             if (enable)
-                await _serviceScope.ServiceProvider.GetService<SysUserService>().EnableUserAsync(context.Id);
+                await _serviceScope.ServiceProvider.GetService<ISysUserService>().EnableUserAsync(context.Id);
             else
-                await _serviceScope.ServiceProvider.GetService<SysUserService>().DisableUserAsync(context.Id);
+                await _serviceScope.ServiceProvider.GetService<ISysUserService>().DisableUserAsync(context.Id);
         }
         finally
         {

framework/admin/ThingsGateway.Admin.Blazor/Page/UserCenter.razor.cs

@@ -44,14 +44,14 @@ public partial class UserCenter
 
     async Task OnDefaultRazorSaveAsync()
     {
-        await _serviceScope.ServiceProvider.GetService<UserCenterService>().UpdateUserDefaultRazorAsync(UserManager.UserId, _defaultMenuId);
+        await _serviceScope.ServiceProvider.GetService<IUserCenterService>().UpdateUserDefaultRazorAsync(UserManager.UserId, _defaultMenuId);
         await _mainLayout.StateHasChangedAsync();
         await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
     }
 
     async Task OnShortcutSaveAsync()
     {
-        await _serviceScope.ServiceProvider.GetService<UserCenterService>().UpdateWorkbenchAsync(_menusChoice);
+        await _serviceScope.ServiceProvider.GetService<IUserCenterService>().UpdateWorkbenchAsync(_menusChoice);
         await _mainLayout.StateHasChangedAsync();
         await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
     }
@@ -62,7 +62,7 @@ public partial class UserCenter
         {
             //验证成功，操作业务
             _passwordInfoInput.Id = UserResoures.CurrentUser.Id;
-            await _serviceScope.ServiceProvider.GetService<UserCenterService>().EditPasswordAsync(_passwordInfoInput);
+            await _serviceScope.ServiceProvider.GetService<IUserCenterService>().EditPasswordAsync(_passwordInfoInput);
             await _mainLayout.StateHasChangedAsync();
             await PopupService.EnqueueSnackbarAsync("成功，将重新登录", AlertTypes.Success);
             await Task.Delay(2000);
@@ -72,7 +72,7 @@ public partial class UserCenter
 
     async Task OnUpdateUserInfoAsync()
     {
-        await _serviceScope.ServiceProvider.GetService<UserCenterService>().UpdateUserInfoAsync(_updateInfoInput);
+        await _serviceScope.ServiceProvider.GetService<IUserCenterService>().UpdateUserInfoAsync(_updateInfoInput);
         await _mainLayout.StateHasChangedAsync();
         await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
     }

framework/admin/ThingsGateway.Admin.Blazor/Page/Vislog.razor.cs

@@ -56,7 +56,7 @@ public partial class Vislog
         var confirm = await PopupService.OpenConfirmDialogAsync("删除", "确定 ?");
         if (confirm)
         {
-            await _serviceScope.ServiceProvider.GetService<VisitLogService>().DeleteAsync(_categoryFilters.Select(it => it.Value).ToArray());
+            await _serviceScope.ServiceProvider.GetService<IVisitLogService>().DeleteAsync(_categoryFilters.Select(it => it.Value).ToArray());
             await _datatable?.QueryClickAsync();
         }
     }
@@ -74,7 +74,7 @@ public partial class Vislog
 
     private async Task<ISqlSugarPagedList<SysVisitLog>> QueryCallAsync(VisitLogPageInput input)
     {
-        var data = await _serviceScope.ServiceProvider.GetService<VisitLogService>().PageAsync(input);
+        var data = await _serviceScope.ServiceProvider.GetService<IVisitLogService>().PageAsync(input);
         return data;
     }
 }

framework/admin/ThingsGateway.Admin.Blazor/Shared/Login.razor.cs

@@ -107,8 +107,8 @@ public partial class Login
             {
                 await PopupService.EnqueueSnackbarAsync(new("登录成功", AlertTypes.Success));
                 await Task.Delay(500);
-                var userId = await _serviceScope.ServiceProvider.GetService<SysUserService>().GetIdByAccountAsync(_loginModel.Account);
-                var data = await _serviceScope.ServiceProvider.GetService<UserCenterService>().GetLoginDefaultRazorAsync(userId);
+                var userId = await _serviceScope.ServiceProvider.GetService<ISysUserService>().GetIdByAccountAsync(_loginModel.Account);
+                var data = await _serviceScope.ServiceProvider.GetService<IUserCenterService>().GetLoginDefaultRazorAsync(userId);
                 var sameLevelMenus = await _serviceScope.ServiceProvider.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");

framework/admin/ThingsGateway.Admin.Blazor/Shared/MainLayout.razor.cs

@@ -16,7 +16,7 @@ using ThingsGateway.Foundation.Extension.String;
 
 namespace ThingsGateway.Admin.Blazor;
 
-public partial class MainLayout
+public partial class MainLayout : IDisposable
 {
     private List<SysResource> _breadcrumbSysResources = new();
     private string _configCopyRight = "";
@@ -43,16 +43,23 @@ public partial class MainLayout
     private IServiceScopeFactory _serviceScopeFactory { get; set; }
     [Inject]
     private UserResoures _userResoures { get; set; }
+
+    public void Dispose()
+    {
+        _serviceScope.Dispose();
+    }
+
     /// <summary>
     /// 页面刷新
     /// </summary>
     /// <returns></returns>
     public async Task StateHasChangedAsync()
     {
-        _configCopyRight = (await _serviceScope.ServiceProvider.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_COPYRIGHT)).ConfigValue;
-        _configTitle = (await _serviceScope.ServiceProvider.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_TITLE)).ConfigValue;
-        _configCopyRightUrl = (await _serviceScope.ServiceProvider.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_COPYRIGHT_URL)).ConfigValue;
-        _configPageTab = (await _serviceScope.ServiceProvider.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_PAGETAB)).ConfigValue.ToBool(true);
+        var configService = _serviceScope.ServiceProvider.GetService<IConfigService>();
+        _configCopyRight = (await configService.GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_COPYRIGHT)).ConfigValue;
+        _configTitle = (await configService.GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_TITLE)).ConfigValue;
+        _configCopyRightUrl = (await configService.GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_COPYRIGHT_URL)).ConfigValue;
+        _configPageTab = (await configService.GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_PAGETAB)).ConfigValue.ToBool(true);
 
         await _userResoures.InitUserAsync();
         await _userResoures.InitMenuAsync();

framework/admin/ThingsGateway.Admin.Core/ThingsGateway.Admin.Core.csproj

@@ -5,8 +5,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.1.5" />
-		<PackageReference Include="SqlSugarCore" Version="5.1.4.123" />
+		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.1.8" />
+		<PackageReference Include="SqlSugarCore" Version="5.1.4.122" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
 	</ItemGroup>

framework/admin/ThingsGateway.Components/BaseComponent/BaseComponentBase.cs

@@ -56,6 +56,7 @@ public abstract class BaseComponentBase : ComponentBase, IDisposable
     /// </summary>
     public virtual void Dispose()
     {
+        _serviceScope.Dispose();
     }
 
     /// <summary>

framework/admin/ThingsGateway.Core/ThingsGateway.Core.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<ItemGroup>
-		<PackageReference Include="Furion.Pure" Version="4.9.1.5" />
-		<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.1.5" />
+		<PackageReference Include="Furion.Pure" Version="4.9.1.8" />
+		<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.1.8" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>
 

framework/demo/Directory.Build.props

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

framework/demo/ThingsGateway.Foundation.Demo.Rcl/Components/DebugPage/DriverDebugUIBase.cs

@@ -12,6 +12,9 @@
 
 using Microsoft.AspNetCore.Components;
 
+using ThingsGateway.Components;
+
+
 namespace ThingsGateway.Foundation.Demo;
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 /// <summary>

framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusDtuDebugPage.razor

@@ -40,7 +40,9 @@
                   Dense>
         </MSelect>
 
+            <MCheckbox Class="ma-1" Style="max-width:200px" Label=@(_plc.Description(x => x.IsRtu)) Dense HideDetails="@("auto")" @bind-Value=@_plc.IsRtu></MCheckbox>
             <MCheckbox Class="ma-1" Style="max-width:200px" Label=@(_plc.Description(x => x.IsCheckMessageId)) Dense HideDetails="@("auto")" @bind-Value=@_plc.IsCheckMessageId></MCheckbox>
+            <MCheckbox Class="ma-1" Style="max-width:200px" Label=@(_plc.Description(x => x.Crc16CheckEnable)) Dense HideDetails="@("auto")" @bind-Value=@_plc.Crc16CheckEnable></MCheckbox>
 
         }
     </MRow>

framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusDtuDebugPage.razor.cs

@@ -13,9 +13,9 @@
 namespace ThingsGateway.Foundation.Demo;
 
 /// <summary>
-/// ModbusTcpDtuDebugPage
+/// ModbusDtuDebugPage
 /// </summary>
-public partial class ModbusTcpDtuDebugPage
+public partial class ModbusDtuDebugPage
 {
     /// <summary>
     /// TcpServerPage
@@ -23,7 +23,7 @@ public partial class ModbusTcpDtuDebugPage
     private TcpServerPage _tcpServerPage;
     private DriverDebugUIPage _driverDebugUIPage;
 
-    private ThingsGateway.Foundation.Adapter.Modbus.ModbusTcpDtu _plc;
+    private ThingsGateway.Foundation.Adapter.Modbus.ModbusDtu _plc;
 
     /// <summary>
     /// <inheritdoc/>
@@ -70,7 +70,7 @@ public partial class ModbusTcpDtuDebugPage
 
             if (_tcpServerPage != null)
                 _tcpServerPage.LogAction = _driverDebugUIPage.LogOut;
-            _plc = new ThingsGateway.Foundation.Adapter.Modbus.ModbusTcpDtu(_tcpServerPage.GetTcpServer());
+            _plc = new ThingsGateway.Foundation.Adapter.Modbus.ModbusDtu(_tcpServerPage.GetTcpServer());
             _driverDebugUIPage.Plc = _plc;
             //载入配置
             StateHasChanged();

framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/OPCDA/OPCDAClientDebugPage.razor.cs

@@ -20,8 +20,6 @@ using Microsoft.JSInterop;
 
 using Newtonsoft.Json.Linq;
 
-using System.Collections.Generic;
-
 using ThingsGateway.Foundation.Adapter.OPCDA;
 using ThingsGateway.Foundation.Adapter.OPCDA.Da;
 
@@ -45,6 +43,7 @@ public partial class OPCDAClientDebugPage : IDisposable
     {
         _plc.SafeDispose();
         opcDAClientPage.SafeDispose();
+        base.Dispose();
     }
 
     /// <inheritdoc/>
@@ -105,7 +104,7 @@ public partial class OPCDAClientDebugPage : IDisposable
                     await PopupService.EnqueueSnackbarAsync("无可用变量", AlertTypes.Warning);
                     return;
                 }
-                await _serviceScope.ServiceProvider.GetService<CollectDeviceService>().AddAsync(data?.Item1);
+                await _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().AddAsync(data?.Item1);
                 await _serviceScope.ServiceProvider.GetService<VariableService>().AddBatchAsync(data?.Item2);
                 await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
             }
@@ -151,7 +150,7 @@ public partial class OPCDAClientDebugPage : IDisposable
     /// <returns></returns>
     public async Task DownDeviceExportAsync(CollectDevice data)
     {
-        using var memoryStream = await _serviceScope.ServiceProvider.GetService<CollectDeviceService>().ExportFileAsync(new List<CollectDevice>() { data });
+        using var memoryStream = await _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().ExportFileAsync(new List<CollectDevice>() { data });
         using var streamRef = new DotNetStreamReference(stream: memoryStream);
         JSObjectReference ??= await JSRuntime.LoadModuleAsync("js/downloadFileFromStream");
         await JSObjectReference.InvokeVoidAsync("downloadFileFromStream", $"设备导出{DateTimeExtensions.CurrentDateTime.ToFileDateTimeFormat()}.xlsx", streamRef);

framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/OPCUA/OPCUAClientDebugPage.razor.cs

@@ -96,7 +96,7 @@ public partial class OPCUAClientDebugPage
                 await PopupService.EnqueueSnackbarAsync("无可用变量", AlertTypes.Warning);
                 return;
             }
-            await _serviceScope.ServiceProvider.GetService<CollectDeviceService>().AddAsync(data.Item1);
+            await _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().AddAsync(data.Item1);
             await _serviceScope.ServiceProvider.GetService<VariableService>().AddBatchAsync(data.Item2);
             await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
         }
@@ -141,7 +141,7 @@ public partial class OPCUAClientDebugPage
     /// <returns></returns>
     public async Task DownDeviceExportAsync(CollectDevice data)
     {
-        using var memoryStream = await _serviceScope.ServiceProvider.GetService<CollectDeviceService>().ExportFileAsync(new List<CollectDevice>() { data });
+        using var memoryStream = await _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().ExportFileAsync(new List<CollectDevice>() { data });
         using var streamRef = new DotNetStreamReference(stream: memoryStream);
         JSObjectReference ??= await JSRuntime.LoadModuleAsync("js/downloadFileFromStream");
         await JSObjectReference.InvokeVoidAsync("downloadFileFromStream", $"设备导出{DateTimeExtensions.CurrentDateTime.ToFileDateTimeFormat()}.xlsx", streamRef);

framework/foundation/Directory.Build.props

@@ -1,20 +1,14 @@
 <Project>
+	<Import Project="$(SolutionDir)\Directory.Build.props" />
 	<!--如果编译net45报错无支持，用一下方法添加net45包-->
 	<!--VS顶部菜单栏 -> 视图 -> 其他 -> 程序包控制台
 	Install-Package Microsoft.NETFramework.ReferenceAssemblies.net45
 	-->
 	<PropertyGroup>
-		<Version>4.0.0.4</Version>
-		<GenerateDocumentationFile>True</GenerateDocumentationFile>
-		<LangVersion>latest</LangVersion>
 		<TargetFrameworks>net45;netstandard2.0;net6.0;net8.0;</TargetFrameworks>
 		<Description>
 			ThingsGateway.Foundation是工业设备通讯类库，归属于ThingsGateway边缘网关项目，说明文档：https://diego2098.gitee.io/thingsgateway-docs/
 		</Description>
-		<Authors>Diego</Authors>
-		<Product>ThingsGateway</Product>
-		<Copyright>© 2023-present Diego</Copyright>
-		<RepositoryUrl>https://gitee.com/diego2098/ThingsGateway</RepositoryUrl>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<EmbedUntrackedSource>true</EmbedUntrackedSource>
 		<EmbedAllSources>true</EmbedAllSources>
@@ -26,17 +20,11 @@
 		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
 		<PackageProjectUrl>https://diego2098.gitee.io/thingsgateway-docs/</PackageProjectUrl>
 		<PackageTags>ThingsGateway;Diego;dotNET China;Blazor;设备采集;边缘网关</PackageTags>
-		<SignAssembly>True</SignAssembly>
-		<DelaySign>False</DelaySign>
-		<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
 		<PackageOutputPath>..\..\nupkgs</PackageOutputPath>
 		<AssemblyOriginatorKeyFile>..\..\..\snks/ThingsGateway.snk</AssemblyOriginatorKeyFile>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	</PropertyGroup>
 
-	<PropertyGroup>
-	</PropertyGroup>
-
-
 	<ItemGroup>
 		<None Include="..\..\..\README.md" Pack="true" PackagePath="\" />
 	</ItemGroup>

framework/foundation/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007.cs

@@ -106,7 +106,7 @@ public class DLT645_2007 : ReadWriteDevicesSerialSessionBase, IDLT645_2007
     public override OperResult Write(string address, bool[] value, CancellationToken cancellationToken = default) => Write(address, value.ToString(), cancellationToken);
 
     /// <inheritdoc/>
-    public override Task<OperResult> WriteAsync(string address, byte[] value, CancellationToken cancellationToken = default) => throw new NotImplementedException();
+    public override Task<OperResult> WriteAsync(string address, byte[] value, CancellationToken cancellationToken = default) => Task.FromResult(new OperResult());
     /// <inheritdoc/>
     public override Task<OperResult> WriteAsync(string address, uint value, CancellationToken cancellationToken = default) => WriteAsync(address, value.ToString(), cancellationToken);
     /// <inheritdoc/>
@@ -125,7 +125,7 @@ public class DLT645_2007 : ReadWriteDevicesSerialSessionBase, IDLT645_2007
     public override Task<OperResult> WriteAsync(string address, int value, CancellationToken cancellationToken = default) => WriteAsync(address, value.ToString(), cancellationToken);
 
     /// <inheritdoc/>
-    public override Task<OperResult> WriteAsync(string address, bool[] value, CancellationToken cancellationToken = default) => throw new NotImplementedException();
+    public override Task<OperResult> WriteAsync(string address, bool[] value, CancellationToken cancellationToken = default) => Task.FromResult(new OperResult());
 
 
     #region 其他方法

framework/foundation/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007OverTcp.cs

@@ -106,7 +106,7 @@ public class DLT645_2007OverTcp : ReadWriteDevicesTcpClientBase, IDLT645_2007
     public override OperResult Write(string address, bool[] value, CancellationToken cancellationToken = default) => Write(address, value.ToString(), cancellationToken);
 
     /// <inheritdoc/>
-    public override Task<OperResult> WriteAsync(string address, byte[] value, CancellationToken cancellationToken = default) => throw new NotImplementedException();
+    public override Task<OperResult> WriteAsync(string address, byte[] value, CancellationToken cancellationToken = default) => Task.FromResult(new OperResult());
     /// <inheritdoc/>
     public override Task<OperResult> WriteAsync(string address, uint value, CancellationToken cancellationToken = default) => WriteAsync(address, value.ToString(), cancellationToken);
     /// <inheritdoc/>
@@ -125,7 +125,7 @@ public class DLT645_2007OverTcp : ReadWriteDevicesTcpClientBase, IDLT645_2007
     public override Task<OperResult> WriteAsync(string address, int value, CancellationToken cancellationToken = default) => WriteAsync(address, value.ToString(), cancellationToken);
 
     /// <inheritdoc/>
-    public override Task<OperResult> WriteAsync(string address, bool[] value, CancellationToken cancellationToken = default) => throw new NotImplementedException();
+    public override Task<OperResult> WriteAsync(string address, bool[] value, CancellationToken cancellationToken = default) => Task.FromResult(new OperResult());
 
 
     #region 其他方法

framework/foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/Dtu/ModbusTcpDtu/ModbusDtu.cs

@@ -14,14 +14,14 @@ using System.ComponentModel;
 
 namespace ThingsGateway.Foundation.Adapter.Modbus;
 /// <inheritdoc/>
-public class ModbusTcpDtu : ReadWriteDevicesTcpServerBase
+public class ModbusDtu : ReadWriteDevicesTcpServerBase
 {
     /// <inheritdoc/>
-    public ModbusTcpDtu(TcpService tcpService) : base(tcpService)
+    public ModbusDtu(TcpService tcpService) : base(tcpService)
     {
         ThingsGatewayBitConverter = new ThingsGatewayBitConverter(EndianType.Big);
         RegisterByteLength = 2;
-        ModbusTcpDtuPlugin modbusTcpSalvePlugin = new ModbusTcpDtuPlugin();
+        ModbusDtuPlugin modbusTcpSalvePlugin = new ModbusDtuPlugin();
         tcpService.Config.ConfigurePlugins(a =>
          {
              a.Add(modbusTcpSalvePlugin);
@@ -35,6 +35,18 @@ public class ModbusTcpDtu : ReadWriteDevicesTcpServerBase
     [Description("检测事务标识符")]
     public bool IsCheckMessageId { get; set; }
 
+    /// <summary>
+    /// 是否Rtu格式
+    /// </summary>
+    [Description("是否Rtu格式")]
+    public bool IsRtu { get; set; }
+
+    /// <summary>
+    /// Crc校验
+    /// </summary>
+    [Description("Crc校验")]
+    public bool Crc16CheckEnable { get; set; } = true;
+
     /// <summary>
     /// 站号
     /// </summary>
@@ -92,23 +104,49 @@ public class ModbusTcpDtu : ReadWriteDevicesTcpServerBase
     {
         if (socketClient != default)
         {
-            ModbusTcpDataHandleAdapter dataHandleAdapter = new()
-            {
-                IsCheckMessageId = IsCheckMessageId,
-                CacheTimeout = TimeSpan.FromMilliseconds(CacheTimeout)
-            };
-            socketClient.SetDataHandlingAdapter(dataHandleAdapter);
-        }
-        else
-        {
-            foreach (var item in TcpService.GetClients())
+            if (!IsRtu)
             {
                 ModbusTcpDataHandleAdapter dataHandleAdapter = new()
                 {
                     IsCheckMessageId = IsCheckMessageId,
                     CacheTimeout = TimeSpan.FromMilliseconds(CacheTimeout)
                 };
-                item.SetDataHandlingAdapter(dataHandleAdapter);
+                socketClient.SetDataHandlingAdapter(dataHandleAdapter);
+            }
+            else
+            {
+                ModbusRtuDataHandleAdapter dataHandleAdapter = new()
+                {
+                    Crc16CheckEnable = Crc16CheckEnable,
+                    CacheTimeout = TimeSpan.FromMilliseconds(CacheTimeout)
+                };
+                socketClient.SetDataHandlingAdapter(dataHandleAdapter);
+            }
+        }
+        else
+        {
+            //只适配第一个
+            var item = TcpService.GetClients().FirstOrDefault();
+            if (item != null)
+            {
+                if (!IsRtu)
+                {
+                    ModbusTcpDataHandleAdapter dataHandleAdapter = new()
+                    {
+                        IsCheckMessageId = IsCheckMessageId,
+                        CacheTimeout = TimeSpan.FromMilliseconds(CacheTimeout)
+                    };
+                    item.SetDataHandlingAdapter(dataHandleAdapter);
+                }
+                else
+                {
+                    ModbusRtuDataHandleAdapter dataHandleAdapter = new()
+                    {
+                        Crc16CheckEnable = Crc16CheckEnable,
+                        CacheTimeout = TimeSpan.FromMilliseconds(CacheTimeout)
+                    };
+                    item.SetDataHandlingAdapter(dataHandleAdapter);
+                }
             }
         }
     }
@@ -187,7 +225,7 @@ public class ModbusTcpDtu : ReadWriteDevicesTcpServerBase
         if (TcpService.TryGetSocketClient($"ID={id}", out var client))
         {
             SetDataAdapter(client);
-            return SendThenReturn<ModbusTcpMessage>(command, cancellationToken, client);
+            return SendThenReturn<MessageBase>(command, cancellationToken, client);
         }
         else
         {
@@ -200,7 +238,7 @@ public class ModbusTcpDtu : ReadWriteDevicesTcpServerBase
         if (TcpService.TryGetSocketClient($"ID={id}", out var client))
         {
             SetDataAdapter(client);
-            return await SendThenReturnAsync<ModbusTcpMessage>(command, cancellationToken, client);
+            return await SendThenReturnAsync<MessageBase>(command, cancellationToken, client);
         }
         else if (TcpService.SocketClients.Count == 1)
         {
@@ -208,13 +246,13 @@ public class ModbusTcpDtu : ReadWriteDevicesTcpServerBase
             if (client1 != null)
             {
                 SetDataAdapter(client1);
-                return await SendThenReturnAsync<ModbusTcpMessage>(command, cancellationToken, client1);
+                return await SendThenReturnAsync<MessageBase>(command, cancellationToken, client1);
             }
         }
         return new OperResult<byte[]>("客户端未连接");
     }
 
-    internal class ModbusTcpDtuPlugin : PluginBase, ITcpReceivingPlugin
+    internal class ModbusDtuPlugin : PluginBase, ITcpReceivingPlugin
     {
         public async Task OnTcpReceiving(ITcpClientBase client, ByteBlockEventArgs e)
         {

framework/foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusHelper.cs

@@ -134,21 +134,19 @@ internal class ModbusHelper
 
         if (response[1] >= 0x80)//错误码
             return new OperResult<byte[], FilterResult>(GetDescriptionByErrorCode(response[2])) { Content2 = FilterResult.Success };
-        if (response[1] <= 0x05)
+        if (response[1] <= 0x04)
         {
             if ((response.Length < response[2] + 5))
                 return new OperResult<byte[], FilterResult>("数据长度不足" + response.ToHexString()) { Content2 = FilterResult.Cache };
-
         }
         else
         {
             if ((response.Length < 8))
                 return new OperResult<byte[], FilterResult>("数据长度不足" + response.ToHexString()) { Content2 = FilterResult.Cache };
-
         }
 
 
-        var data = response.SelectMiddle(0, response[2] != 0 ? response[2] + 5 : 8);
+        var data = response.SelectMiddle(0, response[1] <= 0x04 ? response[2] != 0 ? response[2] + 5 : 8 : 8);
         if (crcCheck && !CRC16Utils.CheckCRC16(data))
             return new OperResult<byte[], FilterResult>("Crc校验失败" + DataTransUtil.ByteToHexString(data, ' ')) { Content2 = FilterResult.Success };
         return GetModbusData(send, data.RemoveLast(2));

framework/foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusTcp/ModbusTcpDataHandleAdapter.cs

@@ -19,7 +19,7 @@ namespace ThingsGateway.Foundation.Adapter.Modbus;
 /// </summary>
 internal class ModbusTcpDataHandleAdapter : ReadWriteDevicesSingleStreamDataHandleAdapter<ModbusTcpMessage>
 {
-    private readonly IncrementCount easyIncrementCount = new(ushort.MaxValue);
+    private readonly IncrementCount _incrementCount = new(ushort.MaxValue);
 
     /// <summary>
     /// 检测事务标识符
@@ -39,7 +39,7 @@ internal class ModbusTcpDataHandleAdapter : ReadWriteDevicesSingleStreamDataHand
     /// <inheritdoc/>
     public override byte[] PackCommand(byte[] command)
     {
-        return ModbusHelper.AddModbusTcpHead(command, (ushort)easyIncrementCount.GetCurrentValue());
+        return ModbusHelper.AddModbusTcpHead(command, (ushort)_incrementCount.GetCurrentValue());
     }
 
     /// <inheritdoc/>

framework/foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusUdp/ModbusUdpDataHandleAdapter.cs

@@ -18,7 +18,7 @@ namespace ThingsGateway.Foundation.Adapter.Modbus;
 /// </summary>
 internal class ModbusUdpDataHandleAdapter : ReadWriteDevicesUdpDataHandleAdapter<ModbusTcpMessage>
 {
-    private readonly IncrementCount easyIncrementCount = new(ushort.MaxValue);
+    private readonly IncrementCount _incrementCount = new(ushort.MaxValue);
 
     /// <summary>
     /// 检测事务标识符
@@ -38,7 +38,7 @@ internal class ModbusUdpDataHandleAdapter : ReadWriteDevicesUdpDataHandleAdapter
     /// <inheritdoc/>
     public override byte[] PackCommand(byte[] command)
     {
-        return ModbusHelper.AddModbusTcpHead(command, (ushort)easyIncrementCount.GetCurrentValue());
+        return ModbusHelper.AddModbusTcpHead(command, (ushort)_incrementCount.GetCurrentValue());
     }
 
     /// <inheritdoc/>

framework/foundation/ThingsGateway.Foundation/Foundation/BaseReadWrite/IReadWrite.cs

@@ -143,7 +143,7 @@ public interface IReadWrite : IDisposable
     /// <param name="cancellationToken">取消令箭</param>
     /// <param name="senderClient">传入改参数时，将新建等待线程</param>
     /// <returns></returns>
-    T SendThenReturn<T>(byte[] command, CancellationToken cancellationToken, ISenderClient senderClient = default) where T : OperResult<byte[]>, new();
+    T SendThenReturn<T>(byte[] command, CancellationToken cancellationToken, ISenderClient senderClient = default) where T : OperResult<byte[]>;
 
     /// <summary>
     /// 异步发送并返回结果
@@ -153,7 +153,7 @@ public interface IReadWrite : IDisposable
     /// <param name="cancellationToken">取消令箭</param>
     /// <param name="senderClient">传入改参数时，将新建等待线程</param>
     /// <returns></returns>
-    Task<T> SendThenReturnAsync<T>(byte[] command, CancellationToken cancellationToken, ISenderClient senderClient = default) where T : OperResult<byte[]>, new();
+    Task<T> SendThenReturnAsync<T>(byte[] command, CancellationToken cancellationToken, ISenderClient senderClient = default) where T : OperResult<byte[]>;
 
     /// <summary>
     /// 发送获取数据

framework/foundation/ThingsGateway.Foundation/Foundation/BaseReadWrite/ReadWriteDevicesBase.cs

@@ -148,7 +148,7 @@ public abstract class ReadWriteDevicesBase : IReadWrite
     public abstract void Send(byte[] command, string id = default);
 
     /// <inheritdoc/>
-    public virtual T SendThenReturn<T>(byte[] command, CancellationToken cancellationToken, ISenderClient senderClient = default) where T : OperResult<byte[]>, new()
+    public virtual T SendThenReturn<T>(byte[] command, CancellationToken cancellationToken, ISenderClient senderClient = default) where T : OperResult<byte[]>
     {
         var item = command;
         if (FrameTime != 0)
@@ -157,7 +157,7 @@ public abstract class ReadWriteDevicesBase : IReadWrite
         return (T)result.RequestInfo;
     }
     /// <inheritdoc/>
-    public virtual async Task<T> SendThenReturnAsync<T>(byte[] command, CancellationToken cancellationToken, ISenderClient senderClient = default) where T : OperResult<byte[]>, new()
+    public virtual async Task<T> SendThenReturnAsync<T>(byte[] command, CancellationToken cancellationToken, ISenderClient senderClient = default) where T : OperResult<byte[]>
     {
         var item = command;
         await Task.Delay(FrameTime, cancellationToken);

framework/foundation/ThingsGateway.Foundation/Foundation/BaseReadWrite/ReadWriteDevicesUdpSessionBase.cs

@@ -69,7 +69,7 @@ public abstract class ReadWriteDevicesUdpSessionBase : ReadWriteDevicesBase
     /// <inheritdoc/>
     public override string ToString()
     {
-        return UdpSession.RemoteIPHost.ToString();
+        return UdpSession.RemoteIPHost?.ToString();
     }
 
     /// <inheritdoc/>

framework/foundation/ThingsGateway.Foundation/Foundation/DataHandleAdapter/ReadWriteDevicesSingleStreamDataHandleAdapter.cs

@@ -29,6 +29,7 @@ public abstract class ReadWriteDevicesSingleStreamDataHandleAdapter<TRequest> :
     public ReadWriteDevicesSingleStreamDataHandleAdapter()
     {
         Request = GetInstance();
+        CacheTimeoutEnable = true;
     }
     /// <inheritdoc/>
     public override bool CanSendRequestInfo => false;

framework/foundation/ThingsGateway.Foundation/Foundation/DataHandleAdapter/ReadWriteDevicesUdpDataHandleAdapter.cs

@@ -53,7 +53,7 @@ public abstract class ReadWriteDevicesUdpDataHandleAdapter<TRequest> : UdpDataHa
     /// <inheritdoc/>
     public override string ToString()
     {
-        return (Owner as UdpSession)?.RemoteIPHost.ToString();
+        return (Owner as UdpSession)?.RemoteIPHost?.ToString();
     }
 
     /// <summary>
@@ -83,11 +83,11 @@ public abstract class ReadWriteDevicesUdpDataHandleAdapter<TRequest> : UdpDataHa
         var allBytes = byteBlock.ToArray(0, byteBlock.Len);
         Logger?.Trace($"{FoundationConst.LogMessageHeader}{ToString()}- 接收:{(IsHexData ? allBytes.ToHexString(' ') : Encoding.UTF8.GetString(allBytes))}");
 
-        if (Request?.SendBytes == null)
-        {
-            GoReceived(remoteEndPoint, byteBlock, null);
-            return;
-        }
+        //if (Request?.SendBytes == null)
+        //{
+        //    GoReceived(remoteEndPoint, byteBlock, null);
+        //    return;
+        //}
         byte[] header = new byte[] { };
         if (Request.HeadBytesLength > 0)
         {

framework/foundation/ThingsGateway.Foundation/Foundation/Extensions/StringExtensions.cs

@@ -421,6 +421,74 @@ public static class StringExtensions
     {
         return value.IsNullOrEmpty() ? defaultValue : ushort.TryParse(value, out var n) ? n : defaultValue;
     }
+    /// <summary>
+    /// ToDouble
+    /// </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>
+    /// ToDecimal
+    /// </summary>
+    /// <returns></returns>
+    public static decimal ToDecimal(this object value, int defaultValue = 0)
+    {
+        if (value is Double d)
+        {
+            return Double.IsNaN(d) ? defaultValue : (Decimal)d;
+        }
+        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>
+    /// ToInt
+    /// </summary>
+    /// <returns></returns>
+    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>
     /// 用 正则表达式 判断字符是不是汉字

framework/foundation/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj

@@ -2,7 +2,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='net45'">

framework/foundation/ThingsGateway.Foundation/TouchSocket/Http/Config/HttpConfigExtensions.cs

@@ -51,9 +51,9 @@ namespace ThingsGateway.Foundation.Sockets
         /// </summary>
         /// <param name="config"></param>
         /// <returns></returns>
-        public static HttpClient BuildWithHttpClient(this TouchSocketConfig config)
+        public static Http.HttpClient BuildWithHttpClient(this TouchSocketConfig config)
         {
-            return BuildWithHttpClient<HttpClient>(config);
+            return BuildWithHttpClient<Http.HttpClient>(config);
         }
 
         /// <summary>

framework/foundation/ThingsGateway.Foundation/TouchSocket/Http/StaticPage/HttpStaticPagePlugin.cs

@@ -43,26 +43,25 @@ namespace ThingsGateway.Foundation.Http
             });
         }
 
-        /// <summary>
-        /// 静态文件缓存。
-        /// </summary>
-        public FileCachePool FileCache { get; private set; }
-
         /// <summary>
         /// 提供文件扩展名和MIME类型之间的映射。
         /// </summary>
         public IContentTypeProvider ContentTypeProvider { get; set; }
 
         /// <summary>
-        /// 设置提供文件扩展名和MIME类型之间的映射。
+        /// 静态文件缓存。
         /// </summary>
-        /// <param name="provider"></param>
-        /// <returns></returns>
-        public HttpStaticPagePlugin SetContentTypeProvider(IContentTypeProvider provider)
-        {
-            this.ContentTypeProvider = provider ?? throw new ArgumentNullException(nameof(provider));
-            return this;
-        }
+        public FileCachePool FileCache { get; private set; }
+
+        /// <summary>
+        /// 重新导航。
+        /// </summary>
+        public Func<HttpRequest, Task<string>> NavigateAction { get; set; }
+
+        /// <summary>
+        /// 在响应之前调用
+        /// </summary>
+        public Func<HttpContext, Task> ResponseAction { get; set; }
 
         /// <summary>
         /// 添加静态
@@ -76,7 +75,33 @@ namespace ThingsGateway.Foundation.Http
             timeout ??= TimeSpan.FromHours(1);
             this.FileCache.InsertPath(path, prefix, filter, timeout.Value, null);
         }
+        /// <inheritdoc/>
+        public async Task OnHttpRequest(IHttpSocketClient client, HttpContextEventArgs e)
+        {
+            var url = await this.NavigateAction.Invoke(e.Context.Request);
+            if (this.FileCache.Find(url, out var data))
+            {
+                var response = e.Context.Response;
+                response.SetStatus();
+                if (this.ContentTypeProvider?.TryGetContentType(url, out var result) != true)
+                {
+                    result = HttpTools.GetContentTypeFromExtension(url);
+                }
+                response.ContentType = result;
+                response.SetContent(data);
+                if (this.ResponseAction != null)
+                {
+                    await this.ResponseAction.Invoke(e.Context);
+                }
 
+                await response.AnswerAsync();
+                e.Handled = true;
+            }
+            else
+            {
+                await e.InvokeNext();
+            }
+        }
         /// <summary>
         /// Clear static content cache
         /// </summary>
@@ -84,20 +109,23 @@ namespace ThingsGateway.Foundation.Http
         {
             this.FileCache.Clear();
         }
-
         /// <summary>
-        /// 重新导航
+        /// Remove static content cache
         /// </summary>
-        public Func<HttpRequest, Task<string>> NavigateAction { get; set; }
-
-        /// <summary>
-        /// 设定重新导航
-        /// </summary>
-        /// <param name="func"></param>
-        /// <returns></returns>
-        public HttpStaticPagePlugin SetNavigateAction(Func<HttpRequest, Task<string>> func)
+        /// <param name="path">Static content path</param>
+        public void RemoveFolder(string path)
         {
-            this.NavigateAction = func;
+            this.FileCache.RemovePath(path);
+        }
+
+        /// <summary>
+        /// 设置提供文件扩展名和MIME类型之间的映射。
+        /// </summary>
+        /// <param name="provider"></param>
+        /// <returns></returns>
+        public HttpStaticPagePlugin SetContentTypeProvider(IContentTypeProvider provider)
+        {
+            this.ContentTypeProvider = provider ?? throw new ArgumentNullException(nameof(provider));
             return this;
         }
 
@@ -115,35 +143,30 @@ namespace ThingsGateway.Foundation.Http
             return this;
         }
 
-        /// <inheritdoc/>
-        public async Task OnHttpRequest(IHttpSocketClient client, HttpContextEventArgs e)
+        /// <summary>
+        /// 在响应之前调用。
+        /// </summary>
+        /// <param name="func"></param>
+        /// <returns></returns>
+        public HttpStaticPagePlugin SetResponseAction(Func<HttpContext, Task> func)
         {
-            var url = await this.NavigateAction.Invoke(e.Context.Request);
-            if (this.FileCache.Find(url, out var data))
-            {
-                e.Context.Response.SetStatus();
-                if (this.ContentTypeProvider?.TryGetContentType(url, out var result) != true)
-                {
-                    result = HttpTools.GetContentTypeFromExtension(url);
-                }
-                e.Context.Response.ContentType = result;
-                e.Context.Response.SetContentLength(data.Length)
-                    .WriteContent(data);
-                e.Handled = true;
-            }
-            else
-            {
-                await e.InvokeNext();
-            }
+            this.ResponseAction = func;
+            return this;
         }
 
         /// <summary>
-        /// Remove static content cache
+        /// 在响应之前调用。
         /// </summary>
-        /// <param name="path">Static content path</param>
-        public void RemoveFolder(string path)
+        /// <param name="action"></param>
+        /// <returns></returns>
+        public HttpStaticPagePlugin SetResponseAction(Action<HttpContext> action)
         {
-            this.FileCache.RemovePath(path);
+            this.ResponseAction = (response) =>
+            {
+                action.Invoke(response);
+                return EasyTask.CompletedTask;
+            };
+            return this;
         }
     }
 }

framework/foundation/ThingsGateway.Foundation/TouchSocket/Socket/Components/Tcp/SocketClient.cs

@@ -40,6 +40,14 @@ namespace ThingsGateway.Foundation.Sockets
         {
             this.Protocol = Protocol.Tcp;
         }
+        /// <summary>
+        /// <inheritdoc/>
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return $"{nameof(SocketClient)}:{IP}:{Port}";
+        }
 
         #region 变量
 

framework/foundation/ThingsGateway.Foundation/TouchSocket/WebApi.Swagger/Plugins/SwaggerPlugin.cs

@@ -75,7 +75,7 @@ namespace ThingsGateway.Foundation.WebApi.Swagger
                     var bytes = new byte[stream.Length];
                     stream.Read(bytes, 0, bytes.Length);
                     var prefix = this.Prefix.IsNullOrEmpty() ? "/" : (this.Prefix.StartsWith("/") ? this.Prefix : $"/{this.Prefix}");
-                    var name = item.Replace("ThingsGateway.Foundation.ThingsGateway.Foundation.WebApi.Swagger.api.", string.Empty);
+                    var name = item.Replace("ThingsGateway.Foundation.TouchSocket.WebApi.Swagger.api.", string.Empty);
                     if (name == "openapi.json")
                     {
                         try

framework/foundation/ThingsGateway.Foundation/TouchSocket/WebApi/Plugins/WebApiParserPlugin.cs

@@ -342,11 +342,11 @@ namespace ThingsGateway.Foundation.WebApi
             var client = (IHttpSocketClient)sender;
             var e = (HttpContextEventArgs)args;
 
-            if (e.Context.Request.Method == HttpMethod.Get)
+            if (e.Context.Request.Method == Http.HttpMethod.Get)
             {
                 return this.OnHttpGet(client, e);
             }
-            else if (e.Context.Request.Method == HttpMethod.Post)
+            else if (e.Context.Request.Method == Http.HttpMethod.Post)
             {
                 return this.OnHttpPost(client, e);
             }

framework/gateway/Directory.Build.props

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

framework/gateway/ThingsGateway.Gateway.ApiController/Controllers/CollectDbInfoControler.cs

@@ -30,14 +30,14 @@ public class CollectDbInfoControler : IDynamicApiController
 {
     readonly IServiceScope _serviceScope;
     /// <inheritdoc cref="CollectDbInfoControler"/>
-    public CollectDbInfoControler(IServiceScopeFactory scopeFactory, VariableService variableService, CollectDeviceService collectDeviceService)
+    public CollectDbInfoControler(IServiceScopeFactory scopeFactory, VariableService variableService, ICollectDeviceService collectDeviceService)
     {
         _serviceScope = scopeFactory.CreateScope();
         _variableService = variableService;
         _collectDeviceService = collectDeviceService;
     }
 
-    CollectDeviceService _collectDeviceService { get; set; }
+    ICollectDeviceService _collectDeviceService { get; set; }
     VariableService _variableService { get; set; }
     /// <summary>
     /// 获取采集设备信息

framework/gateway/ThingsGateway.Gateway.ApiController/Controllers/FileController.cs

@@ -23,9 +23,9 @@ namespace ThingsGateway.Gateway.ApiController;
 public class FileController : IDynamicApiController
 {
     private readonly IBackendLogService _backendLogService;
-    private readonly CollectDeviceService _collectDeviceService;
+    private readonly ICollectDeviceService _collectDeviceService;
     private readonly IRpcLogService _rpcLogService;
-    private readonly UploadDeviceService _uploadDeviceService;
+    private readonly IUploadDeviceService _uploadDeviceService;
     private readonly VariableService _variableService;
     /// <summary>
     /// <inheritdoc cref="FileController"/>
@@ -33,8 +33,8 @@ public class FileController : IDynamicApiController
     public FileController(
         IRpcLogService rpcLogService,
         IBackendLogService backendLogService,
-        CollectDeviceService collectDeviceService,
-        UploadDeviceService uploadDeviceService,
+        ICollectDeviceService collectDeviceService,
+        IUploadDeviceService uploadDeviceService,
         VariableService variableService
         )
     {

framework/gateway/ThingsGateway.Gateway.ApiController/ThingsGateway.Gateway.ApiController.xml

@@ -9,7 +9,7 @@
             采集设备
             </summary>
         </member>
-        <member name="M:ThingsGateway.Gateway.ApiController.CollectDbInfoControler.#ctor(Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,ThingsGateway.Gateway.Application.VariableService,ThingsGateway.Gateway.Application.CollectDeviceService)">
+        <member name="M:ThingsGateway.Gateway.ApiController.CollectDbInfoControler.#ctor(Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,ThingsGateway.Gateway.Application.VariableService,ThingsGateway.Gateway.Application.ICollectDeviceService)">
             <inheritdoc cref="T:ThingsGateway.Gateway.ApiController.CollectDbInfoControler"/>
         </member>
         <member name="M:ThingsGateway.Gateway.ApiController.CollectDbInfoControler.GetCollectDeviceList(ThingsGateway.Gateway.Application.DevicePageInput)">
@@ -29,7 +29,7 @@
             文件下载
             </summary>
         </member>
-        <member name="M:ThingsGateway.Gateway.ApiController.FileController.#ctor(ThingsGateway.Gateway.Application.IRpcLogService,ThingsGateway.Gateway.Application.IBackendLogService,ThingsGateway.Gateway.Application.CollectDeviceService,ThingsGateway.Gateway.Application.UploadDeviceService,ThingsGateway.Gateway.Application.VariableService)">
+        <member name="M:ThingsGateway.Gateway.ApiController.FileController.#ctor(ThingsGateway.Gateway.Application.IRpcLogService,ThingsGateway.Gateway.Application.IBackendLogService,ThingsGateway.Gateway.Application.ICollectDeviceService,ThingsGateway.Gateway.Application.IUploadDeviceService,ThingsGateway.Gateway.Application.VariableService)">
             <summary>
             <inheritdoc cref="T:ThingsGateway.Gateway.ApiController.FileController"/>
             </summary>

framework/gateway/ThingsGateway.Gateway.Application/Model/DeviceVariableRunTime.cs

@@ -10,6 +10,8 @@
 //------------------------------------------------------------------------------
 #endregion
 
+using Mapster;
+
 using System.ComponentModel;
 
 using ThingsGateway.Gateway.Core.Extensions;
@@ -48,6 +50,7 @@ public class DeviceVariableRunTime : DeviceVariable, IDeviceVariableRunTime
     /// </summary>
     [Newtonsoft.Json.JsonIgnore]
     [System.Text.Json.Serialization.JsonIgnore]
+    [AdaptIgnore]
     [Description("采集设备")]
     public CollectDeviceRunTime CollectDeviceRunTime { get; set; }
 

framework/gateway/ThingsGateway.Gateway.Application/Plugin/CollectBase.cs

@@ -43,14 +43,16 @@ public abstract class CollectBase : DriverBase
 
     public override async Task AfterStopAsync()
     {
-        await base.AfterStopAsync();
         //去除全局设备变量
         lock (_globalDeviceData.CollectDevices)
         {
             _globalDeviceData.CollectDevices.RemoveWhere(it => it.Id == DeviceId);
         }
+        await base.AfterStopAsync();
     }
 
+
+
     public override void Init(DeviceRunTime device)
     {
         base.Init(device);
@@ -83,7 +85,7 @@ public abstract class CollectBase : DriverBase
     public virtual async Task<Dictionary<string, OperResult>> WriteValuesAsync(Dictionary<DeviceVariableRunTime, JToken> writeInfoLists, CancellationToken cancellationToken)
     {
         if (_readWrite == null)
-            throw new("未初始化成功");
+            throw new($"无法写入数据，{nameof(_readWrite)}为null");
         Dictionary<string, OperResult> operResults = new();
         foreach (var writeInfo in writeInfoLists)
         {
@@ -165,7 +167,7 @@ public abstract class CollectBase : DriverBase
 
                         if (!string.IsNullOrEmpty(methodResult.MethodStr))
                         {
-                            string[] strs = methodResult.MethodStr?.Trim()?.TrimEnd(';').Split(';');
+                            string[] strs = methodResult.MethodStr?.Trim()?.TrimEnd(',').Split(',');
                             try
                             {
                                 int index = 0;
@@ -233,7 +235,7 @@ public abstract class CollectBase : DriverBase
                     var readErrorCount = 0;
                     var readResult = await ReadSourceAsync(deviceVariableSourceRead, cancellationToken);
 
-                    while (readResult != null && !readResult.IsSuccess && readErrorCount < 3)
+                    while (readResult != null && !readResult.IsSuccess && readErrorCount < DriverPropertys.RetryCount)
                     {
                         readErrorCount++;
                         LogMessage?.Trace($"{DeviceName} - 采集[{deviceVariableSourceRead?.Address} - {deviceVariableSourceRead?.Length}] 数据失败 - {readResult?.Message}");
@@ -285,7 +287,7 @@ public abstract class CollectBase : DriverBase
                     var readErrorCount = 0;
                     var readResult = await InvokeMethodAsync(deviceVariableMethodRead, cancellationToken);
 
-                    while (readResult != null && !readResult.IsSuccess && readErrorCount < 3)
+                    while (readResult != null && !readResult.IsSuccess && readErrorCount < DriverPropertys.RetryCount)
                     {
                         readErrorCount++;
                         LogMessage?.Trace($"{DeviceName} - 执行方法[{deviceVariableMethodRead.MethodInfo.Name}] - 失败 - {readResult?.Message}");
@@ -363,8 +365,8 @@ public abstract class CollectBase : DriverBase
 
                     if (!string.IsNullOrEmpty(deviceVariableMethodSource.MethodStr) || !string.IsNullOrEmpty(value))
                     {
-                        var strs1 = deviceVariableMethodSource.MethodStr?.Trim()?.TrimEnd(';').Split(';') ?? Array.Empty<string>();
-                        var strs2 = value?.Trim()?.TrimEnd(';').Split(';') ?? Array.Empty<string>();
+                        var strs1 = deviceVariableMethodSource.MethodStr?.Trim()?.TrimEnd(',').Split(',') ?? Array.Empty<string>();
+                        var strs2 = value?.Trim()?.TrimEnd(',').Split(',') ?? Array.Empty<string>();
                         //通过分号分割，并且合并参数
                         var strs = GenericExtensions.SpliceArray(strs1, strs2);
                         int index = 0;

framework/gateway/ThingsGateway.Gateway.Application/Plugin/DeviceThread.cs

@@ -139,7 +139,11 @@ public class DeviceThread
                                 var result = await device.ExecuteAsync(stoppingToken);
                                 if (result == ThreadRunReturn.None)
                                 {
-                                    await Task.Delay(CycleInterval, stoppingToken);
+                                    //4.0.0.7版本添加离线恢复的间隔时间
+                                    if (device.CurrentDevice.DeviceStatus == DeviceStatusEnum.OffLine && device is not UpLoadBase)
+                                        await Task.Delay(Math.Min(device.DriverPropertys.ReIntervalTime, DeviceWorker.CheckIntervalTime / 2) * 1000 - CycleInterval, stoppingToken);
+                                    else
+                                        await Task.Delay(CycleInterval, stoppingToken);
                                 }
                                 else if (result == ThreadRunReturn.Continue)
                                 {

framework/gateway/ThingsGateway.Gateway.Application/Plugin/DriverBase.cs

@@ -275,7 +275,7 @@ public abstract class DriverBase : DisposableObject
         {
             LogMessage?.LogError(ex, $"插件执行{nameof(ExecuteAsync)}方法失败");
             CurrentDevice.SetDeviceStatus(null, CurrentDevice.ErrorCount + 1, ex.Message);
-            return ThreadRunReturn.Continue;
+            return ThreadRunReturn.None;
         }
     }
 

framework/gateway/ThingsGateway.Gateway.Application/Plugin/DriverProperty.cs

@@ -33,6 +33,17 @@ public abstract class VariablePropertyBase
 /// </summary>
 public abstract class DriverPropertyBase
 {
+
+    /// <summary>
+    /// 离线后恢复运行的间隔时间 /s，默认300s
+    /// </summary>
+    [DeviceProperty("离线恢复间隔", "离线后恢复运行的间隔时间s，默认300s，最大3600s")]
+    public virtual int ReIntervalTime { get; set; } = 300;
+    /// <summary>
+    /// 失败重试次数，默认3
+    /// </summary>
+    [DeviceProperty("失败重试次数", "失败重试次数，默认3")]
+    public virtual int RetryCount { get; set; } = 3;
     #region 共享通道配置
 
     /// <summary>
@@ -87,4 +98,22 @@ public abstract class DriverPropertyBase
 
     #endregion
 
+}
+
+
+/// <summary>
+/// 插件配置项
+/// <para></para>
+/// 约定：
+/// 如果需要密码输入，属性名称中需包含Password字符串
+/// <br></br>
+/// 使用<see cref="DevicePropertyAttribute"/> 标识所需的配置属性
+/// </summary>
+public abstract class UpDriverPropertyBase : DriverPropertyBase
+{
+
+    public override int ReIntervalTime { get; set; } = 300;
+
+    public override int RetryCount { get; set; } = 3;
+
 }

framework/gateway/ThingsGateway.Gateway.Application/Plugin/UploadPropertyWithCache.cs

@@ -15,7 +15,7 @@ namespace ThingsGateway.Gateway.Application;
 /// <summary>
 /// <inheritdoc/>
 /// </summary>
-public class UploadPropertyWithCache : DriverPropertyBase
+public class UploadPropertyWithCache : UpDriverPropertyBase
 {
     /// <summary>
     /// 线程循环间隔

framework/gateway/ThingsGateway.Gateway.Application/Plugin/UploadPropertyWithCacheT.cs

@@ -15,7 +15,7 @@ namespace ThingsGateway.Gateway.Application;
 /// <summary>
 /// <inheritdoc/>
 /// </summary>
-public class UploadPropertyWithCacheT : DriverPropertyBase
+public class UploadPropertyWithCacheT : UpDriverPropertyBase
 {
     /// <summary>
     /// 线程循环间隔

framework/gateway/ThingsGateway.Gateway.Application/Services/Device/CollectDeviceService.cs

@@ -24,8 +24,10 @@ using Yitter.IdGenerator;
 namespace ThingsGateway.Gateway.Application;
 
 [Injection(Proxy = typeof(OperDispatchProxy))]
-public class CollectDeviceService : DeviceService<CollectDevice>, ITransient
+public class CollectDeviceService : DeviceService<CollectDevice>, ITransient, ICollectDeviceService
 {
+    protected override string DeviceSheetName => ExportHelpers.CollectDeviceSheetName;
+
     public CollectDeviceService(IServiceScopeFactory serviceScopeFactory, IFileService fileService) : base(serviceScopeFactory, fileService)
     {
     }

framework/gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceService.cs

@@ -10,7 +10,6 @@
 //------------------------------------------------------------------------------
 #endregion
 
-using Furion.DependencyInjection;
 using Furion.FriendlyException;
 
 using Mapster;
@@ -31,12 +30,11 @@ using Yitter.IdGenerator;
 
 namespace ThingsGateway.Gateway.Application;
 
-[Injection(Proxy = typeof(OperDispatchProxy))]
-public abstract class DeviceService<T> : DbRepository<T> where T : Device, new()
+public abstract class DeviceService<T> : DbRepository<T>, IDeviceService<T> where T : Device, new()
 {
     protected readonly IFileService _fileService;
     protected readonly IServiceScope _serviceScope;
-    /// <inheritdoc cref="CollectDeviceService"/>
+    /// <inheritdoc cref="ICollectDeviceService"/>
     public DeviceService(
     IServiceScopeFactory serviceScopeFactory,
     IFileService fileService
@@ -206,7 +204,7 @@ public abstract class DeviceService<T> : DbRepository<T> where T : Device, new()
         var data = await query.ToListAsync();
         return await ExportFileAsync(data);
     }
-
+    protected abstract string DeviceSheetName { get; }
     /// <inheritdoc/>
     [OperDesc("导出采集设备表", IsRecordPar = false)]
     public async Task<MemoryStream> ExportFileAsync(List<T> devDatas = null)
@@ -235,8 +233,8 @@ public abstract class DeviceService<T> : DbRepository<T> where T : Device, new()
             }
             deviceDicts.TryGetValue(devData.RedundantDeviceId, out var redundantDevice);
 
-            //设备实体没有包含插件名称，手动插入
-            devExport.Add(ExportHelpers.PluginName, devData.PluginName);
+            ////设备实体没有包含插件名称，手动插入
+            //devExport.Add(ExportHelpers.PluginName, devData.PluginName);
             //设备实体没有包含冗余设备名称，手动插入
             devExport.Add(ExportHelpers.RedundantDeviceName, redundantDevice?.Name);
 
@@ -277,7 +275,7 @@ public abstract class DeviceService<T> : DbRepository<T> where T : Device, new()
         }
 
         //添加设备页
-        sheets.Add(ExportHelpers.CollectDeviceSheetName, devExports);
+        sheets.Add(DeviceSheetName, devExports);
 
 
         //添加插件属性页
@@ -321,7 +319,7 @@ public abstract class DeviceService<T> : DbRepository<T> where T : Device, new()
         var collectDevices = new List<T>();
         foreach (var item in input)
         {
-            if (item.Key == ExportHelpers.CollectDeviceSheetName)
+            if (item.Key == DeviceSheetName)
             {
                 var collectDeviceImports = ((ImportPreviewOutput<T>)item.Value).Data;
                 collectDevices = collectDeviceImports.Values.Adapt<List<T>>();
@@ -362,7 +360,7 @@ public abstract class DeviceService<T> : DbRepository<T> where T : Device, new()
             //单页数据
             var rows = stream.Query(useHeaderRow: true, sheetName: sheetName).Cast<IDictionary<string, object>>();
             #region 采集设备sheet
-            if (sheetName == ExportHelpers.CollectDeviceSheetName)
+            if (sheetName == DeviceSheetName)
             {
                 int row = 1;
                 ImportPreviewOutput<T> importPreviewOutput = new();
@@ -376,22 +374,22 @@ public abstract class DeviceService<T> : DbRepository<T> where T : Device, new()
                     {
                         var device = ((ExpandoObject)item).ConvertToEntity<T>(true);
                         #region 特殊转化名称
-                        //转化插件名称
-                        var hasPlugin = item.TryGetValue(ExportHelpers.PluginName, out var pluginObj);
+                        ////转化插件名称
+                        //var hasPlugin = item.TryGetValue(ExportHelpers.PluginName, out var pluginObj);
 
-                        if (pluginObj == null || !driverPluginFullNameDict.TryGetValue(pluginObj.ToString(), out var plugin))
-                        {
-                            //找不到对应的插件
-                            importPreviewOutput.HasError = true;
-                            importPreviewOutput.Results.Add((row++, false, $"{ExportHelpers.PluginName}不存在"));
-                            return;
-                        }
+                        //if (pluginObj == null || !driverPluginFullNameDict.TryGetValue(pluginObj.ToString(), out var plugin))
+                        //{
+                        //    //找不到对应的插件
+                        //    importPreviewOutput.HasError = true;
+                        //    importPreviewOutput.Results.Add((row++, false, $"{ExportHelpers.PluginName}不存在"));
+                        //    return;
+                        //}
                         //转化冗余设备名称
-                        var hasRedundant = item.TryGetValue(ExportHelpers.PluginName, out var redundantObj);
+                        var hasRedundant = item.TryGetValue(ExportHelpers.RedundantDeviceName, out var redundantObj);
 
                         #endregion
                         //设备ID、冗余设备ID都需要手动补录
-                        if (hasRedundant && deviceDicts.TryGetValue(redundantObj.ToString(), out var rendundantDevice))
+                        if (hasRedundant && redundantObj != null && deviceDicts.TryGetValue(redundantObj.ToString(), out var rendundantDevice))
                         {
                             device.RedundantDeviceId = rendundantDevice.Id;
                         }

framework/gateway/ThingsGateway.Gateway.Application/Services/Device/ICollectDeviceService.cs

@@ -0,0 +1,10 @@
+
+namespace ThingsGateway.Gateway.Application
+{
+    public interface ICollectDeviceService : IDeviceService<CollectDevice>
+    {
+        Task CopyDevAndVarAsync(IEnumerable<CollectDevice> input);
+        Task EditsAsync(List<CollectDevice> input);
+        Task<IEnumerable<DeviceRunTime>> GetDeviceRuntimeAsync(long devId = 0);
+    }
+}

framework/gateway/ThingsGateway.Gateway.Application/Services/Device/IDeviceService.cs

@@ -0,0 +1,24 @@
+using Microsoft.AspNetCore.Components.Forms;
+
+namespace ThingsGateway.Gateway.Application
+{
+    public interface IDeviceService<T> where T : Device, new()
+    {
+        Task AddAsync(T input);
+        Task CopyDevAsync(IEnumerable<T> input);
+        Task DeleteAsync(params long[] input);
+        Task EditAsync(DeviceEditInput input);
+        Task<MemoryStream> ExportFileAsync(List<T> devDatas = null);
+        Task<MemoryStream> ExportFileAsync(DeviceInput input);
+        List<T> GetCacheList(bool isMapster);
+        T GetDeviceById(long Id);
+        long? GetIdByName(string name);
+        string GetNameById(long id);
+        List<DeviceTree> GetTree();
+        Task ImportAsync(Dictionary<string, ImportPreviewOutputBase> input);
+        Task<SqlSugarPagedList<T>> PageAsync(DevicePageInput input);
+        Task<Dictionary<string, ImportPreviewOutputBase>> PreviewAsync(IBrowserFile file);
+        Task<Dictionary<string, ImportPreviewOutputBase>> PreviewAsync(MemoryStream stream);
+        void RemoveCache();
+    }
+}

framework/gateway/ThingsGateway.Gateway.Application/Services/Device/IUploadDeviceService.cs

@@ -0,0 +1,9 @@
+
+namespace ThingsGateway.Gateway.Application
+{
+    public interface IUploadDeviceService : IDeviceService<Device>
+    {
+        Task EditsAsync(List<Device> input);
+        IEnumerable<DeviceRunTime> GetDeviceRuntime(long devId = 0);
+    }
+}

framework/gateway/ThingsGateway.Gateway.Application/Services/Device/UploadDeviceService.cs

@@ -19,8 +19,9 @@ using Microsoft.Extensions.DependencyInjection;
 namespace ThingsGateway.Gateway.Application;
 
 [Injection(Proxy = typeof(OperDispatchProxy))]
-public class UploadDeviceService : DeviceService<Device>, ITransient
+public class UploadDeviceService : DeviceService<Device>, ITransient, IUploadDeviceService
 {
+    protected override string DeviceSheetName => ExportHelpers.UploadDeviceSheetName;
     public UploadDeviceService(IServiceScopeFactory serviceScopeFactory, IFileService fileService) : base(serviceScopeFactory, fileService)
     {
     }

framework/gateway/ThingsGateway.Gateway.Application/Services/DriverPlugin/DriverPluginService.cs

@@ -173,7 +173,7 @@ public class DriverPluginService : ISingleton
 
                 }
                 return plugins;
-            }, false);
+            }, true);
             return data;
         }
     }
@@ -270,9 +270,9 @@ public class DriverPluginService : ISingleton
     static T GetCustomAttributeRecursive<T>(PropertyInfo property) where T : Attribute
     {
         var attribute = property.GetCustomAttribute<T>(false);
-        if (attribute == null && property.DeclaringType.BaseType != null)
+        if (attribute == null && property.ReflectedType.BaseType != null && property.ReflectedType != typeof(UpDriverPropertyBase))
         {
-            var baseProperty = property.DeclaringType.BaseType.GetProperties().FirstOrDefault(p => p.Name == property.Name);
+            var baseProperty = property.ReflectedType.BaseType.GetProperties().FirstOrDefault(p => p.Name == property.Name);
             if (baseProperty != null)
             {
                 attribute = GetCustomAttributeRecursive<T>(baseProperty);

framework/gateway/ThingsGateway.Gateway.Application/Services/Variable/IVariableService.cs

@@ -0,0 +1,23 @@
+using Furion.DependencyInjection;
+
+using Microsoft.AspNetCore.Components.Forms;
+
+namespace ThingsGateway.Gateway.Application;
+
+public interface IVariableService : ITransient
+{
+    Task AddAsync(DeviceVariable input);
+    Task AddBatchAsync(List<DeviceVariable> input);
+    Task ClearDeviceVariableAsync();
+    Task DeleteAsync(params long[] input);
+    void DeleteVariableFromCache();
+    Task EditAsync(DeviceVariable input);
+    Task<MemoryStream> ExportFileAsync(List<DeviceVariable> deviceVariables = null, string deviceName = null);
+    Task<MemoryStream> ExportFileAsync(VariableInput input);
+    Task<List<DeviceVariableRunTime>> GetDeviceVariableRuntimeAsync(long devId = 0);
+    Task<List<DeviceVariableRunTime>> GetMemoryVariableRuntimeAsync();
+    Task ImportAsync(Dictionary<string, ImportPreviewOutputBase> input);
+    Task<SqlSugarPagedList<DeviceVariable>> PageAsync(VariablePageInput input);
+    Task<Dictionary<string, ImportPreviewOutputBase>> PreviewAsync(IBrowserFile file);
+    Task<Dictionary<string, ImportPreviewOutputBase>> PreviewAsync(MemoryStream stream, List<CollectDevice> memCollectDevices = null, List<Device> memUploadDevices = null);
+}

framework/gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableService.cs

@@ -32,18 +32,18 @@ namespace ThingsGateway.Gateway.Application;
 
 /// <inheritdoc cref="VariableService"/>
 [Injection(Proxy = typeof(OperDispatchProxy))]
-public class VariableService : DbRepository<DeviceVariable>, ITransient
+public class VariableService : DbRepository<DeviceVariable>, IVariableService
 {
-    private readonly CollectDeviceService _collectDeviceService;
-    private readonly UploadDeviceService _uploadDeviceService;
+    private readonly ICollectDeviceService _collectDeviceService;
+    private readonly IUploadDeviceService _uploadDeviceService;
     private readonly FileService _fileService;
     private readonly IServiceScope _serviceScope;
 
     /// <inheritdoc cref="VariableService"/>
     public VariableService(
-        CollectDeviceService collectDeviceService,
+        ICollectDeviceService collectDeviceService,
         FileService fileService,
-        UploadDeviceService uploadDeviceService,
+        IUploadDeviceService uploadDeviceService,
     IServiceScopeFactory scopeFactory)
     {
         _serviceScope = scopeFactory.CreateScope();

framework/gateway/ThingsGateway.Gateway.Application/Startup.cs

@@ -12,6 +12,8 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
+using System.Reflection;
+
 namespace ThingsGateway.Gateway.Application;
 
 /// <summary>
@@ -42,6 +44,9 @@ public class Startup : AppStartup
         services.AddHostedService<CollectDeviceWorker>();
         services.AddHostedService<AlarmWorker>();
         services.AddHostedService<UploadDeviceWorker>();
+
+        ThingsGateway.Core.TypeExtensions.DefaultFuncs.Add(a => a.GetCustomAttribute<VariablePropertyAttribute>()?.Description);
+
     }
 
 

framework/gateway/ThingsGateway.Gateway.Application/ThingsGateway.Gateway.Application.csproj

@@ -8,13 +8,21 @@
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 	  </Content>
 	</ItemGroup>
-
+	<ItemGroup>
+		<!--kafka在某些系统中出现无法动态加载资源的情况，需要手动拷贝到主程序下，所以这里直接引用native内容，发布会自动生成-->
+		<PackageReference Include="Confluent.Kafka" Version="2.3.0">
+			<Private>false</Private>
+			<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+			<IncludeAssets> native; </IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="LiteDB" Version="5.0.17" />
-		<PackageReference Include="Hardware.Info" Version="100.0.0" />
-		<PackageReference Include="CS-Script" Version="4.8.8" />
+		<PackageReference Include="Hardware.Info" Version="100.0.0.1" />
+		<PackageReference Include="CodingSeb.ExpressionEvaluator" Version="1.4.40" />
+		<PackageReference Include="CS-Script" Version="4.8.10" />
 		<!--CS-Script与Furion冲突，直接安装覆盖版本-->
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.7.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0" />
 		<PackageReference Include="SqlSugar.TDengineCore" Version="3.4.0" />
 	</ItemGroup>
 

framework/gateway/ThingsGateway.Gateway.Application/Workers/CollectDeviceWorker.cs

@@ -23,7 +23,7 @@ namespace ThingsGateway.Gateway.Application;
 /// </summary>
 public class CollectDeviceWorker : DeviceWorker
 {
-
+    private GlobalDeviceData _globalDeviceData;
     public CollectDeviceWorker(IServiceScopeFactory serviceScopeFactory, IHostApplicationLifetime appLifetime) : base(serviceScopeFactory, appLifetime)
     {
         _logger = _serviceScope.ServiceProvider.GetService<ILoggerFactory>().CreateLogger("南向设备服务");
@@ -49,6 +49,10 @@ public class CollectDeviceWorker : DeviceWorker
             await StopOtherHostService();
             //停止全部采集线程
             await RemoveAllDeviceThreadAsync();
+
+            //清空内存列表
+            _globalDeviceData.CollectDevices.Clear();
+
             //创建全部采集线程
             await CreatAllDeviceThreadsAsync();
             //开始其他后台服务
@@ -101,7 +105,7 @@ public class CollectDeviceWorker : DeviceWorker
         if (!_stoppingToken.IsCancellationRequested)
         {
             _logger.LogInformation("正在获取南向设备组态信息");
-            var collectDeviceRunTimes = (await _serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetDeviceRuntimeAsync());
+            var collectDeviceRunTimes = (await _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetDeviceRuntimeAsync());
             _logger.LogInformation("获取南向设备组态信息完成");
             foreach (var collectDeviceRunTime in collectDeviceRunTimes.Where(a => !collectDeviceRunTimes.Any(b => a.Id == b.RedundantDeviceId && b.IsRedundant)))
             {
@@ -125,7 +129,7 @@ public class CollectDeviceWorker : DeviceWorker
 
     protected override async Task<IEnumerable<DeviceRunTime>> GetDeviceRunTimeAsync(long devId)
     {
-        return await _serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetDeviceRuntimeAsync(devId);
+        return await _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetDeviceRuntimeAsync(devId);
     }
 
     #endregion
@@ -139,7 +143,7 @@ public class CollectDeviceWorker : DeviceWorker
     /// <returns></returns>
     public List<string> GetDeviceMethods(long devId)
     {
-        var pluginName = _serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetDeviceById(devId).PluginName;
+        var pluginName = _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetDeviceById(devId).PluginName;
         var driverBase = _driverPluginService.GetDriver(pluginName);
         var Propertys = _driverPluginService.GetDriverMethodInfo(driverBase);
         driverBase?.SafeDispose();
@@ -158,7 +162,7 @@ public class CollectDeviceWorker : DeviceWorker
         var Propertys = _driverPluginService.GetDriverProperties(driverBase);
         if (devId != 0)
         {
-            var collectDevice = _serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetDeviceById(devId);
+            var collectDevice = _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetDeviceById(devId);
             collectDevice?.DevicePropertys?.ForEach(it =>
             {
                 var dependencyProperty = Propertys.FirstOrDefault(a => a.PropertyName == it.PropertyName);
@@ -197,10 +201,13 @@ public class CollectDeviceWorker : DeviceWorker
     {
         await _easyLock?.WaitAsync();
         _driverPluginService = _serviceScope.ServiceProvider.GetService<DriverPluginService>();
+        _globalDeviceData = _serviceScope.ServiceProvider.GetService<GlobalDeviceData>();
         //重启采集线程，会启动其他后台服务
         await RestartDeviceThreadAsync();
         await WhileExecuteAsync(stoppingToken);
     }
+
+
     protected virtual async Task WhileExecuteAsync(CancellationToken stoppingToken)
     {
         while (!stoppingToken.IsCancellationRequested)
@@ -224,17 +231,17 @@ public class CollectDeviceWorker : DeviceWorker
 
                             if (driverBase.CurrentDevice.DeviceStatus == DeviceStatusEnum.OffLine)
                             {
-                                if (driverBase.CurrentDevice.IsRedundant && _serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetCacheList(false).Any(a => a.Id == driverBase.CurrentDevice.RedundantDeviceId))
+                                if (driverBase.CurrentDevice.IsRedundant && _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetCacheList(false).Any(a => a.Id == driverBase.CurrentDevice.RedundantDeviceId))
                                 {
                                     await DeviceRedundantThreadAsync(driverBase.CurrentDevice.Id);
                                 }
                             }
 
-                            //超过30分钟，或者(初始化失败并超过10分钟)会重启
+
                             if (
             (driverBase.CurrentDevice.ActiveTime != DateTime.MinValue &&
-            driverBase.CurrentDevice.ActiveTime.AddMinutes(30) <= DateTimeExtensions.CurrentDateTime)
-            || (driverBase.IsInitSuccess == false && driverBase.CurrentDevice.ActiveTime.AddMinutes(10) <= DateTimeExtensions.CurrentDateTime)
+            driverBase.CurrentDevice.ActiveTime.AddSeconds(CheckIntervalTime) <= DateTimeExtensions.CurrentDateTime)
+            || (driverBase.IsInitSuccess == false && driverBase.CurrentDevice.ActiveTime.AddMinutes(CheckIntervalTime) <= DateTimeExtensions.CurrentDateTime)
             )
                             {
                                 //如果线程处于暂停状态，跳过

framework/gateway/ThingsGateway.Gateway.Application/Workers/DeviceWorker.cs

@@ -49,7 +49,7 @@ public abstract class DeviceWorker : BackgroundService
     /// </summary>
     public List<DriverBase> DriverBases => _deviceThreads
         .Where(a => a.DriverBases.Any(b => b.CurrentDevice != null))
-        .SelectMany(a => a.DriverBases).ToList();
+        .SelectMany(a => a.DriverBases).OrderByDescending(a => a.CurrentDevice.DeviceStatus).ToList();
 
     /// <summary>
     /// 设备子线程列表
@@ -381,7 +381,10 @@ public abstract class DeviceWorker : BackgroundService
         }
     }
 
-
+    /// <summary>
+    /// 线程检查时间，120分钟
+    /// </summary>
+    public const int CheckIntervalTime = 7200;
     protected abstract Task StartOtherHostService();
     protected abstract Task StopOtherHostService();
 

framework/gateway/ThingsGateway.Gateway.Application/Workers/UploadDeviceWorker.cs

@@ -100,7 +100,7 @@ public class UploadDeviceWorker : DeviceWorker
         if (!_stoppingToken.IsCancellationRequested)
         {
             _logger.LogInformation("正在获取北向设备组态信息");
-            var deviceRunTimes = (_serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetDeviceRuntime());
+            var deviceRunTimes = (_serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetDeviceRuntime());
             _logger.LogInformation("获取北向设备组态信息完成");
             foreach (var uploadDeviceRunTime in deviceRunTimes.Where(a => !deviceRunTimes.Any(b => a.Id == b.RedundantDeviceId && b.IsRedundant)))
             {
@@ -135,7 +135,7 @@ public class UploadDeviceWorker : DeviceWorker
     /// <returns></returns>
     public List<string> GetDeviceMethods(long devId)
     {
-        var pluginName = _serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetDeviceById(devId).PluginName;
+        var pluginName = _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetDeviceById(devId).PluginName;
         var driverBase = _driverPluginService.GetDriver(pluginName);
         var Propertys = _driverPluginService.GetDriverMethodInfo(driverBase);
         driverBase?.SafeDispose();
@@ -154,7 +154,7 @@ public class UploadDeviceWorker : DeviceWorker
         var Propertys = _driverPluginService.GetDriverProperties(driverBase);
         if (devId != 0)
         {
-            var uploadDevice = _serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetDeviceById(devId);
+            var uploadDevice = _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetDeviceById(devId);
             uploadDevice?.DevicePropertys?.ForEach(it =>
             {
                 var dependencyProperty = Propertys.FirstOrDefault(a => a.PropertyName == it.PropertyName);
@@ -237,7 +237,7 @@ public class UploadDeviceWorker : DeviceWorker
 
                             if (driverBase.CurrentDevice.DeviceStatus == DeviceStatusEnum.OffLine)
                             {
-                                if (driverBase.CurrentDevice.IsRedundant && _serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetCacheList(false).Any(a => a.Id == driverBase.CurrentDevice.RedundantDeviceId))
+                                if (driverBase.CurrentDevice.IsRedundant && _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetCacheList(false).Any(a => a.Id == driverBase.CurrentDevice.RedundantDeviceId))
                                 {
                                     await DeviceRedundantThreadAsync(driverBase.CurrentDevice.Id);
                                 }
@@ -245,11 +245,11 @@ public class UploadDeviceWorker : DeviceWorker
 
 
 
-                            //超过30分钟，或者(初始化失败并超过10分钟)会重启
+
                             if (
             (driverBase.CurrentDevice.ActiveTime != DateTime.MinValue &&
-            driverBase.CurrentDevice.ActiveTime.AddMinutes(30) <= DateTimeExtensions.CurrentDateTime)
-            || (driverBase.IsInitSuccess == false && driverBase.CurrentDevice.ActiveTime.AddMinutes(10) <= DateTimeExtensions.CurrentDateTime)
+            driverBase.CurrentDevice.ActiveTime.AddMinutes(CheckIntervalTime) <= DateTimeExtensions.CurrentDateTime)
+            || (driverBase.IsInitSuccess == false && driverBase.CurrentDevice.ActiveTime.AddMinutes(CheckIntervalTime) <= DateTimeExtensions.CurrentDateTime)
             )
                             {
                                 //如果线程处于暂停状态，跳过
@@ -307,7 +307,7 @@ public class UploadDeviceWorker : DeviceWorker
 
     protected override Task<IEnumerable<DeviceRunTime>> GetDeviceRunTimeAsync(long devId)
     {
-        return Task.FromResult(_serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetDeviceRuntime(devId));
+        return Task.FromResult(_serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetDeviceRuntime(devId));
     }
 
     #endregion

framework/gateway/ThingsGateway.Gateway.Blazor/Page/BackendLogPage.razor.cs

@@ -34,7 +34,7 @@ public partial class BackendLogPage
         var confirm = await PopupService.OpenConfirmDialogAsync("删除", "确定 ?");
         if (confirm)
         {
-            await _serviceScope.ServiceProvider.GetService<BackendLogService>().DeleteAsync();
+            await _serviceScope.ServiceProvider.GetService<IBackendLogService>().DeleteAsync();
             await _datatable?.QueryClickAsync();
         }
     }
@@ -46,7 +46,7 @@ public partial class BackendLogPage
 
     private async Task<ISqlSugarPagedList<BackendLog>> QueryCallAsync(BackendLogPageInput input)
     {
-        var data = await _serviceScope.ServiceProvider.GetService<BackendLogService>().PageAsync(input);
+        var data = await _serviceScope.ServiceProvider.GetService<IBackendLogService>().PageAsync(input);
         return data;
     }
 }

framework/gateway/ThingsGateway.Gateway.Blazor/Page/CollectDevicePage.razor.cs

@@ -35,7 +35,7 @@ public partial class CollectDevicePage : BaseComponentBase
     List<CollectDevice> _devices = new();
     List<DriverPlugin> _driverPlugins;
     ImportExcel _importExcel;
-    string _searchName;
+    //string _searchName;
     [Inject]
     AjaxService _ajaxService { get; set; }
     [Inject]
@@ -62,18 +62,18 @@ public partial class CollectDevicePage : BaseComponentBase
                 return;
             }
         }
-        data ??= _serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetCacheList(true);
+        data ??= _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetCacheList(true);
         foreach (var device in data)
         {
             device.DevicePropertys = GetDriverProperties(device.PluginName, device.Id);
         }
-        await _serviceScope.ServiceProvider.GetService<CollectDeviceService>().EditsAsync(data);
+        await _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().EditsAsync(data);
         await PopupService.EnqueueSnackbarAsync("刷新成功", AlertTypes.Success);
 
     }
     private async Task AddCallAsync(DeviceAddInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<CollectDeviceService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().AddAsync(input);
         Refresh();
         await _mainLayout.StateHasChangedAsync();
     }
@@ -85,7 +85,7 @@ public partial class CollectDevicePage : BaseComponentBase
             return;
         }
 
-        await _serviceScope.ServiceProvider.GetService<CollectDeviceService>().CopyDevAndVarAsync(data);
+        await _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().CopyDevAndVarAsync(data);
         await DatatableQueryAsync();
         await PopupService.EnqueueSnackbarAsync("复制成功", AlertTypes.Success);
         await _mainLayout.StateHasChangedAsync();
@@ -99,7 +99,7 @@ public partial class CollectDevicePage : BaseComponentBase
             return;
         }
 
-        await _serviceScope.ServiceProvider.GetService<CollectDeviceService>().CopyDevAsync(data);
+        await _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().CopyDevAsync(data);
         await DatatableQueryAsync();
         await PopupService.EnqueueSnackbarAsync("复制成功", AlertTypes.Success);
         await _mainLayout.StateHasChangedAsync();
@@ -112,14 +112,14 @@ public partial class CollectDevicePage : BaseComponentBase
 
     private async Task DeleteCallAsync(IEnumerable<CollectDevice> input)
     {
-        await _serviceScope.ServiceProvider.GetService<CollectDeviceService>().DeleteAsync(input.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().DeleteAsync(input.Select(a => a.Id).ToArray());
         Refresh();
         await _mainLayout.StateHasChangedAsync();
     }
 
     Task<Dictionary<string, ImportPreviewOutputBase>> DeviceImportAsync(IBrowserFile file)
     {
-        return _serviceScope.ServiceProvider.GetService<CollectDeviceService>().PreviewAsync(file);
+        return _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().PreviewAsync(file);
     }
 
     async Task DownExportAsync(DevicePageInput input = null)
@@ -148,8 +148,8 @@ public partial class CollectDevicePage : BaseComponentBase
 
     private async Task EditCallAsync(DeviceEditInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<CollectDeviceService>().EditAsync(input);
-        _devices = _serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetCacheList(true);
+        await _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().EditAsync(input);
+        _devices = _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetCacheList(true);
         _deviceGroups = _devices?.Select(a => a.DeviceGroup)?.Where(a => a != null).Distinct()?.ToList();
         await _mainLayout.StateHasChangedAsync();
     }
@@ -161,19 +161,19 @@ public partial class CollectDevicePage : BaseComponentBase
 
     private async Task<ISqlSugarPagedList<CollectDevice>> QueryCallAsync(DevicePageInput input)
     {
-        var data = await _serviceScope.ServiceProvider.GetService<CollectDeviceService>().PageAsync(input);
+        var data = await _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().PageAsync(input);
         return data;
     }
 
     private void Refresh()
     {
-        _devices = _serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetCacheList(true);
+        _devices = _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetCacheList(true);
         _deviceGroups = _devices?.Select(a => a.DeviceGroup)?.Where(a => a != null).Distinct()?.ToList();
     }
 
     async Task SaveDeviceImportAsync(Dictionary<string, ImportPreviewOutputBase> data)
     {
-        await _serviceScope.ServiceProvider.GetService<CollectDeviceService>().ImportAsync(data);
+        await _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().ImportAsync(data);
         await DatatableQueryAsync();
         _importExcel.IsShowImport = false;
         await _mainLayout.StateHasChangedAsync();

framework/gateway/ThingsGateway.Gateway.Blazor/Page/DeviceStatusPage.razor

@@ -52,7 +52,7 @@
 
                      <MCard Class="ma-2" Style=@($"height: calc(100vh - {BlazorResourceConst.DefaultHeight + 80}px );")>
                          <MCardTitle>
-                             <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_collectDeviceGroupSearchName"
+                             <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_collectDeviceSearchName"
                                             Outlined Label=@typeof(CollectDevice).GetDescription(nameof(CollectDevice.DeviceGroup)) />
                              </MCardTitle>
 
@@ -64,7 +64,7 @@
                                    }
                                    } )
                                         Items="_collectDeviceGroups" ItemText="r=>r" ItemChildren="r=>null"
-                                        Search="@_collectDeviceGroupSearchName"
+                                        Search="@_collectDeviceSearchName"
                                       Activatable ItemKey=@(r=>r)>
                                  <LabelContent>
                                      <span title=@context.Item>
@@ -77,10 +77,10 @@
                     <MCol Md=5 Cols="12">
                         <MCard Height=@($"calc(100vh - {BlazorResourceConst.DefaultHeight + 80}px; )") Style="overflow-y:auto;" Flat Class="ml-2 my-4">
 
-                              <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_collectDeviceGroupSearchName"
-                                            Outlined Label=@typeof(CollectDevice).GetDescription(nameof(CollectDevice.DeviceGroup)) />
+                              <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_collectDeviceSearchName"
+                                            Outlined Label=@typeof(CollectDevice).GetDescription(nameof(CollectDevice.Name)) />
 
-                             <MVirtualScroll Context="item" Height=@($"calc(100vh - {BlazorResourceConst.DefaultHeight+140}px)") OverscanCount=2 ItemSize="60" Items="_collectDriverBases.WhereIF(!_collectDeviceGroupSearchName.IsNullOrEmpty(),a=>a.CurrentDevice.DeviceGroup==_collectDeviceGroupSearchName).ToList()">
+                             <MVirtualScroll Context="item" Height=@($"calc(100vh - {BlazorResourceConst.DefaultHeight+140}px)") OverscanCount=2 ItemSize="60" Items="_collectDriverBases.WhereIF(!_collectDeviceSearchName.IsNullOrEmpty(),a=>a.CurrentDevice.Name.Contains(_collectDeviceSearchName)).ToList()">
 
                                  <ItemContent>
                                      @if (item.CurrentDevice != null)
@@ -255,7 +255,7 @@
 @*                     <MCol Md=2 Cols="12">
                         <MCard Class="ma-2" Style=@($"height: calc(100vh - {BlazorResourceConst.DefaultHeight + 80}px); )")>
                             <MCardTitle>
-                                <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_uploadDeviceGroupSearchName"
+                                <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_uploadDeviceSearchName"
                                             Outlined Label=@typeof(Device).GetDescription(nameof(Device.DeviceGroup)) />
                              </MCardTitle>
                              <MTreeview Style=@($"height: calc(100vh - {BlazorResourceConst.DefaultHeight+240}px);overflow-y:auto") Dense TItem="string" TKey="string" ActiveChanged=@(async a=>
@@ -267,7 +267,7 @@
                                    }
                                    } )
                                         Items="_uploadDeviceGroups" ItemText="r=>r" ItemChildren="r=>null"
-                                        Search="@_uploadDeviceGroupSearchName"
+                                        Search="@_uploadDeviceSearchName"
                                       Activatable ItemKey=@(r=>r)>
                                  <LabelContent>
                                      <span title=@context.Item>
@@ -279,10 +279,10 @@
                     </MCol> *@
                     <MCol Md=5 Cols="12">
                         <MCard Height=@($"calc(100vh - {BlazorResourceConst.DefaultHeight+80}px)") Style="overflow-y:auto;" Flat Class="ml-2 my-4">
-                             <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_uploadDeviceGroupSearchName"
-                                            Outlined Label=@typeof(CollectDevice).GetDescription(nameof(CollectDevice.DeviceGroup)) />
+                             <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_uploadDeviceSearchName"
+                                            Outlined Label=@typeof(CollectDevice).GetDescription(nameof(CollectDevice.Name)) />
 
-                             <MVirtualScroll Context="item" Height=@($"calc(100vh - {BlazorResourceConst.DefaultHeight+140}px)") OverscanCount=2 ItemSize="60" Items="_uploadDriverBases.WhereIF(!_uploadDeviceGroupSearchName.IsNullOrEmpty(),a=>a.CurrentDevice.DeviceGroup==_uploadDeviceGroupSearchName).ToList()">
+                             <MVirtualScroll Context="item" Height=@($"calc(100vh - {BlazorResourceConst.DefaultHeight+140}px)") OverscanCount=2 ItemSize="60" Items="_uploadDriverBases.WhereIF(!_uploadDeviceSearchName.IsNullOrEmpty(),a=>a.CurrentDevice.Name.Contains(_uploadDeviceSearchName)).ToList()">
 
                                  <ItemContent>
                                      @if (item.CurrentDevice != null)

framework/gateway/ThingsGateway.Gateway.Blazor/Page/DeviceStatusPage.razor.cs

@@ -12,8 +12,6 @@
 
 using BlazorComponent;
 
-using Mapster;
-
 using Masa.Blazor;
 
 using Microsoft.AspNetCore.Components;
@@ -30,10 +28,11 @@ namespace ThingsGateway.Gateway.Blazor;
 public partial class DeviceStatusPage : IDisposable
 {
     readonly PeriodicTimer _periodicTimer = new(TimeSpan.FromSeconds(3));
-    private string _collectDeviceGroup;
     private bool _isShowDetailUI;
-    List<string> _collectDeviceGroups = new();
-    string _collectDeviceGroupSearchName;
+    //List<string> _collectDeviceGroups = new();
+    //string _collectDeviceGroupSearchName;
+    //private string _collectDeviceSearchName;
+    string _collectDeviceSearchName;
     List<CollectBase> _collectDriverBases = new();
     CollectBase _collectDriverItem;
     BootstrapDynamicComponent _driverComponent;
@@ -42,9 +41,10 @@ public partial class DeviceStatusPage : IDisposable
     bool _isAllRestart;
     bool _isRestart;
     StringNumber _tabNumber;
-    private string _uploadDeviceGroup;
-    List<string> _uploadDeviceGroups = new();
-    string _uploadDeviceGroupSearchName;
+    //private string _uploadDeviceSearchName;
+    //List<string> _uploadDeviceGroups = new();
+    //string _uploadDeviceGroupSearchName;
+    string _uploadDeviceSearchName;
     List<DriverBase> _uploadDriverBases = new();
     DriverBase _uploadDriverItem;
     AlarmWorker _alarmWorker { get; set; }
@@ -121,8 +121,8 @@ public partial class DeviceStatusPage : IDisposable
 
     void CollectDeviceQuery()
     {
-        _collectDeviceGroups = _globalDeviceData.CollectDevices.Adapt<List<CollectDevice>>()?.Select(a => a.DeviceGroup)?.Where(a => a != null).Distinct()?.ToList() ?? new();
-        _collectDriverBases = _collectDeviceWorker?.DriverBases?.WhereIF(!_collectDeviceGroup.IsNullOrEmpty(), a => a.CurrentDevice?.DeviceGroup == _collectDeviceGroup).Select(a => (CollectBase)a).ToList() ?? new();
+        //_collectDeviceGroups = _globalDeviceData.CollectDevices?.Select(a => a.DeviceGroup)?.Where(a => !a.IsNullOrEmpty()).Distinct()?.ToList() ?? new();
+        _collectDriverBases = _collectDeviceWorker?.DriverBases?.WhereIF(!_collectDeviceSearchName.IsNullOrEmpty(), a => a.CurrentDevice?.Name.Contains(_collectDeviceSearchName) == true).Select(a => (CollectBase)a).ToList() ?? new();
     }
     async Task DeviceRedundantThreadAsync(long devId)
     {
@@ -207,10 +207,6 @@ public partial class DeviceStatusPage : IDisposable
         {
             try
             {
-                {
-                    _collectDeviceGroups = _globalDeviceData.CollectDevices.Adapt<List<CollectDevice>>()?.Select(a => a.DeviceGroup)?.Where(a => a != null).Distinct()?.ToList() ?? new();
-                    _collectDriverBases = _collectDeviceWorker?.DriverBases?.WhereIF(!_collectDeviceGroup.IsNullOrEmpty(), a => a.CurrentDevice?.DeviceGroup == _collectDeviceGroup).Select(a => (CollectBase)a).ToList() ?? new();
-                }
                 if (_collectDriverBases?.FirstOrDefault()?.CurrentDevice == null || _collectDeviceWorker?.DriverBases.Count != _collectDriverBases.Count)
                 {
                     CollectDeviceQuery();
@@ -248,8 +244,8 @@ public partial class DeviceStatusPage : IDisposable
 
     void UploadDeviceQuery()
     {
-        _uploadDeviceGroups = _uploadDeviceWorker.DriverBases.Select(a => a.CurrentDevice)?.Select(a => a.DeviceGroup)?.Where(a => a != null).Distinct()?.ToList() ?? new();
-        _uploadDriverBases = _uploadDeviceWorker?.DriverBases?.WhereIF(!_uploadDeviceGroup.IsNullOrEmpty(), a => a.CurrentDevice?.DeviceGroup == _uploadDeviceGroup).ToList() ?? new();
+        //_uploadDeviceGroups = _uploadDeviceWorker.DriverBases.Select(a => a.CurrentDevice)?.Select(a => a.DeviceGroup)?.Where(a => a != null).Distinct()?.ToList() ?? new();
+        _uploadDriverBases = _uploadDeviceWorker?.DriverBases?.WhereIF(!_uploadDeviceSearchName.IsNullOrEmpty(), a => a.CurrentDevice?.Name.Contains(_uploadDeviceSearchName) == true).ToList() ?? new();
     }
     async Task UpRestartAsync(long devId)
     {

framework/gateway/ThingsGateway.Gateway.Blazor/Page/DeviceVariablePage.razor

@@ -161,7 +161,7 @@ else
         case nameof(context.Item.DeviceId):
             <span title=@context.Value>
                 @(
-            _serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetNameById(context.Item.DeviceId)
+            _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetNameById(context.Item.DeviceId)
                 )
             </span>
         break;
@@ -193,7 +193,7 @@ else
                     </td>
                     <td class="text-start ">
                         <div style="word-break:break-all; white-space:pre-wrap;">
-                            @(_serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetNameById(context.Item2.ToLong()))
+                            @(_serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetNameById(context.Item2.ToLong()))
                         </div>
                     </td>
                 </tr>

framework/gateway/ThingsGateway.Gateway.Blazor/Page/DeviceVariablePage.razor.cs

@@ -32,7 +32,7 @@ public partial class DeviceVariablePage
 
     ImportExcel _importExcel;
     Dictionary<long, List<string>> _otherMethods = new();
-    string _searchName;
+    //string _searchName;
 
     List<Device> _uploadDevices = new();
 
@@ -46,9 +46,9 @@ public partial class DeviceVariablePage
     /// <returns></returns>
     protected override async Task OnParametersSetAsync()
     {
-        _collectDevices = _serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetCacheList(true);
-        _uploadDevices = _serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetCacheList(true);
-        _deviceGroups = _serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetTree();
+        _collectDevices = _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetCacheList(true);
+        _uploadDevices = _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetCacheList(true);
+        _deviceGroups = _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetTree();
         await base.OnParametersSetAsync();
     }
 

framework/gateway/ThingsGateway.Gateway.Blazor/Page/DeviceVariableRunTimePage.razor

@@ -135,7 +135,7 @@ else
                             </td>
                             <td class="text-start ">
                                 <div style="word-break:break-all; white-space:pre-wrap;">
-                                    @(_serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetNameById(context.Item2.ToLong()))
+                                    @(_serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetNameById(context.Item2.ToLong()))
                                 </div>
                             </td>
                         </tr>

framework/gateway/ThingsGateway.Gateway.Blazor/Page/DeviceVariableRunTimePage.razor.cs

@@ -34,7 +34,7 @@ public partial class DeviceVariableRunTimePage
     private IAppDataTable _datatable;
     private List<DeviceTree> _deviceGroups = new();
     private EventCallback<string> _onWrite;
-    private string _searchName;
+    //private string _searchName;
     /// <summary>
     /// 设备名称
     /// </summary>
@@ -140,7 +140,7 @@ public partial class DeviceVariableRunTimePage
 
     private async Task<ISqlSugarPagedList<DeviceVariableRunTime>> QueryCallAsync(VariablePageInput input)
     {
-        var uploadDevId = _serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetIdByName(input.UploadDeviceName);
+        var uploadDevId = _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetIdByName(input.UploadDeviceName);
         var data = _globalDeviceData.AllVariables
             .WhereIF(!input.DeviceName.IsNullOrEmpty(), a => a.DeviceName == input.DeviceName)
             .WhereIF(!input.Name.IsNullOrEmpty(), a => a.Name.Contains(input.Name))

framework/gateway/ThingsGateway.Gateway.Blazor/Page/RpcLogPage.razor.cs

@@ -32,7 +32,7 @@ public partial class RpcLogPage
         var confirm = await PopupService.OpenConfirmDialogAsync("删除", "确定 ?");
         if (confirm)
         {
-            await _serviceScope.ServiceProvider.GetService<RpcLogService>().DeleteAsync();
+            await _serviceScope.ServiceProvider.GetService<IRpcLogService>().DeleteAsync();
             await _datatable?.QueryClickAsync();
         }
     }
@@ -50,7 +50,7 @@ public partial class RpcLogPage
 
     private async Task<ISqlSugarPagedList<RpcLog>> QueryCallAsync(RpcLogPageInput input)
     {
-        var data = await _serviceScope.ServiceProvider.GetService<RpcLogService>().PageAsync(input);
+        var data = await _serviceScope.ServiceProvider.GetService<IRpcLogService>().PageAsync(input);
         return data;
     }
 }

framework/gateway/ThingsGateway.Gateway.Blazor/Page/UploadDevicePage.razor.cs

@@ -35,7 +35,7 @@ public partial class UploadDevicePage
     List<Device> _devices = new();
     List<DriverPlugin> _driverPlugins;
     ImportExcel _importExcel;
-    string _searchName;
+    //string _searchName;
     [Inject]
     AjaxService _ajaxService { get; set; }
     [Inject]
@@ -54,7 +54,7 @@ public partial class UploadDevicePage
 
     private async Task AddCallAsync(DeviceAddInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<UploadDeviceService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().AddAsync(input);
         Refresh();
         await _mainLayout.StateHasChangedAsync();
     }
@@ -68,12 +68,12 @@ public partial class UploadDevicePage
                 return;
             }
         }
-        data ??= _serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetCacheList(true);
+        data ??= _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetCacheList(true);
         foreach (var device in data)
         {
             device.DevicePropertys = GetDriverProperties(device.PluginName, device.Id);
         }
-        await _serviceScope.ServiceProvider.GetService<UploadDeviceService>().EditsAsync(data);
+        await _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().EditsAsync(data);
         await PopupService.EnqueueSnackbarAsync("刷新成功", AlertTypes.Success);
 
     }
@@ -85,7 +85,7 @@ public partial class UploadDevicePage
             return;
         }
 
-        await _serviceScope.ServiceProvider.GetService<UploadDeviceService>().CopyDevAsync(data);
+        await _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().CopyDevAsync(data);
         await DatatableQueryAsync();
         await PopupService.EnqueueSnackbarAsync("复制成功", AlertTypes.Success);
         await _mainLayout.StateHasChangedAsync();
@@ -98,14 +98,14 @@ public partial class UploadDevicePage
 
     private async Task DeleteCallAsync(IEnumerable<Device> input)
     {
-        await _serviceScope.ServiceProvider.GetService<UploadDeviceService>().DeleteAsync(input.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().DeleteAsync(input.Select(a => a.Id).ToArray());
         Refresh();
         await _mainLayout.StateHasChangedAsync();
     }
 
     Task<Dictionary<string, ImportPreviewOutputBase>> DeviceImportAsync(IBrowserFile file)
     {
-        return _serviceScope.ServiceProvider.GetService<UploadDeviceService>().PreviewAsync(file);
+        return _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().PreviewAsync(file);
     }
 
     async Task DownExportAsync(DevicePageInput input = null)
@@ -134,8 +134,8 @@ public partial class UploadDevicePage
 
     private async Task EditCallAsync(DeviceEditInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<UploadDeviceService>().EditAsync(input);
-        _devices = _serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetCacheList(true);
+        await _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().EditAsync(input);
+        _devices = _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetCacheList(true);
         _deviceGroups = _devices?.Select(a => a.DeviceGroup)?.Where(a => a != null).Distinct()?.ToList();
         await _mainLayout.StateHasChangedAsync();
     }
@@ -147,19 +147,19 @@ public partial class UploadDevicePage
 
     private async Task<ISqlSugarPagedList<Device>> QueryCallAsync(DevicePageInput input)
     {
-        var data = await _serviceScope.ServiceProvider.GetService<UploadDeviceService>().PageAsync(input);
+        var data = await _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().PageAsync(input);
         return data;
     }
 
     private void Refresh()
     {
-        _devices = _serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetCacheList(true);
+        _devices = _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetCacheList(true);
         _deviceGroups = _devices?.Select(a => a.DeviceGroup)?.Where(a => a != null).Distinct()?.ToList();
     }
 
     async Task SaveDeviceImportAsync(Dictionary<string, ImportPreviewOutputBase> data)
     {
-        await _serviceScope.ServiceProvider.GetService<UploadDeviceService>().ImportAsync(data);
+        await _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().ImportAsync(data);
         await DatatableQueryAsync();
         _importExcel.IsShowImport = false;
         await _mainLayout.StateHasChangedAsync();

framework/gateway/ThingsGateway.Gateway.Blazor/ThingsGateway.Gateway.Blazor.csproj

@@ -2,7 +2,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\admin\ThingsGateway.Admin.Blazor\ThingsGateway.Admin.Blazor.csproj" />
-	  <ProjectReference Include="..\..\admin\ThingsGateway.Components\ThingsGateway.Components.csproj" />
 	  <ProjectReference Include="..\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj" />
   </ItemGroup>
 </Project>

framework/gateway/ThingsGateway.Gateway.Core/ThingsGateway.Gateway.Core.csproj

@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<ItemGroup>
-		<PackageReference Include="CodingSeb.ExpressionEvaluator" Version="1.4.40" />
-	</ItemGroup>
-
 	<ItemGroup>
 	  <ProjectReference Include="..\..\admin\ThingsGateway.Admin.Core\ThingsGateway.Admin.Core.csproj" />
 	</ItemGroup>

framework/plugin/Directory.Build.props

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

framework/plugin/ThingsGateway.Plugin.DLT645/DLT645_2007OverTcp/DLT645_2007OverTcpProperty.cs

@@ -71,8 +71,8 @@ public class DLT645_2007OverTcpProperty : DriverPropertyBase
     /// <summary>
     /// 组包缓存超时ms
     /// </summary>
-    [DeviceProperty("组包缓存超时", "某些设备性能较弱，报文间需要间隔较长时间，可以设置更长的组包缓存，默认1s")]
-    public int CacheTimeout { get; set; } = 1;
+    [DeviceProperty("组包缓存超时", "某些设备性能较弱，报文间需要间隔较长时间，可以设置更长的组包缓存，默认1000ms")]
+    public int CacheTimeout { get; set; } = 1000;
     /// <summary>
     /// 共享链路
     /// </summary>

framework/plugin/ThingsGateway.Plugin.DLT645/ThingsGateway.Plugin.DLT645.csproj

@@ -12,14 +12,10 @@
 		<Compile Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\DriverDebugUIPage.razor.cs" Link="DebugPage\DriverDebugUIPage.razor.cs" />
 		<Compile Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\SerialSessionPage.razor.cs" Link="DebugPage\SerialSessionPage.razor.cs" />
 		<Compile Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\TcpClientPage.razor.cs" Link="DebugPage\TcpClientPage.razor.cs" />
-		<Compile Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\TcpServerPage.razor.cs" Link="DebugPage\TcpServerPage.razor.cs" />
-		<Compile Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\UdpSessionPage.razor.cs" Link="DebugPage\UdpSessionPage.razor.cs" />
 
 		<Content Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\DriverDebugUIPage.razor" Link="DebugPage\DriverDebugUIPage.razor" />
 		<Content Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\SerialSessionPage.razor" Link="DebugPage\SerialSessionPage.razor" />
 		<Content Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\TcpClientPage.razor" Link="DebugPage\TcpClientPage.razor" />
-		<Content Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\TcpServerPage.razor" Link="DebugPage\TcpServerPage.razor" />
-		<Content Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\UdpSessionPage.razor" Link="DebugPage\UdpSessionPage.razor" />
 
 	</ItemGroup>
 
@@ -30,7 +26,7 @@
 	</ItemGroup>
 	<ItemGroup>
 
-		<ProjectReference Include="..\..\gateway\ThingsGateway.Gateway.Blazor\ThingsGateway.Gateway.Blazor.csproj" >
+		<ProjectReference Include="..\..\gateway\ThingsGateway.Gateway.Blazor\ThingsGateway.Gateway.Blazor.csproj">
 			<Private>false</Private>
 			<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
 			<ExcludeAssets>runtime</ExcludeAssets>

framework/plugin/ThingsGateway.Plugin.Kafka/Kafka/KafkaProducer.cs

@@ -69,18 +69,19 @@ public partial class KafkaProducer : UpLoadBaseWithCacheT<DeviceData, VariableDa
 
         #region Kafka 生产者
 
-        Enum.TryParse<SecurityProtocol>(_driverPropertys.SecurityProtocol, out var SecurityProtocol);
-        Enum.TryParse<SaslMechanism>(_driverPropertys.SaslMechanism, out var SaslMechanism);
 
         //1、生产者配置
         producerconfig = new ProducerConfig
         {
             BootstrapServers = _driverPropertys.BootStrapServers,
-            SecurityProtocol = SecurityProtocol,
-            SaslMechanism = SaslMechanism,
-            SaslUsername = _driverPropertys.SaslUsername,
-            SaslPassword = _driverPropertys.SaslPassword,
+            SecurityProtocol = _driverPropertys.SecurityProtocol,
+            SaslMechanism = _driverPropertys.SaslMechanism,
+
         };
+        if (!string.IsNullOrEmpty(_driverPropertys.SaslUsername))
+            producerconfig.SaslUsername = _driverPropertys.SaslUsername;
+        if (!string.IsNullOrEmpty(_driverPropertys.SaslPassword))
+            producerconfig.SaslPassword = _driverPropertys.SaslPassword;
 
         //2、创建生产者
         producerBuilder = new ProducerBuilder<Null, string>(producerconfig);
@@ -123,7 +124,14 @@ public partial class KafkaProducer : UpLoadBaseWithCacheT<DeviceData, VariableDa
                 osStr += RuntimeInformation.ProcessArchitecture.ToString().ToLower();
 
                 var pathToLibrd = System.IO.Path.Combine(Directory, "runtimes", osStr, "native", $"librdkafka{fileEx}");
-                Library.Load(pathToLibrd);
+                try
+                {
+                    Library.Load(pathToLibrd);
+                }
+                catch (Exception ex)
+                {
+                    LogMessage.LogError(ex, $"加载dll失败：{pathToLibrd}");
+                }
             }
             producer = producerBuilder.Build();
         }

framework/plugin/ThingsGateway.Plugin.Kafka/Kafka/KafkaProducerProperty.cs

@@ -10,6 +10,8 @@
 //------------------------------------------------------------------------------
 #endregion
 
+using Confluent.Kafka;
+
 namespace ThingsGateway.Plugin.Kafka;
 
 /// <summary>
@@ -53,12 +55,10 @@ public class KafkaProducerProperty : UploadPropertyWithCacheT
     /// </summary>
     [DeviceProperty("密码", "")]
     public string SaslPassword { get; set; } = "none";
-    [DeviceProperty("SecurityProtocol", "")]
-    public string SecurityProtocol { get; set; } = "SaslPlaintext";
-    [DeviceProperty("SaslMechanism", "")]
-    public string SaslMechanism { get; set; } = "Plain";
-
-
+    [DeviceProperty("SecurityProtocol", "Plaintext, Ssl, SaslPlaintext, SaslSsl")]
+    public SecurityProtocol SecurityProtocol { get; set; } = SecurityProtocol.Plaintext;
+    [DeviceProperty("SaslMechanism", " Gssapi, Plain, ScramSha256, ScramSha512, OAuthBearer")]
+    public SaslMechanism SaslMechanism { get; set; } = SaslMechanism.Plain;
 
     /// <summary>
     /// 设备实体脚本

framework/plugin/ThingsGateway.Plugin.Modbus/Dtu/ModbusDtu/ModbusDtu.cs

@@ -17,14 +17,14 @@ namespace ThingsGateway.Plugin.Modbus;
 /// <summary>
 /// <inheritdoc/>
 /// </summary>
-public class ModbusTcpDtu : CollectBase
+public class ModbusDtu : CollectBase
 {
-    private readonly ModbusTcpDtuProperty _driverPropertys = new();
+    private readonly ModbusDtuProperty _driverPropertys = new();
 
-    private ThingsGateway.Foundation.Adapter.Modbus.ModbusTcpDtu _plc;
+    private ThingsGateway.Foundation.Adapter.Modbus.ModbusDtu _plc;
 
     /// <inheritdoc/>
-    public override Type DriverDebugUIType => typeof(ModbusTcpDtuDebugPage);
+    public override Type DriverDebugUIType => typeof(ModbusDtuDebugPage);
 
     /// <inheritdoc/>
     public override DriverPropertyBase DriverPropertys => _driverPropertys;
@@ -45,13 +45,15 @@ public class ModbusTcpDtu : CollectBase
         var client1 = new TcpService();
         ((TcpService)client1).Setup(FoundataionConfig);
         //载入配置
-        _plc = new((TcpService)client)
+        _plc = new((TcpService)client1)
         {
             DataFormat = _driverPropertys.DataFormat,
             FrameTime = _driverPropertys.FrameTime,
             CacheTimeout = _driverPropertys.CacheTimeout,
             Station = _driverPropertys.Station,
             TimeOut = _driverPropertys.TimeOut,
+            IsRtu = _driverPropertys.IsRtu,
+            Crc16CheckEnable = _driverPropertys.Crc16CheckEnable,
             IsCheckMessageId = _driverPropertys.MessageIdCheckEnable
         };
         base.Init(client);

framework/plugin/ThingsGateway.Plugin.Modbus/Dtu/ModbusDtu/ModbusDtuProperty.cs

@@ -14,7 +14,7 @@ namespace ThingsGateway.Plugin.Modbus;
 /// <summary>
 /// <inheritdoc/>
 /// </summary>
-public class ModbusTcpDtuProperty : DriverPropertyBase
+public class ModbusDtuProperty : DriverPropertyBase
 {
     /// <summary>
     /// IP
@@ -61,6 +61,19 @@ public class ModbusTcpDtuProperty : DriverPropertyBase
     /// </summary>
     [DeviceProperty("连接标识检测", "")]
     public bool MessageIdCheckEnable { get; set; }
+
+    /// <summary>
+    /// 是否Rtu格式
+    /// </summary>
+    [DeviceProperty("是否Rtu格式")]
+    public bool IsRtu { get; set; }
+
+    /// <summary>
+    /// Crc校验
+    /// </summary>
+    [DeviceProperty("Crc校验")]
+    public bool Crc16CheckEnable { get; set; } = true;
+
     /// <summary>
     /// 共享链路
     /// </summary>

framework/plugin/ThingsGateway.Plugin.Modbus/ModbusSerialServer/ModbusSerialServerProperty.cs

@@ -16,7 +16,7 @@ namespace ThingsGateway.Plugin.Modbus;
 /// <summary>
 /// <inheritdoc/>
 /// </summary>
-public class ModbusSerialServerProperty : DriverPropertyBase
+public class ModbusSerialServerProperty : UpDriverPropertyBase
 {
     /// <summary>
     /// COM口

framework/plugin/ThingsGateway.Plugin.Modbus/ModbusTcpServer/ModbusTcpServerProperty.cs

@@ -14,7 +14,7 @@ namespace ThingsGateway.Plugin.Modbus;
 /// <summary>
 /// <inheritdoc/>
 /// </summary>
-public class ModbusTcpServerProperty : DriverPropertyBase
+public class ModbusTcpServerProperty : UpDriverPropertyBase
 {
     /// <summary>
     /// IP

framework/plugin/ThingsGateway.Plugin.Modbus/ThingsGateway.Plugin.Modbus.csproj

@@ -35,7 +35,7 @@
 		<Compile Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusRtuOverUdpDebugPage.razor.cs" Link="Page\ModbusRtuOverUdpDebugPage.razor.cs" />
 		<Compile Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusSerialServerDebugPage.razor.cs" Link="Page\ModbusSerialServerDebugPage.razor.cs" />
 		<Compile Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusTcpDebugPage.razor.cs" Link="Page\ModbusTcpDebugPage.razor.cs" />
-		<Compile Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusTcpDtuDebugPage.razor.cs" Link="Page\ModbusTcpDtuDebugPage.razor.cs" />
+		<Compile Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusDtuDebugPage.razor.cs" Link="Page\ModbusDtuDebugPage.razor.cs" />
 		<Compile Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusTcpServerDebugPage.razor.cs" Link="Page\ModbusTcpServerDebugPage.razor.cs" />
 		<Compile Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusUdpDebugPage.razor.cs" Link="Page\ModbusUdpDebugPage.razor.cs" />
 		<Content Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusRtuDebugPage.razor" Link="Page\ModbusRtuDebugPage.razor" />
@@ -43,7 +43,7 @@
 		<Content Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusRtuOverUdpDebugPage.razor" Link="Page\ModbusRtuOverUdpDebugPage.razor" />
 		<Content Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusSerialServerDebugPage.razor" Link="Page\ModbusSerialServerDebugPage.razor" />
 		<Content Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusTcpDebugPage.razor" Link="Page\ModbusTcpDebugPage.razor" />
-		<Content Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusTcpDtuDebugPage.razor" Link="Page\ModbusTcpDtuDebugPage.razor" />
+		<Content Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusDtuDebugPage.razor" Link="Page\ModbusDtuDebugPage.razor" />
 		<Content Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusTcpServerDebugPage.razor" Link="Page\ModbusTcpServerDebugPage.razor" />
 		<Content Include="..\..\demo\ThingsGateway.Foundation.Demo.Rcl\Pages\Modbus\ModbusUdpDebugPage.razor" Link="Page\ModbusUdpDebugPage.razor" />
 	</ItemGroup>
@@ -51,7 +51,7 @@
 
 	<ItemGroup>
 
-		<ProjectReference Include="..\..\gateway\ThingsGateway.Gateway.Blazor\ThingsGateway.Gateway.Blazor.csproj" >
+		<ProjectReference Include="..\..\gateway\ThingsGateway.Gateway.Blazor\ThingsGateway.Gateway.Blazor.csproj">
 			<Private>false</Private>
 			<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
 			<ExcludeAssets>runtime</ExcludeAssets>

framework/plugin/ThingsGateway.Plugin.Mqtt/MqttServer/MqttServerProperty.cs

@@ -14,7 +14,7 @@ namespace ThingsGateway.Plugin.Mqtt;
 /// <summary>
 /// <inheritdoc/>
 /// </summary>
-public class MqttServerProperty : DriverPropertyBase
+public class MqttServerProperty : UpDriverPropertyBase
 {
     [DeviceProperty("是否选择全部变量", "")] public bool IsAllVariable { get; set; } = false;
 

framework/plugin/ThingsGateway.Plugin.OPCDA/ThingsGateway.Plugin.OPCDA.csproj

@@ -12,16 +12,8 @@
 	<ItemGroup>
 		<Compile Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\DriverDebugUIBase.cs" Link="DebugPage\DriverDebugUIBase.cs" />
 		<Compile Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\DriverDebugUIPage.razor.cs" Link="DebugPage\DriverDebugUIPage.razor.cs" />
-		<Compile Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\SerialSessionPage.razor.cs" Link="DebugPage\SerialSessionPage.razor.cs" />
-		<Compile Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\TcpClientPage.razor.cs" Link="DebugPage\TcpClientPage.razor.cs" />
-		<Compile Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\TcpServerPage.razor.cs" Link="DebugPage\TcpServerPage.razor.cs" />
-		<Compile Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\UdpSessionPage.razor.cs" Link="DebugPage\UdpSessionPage.razor.cs" />
 
 		<Content Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\DriverDebugUIPage.razor" Link="DebugPage\DriverDebugUIPage.razor" />
-		<Content Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\SerialSessionPage.razor" Link="DebugPage\SerialSessionPage.razor" />
-		<Content Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\TcpClientPage.razor" Link="DebugPage\TcpClientPage.razor" />
-		<Content Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\TcpServerPage.razor" Link="DebugPage\TcpServerPage.razor" />
-		<Content Include="..\..\Demo\ThingsGateway.Foundation.Demo.Rcl\Components\DebugPage\UdpSessionPage.razor" Link="DebugPage\UdpSessionPage.razor" />
 
 	</ItemGroup>
 
@@ -45,7 +37,7 @@
 
 	<ItemGroup>
 
-		<ProjectReference Include="..\..\gateway\ThingsGateway.Gateway.Blazor\ThingsGateway.Gateway.Blazor.csproj" >
+		<ProjectReference Include="..\..\gateway\ThingsGateway.Gateway.Blazor\ThingsGateway.Gateway.Blazor.csproj">
 			<Private>false</Private>
 			<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
 			<ExcludeAssets>runtime</ExcludeAssets>