Browse Source

版本更新

Shun 2 năm trước cách đây
mục cha
commit
905e2322e4
36 tập tin đã thay đổi với 97 bổ sung97 xóa
  1. 1 1
      src/YSAI.AllenBradley/AllenBradleyOperate.cs
  2. 2 2
      src/YSAI.AllenBradley/YSAI.AllenBradley.csproj
  3. 2 2
      src/YSAI.Beckhoff/BeckhoffOperate.cs
  4. 2 2
      src/YSAI.Beckhoff/YSAI.Beckhoff.csproj
  5. 2 2
      src/YSAI.Can/CanOperate.cs
  6. 2 2
      src/YSAI.Can/YSAI.Can.csproj
  7. 2 2
      src/YSAI.Core/YSAI.Core.csproj
  8. 3 3
      src/YSAI.Core/handler/AddressHandler.cs
  9. 2 2
      src/YSAI.DB/DBOperate.cs
  10. 2 2
      src/YSAI.DB/YSAI.DB.csproj
  11. 1 1
      src/YSAI.DaqManage/YSAI.DaqManage.csproj
  12. 2 2
      src/YSAI.Kafka/YSAI.Kafka.csproj
  13. 2 2
      src/YSAI.Mewtocol/MewtocolOperate.cs
  14. 2 2
      src/YSAI.Mewtocol/YSAI.Mewtocol.csproj
  15. 1 1
      src/YSAI.Mitsubishi/MitsubishiOperate.cs
  16. 2 2
      src/YSAI.Mitsubishi/YSAI.Mitsubishi.csproj
  17. 11 11
      src/YSAI.Modbus/ModbusOperate.cs
  18. 2 2
      src/YSAI.Modbus/YSAI.Modbus.csproj
  19. 2 2
      src/YSAI.Mqtt/YSAI.Mqtt.csproj
  20. 2 2
      src/YSAI.NetMQ/YSAI.NetMQ.csproj
  21. 2 2
      src/YSAI.Netty/YSAI.Netty.csproj
  22. 1 1
      src/YSAI.Omron/OmronOperate.cs
  23. 2 2
      src/YSAI.Omron/YSAI.Omron.csproj
  24. 2 2
      src/YSAI.Opc/YSAI.Opc.csproj
  25. 3 3
      src/YSAI.Opc/da/client/OpcDaClientOperate.cs
  26. 3 3
      src/YSAI.Opc/da/http/OpcDaHttpOperate.cs
  27. 4 4
      src/YSAI.Opc/ua/client/OpcUaClientOperate.cs
  28. 2 2
      src/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj
  29. 2 2
      src/YSAI.Redis/YSAI.Redis.csproj
  30. 1 1
      src/YSAI.RelayManage/YSAI.RelayManage.csproj
  31. 1 1
      src/YSAI.Rest/YSAI.Rest.csproj
  32. 2 2
      src/YSAI.Rpc/YSAI.Rpc.csproj
  33. 1 1
      src/YSAI.Siemens/SiemensOperate.cs
  34. 2 2
      src/YSAI.Siemens/YSAI.Siemens.csproj
  35. 1 1
      src/YSAI.Test/YSAI.Test.csproj
  36. 21 21
      src/YSAI.VT/Program.cs

+ 1 - 1
src/YSAI.AllenBradley/AllenBradleyOperate.cs

@@ -467,7 +467,7 @@ namespace YSAI.AllenBradley
                         }
                     }
                     //数据处理
-                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(item, Value?.ToString());
+                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(item, Value);
 
                     //数据添加
                     param.AddOrUpdate(item.AddressName, addressValue, (k, v) => addressValue);

+ 2 - 2
src/YSAI.AllenBradley/YSAI.AllenBradley.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -16,6 +16,6 @@
     <Description>$(DescriptionType):$(DescriptionName) ( $(DescriptionDetails) )</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="23.334.14260" />
+    <PackageReference Include="YSAI.Core" Version="23.334.19090" />
   </ItemGroup>
 </Project>

