Opc Fix

Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj

@@ -30,18 +30,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Modbus.Net\Modbus.Net.csproj" />
+    <PackageReference Include="H.Opc" Version="0.9.3" />
   </ItemGroup>
-
+  
   <ItemGroup>
-    <Reference Include="System.Configuration" />
+    <ProjectReference Include="..\Modbus.Net\Modbus.Net.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <None Include="README.md" Pack="true" PackagePath="" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="H.Opc" Version="0.9.3" />
-  </ItemGroup>
 </Project>

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
         ///     构造函数
         /// </summary>
         /// <param name="isRegexOn">是否开启正则匹配</param>
-        public OpcDaProtocolLinker(bool isRegexOn) : this(ConfigurationManager.AppSettings["OpcDaHost"], isRegexOn)
+        public OpcDaProtocolLinker(bool isRegexOn) : this(ConfigurationReader.GetValueDirect("OpcDa", "Host"), isRegexOn)
         {
         }
 

Modbus.Net/Modbus.Net.OPC/OpcUaProtocolLinker.cs

@@ -11,7 +11,7 @@ namespace Modbus.Net.OPC
         ///     构造函数
         /// </summary>
         /// <param name="isRegexOn">是否开启正则匹配</param>
-        public OpcUaProtocolLinker(bool isRegexOn) : this(ConfigurationManager.AppSettings["OpcUaHost"], isRegexOn)
+        public OpcUaProtocolLinker(bool isRegexOn) : this(ConfigurationReader.GetValueDirect("OpcUa", "Host"), isRegexOn)
         {
         }
 

Modbus.Net/Modbus.Net/Modbus.Net.csproj

@@ -29,6 +29,12 @@
     <DocumentationFile>bin\Debug\Modbus.Net.xml</DocumentationFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Content Include="appsettings.default.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="DotNetty.Handlers" Version="0.7.5" />
     <PackageReference Include="FastEnum" Version="1.8.0" />

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"
     }

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"
     }

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"
     }

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"
     }

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"
     }

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"
     }