10.7.55

更新解决方案
2025-06-13 09:14:22 +08:00 · 2025-06-13 09:06:42 +08:00
60 changed files with 28 additions and 112 deletions
--- a/src/Admin/ThingsGateway.Admin.Application/Startup.cs
+++ b/src/Admin/ThingsGateway.Admin.Application/Startup.cs
@@ -10,7 +10,6 @@

 using BootstrapBlazor.Components;

-using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;

 using System.Reflection;
--- a/src/Admin/ThingsGateway.DB/Startup.cs
+++ b/src/Admin/ThingsGateway.DB/Startup.cs
@@ -10,7 +10,6 @@

 using BootstrapBlazor.Components;

-using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;

 using ThingsGateway.SqlSugar;
--- a/src/Admin/ThingsGateway.Razor/Startup.cs
+++ b/src/Admin/ThingsGateway.Razor/Startup.cs
@@ -8,7 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;

 using ThingsGateway.NewLife;
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>

 	<PropertyGroup>
-		<PluginVersion>10.7.54</PluginVersion>
-		<ProPluginVersion>10.7.54</ProPluginVersion>
+		<PluginVersion>10.7.55</PluginVersion>
+		<ProPluginVersion>10.7.55</ProPluginVersion>
 		<AuthenticationVersion>2.6.0</AuthenticationVersion>
 		<NET8Version>8.0.17</NET8Version>
 		<NET9Version>9.0.6</NET9Version>
--- a/src/Gateway/ThingsGateway.Blazor.Diagrams.Core/Core/Diagram.cs
+++ b/src/Gateway/ThingsGateway.Blazor.Diagrams.Core/Core/Diagram.cs
@@ -1,6 +1,4 @@
-using System.Runtime.CompilerServices;
-
-using ThingsGateway.Blazor.Diagrams.Core.Behaviors;
+using ThingsGateway.Blazor.Diagrams.Core.Behaviors;
 using ThingsGateway.Blazor.Diagrams.Core.Controls;
 using ThingsGateway.Blazor.Diagrams.Core.Events;
 using ThingsGateway.Blazor.Diagrams.Core.Extensions;
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Entity/Rules.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Entity/Rules.cs
@@ -4,7 +4,6 @@ using Newtonsoft.Json.Linq;

 using System.ComponentModel.DataAnnotations;

-using ThingsGateway.Admin.Application;
 using ThingsGateway.Blazor.Diagrams.Core.Geometry;
 using ThingsGateway.Blazor.Diagrams.Core.Models;
 using ThingsGateway.SqlSugar;
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Helps/RuleHelpers.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Helps/RuleHelpers.cs
@@ -19,8 +19,6 @@ using ThingsGateway.Blazor.Diagrams.Core.Anchors;
 using ThingsGateway.Blazor.Diagrams.Core.Geometry;
 using ThingsGateway.Blazor.Diagrams.Core.Models;

-using static Dm.net.buffer.ByteArrayBuffer;
-
 namespace ThingsGateway.Gateway.Application;

 public static class RuleHelpers
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Actuator/ExecuteScriptNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Actuator/ExecuteScriptNode.cs
@@ -1,8 +1,6 @@


 using ThingsGateway.Blazor.Diagrams.Core.Geometry;
-using ThingsGateway.Blazor.Diagrams.Core.Models;
-using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife;

 using TouchSocket.Core;
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Actuator/VariableRpcNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Actuator/VariableRpcNode.cs
@@ -1,7 +1,5 @@

 using ThingsGateway.Blazor.Diagrams.Core.Geometry;
-using ThingsGateway.Blazor.Diagrams.Core.Models;
-using ThingsGateway.Gateway.Application;

 using TouchSocket.Core;

--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Expression/ConditionNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Expression/ConditionNode.cs
@@ -1,7 +1,5 @@

 using ThingsGateway.Blazor.Diagrams.Core.Geometry;