+ 2 - 2
src/YSAI.Beckhoff/BeckhoffOperate.cs

@@ -134,7 +134,7 @@ namespace YSAI.Beckhoff
                                 //设置参数
                                 ConcurrentDictionary<string, AddressValue> param = new ConcurrentDictionary<string, AddressValue>();
                                 //处理数据
-                                AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(addressDetails, value?.ToString());  //数据
+                                AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(addressDetails, value);  //数据
                                 //添加或更新
                                 param.AddOrUpdate(addressDetails.AddressName, addressValue, (k, v) => addressValue);
 
@@ -470,7 +470,7 @@ namespace YSAI.Beckhoff
                         }
 
                         //数据处理
-                        AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(item, Value?.ToString());
+                        AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(item, Value);
 
                         //数据添加
                         param.AddOrUpdate(item.AddressName, addressValue, (k, v) => addressValue);

+ 2 - 2
src/YSAI.Beckhoff/YSAI.Beckhoff.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -17,6 +17,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Beckhoff.TwinCAT.Ads" Version="6.1.125" />
-    <PackageReference Include="YSAI.Core" Version="23.334.14260" />
+    <PackageReference Include="YSAI.Core" Version="23.334.19090" />
   </ItemGroup>
 </Project>

+ 2 - 2
src/YSAI.Can/CanOperate.cs

@@ -295,7 +295,7 @@ namespace YSAI.Can
                             object? Value = VAM.Read(item);
 
                             //数据处理
-                            AddressValue? addressValue = YSAI.Core.handler.AddressHandler.ExecuteDispose(item, Value?.ToString());
+                            AddressValue? addressValue = YSAI.Core.handler.AddressHandler.ExecuteDispose(item, Value);
 
                             //数据添加
                             param.AddOrUpdate(item.AddressName, addressValue, (k, v) => addressValue);
@@ -317,7 +317,7 @@ namespace YSAI.Can
                                 object? Value = candata.ToJson();
 
                                 //数据处理
-                                AddressValue? addressValue = YSAI.Core.handler.AddressHandler.ExecuteDispose(item, Value?.ToString());
+                                AddressValue? addressValue = YSAI.Core.handler.AddressHandler.ExecuteDispose(item, Value);
 
                                 //数据添加
                                 param.AddOrUpdate(item.AddressName, addressValue, (k, v) => addressValue);

+ 2 - 2
src/YSAI.Can/YSAI.Can.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -16,7 +16,7 @@
     <Description>$(DescriptionType):$(DescriptionName) ( $(DescriptionDetails) )</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="23.334.14260" />
+    <PackageReference Include="YSAI.Core" Version="23.334.19090" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Kvaser.CanLib">

+ 2 - 2
src/YSAI.Core/YSAI.Core.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.334.14260</Version>
+    <Version>23.334.19090</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -17,7 +17,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.IO.Ports" Version="8.0.0" />
-    <PackageReference Include="YSAI.Model" Version="23.334.13504" />
+    <PackageReference Include="YSAI.Model" Version="23.334.18639" />
     <PackageReference Include="Microsoft.ClearScript" Version="7.4.4" />
   </ItemGroup>
 </Project>

+ 3 - 3
src/YSAI.Core/handler/AddressHandler.cs

@@ -56,7 +56,7 @@ namespace YSAI.Core.handler
         /// <param name="addressDetails">地址详情数据</param>
         /// <param name="value">底层硬件返回的值</param>
         /// <returns>地址值</returns>
