更新发布版3.0.0.28

framework/Demo/Directory.Build.props

@@ -1,8 +1,7 @@
 <Project>
 	<PropertyGroup>
-		<Version>3.0.0.27</Version>
+		<Version>3.0.0.28</Version>
 		<LangVersion>latest</LangVersion>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<Authors>Diego</Authors>
 		<Product>ThingsGateway</Product>
 		<Copyright>© 2023-present Diego</Copyright>

framework/Demo/ThingsGateway.Foundation.Demo.Photino/ThingsGateway.Foundation.Demo.Photino.csproj

@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<ApplicationIcon>favicon.ico</ApplicationIcon>
 	</PropertyGroup>
 
@@ -28,5 +29,18 @@
 	</ItemGroup>
 
 
+	<ItemGroup>
+	  <Content Update="wwwroot\favicon.ico">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\favicon.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\index.html">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	</ItemGroup>
+
+
 
 </Project>

framework/Demo/ThingsGateway.Foundation.Demo.Rcl/ThingsGateway.Foundation.Demo.Rcl.csproj

@@ -1,18 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
+	<PropertyGroup>
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+	</PropertyGroup>
+
 	<PropertyGroup Condition="'$(SolutionName)'=='ThingsGateway - Pro'">
 		<DefineConstants>Pro</DefineConstants>
 	</PropertyGroup>
-	<ItemGroup Condition="'$(SolutionName)'=='ThingsGateway - Pro'">
-
-
+	<ItemGroup Condition="'$(SolutionName)'=='ThingsGateway - Pro' AND '$(Configuration)' == 'Debug'">
 
 		<Compile Include="..\..\PluginPro\ThingsGateway.Plugin.Melsec\Page\QnA3E_BinaryDebugPage.razor.cs" Link="Pages\Melsec\QnA3E_BinaryDebugPage.razor.cs" />
 		<Content Include="..\..\PluginPro\ThingsGateway.Plugin.Melsec\Page\QnA3E_BinaryDebugPage.razor" Link="Pages\Melsec\QnA3E_BinaryDebugPage.razor" />
 		<ProjectReference Include="..\..\FoundationPro\ThingsGateway.Foundation.Adapter.Melsec\ThingsGateway.Foundation.Adapter.Melsec.csproj" />
 
-		
-		
+
 		<Compile Include="..\..\PluginPro\ThingsGateway.Plugin.AllenBradleyCip\Page\AllenBradleyCipTcpDebugPage.razor.cs" Link="Pages\ABCIP\AllenBradleyCipTcpDebugPage.razor.cs" />
 		<Content Include="..\..\PluginPro\ThingsGateway.Plugin.AllenBradleyCip\Page\AllenBradleyCipTcpDebugPage.razor" Link="Pages\ABCIP\AllenBradleyCipTcpDebugPage.razor" />
 		<ProjectReference Include="..\..\FoundationPro\ThingsGateway.Foundation.Adapter.AllenBradleyCip\ThingsGateway.Foundation.Adapter.AllenBradleyCip.csproj" />
@@ -45,24 +46,26 @@
 		<Content Include="..\..\PluginProAF2021\ThingsGateway.Plugin.HZW_QTJC_01\Page\HZW_QTJC_01SerialOverTcpDebugPage.razor" Link="Pages\HZW_QTJC_01\HZW_QTJC_01SerialOverTcpDebugPage.razor" />
 		<ProjectReference Include="..\..\PluginProAF2021\ThingsGateway.Foundation.Adapter.HZW_QTJC_01\ThingsGateway.Foundation.Adapter.HZW_QTJC_01.csproj" />
 
