更新依赖包

优化设备线程启停逻辑
添加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.8</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.3</Version>
-		<LangVersion>latest</LangVersion>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Authors>Diego</Authors>
-		<Product>ThingsGateway</Product>
-		<Copyright>© 2023-present Diego</Copyright>
-		<RepositoryUrl>https://gitee.com/diego2098/ThingsGateway</RepositoryUrl>
-		<SignAssembly>True</SignAssembly>
-		<DelaySign>False</DelaySign>
-		<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
+
 	</PropertyGroup>
 
 

framework/admin/ThingsGateway.Admin.ApiController/Controllers/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/ThingsGateway.Admin.Application.csproj

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

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

@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD>룩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߱<EFBFBD><EFBFBD><EFBFBD>Diego<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-//  Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><EFBFBD>Ŀ<EFBFBD>ԴЭ<EFBFBD>鼰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><EFBFBD>
-//  GiteeԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://gitee.com/diego2098/ThingsGateway
-//  GithubԴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ⣺https://github.com/kimdiego2098/ThingsGateway
-//  ʹ<EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD>https://diego2098.gitee.io/thingsgateway-docs/
-//  QQȺ<EFBFBD><EFBFBD>605534569
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion
 
@@ -16,8 +16,7 @@ using Masa.Blazor.Presets;
 
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.Extensions.DependencyInjection;
-
-using System.Diagnostics;
+using Microsoft.Extensions.Hosting;
 
 using ThingsGateway.Foundation.Extension.String;
 
@@ -44,7 +43,7 @@ public partial class Login
     /// <inheritdoc/>
     protected override async Task OnParametersSetAsync()
     {
-        if (Debugger.IsAttached)
+        if (App.WebHostEnvironment.IsDevelopment())
         {
             _loginModel.Account = "superAdmin";
             _password = "111111";
@@ -54,7 +53,7 @@ public partial class Login
         _configTitle = (await _serviceScope.ServiceProvider.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_TITLE))?.ConfigValue;
         _configRemark = (await _serviceScope.ServiceProvider.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_REMARK))?.ConfigValue;
         _showCaptcha = (await _serviceScope.ServiceProvider.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_CAPTCHA_OPEN))?.ConfigValue?.ToBool(false) == true;
-        _welcome = "<EFBFBD><EFBFBD>ӭʹ<EFBFBD><EFBFBD>" + _configTitle + "!";
+        _welcome = "欢迎使用" + _configTitle + "!";
         await base.OnParametersSetAsync();
     }
 
@@ -102,14 +101,14 @@ public partial class Login
                     await _captcha.RefreshCode();
                 }
 
-                await PopupService.EnqueueSnackbarAsync(new("<EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD>" + ": " + ret.Msg.ToString(), AlertTypes.Error));
+                await PopupService.EnqueueSnackbarAsync(new("登录错误" + ": " + ret.Msg.ToString(), AlertTypes.Error));
             }
             else
             {
-                await PopupService.EnqueueSnackbarAsync(new("<EFBFBD><EFBFBD>¼<EFBFBD>ɹ<EFBFBD>", AlertTypes.Success));
+                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");
@@ -124,7 +123,7 @@ public partial class Login
                 await _captcha.RefreshCode();
             }
 
-            await PopupService.EnqueueSnackbarAsync(new("<EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD>", AlertTypes.Error));
+            await PopupService.EnqueueSnackbarAsync(new("登录错误", AlertTypes.Error));
         }
     }
     private async Task<string> RefreshCode()

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

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

@@ -24,7 +24,6 @@ public class Startup : AppStartup
     public void ConfigureServices(IServiceCollection services)
     {
         services.ThingsGatewayComponentsConfigureServices();
-
         services.AddScoped<UserResoures>();
 
     }

framework/admin/ThingsGateway.Admin.Blazor/ThingsGateway.Admin.Blazor.csproj

@@ -3,6 +3,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.0" />
+		<PackageReference Include="Masa.Blazor.SomethingSkia" Version="1.2.2" />
 	</ItemGroup>
 
 

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

@@ -35,6 +35,7 @@ public class Startup : AppStartup
         {
             WorkerId = 4// 取值范围0~63
         });
+        services.ThingsGatewayCoreConfigureServices();
 
         services.AddComponent<LoggingConsoleComponent>();//启动控制台日志格式化组件
         ThingsGateway.Core.TypeExtensions.DefaultFuncs.Add(a => a.GetCustomAttribute<SqlSugar.SugarColumn>()?.ColumnDescription);

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

@@ -5,8 +5,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.1.5" />
-		<PackageReference Include="SqlSugarCore" Version="5.1.4.122" />
+		<PackageReference Include="Furion.Pure" Version="4.9.1.11" />
+		<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.1.11" />
+		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.1.11" />
+		<PackageReference Include="SqlSugarCore" Version="5.1.4.126" />
 		<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.Components/Extension/ServiceExtensions.cs

@@ -19,7 +19,7 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace ThingsGateway.Components;
 
-public static class ConfigureService
+public static class ServiceExtensions
 {
     /// <inheritdoc/>
     public static void ThingsGatewayComponentsConfigureServices(this IServiceCollection services)
@@ -65,9 +65,7 @@ public static class ConfigureService
         { nameof(MTimeline), new Dictionary<string, object>() { { nameof(MTimeline.Dense), true } } },
         { nameof(MToolbar), new Dictionary<string, object>() { { nameof(MToolbar.Dense), true } } },
         { "MTreeview", new Dictionary<string, object>() { { "Dense", true } } },
-        { nameof(PImageCaptcha), new Dictionary<string, object>() { { nameof(PImageCaptcha.Dense), true } } }
-
-
+        { "PImageCaptcha", new Dictionary<string, object>() { { "Dense", true } } }
 
             };
             options.ConfigureTheme(theme =>
@@ -98,6 +96,7 @@ public static class ConfigureService
         services.AddScoped<InitTimezone>();
         services.AddScoped<AjaxService>();
         services.AddScoped<CookieStorage>();
+        services.AddScoped<IDefaultTimezoneOffsetAccessor, DefaultTimezoneOffsetAccessor>();
 
     }
 }

framework/admin/ThingsGateway.Components/JS/DefaultTimezoneOffsetAccessor.cs

@@ -1,4 +1,4 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
@@ -10,15 +10,12 @@
 //------------------------------------------------------------------------------
 #endregion
 
-namespace ThingsGateway.Foundation.Serial;
+namespace ThingsGateway.Components;
 
-/// <summary>
-/// 字节事件
-/// </summary>
-public class SerialReceivedEventArgs : TouchSocketEventArgs
+public class DefaultTimezoneOffsetAccessor : IDefaultTimezoneOffsetAccessor
 {
-    /// <summary>
-    /// 数据块
-    /// </summary>
-    public ByteBlock UserToken { get; set; }
-}
+    public TimeSpan GetTimezoneOffsetResult()
+    {
+        return TimeSpan.FromHours(8);
+    }
+}

framework/admin/ThingsGateway.Components/JS/IDefaultTimezoneOffsetAccessor.cs

@@ -0,0 +1,8 @@
+
+namespace ThingsGateway.Components
+{
+    public interface IDefaultTimezoneOffsetAccessor
+    {
+        TimeSpan GetTimezoneOffsetResult();
+    }
+}

framework/admin/ThingsGateway.Components/JS/InitTimezone.cs

@@ -10,9 +10,6 @@
 //------------------------------------------------------------------------------
 #endregion
 
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-
 namespace ThingsGateway.Components;
 
 /// <summary>
@@ -43,17 +40,11 @@ public class InitTimezone : IDisposable
     /// <param name="jsRuntime"></param>
     /// <param name="storage"></param>
     /// <param name="serviceProvider"></param>
-    public InitTimezone(IJSRuntime jsRuntime, CookieStorage storage, IServiceProvider serviceProvider)
+    public InitTimezone(IJSRuntime jsRuntime, CookieStorage storage, IDefaultTimezoneOffsetAccessor defaultTimezoneOffsetAccessor)
     {
-        IHttpContextAccessor httpContextAccessor = serviceProvider.GetService<IHttpContextAccessor>();
         _jsRuntime = jsRuntime;
         _storage = storage;
-        var httpContext = httpContextAccessor?.HttpContext;
-        if (httpContext is not null)
-        {
-            var timezoneOffsetResult = httpContext.Request.Cookies[_timezoneOffsetKey];
-            _timezoneOffset = TimeSpan.FromMinutes(Convert.ToDouble(timezoneOffsetResult));
-        }
+        _timezoneOffset = defaultTimezoneOffsetAccessor.GetTimezoneOffsetResult();
     }
     /// <summary>
     /// 获取Web客户端时差

framework/admin/ThingsGateway.Components/ThingsGateway.Components.csproj

@@ -3,7 +3,6 @@
 	
 	<ItemGroup>
 		<PackageReference Include="Masa.Blazor" Version="1.2.2" />
-		<PackageReference Include="Masa.Blazor.SomethingSkia" Version="1.2.2" />
 	</ItemGroup>
 	
 	<ItemGroup>

framework/admin/ThingsGateway.Core/Cache/MemoryCache.cs

@@ -10,8 +10,6 @@
 //------------------------------------------------------------------------------
 #endregion
 
-using Furion.DependencyInjection;
-
 using Mapster;
 
 using Microsoft.Extensions.Caching.Memory;
@@ -23,8 +21,9 @@ namespace ThingsGateway.Core;
 /// <summary>
 /// 系统内存缓存
 /// </summary>
