1. 修改S7库名称，现使用Siemens

2. 所有库新增中英文描述

README.md

@@ -461,4 +461,9 @@ while(true)
 1. 展示特性中新增详细提示字段，方面展示时了解与指导此属性的详情
 2. Serilog 更新至最新版本
 3. 修改版本规则 ( 年.天.秒 ) ( 23.317.30964 ) -- 23年，第317天，当天的30964秒时生成的版本
-4. 生成nuget包位置更新
+4. 生成nuget包位置更新
+
+#### 2023-11-14
+1. 修改S7库名称，现使用Siemens
+2. 所有库新增中英文描述
+3. 等待.net8发布，集成.net8

src/YSAI.AllenBradley/AllenBradleyOperate.cs

@@ -12,7 +12,7 @@ using YSAI.Unility;
 namespace YSAI.AllenBradley
 {
     /// <summary>
-    /// 艾伦·布拉德利 PLC
+    /// 罗克韦尔 PLC
     /// </summary>
     public sealed class AllenBradleyOperate : IBaseAbstract, IDaq
     {

src/YSAI.AllenBradley/YSAI.AllenBradley.csproj

@@ -11,6 +11,11 @@
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DescriptionType>采集协议</DescriptionType>
+		<DescriptionName_En>AllenBradley</DescriptionName_En>
+		<DescriptionName_Cn>罗克韦尔</DescriptionName_Cn>
+		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
 	</PropertyGroup>
 
 	<ItemGroup>

src/YSAI.Beckhoff/YSAI.Beckhoff.csproj

@@ -11,6 +11,11 @@
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DescriptionType>采集协议</DescriptionType>
+		<DescriptionName_En>Beckhoff</DescriptionName_En>
+		<DescriptionName_Cn>倍福</DescriptionName_Cn>
+		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Beckhoff.TwinCAT.Ads" Version="6.1.86" />

src/YSAI.Can/YSAI.Can.csproj

@@ -11,6 +11,11 @@
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DescriptionType>采集协议</DescriptionType>
+		<DescriptionName_En>CAN</DescriptionName_En>
+		<DescriptionName_Cn>工业标准通信协议</DescriptionName_Cn>
+		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
 	</PropertyGroup>
 
   <ItemGroup>

src/YSAI.DAQ.sln

@@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Unility", "YSAI.Unilit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Log", "YSAI.Log\YSAI.Log.csproj", "{C8EEBF30-365E-4F22-A58C-C68FB58E4256}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.S7", "YSAI.S7\YSAI.S7.csproj", "{4A24E34B-5BBF-4D1E-AEE2-B22FF6E6A7D9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Opc", "YSAI.Opc\YSAI.Opc.csproj", "{FEA383F4-9CDD-422F-9068-200A66DF7C81}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Mqtt", "YSAI.Mqtt\YSAI.Mqtt.csproj", "{1EE30939-69BA-4F20-96B3-D4082C937924}"
@@ -73,8 +71,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Modbus.Pack", "YSAI.Mo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Opc.Pack", "YSAI.Opc.Pack\YSAI.Opc.Pack.csproj", "{03C88A20-C849-49AF-BCA9-D2F78A7054F0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.S7.Pack", "YSAI.S7.Pack\YSAI.S7.Pack.csproj", "{C09178F0-6FEA-4C3B-B84D-89C355C96A13}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Kafka.Pack", "YSAI.Kafka.Pack\YSAI.Kafka.Pack.csproj", "{FA745761-1C35-40A8-8695-8114EAF4273F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Mqtt.Pack", "YSAI.Mqtt.Pack\YSAI.Mqtt.Pack.csproj", "{690A2E26-908A-4AED-8689-01B23F5CFCBE}"
@@ -117,9 +113,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.AllenBradley", "YSAI.A
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.AllenBradley.Pack", "YSAI.AllenBradley.Pack\YSAI.AllenBradley.Pack.csproj", "{3263AB0B-19E7-456B-9DCF-C7DC3BEED337}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Mewtocol", "YSAI.Mewtocol\YSAI.Mewtocol.csproj", "{BA30E984-11EE-426B-872C-8DF74D48C3B3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Mewtocol", "YSAI.Mewtocol\YSAI.Mewtocol.csproj", "{BA30E984-11EE-426B-872C-8DF74D48C3B3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Mewtocol.Pack", "YSAI.Mewtocol.Pack\YSAI.Mewtocol.Pack.csproj", "{586340C5-C724-456D-A385-F8265D7E9FBA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Siemens", "YSAI.Siemens\YSAI.Siemens.csproj", "{1F68D7B4-3565-4278-A207-8724303EEF60}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Mewtocol.Pack", "YSAI.Mewtocol.Pack\YSAI.Mewtocol.Pack.csproj", "{586340C5-C724-456D-A385-F8265D7E9FBA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Siemens.Pack", "YSAI.Siemens.Pack\YSAI.Siemens.Pack.csproj", "{A9D6C2E8-E8B0-482B-ABBD-BEBA119AB89A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -139,10 +139,6 @@ Global
 		{C8EEBF30-365E-4F22-A58C-C68FB58E4256}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C8EEBF30-365E-4F22-A58C-C68FB58E4256}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C8EEBF30-365E-4F22-A58C-C68FB58E4256}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A24E34B-5BBF-4D1E-AEE2-B22FF6E6A7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A24E34B-5BBF-4D1E-AEE2-B22FF6E6A7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A24E34B-5BBF-4D1E-AEE2-B22FF6E6A7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A24E34B-5BBF-4D1E-AEE2-B22FF6E6A7D9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FEA383F4-9CDD-422F-9068-200A66DF7C81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FEA383F4-9CDD-422F-9068-200A66DF7C81}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FEA383F4-9CDD-422F-9068-200A66DF7C81}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -231,10 +227,6 @@ Global
 		{03C88A20-C849-49AF-BCA9-D2F78A7054F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{03C88A20-C849-49AF-BCA9-D2F78A7054F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{03C88A20-C849-49AF-BCA9-D2F78A7054F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C09178F0-6FEA-4C3B-B84D-89C355C96A13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C09178F0-6FEA-4C3B-B84D-89C355C96A13}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C09178F0-6FEA-4C3B-B84D-89C355C96A13}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C09178F0-6FEA-4C3B-B84D-89C355C96A13}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FA745761-1C35-40A8-8695-8114EAF4273F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FA745761-1C35-40A8-8695-8114EAF4273F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FA745761-1C35-40A8-8695-8114EAF4273F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -327,6 +319,14 @@ Global
 		{586340C5-C724-456D-A385-F8265D7E9FBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{586340C5-C724-456D-A385-F8265D7E9FBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{586340C5-C724-456D-A385-F8265D7E9FBA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F68D7B4-3565-4278-A207-8724303EEF60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F68D7B4-3565-4278-A207-8724303EEF60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F68D7B4-3565-4278-A207-8724303EEF60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F68D7B4-3565-4278-A207-8724303EEF60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9D6C2E8-E8B0-482B-ABBD-BEBA119AB89A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9D6C2E8-E8B0-482B-ABBD-BEBA119AB89A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9D6C2E8-E8B0-482B-ABBD-BEBA119AB89A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9D6C2E8-E8B0-482B-ABBD-BEBA119AB89A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -335,7 +335,6 @@ Global
 		{859336BA-B7A8-45E7-BE35-72B1BB7D01B7} = {D60224CF-7F12-453B-851E-B5C01F9D2BBE}
 		{3D1D4ACF-EFD0-497D-891D-527BDE7CA9A4} = {D60224CF-7F12-453B-851E-B5C01F9D2BBE}
 		{C8EEBF30-365E-4F22-A58C-C68FB58E4256} = {D60224CF-7F12-453B-851E-B5C01F9D2BBE}
-		{4A24E34B-5BBF-4D1E-AEE2-B22FF6E6A7D9} = {0A264424-1AD7-49FA-B813-D96498066479}
 		{FEA383F4-9CDD-422F-9068-200A66DF7C81} = {0A264424-1AD7-49FA-B813-D96498066479}
 		{1EE30939-69BA-4F20-96B3-D4082C937924} = {9D8EDBBA-7A97-4D84-9B12-7FCC2F834046}
 		{FEFEFB3E-30EE-429A-B39D-F39CF1338E38} = {0A264424-1AD7-49FA-B813-D96498066479}
@@ -362,7 +361,6 @@ Global
 		{76474288-450D-4553-BA0B-6ECB06BB48D8} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 		{183B670D-6A3C-49AF-9558-4154824319CA} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 		{03C88A20-C849-49AF-BCA9-D2F78A7054F0} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
-		{C09178F0-6FEA-4C3B-B84D-89C355C96A13} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 		{FA745761-1C35-40A8-8695-8114EAF4273F} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 		{690A2E26-908A-4AED-8689-01B23F5CFCBE} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 		{68C1433D-2DB7-499E-9225-CB8191891F8F} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
@@ -386,6 +384,8 @@ Global
 		{3263AB0B-19E7-456B-9DCF-C7DC3BEED337} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 		{BA30E984-11EE-426B-872C-8DF74D48C3B3} = {0A264424-1AD7-49FA-B813-D96498066479}
 		{586340C5-C724-456D-A385-F8265D7E9FBA} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
+		{1F68D7B4-3565-4278-A207-8724303EEF60} = {0A264424-1AD7-49FA-B813-D96498066479}
+		{A9D6C2E8-E8B0-482B-ABBD-BEBA119AB89A} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5D5D3927-6714-40C0-84EA-44C5BA4C5E87}

src/YSAI.DB/YSAI.DB.csproj

@@ -11,6 +11,11 @@
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DescriptionType>采集协议</DescriptionType>
+		<DescriptionName_En>DB</DescriptionName_En>
+		<DescriptionName_Cn>数据库</DescriptionName_Cn>
+		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
 	</PropertyGroup>
 
 	<ItemGroup>

src/YSAI.Kafka/YSAI.Kafka.csproj

@@ -11,6 +11,11 @@
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DescriptionType>转发协议</DescriptionType>
+		<DescriptionName_En>Kafka</DescriptionName_En>
+		<DescriptionName_Cn></DescriptionName_Cn>
+		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
 	</PropertyGroup>
 
   <ItemGroup>

src/YSAI.Mewtocol/YSAI.Mewtocol.csproj

@@ -11,6 +11,11 @@
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DescriptionType>采集协议</DescriptionType>
+		<DescriptionName_En>Mewtocol</DescriptionName_En>
+		<DescriptionName_Cn>松下</DescriptionName_Cn>
+		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
 	</PropertyGroup>
 
 	<ItemGroup>

src/YSAI.Mitsubishi/YSAI.Mitsubishi.csproj

@@ -11,6 +11,11 @@
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DescriptionType>采集协议</DescriptionType>
+		<DescriptionName_En>Mitsubishi</DescriptionName_En>
+		<DescriptionName_Cn>三菱</DescriptionName_Cn>
+		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
 	</PropertyGroup>
 
   <ItemGroup>

src/YSAI.Modbus/YSAI.Modbus.csproj

@@ -11,6 +11,11 @@
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DescriptionType>采集协议</DescriptionType>
+		<DescriptionName_En>Modbus</DescriptionName_En>
+		<DescriptionName_Cn>工业标准通信协议</DescriptionName_Cn>
+		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
 	</PropertyGroup>
 
 	<ItemGroup>

src/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -11,6 +11,11 @@
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DescriptionType>转发协议</DescriptionType>
+		<DescriptionName_En>Mqtt</DescriptionName_En>
+		<DescriptionName_Cn></DescriptionName_Cn>
+		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
 	</PropertyGroup>
 
   <ItemGroup>

src/YSAI.NetMQ/YSAI.NetMQ.csproj

@@ -12,6 +12,11 @@
 		<Product>SCADA</Product>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
+		<DescriptionType>转发协议</DescriptionType>
+		<DescriptionName_En>NetMQ</DescriptionName_En>
+		<DescriptionName_Cn></DescriptionName_Cn>
+		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
 	</PropertyGroup>
 
 

src/YSAI.Netty/YSAI.Netty.csproj

@@ -11,6 +11,11 @@
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DescriptionType>转发协议</DescriptionType>
+		<DescriptionName_En>Netty</DescriptionName_En>
+		<DescriptionName_Cn></DescriptionName_Cn>
+		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="DotNetty.Handlers" Version="0.7.5" />

src/YSAI.Omron/YSAI.Omron.csproj

@@ -11,6 +11,11 @@
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DescriptionType>采集协议</DescriptionType>
+		<DescriptionName_En>Omron</DescriptionName_En>
+		<DescriptionName_Cn>欧姆龙</DescriptionName_Cn>
+		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="YSAI.Core" Version="23.317.31271" />

src/YSAI.Opc/YSAI.Opc.csproj

@@ -11,6 +11,11 @@
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DescriptionType>采集协议</DescriptionType>
+		<DescriptionName_En>Opc</DescriptionName_En>
+		<DescriptionName_Cn>工业标准通信协议</DescriptionName_Cn>
+		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
 	</PropertyGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.372.76" />

src/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -11,6 +11,11 @@
 	<Company>YSAI</Company>
 	<Product>SCADA</Product>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
+	<DescriptionType>转发协议</DescriptionType>
+	<DescriptionName_En>RabbitMQ</DescriptionName_En>
+	<DescriptionName_Cn></DescriptionName_Cn>
+	<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+	<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
   </PropertyGroup>
 	
 

src/YSAI.S7.Pack/Program.cs

@@ -1,10 +1,10 @@
 using YSAI.Unility;
 
-namespace YSAI.S7.Pack
+namespace YSAI.Siemens.Pack
 {
     internal class Program
     {
-        private static void Main(string[] args)
+        static void Main(string[] args)
         {
             string FileDirectory = string.Empty;
             string[] paths = AppDomain.CurrentDomain.BaseDirectory.Split('\\');
@@ -13,15 +13,15 @@ namespace YSAI.S7.Pack
                 FileDirectory += $"{paths[i]}//";
             }
             FileDirectory += "YSAI.Manage//param";
-            string Name = "YSAI.S7";
+            string Name = "YSAI.Siemens";
             string ParamFile = $"{FileDirectory}//{Name}.Param.json";
             string ParamDetailsFile = $"{FileDirectory}//{Name}.ParamDetails.json";
             if (!Directory.Exists(FileDirectory))
             {
                 Directory.CreateDirectory(FileDirectory);
             }
-            FileTool.StringToFile(ParamFile, new S7Data.Basics().ToJson().JsonFormatting());
-            FileTool.StringToFile(ParamDetailsFile, ReflexTool.GetClassAllPropertyData<S7Data.Basics>().ToJson().JsonFormatting());
+            FileTool.StringToFile(ParamFile, new SiemensData.Basics().ToJson().JsonFormatting());
+            FileTool.StringToFile(ParamDetailsFile, ReflexTool.GetClassAllPropertyData<SiemensData.Basics>().ToJson().JsonFormatting());
         }
     }
 }

src/YSAI.Siemens.Pack/YSAI.Siemens.Pack.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\YSAI.Siemens\YSAI.Siemens.csproj" />
+  </ItemGroup>
+
+</Project>

src/YSAI.S7/S7Data.cs

@@ -5,10 +5,9 @@ using System.ComponentModel;
 using YSAI.Core.attribute;
 using YSAI.Core.subscription;
 using YSAI.Unility;
-
-namespace YSAI.S7
+namespace YSAI.Siemens
 {
-    public class S7Data
+    public class SiemensData
     {
         /// <summary>
         /// 基础数据

src/YSAI.S7/S7Operate.cs

@@ -10,14 +10,14 @@ using YSAI.Core.virtualAddress;
 using YSAI.Log;
 using YSAI.Unility;
 
-namespace YSAI.S7
+namespace YSAI.Siemens
 {
     /// <summary>
-    /// s7操作
+    /// 西门子PLC
     /// </summary>
-    public sealed class S7Operate : IBaseAbstract, IDaq
+    public class SiemensOperate : IBaseAbstract, IDaq
     {
-        protected override string TAG => "S7Operate";
+        protected override string TAG => "SiemensOperate";
 
         /// <summary>
         /// 锁
@@ -27,19 +27,19 @@ namespace YSAI.S7
         /// <summary>
         /// 自身对象集合
         /// </summary>
-        private static List<S7Operate> ThisObjList = new List<S7Operate>();
+        private static List<SiemensOperate> ThisObjList = new List<SiemensOperate>();
 
         /// <summary>
         /// 单例模式
         /// </summary>
         /// <returns></returns>
-        public static S7Operate Instance(S7Data.Basics basics)
+        public static SiemensOperate Instance(SiemensData.Basics basics)
         {
             if (ThisObjList.Count >= MaxInstanceCount)
             {
                 throw new Exception(ExceedMaxInstanceCountTips);
             }
-            S7Operate? exp = ThisObjList.FirstOrDefault(c => c.basics.Comparer(basics).result);
+            SiemensOperate? exp = ThisObjList.FirstOrDefault(c => c.basics.Comparer(basics).result);
             if (exp == null)
             {
                 lock (Lock)
@@ -50,7 +50,7 @@ namespace YSAI.S7
                     }
                     else
                     {
-                        S7Operate exp2 = new S7Operate(basics);
+                        SiemensOperate exp2 = new SiemensOperate(basics);
                         ThisObjList.Add(exp2);
                         return exp2;
                     }
@@ -63,18 +63,18 @@ namespace YSAI.S7
         /// 构造函数
         /// </summary>
         /// <param name="basics"></param>
-        public S7Operate(S7Data.Basics basics)
+        public SiemensOperate(SiemensData.Basics basics)
         {
             this.basics = basics;
         }
 
-        public S7Operate()
+        public SiemensOperate()
         { }
 
         /// <summary>
         /// 基础数据
         /// </summary>
-        private S7Data.Basics basics { get; set; }
+        private SiemensData.Basics basics { get; set; }
 
         /// <summary>
         /// 虚拟地址
@@ -443,7 +443,7 @@ namespace YSAI.S7
                 //命名空间
                 string nameSpace = "YSAI.S7.S7Operate";
                 //参数处理
-                OperateResult operateResult = ParamHandler.Get(new S7Data.Basics(), name, Properties: new List<ParamStructure.propertie>
+                OperateResult operateResult = ParamHandler.Get(new SiemensData.Basics(), name, Properties: new List<ParamStructure.propertie>
                 {
                     new ParamStructure.propertie
                     {
@@ -474,9 +474,9 @@ namespace YSAI.S7
             try
             {
                 //先判断对象类型是否一致
-                if (typeof(T).FullName.Equals(typeof(S7Data.Basics).FullName))
+                if (typeof(T).FullName.Equals(typeof(SiemensData.Basics).FullName))
                 {
-                    return Break(SN, true, RData: Instance(Basics as S7Data.Basics));
+                    return Break(SN, true, RData: Instance(Basics as SiemensData.Basics));
                 }
                 else
                 {

src/YSAI.S7/YSAI.S7.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
@@ -11,15 +11,20 @@
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DescriptionType>采集协议</DescriptionType>
+		<DescriptionName_En>Siemens</DescriptionName_En>
+		<DescriptionName_Cn>西门子</DescriptionName_Cn>
+		<Description Condition="'$(DescriptionName_Cn)' != ''">$(DescriptionType)：$(DescriptionName_En)($(DescriptionName_Cn))</Description>
+		<Description Condition="'$(DescriptionName_Cn)' == ''">$(DescriptionType)：$(DescriptionName_En)</Description>
 	</PropertyGroup>
 
 	<ItemGroup>
-    <PackageReference Include="S7netplus" Version="0.20.0" />
-    <PackageReference Include="YSAI.Core" Version="23.317.31271" />
-  </ItemGroup>
+		<PackageReference Include="S7netplus" Version="0.20.0" />
+		<PackageReference Include="YSAI.Core" Version="23.317.31271" />
+	</ItemGroup>
 
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
 	</ItemGroup>-->
-	
+
 </Project>

src/YSAI.Test.All/YSAI.Test.All.csproj

@@ -15,7 +15,6 @@
   <ItemGroup>
     <ProjectReference Include="..\YSAI.NetMQ\YSAI.NetMQ.csproj" />
     <ProjectReference Include="..\YSAI.Opc\YSAI.Opc.csproj" />
-    <ProjectReference Include="..\YSAI.S7\YSAI.S7.csproj" />
   </ItemGroup>
 
 

src/YSAI.Test.Console/YSAI.Test.Console.csproj

@@ -23,7 +23,6 @@
 		<ProjectReference Include="..\YSAI.Omron\YSAI.Omron.csproj" />
 		<ProjectReference Include="..\YSAI.Opc\YSAI.Opc.csproj" />
 		<ProjectReference Include="..\YSAI.RabbitMQ\YSAI.RabbitMQ.csproj" />
-		<ProjectReference Include="..\YSAI.S7\YSAI.S7.csproj" />
 		<ProjectReference Include="..\YSAI.DaqManage\YSAI.DaqManage.csproj" />
 		<ProjectReference Include="..\YSAI.RelayManage\YSAI.RelayManage.csproj" />
 	</ItemGroup>

src/YSAI.Test.Service/YSAI.Test.Service.csproj

@@ -12,8 +12,4 @@
 	<PackageReference Include="Talk.BACnet" Version="1.0.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\YSAI.S7\YSAI.S7.csproj" />
-  </ItemGroup>
-
 </Project>

src/YSAI.Test/YSAI.Test.csproj

@@ -28,7 +28,6 @@
     <ProjectReference Include="..\YSAI.Mqtt\YSAI.Mqtt.csproj" />
     <ProjectReference Include="..\YSAI.Opc\YSAI.Opc.csproj" />
     <ProjectReference Include="..\YSAI.RabbitMQ\YSAI.RabbitMQ.csproj" />
-    <ProjectReference Include="..\YSAI.S7\YSAI.S7.csproj" />
   </ItemGroup>
 
 </Project>

src/YSAI.Tool.Core/YSAI.Tool.Core.csproj

@@ -13,7 +13,6 @@
 		<ProjectReference Include="..\YSAI.Modbus\YSAI.Modbus.csproj" />
 		<ProjectReference Include="..\YSAI.Mqtt\YSAI.Mqtt.csproj" />
 		<ProjectReference Include="..\YSAI.Opc\YSAI.Opc.csproj" />
-		<ProjectReference Include="..\YSAI.S7\YSAI.S7.csproj" />
 		<ProjectReference Include="..\YSAI.WindowMessage\YSAI.WindowMessage.csproj" />
 	</ItemGroup>