-		<Compile Include="..\..\PluginProAF2021\ThingsGateway.Plugin.LQTCP\Page\LQTCPDebugPage.razor.cs" Link="Pages\LQTCP\LQTCPDebugPage.razor.cs" />
-		<Content Include="..\..\PluginProAF2021\ThingsGateway.Plugin.LQTCP\Page\LQTCPDebugPage.razor" Link="Pages\LQTCP\LQTCPDebugPage.razor" />
-		<ProjectReference Include="..\..\PluginProAF2021\ThingsGateway.Foundation.Adapter.LQTCP\ThingsGateway.Foundation.Adapter.LQTCP.csproj" />
-
-
-		<Compile Include="..\..\PluginProAF2021\ThingsGateway.Plugin.KELID2008\Page\KELID2008DebugPage.razor.cs" Link="Pages\KELID2008\KELID2008DebugPage.razor.cs" />
-		<Compile Include="..\..\PluginProAF2021\ThingsGateway.Plugin.KELID2008\Page\KELID2008OverTcpDebugPage.razor.cs" Link="Pages\KELID2008\KELID2008OverTcpDebugPage.razor.cs" />
-		<Content Include="..\..\PluginProAF2021\ThingsGateway.Plugin.KELID2008\Page\KELID2008DebugPage.razor" Link="Pages\KELID2008\KELID2008DebugPage.razor" />
-		<Content Include="..\..\PluginProAF2021\ThingsGateway.Plugin.KELID2008\Page\KELID2008OverTcpDebugPage.razor" Link="Pages\KELID2008\KELID2008OverTcpDebugPage.razor" />
-		<ProjectReference Include="..\..\PluginProAF2021\ThingsGateway.Foundation.Adapter.KELID2008\ThingsGateway.Foundation.Adapter.KELID2008.csproj" />
 
 
 	</ItemGroup>
 
+	<ItemGroup Condition="'$(SolutionName)'=='ThingsGateway - Pro' ">
+		<Compile Include="..\..\PluginProAF2021\ThingsGateway.Plugin.LQTCP\Page\LQTCPDebugPage.razor.cs" Link="Pages\LQTCP\LQTCPDebugPage.razor.cs" />
+	<Content Include="..\..\PluginProAF2021\ThingsGateway.Plugin.LQTCP\Page\LQTCPDebugPage.razor" Link="Pages\LQTCP\LQTCPDebugPage.razor" />
+	<ProjectReference Include="..\..\PluginProAF2021\ThingsGateway.Foundation.Adapter.LQTCP\ThingsGateway.Foundation.Adapter.LQTCP.csproj" />
+
+
+	<Compile Include="..\..\PluginProAF2021\ThingsGateway.Plugin.KELID2008\Page\KELID2008DebugPage.razor.cs" Link="Pages\KELID2008\KELID2008DebugPage.razor.cs" />
+	<Compile Include="..\..\PluginProAF2021\ThingsGateway.Plugin.KELID2008\Page\KELID2008OverTcpDebugPage.razor.cs" Link="Pages\KELID2008\KELID2008OverTcpDebugPage.razor.cs" />
+	<Content Include="..\..\PluginProAF2021\ThingsGateway.Plugin.KELID2008\Page\KELID2008DebugPage.razor" Link="Pages\KELID2008\KELID2008DebugPage.razor" />
+	<Content Include="..\..\PluginProAF2021\ThingsGateway.Plugin.KELID2008\Page\KELID2008OverTcpDebugPage.razor" Link="Pages\KELID2008\KELID2008OverTcpDebugPage.razor" />
+	<ProjectReference Include="..\..\PluginProAF2021\ThingsGateway.Foundation.Adapter.KELID2008\ThingsGateway.Foundation.Adapter.KELID2008.csproj" />
+	</ItemGroup>
 
 
 	<ItemGroup>
-		<Compile Include="..\..\Plugin\ThingsGateway.Plugin.DLT645\Page\DLT645_2007DebugPage.razor.cs" Link="Pages\DLT645\DLT645_2007DebugPage.razor.cs" />
+
 		<Compile Include="..\..\Plugin\ThingsGateway.Plugin.Mqtt\MqttRpcNameVaueWithId.cs" Link="Pages\Mqtt\MqttRpcNameVaueWithId.cs" />
 		<Compile Include="..\..\Plugin\ThingsGateway.Plugin.Mqtt\Page\MqttClientDebugPage.razor.cs" Link="Pages\Mqtt\MqttClientDebugPage.razor.cs" />
 		<Compile Include="..\..\Plugin\ThingsGateway.Plugin.Mqtt\Page\MqttClientPage.razor.cs" Link="Pages\Mqtt\MqttClientPage.razor.cs" />
