2.1.0.7

This reverts commit a6d99fe227.

framework/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<Version>2.0.9.3</Version>
+		<Version>2.1.0.7</Version>
 		<Authors>Diego</Authors>
 		<Product>ThingsGateway</Product>
 		<Copyright>© 2023-present Diego</Copyright>

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

@@ -18,6 +18,7 @@ using System.Reflection;
 using System.Text;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 using UAParser;
 

framework/ThingsGateway.Admin.Application/Helper/PermissionUtil.cs

@@ -20,6 +20,7 @@ using System.Globalization;
 using System.Reflection;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 using Yitter.IdGenerator;
 

framework/ThingsGateway.Admin.Application/Helper/SeedDataUtil.cs

@@ -13,6 +13,8 @@
 using System.Text;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

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

@@ -16,6 +16,7 @@ using Furion.FriendlyException;
 using Mapster;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 namespace ThingsGateway.Admin.Application;
 

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

@@ -17,6 +17,7 @@ using Furion.FriendlyException;
 using Mapster;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 using Yitter.IdGenerator;
 

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

@@ -19,6 +19,7 @@ using Mapster;
 using SqlSugar;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 namespace ThingsGateway.Admin.Application;
 

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

@@ -17,6 +17,7 @@ using Furion.FriendlyException;
 using Mapster;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 namespace ThingsGateway.Admin.Application;
 

framework/ThingsGateway.Admin.Blazor.Core/Components/Foter.razor

@@ -19,7 +19,7 @@
 <MSheet>
     <MCard Flat Href=@CONFIG_COPYRIGHT_URL Target="_blank">
         <MLabel Style="background-color:inherit;" Class="text-subtltie-2">@CONFIG_COPYRIGHT</MLabel>
-        <MLabel Style="background-color:inherit;" Class="text-subtltie-2 ml-4">@Version</MLabel>
+        <MLabel Style="background-color:inherit;white-space: pre;" Class="text-subtltie-2 ml-4">@Version</MLabel>
     </MCard>
 </MSheet>
 

framework/ThingsGateway.Admin.Blazor.Core/Components/Foter.razor.cs

@@ -14,6 +14,8 @@ using Microsoft.AspNetCore.Components;
 
 using System.Reflection;
 
+using ThingsGateway.Admin.Core;
+
 namespace ThingsGateway.Admin.Blazor.Core;
 /// <summary>
 /// Foter
@@ -40,7 +42,12 @@ public partial class Foter
     /// <inheritdoc/>
     protected override async Task OnParametersSetAsync()
     {
-        Version = "v" + Assembly.GetExecutingAssembly().GetName().Version.ToString();
+        var assembly = Assembly.GetEntryAssembly();
+        if (assembly != null)
+        {
+            Version = $"v{assembly.GetName().Version}";
+        }
+
         await base.OnParametersSetAsync();
     }
 

framework/ThingsGateway.Admin.Blazor.Core/Components/UserMenu.razor.cs

@@ -17,6 +17,7 @@ using Masa.Blazor;
 using Microsoft.AspNetCore.Components;
 
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 namespace ThingsGateway.Admin.Blazor.Core;
 /// <summary>

framework/ThingsGateway.Admin.Blazor.Core/ThingsGateway.Admin.Blazor.Core.csproj

@@ -14,7 +14,7 @@
 	
 	<ItemGroup>
 
-		<PackageReference Include="Masa.Blazor" Version="1.0.2" />
+		<PackageReference Include="Masa.Blazor" Version="1.0.3" />
 		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.10" />
 
 	</ItemGroup>

framework/ThingsGateway.Admin.Blazor.Core/UserResoures/UserResoures.cs

@@ -20,6 +20,7 @@ using Microsoft.AspNetCore.Http;
 
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 namespace ThingsGateway.Admin.Blazor.Core;
 

framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor.cs

@@ -282,6 +282,7 @@ public partial class AppDataTable<TItem, SearchItem, AddItem, EditItem> : IAppDa
             {
                 SearchModel.Size = PageItems.Total;
             }
+            selectedItem = new List<TItem>();
         }
         catch (Exception ex)
         {

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

@@ -15,7 +15,6 @@
 @using Microsoft.AspNetCore.Authorization;
 @using ThingsGateway.Admin.Application;
  
-@inject IConfigService ConfigService
 @namespace ThingsGateway.Admin.Blazor
 @attribute [Authorize]
 @inject UserResoures UserResoures

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

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

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

@@ -16,7 +16,7 @@
 @using Masa.Blazor.Presets;
 @using Microsoft.AspNetCore.Authorization;
 @using ThingsGateway.Admin.Application;
-@inject IMenuService MenuService
+
 @namespace ThingsGateway.Admin.Blazor
 @attribute [Authorize]
 @inherits BaseComponentBase

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

@@ -29,14 +29,11 @@ public partial class Menu
     long buttonParentId;
     bool IsShowButtonList;
     List<SysResource> MenuCatalog = new();
-    [Inject]
-    IButtonService ButtonService { get; set; }
+
 
     [CascadingParameter]
     MainLayout MainLayout { get; set; }
 
-    [Inject]
-    IResourceService ResourceService { get; set; }
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -52,23 +49,23 @@ public partial class Menu
     private async Task AddCallAsync(MenuAddInput input)
     {
         input.ParentId = search.ParentId;
-        await MenuService.AddAsync(input);
+        await App.GetService<MenuService>().AddAsync(input);
         await NavChangeAsync();
     }
     private async Task ButtonAddCallAsync(ButtonAddInput input)
     {
         input.ParentId = buttonParentId;
-        await ButtonService.AddAsync(input);
+        await App.GetService<ButtonService>().AddAsync(input);
     }
 
     private Task ButtonDeleteCallAsync(IEnumerable<SysResource> input)
     {
-        return ButtonService.DeleteAsync(input.Select(a => a.Id).ToArray());
+        return App.GetService<ButtonService>().DeleteAsync(input.Select(a => a.Id).ToArray());
     }
 
     private Task ButtonEditCallAsync(ButtonEditInput input)
     {
-        return ButtonService.EditAsync(input);
+        return App.GetService<ButtonService>().EditAsync(input);
 
     }
 
@@ -92,7 +89,7 @@ public partial class Menu
     private async Task<SqlSugarPagedList<SysResource>> ButtonQueryCallAsync(ButtonPageInput input)
     {
         input.ParentId = buttonParentId;
-        var data = await ButtonService.PageAsync(input);
+        var data = await App.GetService<ButtonService>().PageAsync(input);
         return data;
     }
 
@@ -103,13 +100,13 @@ public partial class Menu
 
     private async Task DeleteCallAsync(IEnumerable<SysResource> input)
     {
-        await MenuService.DeleteAsync(input.Select(a => a.Id).ToArray());
+        await App.GetService<MenuService>().DeleteAsync(input.Select(a => a.Id).ToArray());
         await NavChangeAsync();
 
     }
     private async Task EditCallAsync(MenuEditInput input)
     {
-        await MenuService.EditAsync(input);
+        await App.GetService<MenuService>().EditAsync(input);
         await NavChangeAsync();
 
     }
@@ -117,9 +114,9 @@ public partial class Menu
     private async Task<List<SysResource>> GetMenuCatalogAsync()
     {
         //获取所有菜单
-        List<SysResource> sysResources = await ResourceService.GetListByCategoryAsync(ResourceCategoryEnum.MENU);
+        List<SysResource> sysResources = await App.GetService<ResourceService>().GetListByCategoryAsync(ResourceCategoryEnum.MENU);
         sysResources = sysResources.Where(it => it.TargetType == TargetTypeEnum.None).ToList();
-        MenuCatalog = ResourceService.ResourceListToTree(sysResources);
+        MenuCatalog = App.GetService<ResourceService>().ResourceListToTree(sysResources);
         return MenuCatalog;
     }
 
@@ -130,7 +127,7 @@ public partial class Menu
     }
     private async Task<SqlSugarPagedList<SysResource>> QueryCallAsync(MenuPageInput input)
     {
-        var data = await MenuService.TreeAsync(input);
+        var data = await App.GetService<MenuService>().TreeAsync(input);
         return data.ToPagedList(input);
     }
 

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

@@ -15,7 +15,7 @@
 @using Masa.Blazor.Presets;
 @using Microsoft.AspNetCore.Authorization;
 @using ThingsGateway.Admin.Application;
-@inject IOpenApiSessionService SessionService
+ 
 @namespace ThingsGateway.Admin.Blazor
 @attribute [Authorize]
 @inject UserResoures UserResoures

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

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

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

@@ -15,7 +15,7 @@
 @using Microsoft.AspNetCore.Authorization;
 @using ThingsGateway.Admin.Application;
 @using Masa.Blazor.Presets;
-@inject IOpenApiUserService OpenApiUserService
+ 
 @namespace ThingsGateway.Admin.Blazor
 @attribute [Authorize]
 @inject UserResoures UserResoures

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

@@ -31,21 +31,20 @@ public partial class OpenApiUserR
     bool IsShowRoles;
     List<OpenApiPermissionTreeSelector> RolesChoice = new();
     string SearchName;
-    [Inject]
-    IRoleService SysRoleService { get; set; }
+
     private Task AddCallAsync(OpenApiUserAddInput input)
     {
-        return OpenApiUserService.AddAsync(input);
+        return App.GetService<OpenApiUserService>().AddAsync(input);
     }
 
     private async Task DeleteCallAsync(IEnumerable<OpenApiUser> users)
     {
-        await OpenApiUserService.DeleteAsync(users.Select(a => a.Id).ToArray());
+        await App.GetService<OpenApiUserService>().DeleteAsync(users.Select(a => a.Id).ToArray());
     }
 
     private Task EditCallAsync(OpenApiUserEditInput users)
     {
-        return OpenApiUserService.EditAsync(users);
+        return App.GetService<OpenApiUserService>().EditAsync(users);
     }
 
     private List<OpenApiPermissionTreeSelector> GetRouters()
@@ -61,7 +60,7 @@ public partial class OpenApiUserR
             OpenApiUserGrantPermissionInput userGrantRoleInput = new();
             userGrantRoleInput.Id = ChoiceUserId;
             userGrantRoleInput.PermissionList = RolesChoice.Select(it => it.ApiRoute).ToList();
-            await OpenApiUserService.GrantRoleAsync(userGrantRoleInput);
+            await App.GetService<OpenApiUserService>().GrantRoleAsync(userGrantRoleInput);
             IsShowRoles = false;
             await _datatable?.QueryClickAsync();
         }
@@ -73,7 +72,7 @@ public partial class OpenApiUserR
     }
     private Task<SqlSugarPagedList<OpenApiUser>> QueryCallAsync(OpenApiUserPageInput input)
     {
-        return OpenApiUserService.PageAsync(input);
+        return App.GetService<OpenApiUserService>().PageAsync(input);
     }
 
     private async Task UserStatusChangeAsync(OpenApiUser context, bool enable)
@@ -81,9 +80,9 @@ public partial class OpenApiUserR
         try
         {
             if (enable)
-                await OpenApiUserService.EnableUserAsync(context.Id);
+                await App.GetService<OpenApiUserService>().EnableUserAsync(context.Id);
             else
-                await OpenApiUserService.DisableUserAsync(context.Id);
+                await App.GetService<OpenApiUserService>().DisableUserAsync(context.Id);
         }
         finally
         {

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

@@ -14,7 +14,7 @@
 @using System.Linq.Expressions;
 @using Microsoft.AspNetCore.Authorization;
 @using ThingsGateway.Admin.Application;
-@inject IOperateLogService OperateLogService
+ 
 @namespace ThingsGateway.Admin.Blazor
 @attribute [Authorize]
 @inject UserResoures UserResoures

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

@@ -44,7 +44,7 @@ public partial class Oplog
         var confirm = await PopupService.OpenConfirmDialogAsync("删除", "确定 ?");
         if (confirm)
         {
-            await OperateLogService.DeleteAsync(CategoryFilters.Select(it => it.Value).ToArray());
+            await App.GetService<OperateLogService>().DeleteAsync(CategoryFilters.Select(it => it.Value).ToArray());
             await _datatable?.QueryClickAsync();
         }
     }
@@ -54,7 +54,7 @@ public partial class Oplog
         input.Account = search.Account;
         input.Category = search.Category;
         input.ExeStatus = search.ExeStatus;
-        return OperateLogService.PageAsync(input);
+        return App.GetService<OperateLogService>().PageAsync(input);
     }
     [Inject]
     AjaxService AjaxService { get; set; }

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

@@ -16,7 +16,7 @@
 @using Masa.Blazor.Presets;
 @using Microsoft.AspNetCore.Authorization;
 @using ThingsGateway.Admin.Application;
-@inject IRoleService SysRoleService
+ 
 @namespace ThingsGateway.Admin.Blazor
 @attribute [Authorize]
 @inject UserResoures UserResoures

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

@@ -38,27 +38,23 @@ public partial class Role
     [CascadingParameter]
     MainLayout MainLayout { get; set; }
 
-    [Inject]
-    IResourceService ResourceService { get; set; }
+
 
     private string SearchKey { get; set; }
 
-    [Inject]
-    ISysUserService SysUserService { get; set; }
-
     private Task AddCallAsync(RoleAddInput input)
     {
-        return SysRoleService.AddAsync(input);
+        return App.GetService<RoleService>().AddAsync(input);
     }
     private async Task DeleteCallAsync(IEnumerable<SysRole> sysRoles)
     {
-        await SysRoleService.DeleteAsync(sysRoles.Select(a => a.Id).ToArray());
+        await App.GetService<RoleService>().DeleteAsync(sysRoles.Select(a => a.Id).ToArray());
         await MainLayout.StateHasChangedAsync();
     }
 
     private async Task EditCallAsync(RoleEditInput input)
     {
-        await SysRoleService.EditAsync(input);
+        await App.GetService<RoleService>().EditAsync(input);
         await MainLayout.StateHasChangedAsync();
     }
     private async Task OnRoleHasResuorcesSaveAsync(ModalActionEventArgs args)
@@ -69,7 +65,7 @@ public partial class Role
             var data = new List<SysResource>();
             userGrantRoleInput.Id = ChoiceRoleId;
             userGrantRoleInput.GrantInfoList = RoleHasResuorces;
-            await SysRoleService.GrantResourceAsync(userGrantRoleInput);
+            await App.GetService<RoleService>().GrantResourceAsync(userGrantRoleInput);
             IsShowResuorces = false;
         }
         catch (Exception ex)
