refactor.

src/DotNetCore.CAP/Internal/DefaultModelBinder.cs

@@ -3,7 +3,7 @@ using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading.Tasks;
 using DotNetCore.CAP.Abstractions.ModelBinding;
-using Newtonsoft.Json;
+using DotNetCore.CAP.Infrastructure;
 
 namespace DotNetCore.CAP.Internal
 {
@@ -18,7 +18,7 @@ namespace DotNetCore.CAP.Internal
                 bindingContext.Model = CreateModel(bindingContext);
             }
             
-            bindingContext.Result = JsonConvert.DeserializeObject(bindingContext.Values, bindingContext.ModelType);
+            bindingContext.Result = Helper.FromJson(bindingContext.Values, bindingContext.ModelType);
 
             return Task.CompletedTask;
         }

src/DotNetCore.CAP/Internal/IConsumerInvoker.Default.cs

@@ -11,9 +11,9 @@ namespace DotNetCore.CAP.Internal
     {
         protected readonly ILogger _logger;
         protected readonly IServiceProvider _serviceProvider;
+        protected readonly ConsumerContext _consumerContext;
         private readonly IModelBinder _modelBinder;
         private readonly ObjectMethodExecutor _executor;
-        protected readonly ConsumerContext _consumerContext;
 
         public DefaultConsumerInvoker(ILogger logger,
             IServiceProvider serviceProvider,
@@ -29,15 +29,11 @@ namespace DotNetCore.CAP.Internal
         }
 
         public Task InvokeAsync()
-        {
-            try
         {
             using (_logger.BeginScope("consumer invoker begin"))
             {
-                    _logger.LogDebug("Executing consumer Topic: {0}", _consumerContext.ConsumerDescriptor.Attribute);
+                _logger.LogDebug("Executing consumer Topic: {0}", _consumerContext.ConsumerDescriptor.MethodInfo.Name);
 
-                    try
-                    {
                 var obj = ActivatorUtilities.GetServiceOrCreateInstance(_serviceProvider, _consumerContext.ConsumerDescriptor.ImplTypeInfo.AsType());
 
                 var value = _consumerContext.DeliverMessage.Content;
@@ -58,15 +54,6 @@ namespace DotNetCore.CAP.Internal
                 }
                 return Task.CompletedTask;
             }
-                    finally
-                    {
-                        _logger.LogDebug("Executed consumer method .");
-                    }
-                }
-            }
-            finally
-            {
-            }
         }
     }
 }
\ No newline at end of file

src/DotNetCore.CAP/Job/IJob.CapJob.cs

@@ -40,6 +40,8 @@ namespace DotNetCore.CAP.Job
 
                 var nextReceivedMessage = await messageStore.GetNextReceivedMessageToBeExcuted();
                 if (nextReceivedMessage != null)
+                {
+                    try
                     {
                         var executeDescriptor = matchs[nextReceivedMessage.KeyName];
                         var consumerContext = new ConsumerContext(executeDescriptor, nextReceivedMessage);
@@ -49,7 +51,13 @@ namespace DotNetCore.CAP.Job
 
                         await invoker.InvokeAsync();
 
-                    await messageStore.ChangeReceivedMessageStateAsync(nextReceivedMessage,StatusName.Succeeded);
+                        await messageStore.ChangeReceivedMessageStateAsync(nextReceivedMessage, StatusName.Succeeded);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.ReceivedMessageRetryExecutingFailed(nextReceivedMessage.KeyName, ex);
+                    }
+
                 }
             }
         }

src/DotNetCore.CAP/LoggerExtensions.cs

@@ -21,6 +21,7 @@ namespace DotNetCore.CAP
         private static Action<ILogger, string, string, Exception> _enqueuingSentMessage;
         private static Action<ILogger, string, string, Exception> _enqueuingReceivdeMessage;
         private static Action<ILogger, string, Exception> _executingConsumerMethod;
+        private static Action<ILogger, string, Exception> _receivedMessageRetryExecuting;
 
         static LoggerExtensions()
         {
@@ -78,6 +79,11 @@ namespace DotNetCore.CAP
                 LogLevel.Error,
                 5,
                 "Consumer method '{methodName}' failed to execute.");
+
+            _receivedMessageRetryExecuting = LoggerMessage.Define<string>(
+                LogLevel.Error,
+                5,
+                "Received message topic method '{topicName}' failed to execute.");
         }
 
         public static void ConsumerMethodExecutingFailed(this ILogger logger, string methodName, Exception ex)
@@ -85,6 +91,11 @@ namespace DotNetCore.CAP
             _executingConsumerMethod(logger, methodName, ex);
         }
 
+        public static void ReceivedMessageRetryExecutingFailed(this ILogger logger, string topicName, Exception ex)
+        {
+            _receivedMessageRetryExecuting(logger, topicName, ex);
+        }
+
         public static void EnqueuingReceivedMessage(this ILogger logger, string nameKey, string content)
         {
             _enqueuingReceivdeMessage(logger, nameKey, content, null);