From f75bb945dad06f97eca8985609ba88fcd60cca01 Mon Sep 17 00:00:00 2001
From: dingsongjie <dingsongjie@DESKTOP-0AS088R>
Date: Sun, 19 Jan 2020 15:52:19 +0800
Subject: [PATCH] 简化 ReliableEventHandler

---
 samples/apis/Product.Api/Application/CommandHandler/AddProductTypeCommandHandler.cs |  2 +-
 src/Pole.ReliableMessage.Masstransit/MasstransitReliableEventHandler.cs             | 34 +---------------------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/samples/apis/Product.Api/Application/CommandHandler/AddProductTypeCommandHandler.cs b/samples/apis/Product.Api/Application/CommandHandler/AddProductTypeCommandHandler.cs
index 0c96ab5..0d921ab 100644
--- a/samples/apis/Product.Api/Application/CommandHandler/AddProductTypeCommandHandler.cs
+++ b/samples/apis/Product.Api/Application/CommandHandler/AddProductTypeCommandHandler.cs
@@ -25,7 +25,7 @@ namespace Product.Api.Application.CommandHandler
         }
         public async Task<CommonCommandResponse> Handle(Command<AddProductTypeRequest, CommonCommandResponse> request, CancellationToken cancellationToken)
         {
-            var productType = new Domain.ProductTypeAggregate.ProductType(request.Data.Id, request.Data.Name);
+            var productType = new Domain.ProductTypeAggregate.ProductType(Guid.NewGuid().ToString("N"), request.Data.Name);
 
             _productTypeRepository.Add(productType);
             ProductTypeAddedDomainEvent productTypeAddedDomainEvent = new ProductTypeAddedDomainEvent
diff --git a/src/Pole.ReliableMessage.Masstransit/MasstransitReliableEventHandler.cs b/src/Pole.ReliableMessage.Masstransit/MasstransitReliableEventHandler.cs
index e819699..cb8c236 100644
--- a/src/Pole.ReliableMessage.Masstransit/MasstransitReliableEventHandler.cs
+++ b/src/Pole.ReliableMessage.Masstransit/MasstransitReliableEventHandler.cs
@@ -16,53 +16,21 @@ namespace Pole.ReliableMessage.Masstransit
     public abstract class ReliableEventHandler<TEvent> : IReliableEventHandler<TEvent>, IConsumer<TEvent>
        where TEvent : class
     {
-        private const string FIRST_TIME_STORAGE_EXECUTE_ERROR_TAG = "FirstTimeStorageExecuteErrorTag";
-        private readonly IMessageStorage _messageStorage;
         private readonly ILogger<ReliableEventHandler<TEvent>> _logger;
-        private readonly IServiceProvider _serviceProvider;
-        private bool FirstTimeStorageExecuteErrorTag = false;
         public ReliableEventHandler(IServiceProvider serviceProvider)
         {
-            _messageStorage = serviceProvider.GetRequiredService<IMessageStorage>();
             var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
             _logger = loggerFactory.CreateLogger<ReliableEventHandler<TEvent>>();
-            _serviceProvider = serviceProvider;
         }
 
         public abstract Task Handle(IReliableEventHandlerContext<TEvent> context);
         public async Task Consume(ConsumeContext<TEvent> context)
         {
             var messageId = GetReliableMessageId(context);
-            if (_logger.IsEnabled(LogLevel.Debug))
-            {
-                var jsonConveter = _serviceProvider.GetRequiredService(typeof(IJsonConverter)) as IJsonConverter;
-                var json = jsonConveter.Serialize(context.Message);
-                _logger.LogDebug($"Message Begin Handle,messageId:{messageId}, message content :{json}");
-            }
 
-            //var retryAttempt = context.GetRetryAttempt();
-            //if (retryAttempt == 0)
-            //{
-            //    if (string.IsNullOrEmpty(messageId))
-            //    {
-            //        _logger.LogWarning($"Message has no ReliableMessageId, ignore");
-            //        return;
-            //    }
-            //    var isHandled = !await _messageStorage.CheckAndUpdateStatus(m => m.Id == messageId, MessageStatus.Handed);
-            //    if (isHandled)
-            //    {
-            //        _logger.LogTrace($"This message has handled begore ReliableMessageId:{messageId}, ignore");
-            //        return;
-            //    }
+            _logger.LogDebug($"Message Begin Handle,messageId:{messageId}");
 
             await Handle(new DefaultReliableEventHandlerContext<TEvent>(context));
-            //}
-            //else
-            //{
-            //    // 确保 Handle 前
-            //    await _messageStorage.CheckAndUpdateStatus(m => m.Id == messageId, MessageStatus.Handed);
-            //    await Handle(new DefaultReliableEventHandlerContext<TEvent>(context));
-            //}
 
             _logger.LogDebug($"Message handled successfully ,messageId:{messageId}");
         }
--
libgit2 0.25.0