更新版本号

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

framework/Directory.Build.props

@@ -1,20 +0,0 @@
-<Project>
-	<PropertyGroup>
-		
-		<ImplicitUsings>enable</ImplicitUsings>
-		<TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
-		<Version>4.0.0.6</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 - Admin.sln

@@ -1,101 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.6.33927.249
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "admin", "admin", "{4E66C22C-0636-4949-BF6A-9E3BBE1550BA}"
-	ProjectSection(SolutionItems) = preProject
-		admin\Directory.Build.props = admin\Directory.Build.props
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Components", "admin\ThingsGateway.Components\ThingsGateway.Components.csproj", "{0A891D8E-23B3-46AD-8D30-565EE5004F93}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Core", "admin\ThingsGateway.Core\ThingsGateway.Core.csproj", "{A712EAEE-94F2-4F01-8C1C-2EC802280DD7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Admin.Core", "admin\ThingsGateway.Admin.Core\ThingsGateway.Admin.Core.csproj", "{5DA3D2BD-6768-4479-B52F-49E022EFF310}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Admin.Blazor", "admin\ThingsGateway.Admin.Blazor\ThingsGateway.Admin.Blazor.csproj", "{8DD5DF98-7FDE-4B49-8661-AEB44D923CFE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Admin.Application", "admin\ThingsGateway.Admin.Application\ThingsGateway.Admin.Application.csproj", "{D6685A42-2712-417A-92C5-5EFF90B9FA94}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Admin.ApiController", "admin\ThingsGateway.Admin.ApiController\ThingsGateway.Admin.ApiController.csproj", "{0D17D801-6DAA-4FD1-9A99-F9F07FA6BA88}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "web", "web", "{F0C9A8CB-231B-45E0-B91B-4FEF7EF47197}"
-	ProjectSection(SolutionItems) = preProject
-		web\Directory.Build.props = web\Directory.Build.props
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Web.Core", "web\ThingsGateway.Web.Core\ThingsGateway.Web.Core.csproj", "{D37EC028-EA46-4510-8261-6E780A906314}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Web.Entry", "web\ThingsGateway.Web.Entry\ThingsGateway.Web.Entry.csproj", "{C5F662EB-991F-438D-BF61-EF87E7371C04}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{97B23D8B-C6C0-4746-A21F-C7B49354B284}"
-	ProjectSection(SolutionItems) = preProject
-		..\.gitignore = ..\.gitignore
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Foundation", "foundation\ThingsGateway.Foundation\ThingsGateway.Foundation.csproj", "{6961511A-8787-42AF-827D-B630B2AF4791}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "foundation", "foundation", "{268A1A81-2685-47E1-9986-5934A58A31A4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0A891D8E-23B3-46AD-8D30-565EE5004F93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A891D8E-23B3-46AD-8D30-565EE5004F93}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A891D8E-23B3-46AD-8D30-565EE5004F93}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A891D8E-23B3-46AD-8D30-565EE5004F93}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A712EAEE-94F2-4F01-8C1C-2EC802280DD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A712EAEE-94F2-4F01-8C1C-2EC802280DD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A712EAEE-94F2-4F01-8C1C-2EC802280DD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A712EAEE-94F2-4F01-8C1C-2EC802280DD7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5DA3D2BD-6768-4479-B52F-49E022EFF310}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DA3D2BD-6768-4479-B52F-49E022EFF310}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DA3D2BD-6768-4479-B52F-49E022EFF310}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5DA3D2BD-6768-4479-B52F-49E022EFF310}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8DD5DF98-7FDE-4B49-8661-AEB44D923CFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8DD5DF98-7FDE-4B49-8661-AEB44D923CFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8DD5DF98-7FDE-4B49-8661-AEB44D923CFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8DD5DF98-7FDE-4B49-8661-AEB44D923CFE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D6685A42-2712-417A-92C5-5EFF90B9FA94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D6685A42-2712-417A-92C5-5EFF90B9FA94}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D6685A42-2712-417A-92C5-5EFF90B9FA94}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D6685A42-2712-417A-92C5-5EFF90B9FA94}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0D17D801-6DAA-4FD1-9A99-F9F07FA6BA88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D17D801-6DAA-4FD1-9A99-F9F07FA6BA88}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D17D801-6DAA-4FD1-9A99-F9F07FA6BA88}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D17D801-6DAA-4FD1-9A99-F9F07FA6BA88}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D37EC028-EA46-4510-8261-6E780A906314}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D37EC028-EA46-4510-8261-6E780A906314}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D37EC028-EA46-4510-8261-6E780A906314}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D37EC028-EA46-4510-8261-6E780A906314}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C5F662EB-991F-438D-BF61-EF87E7371C04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5F662EB-991F-438D-BF61-EF87E7371C04}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5F662EB-991F-438D-BF61-EF87E7371C04}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C5F662EB-991F-438D-BF61-EF87E7371C04}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6961511A-8787-42AF-827D-B630B2AF4791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6961511A-8787-42AF-827D-B630B2AF4791}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6961511A-8787-42AF-827D-B630B2AF4791}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6961511A-8787-42AF-827D-B630B2AF4791}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0A891D8E-23B3-46AD-8D30-565EE5004F93} = {4E66C22C-0636-4949-BF6A-9E3BBE1550BA}
-		{A712EAEE-94F2-4F01-8C1C-2EC802280DD7} = {4E66C22C-0636-4949-BF6A-9E3BBE1550BA}
-		{5DA3D2BD-6768-4479-B52F-49E022EFF310} = {4E66C22C-0636-4949-BF6A-9E3BBE1550BA}
-		{8DD5DF98-7FDE-4B49-8661-AEB44D923CFE} = {4E66C22C-0636-4949-BF6A-9E3BBE1550BA}
-		{D6685A42-2712-417A-92C5-5EFF90B9FA94} = {4E66C22C-0636-4949-BF6A-9E3BBE1550BA}
-		{0D17D801-6DAA-4FD1-9A99-F9F07FA6BA88} = {4E66C22C-0636-4949-BF6A-9E3BBE1550BA}
-		{D37EC028-EA46-4510-8261-6E780A906314} = {F0C9A8CB-231B-45E0-B91B-4FEF7EF47197}
-		{C5F662EB-991F-438D-BF61-EF87E7371C04} = {F0C9A8CB-231B-45E0-B91B-4FEF7EF47197}
-		{6961511A-8787-42AF-827D-B630B2AF4791} = {268A1A81-2685-47E1-9986-5934A58A31A4}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C49B2D3E-6818-4E28-91B7-6E4E7E264BBB}
-	EndGlobalSection
-EndGlobal

framework/ThingsGateway.sln

@@ -82,7 +82,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{97B23D8B-C6C0-4746-A21F-C7B49354B284}"
 	ProjectSection(SolutionItems) = preProject
 		..\.gitignore = ..\.gitignore
-		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Plugin.Kafka", "plugin\ThingsGateway.Plugin.Kafka\ThingsGateway.Plugin.Kafka.csproj", "{E4B8B8E6-FAE7-43BA-9A51-33A3CD9FB825}"

framework/admin/Directory.Build.props

@@ -1,7 +1,17 @@
 <Project>
-	<Import Project="$(SolutionDir)\Directory.Build.props" />
 	<PropertyGroup>
-
+		<ImplicitUsings>enable</ImplicitUsings>
+		<TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+		<Version>4.0.0.1</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 IConfigService _configService;
+    private readonly ConfigService _configService;
     /// <summary>
     /// <inheritdoc cref="SwaggerController"/>
     /// </summary>
     /// <param name="sysConfigService"></param>
-    public SwaggerController(IConfigService sysConfigService)
+    public SwaggerController(ConfigService sysConfigService)
     {
         _configService = sysConfigService;
     }

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

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

framework/admin/ThingsGateway.Admin.Application/Aop/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, true);
+        var desc = method.GetActualCustomAttribute<OperDescAttribute>(Target);
         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, true);