-using ThingsGateway.Blazor.Diagrams.Core.Models;
-using ThingsGateway.Gateway.Application;
 using ThingsGateway.Gateway.Application.Extensions;
 using ThingsGateway.NewLife.Extension;

--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Expression/DelayNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Expression/DelayNode.cs
@@ -1,6 +1,5 @@

 using ThingsGateway.Blazor.Diagrams.Core.Geometry;
-using ThingsGateway.Blazor.Diagrams.Core.Models;

 using TouchSocket.Core;

--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/NumberNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/NumberNode.cs
@@ -1,5 +1,4 @@
 using ThingsGateway.Blazor.Diagrams.Core.Geometry;
-using ThingsGateway.Blazor.Diagrams.Core.Models;
 namespace ThingsGateway.Gateway.Application;

 public abstract class NumberNode : PlaceholderNode
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/TextNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/TextNode.cs
@@ -1,6 +1,5 @@

 using ThingsGateway.Blazor.Diagrams.Core.Geometry;
-using ThingsGateway.Blazor.Diagrams.Core.Models;
 namespace ThingsGateway.Gateway.Application;

 public abstract class TextNode : PlaceholderNode
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/AlarmChangedTriggerNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/AlarmChangedTriggerNode.cs
@@ -1,11 +1,7 @@

-using ThingsGateway.Blazor.Diagrams.Core.Geometry;
-using ThingsGateway.Blazor.Diagrams.Core.Models;
-
 using System.Collections.Concurrent;

-using ThingsGateway.Foundation;
-using ThingsGateway.Gateway.Application;
+using ThingsGateway.Blazor.Diagrams.Core.Geometry;

 using TouchSocket.Core;

--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/DeviceChangedTriggerNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/DeviceChangedTriggerNode.cs
@@ -1,10 +1,7 @@

-using ThingsGateway.Blazor.Diagrams.Core.Geometry;
-using ThingsGateway.Blazor.Diagrams.Core.Models;
 using System.Collections.Concurrent;

-using ThingsGateway.Foundation;
-using ThingsGateway.Gateway.Application;
+using ThingsGateway.Blazor.Diagrams.Core.Geometry;

 using TouchSocket.Core;

--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/TimeIntervalTriggerNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/TimeIntervalTriggerNode.cs
@@ -1,7 +1,5 @@

 using ThingsGateway.Blazor.Diagrams.Core.Geometry;
-using ThingsGateway.Blazor.Diagrams.Core.Models;
-using ThingsGateway.Foundation;
 using ThingsGateway.NewLife;

 using TouchSocket.Core;
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/ValueChangedTriggerNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/Trigger/ValueChangedTriggerNode.cs
@@ -1,10 +1,7 @@

-using ThingsGateway.Blazor.Diagrams.Core.Geometry;
-using ThingsGateway.Blazor.Diagrams.Core.Models;
 using System.Collections.Concurrent;

-using ThingsGateway.Foundation;
-using ThingsGateway.Gateway.Application;
+using ThingsGateway.Blazor.Diagrams.Core.Geometry;

 using TouchSocket.Core;

--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/VariableNode.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Node/VariableNode.cs
@@ -1,6 +1,5 @@

 using ThingsGateway.Blazor.Diagrams.Core.Geometry;
-using ThingsGateway.Blazor.Diagrams.Core.Models;
 namespace ThingsGateway.Gateway.Application;

 public abstract class VariableNode : TextNode
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Services/DefaultDiagram.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Services/DefaultDiagram.cs
@@ -1,6 +1,4 @@
 using ThingsGateway.Blazor.Diagrams.Core;
-using ThingsGateway.Blazor.Diagrams.Core.Controls.Default;
-using ThingsGateway.Blazor.Diagrams.Core.Models.Base;
 using ThingsGateway.Blazor.Diagrams.Core.Options;

 namespace ThingsGateway.Gateway.Application;
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Services/RulesEngineHostedService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Services/RulesEngineHostedService.cs
@@ -16,7 +16,6 @@ using Microsoft.Extensions.Logging;

 using ThingsGateway.Blazor.Diagrams.Core;
 using ThingsGateway.Blazor.Diagrams.Core.Models;
