转发协议包修改

src/YSAI.DAQ/YSAI.DAQ.sln

@@ -91,8 +91,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Tool", "YSAI.Tool\YSAI
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Test.All", "YSAI.Test.All\YSAI.Test.All.csproj", "{1CFDF4C1-53F7-4A32-B83D-4B99AFC95A8D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Test.Winform", "YSAI.Test.Winform\YSAI.Test.Winform.csproj", "{CF7C703A-2A1A-45B8-83DC-432C99AB6D2E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -239,10 +237,6 @@ Global
 		{1CFDF4C1-53F7-4A32-B83D-4B99AFC95A8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1CFDF4C1-53F7-4A32-B83D-4B99AFC95A8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1CFDF4C1-53F7-4A32-B83D-4B99AFC95A8D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF7C703A-2A1A-45B8-83DC-432C99AB6D2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF7C703A-2A1A-45B8-83DC-432C99AB6D2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF7C703A-2A1A-45B8-83DC-432C99AB6D2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF7C703A-2A1A-45B8-83DC-432C99AB6D2E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -287,7 +281,6 @@ Global
 		{E85BF19B-E671-4A1E-BC67-B545700B4BF1} = {1856E9E1-33C4-45C1-832C-854F9BE1ACC4}
 		{3C333E39-520D-4183-8E3D-D0FF6628C15E} = {1856E9E1-33C4-45C1-832C-854F9BE1ACC4}
 		{1CFDF4C1-53F7-4A32-B83D-4B99AFC95A8D} = {12CB0510-7B1E-4518-AA3B-412A4D323D42}
-		{CF7C703A-2A1A-45B8-83DC-432C99AB6D2E} = {12CB0510-7B1E-4518-AA3B-412A4D323D42}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5D5D3927-6714-40C0-84EA-44C5BA4C5E87}

src/YSAI.DAQ/YSAI.Kafka/KafkaOperate.cs

@@ -102,10 +102,10 @@ namespace YSAI.Kafka
                         if (result != null)
                         {
                             string Topic = result.Topic;
-                            string Content = result.Message.Value;
+                            object Content = result.Message.Value;
                             string Key = result.Message.Key;
                             long Offset = result.TopicPartitionOffset.Offset.Value;
-                            OnEventHandler(this, new EventResult(true, $"{LogHead} 接收到主题 ( {Topic} ) 内容 ( {Content} ) 键 ( {Key} ) 偏移量 ( {Offset} )", "{" + $"\"Topic\":\"{Topic}\",\"Content\":\"{Content}\",\"Key\":\"{Key}\",\"Offset\":\"{Offset}\"" + "}", Core.@enum.ResultType.Dynamic));
+                            OnEventHandler(this, new EventResult(true, $"{LogHead} 接收到主题 ( {Topic} ) 内容 ( {Content} ) 键 ( {Key} ) 偏移量 ( {Offset} )", "{" + $"\"Topic\":\"{Topic}\",\"Content\":{Content},\"Key\":\"{Key}\",\"Offset\":\"{Offset}\"" + "}", Core.@enum.ResultType.Dynamic));
                             //消息已处理提交偏移量
                             Consumer?.Commit(result);
                         }

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.18</Version>
+	  <Version>1.0.0.19</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>

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.20</Version>
+	  <Version>1.0.0.21</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>

src/YSAI.DAQ/YSAI.Mqtt/client/MqttClientOperate.cs

@@ -82,9 +82,9 @@ namespace YSAI.Mqtt.client
         private async Task MqttClient_ApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs arg)
         {
             string Topic = arg.ApplicationMessage.Topic;
-            string Content = Encoding.UTF8.GetString(arg.ApplicationMessage.Payload);
+            object Content = Encoding.UTF8.GetString(arg.ApplicationMessage.Payload);
             string ClientID = arg.ClientId;
-            OnEventHandler(this, new EventResult(true, $"{LogHead} 接收到主题 ( {Topic} ) 内容 ( {Content} )", "{" + $"\"Topic\":\"{Topic}\",\"Content\":\"{Content}\",\"ClientID\":\"{ClientID}\"" + "}", Core.@enum.ResultType.Dynamic));
+            OnEventHandler(this, new EventResult(true, $"{LogHead} 接收到主题 ( {Topic} ) 内容 ( {Content} )", "{" + $"\"Topic\":\"{Topic}\",\"Content\":{Content},\"ClientID\":\"{ClientID}\"" + "}", Core.@enum.ResultType.Dynamic));
             await Task.CompletedTask;
         }
 

src/YSAI.DAQ/YSAI.RabbitMQ/RabbitMQOperate.cs

@@ -289,8 +289,8 @@ namespace YSAI.RabbitMQ
                 Channels[e.Exchange].BasicAck(e.DeliveryTag, false);
             }
             string Topic = e.RoutingKey;