-        public static AddressValue? ExecuteDispose(AddressDetails addressDetails, string? value)
+        public static AddressValue? ExecuteDispose(AddressDetails addressDetails, object? value)
         {
             try
             {
@@ -73,7 +73,7 @@ namespace YSAI.Core.handler
                 int Quality = -1;
 
                 //当收到空数据时说明数据异常
-                if (string.IsNullOrWhiteSpace(value))
+                if (value is null || string.IsNullOrWhiteSpace(value?.ToString()))
                 {
                     //异常数据
                     Quality = 0;
@@ -81,7 +81,7 @@ namespace YSAI.Core.handler
                 else
                 {
                     //数据质量
-                    Quality = DataTypeConvert(addressDetails.AddressDataType, value, out object? outValue);
+                    Quality = DataTypeConvert(addressDetails.AddressDataType, value?.ToString(), out object? outValue);
 
                     //判断数据质量
                     if (Quality == 1)

+ 2 - 2
src/YSAI.DB/DBOperate.cs

@@ -467,7 +467,7 @@ namespace YSAI.DB
                 object? value = VAM.Read(addressDetails);
 
                 //处理
-                AddressValue? addressValue = YSAI.Core.handler.AddressHandler.ExecuteDispose(addressDetails, value?.ToString());
+                AddressValue? addressValue = YSAI.Core.handler.AddressHandler.ExecuteDispose(addressDetails, value);
 
                 //添加进字典
                 retData.AddOrUpdate(addressDetails.AddressName, addressValue, (k, v) => addressValue);
@@ -489,7 +489,7 @@ namespace YSAI.DB
                         object? value = Convert.ToString(item[column]);
 
                         //处理
-                        AddressValue? addressValue = YSAI.Core.handler.AddressHandler.ExecuteDispose(addressDetails, value?.ToString());
+                        AddressValue? addressValue = YSAI.Core.handler.AddressHandler.ExecuteDispose(addressDetails, value);
 
                         //添加进字典   哪个表的哪个字段    值
                         retData.AddOrUpdate(column, addressValue, (k, v) => addressValue);

+ 2 - 2
src/YSAI.DB/YSAI.DB.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -21,6 +21,6 @@
     <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="23.334.14260" />
+    <PackageReference Include="YSAI.Core" Version="23.334.19090" />
   </ItemGroup>
 </Project>

+ 1 - 1
src/YSAI.DaqManage/YSAI.DaqManage.csproj

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

+ 2 - 2
src/YSAI.Kafka/YSAI.Kafka.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -17,6 +17,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="2.3.0" />
-    <PackageReference Include="YSAI.Model" Version="23.334.13504" />
+    <PackageReference Include="YSAI.Model" Version="23.334.18639" />
   </ItemGroup>
 </Project>

+ 2 - 2
src/YSAI.Mewtocol/MewtocolOperate.cs

@@ -213,7 +213,7 @@ namespace YSAI.Mewtocol
                                 }
                             }
                             //数据处理
-                            AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(item, Value?.ToString());
+                            AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(item, Value);
 
                             //数据添加
                             param.AddOrUpdate(item.AddressName, addressValue, (k, v) => addressValue);
@@ -328,7 +328,7 @@ namespace YSAI.Mewtocol
                                 }
                             }
                             //数据处理
-                            AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(item, Value?.ToString());
+                            AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(item, Value);
 
                             //数据添加
                             param.AddOrUpdate(item.AddressName, addressValue, (k, v) => addressValue);

+ 2 - 2
src/YSAI.Mewtocol/YSAI.Mewtocol.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -17,6 +17,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Mewtocol.NET" Version="0.8.1" />
-    <PackageReference Include="YSAI.Core" Version="23.334.14260" />
+    <PackageReference Include="YSAI.Core" Version="23.334.19090" />
   </ItemGroup>
 </Project>

+ 1 - 1
src/YSAI.Mitsubishi/MitsubishiOperate.cs

@@ -893,7 +893,7 @@ namespace YSAI.Mitsubishi
                         }
                     }
                     //数据处理
-                    AddressValue addressValue = Core.handler.AddressHandler.ExecuteDispose(item, Value?.ToString());
+                    AddressValue addressValue = Core.handler.AddressHandler.ExecuteDispose(item, Value);
 
                     //数据添加
                     param.AddOrUpdate(item.AddressName, addressValue, (k, v) => addressValue);

