Начало Каталог Помощ
Вход
lishun
/
YS-SCADA-LiShun-New
1
0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

版本更新

Shun преди 2 години
родител
1b324c0f3a
ревизия
3f3112af4a
променени са 18 файла, в които са добавени 33 реда и са изтрити 32 реда
Разделен изглед Покажи статистика за разликите
  1. 3 2
      README.md
  2. 1 1
      src/YSAI.AllenBradley/YSAI.AllenBradley.csproj
  3. 2 2
      src/YSAI.Beckhoff/YSAI.Beckhoff.csproj
  4. 2 2
      src/YSAI.Can/YSAI.Can.csproj
  5. 2 2
      src/YSAI.DB/YSAI.DB.csproj
  6. 1 1
      src/YSAI.DaqManage/YSAI.DaqManage.csproj
  7. 2 2
      src/YSAI.Kafka/YSAI.Kafka.csproj
  8. 2 2
      src/YSAI.Mitsubishi/YSAI.Mitsubishi.csproj
  9. 2 2
      src/YSAI.Modbus/YSAI.Modbus.csproj
  10. 2 2
      src/YSAI.Mqtt/YSAI.Mqtt.csproj
  11. 2 2
      src/YSAI.NetMQ/YSAI.NetMQ.csproj
  12. 2 2
      src/YSAI.Netty/YSAI.Netty.csproj
  13. 2 2
      src/YSAI.Omron/YSAI.Omron.csproj
  14. 2 2
      src/YSAI.Opc/YSAI.Opc.csproj
  15. 2 2
      src/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj
  16. 1 1
      src/YSAI.RelayManage/YSAI.RelayManage.csproj
  17. 2 2
      src/YSAI.S7/YSAI.S7.csproj
  18. 1 1
      src/YSAI.Test/YSAI.Test.csproj

+ 3 - 2
README.md
Целия файл 

@@ -35,8 +35,8 @@
 
 1. 公共快捷方便方法集合	[字节、枚举、文件、Json、Xml、Ftp、System ...]
 
 
 ## 采集协议
 
-1. OpcUa客户端
 
-2. OpcDa客户端
 
+1. OpcUa
 
+2. OpcDa
 
 3. OpcDaHttp
 
 4. Can
 
 5. DB(数据库)	[SqlServer、MySql、Oracle、SQLite]   
@@ -45,6 +45,7 @@
 
 8. Beckhoff(倍福)	[ADS]
 
 9. Mitsubishi(三菱)	[A1E、QNA3E]
 
 10. Omron(欧姆龙)	[FINS]
 
