版本更新

src/YSAI.DAQ/.dockerignore

@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

src/YSAI.DAQ/YSAI.Beckhoff/YSAI.Beckhoff.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.8</Version>
+		<Version>1.0.0.9</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.83" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.84" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

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.33</Version>
+	  <Version>1.0.0.34</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.83" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.84" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.DAQ.sln

@@ -107,7 +107,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Omron.Pack", "YSAI.Omr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Mitsubishi.Pack", "YSAI.Mitsubishi.Pack\YSAI.Mitsubishi.Pack.csproj", "{3573D496-3EE5-48B2-9060-E5306B5E3A94}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.NetMQ", "YSAI.NetMQ\YSAI.NetMQ.csproj", "{B703E19E-A1A7-4D7B-908A-C28B66512A8B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.NetMQ", "YSAI.NetMQ\YSAI.NetMQ.csproj", "{B703E19E-A1A7-4D7B-908A-C28B66512A8B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Test.Consoles", "YSAI.Test.Consoles\YSAI.Test.Consoles.csproj", "{11411FF2-2768-4216-8062-8B56461A010B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.NetMQ.Pack", "YSAI.NetMQ.Pack\YSAI.NetMQ.Pack.csproj", "{F41F510E-5D32-44A1-97A0-228B507DDA90}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -291,6 +295,14 @@ Global
 		{B703E19E-A1A7-4D7B-908A-C28B66512A8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B703E19E-A1A7-4D7B-908A-C28B66512A8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B703E19E-A1A7-4D7B-908A-C28B66512A8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11411FF2-2768-4216-8062-8B56461A010B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11411FF2-2768-4216-8062-8B56461A010B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11411FF2-2768-4216-8062-8B56461A010B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11411FF2-2768-4216-8062-8B56461A010B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F41F510E-5D32-44A1-97A0-228B507DDA90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F41F510E-5D32-44A1-97A0-228B507DDA90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F41F510E-5D32-44A1-97A0-228B507DDA90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F41F510E-5D32-44A1-97A0-228B507DDA90}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -344,6 +356,8 @@ Global
 		{5EB13A98-97E5-4848-A5F3-D90974AA76A8} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 		{3573D496-3EE5-48B2-9060-E5306B5E3A94} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 		{B703E19E-A1A7-4D7B-908A-C28B66512A8B} = {9D8EDBBA-7A97-4D84-9B12-7FCC2F834046}
+		{11411FF2-2768-4216-8062-8B56461A010B} = {12CB0510-7B1E-4518-AA3B-412A4D323D42}
+		{F41F510E-5D32-44A1-97A0-228B507DDA90} = {1EBA4FD7-DF52-49A0-8AA4-9E61ABC614F5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5D5D3927-6714-40C0-84EA-44C5BA4C5E87}

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.33</Version>
+	  <Version>1.0.0.34</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.83" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.84" />
 	</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.83" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.84" />
 	</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.34</Version>
+	  <Version>1.0.0.35</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.83" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.84" />
   </ItemGroup>
 	
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Beckhoff.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "5613CD5D815449FA8D86F77CA4727C68",
+    "SN": "4D6C4F9EC5BA4395AAF2E37CB1E16B4D",
     "AmsNetID": "192.168.66.130.1.1",
     "Port": 851,
     "TaskNumber": 5,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Can.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "51F6B6D32E034A46B5F90F5621777D16",
+    "SN": "D6F5C158C13B4D11866E100F93930330",
     "BaudRate": 0,
     "CanChannel": 0,
     "HandleInterval": 1000,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.DB.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "711D5EAC37394A1F8B15FCFD675DFD0A",
+    "SN": "AC4FAD97C3E94422859656D5907B23B5",
     "ConnectStr": null,
     "DBType": "SqlServer",
     "HandleInterval": 1000,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Kafka.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "DB3DA14DD1FE4461ADEE7416BB378F26",
+    "SN": "6DAA493FFA7E45A6B93BE91211E4763E",
     "BootstrapServers": null,
     "WaitTime": 1000,
     "SecurityProtocol": "Plaintext",

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Mitsubishi.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "03A06B5FF78340B79E146FCBC1541B2E",
+    "SN": "2D7D20DCBE8E4066ABB86F6A401CB6F8",
     "Ip": "127.0.0.1",
     "Port": 6688,
     "InterruptReconnection": true,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Modbus.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "ACA40825B5FE44E7A76DCC06D495933A",
+    "SN": "B5D247FFD01046FA8A76349AD09649D4",
     "SlaveAddress": 1,
     "ProtocolType": "Tcp",
     "ReadTimeOut": 2000,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Mqtt.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "92337887C0D744E89EF5CE04F3AF13C0",
+    "SN": "532C1F703AA2434A8060022217DEEF3C",
     "Ip": null,
     "Port": 0,
     "UserName": null,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.NetMQ.Param.json

@@ -0,0 +1,6 @@
+{
+    "SAddress": "tcp://127.0.0.1:8866",
+    "PAddress": "tcp://127.0.0.1:8866",
+    "ReceiveHighWatermark": 1000,
+    "TimeOut": 1000
+}

src/YSAI.DAQ/YSAI.Manage/param/YSAI.NetMQ.ParamDetails.json

@@ -0,0 +1,30 @@
+[
+    {
+        "Name": "SAddress",
+        "Describe": "订阅地址",
+        "ParamType": "String",
+        "EnumArray": null,
+        "ObjArray": null
+    },
+    {
+        "Name": "PAddress",
+        "Describe": "发布地址",
+        "ParamType": "String",
+        "EnumArray": null,
+        "ObjArray": null
+    },
+    {
+        "Name": "ReceiveHighWatermark",
+        "Describe": "队列大小",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
+    },
+    {
+        "Name": "TimeOut",
+        "Describe": "超时时间",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
+    }
+]

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Netty.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "E7A293E138134535BD8BEA4FCBB96509",
+    "SN": "7023784F33F948B89CD40650B70005F2",
     "Host": null,
     "Port": 0,
     "SslFilePath": null,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Omron.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "AD959336358148D194AC7A2638FF8C45",
+    "SN": "4DE688731B15438AB527B75D517CED01",
     "Ip": "127.0.0.1",
     "Port": 6688,
     "InterruptReconnection": true,
@@ -7,7 +7,7 @@
     "Timeout": 1000,
     "UnitAddress": 0,
     "SA1": 11,
-    "PType": "Fins",
+    "PType": "FINS",
     "EFormat": "CDAB",
     "HandleInterval": 1000,
     "ChangeOut": true,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Omron.ParamDetails.json

@@ -62,7 +62,7 @@
         "EnumArray": [
             {
                 "Value": 0,
-                "Name": "Fins",
+                "Name": "FINS",
                 "Describe": "欧姆龙FINS"
             }
         ],

src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDa.Param.json

@@ -1,6 +1,6 @@
 {
     "SubscribeSingleGroupMaxCount": 0,
-    "SN": "B97DDD1C7E3B4486BBB66332C3BF6BFF",
+    "SN": "88A9FA325BE2494D83FB29DA968D22E0",
     "SName": "Knight.OPC.Server.Demo",
     "ApiVerType": "COM_DA_30",
     "UpdateRate": 100,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDaHttp.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "9B24D0EAFAA84A30A710B0F4204CAD33",
+    "SN": "37CC2EB5EC134E6E8D409D7589F8427F",
     "Ip": "127.0.0.1",
     "Port": 6688,
     "Key": null,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcUa.Param.json

@@ -1,12 +1,12 @@
 {
     "SubscribeSingleGroupMaxCount": 0,
-    "SN": "519334EF3867403989D197B291050ABF",
+    "SN": "939A6F68B1DC49DD99A73A731CCC9410",
     "UserName": null,
     "Password": null,
     "Cer": null,
     "SecreKey": null,
     "ServerUrl": null,
-    "CustomName": "d0937d05e91c45b0a9d6dd2276a31005",
+    "CustomName": "8f538ef4f3db4e01afa6d5990cdf7806",
     "Timeout": 5000,
     "SamplingInterval": 100,
     "PublishingInterval": 1000,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.RabbitMQ.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "F536D52BB0F246E3943F3D9999634F80",
+    "SN": "6840C33CC2A64A4B9E0FEE7D5A98045E",
     "ExChangeName": null,
     "HostName": null,
     "Port": 0,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.S7.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "6FF7E1B9379A4E478625460EAB45E31C",
+    "SN": "113A7A7EBDB046F6B9C5E04A3BB03DFA",
     "Ip": null,
     "Port": 0,
     "S7CpuType": "S7200",

src/YSAI.DAQ/YSAI.Mitsubishi/YSAI.Mitsubishi.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.1</Version>
+		<Version>1.0.0.2</Version>
 		<Authors>Shun</Authors>
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.83" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.84" />
   </ItemGroup>
 
 </Project>

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.34</Version>
+	  <Version>1.0.0.35</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.83" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.84" />
   </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.36</Version>
+	  <Version>1.0.0.37</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.83" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.84" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.NetMQ.Pack/Program.cs

@@ -0,0 +1,27 @@
+using YSAI.Unility;
+
+namespace YSAI.NetMQ.Pack
+{
+    internal class Program
+    {
+        static void Main(string[] args)
+        {
+            string FileDirectory = string.Empty;
+            string[] paths = AppDomain.CurrentDomain.BaseDirectory.Split('\\');
+            for (int i = 0; i < paths.Length - 5; i++)
+            {
+                FileDirectory += $"{paths[i]}//";
+            }
+            FileDirectory += "YSAI.Manage//param";
+            string Name = "YSAI.NetMQ";
+            string ParamFile = $"{FileDirectory}//{Name}.Param.json";
+            string ParamDetailsFile = $"{FileDirectory}//{Name}.ParamDetails.json";
+            if (!Directory.Exists(FileDirectory))
+            {
+                Directory.CreateDirectory(FileDirectory);
+            }
+            FileTool.StringToFile(ParamFile, new NetMQData.Basics().ToJson().JsonFormatting());
+            FileTool.StringToFile(ParamDetailsFile, ReflexTool.GetClassAllPropertyData<NetMQData.Basics>().ToJson().JsonFormatting());
+        }
+    }
+}

src/YSAI.DAQ/YSAI.NetMQ/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\YSAI.Publish\Release\net6.0\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+  </PropertyGroup>
+</Project>

src/YSAI.DAQ/YSAI.NetMQ/YSAI.NetMQ.csproj

@@ -1,14 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+		<Version>1.0.0.1</Version>
+		<Authors>Shun</Authors>
+		<Company>YSAI</Company>
+		<Product>SCADA</Product>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
+	</PropertyGroup>
 
-  <ItemGroup>
+
+	<ItemGroup>
     <PackageReference Include="NetMQ" Version="4.0.1.13" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.83" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.84" />
   </ItemGroup>
 
 </Project>

src/YSAI.DAQ/YSAI.Netty/YSAI.Netty.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.8</Version>
+		<Version>1.0.0.9</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.83" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.84" />
 	</ItemGroup>
 </Project>

src/YSAI.DAQ/YSAI.Omron/YSAI.Omron.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.1</Version>
+		<Version>1.0.0.2</Version>
 		<Authors>Shun</Authors>
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>
@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="YSAI.Core" Version="1.0.0.83" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.84" />
 	</ItemGroup>
 
 </Project>

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.45</Version>
+	  <Version>1.0.0.46</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.83" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.84" />
   </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.35</Version>
+	  <Version>1.0.0.36</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.83" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.84" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/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.83" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.84" />
 		<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.32</Version>
+	  <Version>1.0.0.33</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.83" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.84" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Test.All/Program.cs

@@ -1,14 +1,14 @@
-
+Console.WriteLine();
 //Console.WriteLine(DateTime.Parse($"{0}:{0}:{0}.{123}").ToString("HH:mm:ss:fff"));
 
-using YSAI.Unility;
+//using YSAI.Unility;
 
-while (true)
-{
-    TimeTool.Instance("1").StartRecord();
-    Thread.Sleep(100);
-    Console.WriteLine(TimeTool.Instance("1").StopRecord().milliseconds);
-}
+//while (true)
+//{
+//    TimeTool.Instance("1").StartRecord();
+//    Thread.Sleep(100);
+//    Console.WriteLine(TimeTool.Instance("1").StopRecord().milliseconds);
+//}
 
 
 //using NetMQ;
@@ -45,7 +45,8 @@ while (true)
 //using YSAI.Unility;
 //string topic = "666";
 //string topic1 = "777";
-//int count = 1;
+//int 发 = 1;
+//int 收 = 1;
 
 //NetMQOperate netMQClientOperate = NetMQOperate.Instance(new NetMQData.Basics());
 //Console.WriteLine(netMQClientOperate.On().ToJson().JsonFormatting());
@@ -53,23 +54,15 @@ while (true)
 //netMQClientOperate.OnEvent += NetMQClientOperate_OnEvent;
 
 //Console.WriteLine(netMQClientOperate.Subscribe(topic).ToJson().JsonFormatting());
-//Console.WriteLine(netMQClientOperate.Subscribe(topic1).ToJson().JsonFormatting());
-
+////Console.WriteLine(netMQClientOperate.Subscribe(topic1).ToJson().JsonFormatting());
+//Console.ReadLine();
 //while (true)
 //{
-//    Console.ReadLine();
-
+//    发++;
 //    netMQClientOperate.Produce(topic, new Random().NextDouble().ToString());
-//    netMQClientOperate.Produce(topic1, new Random().NextDouble().ToString());
-//    count++;
-
-
-//    if (count == 10)
-//    {
-//        Console.WriteLine(netMQClientOperate.UnSubscribe(topic).State);
-//        Console.WriteLine(netMQClientOperate.UnSubscribe(topic1).State);
-//        break;
-//    }
+//    //netMQClientOperate.Produce(topic1, new Random().NextDouble().ToString());
+//    Console.WriteLine($"[ 发 ] - {发}");
+//    Thread.Sleep(1);
 //}
 
 //Console.ReadKey();
@@ -77,7 +70,9 @@ while (true)
 
 //void NetMQClientOperate_OnEvent(object? sender, YSAI.Core.data.EventResult e)
 //{
-//    Console.WriteLine(e.ToJson());
+//    收++;
+//    //Console.WriteLine(e.ToJson());
+//    Console.WriteLine($"[ 收 ] - {收}");
 //}
 
 

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

@@ -13,8 +13,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\YSAI.Unility\YSAI.Unility.csproj" />
+    <ProjectReference Include="..\YSAI.NetMQ\YSAI.NetMQ.csproj" />
   </ItemGroup>
 
 
+
 </Project>

src/YSAI.DAQ/YSAI.Test.Consoles/Program.cs

@@ -0,0 +1,10 @@
+namespace YSAI.Test.Consoles
+{
+    internal class Program
+    {
+        static void Main(string[] args)
+        {
+            Console.WriteLine("Hello, World!");
+        }
+    }
+}

src/YSAI.DAQ/YSAI.Test.Consoles/YSAI.Test.Consoles.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>
+    <PackageReference Include="NetMQ" Version="4.0.1.13" />
+  </ItemGroup>
+
+</Project>

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