+ 2 - 2
src/YSAI.Mitsubishi/YSAI.Mitsubishi.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -16,7 +16,7 @@
     <Description>$(DescriptionType):$(DescriptionName) ( $(DescriptionDetails) )</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="23.334.14260" />
+    <PackageReference Include="YSAI.Core" Version="23.334.19090" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\YSAI.Modbus\YSAI.Modbus.csproj" />

+ 11 - 11
src/YSAI.Modbus/ModbusOperate.cs

@@ -496,7 +496,7 @@ namespace YSAI.Modbus
                     }
 
                     //数据处理
-                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value?.ToString());
+                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value);
 
                     //数据添加
                     param.AddOrUpdate(add.AddressName, addressValue, (k, v) => addressValue);
@@ -582,7 +582,7 @@ namespace YSAI.Modbus
                     }
 
                     //数据处理
-                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value?.ToString());
+                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value);
 
                     //数据添加
                     param.AddOrUpdate(add.AddressName, addressValue, (k, v) => addressValue);
@@ -668,7 +668,7 @@ namespace YSAI.Modbus
                         }
                     }
                     //数据处理
-                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value?.ToString());
+                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value);
 
                     //数据添加
                     param.AddOrUpdate(add.AddressName, addressValue, (k, v) => addressValue);
@@ -756,7 +756,7 @@ namespace YSAI.Modbus
                     }
 
                     //数据处理
-                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value?.ToString());
+                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value);
 
                     //数据添加
                     param.AddOrUpdate(add.AddressName, addressValue, (k, v) => addressValue);
@@ -1071,7 +1071,7 @@ namespace YSAI.Modbus
                         }
                     }
                     //数据处理
-                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value?.ToString());
+                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value);
 
                     //数据添加
                     param.AddOrUpdate(add.AddressName, addressValue, (k, v) => addressValue);
@@ -1140,7 +1140,7 @@ namespace YSAI.Modbus
                         }
                     }
                     //数据处理
-                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value?.ToString());
+                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value);
 
                     //数据添加
                     param.AddOrUpdate(add.AddressName, addressValue, (k, v) => addressValue);
@@ -1209,7 +1209,7 @@ namespace YSAI.Modbus
                         }
                     }
                     //数据处理
-                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value?.ToString());
+                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value);
 
                     //数据添加
                     param.AddOrUpdate(add.AddressName, addressValue, (k, v) => addressValue);
@@ -1278,7 +1278,7 @@ namespace YSAI.Modbus
                         }
                     }
                     //数据处理
-                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value?.ToString());
+                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value);
 
                     //数据添加
                     param.AddOrUpdate(add.AddressName, addressValue, (k, v) => addressValue);
@@ -1347,7 +1347,7 @@ namespace YSAI.Modbus
                         }
                     }
                     //数据处理
-                    AddressValue addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value?.ToString());
+                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value);
 
                     //数据添加
                     param.AddOrUpdate(add.AddressName, addressValue, (k, v) => addressValue);
@@ -1416,7 +1416,7 @@ namespace YSAI.Modbus
                         }
                     }
                     //数据处理
-                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value?.ToString());
+                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value);
 
                     //数据添加
                     param.AddOrUpdate(add.AddressName, addressValue, (k, v) => addressValue);
@@ -1902,7 +1902,7 @@ namespace YSAI.Modbus
                         }
 
                         //数据处理
-                        AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value?.ToString());
+                        AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(add, Value);
                         //数据添加
                         param.AddOrUpdate(add.AddressName, addressValue, (k, v) => addressValue);
                     }

+ 2 - 2
src/YSAI.Modbus/YSAI.Modbus.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -18,6 +18,6 @@
   <ItemGroup>
     <PackageReference Include="NModbus" Version="3.0.81" />
     <PackageReference Include="NModbus.Serial" Version="3.0.81" />
-    <PackageReference Include="YSAI.Core" Version="23.334.14260" />
+    <PackageReference Include="YSAI.Core" Version="23.334.19090" />
   </ItemGroup>
 </Project>

+ 2 - 2
src/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -18,6 +18,6 @@
   <ItemGroup>
     <PackageReference Include="MQTTnet" Version="4.3.1.873" />
     <PackageReference Include="MQTTnet.AspNetCore" Version="4.3.1.873" />
-    <PackageReference Include="YSAI.Model" Version="23.334.13504" />
+    <PackageReference Include="YSAI.Model" Version="23.334.18639" />
   </ItemGroup>
 </Project>

+ 2 - 2
src/YSAI.NetMQ/YSAI.NetMQ.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -18,6 +18,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NetMQ" Version="4.0.1.13" />
-    <PackageReference Include="YSAI.Model" Version="23.334.13504" />
+    <PackageReference Include="YSAI.Model" Version="23.334.18639" />
   </ItemGroup>
 </Project>

+ 2 - 2
src/YSAI.Netty/YSAI.Netty.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -18,6 +18,6 @@
   <ItemGroup>
     <PackageReference Include="DotNetty.Handlers" Version="0.7.5" />
     <PackageReference Include="DotNetty.Transport" Version="0.7.5" />
-    <PackageReference Include="YSAI.Model" Version="23.334.13504" />
+    <PackageReference Include="YSAI.Model" Version="23.334.18639" />
   </ItemGroup>
 </Project>

+ 1 - 1
src/YSAI.Omron/OmronOperate.cs

@@ -759,7 +759,7 @@ namespace YSAI.Omron
                         }
                     }
                     //数据处理
-                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(item, Value?.ToString());
+                    AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(item, Value);
 
                     //数据添加
                     param.AddOrUpdate(item.AddressName, addressValue, (k, v) => addressValue);

+ 2 - 2
src/YSAI.Omron/YSAI.Omron.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -16,6 +16,6 @@
     <Description>$(DescriptionType):$(DescriptionName) ( $(DescriptionDetails) )</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="23.334.14260" />
+    <PackageReference Include="YSAI.Core" Version="23.334.19090" />
   </ItemGroup>
 </Project>

+ 2 - 2
src/YSAI.Opc/YSAI.Opc.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11250</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -17,6 +17,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.372.76" />
-    <PackageReference Include="YSAI.Core" Version="23.334.14260" />
+    <PackageReference Include="YSAI.Core" Version="23.334.19090" />
   </ItemGroup>
 </Project>

+ 3 - 3
src/YSAI.Opc/da/client/OpcDaClientOperate.cs

@@ -650,7 +650,7 @@ namespace YSAI.Opc.da.client
                                         ConcurrentDictionary<string, AddressValue> param = new ConcurrentDictionary<string, AddressValue>();
 
                                         //处理数据
-                                        AddressValue? addressValue = YSAI.Core.handler.AddressHandler.ExecuteDispose(addressDetails, item.Value?.ToString());  //数据
+                                        AddressValue? addressValue = YSAI.Core.handler.AddressHandler.ExecuteDispose(addressDetails, item.Value);  //数据
 
                                         //添加至集合
                                         param.AddOrUpdate(addressDetails.AddressName, addressValue, (k, v) => addressValue);
@@ -832,7 +832,7 @@ namespace YSAI.Opc.da.client
                             object? Value = VAM.Read(item);
 
                             //数据处理
-                            AddressValue? addressValue = YSAI.Core.handler.AddressHandler.ExecuteDispose(item, Value?.ToString());
+                            AddressValue? addressValue = YSAI.Core.handler.AddressHandler.ExecuteDispose(item, Value);
 
                             //数据添加
                             param.AddOrUpdate(item.AddressName, addressValue, (k, v) => addressValue);
@@ -856,7 +856,7 @@ namespace YSAI.Opc.da.client
                                 object? Value = itemValue[i].Value;
 
                                 //数据处理