-using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife;

 using TouchSocket.Core;
--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Services/RulesService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/RulesEngine/Services/RulesService.cs
@@ -12,9 +12,7 @@ using BootstrapBlazor.Components;

 using System.Data;

-using ThingsGateway.Admin.Application;
 using ThingsGateway.Extension.Generic;
-using ThingsGateway.Gateway.Application;
 using ThingsGateway.SqlSugar;

 using TouchSocket.Core;
--- a/src/Gateway/ThingsGateway.Gateway.Application/Startup.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Startup.cs
@@ -10,7 +10,6 @@

 using Mapster;

-using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;

@@ -18,7 +17,6 @@ using System.Reflection;

 using ThingsGateway.Authentication;
 using ThingsGateway.Management;
-using ThingsGateway.Gateway.Application;
 using ThingsGateway.SqlSugar;
 using ThingsGateway.Upgrade;

--- a/src/Gateway/ThingsGateway.Gateway.Razor/Components/QuickActions.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Components/QuickActions.razor.cs
@@ -9,7 +9,6 @@
 //------------------------------------------------------------------------------

 using ThingsGateway.Admin.Razor;
-using ThingsGateway.Gateway.Application;

 namespace ThingsGateway.Gateway.Razor;

--- a/src/Gateway/ThingsGateway.Gateway.Razor/Components/TcpServiceComponent.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Components/TcpServiceComponent.razor.cs
@@ -12,7 +12,6 @@ using Mapster;

 using ThingsGateway.Admin.Application;
 using ThingsGateway.Foundation;
-using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife.Json.Extension;

 using TouchSocket.Core;
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Components/USheet.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Components/USheet.razor.cs
@@ -8,7 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife.Json.Extension;

 namespace ThingsGateway.Gateway.Razor;
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelCopyComponent.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelCopyComponent.razor.cs
@@ -11,7 +11,6 @@
 using Mapster;

 using ThingsGateway.Admin.Application;
-using ThingsGateway.Gateway.Application;

 namespace ThingsGateway.Gateway.Razor;

--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelEditComponent.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelEditComponent.razor.cs
@@ -10,8 +10,6 @@

 using Microsoft.AspNetCore.Components.Forms;

-using ThingsGateway.Gateway.Application;
-
 namespace ThingsGateway.Gateway.Razor;

 public partial class ChannelEditComponent
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelRuntimeInfo.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelRuntimeInfo.razor.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using ThingsGateway.Gateway.Application;
-
 namespace ThingsGateway.Gateway.Razor;

 public partial class ChannelRuntimeInfo
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelRuntimeInfo1.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelRuntimeInfo1.razor.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using ThingsGateway.Gateway.Application;
-
 namespace ThingsGateway.Gateway.Razor;

 public partial class ChannelRuntimeInfo1 : IDisposable
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelTable.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Channel/ChannelTable.razor.cs
@@ -14,7 +14,6 @@ using Microsoft.AspNetCore.Components.Forms;

 using ThingsGateway.Admin.Application;
 using ThingsGateway.Extension.Generic;
-using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife.Extension;

 namespace ThingsGateway.Gateway.Razor;
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceHelpers.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceHelpers.cs
@@ -1,6 +1,4 @@
 using Mapster;
-
-using ThingsGateway.Gateway.Application;
 //------------------------------------------------------------------------------
 //  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
 //  此代码版权（除特别声明外的代码）归作者本人Diego所有
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTree.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTree.razor.cs
@@ -14,7 +14,6 @@ using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Web;

 using ThingsGateway.Admin.Razor;