@@ -86,7 +82,7 @@ public partial class Role
             GrantUserInput userGrantRoleInput = new();
             userGrantRoleInput.Id = ChoiceRoleId;
             userGrantRoleInput.GrantInfoList = UsersChoice.Select(it => it.Id).ToList();
-            await SysRoleService.GrantUserAsync(userGrantRoleInput);
+            await App.GetService<RoleService>().GrantUserAsync(userGrantRoleInput);
             IsShowUsers = false;
         }
         catch (Exception ex)
@@ -99,19 +95,19 @@ public partial class Role
 
     private Task<SqlSugarPagedList<SysRole>> QueryCallAsync(RolePageInput input)
     {
-        return SysRoleService.PageAsync(input);
+        return App.GetService<RoleService>().PageAsync(input);
     }
 
     private async Task ResuorceInitAsync()
     {
-        ResTreeSelectors = (await ResourceService.GetRoleGrantResourceMenusAsync());
-        RoleHasResuorces = (await SysRoleService.OwnResourceAsync(ChoiceRoleId))?.GrantInfoList;
+        ResTreeSelectors = (await App.GetService<ResourceService>().GetRoleGrantResourceMenusAsync());
+        RoleHasResuorces = (await App.GetService<RoleService>().OwnResourceAsync(ChoiceRoleId))?.GrantInfoList;
     }
 
     private async Task<List<UserSelectorOutput>> UserInitAsync()
     {
-        AllUsers = await SysUserService.UserSelectorAsync(SearchKey);
-        var data = await SysRoleService.OwnUserAsync(ChoiceRoleId);
+        AllUsers = await App.GetService<SysUserService>().UserSelectorAsync(SearchKey);
+        var data = await App.GetService<RoleService>().OwnUserAsync(ChoiceRoleId);
         UsersChoice = AllUsers.Where(a => data.Contains(a.Id)).ToList();
         return AllUsers;
     }

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

@@ -16,7 +16,6 @@
 @using Microsoft.AspNetCore.Authorization;
 @using ThingsGateway.Admin.Application;
  
-@inject ISessionService SessionService
 @namespace ThingsGateway.Admin.Blazor
 @attribute [Authorize]
 @inject UserResoures UserResoures

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

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

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

@@ -16,7 +16,7 @@
 @using Masa.Blazor.Presets;
 @using Microsoft.AspNetCore.Authorization;
 @using ThingsGateway.Admin.Application;
-@inject ISpaService SpaService
+ 
 @namespace ThingsGateway.Admin.Blazor
 @attribute [Authorize]
 @inherits BaseComponentBase

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

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

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

@@ -11,7 +11,7 @@
 *@
 
 @page "/admin/user"
-@inject ISysUserService SysUserService
+ 
 @namespace ThingsGateway.Admin.Blazor
 @using Masa.Blazor.Presets;
 @using Microsoft.AspNetCore.Authorization;

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

@@ -34,21 +34,20 @@ public partial class User
     [CascadingParameter]
     MainLayout MainLayout { get; set; }
 
-    [Inject]
-    IRoleService SysRoleService { get; set; }
+
     private Task AddCallAsync(UserAddInput input)
     {
-        return SysUserService.AddAsync(input);
+        return App.GetService<SysUserService>().AddAsync(input);
     }
     private async Task DeleteCallAsync(IEnumerable<SysUser> users)
     {
-        await SysUserService.DeleteAsync(users.Select(a => a.Id).ToArray());
+        await App.GetService<SysUserService>().DeleteAsync(users.Select(a => a.Id).ToArray());
         await MainLayout.StateHasChangedAsync();
     }
 
     private async Task EditCallAsync(UserEditInput users)
     {
-        await SysUserService.EditAsync(users);
+        await App.GetService<SysUserService>().EditAsync(users);
         await MainLayout.StateHasChangedAsync();
     }
 
@@ -59,7 +58,7 @@ public partial class User
             UserGrantRoleInput userGrantRoleInput = new();
             userGrantRoleInput.Id = ChoiceUserId;
             userGrantRoleInput.RoleIdList = RolesChoice.Select(it => it.Id).ToList();
-            await SysUserService.GrantRoleAsync(userGrantRoleInput);
+            await App.GetService<SysUserService>().GrantRoleAsync(userGrantRoleInput);
             IsShowRoles = false;
         }
         catch (Exception ex)
@@ -71,20 +70,20 @@ public partial class User
     }
     private Task<SqlSugarPagedList<SysUser>> QueryCallAsync(UserPageInput input)
     {
-        return SysUserService.PageAsync(input);
+        return App.GetService<SysUserService>().PageAsync(input);
     }
 
     private async Task ResetPasswordAsync(SysUser sysUser)
     {
-        await SysUserService.ResetPasswordAsync(sysUser.Id);
+        await App.GetService<SysUserService>().ResetPasswordAsync(sysUser.Id);
         await PopupService.EnqueueSnackbarAsync(new("成功", AlertTypes.Success));
         await MainLayout.StateHasChangedAsync();
     }
 
     private async Task RoleInitAsync()
     {
-        AllRoles = await SysRoleService.RoleSelectorAsync();
-        var data = await SysRoleService.GetRoleIdListByUserIdAsync(ChoiceUserId);
+        AllRoles = await App.GetService<RoleService>().RoleSelectorAsync();
+        var data = await App.GetService<RoleService>().GetRoleIdListByUserIdAsync(ChoiceUserId);
         RolesChoice = AllRoles.Where(a => data.Contains(a.Id)).ToList();
     }
     private async Task UserStatusChangeAsync(SysUser context, bool enable)
@@ -92,9 +91,9 @@ public partial class User
         try
         {
             if (enable)
-                await SysUserService.EnableUserAsync(context.Id);
+                await App.GetService<SysUserService>().EnableUserAsync(context.Id);
             else
-                await SysUserService.DisableUserAsync(context.Id);
+                await App.GetService<SysUserService>().DisableUserAsync(context.Id);
         }
         finally
         {

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

@@ -33,8 +33,7 @@ public partial class UserCenter
     [Inject]
     NavigationManager NavigationManager { get; set; }
 
-    [Inject]
-    IUserCenterService UserCenterService { get; set; }
+
 
     /// <inheritdoc/>
     protected override async Task OnParametersSetAsync()
@@ -48,14 +47,14 @@ public partial class UserCenter
 
     async Task OnDefaultRazorSaveAsync()
     {
-        await UserCenterService.UpdateUserDefaultRazorAsync(UserManager.UserId, DefaultMenuId);
+        await App.GetService<UserCenterService>().UpdateUserDefaultRazorAsync(UserManager.UserId, DefaultMenuId);
         await MainLayout.StateHasChangedAsync();
         await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
     }
 
     async Task OnShortcutSaveAsync()
     {
-        await UserCenterService.UpdateWorkbenchAsync(_menusChoice);
+        await App.GetService<UserCenterService>().UpdateWorkbenchAsync(_menusChoice);
         await MainLayout.StateHasChangedAsync();
         await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
     }
@@ -66,7 +65,7 @@ public partial class UserCenter
         {
             //验证成功，操作业务
             _passwordInfoInput.Id = UserResoures.CurrentUser.Id;
-            await UserCenterService.EditPasswordAsync(_passwordInfoInput);
+            await App.GetService<UserCenterService>().EditPasswordAsync(_passwordInfoInput);
             await MainLayout.StateHasChangedAsync();
             await PopupService.EnqueueSnackbarAsync("成功，将重新登录", AlertTypes.Success);
             await Task.Delay(2000);
@@ -76,7 +75,7 @@ public partial class UserCenter
 
     async Task OnUpdateUserInfoAsync()
     {
-        await UserCenterService.UpdateUserInfoAsync(_updateInfoInput);
+        await App.GetService<UserCenterService>().UpdateUserInfoAsync(_updateInfoInput);
         await MainLayout.StateHasChangedAsync();
         await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
     }

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

@@ -15,7 +15,6 @@
 @using Microsoft.AspNetCore.Authorization;
 @using ThingsGateway.Admin.Application;
  
-@inject IVisitLogService VisitLogService
 @namespace ThingsGateway.Admin.Blazor
 @attribute [Authorize]
 @inject UserResoures UserResoures

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

@@ -51,14 +51,14 @@ public partial class Vislog
         var confirm = await PopupService.OpenConfirmDialogAsync("删除", "确定 ?");
         if (confirm)
         {
-            await VisitLogService.DeleteAsync(CategoryFilters.Select(it => it.Value).ToArray());
+            await App.GetService<VisitLogService>().DeleteAsync(CategoryFilters.Select(it => it.Value).ToArray());
             await _datatable?.QueryClickAsync();
         }
     }
 
     private async Task<SqlSugarPagedList<SysVisitLog>> QueryCallAsync(VisitLogPageInput input)
     {
-        var data = await VisitLogService.PageAsync(input);
+        var data = await App.GetService<VisitLogService>().PageAsync(input);
         return data;
     }
     [Inject]

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

@@ -21,6 +21,7 @@ using Microsoft.Extensions.Hosting;
 using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Blazor.Core;
 using ThingsGateway.Admin.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 namespace ThingsGateway.Admin.Blazor;
 
@@ -39,10 +40,6 @@ public partial class Login
     AjaxService AjaxService { get; set; }
 
 
-    [Inject]
-    IAuthService AuthService { get; set; }
-
-
 
     string UserLogoUrl { get; set; } = BlazorResourceConst.ResourceUrl + "images/defaultUser.svg";
 
@@ -64,12 +61,7 @@ public partial class Login
         }
     }
     private PImageCaptcha captcha;
-    [Inject]
-    IUserCenterService UserCenterService { get; set; }
-    [Inject]
-    IResourceService ResourceService { get; set; }
-    [Inject]
-    ISysUserService SysUserService { get; set; }
+
     private async Task LoginAsync()
     {
         loginModel.ValidCodeReqNo = CaptchaInfo.ValidCodeReqNo;
@@ -101,9 +93,9 @@ public partial class Login
             {
                 await PopupService.EnqueueSnackbarAsync(new("登录成功", AlertTypes.Success));
                 await Task.Delay(500);
-                var userId = await SysUserService.GetIdByAccountAsync(loginModel.Account);
-                var data = await UserCenterService.GetLoginDefaultRazorAsync(userId);
-                var sameLevelMenus = await ResourceService.GetaMenuAndSpaListAsync();
+                var userId = await App.GetService<SysUserService>().GetIdByAccountAsync(loginModel.Account);
+                var data = await App.GetService<UserCenterService>().GetLoginDefaultRazorAsync(userId);
+                var sameLevelMenus = await App.GetService<ResourceService>().GetaMenuAndSpaListAsync();
                 if (NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsolutePath == "/Login" || NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsolutePath == "/")
                     await AjaxService.GotoAsync(sameLevelMenus.FirstOrDefault(a => a.Id == data)?.Component ?? "index");
                 else
@@ -140,12 +132,12 @@ public partial class Login
 
     private void GetCaptchaInfo()
     {
-        CaptchaInfo = AuthService.GetCaptchaInfo();
+        CaptchaInfo = App.GetService<AuthService>().GetCaptchaInfo();
     }
 
     private Task<string> RefreshCode()
     {
-        CaptchaInfo = AuthService.GetCaptchaInfo();
+        CaptchaInfo = App.GetService<AuthService>().GetCaptchaInfo();
         return Task.FromResult(CaptchaInfo.CodeValue);
     }
 }

framework/ThingsGateway.Admin.Core/Entity/System/OpenApiUser.cs

@@ -86,7 +86,7 @@ public class OpenApiUser : BaseEntity
     /// <summary>
     /// 权限码集合
     /// </summary>
-    [SugarColumn(ColumnName = "PermissionCodeList", ColumnDescription = "权限json", IsJson = true, IsNullable = true)]
+    [SugarColumn(ColumnName = "PermissionCodeList", ColumnDescription = "权限json", ColumnDataType = StaticConfig.CodeFirst_BigString, IsJson = true, IsNullable = true)]
     public List<string> PermissionCodeList { get; set; }
 
     /// <summary>

framework/ThingsGateway.Admin.Core/Entity/System/SysVerificat.cs

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

framework/ThingsGateway.Admin.Core/Extension/JsonExtensions.cs

@@ -12,7 +12,7 @@
 
 using Furion.DependencyInjection;
 
-namespace ThingsGateway.Admin.Core;
+namespace ThingsGateway.Admin.Core.JsonExtensions;
 
 /// <summary>
 /// 对象拓展

framework/ThingsGateway.Admin.Core/Extension/ListExtensions.cs

@@ -18,6 +18,8 @@ using System.Collections;
 using System.Data;
 using System.Reflection;
 
+using ThingsGateway.Admin.Core.JsonExtensions;
+
 namespace ThingsGateway.Admin.Core;
 
 /// <summary>

framework/ThingsGateway.Admin.Core/Extension/ObjectExtensions.cs

@@ -332,20 +332,51 @@ public static class ObjectExtensions
     /// <returns></returns>
     public static bool ToBoolean(this object value, bool defaultValue = false) => value?.ToString().ToUpper() switch
     {
+        "0" or "FALSE" => false,
         "1" or "TRUE" => true,
         _ => defaultValue,
     };
+
     /// <summary>
     /// ToLong
     /// </summary>
     /// <returns></returns>
-    public static long ToLong(this object value, long defaultValue = 0) => value == null || value.ToString().IsNullOrEmpty() ? defaultValue : Int64.TryParse(value.ToString(), out var n) ? n : defaultValue;
+    public static long ToLong(this object value, long defaultValue = 0)
+    {
+        if (value == null || value.ToString().IsNullOrEmpty())
+        {
+            return defaultValue;
+        }
+        else
+        {
+            if (value is bool boolValue)
+            {
+                return boolValue ? 1 : 0;
+            }
+            return Int64.TryParse(value.ToString(), out var n) ? n : defaultValue;
+        }
+    }
 
     /// <summary>
     /// ToInt
     /// </summary>
     /// <returns></returns>
-    public static int ToInt(this object value, int defaultValue = 0) => value == null || value.ToString().IsNullOrEmpty() ? defaultValue : Int32.TryParse(value.ToString(), out var n) ? n : defaultValue;
+    public static int ToInt(this object value, int defaultValue = 0)
+    {
+        if (value == null || value.ToString().IsNullOrEmpty())
+        {
+            return defaultValue;
+        }
+        else
+        {
+            if (value is bool boolValue)
+            {
+                return boolValue ? 1 : 0;
+            }
+            return int.TryParse(value.ToString(), out int n) ? n : defaultValue;
+        }
+    }
+
     /// <summary>
     /// ToDecimal
     /// </summary>
@@ -357,7 +388,18 @@ public static class ObjectExtensions
             return Double.IsNaN(d) ? defaultValue : (Decimal)d;
         }
         var str = value?.ToString();
