Commit 73baaa84 authored by Savorboard's avatar Savorboard

rename MessageBase to MessageContext

parent e1d1898f
...@@ -12,7 +12,7 @@ namespace DotNetCore.CAP.Kafka ...@@ -12,7 +12,7 @@ namespace DotNetCore.CAP.Kafka
private readonly KafkaOptions _kafkaOptions; private readonly KafkaOptions _kafkaOptions;
private Consumer<Null, string> _consumerClient; private Consumer<Null, string> _consumerClient;
public event EventHandler<MessageBase> MessageReceieved; public event EventHandler<MessageContext> MessageReceieved;
public IDeserializer<string> StringDeserializer { get; set; } public IDeserializer<string> StringDeserializer { get; set; }
...@@ -65,8 +65,9 @@ namespace DotNetCore.CAP.Kafka ...@@ -65,8 +65,9 @@ namespace DotNetCore.CAP.Kafka
private void ConsumerClient_OnMessage(object sender, Message<Null, string> e) private void ConsumerClient_OnMessage(object sender, Message<Null, string> e)
{ {
var message = new MessageBase var message = new MessageContext
{ {
Group = _groupId,
KeyName = e.Topic, KeyName = e.Topic,
Content = e.Value Content = e.Value
}; };
......
...@@ -17,7 +17,7 @@ namespace DotNetCore.CAP.RabbitMQ ...@@ -17,7 +17,7 @@ namespace DotNetCore.CAP.RabbitMQ
private IConnection _connection; private IConnection _connection;
private IModel _channel; private IModel _channel;
public event EventHandler<MessageBase> MessageReceieved; public event EventHandler<MessageContext> MessageReceieved;
public RabbitMQConsumerClient(string queueName, RabbitMQOptions options) public RabbitMQConsumerClient(string queueName, RabbitMQOptions options)
{ {
...@@ -77,8 +77,9 @@ namespace DotNetCore.CAP.RabbitMQ ...@@ -77,8 +77,9 @@ namespace DotNetCore.CAP.RabbitMQ
private void OnConsumerReceived(object sender, BasicDeliverEventArgs e) private void OnConsumerReceived(object sender, BasicDeliverEventArgs e)
{ {
var message = new MessageBase var message = new MessageContext
{ {
Group = _queueName,
KeyName = e.RoutingKey, KeyName = e.RoutingKey,
Content = Encoding.UTF8.GetString(e.Body) Content = Encoding.UTF8.GetString(e.Body)
}; };
......
...@@ -13,7 +13,7 @@ namespace DotNetCore.CAP.Abstractions ...@@ -13,7 +13,7 @@ namespace DotNetCore.CAP.Abstractions
/// </summary> /// </summary>
/// <param name="descriptor">consumer method descriptor. </param> /// <param name="descriptor">consumer method descriptor. </param>
/// <param name="message"> reveied message.</param> /// <param name="message"> reveied message.</param>
public ConsumerContext(ConsumerExecutorDescriptor descriptor, MessageBase message) public ConsumerContext(ConsumerExecutorDescriptor descriptor, MessageContext message)
{ {
ConsumerDescriptor = descriptor ?? throw new ArgumentNullException(nameof(descriptor)); ConsumerDescriptor = descriptor ?? throw new ArgumentNullException(nameof(descriptor));
DeliverMessage = message ?? throw new ArgumentNullException(nameof(message)); DeliverMessage = message ?? throw new ArgumentNullException(nameof(message));
...@@ -27,6 +27,6 @@ namespace DotNetCore.CAP.Abstractions ...@@ -27,6 +27,6 @@ namespace DotNetCore.CAP.Abstractions
/// <summary> /// <summary>
/// consumer reveived message. /// consumer reveived message.
/// </summary> /// </summary>
public MessageBase DeliverMessage { get; set; } public MessageContext DeliverMessage { get; set; }
} }
} }
\ No newline at end of file
...@@ -14,6 +14,6 @@ namespace DotNetCore.CAP ...@@ -14,6 +14,6 @@ namespace DotNetCore.CAP
void Listening(TimeSpan timeout); void Listening(TimeSpan timeout);
event EventHandler<MessageBase> MessageReceieved; event EventHandler<MessageContext> MessageReceieved;
} }
} }
\ No newline at end of file
namespace DotNetCore.CAP.Infrastructure namespace DotNetCore.CAP.Infrastructure
{ {
public class MessageBase public class MessageContext
{ {
public string Group { get; set; }
public string KeyName { get; set; } public string KeyName { get; set; }
public string Content { get; set; } public string Content { get; set; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment