版本更新

src/YSAI.DAQ/YSAI.Can/YSAI.Can.csproj

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

src/YSAI.DAQ/YSAI.Core/handler/AddressHandler.cs

@@ -1,7 +1,5 @@
 using YSAI.Core.data;
-using YSAI.Core.@enum;
 using YSAI.Core.reflection;
-using YSAI.Core.script;
 using YSAI.Log;
 using YSAI.Unility;
 
@@ -71,6 +69,6 @@ namespace YSAI.Core.handler
             return null;
         }
 
-        
+
     }
 }

src/YSAI.DAQ/YSAI.Core/handler/ParseHandler.cs

@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using YSAI.Core.data;
 using YSAI.Core.@enum;
-using YSAI.Core.data;
 using YSAI.Core.reflection;
 using YSAI.Core.script;
 using YSAI.Log;

src/YSAI.DAQ/YSAI.Core/handler/RelayHandler.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using YSAI.Core.data;
+using YSAI.Core.data;
 using YSAI.Core.reflection;
 
 namespace YSAI.Core.handler

src/YSAI.DAQ/YSAI.DB/YSAI.DB.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.15</Version>
+	  <Version>1.0.0.16</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.36" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.37" />
 	</ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

src/YSAI.DAQ/YSAI.DaqManage/YSAI.DaqManage.csproj

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

src/YSAI.DAQ/YSAI.Kafka/YSAI.Kafka.csproj

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

src/YSAI.DAQ/YSAI.Manage/Controllers/RelayOperateController.cs

@@ -19,7 +19,7 @@ namespace YSAI.Manage.Controllers
         [HttpPost]
         public OperateResult On(string ISn)
         {
-            return AddressHandler.On(ISn);
+            return RelayHandler.On(ISn);
         }
 
         /// <summary>
@@ -30,7 +30,7 @@ namespace YSAI.Manage.Controllers
         [HttpPost]
         public OperateResult Off(string ISn)
         {
-            return AddressHandler.Off(ISn);
+            return RelayHandler.Off(ISn);
         }
 
         /// <summary>
@@ -40,7 +40,7 @@ namespace YSAI.Manage.Controllers
         [HttpPost]
         public List<string>? TypeSns()
         {
-            return AddressHandler.TypeSns();
+            return RelayHandler.TypeSns();
         }
 
         /// <summary>
@@ -50,7 +50,7 @@ namespace YSAI.Manage.Controllers
         [HttpPost]
         public List<string>? InstanceSns()
         {
-            return AddressHandler.InstanceSns();
+            return RelayHandler.InstanceSns();
         }
 
         /// <summary>
@@ -61,7 +61,7 @@ namespace YSAI.Manage.Controllers
         [HttpPost]
         public OperateResult DisposeISn(string ISn)
         {
-            return AddressHandler.DisposeISn(ISn);
+            return RelayHandler.DisposeISn(ISn);
         }
 
         /// <summary>
@@ -72,7 +72,7 @@ namespace YSAI.Manage.Controllers
         [HttpPost]
         public OperateResult Remove(string ISn)
         {
-            return AddressHandler.RemoveISn(ISn);
+            return RelayHandler.RemoveISn(ISn);
         }
 
         /// <summary>
@@ -85,7 +85,7 @@ namespace YSAI.Manage.Controllers
         [HttpPost]
         public OperateResult Relay(string Topic, string Content, List<string>? ISns = null)
         {
-            return AddressHandler.Produce(Topic, Content, ISns);
+            return RelayHandler.Produce(Topic, Content, ISns);
         }
     }
 }

src/YSAI.DAQ/YSAI.Manage/Program.cs

@@ -28,7 +28,7 @@ namespace YSAI.Manage
             //´´½¨ÊµÀý
             daqManageOperate = DaqManageOperate.Instance();
             daqManageOperate.OnEvent += DaqEvent;
-            AddressHandler.RelayEventRegister(RelayEvent);
+            RelayHandler.RelayEventRegister(RelayEvent);
 
             var builder = WebApplication.CreateBuilder(args);
 

src/YSAI.DAQ/YSAI.Modbus/YSAI.Modbus.csproj

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

src/YSAI.DAQ/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.17</Version>
+	  <Version>1.0.0.18</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.36" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.37" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Opc/YSAI.Opc.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.19</Version>
+	  <Version>1.0.0.20</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.56" />
-	<PackageReference Include="YSAI.Core" Version="1.0.0.36" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.37" />
   </ItemGroup>
 
 

src/YSAI.DAQ/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.16</Version>
+	  <Version>1.0.0.17</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.5.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.36" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.37" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.RelayManage/YSAI.RelayManage.csproj

@@ -9,7 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="RabbitMQ.Client" Version="6.5.0" />
 		<PackageReference Include="Confluent.Kafka" Version="2.2.0" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.36" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.37" />
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 

src/YSAI.DAQ/YSAI.S7/YSAI.S7.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.15</Version>
+	  <Version>1.0.0.16</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.36" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.37" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/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.36" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.37" />
   </ItemGroup>
 
   <ItemGroup>