-        return str.IsNullOrEmpty() ? defaultValue : Decimal.TryParse(str, out var n) ? n : defaultValue;
+        if (str.IsNullOrEmpty())
+        {
+            return defaultValue;
+        }
+        else
+        {
+            if (value is bool boolValue)
+            {
+                return boolValue ? 1 : 0;
+            }
+            return Decimal.TryParse(str, out var n) ? n : defaultValue;
+        }
     }
     /// <summary>
     /// ToDecimal
@@ -370,7 +412,18 @@ public static class ObjectExtensions
             return Double.IsNaN(d) ? defaultValue : (Double)d;
         }
         var str = value?.ToString();
-        return str.IsNullOrEmpty() ? defaultValue : double.TryParse(str, out var n) ? n : defaultValue;
+        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>

framework/ThingsGateway.Admin.Core/SqlSugar/Extension/SqlSugarPageExtension.cs

@@ -12,6 +12,8 @@
 
 using SqlSugar;
 
+using System.Linq.Expressions;
+
 namespace ThingsGateway.Admin.Core;
 
 /// <summary>
@@ -55,12 +57,14 @@ public static class SqlSugarPageExtension
     /// <param name="whereExpression"></param>
     /// <returns></returns>
     public static async Task<SqlSugarPagedList<TEntity>> ToPagedListAsync<TEntity>(this ISugarQueryable<TEntity> queryable,
-        int pageIndex, int pageSize, Func<TEntity, bool> whereExpression = null)
+        int pageIndex, int pageSize, Expression<Func<TEntity, bool>> whereExpression = null)
     {
 
         RefAsync<int> totalCount = 0;
+        if (whereExpression != null)
+            queryable = queryable.Where(whereExpression);
         var records = await queryable.ToPageListAsync(pageIndex, pageSize, totalCount);
-        records = whereExpression != null ? records.Where(whereExpression).ToList() : records;
+        //records = whereExpression != null ? records.Where(whereExpression).ToList() : records;
         var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
         return new SqlSugarPagedList<TEntity>
         {

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

@@ -9,10 +9,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.40" />
-		<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.40" />
-		<PackageReference Include="Furion.Pure" Version="4.8.8.40" />
-		<PackageReference Include="SqlSugarCore" Version="5.1.4.99" />
+		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.42" />
+		<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.42" />
+		<PackageReference Include="Furion.Pure" Version="4.8.8.42" />
+		<PackageReference Include="SqlSugarCore" Version="5.1.4.104" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
 		<PackageReference Include="MiniExcel" Version="1.31.2" />

framework/ThingsGateway.Admin.Core/ThingsGateway.Admin.Core.xml

@@ -850,19 +850,19 @@
             <param name="this"></param>
             <param name="values"></param>
         </member>
-        <member name="T:ThingsGateway.Admin.Core.JsonExtensions">
+        <member name="T:ThingsGateway.Admin.Core.JsonExtensions.JsonExtensions">
             <summary>
             对象拓展
             </summary>
         </member>
-        <member name="M:ThingsGateway.Admin.Core.JsonExtensions.ToJsonString(System.Object)">
+        <member name="M:ThingsGateway.Admin.Core.JsonExtensions.JsonExtensions.ToJsonString(System.Object)">
             <summary>
             转换为Json
             </summary>
             <param name="item"></param>
             <returns></returns>
         </member>
-        <member name="M:ThingsGateway.Admin.Core.JsonExtensions.ToJsonWithT``1(System.String)">
+        <member name="M:ThingsGateway.Admin.Core.JsonExtensions.JsonExtensions.ToJsonWithT``1(System.String)">
             <summary>
             从字符串到json
             </summary>
@@ -1495,7 +1495,7 @@
             <param name="size"></param>
             <returns></returns>
         </member>
-        <member name="M:ThingsGateway.Admin.Core.SqlSugarPageExtension.ToPagedListAsync``1(SqlSugar.ISugarQueryable{``0},System.Int32,System.Int32,System.Func{``0,System.Boolean})">
+        <member name="M:ThingsGateway.Admin.Core.SqlSugarPageExtension.ToPagedListAsync``1(SqlSugar.ISugarQueryable{``0},System.Int32,System.Int32,System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
             <summary>
             SqlSugar分页扩展
             </summary>

framework/ThingsGateway.Application/Converter/StringToEncodingConverter.cs

@@ -80,7 +80,7 @@ public class StringToEncodingConverter : IConverter<string>
     {
         try
         {
-            source = target.ToJson();
+            source = target.ToJsonString();
             return true;
         }
         catch (Exception)

framework/ThingsGateway.Application/Entity/MemoryVariable.cs

@@ -72,7 +72,7 @@ public class MemoryVariable : BaseEntity
     /// <summary>
     /// 变量额外属性Json，通常使用为上传设备,List属性
     /// </summary>
-    [SugarColumn(IsJson = true, ColumnName = "VariablePropertys", ColumnDescription = "变量属性Json", IsNullable = true)]
+    [SugarColumn(IsJson = true, ColumnName = "VariablePropertys", ColumnDataType = StaticConfig.CodeFirst_BigString, ColumnDescription = "变量属性Json", IsNullable = true)]
     [IgnoreExcel]
     public ConcurrentDictionary<long, List<DependencyProperty>> VariablePropertys { get; set; } = new();
     /// <summary>

framework/ThingsGateway.Application/Entity/UploadDevice.cs

@@ -65,7 +65,7 @@ public class UploadDevice : BaseEntity
     /// <summary>
     /// 设备属性Json
     /// </summary>
-    [SugarColumn(IsJson = true, ColumnName = "DevicePropertys", ColumnDescription = "设备属性Json", IsNullable = true)]
+    [SugarColumn(IsJson = true, ColumnName = "DevicePropertys", ColumnDataType = StaticConfig.CodeFirst_BigString, ColumnDescription = "设备属性Json", IsNullable = true)]
     [IgnoreExcel]
     public List<DependencyProperty> DevicePropertys { get; set; }
 

framework/ThingsGateway.Application/Extensions/CSharpScriptEngineExtension.cs

@@ -21,7 +21,7 @@ using Newtonsoft.Json.Converters;
 using System.Dynamic;
 using System.Text;
 
-using TouchSocket.Core;
+using ThingsGateway.Admin.Core.JsonExtensions;
 
 namespace ThingsGateway.Application;
 /// <summary>
@@ -76,7 +76,7 @@ public class CSharpScriptEngine : ISingleton
         var expConverter = new ExpandoObjectConverter();
         dynamic obj = JsonConvert.DeserializeObject<List<ExpandoObject>>(input, expConverter);
         object result = runscript(obj);
-        var json = result.ToJson();
+        var json = result.ToJsonString();
         return json;
     }
 
@@ -116,7 +116,7 @@ public class CSharpScriptEngine : ISingleton
         var expConverter = new ExpandoObjectConverter();
         dynamic obj = JsonConvert.DeserializeObject<ExpandoObject>(input, expConverter);
         object result = runscript(obj);
-        var json = result.ToJson();
+        var json = result.ToJsonString();
         return json;
     }
 
@@ -136,7 +136,7 @@ public static class CSharpScriptEngineExtension
     /// </summary>
     public static string GetSciptListValue<T>(this T datas, string script) where T : class
     {
-        var inPut = datas.ToJson();
+        var inPut = datas.ToJsonString();
         if (!string.IsNullOrEmpty(script))
         {
             //执行脚本，获取新实体
@@ -154,7 +154,7 @@ public static class CSharpScriptEngineExtension
     /// </summary>
     public static string GetSciptValue<T>(this T datas, string script) where T : class
     {
-        var inPut = datas.ToJson();
+        var inPut = datas.ToJsonString();
         if (!string.IsNullOrEmpty(script))
         {
             //执行脚本，获取新实体

framework/ThingsGateway.Application/HardwareInfo/HardwareInfoService.cs

@@ -113,8 +113,9 @@ public class HardwareInfoService : ISingleton
         try
         {
             var url = "http://myip.ipip.net";
-            var stream = await new HttpClient().GetStreamAsync(url);
-            var streamReader = new StreamReader(stream, Encoding.UTF8);
+            using var httpClient = new HttpClient();
+            using var stream = await httpClient.GetStreamAsync(url);
+            using var streamReader = new StreamReader(stream, Encoding.UTF8);
             var html = streamReader.ReadToEnd();
             return html.Replace("当前 IP：", "").Replace("来自于：", "");
         }

framework/ThingsGateway.Application/ManageGateway/ManageGatewayConfig.cs

@@ -0,0 +1,144 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+
+using ThingsGateway.Foundation;
+
+namespace ThingsGateway.Application;
+
+/// <summary>
+/// ManageGatewayConfig
+/// </summary>
+public class ManageGatewayConfig
+{
+    /// <summary>
+    /// 启用
+    /// </summary>
+    public bool Enable { get; set; }
+    /// <summary>
+    /// MqttBrokerIP
+    /// </summary>
+    public string MqttBrokerIP { get; set; }
+
+    /// <summary>
+    /// MqttBrokerPort
+    /// </summary>
+    public int MqttBrokerPort { get; set; }
+
+    /// <summary>
+    /// UserName
+    /// </summary>
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// Password
+    /// </summary>
+    public string Password { get; set; }
+
+
+    /// <summary>
+    /// DBDownTopic，Rpc返回为{DBDownTopic}/Return
+    /// </summary>
+    public string DBDownTopic { get; set; }
+
+    /// <summary>
+    /// DBUploadTopic，Rpc返回为{DBUploadTopic}/Return
+    /// </summary>
+    public string DBUploadTopic { get; set; }
+
+    /// <summary>
+    /// WriteRpcTopic，Rpc返回为{WriteRpcTopic}/Return
+    /// </summary>
+    public string WriteRpcTopic { get; set; }
+}
+
+
+/// <summary>
+/// 用于Mqtt Json传输，上传/下载配置信息
+/// </summary>
+public class MqttDB
+{
+    /// <summary>
+    /// 标识
+    /// </summary>
+    public string GatewayId { get; set; }
+    /// <summary>
+    /// 采集设备
+    /// </summary>
+    public List<CollectDevice> CollectDevices { get; set; }
+    /// <summary>
+    /// true=>删除全部后增加
+    /// </summary>
+    public bool IsCollectDevicesFullUp { get; set; }
+    /// <summary>
+    /// 上传设备
+    /// </summary>
+    public List<UploadDevice> UploadDevices { get; set; }
+    /// <summary>
+    /// true=>删除全部后增加
+    /// </summary>
+    public bool IsUploadDevicesFullUp { get; set; }
+    /// <summary>
+    /// 变量
+    /// </summary>
+    public List<DeviceVariable> DeviceVariables { get; set; }
+    /// <summary>
+    /// true=>删除全部后增加
+    /// </summary>
+    public bool IsDeviceVariablesFullUp { get; set; }
+    /// <summary>
+    /// 配置项
+    /// </summary>
+    public List<SysConfig> SysConfigs { get; set; }
+}
+
+
+/// <summary>
+/// MqttRpc传入
+/// </summary>
+public class ManageMqttRpcFrom
+{
+    /// <summary>
+    /// 标识
+    /// </summary>
+    public string GatewayId { get; set; }
+    /// <summary>
+    /// 标识
+    /// </summary>
+    public string RpcId { get; set; }
+    /// <summary>
+    /// "WriteInfos":{"test":"1"}
+    /// </summary>
+    public Dictionary<string, string> WriteInfos { get; set; } = new();
+}
+/// <summary>
+/// MqttRpc输出
+/// </summary>
+public class ManageMqttRpcResult
+{
+    /// <summary>
+    /// 标识
+    /// </summary>
+    public string GatewayId { get; set; }
+    /// <summary>
+    /// 标识
+    /// </summary>
+    public string RpcId { get; set; }
+    /// <summary>
+    /// 消息
+    /// </summary>
+    public Dictionary<string, OperResult> Message { get; set; } = new();
+    /// <summary>
+    /// 是否成功
+    /// </summary>
+    public bool Success { get; set; }
+}

framework/ThingsGateway.Application/ManageGateway/ManageGatewayWorker.cs

@@ -0,0 +1,289 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+using Furion;
+using Furion.Logging.Extensions;
+
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+using MQTTnet;
+using MQTTnet.Client;
+using MQTTnet.Server;
+
+using System.Net;
+
+using ThingsGateway.Foundation;
+
+using TouchSocket.Core;
+
+namespace ThingsGateway.Application;
+
+/// <summary>
+/// 设备采集报警后台服务
+/// </summary>
+public class ManageGatewayWorker : BackgroundService
+{
+    private readonly ILogger _logger;
+    private readonly ILogger _manageLogger;
+    private readonly ILogger _clientLogger;
+    /// <inheritdoc cref="ManageGatewayWorker"/>
+    public ManageGatewayWorker(ILoggerFactory loggerFactory)
+    {
+        _logger = loggerFactory.CreateLogger("ManageGatewayWorker");
+        _manageLogger = loggerFactory.CreateLogger("管理网关(mqttBroker)");
+        _clientLogger = loggerFactory.CreateLogger("子网关(mqttClient)");
+    }
+    /// <summary>
+    /// 服务状态
+    /// </summary>
+    public OperResult RealAlarmStatuString { get; set; } = new OperResult("初始化");
+    /// <summary>
+    /// 服务状态
+    /// </summary>
+    public OperResult HisAlarmStatuString { get; set; } = new OperResult("初始化");
+    /// <summary>
+    /// 服务状态
+    /// </summary>
+    public OperResult ReadAlarmStatuString { get; set; } = new OperResult("初始化");
+    private MqttServer _mqttServer;
+    private IMqttClient _mqttClient;
+
+
+    #region worker服务
+    /// <inheritdoc/>
+    public override async Task StartAsync(CancellationToken token)
+    {
+        _logger?.LogInformation("ManageGatewayWorker启动");
+        await RestartAsync();
+        await base.StartAsync(token);
+    }
+
+    /// <inheritdoc/>
+    public override Task StopAsync(CancellationToken token)
+    {
+        _logger?.LogInformation("ManageGatewayWorker停止");
+        return base.StopAsync(token);
+    }
+
+    /// <inheritdoc/>
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        await Task.Delay(5000, stoppingToken);
+
+        while (!stoppingToken.IsCancellationRequested)
+        {
+            try
+            {
+                await Task.Delay(60000, stoppingToken);
+            }
+            catch (TaskCanceledException)
+            {
+
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+    }
+
+
+    #endregion
+
+    #region 核心实现
+
+    /// <summary>
+    /// 全部重启锁
+    /// </summary>
+    private readonly EasyLock restartLock = new();
+
+    /// <summary>
+    /// 重启
+    /// </summary>
+    /// <returns></returns>
+    public async Task RestartAsync()
+    {
+        await StopAsync();
+        await StartAsync();
+    }
+
+    internal async Task StartAsync()
+    {
+        try
+        {
+            //重启操作在未完全之前直接取消
+            if (restartLock.IsWaitting)
+            {
+                return;
+            }
+            await restartLock.WaitAsync();
+
+            await InitAsync();
+
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "启动错误");
+        }
+        finally
+        {
+            restartLock.Release();
+        }
+    }
+    internal async Task StopAsync()
+    {
+        try
+        {
+            //重启操作在未完全之前直接取消
+            if (restartLock.IsWaitting)
+            {
+                return;
+            }
+            await restartLock.WaitAsync();
+            _mqttClient?.SafeDispose();
+            _mqttServer?.SafeDispose();
+            _mqttClient = null;
+            _mqttServer = null;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "停止错误");
+        }
+        finally
+        {
+            restartLock.Release();
+        }
+    }
+
+    /// <summary>
+    /// 初始化
+    /// </summary>
+    private async Task InitAsync()
+    {
+        try
+        {
+            var manageGatewayConfig = App.GetConfig<ManageGatewayConfig>("ManageGatewayConfig");
+            if (manageGatewayConfig?.Enable != true)
+            {
+                HisAlarmStatuString = new OperResult($"已退出：不启用管理功能");
+                return;
+            }
+            else
+            {
+                var mqttFactory = new MqttFactory(new MqttNetLogger(_manageLogger));
+                var mqttServerOptions = mqttFactory.CreateServerOptionsBuilder()
+                    .WithDefaultEndpointBoundIPAddress(string.IsNullOrEmpty(manageGatewayConfig.MqttBrokerIP) ? null : IPAddress.Parse(manageGatewayConfig.MqttBrokerIP))
+                    .WithDefaultEndpointPort(manageGatewayConfig.MqttBrokerPort)
+                    .WithDefaultEndpoint()
+                    .Build();
+                _mqttServer = mqttFactory.CreateMqttServer(mqttServerOptions);
+                if (_mqttServer != null)
+                {
+                    _mqttServer.ValidatingConnectionAsync += MqttServer_ValidatingConnectionAsync;
+                    _mqttServer.InterceptingPublishAsync += MqttServer_InterceptingPublishAsync;
+                    _mqttServer.LoadingRetainedMessageAsync += MqttServer_LoadingRetainedMessageAsync;
+                    _mqttServer.InterceptingSubscriptionAsync += MqttServer_InterceptingSubscriptionAsync; ;
+                    await _mqttServer.StartAsync();
+                }
+
+            }
+        }
+        catch (Exception ex)
+        {
+            _manageLogger.LogError(ex, "初始化失败");
+        }
+
+        try
+        {
+            var clientGatewayConfig = App.GetConfig<ManageGatewayConfig>("ClientGatewayConfig");
+            if (clientGatewayConfig?.Enable != true)
+            {
+                RealAlarmStatuString = new OperResult($"已退出：不启用子网关功能");
+                return;
+            }
+            else
+            {
+                var mqttFactory = new MqttFactory(new MqttNetLogger(_clientLogger));
+                var _mqttClientOptions = mqttFactory.CreateClientOptionsBuilder()
+                   .WithCredentials(clientGatewayConfig.UserName, clientGatewayConfig.Password)//账密
+                   .WithTcpServer(clientGatewayConfig.MqttBrokerIP, clientGatewayConfig.MqttBrokerPort)//服务器
+                   .WithCleanSession(true)
+                   .WithKeepAlivePeriod(TimeSpan.FromSeconds(120.0))
+                   .WithoutThrowOnNonSuccessfulConnectResponse()
+                   .Build();
+                var _mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder()
+                     .WithTopicFilter(
+                         f =>
+                         {
+                             f.WithTopic(clientGatewayConfig.WriteRpcTopic);
+                             f.WithAtMostOnceQoS();
+                         })
+                       .WithTopicFilter(
+                         f =>
+                         {
+                             f.WithTopic(clientGatewayConfig.DBDownTopic);
+                             f.WithAtMostOnceQoS();
+                         })
+                                         .WithTopicFilter(
+                         f =>
+                         {
+                             f.WithTopic(clientGatewayConfig.DBUploadTopic);
+                             f.WithAtMostOnceQoS();
+                         })
+                     .Build();
+                _mqttClient = mqttFactory.CreateMqttClient();
+                _mqttClient.ConnectedAsync += MqttClient_ConnectedAsync;
+                _mqttClient.ApplicationMessageReceivedAsync += MqttClient_ApplicationMessageReceivedAsync;
+
+            }
+        }
+        catch (Exception ex)
+        {
+            _clientLogger.LogError(ex, "初始化失败");
+        }
+
+
+    }
+
+    private Task MqttClient_ApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs args)
+    {
+        throw new NotImplementedException();
+    }
+
+    private Task MqttClient_ConnectedAsync(MqttClientConnectedEventArgs args)
+    {
+        throw new NotImplementedException();
+    }
+
+    private Task MqttServer_InterceptingSubscriptionAsync(InterceptingSubscriptionEventArgs args)
+    {
+        throw new NotImplementedException();
+    }
+
+    private Task MqttServer_LoadingRetainedMessageAsync(LoadingRetainedMessagesEventArgs args)
+    {
+        throw new NotImplementedException();
+    }
+
+    private Task MqttServer_InterceptingPublishAsync(InterceptingPublishEventArgs args)
+    {
+        throw new NotImplementedException();
+    }
+
+    private Task MqttServer_ValidatingConnectionAsync(ValidatingConnectionEventArgs args)
+    {
+        throw new NotImplementedException();
+    }
+    #endregion
+}
+
+

framework/ThingsGateway.Application/ManageGateway/MqttNetLogger.cs

@@ -0,0 +1,50 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+using Microsoft.Extensions.Logging;
+
+using MQTTnet.Diagnostics;
+
+
+namespace ThingsGateway.Application;
+
+internal class MqttNetLogger : IMqttNetLogger
+{
+    readonly ILogger LogMessage;
+    public MqttNetLogger(ILogger logger)
+    {
+        LogMessage = logger;
+    }
+
+    public bool IsEnabled => true;
+    public void Publish(MqttNetLogLevel logLevel, string source, string message, object[] parameters, Exception exception)
+    {
+        switch (logLevel)
+        {
+            case MqttNetLogLevel.Verbose:
+                LogMessage?.Log(LogLevel.Trace, source, message != null ? (parameters != null ? message != null ? (parameters != null ? string.Format(message, parameters) : message) : string.Empty : message) : string.Empty, exception);
+                break;
+
+            case MqttNetLogLevel.Info:
+                LogMessage?.Log(LogLevel.Information, source, message != null ? (parameters != null ? string.Format(message, parameters) : message) : string.Empty, exception);
+                break;
+
+            case MqttNetLogLevel.Warning:
+                LogMessage?.Log(LogLevel.Warning, source, message != null ? (parameters != null ? string.Format(message, parameters) : message) : string.Empty, exception);
+                break;
+
+            case MqttNetLogLevel.Error:
+                LogMessage?.Log(LogLevel.Warning, source, message != null ? (parameters != null ? string.Format(message, parameters) : message) : string.Empty, exception);
+                break;
+        }
+    }
+}

framework/ThingsGateway.Application/Model/DeviceVariableRunTime.cs

@@ -82,18 +82,15 @@ public class DeviceVariableRunTime : DeviceVariable
     /// </summary>
     /// <param name="value"></param>
     /// <param name="dateTime"></param>
-    public OperResult SetValue(object value, DateTime dateTime = default)
+    /// <param name="isOnline"></param>
+    public OperResult SetValue(object value, DateTime dateTime = default, bool isOnline = true)
     {
         try
         {
+            IsOnline = isOnline;
 
-            if (value != null)
+            if (!IsOnline)
             {
-                IsOnline = true;
-            }
-            else
-            {
-                IsOnline = false;
                 RawValue = value;
                 Set(value);
                 return OperResult.CreateSuccessResult();

framework/ThingsGateway.Application/Plugin/CollectBase.cs

@@ -10,6 +10,8 @@
 //------------------------------------------------------------------------------
 #endregion
 
+using Furion;
+
 using Microsoft.Extensions.Logging;
 
 using Newtonsoft.Json.Linq;
@@ -102,9 +104,9 @@ public abstract class CollectBase : DriverBase
                         StopBits = config.StopBits,
                     };
                     FoundataionConfig.SetValue(SerialConfigExtension.SerialProperty, data);
-                    var serialClient = new SerialClient();
-                    (serialClient).Setup(FoundataionConfig);
-                    return OperResult.CreateSuccessResult((object)serialClient);
+                    var serialSession = new SerialsSession();
+                    (serialSession).Setup(FoundataionConfig);
+                    return OperResult.CreateSuccessResult((object)serialSession);
                 case ShareChannelEnum.TcpClientEx:
                     FoundataionConfig.SetRemoteIPHost(new IPHost($"{config.IP}:{config.Port}"));
                     var tcpClient = new TcpClientEx();
@@ -157,7 +159,7 @@ public abstract class CollectBase : DriverBase
             {
                 deviceVariableSourceRead.DeviceVariables.ForEach(it =>
                 {
-                    var operResult = it.SetValue(null);
+                    var operResult = it.SetValue(null, isOnline: false);
                     if (!operResult.IsSuccess)
                     {
                         _logger.LogWarning("变量值更新失败：" + operResult.Message);
@@ -220,6 +222,31 @@ public abstract class CollectBase : DriverBase
         }
     }
 
+    internal override void NewMessage(TouchSocket.Core.LogLevel arg1, object arg2, string arg3, Exception arg4)
+    {
+        if (IsSaveLog)
+        {
+            if (arg3.StartsWith(FoundationConst.LogMessageHeader))
+            {
+                var customLevel = App.GetConfig<Microsoft.Extensions.Logging.LogLevel?>("Logging:LogLevel:BackendLog") ?? Microsoft.Extensions.Logging.LogLevel.Trace;
+                if ((byte)arg1 < (byte)customLevel)
+                {
+                    var logRuntime = new BackendLog
+                    {
+                        LogLevel = (Microsoft.Extensions.Logging.LogLevel)arg1,
+                        LogMessage = arg3,
+                        LogSource = "采集设备:" + CurDevice.Name,
+                        LogTime = SysDateTimeExtensions.CurrentDateTime,
+                        Exception = null,
+                    };
+                    _logQueues.Enqueue(logRuntime);
+                }
+            }
+
+        }
+        base.NewMessage(arg1, arg2, arg3, arg4);
+    }
+
     /// <summary>
     /// 返回全部内容字节数组
     /// <br></br>

framework/ThingsGateway.Application/Plugin/DriverBase.cs

@@ -12,7 +12,10 @@
 
 using Microsoft.Extensions.Logging;
 
+using System.Collections.Concurrent;
+
 using ThingsGateway.Foundation;
+using ThingsGateway.Foundation.Extension.ConcurrentQueue;
 
 using TouchSocket.Core;
 
@@ -40,6 +43,7 @@ public abstract class DriverBase : DisposableObject
         LogMessage = new LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
         LogMessage.AddLogger(new EasyLogger(Log_Out) { LogLevel = TouchSocket.Core.LogLevel.Trace });
         FoundataionConfig.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));
+        Task.Factory.StartNew(LogInsertAsync);
     }
     /// <inheritdoc/>
     protected override void Dispose(bool disposing)
@@ -67,6 +71,12 @@ public abstract class DriverBase : DisposableObject
     /// </summary>
     public bool IsLogOut { get; set; }
 
+
+    /// <summary>
+    /// 是否存储报文
+    /// </summary>
+    public bool IsSaveLog { get; set; }
+
     /// <summary>
     /// 报文信息
     /// </summary>
@@ -82,11 +92,14 @@ public abstract class DriverBase : DisposableObject
     /// </summary>
     /// <returns></returns>
     public abstract bool IsConnected();
-
+    /// <summary>
+    /// 存储日志队列
+    /// </summary>
+    protected ConcurrentQueue<BackendLog> _logQueues = new();
     /// <summary>
     /// 设备报文
     /// </summary>
-    internal void NewMessage(TouchSocket.Core.LogLevel arg1, object arg2, string arg3, Exception arg4)
+    internal virtual void NewMessage(TouchSocket.Core.LogLevel arg1, object arg2, string arg3, Exception arg4)
     {
         if (IsLogOut)
         {
@@ -102,6 +115,27 @@ public abstract class DriverBase : DisposableObject
         }
 
     }
+    private async Task LogInsertAsync()
+    {
+        var db = DbContext.Db.CopyNew();
+        while (!DisposedValue)
+        {
+            if (_logQueues.Count > 0)
+            {
+                try
+                {
+                    var data = _logQueues.ToListWithDequeue();
+                    await db.InsertableWithAttr(data).ExecuteCommandAsync();//入库
+                }
+                catch
+                {
+                }
+
+            }
+
+            await Task.Delay(5000);
+        }
+    }
 
     /// <summary>
     /// 底层日志输出

framework/ThingsGateway.Application/Plugin/UpLoadBase.cs

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

framework/ThingsGateway.Application/Rpc/RpcSingletonService.cs

@@ -19,6 +19,7 @@ using Newtonsoft.Json.Linq;
 
 using System.Collections.Concurrent;
 
+using ThingsGateway.Admin.Core.JsonExtensions;
 using ThingsGateway.Foundation;
 using ThingsGateway.Foundation.Extension.ConcurrentQueue;
 

framework/ThingsGateway.Application/SeedData/DriverPluginSeedData.cs

@@ -22,6 +22,9 @@ public class DriverPluginSeedData : ISqlSugarEntitySeedData<DriverPlugin>
     /// <inheritdoc/>
     public IEnumerable<DriverPlugin> SeedData()
     {
-        return SeedDataUtil.GetSeedData<DriverPlugin>("driver_plugin.json");
+        return SeedDataUtil.GetSeedData<DriverPlugin>("driver_plugin.json")
+            .Concat(SeedDataUtil.GetSeedData<DriverPlugin>("pro_driver_plugin.json"))
+            .Concat(SeedDataUtil.GetSeedData<DriverPlugin>("custom_driver_plugin.json"))
+            ;
     }
 }

framework/ThingsGateway.Application/SeedData/Json/driver_plugin.json

@@ -319,6 +319,39 @@
       "UpdateUserId": null,
       "SortCode": 0,
       "ExtJson": null
+    },
+
+    {
+      "Id": 442505,
+      "FileName": "ThingsGateway.DLT645",
+      "AssembleName": "DLT645_2007",
+      "DriverTypeEnum": "Collect",
+      "FilePath": "Plugins/ThingsGateway.DLT645/ThingsGateway.DLT645.dll",
+      "CreateTime": "2023/8/6 18:22:33",
+      "CreateUser": "superAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": 0,
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
+    },
+    {
+      "Id": 442506,
+      "FileName": "ThingsGateway.DLT645",
+      "AssembleName": "DLT645_2007OverTcp",
+      "DriverTypeEnum": "Collect",
+      "FilePath": "Plugins/ThingsGateway.DLT645/ThingsGateway.DLT645.dll",
+      "CreateTime": "2023/8/6 18:22:33",
+      "CreateUser": "superAdmin",
+      "CreateUserId": 212725263002001,
+      "IsDelete": 0,
+      "UpdateTime": null,
+      "UpdateUser": null,
+      "UpdateUserId": null,
+      "SortCode": 0,
+      "ExtJson": null
     }
   ]
 }