@@ -70,11 +73,18 @@
 		<Compile Include="..\..\Plugin\ThingsGateway.Plugin.Mqtt\RpcClass\MqttRpcClientExtensions.cs" Link="Pages\Mqtt\MqttRpcClientExtensions.cs" />
 		<Compile Include="..\..\Plugin\ThingsGateway.Plugin.Mqtt\RpcClass\MqttRpcTopicPair.cs" Link="Pages\Mqtt\MqttRpcTopicPair.cs" />
 		<Compile Include="..\..\Web\ThingsGateway.Gateway.Application\Workers\ManageGateway\MqttLoggerExtensions.cs" Link="Pages\Mqtt\MqttLoggerExtensions.cs" />
+		<Content Include="..\..\Plugin\ThingsGateway.Plugin.Mqtt\Page\MqttClientDebugPage.razor" Link="Pages\Mqtt\MqttClientDebugPage.razor" />
+		<Content Include="..\..\Plugin\ThingsGateway.Plugin.Mqtt\Page\MqttClientPage.razor" Link="Pages\Mqtt\MqttClientPage.razor" />
+		<PackageReference Include="MQTTnet" Version="4.3.1.873" />
+		
+		
+		<Compile Include="..\..\Plugin\ThingsGateway.Plugin.DLT645\Page\DLT645_2007DebugPage.razor.cs" Link="Pages\DLT645\DLT645_2007DebugPage.razor.cs" />
+
 		<Content Include="..\..\Plugin\ThingsGateway.Plugin.DLT645\Page\DLT645_2007DebugPage.razor" Link="Pages\DLT645\DLT645_2007DebugPage.razor" />
 		<Compile Include="..\..\Plugin\ThingsGateway.Plugin.DLT645\Page\DLT645_2007OverTcpDebugPage.razor.cs" Link="Pages\DLT645\DLT645_2007OverTcpDebugPage.razor.cs" />
 		<Content Include="..\..\Plugin\ThingsGateway.Plugin.DLT645\Page\DLT645_2007OverTcpDebugPage.razor" Link="Pages\DLT645\DLT645_2007OverTcpDebugPage.razor" />
 
-		
+
 		<Compile Include="..\..\Plugin\ThingsGateway.Plugin.Modbus\Page\ModbusRtuDebugPage.razor.cs" Link="Pages\Modbus\ModbusRtuDebugPage.razor.cs" />
 		<Content Include="..\..\Plugin\ThingsGateway.Plugin.Modbus\Page\ModbusRtuDebugPage.razor" Link="Pages\Modbus\ModbusRtuDebugPage.razor" />
 		<Compile Include="..\..\Plugin\ThingsGateway.Plugin.Modbus\Page\ModbusRtuOverTcpDebugPage.razor.cs" Link="Pages\Modbus\ModbusRtuOverTcpDebugPage.razor.cs" />
@@ -143,20 +153,7 @@
 	</ItemGroup>
 
 
-	<ItemGroup>
-		<Content Update="wwwroot\**">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
-
-
-
-	<ItemGroup>
-	  <Content Include="..\..\Plugin\ThingsGateway.Plugin.Mqtt\Page\MqttClientDebugPage.razor" Link="Pages\Mqtt\MqttClientDebugPage.razor" />
-	  <Content Include="..\..\Plugin\ThingsGateway.Plugin.Mqtt\Page\MqttClientPage.razor" Link="Pages\Mqtt\MqttClientPage.razor" />
-		<PackageReference Include="MQTTnet" Version="4.3.1.873" />
-	</ItemGroup>
-
+ 
 
 
 </Project>

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

@@ -51,7 +51,7 @@ namespace ThingsGateway.Foundation.Demo.Winform
             // 
             blazorWebView1.Dock = DockStyle.Fill;
             blazorWebView1.Location = new Point(0, 0);
-            blazorWebView1.Margin = new Padding(4, 4, 4, 4);
+            blazorWebView1.Margin = new Padding(4);
             blazorWebView1.Name = "blazorWebView1";
             blazorWebView1.Size = new Size(1029, 529);
             blazorWebView1.TabIndex = 0;
@@ -64,9 +64,10 @@ namespace ThingsGateway.Foundation.Demo.Winform
             ClientSize = new Size(1029, 529);
             Controls.Add(blazorWebView1);
             Icon = (Icon)resources.GetObject("$this.Icon");