+        var desc = method.GetActualCustomAttribute<OperDescAttribute>(Target);
         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)
                 {
-                    GetVerificatInfos(ref verificatInfos);//获取剩余时间
+                    OpenApiSessionService.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)
                   {
-                      GetVerificatInfos(ref verificatInfos);//获取剩余时间
+                      SessionService.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.7" />
+		<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.5" />
 	</ItemGroup>
 
 </Project>

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

@@ -37,7 +37,7 @@ namespace ThingsGateway.Admin.Blazor
             {
                 try
                 {
-                    var data = await _serviceScope.ServiceProvider.GetService<IUserCenterService>().GetLoginDefaultRazorAsync(UserManager.UserId);
+                    var data = await _serviceScope.ServiceProvider.GetService<UserCenterService>().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<IConfigService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<ConfigService>().AddAsync(input);
     }
 
     private async Task DeleteCallAsync(IEnumerable<SysConfig> sysConfigs)
     {
-        await _serviceScope.ServiceProvider.GetService<IConfigService>().DeleteAsync(sysConfigs.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<ConfigService>().DeleteAsync(sysConfigs.Select(a => a.Id).ToArray());
     }
     private async Task EditCallAsync(ConfigEditInput sysConfigs)
     {
-        await _serviceScope.ServiceProvider.GetService<IConfigService>().EditAsync(sysConfigs);
+        await _serviceScope.ServiceProvider.GetService<ConfigService>().EditAsync(sysConfigs);
     }
 
     private async Task OnSaveAsync()
     {
-        await _serviceScope.ServiceProvider.GetService<IConfigService>().EditBatchAsync(_sysConfig);
+        await _serviceScope.ServiceProvider.GetService<ConfigService>().EditBatchAsync(_sysConfig);
         await _mainLayout.StateHasChangedAsync();
         await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
     }
     private async Task<ISqlSugarPagedList<SysConfig>> QueryCallAsync(ConfigPageInput input)
     {
-        return await _serviceScope.ServiceProvider.GetService<IConfigService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<ConfigService>().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<IMenuService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<MenuService>().AddAsync(input);
         await NavChangeAsync();
     }
     private async Task ButtonAddCallAsync(ButtonAddInput input)
     {
         input.ParentId = _buttonParentId;
-        await _serviceScope.ServiceProvider.GetService<IButtonService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<ButtonService>().AddAsync(input);
     }
 
     private async Task ButtonDeleteCallAsync(IEnumerable<SysResource> input)
     {
-        await _serviceScope.ServiceProvider.GetService<IButtonService>().DeleteAsync(input.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<ButtonService>().DeleteAsync(input.Select(a => a.Id).ToArray());
     }
 
     private async Task ButtonEditCallAsync(ButtonEditInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<IButtonService>().EditAsync(input);
+        await _serviceScope.ServiceProvider.GetService<ButtonService>().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<IButtonService>().PageAsync(input);
+        var data = await _serviceScope.ServiceProvider.GetService<ButtonService>().PageAsync(input);
         return data;
     }
 
@@ -96,13 +96,13 @@ public partial class Menu
 
     private async Task DeleteCallAsync(IEnumerable<SysResource> input)
     {
-        await _serviceScope.ServiceProvider.GetService<IMenuService>().DeleteAsync(input.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<MenuService>().DeleteAsync(input.Select(a => a.Id).ToArray());
         await NavChangeAsync();
 
     }
     private async Task EditCallAsync(MenuEditInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<IMenuService>().EditAsync(input);
+        await _serviceScope.ServiceProvider.GetService<MenuService>().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<IMenuService>().TreeAsync(input);
+        var data = await _serviceScope.ServiceProvider.GetService<MenuService>().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<IOpenApiSessionService>().ExitSessionAsync(id);
+            await _serviceScope.ServiceProvider.GetService<OpenApiSessionService>().ExitSessionAsync(id);
         }
     }
 
     private async Task<ISqlSugarPagedList<OpenApiSessionOutput>> SessionQueryCallAsync(OpenApiSessionPageInput input)
     {
-        return await _serviceScope.ServiceProvider.GetService<IOpenApiSessionService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<OpenApiSessionService>().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<IOpenApiSessionService>().ExitVerificatAsync(send);
+        await _serviceScope.ServiceProvider.GetService<OpenApiSessionService>().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<IOpenApiUserService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<OpenApiUserService>().AddAsync(input);
     }
 
     private async Task DeleteCallAsync(IEnumerable<OpenApiUser> users)
     {
-        await _serviceScope.ServiceProvider.GetService<IOpenApiUserService>().DeleteAsync(users.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<OpenApiUserService>().DeleteAsync(users.Select(a => a.Id).ToArray());
     }
 
     private async Task EditCallAsync(OpenApiUserEditInput users)
     {
-        await _serviceScope.ServiceProvider.GetService<IOpenApiUserService>().EditAsync(users);
+        await _serviceScope.ServiceProvider.GetService<OpenApiUserService>().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<IOpenApiUserService>().GrantRoleAsync(userGrantRoleInput);
+            await _serviceScope.ServiceProvider.GetService<OpenApiUserService>().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<IOpenApiUserService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<OpenApiUserService>().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<IOpenApiUserService>().EnableUserAsync(context.Id);
+                await _serviceScope.ServiceProvider.GetService<OpenApiUserService>().EnableUserAsync(context.Id);
             else
-                await _serviceScope.ServiceProvider.GetService<IOpenApiUserService>().DisableUserAsync(context.Id);
+                await _serviceScope.ServiceProvider.GetService<OpenApiUserService>().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<IOperateLogService>().DeleteAsync(_categoryFilters.Select(it => it.Value).ToArray());
+            await _serviceScope.ServiceProvider.GetService<OperateLogService>().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<IOperateLogService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<OperateLogService>().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<IRoleService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<RoleService>().AddAsync(input);
     }
     private async Task DeleteCallAsync(IEnumerable<SysRole> sysRoles)
     {
-        await _serviceScope.ServiceProvider.GetService<IRoleService>().DeleteAsync(sysRoles.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<RoleService>().DeleteAsync(sysRoles.Select(a => a.Id).ToArray());
         await _mainLayout.StateHasChangedAsync();
     }
 
     private async Task EditCallAsync(RoleEditInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<IRoleService>().EditAsync(input);
+        await _serviceScope.ServiceProvider.GetService<RoleService>().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<IRoleService>().GrantResourceAsync(userGrantRoleInput);
+            await _serviceScope.ServiceProvider.GetService<RoleService>().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<IRoleService>().GrantUserAsync(userGrantRoleInput);
+            await _serviceScope.ServiceProvider.GetService<RoleService>().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<IRoleService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<RoleService>().PageAsync(input);
     }
 
     private async Task ResuorceInitAsync()
     {
         _resTreeSelectors = (await _serviceScope.ServiceProvider.GetService<ResourceService>().GetRoleGrantResourceMenusAsync());
-        _roleHasResuorces = (await _serviceScope.ServiceProvider.GetService<IRoleService>().OwnResourceAsync(_choiceRoleId))?.GrantInfoList;
+        _roleHasResuorces = (await _serviceScope.ServiceProvider.GetService<RoleService>().OwnResourceAsync(_choiceRoleId))?.GrantInfoList;
     }
 
     private async Task<List<UserSelectorOutput>> UserInitAsync()
     {
-        _allUsers = await _serviceScope.ServiceProvider.GetService<ISysUserService>().UserSelectorAsync(_searchKey);
-        var data = await _serviceScope.ServiceProvider.GetService<IRoleService>().OwnUserAsync(_choiceRoleId);
+        _allUsers = await _serviceScope.ServiceProvider.GetService<SysUserService>().UserSelectorAsync(_searchKey);
+        var data = await _serviceScope.ServiceProvider.GetService<RoleService>().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<ISessionService>().ExitSessionAsync(id);
+            await _serviceScope.ServiceProvider.GetService<SessionService>().ExitSessionAsync(id);
         }
     }
 
 
     private async Task<ISqlSugarPagedList<SessionOutput>> SessionQueryCallAsync(SessionPageInput input)
     {
-        return await _serviceScope.ServiceProvider.GetService<ISessionService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<SessionService>().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<ISessionService>().ExitVerificatAsync(send);
+        await _serviceScope.ServiceProvider.GetService<SessionService>().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<ISpaService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<SpaService>().AddAsync(input);
         await _mainLayout.StateHasChangedAsync();
     }
     private async Task DeleteCallAsync(IEnumerable<SysResource> input)
     {
-        await _serviceScope.ServiceProvider.GetService<ISpaService>().DeleteAsync(input.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<SpaService>().DeleteAsync(input.Select(a => a.Id).ToArray());
         await _mainLayout.StateHasChangedAsync();
     }
 
     private async Task EditCallAsync(SpaEditInput input)
     {
-        await _serviceScope.ServiceProvider.GetService<ISpaService>().EditAsync(input);
+        await _serviceScope.ServiceProvider.GetService<SpaService>().EditAsync(input);
         await _mainLayout.StateHasChangedAsync();
     }
 
     private async Task<ISqlSugarPagedList<SysResource>> QueryCallAsync(SpaPageInput input)
     {
-        return await _serviceScope.ServiceProvider.GetService<ISpaService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<SpaService>().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<ISysUserService>().AddAsync(input);
+        await _serviceScope.ServiceProvider.GetService<SysUserService>().AddAsync(input);
     }
     private async Task DeleteCallAsync(IEnumerable<SysUser> users)
     {
-        await _serviceScope.ServiceProvider.GetService<ISysUserService>().DeleteAsync(users.Select(a => a.Id).ToArray());
+        await _serviceScope.ServiceProvider.GetService<SysUserService>().DeleteAsync(users.Select(a => a.Id).ToArray());
         await _mainLayout.StateHasChangedAsync();
     }
 
     private async Task EditCallAsync(UserEditInput users)
     {
-        await _serviceScope.ServiceProvider.GetService<ISysUserService>().EditAsync(users);
+        await _serviceScope.ServiceProvider.GetService<SysUserService>().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<ISysUserService>().GrantRoleAsync(userGrantRoleInput);
+            await _serviceScope.ServiceProvider.GetService<SysUserService>().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<ISysUserService>().PageAsync(input);
+        return await _serviceScope.ServiceProvider.GetService<SysUserService>().PageAsync(input);
     }
 
     private async Task ResetPasswordAsync(SysUser sysUser)
     {
-        await _serviceScope.ServiceProvider.GetService<ISysUserService>().ResetPasswordAsync(sysUser.Id);
+        await _serviceScope.ServiceProvider.GetService<SysUserService>().ResetPasswordAsync(sysUser.Id);
         await PopupService.EnqueueSnackbarAsync(new("成功", AlertTypes.Success));
         await _mainLayout.StateHasChangedAsync();
     }
 
     private async Task RoleInitAsync()
     {
-        _allRoles = await _serviceScope.ServiceProvider.GetService<IRoleService>().RoleSelectorAsync();
-        var data = await _serviceScope.ServiceProvider.GetService<IRoleService>().GetRoleIdListByUserIdAsync(_choiceUserId);
+        _allRoles = await _serviceScope.ServiceProvider.GetService<RoleService>().RoleSelectorAsync();
+        var data = await _serviceScope.ServiceProvider.GetService<RoleService>().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<ISysUserService>().EnableUserAsync(context.Id);
+                await _serviceScope.ServiceProvider.GetService<SysUserService>().EnableUserAsync(context.Id);
             else
-                await _serviceScope.ServiceProvider.GetService<ISysUserService>().DisableUserAsync(context.Id);
+                await _serviceScope.ServiceProvider.GetService<SysUserService>().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<IUserCenterService>().UpdateUserDefaultRazorAsync(UserManager.UserId, _defaultMenuId);
+        await _serviceScope.ServiceProvider.GetService<UserCenterService>().UpdateUserDefaultRazorAsync(UserManager.UserId, _defaultMenuId);
         await _mainLayout.StateHasChangedAsync();
         await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
     }
 
     async Task OnShortcutSaveAsync()
     {
-        await _serviceScope.ServiceProvider.GetService<IUserCenterService>().UpdateWorkbenchAsync(_menusChoice);
+        await _serviceScope.ServiceProvider.GetService<UserCenterService>().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<IUserCenterService>().EditPasswordAsync(_passwordInfoInput);
+            await _serviceScope.ServiceProvider.GetService<UserCenterService>().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<IUserCenterService>().UpdateUserInfoAsync(_updateInfoInput);
+        await _serviceScope.ServiceProvider.GetService<UserCenterService>().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<IVisitLogService>().DeleteAsync(_categoryFilters.Select(it => it.Value).ToArray());
+            await _serviceScope.ServiceProvider.GetService<VisitLogService>().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<IVisitLogService>().PageAsync(input);
+        var data = await _serviceScope.ServiceProvider.GetService<VisitLogService>().PageAsync(input);
         return data;
     }
 }

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

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

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

@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
-//  QQ群：605534569
+//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><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
 //------------------------------------------------------------------------------
 #endregion
 
@@ -16,7 +16,7 @@ using ThingsGateway.Foundation.Extension.String;
 
 namespace ThingsGateway.Admin.Blazor;
 
-public partial class MainLayout : IDisposable
+public partial class MainLayout
 {
     private List<SysResource> _breadcrumbSysResources = new();
     private string _configCopyRight = "";
@@ -43,23 +43,16 @@ public partial class MainLayout : IDisposable
     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()
     {
-        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);
+        _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);
 
         await _userResoures.InitUserAsync();
         await _userResoures.InitMenuAsync();

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

@@ -5,8 +5,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.1.7" />
-		<PackageReference Include="SqlSugarCore" Version="5.1.4.124" />
+		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.1.4" />
+		<PackageReference Include="SqlSugarCore" Version="5.1.4.117" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
 	</ItemGroup>

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

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

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

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

framework/demo/Directory.Build.props

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

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

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

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

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

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

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

framework/foundation/Directory.Build.props

@@ -1,14 +1,16 @@
 <Project>
-	<Import Project="$(SolutionDir)\Directory.Build.props" />
-	<!--如果编译net45报错无支持，用一下方法添加net45包-->
-	<!--VS顶部菜单栏 -> 视图 -> 其他 -> 程序包控制台
-	Install-Package Microsoft.NETFramework.ReferenceAssemblies.net45
-	-->
 	<PropertyGroup>
+		<Version>4.0.0.1</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>
@@ -20,11 +22,17 @@
 		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
 		<PackageProjectUrl>https://diego2098.gitee.io/thingsgateway-docs/</PackageProjectUrl>
 		<PackageTags>ThingsGateway;Diego;dotNET China;Blazor;设备采集;边缘网关</PackageTags>
+		<SignAssembly>True</SignAssembly>
+		<DelaySign>False</DelaySign>
+		<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
 		<PackageOutputPath>..\..\nupkgs</PackageOutputPath>
 		<AssemblyOriginatorKeyFile>..\..\..\snks/ThingsGateway.snk</AssemblyOriginatorKeyFile>
-		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	</PropertyGroup>
 
+	<PropertyGroup>
+	</PropertyGroup>
+
+
 	<ItemGroup>
 		<None Include="..\..\..\README.md" Pack="true" PackagePath="\" />
 	</ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,10 @@
 <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/Http/Config/HttpConfigExtensions.cs

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

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

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

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

@@ -608,7 +608,6 @@ namespace ThingsGateway.Foundation.Sockets
                         this.OnAccepted(e);
                     }
                 }
-                catch (ObjectDisposedException) { }
                 catch (Exception ex)
                 {
                     this.Logger.Exception(ex);

framework/foundation/ThingsGateway.Foundation/TouchSocket/Socket/WaitingClient/WaitingClient.cs

@@ -186,6 +186,10 @@ namespace ThingsGateway.Foundation.Sockets
                     }
                 }
             }
+            catch (Exception ex)
+            {
+                return new();
+            }
             finally
             {
                 this.m_cancellationTokenSource = null;

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

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

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

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

framework/gateway/Directory.Build.props

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

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

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

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

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

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

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

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

@@ -43,16 +43,14 @@ public abstract class CollectBase : DriverBase
 
     public override async Task AfterStopAsync()
     {
+        await base.AfterStopAsync();
         //去除全局设备变量
         lock (_globalDeviceData.CollectDevices)
         {
             _globalDeviceData.CollectDevices.RemoveWhere(it => it.Id == DeviceId);
         }
-        await base.AfterStopAsync();
     }
 
-
-
     public override void Init(DeviceRunTime device)
     {
         base.Init(device);
@@ -85,7 +83,7 @@ public abstract class CollectBase : DriverBase
     public virtual async Task<Dictionary<string, OperResult>> WriteValuesAsync(Dictionary<DeviceVariableRunTime, JToken> writeInfoLists, CancellationToken cancellationToken)
     {
         if (_readWrite == null)
-            throw new($"无法写入数据，{nameof(_readWrite)}为null");
+            throw new("未初始化成功");
         Dictionary<string, OperResult> operResults = new();
         foreach (var writeInfo in writeInfoLists)
         {

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

@@ -173,7 +173,7 @@ public class DriverPluginService : ISingleton
 
                 }
                 return plugins;
-            }, true);
+            }, false);
             return data;
         }
     }