framework/ThingsGateway.Application/SeedData/OpenApiUserSeedData.cs

@@ -22,6 +22,6 @@ public class OpenApiUserSeedData : ISqlSugarEntitySeedData<OpenApiUser>
     /// <inheritdoc/>
     public IEnumerable<OpenApiUser> SeedData()
     {
-        return SeedDataUtil.GetSeedData<OpenApiUser>("gatewayopenapi_user.json");
+        return SeedDataUtil.GetSeedData<OpenApiUser>("gateway_openapi_user.json");
     }
 }

framework/ThingsGateway.Application/Services/GatewayLogs/BackendLogService.cs

@@ -86,6 +86,8 @@ public class BackendLogService : DbRepository<BackendLog>, IBackendLogService
     private ISugarQueryable<BackendLog> GetPage(BackendLogPageInput input)
     {
         var query = Context.Queryable<BackendLog>()
+                           .WhereIF(input.StartTime != null, a => a.LogTime >= input.StartTime.Value.ToLocalTime())
+                           .WhereIF(input.EndTime != null, a => a.LogTime <= input.EndTime.Value.ToLocalTime())
                            .WhereIF(!string.IsNullOrEmpty(input.Source), it => it.LogSource.Contains(input.Source))
                            .WhereIF(!string.IsNullOrEmpty(input.Level), it => it.LogLevel.ToString().Contains(input.Level));
         for (int i = 0; i < input.SortField.Count; i++)

framework/ThingsGateway.Application/Services/GatewayLogs/Dto/LogInput.cs

@@ -19,6 +19,15 @@ namespace ThingsGateway.Application;
 /// </summary>
 public class BackendLogPageInput : BasePageInput
 {
+    /// <summary>
+    /// 开始时间
+    /// </summary>
+    public DateTime? StartTime { get; set; } = DateTime.UtcNow.AddDays(-1);
+    /// <summary>
+    /// 结束时间
+    /// </summary>
+    public DateTime? EndTime { get; set; } = DateTime.UtcNow.AddDays(1);
+
     /// <summary>
     /// 日志源
     /// </summary>
@@ -55,6 +64,14 @@ public class BackendLogInput
 /// </summary>
 public class RpcLogPageInput : BasePageInput
 {
+    /// <summary>
+    /// 开始时间
+    /// </summary>
+    public DateTime? StartTime { get; set; } = DateTime.UtcNow.AddDays(-1);
+    /// <summary>
+    /// 结束时间
+    /// </summary>
+    public DateTime? EndTime { get; set; } = DateTime.UtcNow.AddDays(1);
     /// <summary>
     /// 操作源
     /// </summary>

framework/ThingsGateway.Application/Services/GatewayLogs/RpcLogService.cs

@@ -44,6 +44,8 @@ public class RpcLogService : DbRepository<RpcLog>, IRpcLogService
     private ISugarQueryable<RpcLog> GetPage(RpcLogPageInput input)
     {
         var query = Context.Queryable<RpcLog>()
+                           .WhereIF(input.StartTime != null, a => a.LogTime >= input.StartTime.Value.ToLocalTime())
+                           .WhereIF(input.EndTime != null, a => a.LogTime <= input.EndTime.Value.ToLocalTime())
                            .WhereIF(!string.IsNullOrEmpty(input.Source), it => it.OperateSource.Contains(input.Source))
                            .WhereIF(!string.IsNullOrEmpty(input.Object), it => it.OperateObject.Contains(input.Object))
                            .WhereIF(!string.IsNullOrEmpty(input.Method), it => it.OperateMethod.Contains(input.Method));

framework/ThingsGateway.Application/Services/UploadDevice/UploadDeviceService.cs

@@ -64,10 +64,10 @@ public class UploadDeviceService : DbRepository<UploadDevice>, IUploadDeviceServ
     [OperDesc("复制上传设备")]
     public async Task CopyDevAsync(IEnumerable<UploadDevice> input)
     {
-        var newId = YitIdHelper.NextId();
         var newDevs = input.Adapt<List<UploadDevice>>();
         newDevs.ForEach(a =>
         {
+            var newId = YitIdHelper.NextId();
             a.Id = newId;
             a.Name = "Copy-" + a.Name + "-" + newId.ToString();
         });

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

@@ -129,11 +129,11 @@ public class VariableService : DbRepository<DeviceVariable>, IVariableService
         {
             uploadDevid = _uploadDeviceService.GetIdByName(input.UploadDeviceName);
         }
+
         if (!string.IsNullOrEmpty(input.UploadDeviceName))
         {
-            var pageInfo = await query.ToPagedListAsync(input.Current, input.Size, a => a.VariablePropertys.ContainsKey(uploadDevid ?? 0));//分页
+            var pageInfo = await query.ToPagedListAsync(input.Current, input.Size, a => SqlFunc.JsonLike(a.VariablePropertys, uploadDevid.ToString()));//分页
             return pageInfo;
-
         }
         else
         {

framework/ThingsGateway.Application/Startup.cs

@@ -44,6 +44,7 @@ public class Startup : AppStartup
         services.AddHostedService<AlarmWorker>();
         services.AddHostedService<HistoryValueWorker>();
         services.AddHostedService<UploadDeviceWorker>();
+        services.AddHostedService<ManageGatewayWorker>();
     }
 
 }

framework/ThingsGateway.Application/ThingsGateway.Application.csproj

@@ -6,7 +6,7 @@
 
 	<ItemGroup>
 	  <None Remove="SeedData\Json\driver_plugin.json" />
-	  <None Remove="SeedData\Json\gatewayopenapi_user.json" />
+	  <None Remove="SeedData\Json\gateway_openapi_user.json" />
 	  <None Remove="SeedData\Json\gateway_relation.json" />
 	</ItemGroup>
 
@@ -24,7 +24,7 @@
 	  <Content Include="SeedData\Json\gateway_resource.json">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
-	  <Content Include="SeedData\Json\gatewayopenapi_user.json">
+	  <Content Include="SeedData\Json\gateway_openapi_user.json">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	  <Content Include="SeedData\Json\gateway_relation.json">
@@ -37,7 +37,8 @@
 		<PackageReference Include="Hardware.Info" Version="11.1.1.1" />
 		<PackageReference Include="CS-Script" Version="4.8.1" />
 		<!--CS-Script与Furion冲突，直接安装覆盖版本-->
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.6.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.7.0" />
+		<PackageReference Include="MQTTnet" Version="4.2.1.781" />
 	</ItemGroup>
 
 	<ItemGroup>

framework/ThingsGateway.Application/ThingsGateway.Application.xml

@@ -1397,6 +1397,189 @@
         <member name="M:ThingsGateway.Application.BackendLogDatabaseLoggingWriter.Write(Furion.Logging.LogMessage,System.Boolean)">
             <inheritdoc/>
         </member>
+        <member name="T:ThingsGateway.Application.ManageGatewayConfig">
+            <summary>
+            ManageGatewayConfig
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageGatewayConfig.Enable">
+            <summary>
+            启用
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageGatewayConfig.MqttBrokerIP">
+            <summary>
+            MqttBrokerIP
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageGatewayConfig.MqttBrokerPort">
+            <summary>
+            MqttBrokerPort
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageGatewayConfig.UserName">
+            <summary>
+            UserName
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageGatewayConfig.Password">
+            <summary>
+            Password
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageGatewayConfig.DBDownTopic">
+            <summary>
+            DBDownTopic，Rpc返回为{DBDownTopic}/Return
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageGatewayConfig.DBUploadTopic">
+            <summary>
+            DBUploadTopic，Rpc返回为{DBUploadTopic}/Return
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageGatewayConfig.WriteRpcTopic">
+            <summary>
+            WriteRpcTopic，Rpc返回为{WriteRpcTopic}/Return
+            </summary>
+        </member>
+        <member name="T:ThingsGateway.Application.MqttDB">
+            <summary>
+            用于Mqtt Json传输，上传/下载配置信息
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.MqttDB.GatewayId">
+            <summary>
+            标识
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.MqttDB.CollectDevices">
+            <summary>
+            采集设备
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.MqttDB.IsCollectDevicesFullUp">
+            <summary>
+            true=>删除全部后增加
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.MqttDB.UploadDevices">
+            <summary>
+            上传设备
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.MqttDB.IsUploadDevicesFullUp">
+            <summary>
+            true=>删除全部后增加
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.MqttDB.DeviceVariables">
+            <summary>
+            变量
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.MqttDB.IsDeviceVariablesFullUp">
+            <summary>
+            true=>删除全部后增加
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.MqttDB.SysConfigs">
+            <summary>
+            配置项
+            </summary>
+        </member>
+        <member name="T:ThingsGateway.Application.ManageMqttRpcFrom">
+            <summary>
+            MqttRpc传入
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageMqttRpcFrom.GatewayId">
+            <summary>
+            标识
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageMqttRpcFrom.RpcId">
+            <summary>
+            标识
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageMqttRpcFrom.WriteInfos">
+            <summary>
+            "WriteInfos":{"test":"1"}
+            </summary>
+        </member>
+        <member name="T:ThingsGateway.Application.ManageMqttRpcResult">
+            <summary>
+            MqttRpc输出
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageMqttRpcResult.GatewayId">
+            <summary>
+            标识
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageMqttRpcResult.RpcId">
+            <summary>
+            标识
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageMqttRpcResult.Message">
+            <summary>
+            消息
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageMqttRpcResult.Success">
+            <summary>
+            是否成功
+            </summary>
+        </member>
+        <member name="T:ThingsGateway.Application.ManageGatewayWorker">
+            <summary>
+            设备采集报警后台服务
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Application.ManageGatewayWorker.#ctor(Microsoft.Extensions.Logging.ILoggerFactory)">
+            <inheritdoc cref="T:ThingsGateway.Application.ManageGatewayWorker"/>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageGatewayWorker.RealAlarmStatuString">
+            <summary>
+            服务状态
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageGatewayWorker.HisAlarmStatuString">
+            <summary>
+            服务状态
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.ManageGatewayWorker.ReadAlarmStatuString">
+            <summary>
+            服务状态
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Application.ManageGatewayWorker.StartAsync(System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Application.ManageGatewayWorker.StopAsync(System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="M:ThingsGateway.Application.ManageGatewayWorker.ExecuteAsync(System.Threading.CancellationToken)">
+            <inheritdoc/>
+        </member>
+        <member name="F:ThingsGateway.Application.ManageGatewayWorker.restartLock">
+            <summary>
+            全部重启锁
+            </summary>
+        </member>
+        <member name="M:ThingsGateway.Application.ManageGatewayWorker.RestartAsync">
+            <summary>
+            重启
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:ThingsGateway.Application.ManageGatewayWorker.InitAsync">
+            <summary>
+            初始化
+            </summary>
+        </member>
         <member name="T:ThingsGateway.Application.CollectDeviceRunTime">
             <summary>
             采集设备状态表示
@@ -1601,12 +1784,13 @@
             最近一次值
             </summary>
         </member>
-        <member name="M:ThingsGateway.Application.DeviceVariableRunTime.SetValue(System.Object,System.DateTime)">
+        <member name="M:ThingsGateway.Application.DeviceVariableRunTime.SetValue(System.Object,System.DateTime,System.Boolean)">
             <summary>
             设置变量值与时间，设置为null时只更改质量戳状态
             </summary>
             <param name="value"></param>
             <param name="dateTime"></param>
+            <param name="isOnline"></param>
         </member>
         <member name="P:ThingsGateway.Application.DeviceVariableRunTime.ChangeTime">
             <summary>
@@ -1977,6 +2161,11 @@
             是否输出日志
             </summary>
         </member>
+        <member name="P:ThingsGateway.Application.DriverBase.IsSaveLog">
+            <summary>
+            是否存储报文
+            </summary>
+        </member>
         <member name="P:ThingsGateway.Application.DriverBase.Messages">
             <summary>
             报文信息
@@ -1993,6 +2182,11 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="F:ThingsGateway.Application.DriverBase._logQueues">
+            <summary>
+            存储日志队列
+            </summary>
+        </member>
         <member name="M:ThingsGateway.Application.DriverBase.NewMessage(TouchSocket.Core.LogLevel,System.Object,System.String,System.Exception)">
             <summary>
             设备报文
@@ -2582,6 +2776,16 @@
             运行日志分页DTO
             </summary>
         </member>
+        <member name="P:ThingsGateway.Application.BackendLogPageInput.StartTime">
+            <summary>
+            开始时间
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.BackendLogPageInput.EndTime">
+            <summary>
+            结束时间
+            </summary>
+        </member>
         <member name="P:ThingsGateway.Application.BackendLogPageInput.Source">
             <summary>
             日志源
@@ -2612,6 +2816,16 @@
             RPC日志分页DTO
             </summary>
         </member>
+        <member name="P:ThingsGateway.Application.RpcLogPageInput.StartTime">
+            <summary>
+            开始时间
+            </summary>
+        </member>
+        <member name="P:ThingsGateway.Application.RpcLogPageInput.EndTime">
+            <summary>
+            结束时间
+            </summary>
+        </member>
         <member name="P:ThingsGateway.Application.RpcLogPageInput.Source">
             <summary>
             操作源

framework/ThingsGateway.Application/Workers/Alarm/AlarmWorker.cs

@@ -595,7 +595,7 @@ public class AlarmWorker : BackgroundService
                             var cacheData = await CacheDb.GetCacheData();
                             if (cacheData.Count > 0)
                             {
-                                var data = cacheData.SelectMany(a => a.CacheStr.FromJson<List<HistoryAlarm>>()).ToList();
+                                var data = cacheData.SelectMany(a => a.CacheStr.FromJsonString<List<HistoryAlarm>>()).ToList();
                                 try
                                 {
                                     var count = await sqlSugarClient.Insertable(data).ExecuteCommandAsync(stoppingToken.Token);
@@ -633,7 +633,7 @@ public class AlarmWorker : BackgroundService
                                     var cacheDatas = list.ChunkTrivialBetter(500);
                                     foreach (var a in cacheDatas)
                                     {
-                                        await CacheDb.AddCacheData("", a.ToJson(), 50000);
+                                        await CacheDb.AddCacheData("", a.ToJsonString(), 50000);
                                     }
                                 }
 

framework/ThingsGateway.Application/Workers/Collect/CollectDeviceCore.cs

@@ -206,6 +206,8 @@ public class CollectDeviceCore
     {
         try
         {
+            Device.SetDeviceStatus(SysDateTimeExtensions.CurrentDateTime);
+
             if (_device == null)
             {
                 _logger?.LogError(nameof(CollectDeviceRunTime) + "设备不能为null");
@@ -287,6 +289,8 @@ public class CollectDeviceCore
         {
             bool isUpDevice = Device != device;
             _device = device;
+            Device.SetDeviceStatus(SysDateTimeExtensions.CurrentDateTime);
+
             _logger = ServiceHelper.Services.GetService<ILoggerFactory>().CreateLogger("采集设备:" + _device.Name);
             //更新插件信息
             CreatDriver();
@@ -393,7 +397,7 @@ public class CollectDeviceCore
                         var read = await InvokeMethodAsync(deviceVariableMethodRead, token);
                         if (read.IsSuccess)
                         {
-                            _logger?.LogTrace(_device.Name + "执行方法[" + deviceVariableMethodRead.MethodInfo.Name + "] 成功" + read.Content.ToJson());
+                            _logger?.LogTrace(_device.Name + "执行方法[" + deviceVariableMethodRead.MethodInfo.Name + "] 成功" + read.Content.ToJsonString());
                             deviceMethodsVariableSuccessNum += 1;
                         }
                         else
@@ -433,11 +437,11 @@ public class CollectDeviceCore
                 if (_driver.IsConnected())
                 {
                     //更新设备活动时间
-                    Device.SetDeviceStatus(SysDateTimeExtensions.CurrentDateTime, 0);
+                    Device.SetDeviceStatus(SysDateTimeExtensions.CurrentDateTime, errorCount: 0);
                 }
                 else
                 {
-                    Device.SetDeviceStatus(SysDateTimeExtensions.CurrentDateTime, 999);
+                    Device.SetDeviceStatus(errorCount: 999);
                 }
             }
 
@@ -677,9 +681,9 @@ public class CollectDeviceCore
                     }
                     else
                     {
-                        if (isRead)
+                        if (isRead && !result.IsSuccess)
                         {
-                            var operResult = deviceVariableMethodSource.DeviceVariable.SetValue(null);
+                            var operResult = deviceVariableMethodSource.DeviceVariable.SetValue(null, isOnline: false);
                             if (!operResult.IsSuccess)
                             {
                                 _logger?.LogWarning(operResult.Message, ToString());

framework/ThingsGateway.Application/Workers/Collect/CollectDeviceWorker.cs

@@ -95,10 +95,13 @@ public class CollectDeviceWorker : BackgroundService
             await RemoveAllDeviceThreadAsync();
             //创建全部采集线程
             await CreatAllDeviceThreadsAsync();
-            //开始全部采集线程
-            await StartAllDeviceThreadsAsync();
+
             //开始其他后台服务
             await StartOtherHostService();
+
+            //开始全部采集线程
+            await StartAllDeviceThreadsAsync();
+
         }
         catch (Exception ex)
         {

framework/ThingsGateway.Application/Workers/HistoryValue/HistoryValueWorker.cs

@@ -224,7 +224,7 @@ public class HistoryValueWorker : BackgroundService
 
                             //缓存值
                             var cacheData = await CacheDb.GetCacheData();
-                            var data = cacheData.SelectMany(a => a.CacheStr.FromJson<List<HistoryValue>>()).ToList();
+                            var data = cacheData.SelectMany(a => a.CacheStr.FromJsonString<List<HistoryValue>>()).ToList();
                             try
                             {
                                 var count = await sqlSugarClient.Insertable(data).ExecuteCommandAsync(stoppingToken.Token);
@@ -257,7 +257,7 @@ public class HistoryValueWorker : BackgroundService
                                     var cacheDatas = collecthis.ChunkTrivialBetter(500);
                                     foreach (var a in cacheDatas)
                                     {
-                                        await CacheDb.AddCacheData("", a.ToJson(), 50000);
+                                        await CacheDb.AddCacheData("", a.ToJsonString(), 50000);
                                     }
                                 }
                             }
@@ -284,7 +284,7 @@ public class HistoryValueWorker : BackgroundService
                                     var cacheDatas = changehis.ChunkTrivialBetter(500);
                                     foreach (var a in cacheDatas)
                                     {
-                                        await CacheDb.AddCacheData("", a.ToJson(), 50000);
+                                        await CacheDb.AddCacheData("", a.ToJsonString(), 50000);
                                     }
                                 }
                             }

framework/ThingsGateway.Blazor/Components/ImportExcel.razor

@@ -75,30 +75,33 @@
                                         (item.Value.HasError ? "出现错误" : "验证成功")
                                         )
                                 </MSubheader>
-
-                                <MVirtualScroll Context="item1" Height=300 OverscanCount=2 ItemSize="60" Items="item.Value.Results">
-                                    <ItemContent>
-                                        <MListItem>
-                                            <MListItemAction>
-                                                <MChip Class="ma-2">
-                                                    @(
+                                if (item.Value.HasError)
+                                {
+                                    <MVirtualScroll Context="item1" Height=300 OverscanCount=2 ItemSize="60" Items="item.Value.Results.Where(a=>!a.isSuccess).ToList()">
+                                        <ItemContent>
+                                            <MListItem>
+                                                <MListItemAction>
+                                                    <MChip Class="ma-2">
+                                                        @(
                                             $"第{item1.row}行"
                                             )
-                                                </MChip>
-                                            </MListItemAction>
+                                                    </MChip>
+                                                </MListItemAction>
 
-                                            <MListItemContent>
-                                                <MListItemTitle Class=@((item1.isSuccess?"green--text":"red--text"))>
-                                                    <strong>@item1.resultString</strong>
-                                                </MListItemTitle>
-                                            </MListItemContent>
+                                                <MListItemContent>
+                                                    <MListItemTitle Class=@((item1.isSuccess?"green--text":"red--text"))>
+                                                        <strong>@item1.resultString</strong>
+                                                    </MListItemTitle>
+                                                </MListItemContent>
 
-                                        </MListItem>
+                                            </MListItem>
 
-                                        <MDivider></MDivider>
+                                            <MDivider></MDivider>
+
+                                        </ItemContent>
+                                    </MVirtualScroll>
+                                }
                                 
-                                    </ItemContent>
-                                </MVirtualScroll>
 
                             }
 

framework/ThingsGateway.Blazor/DebugPage/DefalutDebugDriverPage.razor

@@ -33,7 +33,7 @@
             <TcpClientPage @ref=TcpClientPage></TcpClientPage>
             break;
         case ChannelEnum.SerialPort:
-            <SerialClientPage @ref=SerialClientPage></SerialClientPage>
+            <SerialSessionPage @ref=SerialSessionPage></SerialSessionPage>
             break;
         case ChannelEnum.UdpSession:
             <UdpSessionPage @ref=UdpSessionPage></UdpSessionPage>

framework/ThingsGateway.Blazor/DebugPage/DefalutDebugDriverPage.razor.cs

@@ -38,9 +38,9 @@ public enum ChannelEnum
 public partial class DefalutDebugDriverPage : DriverDebugUIBase
 {
     /// <summary>
-    /// SerialClientPage
+    /// SerialSessionPage
     /// </summary>
-    public SerialClientPage SerialClientPage;
+    public SerialSessionPage SerialSessionPage;
     /// <summary>
     /// TcpClientPage
     /// </summary>
@@ -79,7 +79,7 @@ public partial class DefalutDebugDriverPage : DriverDebugUIBase
     {
         Plc?.SafeDispose();
         TcpClientPage?.SafeDispose();
-        SerialClientPage?.SafeDispose();
+        SerialSessionPage?.SafeDispose();
         TcpServerPage?.SafeDispose();
         UdpSessionPage?.SafeDispose();
         base.Dispose();
@@ -94,8 +94,8 @@ public partial class DefalutDebugDriverPage : DriverDebugUIBase
         {
             if (TcpClientPage != null)
                 TcpClientPage.LogAction = LogOut;
-            if (SerialClientPage != null)
-                SerialClientPage.LogAction = LogOut;
+            if (SerialSessionPage != null)
+                SerialSessionPage.LogAction = LogOut;
             if (TcpServerPage != null)
                 TcpServerPage.LogAction = LogOut;
             if (UdpSessionPage != null)

framework/ThingsGateway.Blazor/DebugPage/DriverDebugUIBase.cs

@@ -10,6 +10,8 @@
 //------------------------------------------------------------------------------
 #endregion
 
+using Furion;
+
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Logging;
 using Microsoft.JSInterop;
@@ -65,11 +67,7 @@ public abstract class DriverDebugUIBase : ComponentBase, IDisposable
     /// 写入值
     /// </summary>
     public virtual string WriteValue { get; set; }
-    [Inject]
-    private ICollectDeviceService CollectDeviceService { get; set; }
 
-    [Inject]
-    private IVariableService VariableService { get; set; }
     [Inject]
     private InitTimezone InitTimezone { get; set; }
 
@@ -133,7 +131,7 @@ public abstract class DriverDebugUIBase : ComponentBase, IDisposable
         {
             isDownExport = true;
             StateHasChanged();
-            await CollectDeviceService.AddAsync(data);
+            await App.GetService<CollectDeviceService>().AddAsync(data);
         }
         finally
         {
@@ -151,7 +149,7 @@ public abstract class DriverDebugUIBase : ComponentBase, IDisposable
         {
             isDownExport = true;
             StateHasChanged();
-            await VariableService.AddBatchAsync(data);
+            await App.GetService<VariableService>().AddBatchAsync(data);
         }
         finally
         {
@@ -199,7 +197,7 @@ public abstract class DriverDebugUIBase : ComponentBase, IDisposable
         {
             isDownExport = true;
             StateHasChanged();
-            using var memoryStream = await CollectDeviceService.ExportFileAsync(new List<CollectDevice>() { data });
+            using var memoryStream = await App.GetService<CollectDeviceService>().ExportFileAsync(new List<CollectDevice>() { data });
             memoryStream.Seek(0, SeekOrigin.Begin);
             using var streamRef = new DotNetStreamReference(stream: memoryStream);
             _helper ??= await JS.InvokeAsync<IJSObjectReference>("import", $"/_content/ThingsGateway.Admin.Blazor.Core/js/downloadFileFromStream.js");
@@ -221,7 +219,7 @@ public abstract class DriverDebugUIBase : ComponentBase, IDisposable
         {
             isDownExport = true;
             StateHasChanged();
-            using var memoryStream = await VariableService.ExportFileAsync(data, devName);
+            using var memoryStream = await App.GetService<VariableService>().ExportFileAsync(data, devName);
             memoryStream.Seek(0, SeekOrigin.Begin);
             using var streamRef = new DotNetStreamReference(stream: memoryStream);
             _helper ??= await JS.InvokeAsync<IJSObjectReference>("import", $"/_content/ThingsGateway.Admin.Blazor.Core/js/downloadFileFromStream.js");

framework/ThingsGateway.Blazor/DebugPage/SerialSessionPage.razor.cs

@@ -17,7 +17,7 @@ using TouchSocket.Core;
 namespace ThingsGateway.Blazor;
 
 /// <inheritdoc/>
-public partial class SerialClientPage
+public partial class SerialSessionPage
 {
     /// <summary>
     /// 日志输出
@@ -28,18 +28,18 @@ public partial class SerialClientPage
 
     private readonly SerialProperty serialProperty = new();
 
-    private SerialClient SerialClient { get; set; } = new();
+    private SerialsSession SerialsSession { get; set; } = new();
 
     /// <inheritdoc/>
     public void Dispose()
     {
-        SerialClient.SafeDispose();
+        SerialsSession.SafeDispose();
     }
     /// <summary>
     /// 获取对象
     /// </summary>
     /// <returns></returns>
-    public SerialClient GetSerialClient()
+    public SerialsSession GetSerialSession()
     {
         config?.Dispose();
         config = new TouchSocketConfig();
@@ -48,15 +48,15 @@ public partial class SerialClientPage
         config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));
         config.SetSerialProperty(serialProperty);
         //载入配置
-        SerialClient.Setup(config);
-        return SerialClient;
+        SerialsSession.Setup(config);
+        return SerialsSession;
     }
     private async Task ConnectAsync()
     {
         try
         {
-            SerialClient.Close();
-            await GetSerialClient().ConnectAsync();
+            SerialsSession.Close();
+            await GetSerialSession().ConnectAsync();
         }
         catch (Exception ex)
         {
@@ -68,7 +68,7 @@ public partial class SerialClientPage
     {
         try
         {
-            SerialClient.Close();
+            SerialsSession.Close();
         }
         catch (Exception ex)
         {
@@ -82,8 +82,8 @@ public partial class SerialClientPage
         var LogMessage = new TouchSocket.Core.LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
         LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = TouchSocket.Core.LogLevel.Trace });
         config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));
-        SerialClient = new SerialClient();
-        SerialClient.Setup(config);
+        SerialsSession = new SerialsSession();
+        SerialsSession.Setup(config);
         base.OnInitialized();
     }
 

framework/ThingsGateway.Blazor/DebugPage/TcpClientPage.razor.cs

@@ -82,7 +82,7 @@ public partial class TcpClientPage
         var LogMessage = new TouchSocket.Core.LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
         LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = TouchSocket.Core.LogLevel.Trace });
         config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));
-        config.SetRemoteIPHost(new IPHost(IP + ":" + Port)).SetBufferLength(300);
+        config.SetRemoteIPHost(new IPHost(IP + ":" + Port));
         //载入配置
         TcpClientEx.Setup(config);
         return TcpClientEx;
@@ -96,7 +96,7 @@ public partial class TcpClientPage
         var LogMessage = new TouchSocket.Core.LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
         LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = TouchSocket.Core.LogLevel.Trace });
         config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));
-        config.SetRemoteIPHost(new IPHost(IP + ":" + Port)).SetBufferLength(300);
+        config.SetRemoteIPHost(new IPHost(IP + ":" + Port));
         TcpClientEx = new TcpClientEx();
         TcpClientEx.Setup(config);
         base.OnInitialized();

framework/ThingsGateway.Blazor/DebugPage/TcpServerPage.razor.cs

@@ -72,7 +72,6 @@ public partial class TcpServerPage
         LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = TouchSocket.Core.LogLevel.Trace });
         config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));
         config.SetListenIPHosts(new IPHost[] { new IPHost(ip + ":" + port) });
-        config.SetBufferLength(300);
         //载入配置
         TcpServer.Setup(config);
         return TcpServer;
@@ -88,7 +87,6 @@ public partial class TcpServerPage
         LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = TouchSocket.Core.LogLevel.Trace });
         config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));
         config.SetListenIPHosts(new IPHost[] { new IPHost(ip + ":" + port) });