-                                AddressValue? addressValue = YSAI.Core.handler.AddressHandler.ExecuteDispose(address.AddressArray[i], Value?.ToString());
+                                AddressValue? addressValue = YSAI.Core.handler.AddressHandler.ExecuteDispose(address.AddressArray[i], Value);
 
                                 //数据添加
                                 param.AddOrUpdate(itemValue[i].ItemName, addressValue, (k, v) => addressValue);

+ 3 - 3
src/YSAI.Opc/da/http/OpcDaHttpOperate.cs

@@ -346,7 +346,7 @@ namespace YSAI.Opc.da.http
                     {
                         object? Value = VAM.Read(addressDetails.AddressName);
 
-                        nodes.TryAdd(addressDetails.AddressName, AddressHandler.ExecuteDispose(addressDetails, Value?.ToString()));
+                        nodes.TryAdd(addressDetails.AddressName, AddressHandler.ExecuteDispose(addressDetails, Value));
                     }
                     else
                     {
@@ -377,13 +377,13 @@ namespace YSAI.Opc.da.http
                                     if (read.ReadGroup)  //直接读取组下面的数据
                                     {
                                         //处理
-                                        nodes.TryAdd(itemvalues.itemname, AddressHandler.ExecuteDispose(addressDetails, Value?.ToString()));
+                                        nodes.TryAdd(itemvalues.itemname, AddressHandler.ExecuteDispose(addressDetails, Value));
                                     }
                                     else  //读取单个节点数据
                                     {
                                         if (addressDetails.AddressName.Equals(itemvalues.itemname))
                                         {
-                                            nodes.TryAdd(itemvalues.itemname, AddressHandler.ExecuteDispose(addressDetails, Value?.ToString()));
+                                            nodes.TryAdd(itemvalues.itemname, AddressHandler.ExecuteDispose(addressDetails, Value));
                                         }
                                     }
                                 }

+ 4 - 4
src/YSAI.Opc/ua/client/OpcUaClientOperate.cs

@@ -1438,8 +1438,8 @@ namespace YSAI.Opc.ua.client
                                 //设置参数
                                 ConcurrentDictionary<string, AddressValue> param = new ConcurrentDictionary<string, AddressValue>();
                                 //处理数据
-                                AddressValue? addressValue = AddressHandler.ExecuteDispose(queueData.addressDetails, value?.ToString());  //数据
-                                                                                                                                          //添加或更新
+                                AddressValue? addressValue = AddressHandler.ExecuteDispose(queueData.addressDetails, value);  //数据
+                                                                                                                              //添加或更新
                                 param.AddOrUpdate(queueData.addressDetails.AddressName, addressValue, (k, v) => addressValue);
 
                                 //响应
@@ -1857,7 +1857,7 @@ namespace YSAI.Opc.ua.client
                         object? Value = VAM.Read(item);
 
                         //数据处理
-                        AddressValue addressValue = AddressHandler.ExecuteDispose(item, Value?.ToString());
+                        AddressValue addressValue = AddressHandler.ExecuteDispose(item, Value);
 
                         //数据添加
                         param.AddOrUpdate(item.AddressName, addressValue, (k, v) => addressValue);
@@ -1883,7 +1883,7 @@ namespace YSAI.Opc.ua.client
                             object? Value = read.Results[i];
 
                             //数据处理
-                            AddressValue? addressValue = AddressHandler.ExecuteDispose(addressDetails, Value?.ToString());
+                            AddressValue? addressValue = AddressHandler.ExecuteDispose(addressDetails, Value);
 
                             //数据添加
                             param.AddOrUpdate(addressDetails.AddressName, addressValue, (k, v) => addressValue);

+ 2 - 2
src/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -17,6 +17,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.7.0" />
-    <PackageReference Include="YSAI.Model" Version="23.334.13504" />
+    <PackageReference Include="YSAI.Model" Version="23.334.18639" />
   </ItemGroup>
 </Project>