@@ -317,7 +317,7 @@ public class DriverPluginService : ISingleton
         var data = _serviceScope.ServiceProvider.GetService<MemoryCache>().GetOrCreate($"{nameof(GetDriverVariableProperties)}", cacheKey, c =>
         {
             var data = driver.VariablePropertys?.GetType().GetProperties()?.SelectMany(it =>
-    new[] { new { memberInfo = it, attribute = GetCustomAttributeRecursive<VariablePropertyAttribute>(it) } })
+    new[] { new { memberInfo = it, attribute = GetCustomAttributeRecursive<DevicePropertyAttribute>(it) } })
     ?.Where(x => x.attribute != null).ToList()
       ?.SelectMany(it => new[]
       {

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

@@ -109,8 +109,8 @@ public abstract class UpLoadBaseWithCacheT<DeviceT, VariableT> : UpLoadBase
                 CurrentDevice.DeviceVariableRunTimes.ForEach(a => { a.VariableValueChange += VariableValueChange; });
         }
 
-        if (_uploadPropertyWithCache.CycleInterval <= 50) _uploadPropertyWithCache.CycleInterval = 50;
-        if (_uploadPropertyWithCache.UploadInterval <= 100) _uploadPropertyWithCache.UploadInterval = 100;
+        if (_uploadPropertyWithCache.CycleInterval <= 100) _uploadPropertyWithCache.CycleInterval = 100;
+        if (_uploadPropertyWithCache.UploadInterval <= 1000) _uploadPropertyWithCache.UploadInterval = 1000;
         _exVariableTimerTick = new(_uploadPropertyWithCache.UploadInterval);
         _exDeviceTimerTick = new(_uploadPropertyWithCache.UploadInterval);
     }

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

@@ -20,7 +20,7 @@ public class UploadPropertyWithCacheT : DriverPropertyBase
     /// <summary>
     /// 线程循环间隔
     /// </summary>
-    [DeviceProperty("线程循环间隔", "最小50ms")]
+    [DeviceProperty("线程循环间隔", "最小10ms")]
     public virtual int CycleInterval { get; set; } = 1000;
     /// <summary>
     /// 内存队列最大条数
@@ -47,7 +47,7 @@ public class UploadPropertyWithCacheT : DriverPropertyBase
     /// <summary>
     /// 上传间隔时间
     /// </summary>
-    [DeviceProperty("上传间隔时间", "最小100ms")]
+    [DeviceProperty("上传间隔时间", "最小1000ms")]
     public virtual int UploadInterval { get; set; } = 1000;
 
     [DeviceProperty("是否选择全部变量", "")] public bool IsAllVariable { get; set; } = false;

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

@@ -24,10 +24,8 @@ using Yitter.IdGenerator;
 namespace ThingsGateway.Gateway.Application;
 
 [Injection(Proxy = typeof(OperDispatchProxy))]
-public class CollectDeviceService : DeviceService<CollectDevice>, ITransient, ICollectDeviceService
+public class CollectDeviceService : DeviceService<CollectDevice>, ITransient
 {
-    protected override string DeviceSheetName => ExportHelpers.CollectDeviceSheetName;
-
     public CollectDeviceService(IServiceScopeFactory serviceScopeFactory, IFileService fileService) : base(serviceScopeFactory, fileService)
     {
     }
@@ -46,7 +44,7 @@ public class CollectDeviceService : DeviceService<CollectDevice>, ITransient, IC
 
 
     /// <inheritdoc/>
-    [OperDesc("复制设备与变量", IsRecordPar = false)]
+    [OperDesc("复制设备与变量")]
     public virtual async Task CopyDevAndVarAsync(IEnumerable<CollectDevice> input)
     {
         var variableService = _serviceScope.ServiceProvider.GetService<VariableService>();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -12,10 +12,11 @@
 	<ItemGroup>
 		<PackageReference Include="LiteDB" Version="5.0.17" />
 		<PackageReference Include="Hardware.Info" Version="100.0.0" />
-		<PackageReference Include="CS-Script" Version="4.8.10" />
+		<PackageReference Include="CS-Script" Version="4.8.8" />
 		<!--CS-Script与Furion冲突，直接安装覆盖版本-->
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0" />
-		<PackageReference Include="SqlSugar.TDengineCore" Version="3.4.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.7.0" />
+		<PackageReference Include="MQTTnet" Version="4.3.1.873" />
+		<PackageReference Include="SqlSugar.TDengineCore" Version="3.2.0" />
 	</ItemGroup>
 
 	<ItemGroup>

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

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

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

@@ -49,7 +49,7 @@ public abstract class DeviceWorker : BackgroundService
     /// </summary>
     public List<DriverBase> DriverBases => _deviceThreads
         .Where(a => a.DriverBases.Any(b => b.CurrentDevice != null))
-        .SelectMany(a => a.DriverBases).OrderByDescending(a => a.CurrentDevice.DeviceStatus).ToList();
+        .SelectMany(a => a.DriverBases).ToList();
 
     /// <summary>
     /// 设备子线程列表

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

@@ -99,9 +99,9 @@ public class UploadDeviceWorker : DeviceWorker
     {
         if (!_stoppingToken.IsCancellationRequested)
         {
-            _logger.LogInformation("正在获取北向设备组态信息");
-            var deviceRunTimes = (_serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetDeviceRuntime());
-            _logger.LogInformation("获取北向设备组态信息完成");
+            _logger.LogInformation("正在获取北向组态信息");
+            var deviceRunTimes = (_serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetDeviceRuntime());
+            _logger.LogInformation("获取北向组态信息完成");
             foreach (var uploadDeviceRunTime in deviceRunTimes.Where(a => !deviceRunTimes.Any(b => a.Id == b.RedundantDeviceId && b.IsRedundant)))
             {
                 if (!_stoppingToken.IsCancellationRequested)
@@ -135,7 +135,7 @@ public class UploadDeviceWorker : DeviceWorker
     /// <returns></returns>
     public List<string> GetDeviceMethods(long devId)
     {
-        var pluginName = _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetDeviceById(devId).PluginName;
+        var pluginName = _serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetDeviceById(devId).PluginName;
         var driverBase = _driverPluginService.GetDriver(pluginName);
         var Propertys = _driverPluginService.GetDriverMethodInfo(driverBase);
         driverBase?.SafeDispose();
@@ -154,7 +154,7 @@ public class UploadDeviceWorker : DeviceWorker
         var Propertys = _driverPluginService.GetDriverProperties(driverBase);
         if (devId != 0)
         {
-            var uploadDevice = _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetDeviceById(devId);
+            var uploadDevice = _serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetDeviceById(devId);
             uploadDevice?.DevicePropertys?.ForEach(it =>
             {
                 var dependencyProperty = Propertys.FirstOrDefault(a => a.PropertyName == it.PropertyName);
@@ -237,7 +237,7 @@ public class UploadDeviceWorker : DeviceWorker
 
                             if (driverBase.CurrentDevice.DeviceStatus == DeviceStatusEnum.OffLine)
                             {
-                                if (driverBase.CurrentDevice.IsRedundant && _serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetCacheList(false).Any(a => a.Id == driverBase.CurrentDevice.RedundantDeviceId))
+                                if (driverBase.CurrentDevice.IsRedundant && _serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetCacheList(false).Any(a => a.Id == driverBase.CurrentDevice.RedundantDeviceId))
                                 {
                                     await DeviceRedundantThreadAsync(driverBase.CurrentDevice.Id);
                                 }
@@ -307,7 +307,7 @@ public class UploadDeviceWorker : DeviceWorker
 
     protected override Task<IEnumerable<DeviceRunTime>> GetDeviceRunTimeAsync(long devId)
     {
-        return Task.FromResult(_serviceScope.ServiceProvider.GetService<IUploadDeviceService>().GetDeviceRuntime(devId));
+        return Task.FromResult(_serviceScope.ServiceProvider.GetService<UploadDeviceService>().GetDeviceRuntime(devId));
     }
 
     #endregion

framework/gateway/ThingsGateway.Gateway.Blazor/Components/WriteValue.razor.cs

@@ -1,12 +1,12 @@
-#region copyright
+#region copyright
 //------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
-//  QQ群：605534569
+//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊȫ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+//  <EFBFBD>˴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><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
 //------------------------------------------------------------------------------
 #endregion
 
@@ -32,7 +32,7 @@ namespace ThingsGateway.Gateway.Blazor
             try
             {
                 await OnSaveAsync.InvokeAsync(Content);
-                //await InvokeAsync(async () => await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success));
+                //await InvokeAsync(async () => await PopupService.EnqueueSnackbarAsync("<EFBFBD>ɹ<EFBFBD>", AlertTypes.Success));
                 await ClosePopupAsync();
             }
             catch (Exception ex)

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

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

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

@@ -29,7 +29,7 @@
 
 @layout MainLayout
 @using ThingsGateway.Admin.Core;
-@* @if (IsMobile)
+@if (IsMobile)
 {
     @GetAppDataTable()
 }
@@ -67,9 +67,7 @@ else
             @GetAppDataTable()
         </MCol>
     </MRow>
-} *@
-
-@GetAppDataTable()
+}
 
 
 <ImportExcel @ref=_importExcel Import="SaveDeviceImportAsync" Preview="DeviceImportAsync" />

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

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

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

@@ -19,7 +19,7 @@
 @using Masa.Blazor.Presets;
 @using System.IO;
 @using Microsoft.AspNetCore.Authorization;
-@using SqlSugar;
+
 @using ThingsGateway.Admin.Blazor;
 @using ThingsGateway.Admin.Core;
 
@@ -48,11 +48,11 @@
              @if (_tabNumber == 1)
             {
                 <MRow NoGutters>
-@*                  <MCol Md=2 Cols="12">
+                 <MCol Md=2 Cols="12">
 
                      <MCard Class="ma-2" Style=@($"height: calc(100vh - {BlazorResourceConst.DefaultHeight + 80}px );")>
                          <MCardTitle>
-                             <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_collectDeviceSearchName"
+                             <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_collectDeviceGroupSearchName"
                                             Outlined Label=@typeof(CollectDevice).GetDescription(nameof(CollectDevice.DeviceGroup)) />
                              </MCardTitle>
 
@@ -64,7 +64,7 @@
                                    }
                                    } )
                                         Items="_collectDeviceGroups" ItemText="r=>r" ItemChildren="r=>null"
-                                        Search="@_collectDeviceSearchName"
+                                        Search="@_collectDeviceGroupSearchName"
                                       Activatable ItemKey=@(r=>r)>
                                  <LabelContent>
                                      <span title=@context.Item>
@@ -73,14 +73,12 @@
                                 </LabelContent>
                             </MTreeview>
                         </MCard>
-                    </MCol> *@
-                    <MCol Md=5 Cols="12">
+                    </MCol>
+                    <MCol Md=3 Cols="12">
                         <MCard Height=@($"calc(100vh - {BlazorResourceConst.DefaultHeight + 80}px; )") Style="overflow-y:auto;" Flat Class="ml-2 my-4">
 
-                              <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_collectDeviceSearchName"
-                                            Outlined Label=@typeof(CollectDevice).GetDescription(nameof(CollectDevice.Name)) />
 
-                             <MVirtualScroll Context="item" Height=@($"calc(100vh - {BlazorResourceConst.DefaultHeight+140}px)") OverscanCount=2 ItemSize="60" Items="_collectDriverBases.WhereIF(!_collectDeviceSearchName.IsNullOrEmpty(),a=>a.CurrentDevice.Name.Contains(_collectDeviceSearchName)).ToList()">
+                             <MVirtualScroll Context="item" Height=@($"calc(100vh - {BlazorResourceConst.DefaultHeight+100}px)") OverscanCount=2 ItemSize="60" Items="_collectDriverBases">
 
                                  <ItemContent>
                                      @if (item.CurrentDevice != null)
@@ -252,10 +250,10 @@
             @if (_tabNumber == 2)
             {
                 <MRow>
-@*                     <MCol Md=2 Cols="12">
+                    <MCol Md=2 Cols="12">
                         <MCard Class="ma-2" Style=@($"height: calc(100vh - {BlazorResourceConst.DefaultHeight + 80}px); )")>
                             <MCardTitle>
-                                <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_uploadDeviceSearchName"
+                                <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_uploadDeviceGroupSearchName"
                                             Outlined Label=@typeof(Device).GetDescription(nameof(Device.DeviceGroup)) />
                              </MCardTitle>
                              <MTreeview Style=@($"height: calc(100vh - {BlazorResourceConst.DefaultHeight+240}px);overflow-y:auto") Dense TItem="string" TKey="string" ActiveChanged=@(async a=>
@@ -267,7 +265,7 @@
                                    }
                                    } )
                                         Items="_uploadDeviceGroups" ItemText="r=>r" ItemChildren="r=>null"
-                                        Search="@_uploadDeviceSearchName"
+                                        Search="@_uploadDeviceGroupSearchName"
                                       Activatable ItemKey=@(r=>r)>
                                  <LabelContent>
                                      <span title=@context.Item>
@@ -276,13 +274,11 @@
                                 </LabelContent>
                             </MTreeview>
                         </MCard>
-                    </MCol> *@
-                    <MCol Md=5 Cols="12">
+                    </MCol>
+                    <MCol Md=3 Cols="12">
                         <MCard Height=@($"calc(100vh - {BlazorResourceConst.DefaultHeight+80}px)") Style="overflow-y:auto;" Flat Class="ml-2 my-4">
-                             <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_uploadDeviceSearchName"
-                                            Outlined Label=@typeof(CollectDevice).GetDescription(nameof(CollectDevice.Name)) />
 
-                             <MVirtualScroll Context="item" Height=@($"calc(100vh - {BlazorResourceConst.DefaultHeight+140}px)") OverscanCount=2 ItemSize="60" Items="_uploadDriverBases.WhereIF(!_uploadDeviceSearchName.IsNullOrEmpty(),a=>a.CurrentDevice.Name.Contains(_uploadDeviceSearchName)).ToList()">
+                             <MVirtualScroll Context="item" Height=@($"calc(100vh - {BlazorResourceConst.DefaultHeight+100}px)") OverscanCount=2 ItemSize="60" Items="_uploadDriverBases">
 
                                  <ItemContent>
                                      @if (item.CurrentDevice != null)

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

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

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

@@ -30,7 +30,7 @@
 @inject UserResoures UserResoures
 @layout MainLayout
 
-@* @if (IsMobile)
+@if (IsMobile)
 {
     @GetAppDataTable()
 
@@ -69,8 +69,7 @@ else
 
         </MCol>
     </MRow>
-} *@
-@GetAppDataTable()
+}
 
 <ImportExcel @ref=_importExcel Import="SaveDeviceImportAsync" Preview="DeviceImportAsync" />
 
@@ -161,7 +160,7 @@ else
         case nameof(context.Item.DeviceId):
             <span title=@context.Value>
                 @(
-            _serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetNameById(context.Item.DeviceId)
+            _serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetNameById(context.Item.DeviceId)
                 )
             </span>
         break;
@@ -193,7 +192,7 @@ else
                     </td>
                     <td class="text-start ">
                         <div style="word-break:break-all; white-space:pre-wrap;">
-                            @(_serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetNameById(context.Item2.ToLong()))
+                            @(_serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetNameById(context.Item2.ToLong()))
                         </div>
                     </td>
                 </tr>

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

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

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

@@ -30,7 +30,7 @@
 @inherits BaseComponentBase
 @inject UserResoures UserResoures
 @layout MainLayout
-@* @if (IsMobile)
+@if (IsMobile)
 {
     @GetAppDataTable()
 
@@ -69,11 +69,7 @@ else
             @GetAppDataTable()
         </MCol>
     </MRow>
-} *@
-
-@GetAppDataTable()
-
-
+}
 @code {
     RenderFragment GetAppDataTable()
     {
@@ -135,7 +131,7 @@ else
                             </td>
                             <td class="text-start ">
                                 <div style="word-break:break-all; white-space:pre-wrap;">
-                                    @(_serviceScope.ServiceProvider.GetService<ICollectDeviceService>().GetNameById(context.Item2.ToLong()))
+                                    @(_serviceScope.ServiceProvider.GetService<CollectDeviceService>().GetNameById(context.Item2.ToLong()))
                                 </div>
                             </td>
                         </tr>

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

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

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

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

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

@@ -29,7 +29,7 @@
 
 @layout MainLayout
 @using ThingsGateway.Admin.Core;
-@* @if (IsMobile)
+@if (IsMobile)
 {
     @GetAppDataTable()
 }
@@ -67,9 +67,8 @@ else
             @GetAppDataTable()
         </MCol>
     </MRow>
-} *@
+}
 
-@GetAppDataTable()
 
 <ImportExcel @ref=_importExcel Import="SaveDeviceImportAsync" Preview="DeviceImportAsync" />
 

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

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

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

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

framework/plugin/Directory.Build.props

@@ -1,9 +1,23 @@
 <Project>
-	<Import Project="$(SolutionDir)\Directory.Build.props" />
 	<PropertyGroup>
+		<Version>4.0.0.1</Version>
+		<LangVersion>latest</LangVersion>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+		<Authors>Diego</Authors>
+		<Product>ThingsGateway</Product>
+		<Copyright>© 2023-present Diego</Copyright>
+		<RepositoryUrl>https://gitee.com/diego2098/ThingsGateway</RepositoryUrl>
+		<SignAssembly>True</SignAssembly>
+		<DelaySign>False</DelaySign>
+		<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
 
 	</PropertyGroup>
 
+	<!--<PropertyGroup>
+		<EnableDynamicLoading>true</EnableDynamicLoading>
+	</PropertyGroup>-->
+
 	<ItemGroup>
 
 		<ProjectReference Include="..\..\gateway\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj" >

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

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

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

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

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

@@ -16,6 +16,8 @@ using LiteDB;
 
 using Microsoft.Extensions.Logging;
 
+using MQTTnet.Diagnostics;
+
 using System.Runtime.InteropServices;
 
 using ThingsGateway.Foundation.Extension.ConcurrentQueue;
@@ -69,19 +71,18 @@ public partial class KafkaProducer : UpLoadBaseWithCacheT<DeviceData, VariableDa
 
         #region Kafka 生产者
 
+        Enum.TryParse<SecurityProtocol>(_driverPropertys.SecurityProtocol, out var SecurityProtocol);
+        Enum.TryParse<SaslMechanism>(_driverPropertys.SaslMechanism, out var SaslMechanism);
 
         //1、生产者配置
         producerconfig = new ProducerConfig
         {
             BootstrapServers = _driverPropertys.BootStrapServers,
-            SecurityProtocol = _driverPropertys.SecurityProtocol,
-            SaslMechanism = _driverPropertys.SaslMechanism,
-
+            SecurityProtocol = SecurityProtocol,
+            SaslMechanism = SaslMechanism,
+            SaslUsername = _driverPropertys.SaslUsername,
+            SaslPassword = _driverPropertys.SaslPassword,
         };
-        if (!string.IsNullOrEmpty(_driverPropertys.SaslUsername))
-            producerconfig.SaslUsername = _driverPropertys.SaslUsername;
-        if (!string.IsNullOrEmpty(_driverPropertys.SaslPassword))
-            producerconfig.SaslPassword = _driverPropertys.SaslPassword;
 
         //2、创建生产者
         producerBuilder = new ProducerBuilder<Null, string>(producerconfig);

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

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

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

@@ -85,7 +85,7 @@ public class ModbusSerialServer : UpLoadBase
 
         var tags = CurrentDevice.DeviceVariableRunTimes
             .Where(b => !string.IsNullOrEmpty(
-                b.GetPropertyValue(DeviceId, nameof(_variablePropertys.ServiceAddress))?.Value))
+                b.GetPropertyValue(DeviceId, nameof(_variablePropertys.ServiceAddress)).Value))
             .ToList();
 
         tags.ForEach(a =>

framework/plugin/ThingsGateway.Plugin.Modbus/ModbusTcpDtu/ModbusTcpDtu.cs

@@ -45,7 +45,7 @@ public class ModbusTcpDtu : CollectBase
         var client1 = new TcpService();
         ((TcpService)client1).Setup(FoundataionConfig);
         //载入配置
-        _plc = new((TcpService)client1)
+        _plc = new((TcpService)client)
         {
             DataFormat = _driverPropertys.DataFormat,
             FrameTime = _driverPropertys.FrameTime,

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

@@ -64,7 +64,6 @@ public class ModbusTcpServer : UpLoadBase
             iPHost = new IPHost($"{_driverPropertys.IP}:{_driverPropertys.Port}");
         }
         FoundataionConfig.SetListenIPHosts(new IPHost[] { iPHost });
-        FoundataionConfig.SetMaxCount(30000);
         var service = new TcpService();
         service.Setup(FoundataionConfig);
         //载入配置
@@ -79,7 +78,7 @@ public class ModbusTcpServer : UpLoadBase
 
         var tags = CurrentDevice.DeviceVariableRunTimes
             .Where(b => !string.IsNullOrEmpty(
-                b.GetPropertyValue(DeviceId, nameof(_variablePropertys.ServiceAddress))?.Value))
+                b.GetPropertyValue(DeviceId, nameof(_variablePropertys.ServiceAddress)).Value))
             .ToList();
 
         tags.ForEach(a =>

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

@@ -51,7 +51,7 @@
 
 	<ItemGroup>
 
-		<ProjectReference Include="..\..\gateway\ThingsGateway.Gateway.Blazor\ThingsGateway.Gateway.Blazor.csproj">
+		<ProjectReference Include="..\..\gateway\ThingsGateway.Gateway.Blazor\ThingsGateway.Gateway.Blazor.csproj" >
 			<Private>false</Private>
 			<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
 			<ExcludeAssets>runtime</ExcludeAssets>

framework/plugin/ThingsGateway.Plugin.Mqtt/IotSharpClient/IotSharpClientMed.cs

@@ -112,7 +112,7 @@ public partial class IotSharpClient : UpLoadBaseWithCacheT<DeviceData, VariableD
                         var tag = CurrentDevice.DeviceVariableRunTimes.FirstOrDefault(a => a.Name == item.Key);
                         if (tag != null)
                         {
-                            var rpcEnable = tag.GetPropertyValue(DeviceId, nameof(_variablePropertys.VariableRpcEnable))?.Value?.ToBool() == true && _driverPropertys.DeviceRpcEnable;
+                            var rpcEnable = tag.GetPropertyValue(DeviceId, nameof(_variablePropertys.VariableRpcEnable)).Value.ToBool(false) && _driverPropertys.DeviceRpcEnable;
                             if (!rpcEnable)
                             {
                                 results.Add(item.Key, new OperResult("权限不足，变量不支持写入"));

framework/plugin/ThingsGateway.Plugin.Mqtt/MqttClient/MqttClient.cs

@@ -69,20 +69,14 @@ public partial class MqttClient : UpLoadBaseWithCacheT<DeviceData, VariableData>
     {
         base.Init(client);
         var mqttFactory = new MqttFactory();
-        var mqttClientOptionsBuilder = mqttFactory.CreateClientOptionsBuilder()
+        _mqttClientOptions = mqttFactory.CreateClientOptionsBuilder()
            .WithClientId(_driverPropertys.ConnectId)
            .WithCredentials(_driverPropertys.UserName, _driverPropertys.Password)//账密
-
+           .WithTcpServer(_driverPropertys.IP, _driverPropertys.Port)//服务器
            .WithCleanSession(true)
            .WithKeepAlivePeriod(TimeSpan.FromSeconds(120.0))
-           .WithoutThrowOnNonSuccessfulConnectResponse();
-        if (_driverPropertys.IsWebSocket)
-            _mqttClientOptions = mqttClientOptionsBuilder.WithWebSocketServer(a => a.WithUri(_driverPropertys.WebSocktUrl))
+           .WithoutThrowOnNonSuccessfulConnectResponse()
            .Build();
-        else
-            _mqttClientOptions = mqttClientOptionsBuilder.WithTcpServer(_driverPropertys.IP, _driverPropertys.Port)//服务器
-           .Build();
-
         _mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder()
             .WithTopicFilter(
                 f =>

framework/plugin/ThingsGateway.Plugin.Mqtt/MqttClient/MqttClientMed.cs

@@ -134,7 +134,7 @@ public partial class MqttClient : UpLoadBaseWithCacheT<DeviceData, VariableData>
                 var tag = CurrentDevice.DeviceVariableRunTimes.FirstOrDefault(a => a.Name == rpcData.Key);
                 if (tag != null)
                 {
-                    var rpcEnable = tag.GetPropertyValue(DeviceId, nameof(_variablePropertys.VariableRpcEnable))?.Value?.ToBool();
+                    var rpcEnable = tag.GetPropertyValue(DeviceId, nameof(_variablePropertys.VariableRpcEnable)).Value.ToBool();
                     if (rpcEnable == true)
                     {
 

framework/plugin/ThingsGateway.Plugin.Mqtt/MqttClient/MqttClientProperty.cs

@@ -29,16 +29,6 @@ public class MqttClientProperty : UploadPropertyWithCacheT
     [DeviceProperty("端口", "")]
     public override int Port { get; set; } = 1883;
     /// <summary>
-    /// 是否websocket连接
-    /// </summary>
-    [DeviceProperty("是否WebSocket连接", "true=>websocket，flase=>tcp")]
-    public bool IsWebSocket { get; set; } = false;
-    /// <summary>
-    /// WebSocktUrl
-    /// </summary>
-    [DeviceProperty("WebSocktUrl", "")]
-    public string WebSocktUrl { get; set; } = "ws://127.0.0.1:8083/mqtt";
-    /// <summary>
     /// 账号
     /// </summary>
     [DeviceProperty("账号", "")]

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

@@ -14,18 +14,15 @@ using Furion;
 
 using Mapster;
 
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 using MQTTnet;
-using MQTTnet.AspNetCore;
 using MQTTnet.Internal;
 using MQTTnet.Protocol;
 using MQTTnet.Server;
 
 using System.Collections.Concurrent;
+using System.Net;
 using System.Text;
 
 using ThingsGateway.Admin.Application;
@@ -96,7 +93,6 @@ public class MqttServer : UpLoadBase
             _mqttServer.InterceptingSubscriptionAsync -= MqttServer_InterceptingSubscriptionAsync; ;
             _mqttServer?.SafeDispose();
         }
-        _webHost?.Dispose();
         _globalDeviceData?.AllVariables?.ForEach(a => a.VariableValueChange -= VariableValueChange);
         _globalDeviceData?.CollectDevices?.ForEach(a =>
         {
@@ -106,32 +102,16 @@ public class MqttServer : UpLoadBase
         _collectVariableRunTimes.Clear();
         base.Dispose(disposing);
     }
-    private IWebHost _webHost { get; set; }
+
     protected override void Init(ISenderClient client = null)
     {
-        //var mqttFactory = new MqttFactory();
-        //var mqttServerOptions = mqttFactory.CreateServerOptionsBuilder()
-        //    .WithDefaultEndpointBoundIPAddress(string.IsNullOrEmpty(_driverPropertys.IP) ? null : IPAddress.Parse(_driverPropertys.IP))
-        //    .WithDefaultEndpointPort(_driverPropertys.Port)
-        //    .WithDefaultEndpoint()
-        //    .Build();
-        //_mqttServer = mqttFactory.CreateMqttServer(mqttServerOptions);
-        var configuration = new ConfigurationBuilder()
-          .SetBasePath(Directory)
-          .Build();
-        var webBuilder = new WebHostBuilder()
-     .UseKestrel(
-                             o =>
-                             {
-                                 o.ListenAnyIP(_driverPropertys.Port, l => l.UseMqtt());
-                                 o.ListenAnyIP(_driverPropertys.WebSocketPort);
-                             });
-        webBuilder.UseStartup<MqttServerStartup>();
-        _webHost = webBuilder.UseConfiguration(configuration)
-           .Build();
-
-
-        _mqttServer = _webHost.Services.GetService<MqttHostedServer>();
+        var mqttFactory = new MqttFactory();
+        var mqttServerOptions = mqttFactory.CreateServerOptionsBuilder()
+            .WithDefaultEndpointBoundIPAddress(string.IsNullOrEmpty(_driverPropertys.IP) ? null : IPAddress.Parse(_driverPropertys.IP))
+            .WithDefaultEndpointPort(_driverPropertys.Port)
+            .WithDefaultEndpoint()
+            .Build();
+        _mqttServer = mqttFactory.CreateMqttServer(mqttServerOptions);
 
         CollectDevices.Where(a => CurrentDevice.DeviceVariableRunTimes.Select(b => b.DeviceId).Contains(a.Id)).ForEach(a =>
         {
@@ -141,11 +121,11 @@ public class MqttServer : UpLoadBase
         {
             a.VariableValueChange += VariableValueChange;
         });
+
     }
 
     protected override async Task ProtectedBeforStartAsync(CancellationToken cancellationToken)
     {
-        _ = _webHost.StartAsync(cancellationToken);
         if (_mqttServer != null)
         {
             _mqttServer.ValidatingConnectionAsync += MqttServer_ValidatingConnectionAsync;
@@ -308,7 +288,7 @@ public class MqttServer : UpLoadBase
                 var tag = CurrentDevice.DeviceVariableRunTimes.FirstOrDefault(a => a.Name == rpcData.Key);
                 if (tag != null)
                 {
-                    var rpcEnable = tag.GetPropertyValue(DeviceId, nameof(_variablePropertys.VariableRpcEnable))?.Value?.ToBool() == true;
+                    var rpcEnable = tag.GetPropertyValue(DeviceId, nameof(_variablePropertys.VariableRpcEnable)).Value.ToBool(false);
                     if (!rpcEnable)
                     {
                         mqttRpcResult.Success = false;

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

@@ -17,18 +17,17 @@ namespace ThingsGateway.Plugin.Mqtt;
 public class MqttServerProperty : DriverPropertyBase
 {
     [DeviceProperty("是否选择全部变量", "")] public bool IsAllVariable { get; set; } = false;
-
+    /// <summary>
+    /// IP
+    /// </summary>
+    [DeviceProperty("IP", "留空则全部监听")]
+    public override string IP { get; set; } = "";
     /// <summary>
     /// 端口
     /// </summary>
     [DeviceProperty("端口", "")]
     public override int Port { get; set; } = 1883;
     /// <summary>
-    /// WebSocket端口
-    /// </summary>
-    [DeviceProperty("WebSocket端口", "")]
-    public int WebSocketPort { get; set; } = 8083;
-    /// <summary>
     /// 允许连接的ID(前缀)
     /// </summary>
     [DeviceProperty("允许连接的ID(前缀)", "")]