🐛 Fixed some bugs of RabbitMQBus.

Author: catcherwong

build/releasenotes.props

@@ -46,8 +46,8 @@
         2. Update EasyCaching.Core.
         </EasyCachingRedisBusPackageNotes>
         <EasyCachingRabbitBusPackageNotes>
-        1. Modify the default section name.
-        2. Update EasyCaching.Core.
+        1. Fixed Options Bug.
+        2. Fixed Queue Bind Bug.
         </EasyCachingRabbitBusPackageNotes>
 	</PropertyGroup>
 </Project>

build/version.props

@@ -15,6 +15,6 @@
 		<EasyCachingCSRedisPackageVersion>0.5.1</EasyCachingCSRedisPackageVersion>
 		<EasyCachingRedisBusPackageVersion>0.5.1</EasyCachingRedisBusPackageVersion>
 		<EasyCachingCSRedisBusPackageVersion>0.5.1</EasyCachingCSRedisBusPackageVersion>
-		<EasyCachingRabbitBusPackageVersion>0.5.1</EasyCachingRabbitBusPackageVersion>
+		<EasyCachingRabbitBusPackageVersion>0.5.1.1</EasyCachingRabbitBusPackageVersion>
 	</PropertyGroup>
 </Project>

src/EasyCaching.Bus.RabbitMQ/Configurations/EasyCachingOptionsExtensions.cs

@@ -47,7 +47,7 @@ void configure(RabbitMQBusOptions x)
                 x.Port = busOptions.Port;
                 x.QueueMessageExpires = busOptions.QueueMessageExpires;
                 x.RequestedConnectionTimeout = busOptions.RequestedConnectionTimeout;
-                x.RouteKey = busOptions.RouteKey;
+                //x.RouteKey = busOptions.RouteKey;
                 x.SocketReadTimeout = busOptions.SocketReadTimeout;
                 x.SocketWriteTimeout = busOptions.SocketWriteTimeout;
                 x.TopicExchangeName = busOptions.TopicExchangeName;

src/EasyCaching.Bus.RabbitMQ/Configurations/RabbitMQBusOptions.cs

@@ -11,7 +11,7 @@ public class RabbitMQBusOptions : BaseRabbitMQOptions
         /// Gets or sets the route key.
         /// </summary>
         /// <value>The route key.</value>
-        public string RouteKey { get; set; } = "rmq.queue.undurable.easycaching.subscriber.*";
+        //public string RouteKey { get; set; } = "rmq.queue.undurable.easycaching.subscriber.*";
 
         /// <summary>
         /// Gets or sets the name of the queue.

src/EasyCaching.Bus.RabbitMQ/DefaultRabbitMQBus.cs

@@ -8,6 +8,7 @@
     using global::RabbitMQ.Client;
     using global::RabbitMQ.Client.Events;
     using Microsoft.Extensions.ObjectPool;
+    using Microsoft.Extensions.Options;
 
     /// <summary>
     /// Default RabbitMQ Bus.
@@ -52,10 +53,10 @@ public class DefaultRabbitMQBus : IEasyCachingBus
         /// <param name="serializer">Serializer.</param>
         public DefaultRabbitMQBus(
             IPooledObjectPolicy<IConnection> _objectPolicy
-            ,RabbitMQBusOptions rabbitMQOptions
-            ,IEasyCachingSerializer serializer)
+            , IOptions<RabbitMQBusOptions> rabbitMQOptions
+            , IEasyCachingSerializer serializer)
         {
-            this._options = rabbitMQOptions;
+            this._options = rabbitMQOptions.Value;
             this._serializer = serializer;
 
             var factory = new ConnectionFactory
@@ -132,7 +133,7 @@ public void Publish(string topic, EasyCachingMessage message)
             }
             return Task.CompletedTask;
         }
-              
+
         /// <summary>
         /// Subscribe the specified topic and action.
         /// </summary>
@@ -142,7 +143,7 @@ public void Subscribe(string topic, Action<EasyCachingMessage> action)
         {
             _handler = action;
             var queueName = string.Empty;
-            if(string.IsNullOrWhiteSpace(_options.QueueName))
+            if (string.IsNullOrWhiteSpace(_options.QueueName))
             {
                 queueName = $"rmq.queue.undurable.easycaching.subscriber.{_busId}";
             }
@@ -151,13 +152,13 @@ public void Subscribe(string topic, Action<EasyCachingMessage> action)
                 queueName = _options.QueueName;
             }
 
-            Task.Factory.StartNew(() => 
+            Task.Factory.StartNew(() =>
             {
                 var model = _subConnection.CreateModel();
                 model.ExchangeDeclare(_options.TopicExchangeName, ExchangeType.Topic, true, false, null);
                 model.QueueDeclare(queueName, false, false, true, null);
                 // bind the queue with the exchange.
-                model.QueueBind(_options.TopicExchangeName, queueName, _options.RouteKey);
+                model.QueueBind(queueName, _options.TopicExchangeName, topic);
                 var consumer = new EventingBasicConsumer(model);
                 consumer.Received += OnMessage;
                 consumer.Shutdown += OnConsumerShutdown;