+ 2 - 2
src/YSAI.Redis/YSAI.Redis.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -17,6 +17,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="StackExchange.Redis" Version="2.7.4" />
-    <PackageReference Include="YSAI.Model" Version="23.334.13504" />
+    <PackageReference Include="YSAI.Model" Version="23.334.18639" />
   </ItemGroup>
 </Project>

+ 1 - 1
src/YSAI.RelayManage/YSAI.RelayManage.csproj

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

+ 1 - 1
src/YSAI.Rest/YSAI.Rest.csproj

@@ -17,6 +17,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.7.0" />
-    <PackageReference Include="YSAI.Model" Version="23.334.13504" />
+    <PackageReference Include="YSAI.Model" Version="23.334.18639" />
   </ItemGroup>
 </Project>

+ 2 - 2
src/YSAI.Rpc/YSAI.Rpc.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -18,6 +18,6 @@
   <ItemGroup>
     <PackageReference Include="DotNetty.Codecs" Version="0.7.5" />
     <PackageReference Include="ImpromptuInterface" Version="8.0.4" />
-    <PackageReference Include="YSAI.Model" Version="23.334.13504" />
+    <PackageReference Include="YSAI.Model" Version="23.334.18639" />
   </ItemGroup>
 </Project>

+ 1 - 1
src/YSAI.Siemens/SiemensOperate.cs

@@ -264,7 +264,7 @@ namespace YSAI.Siemens
                         }
 
                         //数据处理
-                        AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(item, Value?.ToString());
+                        AddressValue? addressValue = Core.handler.AddressHandler.ExecuteDispose(item, Value);
 
                         //数据添加
                         param.AddOrUpdate(item.AddressName, addressValue, (k, v) => addressValue);

+ 2 - 2
src/YSAI.Siemens/YSAI.Siemens.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.333.11249</Version>
+    <Version>23.334.19910</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>
@@ -17,6 +17,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="S7netplus" Version="0.20.0" />
-    <PackageReference Include="YSAI.Core" Version="23.334.14260" />
+    <PackageReference Include="YSAI.Core" Version="23.334.19090" />
   </ItemGroup>
 </Project>

+ 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="23.334.14260" />
+	<PackageReference Include="YSAI.Core" Version="23.334.19090" />
   </ItemGroup>
 
   <ItemGroup>

+ 21 - 21
src/YSAI.VT/Program.cs

@@ -18,30 +18,30 @@ namespace YSAI.VT
                 //"YSAI.Unility",
                 //"YSAI.Log",
 
-                "YSAI.Model",
+                //"YSAI.Model",
 
                 //"YSAI.Core",
 
-                //"YSAI.Rpc",
-                //"YSAI.Redis",
-
-                //"YSAI.Kafka",
-                //"YSAI.Mqtt",
-                //"YSAI.NetMQ",
-                //"YSAI.Netty",
-                //"YSAI.RabbitMQ",
-                //////////"YSAI.Rest",
-
-                //"YSAI.AllenBradley",
-                //"YSAI.Beckhoff",
-                //"YSAI.Can",
-                //"YSAI.DB",
-                //"YSAI.Mewtocol",
-                //"YSAI.Mitsubishi",
-                //"YSAI.Modbus",
-                //"YSAI.Omron",
-                //"YSAI.Opc",
-                //"YSAI.Siemens",
+                "YSAI.Rpc",
+                "YSAI.Redis",
+
+                "YSAI.Kafka",
+                "YSAI.Mqtt",
+                "YSAI.NetMQ",
+                "YSAI.Netty",
+                "YSAI.RabbitMQ",
+                ////////"YSAI.Rest",
+
+                "YSAI.AllenBradley",
+                "YSAI.Beckhoff",
+                "YSAI.Can",
+                "YSAI.DB",
+                "YSAI.Mewtocol",
+                "YSAI.Mitsubishi",
+                "YSAI.Modbus",
+                "YSAI.Omron",
+                "YSAI.Opc",
+                "YSAI.Siemens",
 
 #endif
             };