-public class MemoryCache : ISingleton
+public class MemoryCache
 {
+    public static MemoryCache Instance { get; private set; } = new();
     private const string intervalStr = "---___---";
     private readonly Microsoft.Extensions.Caching.Memory.MemoryCache _memoryCache = new(new MemoryCacheOptions());
     private readonly Microsoft.Extensions.Caching.Memory.MemoryCache _prefixmemoryCache = new(new MemoryCacheOptions());

framework/admin/ThingsGateway.Core/Extension/ServiceExtensions.cs

@@ -10,20 +10,15 @@
 //------------------------------------------------------------------------------
 #endregion
 
-using Furion;
-
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ThingsGateway.Core;
 
-/// <summary>
-/// Startup
-/// </summary>
-[AppStartup(9999)]
-public class Startup : AppStartup
+public static class ServiceExtensions
 {
-    public void ConfigureServices(IServiceCollection services)
+    /// <inheritdoc/>
+    public static void ThingsGatewayCoreConfigureServices(this IServiceCollection services)
     {
-
+        services.AddSingleton(a => MemoryCache.Instance);
     }
 }

framework/admin/ThingsGateway.Core/Extension/TypeExtensions.cs

@@ -10,8 +10,6 @@
 //------------------------------------------------------------------------------
 #endregion
 
-using Furion;
-
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Globalization;
@@ -90,7 +88,7 @@ public static class TypeExtensions
     public static string GetDescription(this Type modelType, string name, Func<MemberInfo, string> func = null)
     {
         var cacheKey = $"{nameof(GetDescription)}-{CultureInfo.CurrentUICulture.Name}-{modelType.FullName}-{name}-{modelType.TypeHandle.Value}";
-        var str = App.GetService<MemoryCache>().GetOrCreate(cacheKey, entry =>
+        var str = MemoryCache.Instance.GetOrCreate(cacheKey, entry =>
         {
             string dn = default;
             {

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

@@ -1,8 +1,11 @@
 <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="Mapster" Version="7.4.0" />
+
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+
 		<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.3</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.Photino/Program.cs

@@ -12,6 +12,8 @@
 
 using Photino.Blazor;
 
+using ThingsGateway.Core;
+
 namespace ThingsGateway.Foundation.Demo;
 
 internal class Program
@@ -23,11 +25,10 @@ internal class Program
 
         var appBuilder = PhotinoBlazorAppBuilder.CreateDefault(args);
 
-        Serve.RunNative();
-
         appBuilder.RootComponents.Add<App>("#app");
 
         appBuilder.Services.ThingsGatewayComponentsConfigureServices();
+        appBuilder.Services.ThingsGatewayCoreConfigureServices();
         var app = appBuilder.Build();
         app.MainWindow.SetTitle("ThingsGateway.Foundation.Demo");
         app.MainWindow.SetIconFile("wwwroot/favicon.ico");

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/Components/DebugPage/SerialPortClientPage.razor

@@ -18,10 +18,10 @@
 <MCard Flat Class="pa-2 my-1" Style="width:100%">
     <div class="mb-4">通道配置</div>
     <MRow Justify="JustifyTypes.Start" Align="AlignTypes.Center">
-        <MTextField Style="max-width:100px" Class="ma-1" Outlined Label=@(_serialProperty.Description(x => x.PortName)) Dense HideDetails="@("auto")" @bind-Value=@_serialProperty.PortName />
-        <MTextField Style="max-width:100px" Class="ma-1" Outlined Label=@(_serialProperty.Description(x => x.BaudRate)) Dense HideDetails="@("auto")" @bind-Value=@_serialProperty.BaudRate />
-        <MTextField Style="max-width:100px" Class="ma-1" Outlined Label=@(_serialProperty.Description(x => x.DataBits)) Dense HideDetails="@("auto")" @bind-Value=@_serialProperty.DataBits />
-        <MSelect Class="ma-1 " Style="max-width:200px" Outlined @bind-Value="_serialProperty.Parity" Label="@(_serialProperty.Description(x => x.Parity))"
+        <MTextField Style="max-width:100px" Class="ma-1" Outlined Label=@(_serialPortOption.Description(x => x.PortName)) Dense HideDetails="@("auto")" @bind-Value=@_serialPortOption.PortName />
+        <MTextField Style="max-width:100px" Class="ma-1" Outlined Label=@(_serialPortOption.Description(x => x.BaudRate)) Dense HideDetails="@("auto")" @bind-Value=@_serialPortOption.BaudRate />
+        <MTextField Style="max-width:100px" Class="ma-1" Outlined Label=@(_serialPortOption.Description(x => x.DataBits)) Dense HideDetails="@("auto")" @bind-Value=@_serialPortOption.DataBits />
+        <MSelect Class="ma-1 " Style="max-width:200px" Outlined @bind-Value="_serialPortOption.Parity" Label="@(_serialPortOption.Description(x => x.Parity))"
                  Items=@(typeof(Parity).GetEnumList())
                  MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
                  ItemText=@((u) =>u.Description)
@@ -29,7 +29,7 @@
                  HideDetails=@("auto") Height="30"
                  Dense>
         </MSelect>
-        <MSelect Class="ma-1 " Style="max-width:200px" Outlined @bind-Value="_serialProperty.StopBits" Label="@(_serialProperty.Description(x => x.StopBits))"
+        <MSelect Class="ma-1 " Style="max-width:200px" Outlined @bind-Value="_serialPortOption.StopBits" Label="@(_serialPortOption.Description(x => x.StopBits))"
                  Items=@(typeof(StopBits).GetEnumList())
                  MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
                  ItemText=@((u) =>u.Description)

framework/demo/ThingsGateway.Foundation.Demo.Rcl/Components/DebugPage/SerialPortClientPage.razor.cs

@@ -13,39 +13,39 @@
 namespace ThingsGateway.Foundation.Demo;
 
 /// <inheritdoc/>
-public partial class SerialSessionPage : IDisposable
+public partial class SerialPortClientPage : IDisposable
 {
     /// <summary>
     /// 日志输出
     /// </summary>
     public Action<LogLevel, object, string, Exception> LogAction;
 
-    private readonly SerialProperty _serialProperty = new();
+    private readonly SerialPortOption _serialPortOption = new();
     private TouchSocketConfig _config;
-    private SerialSession _serialSession { get; set; } = new();
+    private SerialPortClient _serialPortClient { get; set; } = new();
 
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
     public void Dispose()
     {
-        _serialSession.SafeDispose();
+        _serialPortClient.SafeDispose();
     }
 
     /// <summary>
     /// 获取对象
     /// </summary>
     /// <returns></returns>
-    public SerialSession GetSerialSession()
+    public SerialPortClient GetSerialPortClient()
     {
         _config ??= new TouchSocketConfig();
         var LogMessage = new LoggerGroup() { LogLevel = LogLevel.Trace };
         LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = LogLevel.Trace });
         _config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));
-        _config.SetSerialProperty(_serialProperty);
+        _config.SetSerialPortOption(_serialPortOption);
         //载入配置
-        _serialSession.Setup(_config);
-        return _serialSession;
+        _serialPortClient.Setup(_config);
+        return _serialPortClient;
     }
     internal void StateHasChangedAsync()
     {
@@ -63,7 +63,7 @@ public partial class SerialSessionPage : IDisposable
             var LogMessage = new LoggerGroup() { LogLevel = LogLevel.Trace };
             LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = LogLevel.Trace });
             _config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));
-            _serialSession.Setup(_config);
+            _serialPortClient.Setup(_config);
         }
         base.OnAfterRender(firstRender);
     }