-            Margin = new Padding(4, 4, 4, 4);
+            Margin = new Padding(4);
             Name = "MainFrom";
             Text = "Form1";
+            FormClosed += MainFrom_FormClosed;
             ResumeLayout(false);
         }
 

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

@@ -32,5 +32,10 @@ namespace ThingsGateway.Foundation.Demo.Winform
             this.Text = "ThingsGateway.Foundation.Demo";
             blazorWebView1.RootComponents.Add<ThingsGateway.Foundation.Demo.App>("#app");
         }
+
+        private void MainFrom_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            Application.Exit();
+        }
     }
 }

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

@@ -21,7 +21,7 @@
 
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="7.0.86" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="7.0.96" />
 	</ItemGroup>
 
 
@@ -30,5 +30,18 @@
 	</ItemGroup>
 
 
+	<ItemGroup>
+	  <Content Update="wwwroot\favicon.ico">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\favicon.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\index.html">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	</ItemGroup>
+
+
 
 </Project>

framework/Demo/ThingsGateway.Foundation.Demo.Winform/wwwroot/index.html

@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
+    <title>ThingsGateway.Foundation.Demo</title>
+    <base href="/" />
+
+    <link rel="icon" href="favicon.ico" type="image/x-icon">
+
+
+    <link href="_content/Masa.Blazor/css/masa-blazor.min.css" rel="stylesheet" />
+    <link href="_content/ThingsGateway.Components/css/materialdesign/v7.1.96/css/materialdesignicons.min.css" rel="stylesheet">
+    <link href="_content/ThingsGateway.Components/css/material/icons.css" rel="stylesheet">
+    <link href="_content/ThingsGateway.Components/css/fontawesome/v6.4.0/css/all.min.css" rel="stylesheet">
+    <link href="_content/ThingsGateway.Components/style/custom.css" rel="stylesheet">
+    <link href="_content/ThingsGateway.Components/prism/prism-material-dark-for-masa.css" rel="stylesheet">
+    <link href="_content/ThingsGateway.Components/prism/prism-line-highlight.min.css" rel="stylesheet">
+</head>
+
+<body>
+    <div id="app"></div>
+
+    <div id="blazor-error-ui">
+        <span>
+            <environment include="Staging,Production">
+                An error has occurred. This application may no longer respond until reloaded.
+            </environment>
+            <environment include="Development">
+                An unhandled exception has occurred. See browser dev tools for details.
+            </environment>
+        </span>
+        <a href="" class="reload">Reload</a>
+        <a class="dismiss">🗙</a>
+    </div>
+
+    <script src="_framework/blazor.webview.js" autostart="true"></script>
+    <script src="_content/ThingsGateway.Components/prism/prism.min.js"></script>
+    <script src="_content/BlazorComponent/js/blazor-component.js"></script>
+</body>
+</html>

framework/Foundation/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>3.0.0.27</Version>
+		<Version>3.0.0.28</Version>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<LangVersion>latest</LangVersion>
 		<TargetFrameworks>net45;netstandard2.0;net6.0;net7.0</TargetFrameworks>

framework/Foundation/ThingsGateway.Foundation.Adapter.OPCUA/OPCUAClient/OPCUAClient.cs

@@ -47,7 +47,7 @@ public class OPCUAClient : IDisposable
     /// <summary>
     /// 当前保存的变量名称列表
     /// </summary>
-    public List<string> Variables = new();
+    public List<List<string>> Variables = new();
 
     /// <summary>
     /// 当前的变量名称/OPC变量节点
@@ -584,7 +584,12 @@ public class OPCUAClient : IDisposable
 
         //如果是订阅模式，连接时添加订阅组
         if (OPCNode.ActiveSubscribe)
-            await AddSubscriptionAsync(Guid.NewGuid().ToString(), Variables.ToArray(), OPCNode.LoadType);
+        {
+            foreach (var item in Variables)
+            {
+                await AddSubscriptionAsync(Guid.NewGuid().ToString(), item.ToArray(), OPCNode.LoadType);
+            }
+        }
         return m_session;
     }
 

framework/Foundation/ThingsGateway.Foundation/Foundation/DataHandleAdapter/ReadWriteDevicesTcpDataHandleAdapter.cs

