1

src/YSAI.DAQ/YSAI.Kafka/KafkaData.cs

@@ -90,36 +90,5 @@ namespace YSAI.Kafka
                 }
             }
         }
-
-        /// <summary>
-        /// 消费订阅得到的数据
-        /// </summary>
-        public class ConsumeData<K, V>
-        {
-            /// <summary>
-            /// 消息
-            /// </summary>
-            public string? Message { get; set; }
-            /// <summary>
-            /// 状态
-            /// </summary>
-            public bool State { get; set; }
-            /// <summary>
-            /// 主题
-            /// </summary>
-            public string Topic { get; set; }
-            /// <summary>
-            /// 键
-            /// </summary>
-            public K Key { get; set; }
-            /// <summary>
-            /// 值
-            /// </summary>
-            public V Value { get; set; }
-            /// <summary>
-            /// 时间
-            /// </summary>
-            public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
-        }
     }
 }

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

src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Kafka.xml

@@ -41,41 +41,6 @@
             <param name="obj"></param>
             <returns></returns>
         </member>
-        <member name="T:YSAI.Kafka.KafkaData.ConsumeData`2">
-            <summary>
-            消费订阅得到的数据
-            </summary>
-        </member>
-        <member name="P:YSAI.Kafka.KafkaData.ConsumeData`2.Message">
-            <summary>
-            消息
-            </summary>
-        </member>
-        <member name="P:YSAI.Kafka.KafkaData.ConsumeData`2.State">
-            <summary>
-            状态
-            </summary>
-        </member>
-        <member name="P:YSAI.Kafka.KafkaData.ConsumeData`2.Topic">
-            <summary>
-            主题
-            </summary>
-        </member>
-        <member name="P:YSAI.Kafka.KafkaData.ConsumeData`2.Key">
-            <summary>
-            键
-            </summary>
-        </member>
-        <member name="P:YSAI.Kafka.KafkaData.ConsumeData`2.Value">
-            <summary>
-            值
-            </summary>
-        </member>
-        <member name="P:YSAI.Kafka.KafkaData.ConsumeData`2.Time">
-            <summary>
-            时间
-            </summary>
-        </member>
         <member name="M:YSAI.Kafka.KafkaOperate.Instance(YSAI.Kafka.KafkaData.Basics)">
             <summary>
             单例模式

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

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

@@ -91,7 +91,7 @@ namespace YSAI.Mqtt.client
             DynamicObj.ClientID = arg.ClientId;
             DynamicObj.Topic = arg.ApplicationMessage.Topic;
             DynamicObj.Content = Encoding.UTF8.GetString(arg.ApplicationMessage.Payload);
-            OnEventHandler?.Invoke(this, new EventResult(true, $"{LogHead} ( {arg.ClientId} ) 接收到主题 ( {arg.ApplicationMessage.Topic} ) 内容 ( {DynamicObj.Content} )", DynamicObj, Core.@enum.ResultType.Dynamic));
+            OnEventHandler?.Invoke(this, new EventResult(true, $"{LogHead} 接收到主题 ( {arg.ApplicationMessage.Topic} ) 内容 ( {DynamicObj.Content} )", DynamicObj, Core.@enum.ResultType.Dynamic));
             await Task.CompletedTask;
         }
 

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

@@ -294,13 +294,12 @@ namespace YSAI.RabbitMQ
             dynamic DynamicObj = new ExpandoObject();
             DynamicObj.Content = Encoding.UTF8.GetString(e.Body.ToArray());
             DynamicObj.Topic = e.RoutingKey;
-            //Console.WriteLine((DynamicObj as object).ToJson());
             if (!AutoAck)
             {
                 //当自动确认为false，得手动确认消息
                 Channels[e.Exchange].BasicAck(e.DeliveryTag, false);
             }
-            OnEventHandler?.Invoke(this, new EventResult(true, $"消费成功，{(AutoAck ? "已自动确认" : "已手动确认")}", DynamicObj, Core.@enum.ResultType.Dynamic));
+            OnEventHandler?.Invoke(this, new EventResult(true, $"{LogHead} 接收到主题 ( {e.RoutingKey} ) 内容 ( {DynamicObj.Content} )", DynamicObj, 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.2</Version>
+	  <Version>1.0.0.3</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>