Merge pull request #51 from ojdev/dev

大版本升级

Author: ojdev

.github/workflows/dotnetcore.yml

@@ -30,6 +30,6 @@ jobs:
     - 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=5.0.$GITHUB_RUN_NUMBER -o artifacts/
+      run: dotnet pack src/RabbitMQ.EventBus.AspNetCore -c Release --include-symbols --include-source  -p:PackageVersion=${{steps.tag.outputs.tag}} -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/MessageBody1.cs

@@ -5,30 +5,27 @@
 
 namespace RabbitMQ.EventBus.AspNetCore.Simple.Controllers
 {
-    public class MessageBodyHandle : IEventHandler<MessageBody1>, IDisposable
+public class MessageBodyHandle : IEventResponseHandler<MessageBody, string>, IDisposable
+{
+    private Guid id;
+    private readonly ILogger<MessageBodyHandle> _logger;
+
+    public MessageBodyHandle(ILogger<MessageBodyHandle> logger)
     {
-        private Guid id;
-        private readonly ILogger<MessageBodyHandle> _logger;
+        id = Guid.NewGuid();
+        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+    }
+    public void Dispose()
+    {
+        _logger.LogInformation("MessageBodyHandle Disposable.");
+    }
 
-        public MessageBodyHandle(ILogger<MessageBodyHandle> logger)
-        {
-            id = Guid.NewGuid();
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        }
-        public void Dispose()
-        {
-            Console.WriteLine("释放");
-        }
 
-        public Task Handle(EventHandlerArgs<MessageBody1> args)
-        {
-            Console.WriteLine("==================================================");
-            Console.WriteLine(id + "=>" + typeof(MessageBody1).Name);
-            Console.WriteLine(args.Event.Body);
-            Console.WriteLine(args.Original);
-            Console.WriteLine(args.Redelivered);
-            Console.WriteLine("==================================================");
-            return Task.CompletedTask;
-        }
+    public Task<string> HandleAsync(HandlerEventArgs<MessageBody> args)
+    {
+        return Task.FromResult("收到消息，已确认" + DateTimeOffset.Now);
     }
 }
+
+
+}

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

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 using System;
 using System.Threading.Tasks;
 
@@ -19,48 +20,17 @@ public ValuesController(IRabbitMQEventBus eventBus)
         [HttpGet]
         public async Task<ActionResult<string>> Get()
         {
-            //_eventBus.Publish(new
-            //{
-            //    Body = "rabbitmq.eventbus.test=>发送消息",
-            //    Time = DateTimeOffset.Now
-            //}, exchange: "RabbitMQ.EventBus.Simple", routingKey: "rabbitmq.eventbus.test");
-
-            for (int i = 0; i < 1000; i++)
+            Console.WriteLine($"发送消息{1}");
+            var body = new
             {
-                _eventBus.Publish(new
-                {
-                    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";
-        }
-
-        // GET api/values/5
-        [HttpGet("{id}")]
-        public ActionResult<string> Get(int id)
-        {
-            return "value";
-        }
-
-        // POST api/values
-        [HttpPost]
-        public void Post([FromBody] string value)
-        {
-        }
-
-        // PUT api/values/5
-        [HttpPut("{id}")]
-        public void Put(int id, [FromBody] string value)
-        {
-        }
-
-        // DELETE api/values/5
-        [HttpDelete("{id}")]
-        public void Delete(int id)
-        {
+                requestId = Guid.NewGuid(),
+                Body = $"rabbitmq.eventbus.test=>发送消息\t{1}",
+                Time = DateTimeOffset.Now,
+            };
+            var r = await _eventBus.PublishAsync<string>(body, exchange: "RabbitMQ.EventBus.Simple", routingKey: "rabbitmq.eventbus.test");
+            Console.WriteLine($"返回了{r}");
+            await Task.Delay(500);
+            return r;
         }
     }
 }

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
   </PropertyGroup>

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

@@ -27,19 +27,35 @@ public void ConfigureServices(IServiceCollection services)
             services.AddControllers();
             services.AddHealthChecks();
 
-            services.AddRabbitMQEventBus(() => "amqp://guest:guest@localhost:5672/", eventBusOptionAction: eventBusOption =>
-             {
-                 eventBusOption.ClientProvidedAssembly(assemblyName);
-                 eventBusOption.EnableRetryOnFailure(true, 5000, TimeSpan.FromSeconds(30));
-                 eventBusOption.RetryOnFailure(TimeSpan.FromSeconds(1));
-                 eventBusOption.MessageTTL(2000);
-                 eventBusOption.SetBasicQos(10);
-                 eventBusOption.DeadLetterExchangeConfig(config =>
-                 {
-                     config.Enabled = true;
-                     config.ExchangeNameSuffix = "-test";
-                 });
-             });
+
+            services.AddRabbitMQEventBus("localhost", 5672, "guest", "guest", "", eventBusOptionAction: eventBusOption =>
+            {
+                eventBusOption.ClientProvidedAssembly(assemblyName);
+                eventBusOption.EnableRetryOnFailure(true, 5000, TimeSpan.FromSeconds(30));
+                eventBusOption.RetryOnFailure(TimeSpan.FromSeconds(1));
+                eventBusOption.MessageTTL(2000);
+                eventBusOption.SetBasicQos(10);
+                eventBusOption.DeadLetterExchangeConfig(config =>
+                {
+                    config.Enabled = false;
+                    config.ExchangeNameSuffix = "-test";
+                });
+            });
+            //or
+            //
+            //services.AddRabbitMQEventBus(() => "amqp://guest:guest@localhost:5672/", eventBusOptionAction: eventBusOption =>
+            //{
+            //    eventBusOption.ClientProvidedAssembly(assemblyName);
+            //    eventBusOption.EnableRetryOnFailure(true, 5000, TimeSpan.FromSeconds(30));
+            //    eventBusOption.RetryOnFailure(TimeSpan.FromSeconds(1));
+            //    eventBusOption.MessageTTL(2000);
+            //    eventBusOption.SetBasicQos(10);
+            //    eventBusOption.DeadLetterExchangeConfig(config =>
+            //    {
+            //        config.Enabled = false;
+            //        config.ExchangeNameSuffix = "-test";
+            //    });
+            //});
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -50,7 +66,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseDeveloperExceptionPage();
             }
             app.UseRouting();
-            app.RabbitMQEventBusAutoSubscribe();
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapControllers();

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

@@ -2,8 +2,8 @@
   "Logging": {
     "LogLevel": {
       "Default": "Debug",
-      "System": "Information",
-      "Microsoft": "Information"
+      "System": "Debug",
+      "Microsoft": "Debug"
     }
   }
 }

RabbitMQ.EventBus.AspNetCore.Sample/RabbitMQ.EventBus.AspNetCore.Sample.csproj

@@ -1,7 +1,7 @@
 {
   "Logging": {
     "LogLevel": {
-      "Default": "Warning"
+      "Default": "Debug"
     }
   },
   "AllowedHosts": "*"