@@ -162,7 +162,7 @@ public abstract class ReadWriteDevicesTcpDataHandleAdapter<TRequest> : CustomDat
         Request = GetInstance();
         Request.SendBytes = bytes;
         await GoSendAsync(bytes, 0, bytes.Length);
-        Logger?.Trace($"{FoundationConst.LogMessageHeader}{ToString()}- 发送:{Request.SendBytes.ToHexString(' ')}");
+        Logger?.Trace($"{FoundationConst.LogMessageHeader}{ToString()}- 发送:{(IsHexData ? Request.SendBytes.ToHexString(' ') : Encoding.UTF8.GetString(Request.SendBytes))}");
     }
 
     /// <inheritdoc/>

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

@@ -52,7 +52,14 @@ public class SerialSessionBase : BaseSerial, ISerialSession
         this.Protocol = SerialPort;
         this.m_serialCore = new InternalSerialCore();
     }
-
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    /// <returns></returns>
+    public override string ToString()
+    {
+        return SerialProperty?.ToString();
+    }
     #region 变量
 
     private DelaySender m_delaySender;

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

@@ -497,9 +497,21 @@ namespace ThingsGateway.Foundation.Sockets
             {
                 Logger.Info($"{item.Option.IpHost}停止成功");
             }
+            foreach (var item in GetClients())
+            {
+                try
+                {
+                    item.MainSocket?.Shutdown(SocketShutdown.Both);
+                    item.SafeDispose();
+                }
+                catch
+                {
 
+                }
+            }
             foreach (var item in this.m_monitors)
             {
+
                 item.Socket.SafeDispose();
                 item.SocketAsyncEvent.SafeDispose();
             }