@@ -80,8 +80,8 @@ public partial class SerialSessionPage : IDisposable
     {
         try
         {
-            _serialSession.Close();
-            await GetSerialSession().ConnectAsync();
+            _serialPortClient.Close();
+            await GetSerialPortClient().ConnectAsync();
         }
         catch (Exception ex)
         {
@@ -93,7 +93,7 @@ public partial class SerialSessionPage : IDisposable
     {
         try
         {
-            _serialSession.Close();
+            _serialPortClient.Close();
         }
         catch (Exception ex)
         {

framework/demo/ThingsGateway.Foundation.Demo.Rcl/GlobalUsings.cs

@@ -16,6 +16,6 @@ global using System.Threading.Tasks;
 
 global using ThingsGateway.Components;
 global using ThingsGateway.Foundation.Core;
-global using ThingsGateway.Foundation.Serial;
+global using ThingsGateway.Foundation.SerialPorts;
 global using ThingsGateway.Foundation.Sockets;
 

framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007DebugPage.razor

@@ -19,7 +19,7 @@
 @using Masa.Blazor;
 @namespace ThingsGateway.Foundation.Demo
 
-<SerialSessionPage @ref=_serialSessionPage></SerialSessionPage>
+<SerialPortClientPage @ref=_serialPortClientPage></SerialPortClientPage>
 
 <MCard Flat Class="pa-2 my-1" Style="width:100%">
     <div class="mb-4">驱动配置</div>

framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007DebugPage.razor.cs

@@ -17,9 +17,9 @@ namespace ThingsGateway.Foundation.Demo;
 public partial class DLT645_2007DebugPage
 {
     /// <summary>
-    /// SerialSessionPage
+    /// SerialPortClientPage
     /// </summary>
-    private SerialSessionPage _serialSessionPage;
+    private SerialPortClientPage _serialPortClientPage;
     private DriverDebugUIPage _driverDebugUIPage;
     private ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007 _plc;
     /// <summary>
@@ -37,15 +37,15 @@ public partial class DLT645_2007DebugPage
                     //链路基础配置项
                     var config = new TouchSocketConfig();
                     config
-                    .SetSerialProperty(new SerialProperty() //串口链路才需要
+                    .SetSerialPortOption(new SerialPortOption() //串口链路才需要
                     {
                         PortName = "COM1"
                     });
-                    var serialSession = new SerialSession();//链路对象
-                    serialSession.Setup(config);
+                    var serialPortClient = new SerialPortClient();//链路对象
+                    serialPortClient.Setup(config);
 
                     //创建协议对象,构造函数需要传入对应链路对象
-                    DLT645_2007 plc = new(serialSession)//传入链路
+                    DLT645_2007 plc = new(serialPortClient)//传入链路
                     {
                         //协议配置
                         DataFormat = DataFormat.ABCD,
@@ -69,9 +69,9 @@ public partial class DLT645_2007DebugPage
                 """, "csharp"));
 
 
-            if (_serialSessionPage != null)
-                _serialSessionPage.LogAction = _driverDebugUIPage.LogOut;
-            _plc = new ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007(_serialSessionPage.GetSerialSession());
+            if (_serialPortClientPage != null)
+                _serialPortClientPage.LogAction = _driverDebugUIPage.LogOut;
+            _plc = new ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007(_serialPortClientPage.GetSerialPortClient());
             _driverDebugUIPage.Plc = _plc;
 
             //初始化

framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007OverTcpDebugPage.razor.cs

@@ -17,7 +17,7 @@ namespace ThingsGateway.Foundation.Demo;
 public partial class DLT645_2007OverTcpDebugPage
 {
     /// <summary>
-    /// SerialSessionPage
+    /// SerialPortClientPage
     /// </summary>
     private TcpClientPage _tcpClientPage;
     private DriverDebugUIPage _driverDebugUIPage;

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/Modbus/ModbusRtuDebugPage.razor

@@ -19,7 +19,7 @@
 @using Masa.Blazor;
 @namespace ThingsGateway.Foundation.Demo
 
-<SerialSessionPage @ref=_serialSessionPage></SerialSessionPage>
+<SerialPortClientPage @ref=_serialPortClientPage></SerialPortClientPage>
 
 <MCard Flat Class="pa-2 my-1" Style="width:100%">
      <div class="mb-4">驱动配置</div>

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

@@ -19,9 +19,9 @@ namespace ThingsGateway.Foundation.Demo;
 public partial class ModbusRtuDebugPage
 {
     /// <summary>
-    /// SerialSessionPage
+    /// SerialPortClientPage
     /// </summary>
-    private SerialSessionPage _serialSessionPage;
+    private SerialPortClientPage _serialPortClientPage;
     private readonly List<(string Code, string Language)> _sections = new();
     private DriverDebugUIPage _driverDebugUIPage;
 
@@ -41,15 +41,15 @@ public partial class ModbusRtuDebugPage
                     //链路基础配置项
                     var config = new TouchSocketConfig();
                     config
-                    .SetSerialProperty(new SerialProperty() //串口链路才需要
+                    .SetSerialPortOption(new SerialPortOption() //串口链路才需要
                     {
                         PortName = "COM1"
                     });
-                    var serialSession = new SerialSession();//链路对象
-                    serialSession.Setup(config);
+                    var serialPortClient = new SerialPortClient();//链路对象
+                    serialPortClient.Setup(config);
 
                     //创建协议对象,构造函数需要传入对应链路对象
-                    ModbusRtu plc = new(serialSession)//传入链路
+                    ModbusRtu plc = new(serialPortClient)//传入链路
                     {
                         //协议配置
                         DataFormat = DataFormat.ABCD,
@@ -72,9 +72,9 @@ public partial class ModbusRtuDebugPage
                 """, "csharp"));
 
 
-            if (_serialSessionPage != null)
-                _serialSessionPage.LogAction = _driverDebugUIPage.LogOut;
-            _plc = new ThingsGateway.Foundation.Adapter.Modbus.ModbusRtu(_serialSessionPage.GetSerialSession());
+            if (_serialPortClientPage != null)
+                _serialPortClientPage.LogAction = _driverDebugUIPage.LogOut;
+            _plc = new ThingsGateway.Foundation.Adapter.Modbus.ModbusRtu(_serialPortClientPage.GetSerialPortClient());
             _driverDebugUIPage.Plc = _plc;
             //载入配置
             StateHasChanged();

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

@@ -19,7 +19,7 @@ namespace ThingsGateway.Foundation.Demo;
 public partial class ModbusRtuOverTcpDebugPage
 {
     /// <summary>
-    /// SerialSessionPage
+    /// SerialPortClientPage
     /// </summary>
     private TcpClientPage _tcpClientPage;
     private DriverDebugUIPage _driverDebugUIPage;

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

@@ -17,7 +17,7 @@ namespace ThingsGateway.Foundation.Demo;
 public partial class ModbusRtuOverUdpDebugPage
 {
     /// <summary>
-    /// SerialSessionPage
+    /// SerialPortClientPage
     /// </summary>
     private UdpSessionPage _udpSessionPage;
     private DriverDebugUIPage _driverDebugUIPage;

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

@@ -19,7 +19,7 @@
 @using Masa.Blazor;
 @namespace ThingsGateway.Foundation.Demo
 
-<SerialSessionPage @ref=_serialSessionPage></SerialSessionPage>
+<SerialPortClientPage @ref=_serialPortClientPage></SerialPortClientPage>
 
 <MCard Flat Class="pa-2 my-1" Style="width:100%">
     <div class="mb-4">驱动配置</div>

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

@@ -17,9 +17,9 @@ namespace ThingsGateway.Foundation.Demo;
 public partial class ModbusSerialServerDebugPage
 {
     /// <summary>
-    /// SerialSessionPage
+    /// SerialPortClientPage
     /// </summary>
-    private SerialSessionPage _serialSessionPage;
+    private SerialPortClientPage _serialPortClientPage;
     private DriverDebugUIPage _driverDebugUIPage;
 
     private ThingsGateway.Foundation.Adapter.Modbus.ModbusSerialServer _plc;
@@ -39,15 +39,15 @@ public partial class ModbusSerialServerDebugPage
                     //链路基础配置项
                     var config = new TouchSocketConfig();
                     config
-                    .SetSerialProperty(new SerialProperty() //串口链路才需要
+                    .SetSerialPortOption(new SerialPortOption() //串口链路才需要
                     {
                         PortName = "COM1"
                     });
-                    var serialSession = new SerialSession();//链路对象
-                    serialSession.Setup(config);
+                    var serialPortClient = new SerialPortClient();//链路对象
+                    serialPortClient.Setup(config);
 
                     //创建协议对象,构造函数需要传入对应链路对象
-                    ModbusSerialServer plc = new(serialSession)//传入链路
+                    ModbusSerialServer plc = new(serialPortClient)//传入链路
                     {
                         //协议配置
                         DataFormat = DataFormat.ABCD,
@@ -70,9 +70,9 @@ public partial class ModbusSerialServerDebugPage
                 """, "csharp"));
 
 
-            if (_serialSessionPage != null)
-                _serialSessionPage.LogAction = _driverDebugUIPage.LogOut;
-            _plc = new ThingsGateway.Foundation.Adapter.Modbus.ModbusSerialServer(_serialSessionPage.GetSerialSession());
+            if (_serialPortClientPage != null)
+                _serialPortClientPage.LogAction = _driverDebugUIPage.LogOut;
+            _plc = new ThingsGateway.Foundation.Adapter.Modbus.ModbusSerialServer(_serialPortClientPage.GetSerialPortClient());
             _driverDebugUIPage.Plc = _plc;
             //载入配置
             StateHasChanged();

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

@@ -21,7 +21,7 @@ public partial class ModbusTcpDebugPage
     private ThingsGateway.Foundation.Adapter.Modbus.ModbusTcp _plc;
 
     /// <summary>
-    /// SerialSessionPage
+    /// SerialPortClientPage
     /// </summary>
     private TcpClientPage _tcpClientPage;
     /// <summary>

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

@@ -17,7 +17,7 @@ namespace ThingsGateway.Foundation.Demo;
 public partial class ModbusUdpDebugPage
 {
     /// <summary>
-    /// SerialSessionPage
+    /// SerialPortClientPage
     /// </summary>
     private UdpSessionPage _udpSessionPage;
     private DriverDebugUIPage _driverDebugUIPage;

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

@@ -23,7 +23,7 @@
 @using ThingsGateway.Foundation.Core;
 @using ThingsGateway.Foundation.Adapter.OPCDA.Da;
 @using ThingsGateway.Foundation.Extension;
-@using ThingsGateway.Foundation.Serial;
+@using ThingsGateway.Foundation.SerialPorts;
 @using Masa.Blazor
 
 

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

@@ -25,7 +25,7 @@
 @using ThingsGateway.Foundation.Core;
 @using ThingsGateway.Foundation.Adapter.OPCUA;
 @using ThingsGateway.Foundation.Extension;
-@using ThingsGateway.Foundation.Serial;
+@using ThingsGateway.Foundation.SerialPorts;
 @using Masa.Blazor
 
 

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/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Siemens/SiemensDebugPage.razor

@@ -20,7 +20,7 @@
 @using ThingsGateway.Foundation.Adapter.Siemens;
 @using ThingsGateway.Foundation.Core;
 @using ThingsGateway.Foundation.Extension;
-@using ThingsGateway.Foundation.Serial;
+@using ThingsGateway.Foundation.SerialPorts;
 
 @using Masa.Blazor
 

framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Siemens/SiemensDebugPage.razor.cs

@@ -21,7 +21,7 @@ public partial class SiemensDebugPage
     private ThingsGateway.Foundation.Adapter.Siemens.SiemensS7PLC _plc;
 
     /// <summary>
-    /// SerialSessionPage
+    /// SerialPortClientPage
     /// </summary>
     private TcpClientPage _tcpClientPage;
     /// <summary>

framework/demo/ThingsGateway.Foundation.Demo.Rcl/Shared/MainLayout.razor.cs

@@ -10,8 +10,6 @@
 //------------------------------------------------------------------------------
 #endregion
 
-using System.Collections.Generic;
-
 namespace ThingsGateway.Foundation.Demo;
 
 public partial class MainLayout
@@ -105,16 +103,16 @@ public partial class MainLayout
         "Title": "OPCUAClient"
       }
     ]
-  },
-  {
-    "Title": "Mqtt",
-    "Children": [
-      {
-        "Href": "/MqttClient",
-        "Title": "MqttClient"
-      }
-    ]
   }
+  //{
+  //  "Title": "Mqtt",
+  //  "Children": [
+  //    {
+  //      "Href": "/MqttClient",
+  //      "Title": "MqttClient"
+  //    }
+  //  ]
+  //}
 ]
 
 

framework/demo/ThingsGateway.Foundation.Demo.Rcl/_Imports.razor

@@ -25,5 +25,5 @@
 @using System.Net.Http.Json
 @using System.IO;
 @using System.Text.Json;
-@using ThingsGateway.Foundation.Serial;
+@using ThingsGateway.Foundation.SerialPorts;
 @using ThingsGateway.Foundation.Sockets;

framework/demo/ThingsGateway.Foundation.Demo.Winform/MainFrom.cs

@@ -14,9 +14,9 @@ using Microsoft.AspNetCore.Components.WebView.WindowsForms;
 using Microsoft.Extensions.DependencyInjection;
 
 using System.Diagnostics;
-using System.Threading.Tasks;
 
 using ThingsGateway.Components;
+using ThingsGateway.Core;
 
 namespace ThingsGateway.Foundation.Demo.Winform
 {
@@ -26,14 +26,12 @@ namespace ThingsGateway.Foundation.Demo.Winform
         {
             InitializeComponent();
 
-            IServiceCollection services = null;
+            IServiceCollection services = new ServiceCollection();
 
-            Serve.RunNative(a =>
-            {
-                services = a;
-                services.AddWindowsFormsBlazorWebView();
-                services.ThingsGatewayComponentsConfigureServices();
-            });
+
+            services.AddWindowsFormsBlazorWebView();
+            services.ThingsGatewayComponentsConfigureServices();
+            services.ThingsGatewayCoreConfigureServices();
 
             blazorWebView1.HostPage = "wwwroot/index.html";
             blazorWebView1.Services = services.BuildServiceProvider();

framework/demo/ThingsGateway.Foundation.Demo.Winform/ThingsGateway.Foundation.Demo.Winform.csproj

@@ -7,6 +7,7 @@
 		<UseWindowsForms>true</UseWindowsForms>
 	</PropertyGroup>
 
+
 	<ItemGroup>
 		<None Remove="favicon.ico" />
 	</ItemGroup>

framework/foundation/Directory.Build.props

@@ -1,16 +1,14 @@
 <Project>
+	<Import Project="$(SolutionDir)\Directory.Build.props" />
+	<!--如果编译net45报错无支持，用一下方法添加net45包-->
+	<!--VS顶部菜单栏 -> 视图 -> 其他 -> 程序包控制台
+	Install-Package Microsoft.NETFramework.ReferenceAssemblies.net45
+	-->
 	<PropertyGroup>
-		<Version>4.0.0.3</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>
@@ -22,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

@@ -16,13 +16,13 @@ namespace ThingsGateway.Foundation.Adapter.DLT645;
 /// <summary>
 /// DLT645_2007
 /// </summary>
-public class DLT645_2007 : ReadWriteDevicesSerialSessionBase, IDLT645_2007
+public class DLT645_2007 : ReadWriteDevicesSerialPortClientBase, IDLT645_2007
 {
     /// <summary>
     /// DLT645_2007
     /// </summary>
-    /// <param name="serialSession"></param>
-    public DLT645_2007(SerialSession serialSession) : base(serialSession)
+    /// <param name="serialPortClient"></param>
+    public DLT645_2007(SerialPortClient serialPortClient) : base(serialPortClient)
     {
         ThingsGatewayBitConverter = new DLT645_2007BitConverter(EndianType.Big);
         RegisterByteLength = 2;
@@ -62,7 +62,7 @@ public class DLT645_2007 : ReadWriteDevicesSerialSessionBase, IDLT645_2007
         {
             EnableFEHead = EnableFEHead
         };
-        SerialSession.SetDataHandlingAdapter(dataHandleAdapter);
+        SerialPortClient.SetDataHandlingAdapter(dataHandleAdapter);
     }
 
 
@@ -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.DLT645/GlobalUsings.cs

@@ -17,5 +17,5 @@ global using System.Threading;
 global using System.Threading.Tasks;
 
 global using ThingsGateway.Foundation.Core;
-global using ThingsGateway.Foundation.Serial;
+global using ThingsGateway.Foundation.SerialPorts;
 global using ThingsGateway.Foundation.Sockets;

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

@@ -17,5 +17,5 @@ global using System.Threading;
 global using System.Threading.Tasks;
 
 global using ThingsGateway.Foundation.Core;
-global using ThingsGateway.Foundation.Serial;
+global using ThingsGateway.Foundation.SerialPorts;
 global using ThingsGateway.Foundation.Sockets;

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/ModbusRtu/ModbusRtu.cs

@@ -16,13 +16,13 @@ namespace ThingsGateway.Foundation.Adapter.Modbus;
 /// <summary>
 /// ModbusRtu
 /// </summary>
-public class ModbusRtu : ReadWriteDevicesSerialSessionBase
+public class ModbusRtu : ReadWriteDevicesSerialPortClientBase
 {
     /// <summary>
     /// ModbusRtu
     /// </summary>
-    /// <param name="serialSession"></param>
-    public ModbusRtu(SerialSession serialSession) : base(serialSession)
+    /// <param name="serialPortClient"></param>
+    public ModbusRtu(SerialPortClient serialPortClient) : base(serialPortClient)
     {
         ThingsGatewayBitConverter = new ThingsGatewayBitConverter(EndianType.Big);
         RegisterByteLength = 2;
@@ -93,7 +93,7 @@ public class ModbusRtu : ReadWriteDevicesSerialSessionBase
             Crc16CheckEnable = Crc16CheckEnable,
             CacheTimeout = TimeSpan.FromMilliseconds(CacheTimeout)
         };
-        SerialSession.SetDataHandlingAdapter(dataHandleAdapter);
+        SerialPortClient.SetDataHandlingAdapter(dataHandleAdapter);
     }
 
     /// <inheritdoc/>

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.Adapter.Modbus/Modbus/Server/ModbusSerialServer/ModbusSerialServer.cs

@@ -16,10 +16,10 @@ namespace ThingsGateway.Foundation.Adapter.Modbus;
 /// <summary>
 /// <inheritdoc/>
 /// </summary>
-public class ModbusSerialServer : ReadWriteDevicesSerialSessionBase, IModbusServer
+public class ModbusSerialServer : ReadWriteDevicesSerialPortClientBase, IModbusServer
 {
     /// <inheritdoc/>
-    public ModbusSerialServer(SerialSession serialSession) : base(serialSession)
+    public ModbusSerialServer(SerialPortClient serialPortClient) : base(serialPortClient)
     {
         ThingsGatewayBitConverter = new ThingsGatewayBitConverter(EndianType.Big);
         RegisterByteLength = 2;
@@ -130,7 +130,7 @@ public class ModbusSerialServer : ReadWriteDevicesSerialSessionBase, IModbusServ
     {
         ModbusSerialServerDataHandleAdapter dataHandleAdapter = new();
         dataHandleAdapter.CacheTimeout = TimeSpan.FromMilliseconds(CacheTimeout);
-        SerialSession.SetDataHandlingAdapter(dataHandleAdapter);
+        SerialPortClient.SetDataHandlingAdapter(dataHandleAdapter);
     }
 
 
@@ -165,7 +165,7 @@ public class ModbusSerialServer : ReadWriteDevicesSerialSessionBase, IModbusServ
     }
 
     /// <inheritdoc/>
-    protected override async Task Received(SerialSession client, ReceivedDataEventArgs e)
+    protected override async Task Received(SerialPortClient client, ReceivedDataEventArgs e)
     {
         try
         {

framework/foundation/ThingsGateway.Foundation.Adapter.Modbus/ThingsGateway.Foundation.Adapter.Modbus.xml

@@ -253,11 +253,11 @@
             ModbusRtu
             </summary>
         </member>
-        <member name="M:ThingsGateway.Foundation.Adapter.Modbus.ModbusRtu.#ctor(ThingsGateway.Foundation.Serial.SerialSession)">
+        <member name="M:ThingsGateway.Foundation.Adapter.Modbus.ModbusRtu.#ctor(ThingsGateway.Foundation.SerialPorts.SerialPortClient)">
             <summary>
             ModbusRtu
             </summary>
-            <param name="serialSession"></param>
+            <param name="serialPortClient"></param>
         </member>
         <member name="P:ThingsGateway.Foundation.Adapter.Modbus.ModbusRtu.Crc16CheckEnable">
             <summary>

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/ReadWriteDevicesSerialSessionBase.cs

@@ -10,33 +10,34 @@
 //------------------------------------------------------------------------------
 #endregion
 
+
 namespace ThingsGateway.Foundation.Core;
 
 /// <summary>
 /// 串口读写设备
 /// </summary>
-public abstract class ReadWriteDevicesSerialSessionBase : ReadWriteDevicesBase
+public abstract class ReadWriteDevicesSerialPortClientBase : ReadWriteDevicesBase
 {
     /// <summary>
-    /// <inheritdoc cref="ReadWriteDevicesSerialSessionBase"/>
+    /// <inheritdoc cref="ReadWriteDevicesSerialPortClientBase"/>
     /// </summary>
-    /// <param name="serialSession"></param>
-    public ReadWriteDevicesSerialSessionBase(SerialSession serialSession)
+    /// <param name="serialPortClient"></param>
+    public ReadWriteDevicesSerialPortClientBase(SerialPortClient serialPortClient)
     {
-        SerialSession = serialSession;
-        WaitingClientEx = SerialSession.CreateWaitingClient(new() { });
-        SerialSession.Received -= Received;
-        SerialSession.Connecting -= Connecting;
-        SerialSession.Connected -= Connected;
-        SerialSession.Disconnecting -= Disconnecting;
-        SerialSession.Disconnected -= Disconnected;
-        SerialSession.Connecting += Connecting;
-        SerialSession.Connected += Connected;
-        SerialSession.Disconnecting += Disconnecting;
-        SerialSession.Disconnected += Disconnected;
-        SerialSession.Received += Received;
+        SerialPortClient = serialPortClient;
+        WaitingClientEx = SerialPortClient.CreateWaitingClient(new() { });
+        SerialPortClient.Received -= Received;
+        SerialPortClient.Connecting -= Connecting;
+        SerialPortClient.Connected -= Connected;
+        SerialPortClient.Disconnecting -= Disconnecting;
+        SerialPortClient.Disconnected -= Disconnected;
+        SerialPortClient.Connecting += Connecting;
+        SerialPortClient.Connected += Connected;
+        SerialPortClient.Disconnecting += Disconnecting;
+        SerialPortClient.Disconnected += Disconnected;
+        SerialPortClient.Received += Received;
 
-        Logger = SerialSession.Logger;
+        Logger = SerialPortClient.Logger;
     }
     /// <summary>
     /// 接收解析
@@ -44,88 +45,88 @@ public abstract class ReadWriteDevicesSerialSessionBase : ReadWriteDevicesBase
     /// <param name="client"></param>
     /// <param name="e"></param>
     /// <returns></returns>
-    protected virtual Task Received(SerialSession client, ReceivedDataEventArgs e)
+    protected virtual Task Received(SerialPortClient client, ReceivedDataEventArgs e)
     {
         return EasyTask.CompletedTask;
     }
 
     /// <inheritdoc/>
-    public override ChannelEnum ChannelEnum => ChannelEnum.SerialSession;
+    public override ChannelEnum ChannelEnum => ChannelEnum.SerialPortClient;
 
     /// <summary>
     /// 串口管理对象
     /// </summary>
-    public SerialSession SerialSession { get; }
+    public SerialPortClient SerialPortClient { get; }
 
     /// <summary>
     /// 默认WaitingClientEx
     /// </summary>
-    public virtual IWaitingClient<SerialSession> WaitingClientEx { get; }
+    public virtual IWaitingClient<SerialPortClient> WaitingClientEx { get; }
     /// <inheritdoc/>
     public override bool IsConnected()
     {
-        return SerialSession?.CanSend == true;
+        return SerialPortClient?.CanSend == true;
     }
     /// <inheritdoc/>
     public override void Connect(CancellationToken cancellationToken)
     {
-        SerialSession.Connect();
+        SerialPortClient.Connect();
     }
 
     /// <inheritdoc/>
     public override Task ConnectAsync(CancellationToken cancellationToken)
     {
-        return SerialSession.ConnectAsync();
+        return SerialPortClient.ConnectAsync();
     }
 
     /// <inheritdoc/>
     public override void Disconnect()
     {
         if (CascadeDisposal && IsConnected())
-            SerialSession.Close();
+            SerialPortClient.Close();
     }
 
     /// <inheritdoc/>
     public override void Dispose()
     {
         Disconnect();
-        SerialSession.Received -= Received;
-        SerialSession.Connecting -= Connecting;
-        SerialSession.Connected -= Connected;
-        SerialSession.Disconnecting -= Disconnecting;
-        SerialSession.Disconnected -= Disconnected;
-        if (CascadeDisposal && !SerialSession.DisposedValue)
-            SerialSession.SafeDispose();
+        SerialPortClient.Received -= Received;
+        SerialPortClient.Connecting -= Connecting;
+        SerialPortClient.Connected -= Connected;
+        SerialPortClient.Disconnecting -= Disconnecting;
+        SerialPortClient.Disconnected -= Disconnected;
+        if (CascadeDisposal && !SerialPortClient.DisposedValue)
+            SerialPortClient.SafeDispose();
     }
 
     /// <inheritdoc/>
     public override string ToString()
     {
-        return SerialSession.SerialProperty.ToString();
+        return SerialPortClient.ToString();
     }
 
-    private async Task Connected(ISerialSession client, ConnectedEventArgs e)
+    private async Task Connected(ISerialPortClient client, ConnectedEventArgs e)
     {
-        Logger?.Debug(client.SerialProperty.ToString() + "连接成功");
+        Logger?.Debug(client.ToString() + "连接成功");
         SetDataAdapter();
         await EasyTask.CompletedTask;
     }
 
-    private async Task Connecting(ISerialSession client, SerialConnectingEventArgs e)
+    private async Task Connecting(ISerialPortClient client, SerialConnectingEventArgs e)
     {
-        Logger?.Debug(client.SerialProperty.ToString() + "正在连接");
+        Logger?.Debug(client.ToString() + "正在连接");
         await EasyTask.CompletedTask;
     }
 
-    private async Task Disconnected(ISerialSessionBase client, DisconnectEventArgs e)
+    private async Task Disconnected(ISerialPortClient client, DisconnectEventArgs e)
     {
-        Logger?.Debug(client.SerialProperty.ToString() + "断开连接-" + e.Message);
+        Logger?.Debug(client.ToString() + "断开连接-" + e.Message);
         await EasyTask.CompletedTask;
     }
 
-    private async Task Disconnecting(ISerialSessionBase client, DisconnectEventArgs e)
+    private async Task Disconnecting(ISerialPortClient client, DisconnectEventArgs e)
     {
-        Logger?.Debug(client.SerialProperty.ToString() + "正在主动断开连接-" + e.Message);
+        Logger?.Debug(client.ToString() + "正在主动断开连接-" + e.Message);
         await EasyTask.CompletedTask;
     }
 
@@ -150,6 +151,6 @@ public abstract class ReadWriteDevicesSerialSessionBase : ReadWriteDevicesBase
     /// <inheritdoc/>
     public override void Send(byte[] command, string id = default)
     {
-        SerialSession.Send(command);
+        SerialPortClient.Send(command);
     }
 }

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

@@ -53,8 +53,7 @@ public abstract class ReadWriteDevicesTcpServerBase : ReadWriteDevicesBase
     /// <inheritdoc/>
     public override Task ConnectAsync(CancellationToken cancellationToken)
     {
-        Connect(cancellationToken);
-        return EasyTask.CompletedTask;
+        return TcpService.StartAsync();
     }
 
     /// <inheritdoc/>

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

@@ -48,7 +48,7 @@ public abstract class ReadWriteDevicesUdpSessionBase : ReadWriteDevicesBase
     /// <inheritdoc/>
     public override Task ConnectAsync(CancellationToken cancellationToken)
     {
-        return Task.FromResult(UdpSession.Start());
+        return UdpSession.StartAsync();
     }
 
     /// <inheritdoc/>
@@ -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/Enums/ChannelEnum.cs

@@ -22,7 +22,7 @@ public enum ChannelEnum
     /// <inheritdoc/>
     TcpClient = 1,
     /// <inheritdoc/>
-    SerialSession = 2,
+    SerialPortClient = 2,
     /// <inheritdoc/>
     UdpSession = 4,
     /// <inheritdoc/>

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/Foundation/SerialPort/EventArgs/SerialConnectingEventArgs.cs

@@ -1,48 +0,0 @@
-#region copyright
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-#endregion
-
-using System.IO.Ports;
-
-namespace ThingsGateway.Foundation.Serial;
-/// <summary>
-/// Connecting
-/// </summary>
-/// <typeparam name="TClient"></typeparam>
-/// <param name="client"></param>
-/// <param name="e"></param>
-public delegate Task SerialConnectingEventHandler<TClient>(TClient client, SerialConnectingEventArgs e);
-
-/// <summary>
-/// 客户端连接事件。
-/// </summary>
-public class SerialConnectingEventArgs : MsgPermitEventArgs
-{
-    /// <summary>
-    /// 构造函数
-    /// </summary>
-    /// <param name="serialPort"></param>
-    public SerialConnectingEventArgs(SerialPort serialPort)
-    {
-        this.SerialPort = serialPort;
-        this.IsPermitOperation = true;
-    }
-
-    /// <summary>
-    /// 客户端Id。该Id的赋值，仅在服务器适用。
-    /// </summary>
-    public string Id { get; set; }
-
-    /// <summary>
-    /// 新初始化的通信器
-    /// </summary>
-    public SerialPort SerialPort { get; private set; }
-}

framework/foundation/ThingsGateway.Foundation/Foundation/SerialPort/Extension/SerialConfigExtension.cs

@@ -1,38 +0,0 @@
-#region copyright
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-#endregion
-
-namespace ThingsGateway.Foundation.Serial;
-
-/// <summary>
-/// 串口附加属性
-/// </summary>
-public static class SerialConfigExtension
-{
-    /// <summary>
-    /// 串口属性
-    /// </summary>
-    public static readonly DependencyProperty<SerialProperty> SerialProperty =
-        DependencyProperty<SerialProperty>.Register("SerialProperty", new());
-
-    /// <summary>
-    /// 设置串口
-    /// </summary>
-    /// <param name="config"></param>
-    /// <param name="value"></param>
-    /// <returns></returns>
-    public static TouchSocketConfig SetSerialProperty(this TouchSocketConfig config, SerialProperty value)
-    {
-        config.SetValue(SerialProperty, value);
-        return config;
-    }
-
-}

framework/foundation/ThingsGateway.Foundation/Foundation/SerialPort/Extension/SerialPortExtensions.cs

@@ -1,58 +0,0 @@
-#region copyright
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-#endregion
-
-using System.IO.Ports;
-
-namespace ThingsGateway.Foundation.Serial;
-
-/// <summary>
-/// SocketExtension
-/// </summary>
-public static class SerialPortExtensions
-{
-    /// <summary>
-    /// 会使用同步锁，保证所有数据上缓存区。
-    /// </summary>
-    /// <param name="serialPort"></param>
-    /// <param name="buffer"></param>
-    /// <param name="offset"></param>
-    /// <param name="length"></param>
-    public static void AbsoluteSend(this SerialPort serialPort, byte[] buffer, int offset, int length)
-    {
-        lock (serialPort)
-        {
-            serialPort.Write(buffer, offset, length);
-        }
-    }
-
-    /// <summary>
-    /// 尝试关闭<see cref="SerialPort"/>。不会抛出异常。
-    /// </summary>
-    /// <param name="serialPort"></param>
-    public static void TryClose(this SerialPort serialPort)
-    {
-        lock (serialPort)
-        {
-            try
-            {
-                if (serialPort.IsOpen)
-                {
-                    serialPort.Close();
-                }
-            }
-            catch
-            {
-
-            }
-        }
-    }
-}

framework/foundation/ThingsGateway.Foundation/Foundation/SerialPort/Interface/ISerialSession.cs

@@ -1,36 +0,0 @@
-#region copyright
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-#endregion
-
-namespace ThingsGateway.Foundation.Serial;
-
-/// <summary>
-/// <inheritdoc cref="ISerialSessionBase"/>
-/// </summary>
-public interface ISerialSession : ISerialSessionBase, IClientSender, IPluginObject, ISetupConfigObject
-{
-    /// <summary>
-    /// 成功打开串口
-    /// </summary>
-    ConnectedEventHandler<ISerialSession> Connected { get; set; }
-
-    /// <summary>
-    /// 准备连接串口的时候
-    /// </summary>
-    SerialConnectingEventHandler<ISerialSession> Connecting { get; set; }
-
-    /// <summary>
-    /// 连接串口
-    /// </summary>
-    /// <exception cref="Exception"></exception>
-    ISerialSession Connect();
-
-}

framework/foundation/ThingsGateway.Foundation/Foundation/SerialPort/Interface/ISerialSessionBase.cs

@@ -1,66 +0,0 @@
-#region copyright
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-#endregion
-
-using System.IO.Ports;
-
-namespace ThingsGateway.Foundation.Serial;
-
-/// <summary>
-/// 串口连接接口。
-/// </summary>
-public interface ISerialSessionBase : ISenderClient, IClient, ISender, IDefaultSender, IPluginObject, IRequsetInfoSender, IConfigObject, IOnlineClient
-{
-    /// <summary>
-    /// 是否允许自由调用<see cref="SetDataHandlingAdapter"/>进行赋值。
-    /// </summary>
-    bool CanSetDataHandlingAdapter { get; }
-
-    /// <summary>
-    /// 数据处理适配器
-    /// </summary>
-    SingleStreamDataHandlingAdapter DataHandlingAdapter { get; }
-
-    /// <summary>
-    /// 断开连接
-    /// </summary>
-    DisconnectEventHandler<ISerialSessionBase> Disconnected { get; set; }
-
-    /// <summary>
-    /// 即将断开连接(仅主动断开时有效)。
-    /// <para>
-    /// </para>
-    /// </summary>
-    DisconnectEventHandler<ISerialSessionBase> Disconnecting { get; set; }
-
-    /// <summary>
-    /// 主通信器
-    /// </summary>
-    SerialPort MainSerialPort { get; }
-
-
-    /// <summary>
-    /// 串口描述
-    /// </summary>
-    SerialProperty SerialProperty { get; }
-    /// <summary>
-    /// 关闭客户端。
-    /// </summary>
-    /// <param name="msg"></param>
-    /// <exception cref="Exception"></exception>
-    void Close(string msg = TouchSocketCoreUtility.Empty);
-
-    /// <summary>
-    /// 设置数据处理适配器
-    /// </summary>
-    /// <param name="adapter"></param>
-    void SetDataHandlingAdapter(SingleStreamDataHandlingAdapter adapter);
-}

framework/foundation/ThingsGateway.Foundation/Foundation/SerialPort/SerialPort/SerialCore.cs

@@ -1,388 +0,0 @@
-#region copyright
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-#endregion
-
-using System.IO.Ports;
-
-namespace ThingsGateway.Foundation.Serial;
-internal sealed class InternalSerialCore : SerialCore
-{
-
-}
-/// <summary>
-/// Serial核心
-/// </summary>
-public class SerialCore : IDisposable, ISender
-{
-    /// <summary>
-    /// 最小缓存尺寸
-    /// </summary>
-    public int MinBufferSize { get; set; } = 1024 * 10;
-
-    /// <summary>
-    /// 最大缓存尺寸
-    /// </summary>
-    public int MaxBufferSize { get; set; } = 1024 * 1024 * 10;
-    #region 字段
-
-    /// <summary>
-    /// 同步根
-    /// </summary>
-    public readonly object SyncRoot = new object();
-
-    private long m_bufferRate;
-    private bool m_online => m_serialPort?.IsOpen == true;
-    private int m_receiveBufferSize = 1024 * 10;
-    private ValueCounter m_receiveCounter;
-    private int m_sendBufferSize = 1024 * 10;
-    private ValueCounter m_sendCounter;
-    private readonly EasyLock m_semaphoreForSend = new EasyLock();
-    private SerialPort m_serialPort;
-
-    #endregion 字段
-
-    /// <summary>
-    /// Tcp核心
-    /// </summary>
-    public SerialCore()
-    {
-        this.m_receiveCounter = new ValueCounter
-        {
-            Period = TimeSpan.FromSeconds(1),
-            OnPeriod = this.OnReceivePeriod
-        };
-
-        this.m_sendCounter = new ValueCounter
-        {
-            Period = TimeSpan.FromSeconds(1),
-            OnPeriod = this.OnSendPeriod
-        };
-    }
-
-    /// <summary>
-    /// 析构函数
-    /// </summary>
-    ~SerialCore()
-    {
-        this.SafeDispose();
-    }
-
-    /// <inheritdoc/>
-    public bool CanSend => this.m_online;
-
-    /// <summary>
-    /// 当中断Tcp的时候。当为<see langword="true"/>时，意味着是调用<see cref="Close(string)"/>。当为<see langword="false"/>时，则是其他中断。
-    /// </summary>
-    public Action<SerialCore, bool, string> OnBreakOut { get; set; }
-
-    /// <summary>
-    /// 当发生异常的时候
-    /// </summary>
-    public Action<SerialCore, Exception> OnException { get; set; }
-
-    /// <summary>
-    /// 在线状态
-    /// </summary>
-    public bool Online { get => this.m_online; }
-    /// <summary>
-    /// UserToken
-    /// </summary>
-    public ByteBlock UserToken { get; set; }
-
-    /// <summary>
-    /// 当收到数据的时候
-    /// </summary>
-    public Action<SerialCore, ByteBlock> OnReceived { get; set; }
-
-    /// <summary>
-    /// 接收缓存池,运行时的值会根据流速自动调整
-    /// </summary>
-    public int ReceiveBufferSize
-    {
-        get => this.m_receiveBufferSize;
-    }
-
-    /// <summary>
-    /// 接收计数器
-    /// </summary>
-    public ValueCounter ReceiveCounter { get => this.m_receiveCounter; }
-
-    /// <summary>
-    /// 发送缓存池,运行时的值会根据流速自动调整
-    /// </summary>
-    public int SendBufferSize
-    {
-        get => this.m_sendBufferSize;
-    }
-
-    /// <summary>
-    /// 发送计数器
-    /// </summary>
-    public ValueCounter SendCounter { get => this.m_sendCounter; }
-
-    /// <summary>
-    /// SerialPort
-    /// </summary>
-    public SerialPort MainSerialPort { get => this.m_serialPort; }
-
-
-    /// <summary>
-    /// 开始以Iocp方式接收
-    /// </summary>
-    public virtual void BeginIocpReceive()
-    {
-        var byteBlock = BytePool.Default.GetByteBlock(this.ReceiveBufferSize);
-        this.UserToken = byteBlock;
-        byteBlock.SetLength(0);
-        if (this.m_serialPort.BytesToRead > 0)
-        {
-            this.m_bufferRate += 2;
-            this.ProcessReceived();
-        }
-        m_serialPort.DataReceived += MainSerialPort_DataReceived;
-    }
-
-    private void MainSerialPort_DataReceived(object sender, SerialDataReceivedEventArgs e)
-    {
-        try
-        {
-            this.m_bufferRate = 1;
-            this.ProcessReceived();
-        }
-        catch (Exception ex)
-        {
-            this.PrivateBreakOut(false, ex.ToString());
-        }
-    }
-
-    /// <summary>
-    /// 请求关闭
-    /// </summary>
-    /// <param name="msg"></param>
-    public virtual void Close(string msg)
-    {
-        this.PrivateBreakOut(true, msg);
-    }
-
-    /// <summary>
-    /// 释放对象
-    /// </summary>
-    public void Dispose()
-    {
-        GC.SuppressFinalize(this);
-        UserToken.SafeDispose();
-    }
-
-    /// <summary>
-    /// 重置环境，并设置新的<see cref="m_serialPort"/>。
-    /// </summary>
-    /// <param name="socket"></param>
-    public virtual void Reset(SerialPort socket)
-    {
-        if (socket is null)
-        {
-            throw new ArgumentNullException(nameof(socket));
-        }
-
-        if (!socket.IsOpen)
-        {
-            throw new Exception("新的SerialPort必须在连接状态。");
-        }
-        this.Reset();
-        this.m_serialPort = socket;
-    }
-
-    /// <summary>
-    /// 重置环境。
-    /// </summary>
-    public virtual void Reset()
-    {
-        this.m_receiveCounter.Reset();
-        this.m_sendCounter.Reset();
-        this.m_serialPort = null;
-        this.OnReceived = null;
-        this.OnBreakOut = null;
-        this.UserToken = null;
-        this.m_bufferRate = 1;
-        this.m_receiveBufferSize = this.MinBufferSize;
-        this.m_sendBufferSize = this.MinBufferSize;
-    }
-    /// <summary>
-    /// 判断，当不在连接状态时触发异常。
-    /// </summary>
-    /// <exception cref="NotConnectedException"></exception>
-    protected void ThrowIfNotConnected()
-    {
-        if (!this.m_online)
-        {
-            throw new NotConnectedException();
-        }
-    }
-
-    /// <summary>
-    /// 发送数据。
-    /// <para>
-    /// 内部会根据是否启用Ssl，进行直接发送，还是Ssl发送。
-    /// </para>
-    /// </summary>
-    /// <param name="buffer"></param>
-    /// <param name="offset"></param>
-    /// <param name="length"></param>
-    public virtual void Send(byte[] buffer, int offset, int length)
-    {
-        this.ThrowIfNotConnected();
-        try
-        {
-            this.m_semaphoreForSend.Wait();
-            this.m_serialPort.Write(buffer, offset, length);
-            this.m_sendCounter.Increment(length);
-        }
-        finally
-        {
-            this.m_semaphoreForSend.Release();
-        }
-    }
-
-    /// <summary>
-    /// 异步发送数据。
-    /// </summary>
-    /// <param name="buffer"></param>
-    /// <param name="offset"></param>
-    /// <param name="length"></param>
-    /// <returns></returns>
-    /// <exception cref="Exception"></exception>
-    public virtual async Task SendAsync(byte[] buffer, int offset, int length)
-    {
-        this.ThrowIfNotConnected();
-        try
-        {
-            await this.m_semaphoreForSend.WaitAsync();
-
-            this.m_serialPort.Write(buffer, offset, length);
-            this.m_sendCounter.Increment(length);
-        }
-        finally
-        {
-            this.m_semaphoreForSend.Release();
-        }
-
-    }
-
-    /// <summary>
-    /// 当中断Tcp时。
-    /// </summary>
-    /// <param name="manual">当为<see langword="true"/>时，意味着是调用<see cref="Close(string)"/>。当为<see langword="false"/>时，则是其他中断。</param>
-    /// <param name="msg"></param>
-    protected virtual void BreakOut(bool manual, string msg)
-    {
-        this.OnBreakOut?.Invoke(this, manual, msg);
-    }
-
-
-
-    /// <summary>
-    /// 当发生异常的时候
-    /// </summary>
-    /// <param name="ex"></param>
-    protected virtual void Exception(Exception ex)
-    {
-        this.OnException?.Invoke(this, ex);
-    }
-
-    /// <summary>
-    /// 当收到数据的时候
-    /// </summary>
-    /// <param name="byteBlock"></param>
-    protected virtual void Received(ByteBlock byteBlock)
-    {
-        this.OnReceived?.Invoke(this, byteBlock);
-    }
-
-    private void HandleBuffer(ByteBlock byteBlock)
-    {
-        try
-        {
-            this.m_receiveCounter.Increment(byteBlock.Length);
-            this.Received(byteBlock);
-        }
-        catch (Exception ex)
-        {
-            this.Exception(ex);
-        }
-        finally
-        {
-            byteBlock.Dispose();
-        }
-    }
-
-    private void OnReceivePeriod(long value)
-    {
-        this.m_receiveBufferSize = Math.Max(TouchSocketUtility.HitBufferLength(value), this.MinBufferSize);
-        if (this.MainSerialPort != null && !MainSerialPort.IsOpen)
-        {
-            this.MainSerialPort.ReadBufferSize = this.m_receiveBufferSize;
-        }
-    }
-
-    private void OnSendPeriod(long value)
-    {
-        this.m_sendBufferSize = Math.Max(TouchSocketUtility.HitBufferLength(value), this.MinBufferSize);
-        if (this.MainSerialPort != null && !MainSerialPort.IsOpen)
-        {
-            this.MainSerialPort.WriteBufferSize = this.m_sendBufferSize;
-        }
-    }
-
-    private void PrivateBreakOut(bool manual, string msg)
-    {
-        lock (this.SyncRoot)
-        {
-            if (this.m_online)
-            {
-                this.BreakOut(manual, msg);
-            }
-        }
-    }
-
-    private void ProcessReceived()
-    {
-        if (!this.m_online)
-        {
-            UserToken?.SafeDispose();
-            return;
-        }
-        if (m_serialPort.BytesToRead > 0)
-        {
-            var byteBlock = UserToken;
-            byte[] buffer = BytePool.Default.Rent(m_serialPort.BytesToRead);
-            int num = m_serialPort.Read(buffer, 0, m_serialPort.BytesToRead);
-            byteBlock.Write(buffer, 0, num);
-            byteBlock.SetLength(num);
-            this.HandleBuffer(byteBlock);
-            try
-            {
-                var newByteBlock = BytePool.Default.GetByteBlock((int)Math.Min(this.ReceiveBufferSize * this.m_bufferRate, this.MaxBufferSize));
-                newByteBlock.SetLength(0);
-                UserToken = newByteBlock;
-
-                if (m_serialPort.BytesToRead > 0)
-                {
-                    this.m_bufferRate += 2;
-                    this.ProcessReceived();
-                }
-            }
-            catch (Exception ex)
-            {
-                this.PrivateBreakOut(false, ex.ToString());
-            }
-        }
-    }
-}

framework/foundation/ThingsGateway.Foundation/Foundation/SerialPort/SerialPort/SerialProperty.cs

@@ -1,53 +0,0 @@
-#region copyright
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-#endregion
-
-using System.ComponentModel;
-using System.IO.Ports;
-
-namespace ThingsGateway.Foundation.Serial;
-
-/// <summary>
-/// 串口属性
-/// </summary>
-public class SerialProperty
-{
-    /// <summary>
-    /// COM
-    /// </summary>
-    [Description("COM口")]
-    public string PortName { get; set; } = "COM1";
-    /// <summary>
-    /// 波特率
-    /// </summary>
-    [Description("波特率")]
-    public int BaudRate { get; set; } = 9600;
-    /// <summary>
-    /// 数据位
-    /// </summary>
-    [Description("数据位")]
-    public int DataBits { get; set; } = 8;
-    /// <summary>
-    /// 校验位
-    /// </summary>
-    [Description("校验位")]
-    public Parity Parity { get; set; } = Parity.None;
-    /// <summary>
-    /// 停止位
-    /// </summary>
-    [Description("停止位")]
-    public StopBits StopBits { get; set; } = StopBits.One;
-    /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $"{PortName}[{BaudRate},{DataBits},{StopBits},{Parity}]";
-    }
-}

framework/foundation/ThingsGateway.Foundation/Foundation/SerialPort/SerialPort/SerialSession.cs

@@ -1,749 +0,0 @@
-#region copyright
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-#endregion
-
-using System.IO.Ports;
-
-namespace ThingsGateway.Foundation.Serial;
-
-
-/// <inheritdoc cref="SerialSessionBase"/>
-public class SerialSession : SerialSessionBase
-{
-    /// <summary>
-    /// 接收到数据
-    /// </summary>
-    public ReceivedEventHandler<SerialSession> Received { get; set; }
-
-    /// <inheritdoc/>
-    protected override Task ReceivedData(ReceivedDataEventArgs e)
-    {
-        if (this.Received != null)
-        {
-            return this.Received.Invoke(this, e);
-        }
-        return base.ReceivedData(e);
-    }
-}
-
-/// <summary>
-/// 串口管理
-/// </summary>
-public class SerialSessionBase : SetupConfigObject, ISerialSession
-{
-    static readonly Protocol SerialPort = new("SerialSession");
-    /// <summary>
-    /// 构造函数
-    /// </summary>
-    public SerialSessionBase()
-    {
-        this.Protocol = SerialPort;
-    }
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <returns></returns>
-    public override string ToString()
-    {
-        return SerialProperty?.ToString();
-    }
-    #region 变量
-
-    private DelaySender m_delaySender;
-    private bool m_online => MainSerialPort?.IsOpen == true;
-    private readonly EasyLock m_semaphore = new();
-    private readonly InternalSerialCore m_serialCore = new();
-    #endregion 变量
-
-    #region 事件
-
-    /// <inheritdoc/>
-    public ConnectedEventHandler<ISerialSession> Connected { get; set; }
-
-    /// <inheritdoc/>
-    public SerialConnectingEventHandler<ISerialSession> Connecting { get; set; }
-
-    /// <inheritdoc/>
-    public DisconnectEventHandler<ISerialSessionBase> Disconnected { get; set; }
-
-    /// <inheritdoc/>
-    public DisconnectEventHandler<ISerialSessionBase> Disconnecting { get; set; }
-
-    private async Task PrivateOnConnected(ConnectedEventArgs o)
-    {
-        await this.OnConnected(o);
-    }
-
-    /// <summary>
-    /// 已经建立连接
-    /// </summary>
-    /// <param name="e"></param>
-    protected virtual async Task OnConnected(ConnectedEventArgs e)
-    {
-        try
-        {
-            if (this.Connected != null)
-            {
-                await this.Connected.Invoke(this, e);
-                if (e.Handled)
-                {
-                    return;
-                }
-            }
-            await this.PluginsManager.RaiseAsync(nameof(ITcpConnectedPlugin.OnTcpConnected), this, e);
-        }
-        catch (Exception ex)
-        {
-            this.Logger.Log(LogLevel.Error, this, $"在事件{nameof(this.Connected)}中发生错误。", ex);
-        }
-    }
-
-    private async Task PrivateOnConnecting(SerialConnectingEventArgs e)
-    {
-        if (this.CanSetDataHandlingAdapter)
-        {
-            this.SetDataHandlingAdapter(this.Config.GetValue(TouchSocketConfigExtension.TcpDataHandlingAdapterProperty).Invoke());
-        }
-
-        await this.OnConnecting(e);
-    }
-
-    /// <summary>
-    /// 准备连接的时候，此时并未建立连接
-    /// </summary>
-    /// <param name="e"></param>
-    protected virtual async Task OnConnecting(SerialConnectingEventArgs e)
-    {
-        try
-        {
-            if (this.Connecting != null)
-            {
-                await this.Connecting.Invoke(this, e);
-                if (e.Handled)
-                {
-                    return;
-                }
-            }
-            await this.PluginsManager.RaiseAsync(nameof(ITcpConnectingPlugin.OnTcpConnecting), this, e);
-        }
-        catch (Exception ex)
-        {
-            this.Logger.Log(LogLevel.Error, this, $"在事件{nameof(this.OnConnecting)}中发生错误。", ex);
-        }
-    }
-
-    private async Task PrivateOnDisconnected(object obj)
-    {
-        this.m_receiver?.TryInputReceive(default, default);
-        await this.OnDisconnected((DisconnectEventArgs)obj);
-    }
-
-    /// <summary>
-    /// 断开连接。在客户端未设置连接状态时，不会触发
-    /// </summary>
-    /// <param name="e"></param>
-    protected virtual async Task OnDisconnected(DisconnectEventArgs e)
-    {
-        try
-        {
-            if (this.Disconnected != null)
-            {
-                await this.Disconnected.Invoke(this, e).ConfigureAwait(false);
-                if (e.Handled)
-                {
-                    return;
-                }
-            }
-
-            await this.PluginsManager.RaiseAsync(nameof(ITcpDisconnectedPlugin.OnTcpDisconnected), this, e).ConfigureAwait(false);
-        }
-        catch (Exception ex)
-        {
-            this.Logger.Log(LogLevel.Error, this, $"在事件{nameof(this.Disconnected)}中发生错误。", ex);
-        }
-    }
-
-    private async Task PrivateOnDisconnecting(object obj)
-    {
-        await this.OnDisconnecting((DisconnectEventArgs)obj);
-    }
-
-    /// <summary>
-    /// 即将断开连接(仅主动断开时有效)。
-    /// </summary>
-    /// <param name="e"></param>
-    protected virtual async Task OnDisconnecting(DisconnectEventArgs e)
-    {
-        try
-        {
-            if (this.Disconnecting != null)
-            {
-                await this.Disconnecting.Invoke(this, e).ConfigureAwait(false);
-                if (e.Handled)
-                {
-                    return;
-                }
-            }
-
-            await this.PluginsManager.RaiseAsync(nameof(ITcpDisconnectingPlugin.OnTcpDisconnecting), this, e).ConfigureAwait(false);
-        }
-        catch (Exception ex)
-        {
-            this.Logger.Log(LogLevel.Error, this, $"在事件{nameof(this.Disconnecting)}中发生错误。", ex);
-        }
-    }
-
-    #endregion 事件
-
-    #region 属性
-
-    /// <inheritdoc/>
-    public DateTime LastReceivedTime => this.GetSerialCore().ReceiveCounter.LastIncrement;
-
-    /// <inheritdoc/>
-    public DateTime LastSendTime => this.GetSerialCore().SendCounter.LastIncrement;
-
-    /// <inheritdoc/>
-    public virtual bool CanSetDataHandlingAdapter => true;
-
-    /// <inheritdoc/>
-    public SingleStreamDataHandlingAdapter DataHandlingAdapter { get; private set; }
-
-    /// <inheritdoc/>
-    public SerialProperty SerialProperty { get; private set; }
-    /// <inheritdoc/>
-    public SerialPort MainSerialPort { get; private set; }
-
-    /// <inheritdoc/>
-    public bool Online { get => this.m_online; }
-
-    /// <inheritdoc/>
-    public bool CanSend => this.m_online;
-
-    /// <inheritdoc/>
-    public Protocol Protocol { get; set; }
-
-
-
-    #endregion 属性
-
-    #region 断开操作
-
-    /// <inheritdoc/>
-    public virtual void Close(string msg = TouchSocketCoreUtility.Empty)
-    {
-        lock (this.GetSerialCore())
-        {
-            if (this.m_online)
-            {
-                Task.Factory.StartNew(this.PrivateOnDisconnecting, new DisconnectEventArgs(true, msg));
-                this.MainSerialPort.TryClose();
-                this.BreakOut(true, msg);
-            }
-        }
-    }
-
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="disposing"></param>
-    protected override void Dispose(bool disposing)
-    {
-        lock (this.GetSerialCore())
-        {
-            if (this.m_online)
-            {
-                Task.Factory.StartNew(this.PrivateOnDisconnecting, new DisconnectEventArgs(true, $"{nameof(Dispose)}主动断开"));
-                this.BreakOut(true, $"{nameof(Dispose)}主动断开");
-            }
-        }
-        base.Dispose(disposing);
-    }
-
-    #endregion 断开操作
-
-    #region Connect
-
-    /// <summary>
-    /// 打开串口
-    /// </summary>
-    protected void Open()
-    {
-        try
-        {
-            ThrowIfDisposed();
-            this.m_semaphore.Wait();
-            if (this.m_online)
-            {
-                return;
-            }
-            if (this.DisposedValue)
-            {
-                throw new ObjectDisposedException(this.GetType().FullName);
-            }
-            if (this.Config == null)
-            {
-                throw new ArgumentNullException(nameof(this.Config), "配置文件不能为空。");
-            }
-            var serialProperty = this.Config.GetValue(SerialConfigExtension.SerialProperty) ?? throw new ArgumentNullException("串口配置不能为空。");
-            this.MainSerialPort.SafeDispose();
-            var serialPort = CreateSerial(serialProperty);
-            this.PrivateOnConnecting(new(serialPort)).ConfigureAwait(false).GetAwaiter().GetResult();
-
-            serialPort.Open();
-
-            this.SetSerialPort(serialPort);
-            this.BeginReceive();
-
-            this.PrivateOnConnected(new()).ConfigureAwait(false).GetAwaiter().GetResult();
-        }
-        finally
-        {
-            this.m_semaphore.Release();
-        }
-    }
-
-
-    private void BeginReceive()
-    {
-        this.GetSerialCore().BeginIocpReceive();
-    }
-
-
-    /// <inheritdoc/>
-    public virtual ISerialSession Connect()
-    {
-        this.Open();
-        return this;
-    }
-
-    /// <inheritdoc/>
-    public async Task<ISerialSession> ConnectAsync()
-    {
-        return await Task.Run(() =>
-        {
-            return this.Connect();
-        });
-    }
-
-    #endregion Connect
-
-    #region Receiver
-
-    private Receiver m_receiver;
-
-    /// <inheritdoc/>
-    public IReceiver CreateReceiver()
-    {
-        return this.m_receiver ??= new Receiver(this);
-    }
-
-    /// <inheritdoc/>
-    public void ClearReceiver()
-    {
-        this.m_receiver = null;
-    }
-
-    #endregion
-
-    private void SerialCoreBreakOut(SerialCore core, bool manual, string msg)
-    {
-        this.BreakOut(manual, msg);
-    }
-    /// <summary>
-    /// BreakOut。
-    /// </summary>
-    /// <param name="manual"></param>
-    /// <param name="msg"></param>
-    protected void BreakOut(bool manual, string msg)
-    {
-        lock (this.GetSerialCore())
-        {
-            if (this.m_online)
-            {
-                this.MainSerialPort.SafeDispose();
-                this.m_delaySender.SafeDispose();
-                this.DataHandlingAdapter.SafeDispose();
-                Task.Factory.StartNew(this.PrivateOnDisconnected, new DisconnectEventArgs(manual, msg));
-            }
-        }
-    }
-
-    private SerialCore GetSerialCore()
-    {
-        this.ThrowIfDisposed();
-        return this.m_serialCore ?? throw new ObjectDisposedException(this.GetType().Name);
-    }
-
-
-    /// <inheritdoc/>
-    public virtual void SetDataHandlingAdapter(SingleStreamDataHandlingAdapter adapter)
-    {
-        if (!this.CanSetDataHandlingAdapter)
-        {
-            throw new Exception($"不允许自由调用{nameof(SetDataHandlingAdapter)}进行赋值。");
-        }
-
-        this.SetAdapter(adapter);
-    }
-
-
-    private void PrivateHandleReceivedData(ByteBlock byteBlock, IRequestInfo requestInfo)
-    {
-        if (this.m_receiver != null)
-        {
-            if (this.m_receiver.TryInputReceive(byteBlock, requestInfo))
-            {
-                return;
-            }
-        }
-        this.ReceivedData(new ReceivedDataEventArgs(byteBlock, requestInfo)).GetFalseAwaitResult();
-    }
-
-    /// <summary>
-    /// 当收到适配器处理的数据时。
-    /// </summary>
-    /// <param name="e"></param>
-    /// <returns>如果返回<see langword="true"/>则表示数据已被处理，且不会再向下传递。</returns>
-    protected virtual Task ReceivedData(ReceivedDataEventArgs e)
-    {
-        return this.PluginsManager.RaiseAsync(nameof(ITcpReceivedPlugin.OnTcpReceived), this, e);
-    }
-
-    /// <summary>
-    /// 当即将发送时，如果覆盖父类方法，则不会触发插件。
-    /// </summary>
-    /// <param name="buffer">数据缓存区</param>
-    /// <param name="offset">偏移</param>
-    /// <param name="length">长度</param>
-    /// <returns>返回值表示是否允许发送</returns>
-    protected virtual async Task<bool> SendingData(byte[] buffer, int offset, int length)
-    {
-        if (this.PluginsManager.GetPluginCount(nameof(ITcpSendingPlugin.OnTcpSending)) > 0)
-        {
-            var args = new SendingEventArgs(buffer, offset, length);
-            await this.PluginsManager.RaiseAsync(nameof(ITcpSendingPlugin.OnTcpSending), this, args).ConfigureAwait(false);
-            return args.IsPermitOperation;
-        }
-        return true;
-    }
-
-    /// <inheritdoc/>
-    protected override void LoadConfig(TouchSocketConfig config)
-    {
-        this.SerialProperty = config.GetValue(SerialConfigExtension.SerialProperty);
-        this.Logger ??= this.Container.Resolve<ILog>();
-    }
-
-    /// <summary>
-    /// 设置适配器，该方法不会检验<see cref="CanSetDataHandlingAdapter"/>的值。
-    /// </summary>
-    /// <param name="adapter"></param>
-    protected void SetAdapter(SingleStreamDataHandlingAdapter adapter)
-    {
-        this.ThrowIfDisposed();
-        if (adapter is null)
-        {
-            throw new ArgumentNullException(nameof(adapter));
-        }
-
-        if (this.Config != null)
-        {
-            adapter.Config(this.Config);
-        }
-
-        adapter.Logger = this.Logger;
-        adapter.OnLoaded(this);
-        adapter.ReceivedCallBack = this.PrivateHandleReceivedData;
-        adapter.SendCallBack = this.DefaultSend;
-        adapter.SendAsyncCallBack = this.DefaultSendAsync;
-        this.DataHandlingAdapter = adapter;
-    }
-
-    private static SerialPort CreateSerial(SerialProperty serialProperty)
-    {
-        SerialPort serialPort = new(serialProperty.PortName, serialProperty.BaudRate, serialProperty.Parity, serialProperty.DataBits, serialProperty.StopBits)
-        {
-            DtrEnable = true,
-            RtsEnable = true
-        };
-        return serialPort;
-    }
-
-    #region 发送
-
-    #region 同步发送
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="requestInfo"></param>
-    /// <exception cref="NotConnectedException"></exception>
-    /// <exception cref="OverlengthException"></exception>
-    /// <exception cref="Exception"></exception>
-    public void Send(IRequestInfo requestInfo)
-    {
-        if (this.DisposedValue)
-        {
-            return;
-        }
-        if (this.DataHandlingAdapter == null)
-        {
-            throw new ArgumentNullException(nameof(this.DataHandlingAdapter), TouchSocketResource.NullDataAdapter.GetDescription());
-        }
-        if (!this.DataHandlingAdapter.CanSendRequestInfo)
-        {
-            throw new NotSupportedException($"当前适配器不支持对象发送。");
-        }
-        this.DataHandlingAdapter.SendInput(requestInfo);
-    }
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="buffer"><inheritdoc/></param>
-    /// <param name="offset"><inheritdoc/></param>
-    /// <param name="length"><inheritdoc/></param>
-    /// <exception cref="NotConnectedException"><inheritdoc/></exception>
-    /// <exception cref="OverlengthException"><inheritdoc/></exception>
-    /// <exception cref="Exception"><inheritdoc/></exception>
-    public virtual void Send(byte[] buffer, int offset, int length)
-    {
-        if (this.DataHandlingAdapter == null)
-        {
-            throw new ArgumentNullException(nameof(this.DataHandlingAdapter), TouchSocketResource.NullDataAdapter.GetDescription());
-        }
-        this.DataHandlingAdapter.SendInput(buffer, offset, length);
-    }
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="transferBytes"><inheritdoc/></param>
-    /// <exception cref="NotConnectedException"><inheritdoc/></exception>
-    /// <exception cref="OverlengthException"><inheritdoc/></exception>
-    /// <exception cref="Exception"><inheritdoc/></exception>
-    public virtual void Send(IList<ArraySegment<byte>> transferBytes)
-    {
-        if (this.DataHandlingAdapter == null)
-        {
-            throw new ArgumentNullException(nameof(this.DataHandlingAdapter), TouchSocketResource.NullDataAdapter.GetDescription());
-        }
-
-        if (this.DataHandlingAdapter.CanSplicingSend)
-        {
-            this.DataHandlingAdapter.SendInput(transferBytes);
-        }
-        else
-        {
-            var length = 0;
-            foreach (var item in transferBytes)
-            {
-                length += item.Count;
-            }
-            using (var byteBlock = new ByteBlock(length))
-            {
-                foreach (var item in transferBytes)
-                {
-                    byteBlock.Write(item.Array, item.Offset, item.Count);
-                }
-                this.DataHandlingAdapter.SendInput(byteBlock.Buffer, 0, byteBlock.Len);
-            }
-        }
-    }
-
-    #endregion 同步发送
-
-    #region 异步发送
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="buffer"></param>
-    /// <param name="offset"></param>
-    /// <param name="length"></param>
-    /// <exception cref="NotConnectedException"></exception>
-    /// <exception cref="OverlengthException"></exception>
-    /// <exception cref="Exception"></exception>
-    public virtual Task SendAsync(byte[] buffer, int offset, int length)
-    {
-        this.ThrowIfDisposed();
-        if (this.DataHandlingAdapter == null)
-        {
-            throw new ArgumentNullException(nameof(this.DataHandlingAdapter), TouchSocketResource.NullDataAdapter.GetDescription());
-        }
-        return this.DataHandlingAdapter.SendInputAsync(buffer, offset, length);
-    }
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="requestInfo"></param>
-    /// <exception cref="NotConnectedException"></exception>
-    /// <exception cref="OverlengthException"></exception>
-    /// <exception cref="Exception"></exception>
-    public virtual Task SendAsync(IRequestInfo requestInfo)
-    {
-        this.ThrowIfDisposed();
-        if (this.DataHandlingAdapter == null)
-        {
-            throw new ArgumentNullException(nameof(this.DataHandlingAdapter), TouchSocketResource.NullDataAdapter.GetDescription());
-        }
-        if (!this.DataHandlingAdapter.CanSendRequestInfo)
-        {
-            throw new NotSupportedException($"当前适配器不支持对象发送。");
-        }
-        return this.DataHandlingAdapter.SendInputAsync(requestInfo);
-    }
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="transferBytes"></param>
-    /// <returns></returns>
-    /// <exception cref="ArgumentNullException"></exception>
-    public virtual Task SendAsync(IList<ArraySegment<byte>> transferBytes)
-    {
-        this.ThrowIfDisposed();
-        if (this.DataHandlingAdapter == null)
-        {
-            throw new ArgumentNullException(nameof(this.DataHandlingAdapter), TouchSocketResource.NullDataAdapter.GetDescription());
-        }
-        if (this.DataHandlingAdapter.CanSplicingSend)
-        {
-            return this.DataHandlingAdapter.SendInputAsync(transferBytes);
-        }
-        else
-        {
-            var length = 0;
-            foreach (var item in transferBytes)
-            {
-                length += item.Count;
-            }
-            using (var byteBlock = new ByteBlock(length))
-            {
-                foreach (var item in transferBytes)
-                {
-                    byteBlock.Write(item.Array, item.Offset, item.Count);
-                }
-                return this.DataHandlingAdapter.SendInputAsync(byteBlock.Buffer, 0, byteBlock.Len);
-            }
-        }
-    }
-
-    #endregion 异步发送
-
-    /// <inheritdoc/>
-    public void DefaultSend(byte[] buffer, int offset, int length)
-    {
-        if (this.SendingData(buffer, offset, length).GetFalseAwaitResult())
-        {
-            if (this.m_delaySender != null)
-            {
-                this.m_delaySender.Send(new QueueDataBytes(buffer, offset, length));
-                return;
-            }
-            this.GetSerialCore().Send(buffer, offset, length);
-        }
-    }
-
-    /// <inheritdoc/>
-    public async Task DefaultSendAsync(byte[] buffer, int offset, int length)
-    {
-        if (await this.SendingData(buffer, offset, length))
-        {
-            await this.GetSerialCore().SendAsync(buffer, offset, length);
-        }
-    }
-
-    #endregion 发送
-
-
-    #region 自定义
-
-
-    private void SetSerialPort(SerialPort serialPort)
-    {
-        if (serialPort == null)
-        {
-            return;
-        }
-
-        this.MainSerialPort = serialPort;
-        this.SerialProperty ??= new();
-        this.SerialProperty.Parity = serialPort.Parity;
-        this.SerialProperty.PortName = serialPort.PortName;
-        this.SerialProperty.StopBits = serialPort.StopBits;
-        this.SerialProperty.DataBits = serialPort.DataBits;
-        this.SerialProperty.BaudRate = serialPort.BaudRate;
-
-        var delaySenderOption = this.Config.GetValue(TouchSocketConfigExtension.DelaySenderProperty);
-        if (delaySenderOption != null)
-        {
-            this.m_delaySender = new DelaySender(delaySenderOption, this.MainSerialPort.AbsoluteSend);
-        }
-        this.m_serialCore.Reset(serialPort);
-        this.m_serialCore.OnReceived = this.HandleReceived;
-        this.m_serialCore.OnBreakOut = this.SerialCoreBreakOut;
-        if (this.Config.GetValue(TouchSocketConfigExtension.MinBufferSizeProperty) is int minValue)
-        {
-            this.m_serialCore.MinBufferSize = minValue;
-        }
-
-        if (this.Config.GetValue(TouchSocketConfigExtension.MaxBufferSizeProperty) is int maxValue)
-        {
-            this.m_serialCore.MaxBufferSize = maxValue;
-        }
-    }
-
-    private void HandleReceived(SerialCore core, ByteBlock byteBlock)
-    {
-        try
-        {
-            if (this.DisposedValue)
-            {
-                return;
-            }
-            if (this.ReceivingData(byteBlock).GetFalseAwaitResult())
-            {
-                return;
-            }
-
-            if (this.DataHandlingAdapter == null)
-            {
-                this.Logger.Error(this, TouchSocketResource.NullDataAdapter.GetDescription());
-                return;
-            }
-            this.DataHandlingAdapter.ReceivedInput(byteBlock);
-        }
-        catch (Exception ex)
-        {
-            this.Logger.Log(LogLevel.Error, this, "在处理数据时发生错误", ex);
-        }
-    }
-
-    /// <summary>
-    /// 当收到原始数据
-    /// </summary>
-    /// <param name="byteBlock"></param>
-    /// <returns>如果返回<see langword="true"/>则表示数据已被处理，且不会再向下传递。</returns>
-    protected virtual Task<bool> ReceivingData(ByteBlock byteBlock)
-    {
-        if (this.PluginsManager.GetPluginCount(nameof(ITcpReceivingPlugin.OnTcpReceiving)) > 0)
-        {
-            return this.PluginsManager.RaiseAsync(nameof(ITcpReceivingPlugin.OnTcpReceiving), this, new ByteBlockEventArgs(byteBlock));
-        }
-        return Task.FromResult(false);
-    }
-
-    #endregion
-}

framework/foundation/ThingsGateway.Foundation/GlobalUsings.cs

@@ -20,6 +20,5 @@ global using System.Threading.Tasks;
 global using ThingsGateway.Foundation.Core;
 global using ThingsGateway.Foundation.Http;
 global using ThingsGateway.Foundation.Rpc;
-global using ThingsGateway.Foundation.Serial;
+global using ThingsGateway.Foundation.SerialPorts;
 global using ThingsGateway.Foundation.Sockets;
-

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

@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFrameworks>net45;netstandard2.0;net6.0;net8.0;</TargetFrameworks>
-	</PropertyGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='net45'">

framework/foundation/ThingsGateway.Foundation/TouchSocket/Core/Config/ISetupConfigObject.cs

@@ -15,7 +15,7 @@ namespace ThingsGateway.Foundation.Core
     /// <summary>
     /// 具有设置配置的对象接口
     /// </summary>
-    public interface ISetupConfigObject : IConfigObject, IPluginObject
+    public interface ISetupConfigObject : IConfigObject, IPluginObject, IResolverObject
     {
         /// <summary>
         /// 配置设置项
@@ -23,5 +23,12 @@ namespace ThingsGateway.Foundation.Core
         /// <param name="config"></param>
         /// <exception cref="Exception"></exception>
         void Setup(TouchSocketConfig config);
+
+        /// <summary>
+        /// 异步配置设置项
+        /// </summary>
+        /// <param name="config"></param>
+        /// <returns></returns>
+        Task SetupAsync(TouchSocketConfig config);
     }
 }

framework/foundation/ThingsGateway.Foundation/TouchSocket/Core/Config/SetupConfigObject.cs

@@ -23,10 +23,10 @@ namespace ThingsGateway.Foundation.Core
         public override TouchSocketConfig Config => this.m_config;
 
         /// <inheritdoc/>
-        public IContainer Container { get; private set; }
+        public IResolver Resolver { get; private set; }
 
         /// <inheritdoc/>
-        public IPluginsManager PluginsManager { get; private set; }
+        public IPluginManager PluginManager { get; private set; }
 
         /// <inheritdoc/>
         public void Setup(TouchSocketConfig config)
@@ -40,11 +40,27 @@ namespace ThingsGateway.Foundation.Core
 
             this.BuildConfig(config);
 
-            this.PluginsManager?.Raise(nameof(ILoadingConfigPlugin.OnLoadingConfig), this, new ConfigEventArgs(config));
+            this.PluginManager?.Raise(nameof(ILoadingConfigPlugin.OnLoadingConfig), this, new ConfigEventArgs(config));
             this.LoadConfig(this.Config);
-            this.PluginsManager?.Raise(nameof(ILoadedConfigPlugin.OnLoadedConfig), this, new ConfigEventArgs(config));
+            this.PluginManager?.Raise(nameof(ILoadedConfigPlugin.OnLoadedConfig), this, new ConfigEventArgs(config));
         }
+        /// <inheritdoc/>
+        public async Task SetupAsync(TouchSocketConfig config)
+        {
+            if (config == null)
+            {
+                throw new ArgumentNullException(nameof(config));
+            }
 
+            this.ThrowIfDisposed();
+
+            this.BuildConfig(config);
+
+            await this.PluginManager.RaiseAsync(nameof(ILoadingConfigPlugin.OnLoadingConfig), this, new ConfigEventArgs(config)).ConfigureFalseAwait();
+            this.LoadConfig(config);
+            //return EasyTask.CompletedTask;
+            await this.PluginManager.RaiseAsync(nameof(ILoadedConfigPlugin.OnLoadedConfig), this, new ConfigEventArgs(config)).ConfigureFalseAwait();
+        }
         /// <summary>
         /// 加载配置
         /// </summary>
@@ -56,47 +72,48 @@ namespace ThingsGateway.Foundation.Core
 
         private void BuildConfig(TouchSocketConfig config)
         {
-            this.m_config = config;
+            this.m_config = config ?? throw new ArgumentNullException(nameof(config));
 
-            if (!config.TryGetValue(TouchSocketCoreConfigExtension.ContainerProperty, out var container))
+            if (!config.TryGetValue(TouchSocketCoreConfigExtension.ResolverProperty, out var resolver))
             {
-                container = new Container();
+                if (!config.TryGetValue(TouchSocketCoreConfigExtension.RegistratorProperty, out var registrator))
+                {
+                    registrator = new Container();
+                }
+
+                if (!registrator.IsRegistered(typeof(ILog)))
+                {
+                    registrator.RegisterSingleton<ILog>(new LoggerGroup());
+                }
+
+                if (config.GetValue(TouchSocketCoreConfigExtension.ConfigureContainerProperty) is Action<IRegistrator> actionContainer)
+                {
+                    actionContainer.Invoke(registrator);
+                }
+
+                resolver = registrator.BuildResolver();
             }
 
-            if (!container.IsRegistered(typeof(ILog)))
+            IPluginManager pluginManager;
+            if ((!this.Config.GetValue(TouchSocketCoreConfigExtension.NewPluginManagerProperty)) && resolver.IsRegistered<IPluginManager>())
             {
-                container.RegisterSingleton<ILog, LoggerGroup>();
-            }
-
-            if (!(config.GetValue(TouchSocketCoreConfigExtension.PluginsManagerProperty) is IPluginsManager pluginsManager))
-            {
-                pluginsManager = new PluginsManager(container);
-            }
-
-            if (container.IsRegistered(typeof(IPluginsManager)))
-            {
-                pluginsManager = container.Resolve<IPluginsManager>();
+                pluginManager = resolver.Resolve<IPluginManager>();
             }
             else
             {
-                container.RegisterSingleton<IPluginsManager>(pluginsManager);
+                pluginManager = new PluginManager(resolver);
             }
 
-            if (config.GetValue(TouchSocketCoreConfigExtension.ConfigureContainerProperty) is Action<IContainer> actionContainer)
+            if (this.Config.GetValue(TouchSocketCoreConfigExtension.ConfigurePluginsProperty) is Action<IPluginManager> actionPluginManager)
             {
-                actionContainer.Invoke(container);
+                pluginManager.Enable = true;
+                actionPluginManager.Invoke(pluginManager);
             }
 
-            if (config.GetValue(TouchSocketCoreConfigExtension.ConfigurePluginsProperty) is Action<IPluginsManager> actionPluginsManager)
-            {
-                pluginsManager.Enable = true;
-                actionPluginsManager.Invoke(pluginsManager);
-            }
+            this.Logger ??= resolver.Resolve<ILog>();
 
-            this.Logger ??= container.Resolve<ILog>();
-
-            this.Container = container;
-            this.PluginsManager = pluginsManager;
+            this.PluginManager = pluginManager;
+            this.Resolver = resolver;
         }
     }
 }