-using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.NewLife.Json.Extension;
 using ThingsGateway.SqlSugar;
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTreeItem.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTreeItem.cs
@@ -8,11 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-
-
-
-using ThingsGateway.Gateway.Application;
-
 namespace ThingsGateway.Gateway.Razor;
 public enum ChannelDevicePluginTypeEnum
 {
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceCopyComponent.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceCopyComponent.razor.cs
@@ -11,7 +11,6 @@
 using Mapster;

 using ThingsGateway.Admin.Application;
-using ThingsGateway.Gateway.Application;

 namespace ThingsGateway.Gateway.Razor;

--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceEditComponent.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceEditComponent.razor.cs
@@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Web;

 using ThingsGateway.Extension.Generic;
-using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife.Extension;

 namespace ThingsGateway.Gateway.Razor;
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceRuntimeInfo.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceRuntimeInfo.razor.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using ThingsGateway.Gateway.Application;
-
 namespace ThingsGateway.Gateway.Razor;

 public partial class DeviceRuntimeInfo
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceRuntimeInfo1.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceRuntimeInfo1.razor.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using ThingsGateway.Gateway.Application;
-
 namespace ThingsGateway.Gateway.Razor;

 public partial class DeviceRuntimeInfo1 : IDisposable
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceTable.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceTable.razor.cs
@@ -14,7 +14,6 @@ using Microsoft.AspNetCore.Components.Forms;

 using ThingsGateway.Admin.Application;
 using ThingsGateway.Extension.Generic;
-using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife.Extension;

 namespace ThingsGateway.Gateway.Razor;
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/PropertyComponent.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/PropertyComponent.razor.cs
@@ -8,8 +8,6 @@
 // QQ群：605534569
 // ------------------------------------------------------------------------------

-using ThingsGateway.Gateway.Application;
-
 namespace ThingsGateway.Gateway.Razor;
 public partial class PropertyComponent : IPropertyUIBase
 {
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/ScriptCheck.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/ScriptCheck.razor.cs
@@ -8,7 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife.Json.Extension;

 namespace ThingsGateway.Gateway.Razor;
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/GatewayInfo.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/GatewayInfo.razor.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using ThingsGateway.Gateway.Application;
-
 namespace ThingsGateway.Gateway.Razor;

 public partial class GatewayInfo
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/GatewayMonitorPage.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/GatewayMonitorPage.razor.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using ThingsGateway.Gateway.Application;
-
 namespace ThingsGateway.Gateway.Razor;

 public partial class GatewayMonitorPage
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableCopyComponent.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableCopyComponent.razor.cs
@@ -11,7 +11,6 @@
 using Mapster;

 using ThingsGateway.Admin.Application;
-using ThingsGateway.Gateway.Application;

 namespace ThingsGateway.Gateway.Razor;

--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableEditComponent.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableEditComponent.razor.cs
@@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Components.Web;

 using System.Collections.Concurrent;

-using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.NewLife.Json.Extension;

--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRuntimeInfo.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRuntimeInfo.razor.cs
@@ -15,7 +15,6 @@ using Microsoft.Extensions.Options;

 using ThingsGateway.Admin.Application;
 using ThingsGateway.Extension.Generic;
-using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.NewLife.Json.Extension;

--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/LogPage/BackendLogPage.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/LogPage/BackendLogPage.razor.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using ThingsGateway.Gateway.Application;
-
 namespace ThingsGateway.Gateway.Razor;

 public partial class BackendLogPage
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/LogPage/RpcLogPage.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/LogPage/RpcLogPage.razor.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using ThingsGateway.Gateway.Application;
-
 namespace ThingsGateway.Gateway.Razor;

 public partial class RpcLogPage
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/PluginPage/PluginDebugPage.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/PluginPage/PluginDebugPage.razor.cs
@@ -10,7 +10,6 @@

 using Mapster;

-using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife.Extension;

 namespace ThingsGateway.Gateway.Razor;
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/PluginPage/PluginPage.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/PluginPage/PluginPage.razor.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using ThingsGateway.Gateway.Application;
-
 namespace ThingsGateway.Gateway.Razor;

 public partial class PluginPage
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/PluginPage/SavePlugin.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/PluginPage/SavePlugin.razor.cs
@@ -10,8 +10,6 @@

 using Microsoft.AspNetCore.Components.Forms;

-using ThingsGateway.Gateway.Application;
-
 namespace ThingsGateway.Gateway.Razor;

 public partial class SavePlugin
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RealAlarmPage/RealAlarmPage.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RealAlarmPage/RealAlarmPage.razor.cs
@@ -9,7 +9,6 @@
 //------------------------------------------------------------------------------

 using ThingsGateway.Admin.Application;
-using ThingsGateway.Gateway.Application;

 namespace ThingsGateway.Gateway.Razor;

--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RulesEngine/Component/VariableWidget.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RulesEngine/Component/VariableWidget.razor.cs
@@ -9,7 +9,6 @@
 // ------------------------------------------------------------------------------

 using ThingsGateway.Extension.Generic;
-using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife.Extension;

 namespace ThingsGateway.Gateway.Razor
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Util/ResourceUtil.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Util/ResourceUtil.cs
@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using ThingsGateway.Gateway.Application;
-
 namespace ThingsGateway.Gateway.Razor;

 [ThingsGateway.DependencyInjection.SuppressSniffer]
--- a/src/Gateway/ThingsGateway.Gateway.Razor/_Imports.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/_Imports.razor.cs
@@ -15,8 +15,7 @@ global using Microsoft.Extensions.Localization;

 global using System.Diagnostics.CodeAnalysis;

+global using ThingsGateway.Gateway.Application;
 global using ThingsGateway.Razor;

-global using ThingsGateway.Gateway.Application;
-
 [assembly: SuppressMessage("Reliability", "CA2007", Justification = "<挂起>", Scope = "module")]
--- a/src/Plugin/ThingsGateway.Debug.Razor/Startup.cs
+++ b/src/Plugin/ThingsGateway.Debug.Razor/Startup.cs
@@ -8,7 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;

 namespace ThingsGateway.Debug;
--- a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDbProducer.other.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDbProducer.other.cs
@@ -174,17 +174,17 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<

                if (!_initRealData)
                {
-                        Stopwatch stopwatch = new();
-                        stopwatch.Start();
-                        var ids = (await db.Queryable<SQLRealValue>().AS(_driverPropertys.ReadDBTableName).Select(a => a.Id).ToListAsync(cancellationToken).ConfigureAwait(false)).ToHashSet();
-                        var InsertData = IdVariableRuntimes.Where(a => !ids.Contains(a.Key)).Select(a=>a.Value).Adapt<List<SQLRealValue>>();
-                        var result = await db.Fastest<SQLRealValue>().AS(_driverPropertys.ReadDBTableName).PageSize(100000).BulkCopyAsync(InsertData).ConfigureAwait(false);
-                        _initRealData = true;
-                        stopwatch.Stop();
-                        if (result > 0)
-                        {
-                            LogMessage?.Trace($"RealTable Insert Data Count：{result}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
-                        }
+                    Stopwatch stopwatch = new();
+                    stopwatch.Start();
+                    var ids = (await db.Queryable<SQLRealValue>().AS(_driverPropertys.ReadDBTableName).Select(a => a.Id).ToListAsync(cancellationToken).ConfigureAwait(false)).ToHashSet();
+                    var InsertData = IdVariableRuntimes.Where(a => !ids.Contains(a.Key)).Select(a => a.Value).Adapt<List<SQLRealValue>>();
+                    var result = await db.Fastest<SQLRealValue>().AS(_driverPropertys.ReadDBTableName).PageSize(100000).BulkCopyAsync(InsertData).ConfigureAwait(false);
+                    _initRealData = true;
+                    stopwatch.Stop();
+                    if (result > 0)
+                    {
+                        LogMessage?.Trace($"RealTable Insert Data Count：{result}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
+                    }
                }
                {
                    if (datas?.Count > 0)
--- a/src/ThingsGateway.Photino/ThingsGateway.Photino.csproj
+++ b/src/ThingsGateway.Photino/ThingsGateway.Photino.csproj
@@ -14,8 +14,6 @@
 	<!--发布版-->
 	<Import Project="..\ThingsGateway.Server\targets\Gateway.targets" Condition=" '$(SolutionName)' == 'ThingsGatewayRelease' " />
 	<Import Project="..\ThingsGateway.Server\targets\Admin.targets" Condition=" '$(SolutionName)' == 'ThingsGatewayRelease' " />
-	<!--nuget包解压复制文件，上下文动态加载，网关管理和网关冗余-->
-	<Import Project="..\ThingsGateway.Server\targets\GatewayOther.targets" Condition=" '$(SolutionName)' == 'ThingsGatewayRelease' " />
 	
 	<ItemGroup Condition=" '$(SolutionName)' == 'ThingsGatewayRelease' ">
 		<PackageReference Include="ThingsGateway.Photino.Blazor" Version="$(Version)" />
--- a/src/ThingsGateway.sln
+++ b/src/ThingsGateway.sln
@@ -101,6 +101,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.SqlSugar", "A
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.DB", "Admin\ThingsGateway.DB\ThingsGateway.DB.csproj", "{317B8159-28B1-49B1-1884-97D1BBDED982}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.Blazor.Diagrams.Core", "Gateway\ThingsGateway.Blazor.Diagrams.Core\ThingsGateway.Blazor.Diagrams.Core.csproj", "{AFC0BEE4-E682-BCED-F631-99707421015A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -267,6 +269,10 @@ Global
 		{317B8159-28B1-49B1-1884-97D1BBDED982}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{317B8159-28B1-49B1-1884-97D1BBDED982}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{317B8159-28B1-49B1-1884-97D1BBDED982}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFC0BEE4-E682-BCED-F631-99707421015A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFC0BEE4-E682-BCED-F631-99707421015A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFC0BEE4-E682-BCED-F631-99707421015A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFC0BEE4-E682-BCED-F631-99707421015A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -310,10 +316,11 @@ Global
 		{438B86D4-0CAE-DCC3-E952-90CE77BB8661} = {36510D70-161F-4241-B8D0-781E21032816}
 		{544EDA9F-978F-84F7-48BF-FA5888F52FFB} = {72C65578-92A5-4E99-9779-27835B12B32F}
 		{317B8159-28B1-49B1-1884-97D1BBDED982} = {72C65578-92A5-4E99-9779-27835B12B32F}
+		{AFC0BEE4-E682-BCED-F631-99707421015A} = {5948EA23-4B42-4C22-A266-2E0AE5FA575F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		RESX_Rules = {"EnabledRules":[]}
-		RESX_NeutralResourcesLanguage = zh-Hans
 		SolutionGuid = {199B1B96-4F56-4828-9531-813BA02DB282}
+		RESX_NeutralResourcesLanguage = zh-Hans
+		RESX_Rules = {"EnabledRules":[]}
 	EndGlobalSection
 EndGlobal
--- a/src/Upgrade/ThingsGateway.Upgrade/Startup.cs
+++ b/src/Upgrade/ThingsGateway.Upgrade/Startup.cs
@@ -8,7 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------

-using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
--- a/src/Version.props
+++ b/src/Version.props
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-    <Version>10.7.54</Version>
+    <Version>10.7.55</Version>
  </PropertyGroup>

  <ItemGroup>
Author	SHA1	Message	Date
Diego	1c7f8b5cab	10.7.55	2025-06-13 09:14:22 +08:00
Diego	b7ff9ffca2	更新解决方案	2025-06-13 09:06:42 +08:00