@@ -540,6 +552,18 @@ namespace ThingsGateway.Foundation.Sockets
 
             if (disposing)
             {
+                foreach (var item in GetClients())
+                {
+                    try
+                    {
+                        item.MainSocket?.Shutdown(SocketShutdown.Both);
+                        item.SafeDispose();
+                    }
+                    catch
+                    {
+
+                    }
+                }
                 foreach (var item in this.m_monitors)
                 {
                     item.Socket.SafeDispose();

framework/Plugin/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>3.0.0.27</Version>
+		<Version>3.0.0.28</Version>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>

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

@@ -9,7 +9,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion
-
 namespace ThingsGateway.Plugin.Kafka;
 
 /// <summary>

framework/Plugin/ThingsGateway.Plugin.Kafka/KafkaProducerVariableProperty.cs

@@ -9,7 +9,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 #endregion
-
 namespace ThingsGateway.Plugin.Kafka;
 
 /// <summary>

framework/Plugin/ThingsGateway.Plugin.OPCUA/OPCUAClient/OPCUAClient.cs

@@ -78,8 +78,9 @@ public class OPCUAClient : CollectBase
     public override List<DeviceVariableSourceRead> LoadSourceRead(List<DeviceVariableRunTime> deviceVariables)
     {
         _deviceVariables = deviceVariables;
-        _plc.Variables.AddRange(deviceVariables.Select(a => a.VariableAddress).ToList());
-        var dataLists = deviceVariables.ChunkTrivialBetter(driverPropertys.GroupSize);
+        List<List<DeviceVariableRunTime>> dataLists = deviceVariables.ChunkTrivialBetter(driverPropertys.GroupSize);
+        _plc.Variables = new();
+        _plc.Variables.AddRange(dataLists.Select(a => a.Select(a => a.VariableAddress).ToList()).ToList());
         var dataResult = new List<DeviceVariableSourceRead>();
         foreach (var variable in dataLists)
         {

framework/ThingsGateway.sln

@@ -111,6 +111,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{C39748E6-3
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gateway", "Gateway", "{05A88744-64D9-4959-8A97-5189F327BBBE}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Foundation.Demo.Winform", "Demo\ThingsGateway.Foundation.Demo.Winform\ThingsGateway.Foundation.Demo.Winform.csproj", "{231AEEA6-F914-4F32-AFF6-D554E6C855CF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -249,6 +251,10 @@ Global
 		{2C827B2C-75DF-413B-9AB2-2D1B438AC082}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2C827B2C-75DF-413B-9AB2-2D1B438AC082}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C827B2C-75DF-413B-9AB2-2D1B438AC082}.Release|Any CPU.Build.0 = Release|Any CPU
+		{231AEEA6-F914-4F32-AFF6-D554E6C855CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{231AEEA6-F914-4F32-AFF6-D554E6C855CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{231AEEA6-F914-4F32-AFF6-D554E6C855CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{231AEEA6-F914-4F32-AFF6-D554E6C855CF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -288,6 +294,7 @@ Global
 		{5854938A-F669-40F4-A54C-EC2651730B73} = {9EB46BB6-D4EA-4B06-95EE-6C971E653030}
 		{C39748E6-34AC-4C4A-AEC7-7D807FFB4813} = {9EB46BB6-D4EA-4B06-95EE-6C971E653030}
 		{05A88744-64D9-4959-8A97-5189F327BBBE} = {9EB46BB6-D4EA-4B06-95EE-6C971E653030}
+		{231AEEA6-F914-4F32-AFF6-D554E6C855CF} = {95008B83-0324-4A7C-80DE-2BBDDD1A9099}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C49B2D3E-6818-4E28-91B7-6E4E7E264BBB}

framework/UpgradeManger/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>3.0.0.27</Version>
+		<Version>3.0.0.28</Version>
 		<LangVersion>latest</LangVersion>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<Authors>Diego</Authors>

framework/Web/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>3.0.0.27</Version>
+		<Version>3.0.0.28</Version>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>

framework/Web/ThingsGateway.Gateway.Application/Plugin/UpLoadBase.cs

@@ -125,6 +125,8 @@ public abstract class UpLoadBase : DriverBase
         }
         return null;
     }
+
+
     /// <summary>
     /// 初始化
     /// </summary>

framework/Web/ThingsGateway.Gateway.Application/Workers/Upgrade/ReverseCallbackServer.cs

@@ -194,7 +194,7 @@ internal class ReverseCallbackServer : RpcServer
     {
         //EasyLock.Wait();//不会释放，由外部程序直接关闭软件 //TODO:暂时注释
         _logger.LogInformation("准备更新软件，程序将退出");
-        //TODO:启动控制台程序，用于文件转移/验证/覆盖原文件/重新启动/失败恢复等
+        //启动控制台程序，用于文件转移/验证/覆盖原文件/重新启动/失败恢复等
         var path = FilePluginUtil.GetFileTempPath(_TcpClientBase);
         ProcessStart(path);
         _appLifetime.StopApplication();//停止程序

framework/Web/ThingsGateway.Web.Core/ThingsGateway.Web.Core.csproj

@@ -39,7 +39,7 @@
 		<ProjectReference Include="..\..\PluginProAF2021\ThingsGateway.Gateway.LK\ThingsGateway.Gateway.LK.csproj" />
 	</ItemGroup>
 	
-	<ItemGroup Condition="'$(SolutionName)'=='ThingsGateway - Pro'">
+	<ItemGroup Condition="'$(SolutionName)'=='ThingsGateway - Pro' AND  '$(Configuration)' == 'Debug'">
 		<ProjectReference Include="..\..\PluginProAF2021\ThingsGateway.Gateway.LK\ThingsGateway.Gateway.LK.csproj" />
 	</ItemGroup>
 	

framework/Web/ThingsGateway.Web.Entry/Program.cs

@@ -59,10 +59,11 @@ public class Program
     o =>
     {
         var config = Furion.App.GetConfig<ThingsGateway.Gateway.LK.MqttConfig>("MqttConfig", true);
-
-        o.ListenAnyIP(config.Port, a => MQTTnet.AspNetCore.ConnectionBuilderExtensions.UseMqtt(a));
-
-        o.ListenAnyIP(config.WebSocketPort);
+        if (config.Enable)
+        {
+            o.ListenAnyIP(config.Port, a => MQTTnet.AspNetCore.ConnectionBuilderExtensions.UseMqtt(a));
+            o.ListenAnyIP(config.WebSocketPort);
+        }
     });
 #endif
 

framework/Web/ThingsGateway.Web.Entry/ThingsGateway.Web.Entry.csproj

@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 
-	
+
 	<ItemGroup>
 		<_WebToolingArtifacts Remove="Properties\PublishProfiles\linux64_net6.pubxml" />
 		<_WebToolingArtifacts Remove="Properties\PublishProfiles\linux64_net7.pubxml" />
@@ -50,5 +50,7 @@
 	<PropertyGroup Condition="'$(SolutionName)'=='ThingsGateway - Pro - AF2021'">
 		<DefineConstants>AF2021</DefineConstants>
 	</PropertyGroup>
-	
+	<PropertyGroup  Condition="'$(SolutionName)'=='ThingsGateway - Pro' AND  '$(Configuration)' == 'Debug'">
+		<DefineConstants>AF2021</DefineConstants>
+	</PropertyGroup>
 </Project>

handbook/.docusaurus/@easyops-cn/docusaurus-search-local/default/generated.js

@@ -6,7 +6,7 @@ export const language = ["en","zh"];
 export const removeDefaultStopWordFilter = false;
 export const removeDefaultStemmer = false;
 export { default as Mark } from "E:\\Tg\\ThingsGateway\\ThingsGateway-DEV\\handbook\\node_modules\\mark.js\\dist\\mark.js"
-export const searchIndexUrl = "search-index{dir}.json?_=9f4ebc61";
+export const searchIndexUrl = "search-index{dir}.json?_=32e71452";
 export const searchResultLimits = 8;
 export const searchResultContextMaxLength = 50;
 export const explicitSearchResultPath = true;

handbook/.docusaurus/client-manifest.json

@@ -227,9 +227,9 @@
     "179": {
       "js": [
         {
-          "file": "assets/js/main.7a9d5b15.js",
-          "hash": "77266b9ca300039b",
-          "publicPath": "/thingsgateway-docs/assets/js/main.7a9d5b15.js"
+          "file": "assets/js/main.4a6e381e.js",
+          "hash": "ff82a48f3dca0c49",
+          "publicPath": "/thingsgateway-docs/assets/js/main.4a6e381e.js"
         }
       ]
     },
@@ -299,9 +299,9 @@
     "1303": {
       "js": [
         {
-          "file": "assets/js/runtime~main.4ddd45bf.js",
-          "hash": "061d2e5662b8322a",
-          "publicPath": "/thingsgateway-docs/assets/js/runtime~main.4ddd45bf.js"
+          "file": "assets/js/runtime~main.bd0ffcd3.js",
+          "hash": "ca0f6efc08801a98",
+          "publicPath": "/thingsgateway-docs/assets/js/runtime~main.bd0ffcd3.js"
         }
       ]
     },
@@ -619,9 +619,9 @@
     "8707": {
       "js": [
         {
-          "file": "assets/js/4c79e569.3e5405f6.js",
-          "hash": "baf2d3f9c933bbe5",
-          "publicPath": "/thingsgateway-docs/assets/js/4c79e569.3e5405f6.js"
+          "file": "assets/js/4c79e569.59f00119.js",
+          "hash": "7a9bebca8339d742",
+          "publicPath": "/thingsgateway-docs/assets/js/4c79e569.59f00119.js"
         }
       ]
     },

handbook/.docusaurus/docusaurus-plugin-content-docs/default/site-docs-upgrade-mdx-4c7.json

@@ -12,8 +12,8 @@
   "tags": [],
   "version": "current",
   "lastUpdatedBy": "Kimdiego2098",
-  "lastUpdatedAt": 1697718988,
-  "formattedLastUpdatedAt": "Oct 19, 2023",
+  "lastUpdatedAt": 1698166407,
+  "formattedLastUpdatedAt": "Oct 24, 2023",
   "frontMatter": {
     "id": "upgrade",
     "title": "历史更新"

handbook/docs/upgrade.mdx

@@ -17,6 +17,13 @@ import Tag from "@site/src/components/Tag.js";
 - 其余情况，每年发布一个 `主版本`。
 
 :::
+
+## v3.0.0.27（已发布）
+
+- &nbsp;<Tag>调整</Tag> 优化设备线程启停逻辑
+- &nbsp;<Tag>新增</Tag> 添加winform(blazor) demo
+- &nbsp;<Tag>优化</Tag> 部分页面显示内容优化
+
 ## v3.0.0.25（已发布）
 
 - &nbsp;<Tag>调整</Tag> 删除S7插件中的DstTSAP属性,用插槽号与机架号代替，更直观