-        config.SetBufferLength(300);
         TcpServer = new TcpService();
         TcpServer.Setup(config);
         base.OnInitialized();

framework/ThingsGateway.Blazor/DebugPage/UdpSessionPage.razor.cs

@@ -71,7 +71,7 @@ public partial class UdpSessionPage : IDisposable
         var LogMessage = new TouchSocket.Core.LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
         LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = TouchSocket.Core.LogLevel.Trace });
         config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));
-        config.SetRemoteIPHost(new IPHost(ip + ":" + port)).SetBufferLength(300);
+        config.SetRemoteIPHost(new IPHost(ip + ":" + port));
         config.SetBindIPHost(new IPHost(0));
         //载入配置
         UdpSession.Setup(config);
@@ -88,7 +88,7 @@ public partial class UdpSessionPage : IDisposable
         var LogMessage = new TouchSocket.Core.LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
         LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = TouchSocket.Core.LogLevel.Trace });
         config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));
-        config.SetRemoteIPHost(new IPHost(ip + ":" + port)).SetBufferLength(300);
+        config.SetRemoteIPHost(new IPHost(ip + ":" + port));
         config.SetBindIPHost(new IPHost(0));
         UdpSession = new UdpSession();
         UdpSession.Setup(config);

framework/ThingsGateway.Blazor/Page/BackendLogPage.razor

