fix(settings): 配置文件改为引用机制，新增一个空设备的节点。

dathlin · Aug 12, 2018 · ec98926 · ec98926
1 parent 659e7d4
commit ec98926
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 159 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,11 @@ Install-Package SharpNodeSettings
 <Settings>
   <NodeClass Name="Devices" Description="所有的设备的集合对象">
     <NodeClass Name="分厂一" Description="">
-      <NodeClass Name="车间一" Description="" />
+      <NodeClass Name="车间一" Description="">
+        <DeviceNode Name="测试空设备" Description="此设备安装在角落，编号0001" DeviceType="0" ConnectTimeOut="2000" CreateTime="2018/8/12 9:26:27" InstallationDate="2018/8/12 9:26:27">
+          <DeviceRequest Name="数据请求" Description="一次完整的数据请求" Address="0" Length="10" CaptureInterval="1000" PraseRegularCode="B" />
+        </DeviceNode>
+      </NodeClass>
       <NodeClass Name="车间二" Description="">
         <DeviceNode Name="ModbusTcp客户端" Description="这是描述" DeviceType="10" ConnectTimeOut="1000" CreateTime="2018/8/9 19:58:49" InstallationDate="2018/8/9 19:58:49" IpAddress="127.0.0.1" Port="502" Station="1" IsAddressStartWithZero="true" IsWordReverse="false" IsStringReverse="false">
           <DeviceRequest Name="数据请求" Description="一次完整的数据请求" Address="0" Length="30" CaptureInterval="1000" PraseRegularCode="ABCD" />

diff --git a/SharpNodeSettings.OpcUaServer/SharpNodeSettings.OpcUaServer.csproj b/SharpNodeSettings.OpcUaServer/SharpNodeSettings.OpcUaServer.csproj
@@ -255,13 +255,14 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="App.ico">
+    <Content Include="..\XmlFile\settings.xml">
+      <Link>settings.xml</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Opc.Ua.CertificateGenerator.exe">
+    <Content Include="App.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="settings.xml">
+    <Content Include="Opc.Ua.CertificateGenerator.exe">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="SharpNodeSettingsServer.Config.xml">

diff --git a/SharpNodeSettings.OpcUaServer/settings.xml b/SharpNodeSettings.OpcUaServer/settings.xml
diff --git a/SharpNodeSettings.RedisServer/SharpNodeSettings.RedisServer.csproj b/SharpNodeSettings.RedisServer/SharpNodeSettings.RedisServer.csproj
@@ -60,7 +60,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="settings.xml">
+    <Content Include="..\XmlFile\settings.xml">
+      <Link>settings.xml</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

diff --git a/SharpNodeSettings.RedisServer/settings.xml b/SharpNodeSettings.RedisServer/settings.xml
diff --git a/SharpNodeSettings.SampleServer/SharpNodeSettings.SampleServer.csproj b/SharpNodeSettings.SampleServer/SharpNodeSettings.SampleServer.csproj
@@ -56,7 +56,8 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="settings.xml">
+    <Content Include="..\XmlFile\settings.xml">
+      <Link>settings.xml</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

diff --git a/SharpNodeSettings.SampleServer/settings.xml b/SharpNodeSettings.SampleServer/settings.xml
diff --git a/SharpNodeSettings.Tools/SharpNodeSettings.Tools.csproj b/SharpNodeSettings.Tools/SharpNodeSettings.Tools.csproj
@@ -74,7 +74,8 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="settings.xml">
+    <Content Include="..\XmlFile\settings.xml">
+      <Link>settings.xml</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

diff --git a/SharpNodeSettings.Tools/settings.xml b/SharpNodeSettings.Tools/settings.xml