+11. AllenBradley
 
 
 ```sharp
 
 namespace YSAI.Core.@interface

+ 1 - 1
src/YSAI.AllenBradley/YSAI.AllenBradley.csproj
Целия файл 

@@ -13,6 +13,6 @@
 
 	</PropertyGroup>
 
 
 	<ItemGroup>
 
-		<PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+		<PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
 	</ItemGroup>
 
 </Project>

+ 2 - 2
src/YSAI.Beckhoff/YSAI.Beckhoff.csproj
Целия файл 

@@ -5,7 +5,7 @@
 
 		<ImplicitUsings>enable</ImplicitUsings>
 
 		<Nullable>enable</Nullable>
 
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-		<Version>1.0.0.11</Version>
 
+		<Version>1.0.0.12</Version>
 
 		<Authors>Shun</Authors>
 
 		<Company>YSAI</Company>
 
 		<Product>SCADA</Product>
 
@@ -14,7 +14,7 @@
 
 
 	<ItemGroup>
 
 		<PackageReference Include="Beckhoff.TwinCAT.Ads" Version="6.1.86" />
 
-		<PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+		<PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
 	</ItemGroup>
 
 
 	<!--<ItemGroup>

+ 2 - 2
src/YSAI.Can/YSAI.Can.csproj
Целия файл 

@@ -5,7 +5,7 @@
 
     <ImplicitUsings>enable</ImplicitUsings>
 
     <Nullable>enable</Nullable>
 
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-	  <Version>1.0.0.36</Version>
 
+	  <Version>1.0.0.37</Version>
 
 	  <Authors>Shun</Authors>
 
 	  <Company>YSAI</Company>
 
 	  <Product>SCADA</Product>
 
@@ -17,7 +17,7 @@
 
   </ItemGroup>
 
 
   <ItemGroup>
 
-    <PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+    <PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
   </ItemGroup>
 
 
   <ItemGroup>

+ 2 - 2
src/YSAI.DB/YSAI.DB.csproj
Целия файл 

@@ -5,7 +5,7 @@
 
     <ImplicitUsings>enable</ImplicitUsings>
 
     <Nullable>enable</Nullable>
 
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-	  <Version>1.0.0.36</Version>
 
+	  <Version>1.0.0.37</Version>
 
 	  <Authors>Shun</Authors>
 
 	  <Company>YSAI</Company>
 
 	  <Product>SCADA</Product>
 
@@ -18,7 +18,7 @@
 
 		<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
 
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 
 		<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
 
-		<PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+		<PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
 	</ItemGroup>
 
 	<!--<ItemGroup>
 
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

+ 1 - 1
src/YSAI.DaqManage/YSAI.DaqManage.csproj
Целия файл 

@@ -7,7 +7,7 @@
 
   </PropertyGroup>
 
 	<ItemGroup>
 
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 
-		<PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+		<PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
 	</ItemGroup>
 
 
 	<!--<ItemGroup>

+ 2 - 2
src/YSAI.Kafka/YSAI.Kafka.csproj
Целия файл 

@@ -5,7 +5,7 @@
 
     <ImplicitUsings>enable</ImplicitUsings>
 
     <Nullable>enable</Nullable>
 
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-	  <Version>1.0.0.37</Version>
 
+	  <Version>1.0.0.38</Version>
 
 	  <Authors>Shun</Authors>
 
 	  <Company>YSAI</Company>
 
 	  <Product>SCADA</Product>
 
@@ -14,7 +14,7 @@
 
 
   <ItemGroup>
 
     <PackageReference Include="Confluent.Kafka" Version="2.3.0" />
 
-    <PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+    <PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
   </ItemGroup>
 
 	
 	<!--<ItemGroup>

+ 2 - 2
src/YSAI.Mitsubishi/YSAI.Mitsubishi.csproj
Целия файл 

@@ -5,7 +5,7 @@
 
 		<ImplicitUsings>enable</ImplicitUsings>
 
 		<Nullable>enable</Nullable>
 
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-		<Version>1.0.0.4</Version>
 
+		<Version>1.0.0.5</Version>
 
 		<Authors>Shun</Authors>
 
 		<Company>YSAI</Company>
 
 		<Product>SCADA</Product>
 
@@ -13,7 +13,7 @@
 
 	</PropertyGroup>
 
 
   <ItemGroup>
 
-    <PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+    <PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
   </ItemGroup>
 
 
 </Project>

+ 2 - 2
src/YSAI.Modbus/YSAI.Modbus.csproj
Целия файл 

@@ -5,7 +5,7 @@
 
     <ImplicitUsings>enable</ImplicitUsings>
 
     <Nullable>enable</Nullable>
 
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-	  <Version>1.0.0.37</Version>
 
+	  <Version>1.0.0.38</Version>
 
 	  <Authors>Shun</Authors>
 
 	  <Company>YSAI</Company>
 
 	  <Product>SCADA</Product>
 
@@ -15,7 +15,7 @@
 
 	<ItemGroup>
 
     <PackageReference Include="NModbus" Version="3.0.81" />
 
     <PackageReference Include="NModbus.Serial" Version="3.0.81" />
 
-    <PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+    <PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
   </ItemGroup>
 
 
 	<!--<ItemGroup>

+ 2 - 2
src/YSAI.Mqtt/YSAI.Mqtt.csproj
Целия файл 

@@ -5,7 +5,7 @@
 
     <ImplicitUsings>enable</ImplicitUsings>
 
     <Nullable>enable</Nullable>
 
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-	  <Version>1.0.0.39</Version>
 
+	  <Version>1.0.0.40</Version>
 
 	  <Authors>Shun</Authors>
 
 	  <Company>YSAI</Company>
 
 	  <Product>SCADA</Product>
 
@@ -15,7 +15,7 @@
 
   <ItemGroup>
 
     <PackageReference Include="MQTTnet" Version="4.3.1.873" />
 
     <PackageReference Include="MQTTnet.AspNetCore" Version="4.3.1.873" />
 
-    <PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+    <PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
   </ItemGroup>
 
 
 	<!--<ItemGroup>

+ 2 - 2
src/YSAI.NetMQ/YSAI.NetMQ.csproj
Целия файл 

@@ -5,7 +5,7 @@
 
 		<ImplicitUsings>enable</ImplicitUsings>
 
 		<Nullable>enable</Nullable>
 
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-		<Version>1.0.0.3</Version>
 
+		<Version>1.0.0.4</Version>
 
 		<Authors>Shun</Authors>
 
 		<Company>YSAI</Company>
 
 		<Product>SCADA</Product>
 
@@ -16,7 +16,7 @@
 
 
 	<ItemGroup>
 
     <PackageReference Include="NetMQ" Version="4.0.1.13" />
 
-    <PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+    <PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
   </ItemGroup>
 
 
 </Project>

+ 2 - 2
src/YSAI.Netty/YSAI.Netty.csproj
Целия файл 

@@ -5,7 +5,7 @@
 
 		<ImplicitUsings>enable</ImplicitUsings>
 
 		<Nullable>enable</Nullable>
 
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-		<Version>1.0.0.11</Version>
 
+		<Version>1.0.0.12</Version>
 
 		<Authors>Shun</Authors>
 
 		<Company>YSAI</Company>
 
 		<Product>SCADA</Product>
 
@@ -14,6 +14,6 @@
 
 	<ItemGroup>
 
 		<PackageReference Include="DotNetty.Handlers" Version="0.7.5" />
 
 		<PackageReference Include="DotNetty.Transport" Version="0.7.5" />
 
-		<PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+		<PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
 	</ItemGroup>
 
 </Project>

+ 2 - 2
src/YSAI.Omron/YSAI.Omron.csproj
Целия файл 

@@ -5,7 +5,7 @@
 
 		<ImplicitUsings>enable</ImplicitUsings>
 
 		<Nullable>enable</Nullable>
 
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-		<Version>1.0.0.4</Version>
 
+		<Version>1.0.0.5</Version>
 
 		<Authors>Shun</Authors>
 
 		<Company>YSAI</Company>
 
 		<Product>SCADA</Product>
 
@@ -13,7 +13,7 @@
 
 	</PropertyGroup>
 
 
 	<ItemGroup>
 
-		<PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+		<PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
 	</ItemGroup>
 
 
 </Project>

+ 2 - 2
src/YSAI.Opc/YSAI.Opc.csproj
Целия файл 

@@ -5,7 +5,7 @@
 
     <ImplicitUsings>enable</ImplicitUsings>
 
     <Nullable>enable</Nullable>
 
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-	  <Version>1.0.0.48</Version>
 
+	  <Version>1.0.0.49</Version>
 
 	  <Authors>Shun</Authors>
 
 	  <Company>YSAI</Company>
 
 	  <Product>SCADA</Product>
 
@@ -13,7 +13,7 @@
 
   </PropertyGroup>
 
   <ItemGroup>
 
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.372.76" />
 
-	<PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+	<PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
   </ItemGroup>

+ 2 - 2
src/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj
Целия файл 

@@ -5,7 +5,7 @@
 
     <ImplicitUsings>enable</ImplicitUsings>
 
     <Nullable>enable</Nullable>
 
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-	  <Version>1.0.0.38</Version>
 
+	  <Version>1.0.0.39</Version>
 
 	  <Authors>Shun</Authors>
 
 	  <Company>YSAI</Company>
 
 	  <Product>SCADA</Product>
 
@@ -14,7 +14,7 @@
 
 
   <ItemGroup>
 
     <PackageReference Include="RabbitMQ.Client" Version="6.6.0" />
 
-    <PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+    <PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
   </ItemGroup>
 
 
   <ItemGroup>

+ 1 - 1
src/YSAI.RelayManage/YSAI.RelayManage.csproj
Целия файл 

@@ -9,7 +9,7 @@
 
 	<ItemGroup>
 
 		<PackageReference Include="RabbitMQ.Client" Version="6.6.0" />
 
 		<PackageReference Include="Confluent.Kafka" Version="2.3.0" />
 
-		<PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+		<PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 
 	</ItemGroup>

+ 2 - 2
src/YSAI.S7/YSAI.S7.csproj
Целия файл 

@@ -5,7 +5,7 @@
 
     <ImplicitUsings>enable</ImplicitUsings>
 
     <Nullable>enable</Nullable>
 
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-	  <Version>1.0.0.35</Version>
 
+	  <Version>1.0.0.36</Version>
 
 	  <Authors>Shun</Authors>
 
 	  <Company>YSAI</Company>
 
 	  <Product>SCADA</Product>
 
@@ -14,7 +14,7 @@
 
 
 	<ItemGroup>
 
     <PackageReference Include="S7netplus" Version="0.20.0" />
 
-    <PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+    <PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
   </ItemGroup>
 
 
 	<!--<ItemGroup>

+ 1 - 1
src/YSAI.Test/YSAI.Test.csproj
Целия файл 

@@ -17,7 +17,7 @@
 
       <PrivateAssets>all</PrivateAssets>
 
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 
     </PackageReference>
 
-	<PackageReference Include="YSAI.Core" Version="1.0.0.88" />
 
+	<PackageReference Include="YSAI.Core" Version="1.0.0.89" />
 
   </ItemGroup>
 
 
   <ItemGroup>