@@ -12,7 +12,7 @@
 
 @page "/gatewaylog/backendlog"
 @using System.Linq.Expressions;
-@inject IBackendLogService BackendLogService
+ 
 @inject UserResoures UserResoures
 @namespace ThingsGateway.Blazor
 @using BlazorComponent;
@@ -32,6 +32,30 @@
                 IsShowDetailButton
                 IsShowQueryButton>
     <SearchTemplate>
+
+
+        <MMenu CloseOnContentClick="false" OffsetY Context="menu">
+            <ActivatorContent>
+                <MTextField Dense Readonly Style="max-width:200px;" HideDetails=@("auto") Class="my-1  mx-2 "
+                            Value="context.StartTime.Value.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset)"
+                @attributes="menu.Attrs" Outlined Label=@context.Description(x => x.StartTime) />
+            </ActivatorContent>
+            <ChildContent>
+                <AppDateTimePicker @bind-Value="context.StartTime"></AppDateTimePicker>
+            </ChildContent>
+        </MMenu>
+
+        <MMenu CloseOnContentClick="false" OffsetY Context="menu">
+            <ActivatorContent>
+                <MTextField Dense Readonly Style="max-width:200px;" HideDetails=@("auto") Class="my-1  mx-2 "
+                            Value="context.EndTime.Value.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset)" Clearable
+                @attributes="menu.Attrs" Outlined Label=@context.Description(x => x.EndTime) />
+            </ActivatorContent>
+            <ChildContent>
+                <AppDateTimePicker @bind-Value="context.EndTime"></AppDateTimePicker>
+            </ChildContent>
+        </MMenu>
+
         <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="my-1  mx-2 " @bind-Value="context.Source"
                         Outlined Label=@context.Description(x => x.Source) />
         <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="my-1  mx-2 " @bind-Value="context.Level"

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