-            string Content = Encoding.UTF8.GetString(e.Body.ToArray());
-            OnEventHandler(this, new EventResult(true, $"{LogHead} 接收到主题 ( {Topic} ) 内容 ( {Content} )", "{" + $"\"Topic\":\"{Topic}\",\"Content\":\"{Content}\"" + "}", Core.@enum.ResultType.Dynamic));
+            object Content = Encoding.UTF8.GetString(e.Body.ToArray());
+            OnEventHandler(this, new EventResult(true, $"{LogHead} 接收到主题 ( {Topic} ) 内容 ( {Content} )", "{" + $"\"Topic\":\"{Topic}\",\"Content\":{Content}" + "}", Core.@enum.ResultType.Dynamic));
         }
         public Task<OperateResult> OnAsync()
         {

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.18</Version>
+	  <Version>1.0.0.19</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>

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

@@ -1,31 +1,28 @@
-using System.Text;
-using YSAI.Core.communication.net.tcp.client;
-using YSAI.Core.communication.net.tcp.service;
-using YSAI.Core.data;
-
-TcpClientOperate tcpClientOperate = TcpClientOperate.Instance(new TcpClientData.Basics
-{
-    Ip = "127.0.0.1",
-    Port = 1100,
-    InterruptReconnection = true,
-    SendWait = true,
-    SendWaitInterval = 5000
-});
-tcpClientOperate.OnEvent += TcpClientOperate_OnEvent;
-OperateResult operateResult = tcpClientOperate.On();
-Console.WriteLine(operateResult.Message);
-
-while (true)
-{
-    string message = Console.ReadLine();
-    operateResult = tcpClientOperate.Send(Encoding.Default.GetBytes(message));
-    Console.WriteLine(operateResult.Message);
-}
-
-void TcpClientOperate_OnEvent(object? sender, EventResult e)
-{
-    Console.WriteLine(e.Message);
-};
+
+
+//TcpClientOperate tcpClientOperate = TcpClientOperate.Instance(new TcpClientData.Basics
+//{
+//    Ip = "127.0.0.1",
+//    Port = 1100,
+//    InterruptReconnection = true,
+//    SendWait = true,
+//    SendWaitInterval = 5000
+//});
+//tcpClientOperate.OnEvent += TcpClientOperate_OnEvent;
+//OperateResult operateResult = tcpClientOperate.On();
+//Console.WriteLine(operateResult.Message);
+
+//while (true)
+//{
+//    string message = Console.ReadLine();
+//    operateResult = tcpClientOperate.Send(Encoding.Default.GetBytes(message));
+//    Console.WriteLine(operateResult.Message);
+//}
+
+//void TcpClientOperate_OnEvent(object? sender, EventResult e)
+//{
+//    Console.WriteLine(e.Message);
+//};
 
 //Console.WriteLine(Encoding.Default.GetString((byte[])ByteTool.HexStringToByteArray("58 44 34 20 53 20 20 20 20 20 20 35 2E 30 32 33 20 67 20 33 20 31 20 30 20 30 0D 0A")));;
 

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

@@ -1,16 +1,5 @@
 
 
-
-using S7.Net;
-using System.Collections.Concurrent;
-using YSAI.Core.data;
-using YSAI.Core.@enum;
-using YSAI.DB;
-using YSAI.Log;
-using YSAI.Mqtt.client;
-using YSAI.S7.client;
-using YSAI.Unility;
-
 ////采集
 //using (类 operate = new 类(new 类数据.Basics
 //{