From d43ff1891d39317c537ffdaa75dd3f6b14aa55ef Mon Sep 17 00:00:00 2001 From: "javen.liu" Date: Wed, 9 Apr 2025 17:49:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/NebulaBus/INebulaBus.cs | 8 +++--- src/NebulaBus/NebulaBusService.cs | 28 ++++++++++----------- src/NebulaBus/Rabbitmq/RabbitmqProcessor.cs | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/NebulaBus/INebulaBus.cs b/src/NebulaBus/INebulaBus.cs index a64dcef..d8dfe53 100644 --- a/src/NebulaBus/INebulaBus.cs +++ b/src/NebulaBus/INebulaBus.cs @@ -6,10 +6,10 @@ namespace NebulaBus { public interface INebulaBus { - Task PublishAsync(string name, T message) where T : class, new(); - Task PublishAsync(string name, T message, IDictionary headers) where T : class, new(); - Task PublishAsync(TimeSpan delay, string name, T message) where T : class, new(); - Task PublishAsync(TimeSpan delay, string name, T message, IDictionary headers) + Task PublishAsync(string nameOrGroup, T message) where T : class, new(); + Task PublishAsync(string nameOrGroup, T message, IDictionary headers) where T : class, new(); + Task PublishAsync(TimeSpan delay, string nameOrGroup, T message) where T : class, new(); + Task PublishAsync(TimeSpan delay, string nameOrGroup, T message, IDictionary headers) where T : class, new(); } } \ No newline at end of file diff --git a/src/NebulaBus/NebulaBusService.cs b/src/NebulaBus/NebulaBusService.cs index b8383af..8fe9200 100644 --- a/src/NebulaBus/NebulaBusService.cs +++ b/src/NebulaBus/NebulaBusService.cs @@ -23,52 +23,52 @@ namespace NebulaBus _idWorker = new IdWorker(result, 1); } - public async Task PublishAsync(string group, T message) + public async Task PublishAsync(string nameOrGroup, T message) where T : class, new() { - var header = BuildNebulaHeader(group); + var header = BuildNebulaHeader(nameOrGroup); foreach (var processor in _processors) { - await processor.Publish(group, JsonConvert.SerializeObject(message), header); + await processor.Publish(nameOrGroup, JsonConvert.SerializeObject(message), header); } } - public async Task PublishAsync(string group, T message, IDictionary headers) + public async Task PublishAsync(string nameOrGroup, T message, IDictionary headers) where T : class, new() { - var header = BuildNebulaHeader(group, headers); + var header = BuildNebulaHeader(nameOrGroup, headers); foreach (var processor in _processors) { - await processor.Publish(group, JsonConvert.SerializeObject(message), header); + await processor.Publish(nameOrGroup, JsonConvert.SerializeObject(message), header); } } - public async Task PublishAsync(TimeSpan delay, string group, T message) + public async Task PublishAsync(TimeSpan delay, string nameOrGroup, T message) where T : class, new() { - var header = BuildNebulaHeader(group); + var header = BuildNebulaHeader(nameOrGroup); await _delayMessageScheduler.Schedule(new DelayStoreMessage() { MessageId = header[NebulaHeader.MessageId]!, - Group = group, + Group = nameOrGroup, Header = header, Message = JsonConvert.SerializeObject(message), - Name = group, + Name = nameOrGroup, TriggerTime = DateTimeOffset.Now.AddSeconds(delay.TotalSeconds) }); } - public async Task PublishAsync(TimeSpan delay, string group, T message, IDictionary headers) + public async Task PublishAsync(TimeSpan delay, string nameOrGroup, T message, IDictionary headers) where T : class, new() { - var header = BuildNebulaHeader(group, headers); + var header = BuildNebulaHeader(nameOrGroup, headers); await _delayMessageScheduler.Schedule(new DelayStoreMessage() { MessageId = header[NebulaHeader.MessageId]!, - Group = group, + Group = nameOrGroup, Header = header, Message = JsonConvert.SerializeObject(message), - Name = group, + Name = nameOrGroup, TriggerTime = DateTimeOffset.Now.AddSeconds(delay.TotalSeconds) }); } diff --git a/src/NebulaBus/Rabbitmq/RabbitmqProcessor.cs b/src/NebulaBus/Rabbitmq/RabbitmqProcessor.cs index 1fa6977..572d43a 100644 --- a/src/NebulaBus/Rabbitmq/RabbitmqProcessor.cs +++ b/src/NebulaBus/Rabbitmq/RabbitmqProcessor.cs @@ -64,7 +64,7 @@ namespace NebulaBus.Rabbitmq foreach (var handler in _nebulaHandlers) { var channel = await _connection.CreateChannelAsync(); - + //Create Exchange await channel.ExchangeDeclareAsync(_rabbitmqOptions.ExchangeName, ExchangeType.Direct); await channel.QueueDeclareAsync(handler.Name, false, false, false, null); -- Gitee From 09fbdb305a5c4b19e7d11768ecab1ccf8d4335a6 Mon Sep 17 00:00:00 2001 From: liuhai Date: Wed, 9 Apr 2025 20:07:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=B1=E4=BA=8EName=E5=92=8CGroup?= =?UTF-8?q?=E9=9A=BE=E4=BB=A5=E5=94=AF=E4=B8=80=E7=A1=AE=E5=AE=9A=EF=BC=8C?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=BC=BA=E7=9C=81=E5=80=BC=E4=B8=8D=E5=90=88?= =?UTF-8?q?=E9=80=82=EF=BC=8C=E9=81=82=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/NebulaBus/NebulaHandler.cs | 3 --- .../{WeatherForecastController.cs => TestController.cs} | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) rename src/WebApplicationSample/Controllers/{WeatherForecastController.cs => TestController.cs} (93%) diff --git a/src/NebulaBus/NebulaHandler.cs b/src/NebulaBus/NebulaHandler.cs index 9186d2a..086fae7 100644 --- a/src/NebulaBus/NebulaHandler.cs +++ b/src/NebulaBus/NebulaHandler.cs @@ -36,9 +36,6 @@ namespace NebulaBus public abstract class NebulaHandler : NebulaHandler { - public override string Name => this.GetType().Name; - public override string Group => typeof(T).Name; - internal override async Task Subscribe(IProcessor processor, IDelayMessageScheduler delayMessageScheduler, string message, NebulaHeader header) { diff --git a/src/WebApplicationSample/Controllers/WeatherForecastController.cs b/src/WebApplicationSample/Controllers/TestController.cs similarity index 93% rename from src/WebApplicationSample/Controllers/WeatherForecastController.cs rename to src/WebApplicationSample/Controllers/TestController.cs index 4d73e9a..ca7e2d3 100644 --- a/src/WebApplicationSample/Controllers/WeatherForecastController.cs +++ b/src/WebApplicationSample/Controllers/TestController.cs @@ -6,17 +6,17 @@ namespace WebApplicationSample.Controllers { [ApiController] [Route("[controller]")] - public class WeatherForecastController : ControllerBase + public class TestController : ControllerBase { private static readonly string[] Summaries = new[] { "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" }; - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly INebulaBus _bus; - public WeatherForecastController(ILogger logger, INebulaBus nebulaBus) + public TestController(ILogger logger, INebulaBus nebulaBus) { _logger = logger; _bus = nebulaBus; -- Gitee