Merge branch 'master' into dev

Author: ojdev

.github/workflows/dotnetcore.yml

@@ -26,10 +26,10 @@ jobs:
         # Optionally strip `v` prefix
         strip_v: true
     - name: Set VERSION variable from tag
-      run: echo ${{steps.tag.outputs.tag}}     
+      run: echo ${{steps.tag.outputs.tag}} 
     - name: Build with dotnet
       run: dotnet build --configuration Release src/RabbitMQ.EventBus.AspNetCore 
     - name: Pack
-      run: dotnet pack src/RabbitMQ.EventBus.AspNetCore -c Release --include-symbols --include-source  -p:PackageVersion=3.1.$GITHUB_RUN_NUMBER -o artifacts/
+      run: dotnet pack src/RabbitMQ.EventBus.AspNetCore -c Release --include-symbols --include-source  -p:PackageVersion=5.0.$GITHUB_RUN_NUMBER -o artifacts/
     - name: Publish Symbols to NuGet
       run: dotnet nuget push artifacts/*.symbols.nupkg --api-key ${{secrets.NUGET_API_KEY}} --source https://api.nuget.org/v3/index.json

RabbitMQ.EventBus.AspNetCore.Sample/Controllers/ValuesController.cs

@@ -24,13 +24,16 @@ public async Task<ActionResult<string>> Get()
             //    Body = "rabbitmq.eventbus.test=>发送消息",
             //    Time = DateTimeOffset.Now
             //}, exchange: "RabbitMQ.EventBus.Simple", routingKey: "rabbitmq.eventbus.test");
-            for (int i = 0; i < 100; i++)
+
+            for (int i = 0; i < 1000; i++)
             {
                 _eventBus.Publish(new
                 {
-                    Body = "rabbitmq.eventbus.test1=>发送消息",
+                    Body = $"rabbitmq.eventbus.test1=>发送消息/t{i}",
                     Time = DateTimeOffset.Now,
                 }, exchange: "RabbitMQ.EventBus.Simple", routingKey: "rabbitmq.eventbus.test1");
+                await Task.Yield();
+                await Task.Delay(500);
             }
             return "Ok";
         }

src/RabbitMQ.EventBus.AspNetCore/DefaultRabbitMQEventBus.cs

@@ -54,6 +54,7 @@ public void Publish<TMessage>(TMessage message, string exchange, string routingK
             string body = message.Serialize();
             using var _publishChannel = _persistentConnection.ExchangeDeclare(exchange, type: type);
             _publishChannel.BasicReturn += async (se, ex) => await Task.Delay((int)_persistentConnection.Configuration.ConsumerFailRetryInterval.TotalMilliseconds).ContinueWith(t => Publish(body, ex.Exchange, ex.RoutingKey));
+
             IBasicProperties properties = _publishChannel.CreateBasicProperties();
             properties.DeliveryMode = 2; // persistent
             _publishChannel.BasicPublish(exchange: exchange,