diff --git a/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj b/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj
index cf577db..6fc109c 100644
--- a/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj
+++ b/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj
@@ -30,18 +30,14 @@
-
+
-
+
-
+
-
-
-
-
\ No newline at end of file
diff --git a/Modbus.Net/Modbus.Net.OPC/OpcDaProtocalLinker.cs b/Modbus.Net/Modbus.Net.OPC/OpcDaProtocalLinker.cs
index 4056f32..9189a2e 100644
--- a/Modbus.Net/Modbus.Net.OPC/OpcDaProtocalLinker.cs
+++ b/Modbus.Net/Modbus.Net.OPC/OpcDaProtocalLinker.cs
@@ -1,4 +1,4 @@
-using System.Configuration;
+
namespace Modbus.Net.OPC
{
@@ -11,7 +11,7 @@ namespace Modbus.Net.OPC
/// 构造函数
///
/// 是否开启正则匹配
- public OpcDaProtocolLinker(bool isRegexOn) : this(ConfigurationManager.AppSettings["OpcDaHost"], isRegexOn)
+ public OpcDaProtocolLinker(bool isRegexOn) : this(ConfigurationReader.GetValueDirect("OpcDa", "Host"), isRegexOn)
{
}
diff --git a/Modbus.Net/Modbus.Net.OPC/OpcUaProtocolLinker.cs b/Modbus.Net/Modbus.Net.OPC/OpcUaProtocolLinker.cs
index c565089..38ceef4 100644
--- a/Modbus.Net/Modbus.Net.OPC/OpcUaProtocolLinker.cs
+++ b/Modbus.Net/Modbus.Net.OPC/OpcUaProtocolLinker.cs
@@ -11,7 +11,7 @@ namespace Modbus.Net.OPC
/// 构造函数
///
/// 是否开启正则匹配
- public OpcUaProtocolLinker(bool isRegexOn) : this(ConfigurationManager.AppSettings["OpcUaHost"], isRegexOn)
+ public OpcUaProtocolLinker(bool isRegexOn) : this(ConfigurationReader.GetValueDirect("OpcUa", "Host"), isRegexOn)
{
}
diff --git a/Modbus.Net/Modbus.Net/Modbus.Net.csproj b/Modbus.Net/Modbus.Net/Modbus.Net.csproj
index 699ffe6..e448f08 100644
--- a/Modbus.Net/Modbus.Net/Modbus.Net.csproj
+++ b/Modbus.Net/Modbus.Net/Modbus.Net.csproj
@@ -29,6 +29,12 @@
bin\Debug\Modbus.Net.xml
+
+
+ PreserveNewest
+
+
+
diff --git a/Modbus.Net/Modbus.Net/appsettings.default.json b/Modbus.Net/Modbus.Net/appsettings.default.json
index f72eb6b..44e92a9 100644
--- a/Modbus.Net/Modbus.Net/appsettings.default.json
+++ b/Modbus.Net/Modbus.Net/appsettings.default.json
@@ -39,6 +39,12 @@
"Parity": "Even"
}
},
+ "OpcDa": {
+ "Host": "opcda://localhost/test"
+ },
+ "OpcUa": {
+ "Host": "opc.tcp://localhost/test"
+ },
"Controller": {
"WaitingListCount": "100"
}
diff --git a/Samples/AnyType/appsettings.default.json b/Samples/AnyType/appsettings.default.json
index f72eb6b..44e92a9 100644
--- a/Samples/AnyType/appsettings.default.json
+++ b/Samples/AnyType/appsettings.default.json
@@ -39,6 +39,12 @@
"Parity": "Even"
}
},
+ "OpcDa": {
+ "Host": "opcda://localhost/test"
+ },
+ "OpcUa": {
+ "Host": "opc.tcp://localhost/test"
+ },
"Controller": {
"WaitingListCount": "100"
}
diff --git a/Samples/CrossLamp/appsettings.default.json b/Samples/CrossLamp/appsettings.default.json
index f72eb6b..44e92a9 100644
--- a/Samples/CrossLamp/appsettings.default.json
+++ b/Samples/CrossLamp/appsettings.default.json
@@ -39,6 +39,12 @@
"Parity": "Even"
}
},
+ "OpcDa": {
+ "Host": "opcda://localhost/test"
+ },
+ "OpcUa": {
+ "Host": "opc.tcp://localhost/test"
+ },
"Controller": {
"WaitingListCount": "100"
}
diff --git a/Samples/MachineJob/appsettings.default.json b/Samples/MachineJob/appsettings.default.json
index f72eb6b..44e92a9 100644
--- a/Samples/MachineJob/appsettings.default.json
+++ b/Samples/MachineJob/appsettings.default.json
@@ -39,6 +39,12 @@
"Parity": "Even"
}
},
+ "OpcDa": {
+ "Host": "opcda://localhost/test"
+ },
+ "OpcUa": {
+ "Host": "opc.tcp://localhost/test"
+ },
"Controller": {
"WaitingListCount": "100"
}
diff --git a/Samples/TripleAdd/appsettings.default.json b/Samples/TripleAdd/appsettings.default.json
index f72eb6b..44e92a9 100644
--- a/Samples/TripleAdd/appsettings.default.json
+++ b/Samples/TripleAdd/appsettings.default.json
@@ -39,6 +39,12 @@
"Parity": "Even"
}
},
+ "OpcDa": {
+ "Host": "opcda://localhost/test"
+ },
+ "OpcUa": {
+ "Host": "opc.tcp://localhost/test"
+ },
"Controller": {
"WaitingListCount": "100"
}
diff --git a/Tests/Modbus.Net.Tests/appsettings.default.json b/Tests/Modbus.Net.Tests/appsettings.default.json
index f72eb6b..44e92a9 100644
--- a/Tests/Modbus.Net.Tests/appsettings.default.json
+++ b/Tests/Modbus.Net.Tests/appsettings.default.json
@@ -39,6 +39,12 @@
"Parity": "Even"
}
},
+ "OpcDa": {
+ "Host": "opcda://localhost/test"
+ },
+ "OpcUa": {
+ "Host": "opc.tcp://localhost/test"
+ },
"Controller": {
"WaitingListCount": "100"
}