Shun 2 年 前
コミット
21c6d7eeac

+ 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.338.17728</Version>
+    <Version>23.338.19976</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.338.17220" />
+    <PackageReference Include="YSAI.Core" Version="23.338.19544" />
   </ItemGroup>
 </Project>

+ 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.338.17729</Version>
+    <Version>23.338.19977</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.338.17220" />
+    <PackageReference Include="YSAI.Core" Version="23.338.19544" />
   </ItemGroup>
 </Project>

+ 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.338.17729</Version>
+    <Version>23.338.19977</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.338.17220" />
+    <PackageReference Include="YSAI.Core" Version="23.338.19544" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Kvaser.CanLib">

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

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.338.17220</Version>
+    <Version>23.338.19544</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

+ 4 - 4
src/YSAI.Core/subscribe/SubscribeData.cs

@@ -26,9 +26,9 @@ namespace YSAI.Core.subscription
             public Address? Address { get; set; }
 
             /// <summary>
-            /// 执行方法的委托,读取方法,每个通信设备都应该存在
-            /// Address:请求参数
-            /// Task<OperateResult>:操作结果
+            /// 执行方法的委托,读取方法,每个通信设备都应该存在
+            /// Address:请求参数
+            /// OperateResult:操作结果
             /// </summary>
             public Func<Address, OperateResult>? Function { get; set; }
         }
@@ -44,7 +44,7 @@ namespace YSAI.Core.subscription
             [Description("处理间隔")]
             [Unit("ms")]
             [Display(true, true, true, ParamStructure.dataCate.unmber)]
-            public int HandleInterval { get; set; } = 1000;
+            public int HandleInterval { get; set; } = 100;
 
             /// <summary>
             /// 数据变化抛出 false则为实时数据

+ 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.338.17729</Version>
+    <Version>23.338.19977</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.338.17220" />
+    <PackageReference Include="YSAI.Core" Version="23.338.19544" />
   </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.338.17220" />
+		<PackageReference Include="YSAI.Core" Version="23.338.19544" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

+ 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.338.17729</Version>
+    <Version>23.338.19977</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.338.17220" />
+    <PackageReference Include="YSAI.Core" Version="23.338.19544" />
   </ItemGroup>
 </Project>

+ 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.338.17729</Version>
+    <Version>23.338.19977</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.338.17220" />
+    <PackageReference Include="YSAI.Core" Version="23.338.19544" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\YSAI.Modbus\YSAI.Modbus.csproj" />

+ 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.338.17729</Version>
+    <Version>23.338.19977</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.338.17220" />
+    <PackageReference Include="YSAI.Core" Version="23.338.19544" />
   </ItemGroup>
 </Project>

+ 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.338.17729</Version>
+    <Version>23.338.19977</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.338.17220" />
+    <PackageReference Include="YSAI.Core" Version="23.338.19544" />
   </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.338.17729</Version>
+    <Version>23.338.19977</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.338.17220" />
+    <PackageReference Include="YSAI.Core" Version="23.338.19544" />
   </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.338.17220" />
+		<PackageReference Include="YSAI.Core" Version="23.338.19544" />
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 

+ 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.338.17729</Version>
+    <Version>23.338.19977</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.338.17220" />
+    <PackageReference Include="YSAI.Core" Version="23.338.19544" />
   </ItemGroup>
 </Project>

+ 1 - 1
src/YSAI.Test.Console/Program.cs

@@ -695,7 +695,7 @@ SiemensOperate s7ClientOperate = SiemensOperate.Instance(new SiemensData.Basics(
     Slot = 1,
     CType = CpuType.S71200,
     ChangeOut = true,
-    HandleInterval = 1000,
+    HandleInterval = 100,
     SN = Guid.NewGuid().ToString()
 }); ;
 

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

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

@@ -22,26 +22,26 @@ namespace YSAI.VT
 
                 //"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
             };