diff --git a/framework/Demo/Directory.Build.props b/framework/Demo/Directory.Build.props
index 6dc68172c..44c1103ef 100644
--- a/framework/Demo/Directory.Build.props
+++ b/framework/Demo/Directory.Build.props
@@ -2,7 +2,6 @@
 	<PropertyGroup>
 		<Version>3.0.0.27</Version>
 		<LangVersion>latest</LangVersion>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<Authors>Diego</Authors>
 		<Product>ThingsGateway</Product>
 		<Copyright>© 2023-present Diego</Copyright>
diff --git a/framework/Demo/ThingsGateway.Foundation.Demo.Photino/ThingsGateway.Foundation.Demo.Photino.csproj b/framework/Demo/ThingsGateway.Foundation.Demo.Photino/ThingsGateway.Foundation.Demo.Photino.csproj
index 3de262cc0..b53eb8b67 100644
--- a/framework/Demo/ThingsGateway.Foundation.Demo.Photino/ThingsGateway.Foundation.Demo.Photino.csproj
+++ b/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>
diff --git a/framework/Demo/ThingsGateway.Foundation.Demo.Rcl/wwwroot/favicon.ico b/framework/Demo/ThingsGateway.Foundation.Demo.Photino/wwwroot/favicon.ico
similarity index 100%
rename from framework/Demo/ThingsGateway.Foundation.Demo.Rcl/wwwroot/favicon.ico
rename to framework/Demo/ThingsGateway.Foundation.Demo.Photino/wwwroot/favicon.ico
diff --git a/framework/Demo/ThingsGateway.Foundation.Demo.Rcl/wwwroot/favicon.png b/framework/Demo/ThingsGateway.Foundation.Demo.Photino/wwwroot/favicon.png
similarity index 100%
rename from framework/Demo/ThingsGateway.Foundation.Demo.Rcl/wwwroot/favicon.png
rename to framework/Demo/ThingsGateway.Foundation.Demo.Photino/wwwroot/favicon.png
diff --git a/framework/Demo/ThingsGateway.Foundation.Demo.Rcl/wwwroot/index.html b/framework/Demo/ThingsGateway.Foundation.Demo.Photino/wwwroot/index.html
similarity index 100%
rename from framework/Demo/ThingsGateway.Foundation.Demo.Rcl/wwwroot/index.html
rename to framework/Demo/ThingsGateway.Foundation.Demo.Photino/wwwroot/index.html
diff --git a/framework/Demo/ThingsGateway.Foundation.Demo.Rcl/ThingsGateway.Foundation.Demo.Rcl.csproj b/framework/Demo/ThingsGateway.Foundation.Demo.Rcl/ThingsGateway.Foundation.Demo.Rcl.csproj
index 8f8e1c02e..ef36e33a2 100644
--- a/framework/Demo/ThingsGateway.Foundation.Demo.Rcl/ThingsGateway.Foundation.Demo.Rcl.csproj
+++ b/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>
diff --git a/framework/Demo/ThingsGateway.Foundation.Demo.Winform/MainFrom.Designer.cs b/framework/Demo/ThingsGateway.Foundation.Demo.Winform/MainFrom.Designer.cs
index da0e2cf1b..5ce5314df 100644
--- a/framework/Demo/ThingsGateway.Foundation.Demo.Winform/MainFrom.Designer.cs
+++ b/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);
         }
 
diff --git a/framework/Demo/ThingsGateway.Foundation.Demo.Winform/MainFrom.cs b/framework/Demo/ThingsGateway.Foundation.Demo.Winform/MainFrom.cs
index cf6675d05..47f76b26d 100644
--- a/framework/Demo/ThingsGateway.Foundation.Demo.Winform/MainFrom.cs
+++ b/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();
+        }
     }
 }
\ No newline at end of file
diff --git a/framework/Demo/ThingsGateway.Foundation.Demo.Winform/ThingsGateway.Foundation.Demo.Winform.csproj b/framework/Demo/ThingsGateway.Foundation.Demo.Winform/ThingsGateway.Foundation.Demo.Winform.csproj
index 4aaf1e4f9..2625b95fc 100644
--- a/framework/Demo/ThingsGateway.Foundation.Demo.Winform/ThingsGateway.Foundation.Demo.Winform.csproj
+++ b/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>
diff --git a/framework/Demo/ThingsGateway.Foundation.Demo.Winform/wwwroot/favicon.ico b/framework/Demo/ThingsGateway.Foundation.Demo.Winform/wwwroot/favicon.ico
new file mode 100644
index 000000000..d5a4939b2
Binary files /dev/null and b/framework/Demo/ThingsGateway.Foundation.Demo.Winform/wwwroot/favicon.ico differ
diff --git a/framework/Demo/ThingsGateway.Foundation.Demo.Winform/wwwroot/favicon.png b/framework/Demo/ThingsGateway.Foundation.Demo.Winform/wwwroot/favicon.png
new file mode 100644
index 000000000..e88c7d32f
Binary files /dev/null and b/framework/Demo/ThingsGateway.Foundation.Demo.Winform/wwwroot/favicon.png differ
diff --git a/framework/Demo/ThingsGateway.Foundation.Demo.Winform/wwwroot/index.html b/framework/Demo/ThingsGateway.Foundation.Demo.Winform/wwwroot/index.html
new file mode 100644
index 000000000..ad052fdb8
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/framework/Foundation/ThingsGateway.Foundation/Foundation/DataHandleAdapter/ReadWriteDevicesTcpDataHandleAdapter.cs b/framework/Foundation/ThingsGateway.Foundation/Foundation/DataHandleAdapter/ReadWriteDevicesTcpDataHandleAdapter.cs
index 03696dac2..3e21dce84 100644
--- a/framework/Foundation/ThingsGateway.Foundation/Foundation/DataHandleAdapter/ReadWriteDevicesTcpDataHandleAdapter.cs
+++ b/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/>
diff --git a/framework/Foundation/ThingsGateway.Foundation/TouchSocket/Socket/Components/Tcp/TcpService.cs b/framework/Foundation/ThingsGateway.Foundation/TouchSocket/Socket/Components/Tcp/TcpService.cs
index ee1e8ea0e..f2087db9d 100644
--- a/framework/Foundation/ThingsGateway.Foundation/TouchSocket/Socket/Components/Tcp/TcpService.cs
+++ b/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();