@@ -10,6 +10,8 @@
 //------------------------------------------------------------------------------
 #endregion
 
+using Furion;
+
 using Mapster;
 
 using Microsoft.AspNetCore.Components;
@@ -30,12 +32,14 @@ public partial class BackendLogPage
     [Inject]
     AjaxService AjaxService { get; set; }
 
+    [Inject]
+    InitTimezone InitTimezone { get; set; }
     private async Task ClearClickAsync()
     {
         var confirm = await PopupService.OpenConfirmDialogAsync("删除", "确定 ?");
         if (confirm)
         {
-            await BackendLogService.DeleteAsync();
+            await App.GetService<BackendLogService>().DeleteAsync();
             await _datatable?.QueryClickAsync();
         }
     }
@@ -54,7 +58,7 @@ public partial class BackendLogPage
 
     private async Task<SqlSugarPagedList<BackendLog>> QueryCallAsync(BackendLogPageInput input)
     {
-        var data = await BackendLogService.PageAsync(input);
+        var data = await App.GetService<BackendLogService>().PageAsync(input);
         return data;
     }
 }

framework/ThingsGateway.Blazor/Page/CollectDevicePage.razor

@@ -14,6 +14,7 @@
 @namespace ThingsGateway.Blazor
 @using System.Linq.Expressions;
 @using BlazorComponent;
+@using Furion;
 @using Mapster;
 @using Masa.Blazor
 @using Masa.Blazor.Presets;
@@ -22,11 +23,11 @@
 @using ThingsGateway.Admin.Blazor.Core;
 @using ThingsGateway.Admin.Blazor;
 @using ThingsGateway.Application;
-@inject ICollectDeviceService CollectDeviceService
+ 
 @attribute [Authorize]
 @inherits BaseComponentBase
 @inject UserResoures UserResoures
-@inject IDriverPluginService DriverPluginService
+ 
 @layout MainLayout
 @using ThingsGateway.Admin.Core;
 @if (IsMobile)
@@ -172,7 +173,7 @@ else
                 case nameof(context.Item.PluginId):
                         <span title=@context.Value>
                         @(
-                            DriverPluginService.GetNameById(context.Item.PluginId)
+                            App.GetService<DriverPluginService>().GetNameById(context.Item.PluginId)
                                 )
                     </span>
                     break;

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

@@ -57,8 +57,8 @@ public partial class CollectDevicePage
 
     private async Task AddCallAsync(CollectDeviceAddInput input)
     {
-        await CollectDeviceService.AddAsync(input);
-        CollectDevices = CollectDeviceService.GetCacheList();
+        await App.GetService<CollectDeviceService>().AddAsync(input);
+        CollectDevices = App.GetService<CollectDeviceService>().GetCacheList();
         _deviceGroups = CollectDevices?.Select(a => a.DeviceGroup)?.Where(a => a != null).Distinct()?.ToList();
         await MainLayout.StateHasChangedAsync();
     }
@@ -71,7 +71,7 @@ public partial class CollectDevicePage
             return;
         }
 
-        await CollectDeviceService.CopyDevAndVarAsync(data);
+        await App.GetService<CollectDeviceService>().CopyDevAndVarAsync(data);
         await DatatableQueryAsync();
         await PopupService.EnqueueSnackbarAsync("复制成功", AlertTypes.Success);
         await MainLayout.StateHasChangedAsync();
@@ -85,7 +85,7 @@ public partial class CollectDevicePage
             return;
         }
 
-        await CollectDeviceService.CopyDevAsync(data);
+        await App.GetService<CollectDeviceService>().CopyDevAsync(data);
         await DatatableQueryAsync();
         await PopupService.EnqueueSnackbarAsync("复制成功", AlertTypes.Success);
         await MainLayout.StateHasChangedAsync();
@@ -98,15 +98,15 @@ public partial class CollectDevicePage
 
     private async Task DeleteCallAsync(IEnumerable<CollectDevice> input)
     {
-        await CollectDeviceService.DeleteAsync(input.Select(a => a.Id).ToArray());
-        CollectDevices = CollectDeviceService.GetCacheList();
+        await App.GetService<CollectDeviceService>().DeleteAsync(input.Select(a => a.Id).ToArray());
+        CollectDevices = App.GetService<CollectDeviceService>().GetCacheList();
         _deviceGroups = CollectDevices?.Select(a => a.DeviceGroup)?.Where(a => a != null).Distinct()?.ToList();
         await MainLayout.StateHasChangedAsync();
     }
 
     Task<Dictionary<string, ImportPreviewOutputBase>> DeviceImportAsync(IBrowserFile file)
     {
-        return CollectDeviceService.PreviewAsync(file);
+        return App.GetService<CollectDeviceService>().PreviewAsync(file);
     }
     async Task DownExportAsync(CollectDevicePageInput input = null)
     {
@@ -133,8 +133,8 @@ public partial class CollectDevicePage
 
     private async Task EditCallAsync(CollectDeviceEditInput input)
     {
-        await CollectDeviceService.EditAsync(input);
-        CollectDevices = CollectDeviceService.GetCacheList();
+        await App.GetService<CollectDeviceService>().EditAsync(input);
+        CollectDevices = App.GetService<CollectDeviceService>().GetCacheList();
         _deviceGroups = CollectDevices?.Select(a => a.DeviceGroup)?.Where(a => a != null).Distinct()?.ToList();
         await MainLayout.StateHasChangedAsync();
     }
@@ -147,13 +147,13 @@ public partial class CollectDevicePage
 
     private async Task<SqlSugarPagedList<CollectDevice>> QueryCallAsync(CollectDevicePageInput input)
     {
-        var data = await CollectDeviceService.PageAsync(input);
+        var data = await App.GetService<CollectDeviceService>().PageAsync(input);
         return data;
     }
 
     async Task SaveDeviceImportAsync(Dictionary<string, ImportPreviewOutputBase> data)
     {
-        await CollectDeviceService.ImportAsync(data);
+        await App.GetService<CollectDeviceService>().ImportAsync(data);
         await DatatableQueryAsync();
         ImportExcel.IsShowImport = false;
         await MainLayout.StateHasChangedAsync();

framework/ThingsGateway.Blazor/Page/ConfigPage.razor

@@ -20,7 +20,6 @@
 @using ThingsGateway.Admin.Core;
 @using ThingsGateway.Application;
  
-@inject IConfigService ConfigService
 @namespace ThingsGateway.Blazor
 @attribute [Authorize]
 @inject UserResoures UserResoures

framework/ThingsGateway.Blazor/Page/ConfigPage.razor.cs

@@ -56,7 +56,7 @@ public partial class ConfigPage
         var confirm = await PopupService.OpenConfirmDialogAsync("确认", "保存配置后将重启报警服务，是否确定?");
         if (confirm)
         {
-            await ConfigService.EditBatchAsync(_alarmConfig);
+            await App.GetService<ConfigService>().EditBatchAsync(_alarmConfig);
             await AlarmHostService.RestartAsync();
             await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
         }
@@ -67,7 +67,7 @@ public partial class ConfigPage
         var confirm = await PopupService.OpenConfirmDialogAsync("确认", "保存配置后将重启历史服务，是否确定?");
         if (confirm)
         {
-            await ConfigService.EditBatchAsync(_hisConfig);
+            await App.GetService<ConfigService>().EditBatchAsync(_hisConfig);
             await HistoryValueHostService.RestartAsync();
             await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success);
         }

framework/ThingsGateway.Blazor/Page/DeviceStatusPage.razor

@@ -24,14 +24,12 @@
 @using ThingsGateway.Admin.Core;
 @using ThingsGateway.Application;
 @using TouchSocket.Core;
-@inject ICollectDeviceService CollectDeviceService
-@inject IUploadDeviceService UploadDeviceService
  
 @attribute [Authorize]
 @inherits BaseComponentBase
 @inject UserResoures UserResoures
 @inject NavigationManager NavigationManager
-@inject IDriverPluginService DriverPluginService
+ 
 @layout MainLayout
 <MSheet Style="overflow:auto">
 
@@ -253,6 +251,23 @@
                                             </ChildContent>
                                         </MTooltip>
 
+                                        <MTooltip Bottom Context="tip">
+                                            <ActivatorContent>
+                                                <MButton Disabled=@(!UserResoures.IsHasButtonWithRole("gatewaydevicepause")) Class="mx-2" @attributes="@tip.Attrs" Dark Fab Small
+                                                         OnClick=@(()=>
+                                                 {
+                                                 if(collectDeviceInfoItem.Driver!=null)
+                                                 collectDeviceInfoItem.Driver.IsSaveLog=! collectDeviceInfoItem.Driver.IsSaveLog;
+                                                 }
+                                                 )>
+                                                    <MIcon>@((collectDeviceInfoItem.Driver?.IsSaveLog == true) ? "mdi-pause" : "mdi-play")</MIcon>
+                                                    </MButton>
+                                                </ActivatorContent>
+                                                <ChildContent>
+                                                    <span>@((collectDeviceInfoItem.Driver?.IsSaveLog != true) ? "存入数据库，注意若交互频繁，可能导致数据库太大" : "不存入数据库")</span>
+                                            </ChildContent>
+                                        </MTooltip>
+
                                         <MTooltip Bottom Context="tip">
                                             <ActivatorContent>
                                                 <MButton Loading=isDownExport Disabled=@(!UserResoures.IsHasButtonWithRole("gatewaydevicepause")) Class="mx-2" @attributes="@tip.Attrs" Dark Fab Small
@@ -407,6 +422,10 @@
                                                     <span>@(item.Device?.KeepRun == true ? "暂停" : "运行")</span>
                                             </ChildContent>
                                         </MTooltip>
+
+
+
+
                                         <MTooltip Bottom Context="tip">
                                             <ActivatorContent>
                                                 <MButton Disabled=@(!UserResoures.IsHasButtonWithRole("gatewaydevicerestart")) Class="mx-2" @attributes="@tip.Attrs" Dark Fab Small Loading=isRestart OnClick=@(()=> UpRestartAsync(item.DeviceId))>
@@ -495,7 +514,22 @@
                                                     <span>@((!pauseMessage) ? "暂停日志" : "运行日志")</span>
                                             </ChildContent>
                                         </MTooltip>
-
+                                        <MTooltip Bottom Context="tip">
+                                            <ActivatorContent>
+                                                <MButton Disabled=@(!UserResoures.IsHasButtonWithRole("gatewaydevicepause")) Class="mx-2" @attributes="@tip.Attrs" Dark Fab Small
+                                                         OnClick=@(()=>
+                                                 {
+                                                 if(uploadDeviceInfoItem.Driver!=null)
+                                                 uploadDeviceInfoItem.Driver.IsSaveLog=! uploadDeviceInfoItem.Driver.IsSaveLog;
+                                                 }
+                                                 )>
+                                                    <MIcon>@((uploadDeviceInfoItem.Driver?.IsSaveLog == true) ? "mdi-pause" : "mdi-play")</MIcon>
+                                                    </MButton>
+                                                </ActivatorContent>
+                                                <ChildContent>
+                                                    <span>@((uploadDeviceInfoItem.Driver?.IsSaveLog != true) ? "存入数据库，注意若交互频繁，可能导致数据库太大" : "不存入数据库")</span>
+                                            </ChildContent>
+                                        </MTooltip>
                                         <MTooltip Bottom Context="tip">
                                             <ActivatorContent>
                                                 <MButton Loading=isDownExport Disabled=@(!UserResoures.IsHasButtonWithRole("gatewaydevicepause")) Class="mx-2" @attributes="@tip.Attrs" Dark Fab Small

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

@@ -73,8 +73,6 @@ public partial class DeviceStatusPage : IDisposable
 
     UploadDeviceWorker UploadDeviceHostService { get; set; }
     StringNumber Uppanel { get; set; }
-    [Inject]
-    IVariableService VariableService { get; set; }
 
     /// <summary>
     /// <inheritdoc/>

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

@@ -53,8 +53,6 @@ public partial class DeviceVariablePage
     [Inject]
     AjaxService AjaxService { get; set; }
 
-    [Inject]
-    IVariableService VariableService { get; set; }
 
     /// <summary>
     /// <inheritdoc/>
@@ -70,7 +68,7 @@ public partial class DeviceVariablePage
     }
     private async Task AddCallAsync(DeviceVariableAddInput input)
     {
-        await VariableService.AddAsync(input);
+        await App.GetService<VariableService>().AddAsync(input);
     }
 
     private async Task ClearAsync()
