diff --git a/Modbus.Net/Modbus.Net.OPC/FBox/FBoxOpcDaManchine.cs b/Modbus.Net/Modbus.Net.OPC/FBox/FBoxOpcDaManchine.cs
index 997c627..c1f4827 100644
--- a/Modbus.Net/Modbus.Net.OPC/FBox/FBoxOpcDaManchine.cs
+++ b/Modbus.Net/Modbus.Net.OPC/FBox/FBoxOpcDaManchine.cs
@@ -17,7 +17,9 @@ namespace Modbus.Net.OPC.FBox
/// 是否保持连接
public FBoxOpcDaMachine(string localSequence, string linkerName,
IEnumerable getAddresses, bool keepConnect)
- : base(ConfigurationManager.AppSettings["FBoxOpcDaHost"], getAddresses, keepConnect)
+ : base(
+ ConfigurationManager.AppSettings["FBoxOpcDaHost"] ?? "opcda://localhost/FBoxOpcServer", getAddresses,
+ keepConnect)
{
LocalSequence = localSequence;
LinkerName = linkerName;
diff --git a/Modbus.Net/Modbus.Net/ComConnector.cs b/Modbus.Net/Modbus.Net/ComConnector.cs
index 71ab2d2..0c5b417 100644
--- a/Modbus.Net/Modbus.Net/ComConnector.cs
+++ b/Modbus.Net/Modbus.Net/ComConnector.cs
@@ -312,19 +312,19 @@ namespace Modbus.Net
private void RefreshSendCount()
{
_sendCount++;
- Log.Verbose("Tcp client {ConnectionToken} send count: {SendCount}", ConnectionToken, _sendCount);
+ Log.Verbose("Com client {ConnectionToken} send count: {SendCount}", ConnectionToken, _sendCount);
}
private void RefreshReceiveCount()
{
_receiveCount++;
- Log.Verbose("Tcp client {ConnectionToken} receive count: {SendCount}", ConnectionToken, _receiveCount);
+ Log.Verbose("Com client {ConnectionToken} receive count: {SendCount}", ConnectionToken, _receiveCount);
}
private void RefreshErrorCount()
{
_errorCount++;
- Log.Verbose("Tcp client {ConnectionToken} error count: {ErrorCount}", ConnectionToken, _errorCount);
+ Log.Verbose("Com client {ConnectionToken} error count: {ErrorCount}", ConnectionToken, _errorCount);
}
#region 发送接收数据
@@ -458,7 +458,8 @@ namespace Modbus.Net
{
Log.Verbose("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken,
sendbytes.Length);
- Log.Verbose("Com client {ConnectionToken} send msg: {SendBytes}", ConnectionToken, sendbytes);
+ Log.Verbose(
+ $"Com client {ConnectionToken} send msg: {String.Concat(sendbytes.Select(p => " " + p))}");
SerialPort.Write(sendbytes, 0, sendbytes.Length);
}
catch (Exception err)
@@ -473,8 +474,8 @@ namespace Modbus.Net
returnBytes = ReadMsg();
Log.Verbose("Com client {ConnectionToken} receive msg length: {Length}", ConnectionToken,
returnBytes.Length);
- Log.Verbose("Com client {ConnectionToken} receive msg: {SendBytes}", ConnectionToken,
- returnBytes);
+ Log.Verbose(
+ $"Com client {ConnectionToken} receive msg: {String.Concat(returnBytes.Select(p => " " + p))}");
}
catch (Exception e)
{
@@ -529,7 +530,8 @@ namespace Modbus.Net
{
Log.Verbose("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken,
sendbytes.Length);
- Log.Verbose("Com client {ConnectionToken} send msg: {SendBytes}", ConnectionToken, sendbytes);
+ Log.Verbose(
+ $"Com client {ConnectionToken} send msg: {string.Concat(sendbytes.Select(p => " " + p))}");
SerialPort.Write(sendbytes, 0, sendbytes.Length);
}
catch (Exception err)
diff --git a/Modbus.Net/src/Base.Common/TcpConnector.cs b/Modbus.Net/src/Base.Common/TcpConnector.cs
index 2e71893..a73c96f 100644
--- a/Modbus.Net/src/Base.Common/TcpConnector.cs
+++ b/Modbus.Net/src/Base.Common/TcpConnector.cs
@@ -1,4 +1,5 @@
using System;
+using System.Linq;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
@@ -240,7 +241,7 @@ namespace Modbus.Net
var stream = _socketClient.GetStream();
Log.Verbose("Tcp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length);
- Log.Verbose("Tcp client {ConnectionToken} send text = {Datagram}", ConnectionToken, datagram);
+ Log.Verbose($"Tcp client {ConnectionToken} send text = {String.Concat(datagram.Select(p => " " + p))}");
await stream.WriteAsync(datagram, 0, datagram.Length);
RefreshSendCount();
@@ -281,16 +282,18 @@ namespace Modbus.Net
var stream = _socketClient.GetStream();
- Log.Verbose("Tcp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length);
- Log.Verbose("Tcp client {ConnectionToken} send: {Datagram}", ConnectionToken, datagram);
- await stream.WriteAsync(datagram, 0, datagram.Length);
-
RefreshSendCount();
+ Log.Verbose("Tcp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length);
+ Log.Verbose($"Tcp client {ConnectionToken} send: {String.Concat(datagram.Select(p => " " + p))}");
+ await stream.WriteAsync(datagram, 0, datagram.Length);
+
var receiveBytes = await ReceiveAsync(stream);
Log.Verbose("Tcp client {ConnectionToken} receive text len = {Length}", ConnectionToken,
receiveBytes.Length);
- Log.Verbose("Tcp client {ConnectionToken} receive: {Datagram}", ConnectionToken, receiveBytes);
+ Log.Verbose($"Tcp client {ConnectionToken} receive: {String.Concat(receiveBytes.Select(p => " " + p))}");
+
+ RefreshReceiveCount();
return receiveBytes;
}
@@ -335,9 +338,6 @@ namespace Modbus.Net
var replyMessage = new byte[len];
Array.Copy(_receiveBuffer, replyMessage, len);
- Log.Verbose("Tcp client {ConnectionToken} reply: {replyMessage}", ConnectionToken, replyMessage);
- RefreshReceiveCount();
-
if (len <= 0)
RefreshErrorCount();
diff --git a/Tests/Modbus.Net.Tests/App.config b/Tests/Modbus.Net.Tests/App.config
deleted file mode 100644
index 7802c78..0000000
--- a/Tests/Modbus.Net.Tests/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Tests/Modbus.Net.Tests/Modbus.Net.Tests.csproj b/Tests/Modbus.Net.Tests/Modbus.Net.Tests.csproj
index 2942bdd..82f82f2 100644
--- a/Tests/Modbus.Net.Tests/Modbus.Net.Tests.csproj
+++ b/Tests/Modbus.Net.Tests/Modbus.Net.Tests.csproj
@@ -79,9 +79,6 @@
Modbus.Net
-
-
-