From b6ea596ade99c05be02ab56f8600d2dec9d2fc06 Mon Sep 17 00:00:00 2001 From: Kimdiego2098 <2248356998@qq.com> Date: Wed, 6 Dec 2023 18:35:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/Directory.Build.props | 2 +- ...ialSessionPage.razor => SerialPortClientPage.razor} | 0 ...sionPage.razor.cs => SerialPortClientPage.razor.cs} | 6 +++--- .../Pages/DLT645/DLT645_2007DebugPage.razor | 2 +- .../Pages/DLT645/DLT645_2007DebugPage.razor.cs | 10 +++++----- .../Pages/DLT645/DLT645_2007OverTcpDebugPage.razor.cs | 2 +- .../Pages/Modbus/ModbusRtuDebugPage.razor | 2 +- .../Pages/Modbus/ModbusRtuDebugPage.razor.cs | 10 +++++----- .../Pages/Modbus/ModbusRtuOverTcpDebugPage.razor.cs | 2 +- .../Pages/Modbus/ModbusRtuOverUdpDebugPage.razor.cs | 2 +- .../Pages/Modbus/ModbusSerialServerDebugPage.razor | 2 +- .../Pages/Modbus/ModbusSerialServerDebugPage.razor.cs | 10 +++++----- .../Pages/Modbus/ModbusTcpDebugPage.razor.cs | 2 +- .../Pages/Modbus/ModbusUdpDebugPage.razor.cs | 2 +- .../Pages/Siemens/SiemensDebugPage.razor.cs | 2 +- .../DLT645/DLT645_2007.cs | 2 +- .../Modbus/ModbusRtu/ModbusRtu.cs | 2 +- .../Server/ModbusSerialServer/ModbusSerialServer.cs | 2 +- .../BaseReadWrite/ReadWriteDevicesSerialSessionBase.cs | 6 +++--- .../SerialPort/Components/SerialPortClient.cs | 9 ++++----- .../TouchSocket/Socket/Components/Tcp/SocketClient.cs | 6 +++--- .../TouchSocket/Socket/Components/Tcp/TcpClient.cs | 6 +++--- .../ThingsGateway.Plugin.DLT645.csproj | 4 ++-- .../ThingsGateway.Plugin.Modbus.csproj | 4 ++-- 24 files changed, 48 insertions(+), 49 deletions(-) rename framework/demo/ThingsGateway.Foundation.Demo.Rcl/Components/DebugPage/{SerialSessionPage.razor => SerialPortClientPage.razor} (100%) rename framework/demo/ThingsGateway.Foundation.Demo.Rcl/Components/DebugPage/{SerialSessionPage.razor.cs => SerialPortClientPage.razor.cs} (95%) diff --git a/framework/Directory.Build.props b/framework/Directory.Build.props index 0e91404d5..f4601ed20 100644 --- a/framework/Directory.Build.props +++ b/framework/Directory.Build.props @@ -3,7 +3,7 @@ enable net6.0;net8.0; - 4.0.0.7 + 4.0.0.8 latest Diego ThingsGateway diff --git a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Components/DebugPage/SerialSessionPage.razor b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Components/DebugPage/SerialPortClientPage.razor similarity index 100% rename from framework/demo/ThingsGateway.Foundation.Demo.Rcl/Components/DebugPage/SerialSessionPage.razor rename to framework/demo/ThingsGateway.Foundation.Demo.Rcl/Components/DebugPage/SerialPortClientPage.razor diff --git a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Components/DebugPage/SerialSessionPage.razor.cs b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Components/DebugPage/SerialPortClientPage.razor.cs similarity index 95% rename from framework/demo/ThingsGateway.Foundation.Demo.Rcl/Components/DebugPage/SerialSessionPage.razor.cs rename to framework/demo/ThingsGateway.Foundation.Demo.Rcl/Components/DebugPage/SerialPortClientPage.razor.cs index 6b2f262eb..79f10a04d 100644 --- a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Components/DebugPage/SerialSessionPage.razor.cs +++ b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Components/DebugPage/SerialPortClientPage.razor.cs @@ -13,7 +13,7 @@ namespace ThingsGateway.Foundation.Demo; /// -public partial class SerialSessionPage : IDisposable +public partial class SerialPortClientPage : IDisposable { /// /// 日志输出 @@ -36,7 +36,7 @@ public partial class SerialSessionPage : IDisposable /// 获取对象 /// /// - public SerialPortClient GetSerialSession() + public SerialPortClient GetSerialPortClient() { _config ??= new TouchSocketConfig(); var LogMessage = new LoggerGroup() { LogLevel = LogLevel.Trace }; @@ -81,7 +81,7 @@ public partial class SerialSessionPage : IDisposable try { _serialPortClient.Close(); - await GetSerialSession().ConnectAsync(); + await GetSerialPortClient().ConnectAsync(); } catch (Exception ex) { diff --git a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007DebugPage.razor b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007DebugPage.razor index a59e3d693..e0ebb439c 100644 --- a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007DebugPage.razor +++ b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007DebugPage.razor @@ -19,7 +19,7 @@ @using Masa.Blazor; @namespace ThingsGateway.Foundation.Demo - +
驱动配置
diff --git a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007DebugPage.razor.cs b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007DebugPage.razor.cs index 49cc54409..0a12dbf27 100644 --- a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007DebugPage.razor.cs +++ b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007DebugPage.razor.cs @@ -17,9 +17,9 @@ namespace ThingsGateway.Foundation.Demo; public partial class DLT645_2007DebugPage { /// - /// SerialSessionPage + /// SerialPortClientPage /// - private SerialSessionPage _serialSessionPage; + private SerialPortClientPage _serialPortClientPage; private DriverDebugUIPage _driverDebugUIPage; private ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007 _plc; /// @@ -69,9 +69,9 @@ public partial class DLT645_2007DebugPage """, "csharp")); - if (_serialSessionPage != null) - _serialSessionPage.LogAction = _driverDebugUIPage.LogOut; - _plc = new ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007(_serialSessionPage.GetSerialSession()); + if (_serialPortClientPage != null) + _serialPortClientPage.LogAction = _driverDebugUIPage.LogOut; + _plc = new ThingsGateway.Foundation.Adapter.DLT645.DLT645_2007(_serialPortClientPage.GetSerialPortClient()); _driverDebugUIPage.Plc = _plc; //初始化 diff --git a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007OverTcpDebugPage.razor.cs b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007OverTcpDebugPage.razor.cs index 49ff44457..fa9eb5443 100644 --- a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007OverTcpDebugPage.razor.cs +++ b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/DLT645/DLT645_2007OverTcpDebugPage.razor.cs @@ -17,7 +17,7 @@ namespace ThingsGateway.Foundation.Demo; public partial class DLT645_2007OverTcpDebugPage { /// - /// SerialSessionPage + /// SerialPortClientPage /// private TcpClientPage _tcpClientPage; private DriverDebugUIPage _driverDebugUIPage; diff --git a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuDebugPage.razor b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuDebugPage.razor index bc15593ca..c1a498096 100644 --- a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuDebugPage.razor +++ b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuDebugPage.razor @@ -19,7 +19,7 @@ @using Masa.Blazor; @namespace ThingsGateway.Foundation.Demo - +
驱动配置
diff --git a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuDebugPage.razor.cs b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuDebugPage.razor.cs index c3462dbf9..057b12b5c 100644 --- a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuDebugPage.razor.cs +++ b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuDebugPage.razor.cs @@ -19,9 +19,9 @@ namespace ThingsGateway.Foundation.Demo; public partial class ModbusRtuDebugPage { /// - /// SerialSessionPage + /// SerialPortClientPage /// - private SerialSessionPage _serialSessionPage; + private SerialPortClientPage _serialPortClientPage; private readonly List<(string Code, string Language)> _sections = new(); private DriverDebugUIPage _driverDebugUIPage; @@ -72,9 +72,9 @@ public partial class ModbusRtuDebugPage """, "csharp")); - if (_serialSessionPage != null) - _serialSessionPage.LogAction = _driverDebugUIPage.LogOut; - _plc = new ThingsGateway.Foundation.Adapter.Modbus.ModbusRtu(_serialSessionPage.GetSerialSession()); + if (_serialPortClientPage != null) + _serialPortClientPage.LogAction = _driverDebugUIPage.LogOut; + _plc = new ThingsGateway.Foundation.Adapter.Modbus.ModbusRtu(_serialPortClientPage.GetSerialPortClient()); _driverDebugUIPage.Plc = _plc; //载入配置 StateHasChanged(); diff --git a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuOverTcpDebugPage.razor.cs b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuOverTcpDebugPage.razor.cs index 35042275d..f2ea1cc90 100644 --- a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuOverTcpDebugPage.razor.cs +++ b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuOverTcpDebugPage.razor.cs @@ -19,7 +19,7 @@ namespace ThingsGateway.Foundation.Demo; public partial class ModbusRtuOverTcpDebugPage { /// - /// SerialSessionPage + /// SerialPortClientPage /// private TcpClientPage _tcpClientPage; private DriverDebugUIPage _driverDebugUIPage; diff --git a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuOverUdpDebugPage.razor.cs b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuOverUdpDebugPage.razor.cs index 891c41cd7..a45967074 100644 --- a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuOverUdpDebugPage.razor.cs +++ b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusRtuOverUdpDebugPage.razor.cs @@ -17,7 +17,7 @@ namespace ThingsGateway.Foundation.Demo; public partial class ModbusRtuOverUdpDebugPage { /// - /// SerialSessionPage + /// SerialPortClientPage /// private UdpSessionPage _udpSessionPage; private DriverDebugUIPage _driverDebugUIPage; diff --git a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusSerialServerDebugPage.razor b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusSerialServerDebugPage.razor index 3c35111b5..85535ddd6 100644 --- a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusSerialServerDebugPage.razor +++ b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusSerialServerDebugPage.razor @@ -19,7 +19,7 @@ @using Masa.Blazor; @namespace ThingsGateway.Foundation.Demo - +
驱动配置
diff --git a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusSerialServerDebugPage.razor.cs b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusSerialServerDebugPage.razor.cs index c616173a5..9f2883fa9 100644 --- a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusSerialServerDebugPage.razor.cs +++ b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusSerialServerDebugPage.razor.cs @@ -17,9 +17,9 @@ namespace ThingsGateway.Foundation.Demo; public partial class ModbusSerialServerDebugPage { /// - /// SerialSessionPage + /// SerialPortClientPage /// - private SerialSessionPage _serialSessionPage; + private SerialPortClientPage _serialPortClientPage; private DriverDebugUIPage _driverDebugUIPage; private ThingsGateway.Foundation.Adapter.Modbus.ModbusSerialServer _plc; @@ -70,9 +70,9 @@ public partial class ModbusSerialServerDebugPage """, "csharp")); - if (_serialSessionPage != null) - _serialSessionPage.LogAction = _driverDebugUIPage.LogOut; - _plc = new ThingsGateway.Foundation.Adapter.Modbus.ModbusSerialServer(_serialSessionPage.GetSerialSession()); + if (_serialPortClientPage != null) + _serialPortClientPage.LogAction = _driverDebugUIPage.LogOut; + _plc = new ThingsGateway.Foundation.Adapter.Modbus.ModbusSerialServer(_serialPortClientPage.GetSerialPortClient()); _driverDebugUIPage.Plc = _plc; //载入配置 StateHasChanged(); diff --git a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusTcpDebugPage.razor.cs b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusTcpDebugPage.razor.cs index 6c76c10f7..ef0b21b41 100644 --- a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusTcpDebugPage.razor.cs +++ b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusTcpDebugPage.razor.cs @@ -21,7 +21,7 @@ public partial class ModbusTcpDebugPage private ThingsGateway.Foundation.Adapter.Modbus.ModbusTcp _plc; /// - /// SerialSessionPage + /// SerialPortClientPage /// private TcpClientPage _tcpClientPage; /// diff --git a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusUdpDebugPage.razor.cs b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusUdpDebugPage.razor.cs index 9bf693021..89cf29739 100644 --- a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusUdpDebugPage.razor.cs +++ b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Modbus/ModbusUdpDebugPage.razor.cs @@ -17,7 +17,7 @@ namespace ThingsGateway.Foundation.Demo; public partial class ModbusUdpDebugPage { /// - /// SerialSessionPage + /// SerialPortClientPage /// private UdpSessionPage _udpSessionPage; private DriverDebugUIPage _driverDebugUIPage; diff --git a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Siemens/SiemensDebugPage.razor.cs b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Siemens/SiemensDebugPage.razor.cs index ff3c1d7d7..45e21a1f7 100644 --- a/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Siemens/SiemensDebugPage.razor.cs +++ b/framework/demo/ThingsGateway.Foundation.Demo.Rcl/Pages/Siemens/SiemensDebugPage.razor.cs @@ -21,7 +21,7 @@ public partial class SiemensDebugPage private ThingsGateway.Foundation.Adapter.Siemens.SiemensS7PLC _plc; /// - /// SerialSessionPage + /// SerialPortClientPage /// private TcpClientPage _tcpClientPage; /// diff --git a/framework/foundation/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007.cs b/framework/foundation/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007.cs index cbe79df6a..6b773e3ca 100644 --- a/framework/foundation/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007.cs +++ b/framework/foundation/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007.cs @@ -16,7 +16,7 @@ namespace ThingsGateway.Foundation.Adapter.DLT645; /// /// DLT645_2007 /// -public class DLT645_2007 : ReadWriteDevicesSerialSessionBase, IDLT645_2007 +public class DLT645_2007 : ReadWriteDevicesSerialPortClientBase, IDLT645_2007 { /// /// DLT645_2007 diff --git a/framework/foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusRtu/ModbusRtu.cs b/framework/foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusRtu/ModbusRtu.cs index bb8b7d2b0..7437a37bb 100644 --- a/framework/foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusRtu/ModbusRtu.cs +++ b/framework/foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusRtu/ModbusRtu.cs @@ -16,7 +16,7 @@ namespace ThingsGateway.Foundation.Adapter.Modbus; /// /// ModbusRtu /// -public class ModbusRtu : ReadWriteDevicesSerialSessionBase +public class ModbusRtu : ReadWriteDevicesSerialPortClientBase { /// /// ModbusRtu diff --git a/framework/foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/Server/ModbusSerialServer/ModbusSerialServer.cs b/framework/foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/Server/ModbusSerialServer/ModbusSerialServer.cs index 9fdcda595..45ba9af08 100644 --- a/framework/foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/Server/ModbusSerialServer/ModbusSerialServer.cs +++ b/framework/foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/Server/ModbusSerialServer/ModbusSerialServer.cs @@ -16,7 +16,7 @@ namespace ThingsGateway.Foundation.Adapter.Modbus; /// /// /// -public class ModbusSerialServer : ReadWriteDevicesSerialSessionBase, IModbusServer +public class ModbusSerialServer : ReadWriteDevicesSerialPortClientBase, IModbusServer { /// public ModbusSerialServer(SerialPortClient serialPortClient) : base(serialPortClient) diff --git a/framework/foundation/ThingsGateway.Foundation/Foundation/BaseReadWrite/ReadWriteDevicesSerialSessionBase.cs b/framework/foundation/ThingsGateway.Foundation/Foundation/BaseReadWrite/ReadWriteDevicesSerialSessionBase.cs index 674bdf47e..6d590fd06 100644 --- a/framework/foundation/ThingsGateway.Foundation/Foundation/BaseReadWrite/ReadWriteDevicesSerialSessionBase.cs +++ b/framework/foundation/ThingsGateway.Foundation/Foundation/BaseReadWrite/ReadWriteDevicesSerialSessionBase.cs @@ -16,13 +16,13 @@ namespace ThingsGateway.Foundation.Core; /// /// 串口读写设备 /// -public abstract class ReadWriteDevicesSerialSessionBase : ReadWriteDevicesBase +public abstract class ReadWriteDevicesSerialPortClientBase : ReadWriteDevicesBase { /// - /// + /// /// /// - public ReadWriteDevicesSerialSessionBase(SerialPortClient serialPortClient) + public ReadWriteDevicesSerialPortClientBase(SerialPortClient serialPortClient) { SerialPortClient = serialPortClient; WaitingClientEx = SerialPortClient.CreateWaitingClient(new() { }); diff --git a/framework/foundation/ThingsGateway.Foundation/TouchSocket/SerialPort/Components/SerialPortClient.cs b/framework/foundation/ThingsGateway.Foundation/TouchSocket/SerialPort/Components/SerialPortClient.cs index c88f407c0..48ac72428 100644 --- a/framework/foundation/ThingsGateway.Foundation/TouchSocket/SerialPort/Components/SerialPortClient.cs +++ b/framework/foundation/ThingsGateway.Foundation/TouchSocket/SerialPort/Components/SerialPortClient.cs @@ -232,8 +232,7 @@ namespace ThingsGateway.Foundation.SerialPorts { if (this.m_online) { - Task.Factory.StartNew(this.PrivateOnDisconnecting, new DisconnectEventArgs(true, msg)); - this.MainSerialPort.TryClose(); + this.PrivateOnDisconnecting(new DisconnectEventArgs(true, msg)).GetFalseAwaitResult(); this.BreakOut(true, msg); } } @@ -249,7 +248,7 @@ namespace ThingsGateway.Foundation.SerialPorts { if (this.m_online) { - Task.Factory.StartNew(this.PrivateOnDisconnecting, new DisconnectEventArgs(true, $"{nameof(Dispose)}主动断开")); + this.PrivateOnDisconnecting(new DisconnectEventArgs(true, $"{nameof(Dispose)}主动断开")).GetFalseAwaitResult(); this.BreakOut(true, $"{nameof(Dispose)}主动断开"); } } @@ -357,7 +356,7 @@ namespace ThingsGateway.Foundation.SerialPorts this.MainSerialPort.SafeDispose(); this.m_delaySender.SafeDispose(); this.DataHandlingAdapter.SafeDispose(); - Task.Factory.StartNew(this.PrivateOnDisconnected, new DisconnectEventArgs(manual, msg)); + this.PrivateOnDisconnected(new DisconnectEventArgs(manual, msg)).GetFalseAwaitResult(); } } } @@ -430,7 +429,7 @@ namespace ThingsGateway.Foundation.SerialPorts } private SerialPort CreateSerial(SerialPortOption serialPortOption) { - SerialPortOption = serialPortOption; + SerialPortOption = serialPortOption.Map(); var serialPort = new SerialPort(serialPortOption.PortName, serialPortOption.BaudRate, serialPortOption.Parity, serialPortOption.DataBits, serialPortOption.StopBits); return serialPort; } diff --git a/framework/foundation/ThingsGateway.Foundation/TouchSocket/Socket/Components/Tcp/SocketClient.cs b/framework/foundation/ThingsGateway.Foundation/TouchSocket/Socket/Components/Tcp/SocketClient.cs index cec879265..1111faa07 100644 --- a/framework/foundation/ThingsGateway.Foundation/TouchSocket/Socket/Components/Tcp/SocketClient.cs +++ b/framework/foundation/ThingsGateway.Foundation/TouchSocket/Socket/Components/Tcp/SocketClient.cs @@ -233,7 +233,7 @@ namespace ThingsGateway.Foundation.Sockets this.MainSocket.SafeDispose(); this.m_delaySender.SafeDispose(); this.DataHandlingAdapter.SafeDispose(); - Task.Factory.StartNew(this.PrivateOnDisconnected, new DisconnectEventArgs(manual, msg)); + this.PrivateOnDisconnected(new DisconnectEventArgs(manual, msg)).GetFalseAwaitResult(); } } @@ -397,7 +397,7 @@ namespace ThingsGateway.Foundation.Sockets { if (this.Online) { - Task.Factory.StartNew(this.PrivateOnDisconnecting, new DisconnectEventArgs(true, msg)); + this.PrivateOnDisconnecting(new DisconnectEventArgs(true, msg)).GetFalseAwaitResult(); this.MainSocket.TryClose(); this.BreakOut(true, msg); } @@ -479,7 +479,7 @@ namespace ThingsGateway.Foundation.Sockets { if (this.Online) { - Task.Factory.StartNew(this.PrivateOnDisconnecting, new DisconnectEventArgs(true, $"{nameof(Dispose)}主动断开")); + this.PrivateOnDisconnecting(new DisconnectEventArgs(true, $"{nameof(Dispose)}主动断开")).GetFalseAwaitResult(); this.BreakOut(true, $"{nameof(Dispose)}主动断开"); } diff --git a/framework/foundation/ThingsGateway.Foundation/TouchSocket/Socket/Components/Tcp/TcpClient.cs b/framework/foundation/ThingsGateway.Foundation/TouchSocket/Socket/Components/Tcp/TcpClient.cs index 8ef0f84ee..213eb3677 100644 --- a/framework/foundation/ThingsGateway.Foundation/TouchSocket/Socket/Components/Tcp/TcpClient.cs +++ b/framework/foundation/ThingsGateway.Foundation/TouchSocket/Socket/Components/Tcp/TcpClient.cs @@ -267,7 +267,7 @@ namespace ThingsGateway.Foundation.Sockets { if (this.m_online) { - Task.Factory.StartNew(this.PrivateOnDisconnecting, new DisconnectEventArgs(true, msg)); + this.PrivateOnDisconnecting(new DisconnectEventArgs(true, msg)).GetFalseAwaitResult(); this.MainSocket.TryClose(); this.BreakOut(true, msg); } @@ -285,7 +285,7 @@ namespace ThingsGateway.Foundation.Sockets { if (this.m_online) { - Task.Factory.StartNew(this.PrivateOnDisconnecting, new DisconnectEventArgs(true, $"{nameof(Dispose)}主动断开")); + this.PrivateOnDisconnecting(new DisconnectEventArgs(true, $"{nameof(Dispose)}主动断开")).GetFalseAwaitResult(); this.BreakOut(true, $"{nameof(Dispose)}主动断开"); } } @@ -498,7 +498,7 @@ namespace ThingsGateway.Foundation.Sockets this.MainSocket.SafeDispose(); this.m_delaySender.SafeDispose(); this.DataHandlingAdapter.SafeDispose(); - Task.Factory.StartNew(this.PrivateOnDisconnected, new DisconnectEventArgs(manual, msg)); + this.PrivateOnDisconnected(new DisconnectEventArgs(manual, msg)).GetFalseAwaitResult(); } } } diff --git a/framework/plugin/ThingsGateway.Plugin.DLT645/ThingsGateway.Plugin.DLT645.csproj b/framework/plugin/ThingsGateway.Plugin.DLT645/ThingsGateway.Plugin.DLT645.csproj index 725975121..38c7d9634 100644 --- a/framework/plugin/ThingsGateway.Plugin.DLT645/ThingsGateway.Plugin.DLT645.csproj +++ b/framework/plugin/ThingsGateway.Plugin.DLT645/ThingsGateway.Plugin.DLT645.csproj @@ -10,11 +10,11 @@ - + - + diff --git a/framework/plugin/ThingsGateway.Plugin.Modbus/ThingsGateway.Plugin.Modbus.csproj b/framework/plugin/ThingsGateway.Plugin.Modbus/ThingsGateway.Plugin.Modbus.csproj index 33f2295e9..1f4d7df64 100644 --- a/framework/plugin/ThingsGateway.Plugin.Modbus/ThingsGateway.Plugin.Modbus.csproj +++ b/framework/plugin/ThingsGateway.Plugin.Modbus/ThingsGateway.Plugin.Modbus.csproj @@ -16,13 +16,13 @@ - + - +