@@ -78,7 +76,7 @@ public partial class DeviceVariablePage
         var confirm = await PopupService.OpenConfirmDialogAsync("确认", "清空?");
         if (confirm)
         {
-            await VariableService.ClearDeviceVariableAsync();
+            await App.GetService<VariableService>().ClearDeviceVariableAsync();
         }
         await DatatableQueryAsync();
 
@@ -91,7 +89,7 @@ public partial class DeviceVariablePage
 
     private async Task DeleteCallAsync(IEnumerable<DeviceVariable> input)
     {
-        await VariableService.DeleteAsync(input.Select(a => a.Id).ToArray());
+        await App.GetService<VariableService>().DeleteAsync(input.Select(a => a.Id).ToArray());
     }
 
     void DeviceChanged(long devId)
@@ -107,7 +105,7 @@ public partial class DeviceVariablePage
 
     Task<Dictionary<string, ImportPreviewOutputBase>> DeviceImportAsync(IBrowserFile file)
     {
-        return VariableService.PreviewAsync(file);
+        return App.GetService<VariableService>().PreviewAsync(file);
     }
     async Task DownExportAsync(DeviceVariablePageInput input = null)
     {
@@ -116,7 +114,7 @@ public partial class DeviceVariablePage
 
     private async Task EditCallAsync(VariableEditInput input)
     {
-        await VariableService.EditAsync(input);
+        await App.GetService<VariableService>().EditAsync(input);
     }
 
     List<DependencyProperty> GetDriverProperties(long driverId, List<DependencyProperty> dependencyProperties)
@@ -126,13 +124,13 @@ public partial class DeviceVariablePage
 
     private async Task<SqlSugarPagedList<DeviceVariable>> QueryCallAsync(DeviceVariablePageInput input)
     {
-        var data = await VariableService.PageAsync(input);
+        var data = await App.GetService<VariableService>().PageAsync(input);
         return data;
     }
 
     async Task SaveDeviceImportAsync(Dictionary<string, ImportPreviewOutputBase> data)
     {
-        await VariableService.ImportAsync(data);
+        await App.GetService<VariableService>().ImportAsync(data);
         await DatatableQueryAsync();
         ImportExcel.IsShowImport = false;
     }

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

@@ -52,8 +52,6 @@ public partial class DeviceVariableRunTimePage
     GlobalDeviceData GlobalDeviceData { get; set; }
 
     VariablePageInput SearchModel { get; set; } = new();
-    [Inject]
-    IUploadDeviceService UploadDeviceService { get; set; }
 
     CollectDeviceWorker CollectDeviceHostService { get; set; }
     [Inject]
@@ -121,7 +119,7 @@ public partial class DeviceVariableRunTimePage
 
     private Task<SqlSugarPagedList<DeviceVariableRunTime>> QueryCallAsync(VariablePageInput input)
     {
-        var uploadDevId = UploadDeviceService.GetIdByName(input.UploadDeviceName);
+        var uploadDevId = App.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/ThingsGateway.Blazor/Page/DriverDebugPage.razor

@@ -24,11 +24,11 @@
 @using ThingsGateway.Admin.Blazor;
 @using ThingsGateway.Admin.Core;
 @using ThingsGateway.Application;
-@inject IVariableService VariableService
+ 
 @attribute [Authorize]
 @inherits BaseComponentBase
 @inject UserResoures UserResoures
-@inject ICollectDeviceService CollectDeviceService
+ 
 @layout MainLayout
 
 <MRow NoGutters>

framework/ThingsGateway.Blazor/Page/DriverDebugPage.razor.cs

@@ -12,6 +12,8 @@
 
 using BlazorComponent;
 
+using Furion;
+
 using Masa.Blazor;
 
 using Microsoft.AspNetCore.Components;
@@ -33,14 +35,13 @@ public partial class DriverDebugPage
     List<DriverPluginCategory> DriverPlugins;
     bool IsShowTreeView = true;
     PluginDebugUIInput SearchModel { get; set; } = new();
-    [Inject]
-    IDriverPluginService DriverPluginService { get; set; }
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
     protected override void OnInitialized()
     {
-        DriverPlugins = DriverPluginService.GetDriverPluginChildrenList();
+        DriverPlugins = App.GetService<DriverPluginService>().GetDriverPluginChildrenList();
         base.OnInitialized();
     }
 

framework/ThingsGateway.Blazor/Page/DriverPluginPage.razor

@@ -21,7 +21,7 @@
 @using ThingsGateway.Admin.Blazor;
 @using ThingsGateway.Admin.Core;
 @using ThingsGateway.Application;
-@inject IDriverPluginService DriverPluginService
+ 
 @attribute [Authorize]
 @inherits BaseComponentBase
 @inject UserResoures UserResoures

framework/ThingsGateway.Blazor/Page/DriverPluginPage.razor.cs

@@ -10,6 +10,8 @@
 //------------------------------------------------------------------------------
 #endregion
 
+using Furion;
+
 using ThingsGateway.Admin.Blazor.Core;
 using ThingsGateway.Admin.Core;
 using ThingsGateway.Application;
@@ -25,12 +27,12 @@ public partial class DriverPluginPage
 
     private async Task AddCallAsync(DriverPluginAddInput input)
     {
-        await DriverPluginService.AddAsync(input);
+        await App.GetService<DriverPluginService>().AddAsync(input);
     }
 
     private async Task<SqlSugarPagedList<DriverPlugin>> QueryCallAsync(DriverPluginPageInput input)
     {
-        var data = await DriverPluginService.PageAsync(input);
+        var data = await App.GetService<DriverPluginService>().PageAsync(input);
         return data;
     }
 }

framework/ThingsGateway.Blazor/Page/MemoryVariablePage.razor.cs

@@ -45,11 +45,6 @@ public partial class MemoryVariablePage
     [Inject]
     AjaxService AjaxService { get; set; }
 
-    [Inject]
-    InitTimezone InitTimezone { get; set; }
-
-    [Inject]
-    IVariableService VariableService { get; set; }
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -70,7 +65,7 @@ public partial class MemoryVariablePage
 
     private async Task AddCallAsync(MemoryVariableAddInput input)
     {
-        await VariableService.AddAsync(input);
+        await App.GetService<VariableService>().AddAsync(input);
     }
 
     private async Task ClearAsync()
@@ -78,7 +73,7 @@ public partial class MemoryVariablePage
         var confirm = await PopupService.OpenConfirmDialogAsync("确认", "清空?");
         if (confirm)
         {
-            await VariableService.ClearMemoryVariableAsync();
+            await App.GetService<VariableService>().ClearMemoryVariableAsync();
         }
         await DatatableQueryAsync();
 
@@ -91,12 +86,12 @@ public partial class MemoryVariablePage
 
     private async Task DeleteCallAsync(IEnumerable<DeviceVariable> input)
     {
-        await VariableService.DeleteAsync(input.Select(a => a.Id).ToArray());
+        await App.GetService<VariableService>().DeleteAsync(input.Select(a => a.Id).ToArray());
     }
 
     Task<Dictionary<string, ImportPreviewOutputBase>> DeviceImportAsync(IBrowserFile file)
     {
-        return VariableService.MemoryVariablePreviewAsync(file);
+        return App.GetService<VariableService>().MemoryVariablePreviewAsync(file);
     }
 
 
@@ -108,7 +103,7 @@ public partial class MemoryVariablePage
 
     private async Task EditCallAsync(MemoryVariableAddInput input)
     {
-        await VariableService.EditAsync(input);
+        await App.GetService<VariableService>().EditAsync(input);
     }
 
 
@@ -119,12 +114,12 @@ public partial class MemoryVariablePage
 
     private async Task<SqlSugarPagedList<DeviceVariable>> QueryCallAsync(MemoryVariablePageInput input)
     {
-        var data = await VariableService.PageAsync(input);
+        var data = await App.GetService<VariableService>().PageAsync(input);
         return data;
     }
     async Task SaveDeviceImportAsync(Dictionary<string, ImportPreviewOutputBase> data)
     {
-        await VariableService.ImportAsync(data);
+        await App.GetService<VariableService>().ImportAsync(data);
         await DatatableQueryAsync();
         ImportExcel.IsShowImport = false;
     }

framework/ThingsGateway.Blazor/Page/RpcLogPage.razor

@@ -18,7 +18,7 @@
 @using ThingsGateway.Admin.Blazor;
 @using ThingsGateway.Admin.Core;
 @using ThingsGateway.Application;
-@inject IRpcLogService RpcLogService
+ 
 @namespace ThingsGateway.Blazor
 @attribute [Authorize]
 @inject UserResoures UserResoures
@@ -30,6 +30,31 @@
               QueryCallAsync="QueryCallAsync"
                 IsShowDetailButton IsShowQueryButton>
     <SearchTemplate>
+
+        
+        <MMenu CloseOnContentClick="false" OffsetY Context="menu">
+            <ActivatorContent>
+                <MTextField Dense Readonly Style="max-width:200px;" HideDetails=@("auto") Class="my-1  mx-2 "
+                            Value="context.StartTime.Value.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset)"
+                @attributes="menu.Attrs" Outlined Label=@context.Description(x => x.StartTime) />
+            </ActivatorContent>
+            <ChildContent>
+                <AppDateTimePicker @bind-Value="context.StartTime"></AppDateTimePicker>
+            </ChildContent>
+        </MMenu>
+
+        <MMenu CloseOnContentClick="false" OffsetY Context="menu">
+            <ActivatorContent>
+                <MTextField Dense Readonly Style="max-width:200px;" HideDetails=@("auto") Class="my-1  mx-2 "
+                            Value="context.EndTime.Value.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset)" Clearable
+                @attributes="menu.Attrs" Outlined Label=@context.Description(x => x.EndTime) />
+            </ActivatorContent>
+            <ChildContent>
+                <AppDateTimePicker @bind-Value="context.EndTime"></AppDateTimePicker>
+            </ChildContent>
+        </MMenu>
+
+
         <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="my-1  mx-2 " @bind-Value="context.Source"
                         Outlined Label=@context.Description(x => x.Source) />
         <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="my-1  mx-2 " @bind-Value="context.Object"

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

@@ -10,6 +10,8 @@
 //------------------------------------------------------------------------------
 #endregion
 
+using Furion;
+
 using Mapster;
 
 using Microsoft.AspNetCore.Components;
@@ -29,13 +31,14 @@ public partial class RpcLogPage
     [Inject]
     AjaxService AjaxService { get; set; }
 
-
+    [Inject]
+    InitTimezone InitTimezone { get; set; }
     private async Task ClearClickAsync()
     {
         var confirm = await PopupService.OpenConfirmDialogAsync("删除", "确定 ?");
         if (confirm)
         {
-            await RpcLogService.DeleteAsync();
+            await App.GetService<RpcLogService>().DeleteAsync();
             await _datatable?.QueryClickAsync();
         }
     }
@@ -53,7 +56,7 @@ public partial class RpcLogPage
 
     private async Task<SqlSugarPagedList<RpcLog>> QueryCallAsync(RpcLogPageInput input)
     {
-        var data = await RpcLogService.PageAsync(input);
+        var data = await App.GetService<RpcLogService>().PageAsync(input);
         return data;
     }
 }

framework/ThingsGateway.Blazor/Page/UploadDevicePage.razor

@@ -14,6 +14,7 @@
 @namespace ThingsGateway.Blazor
 @using System.Linq.Expressions;
 @using BlazorComponent;
+@using Furion;
 @using Mapster;
 @using Masa.Blazor.Presets;
 @using System.IO;
@@ -149,7 +150,7 @@ else
                 case nameof(context.Item.PluginId):
                     <span title=@context.Value>
                         @(
-                            DriverPluginService.GetNameById(context.Item.PluginId)
+                            App.GetService<DriverPluginService>().GetNameById(context.Item.PluginId)
                                 )
                     </span>
                     break;