重构IApiActionFilter

Author: xljiulang

Demo/HttpClients/LogFilter.cs

@@ -32,6 +32,11 @@ public override Task OnBeginRequestAsync(ApiActionContext context)
         /// <returns></returns>
         public override async Task OnEndRequestAsync(ApiActionContext context)
         {
+            if (context.Exception != null)
+            {
+                return;
+            }
+
             var request = context.RequestMessage;
             var dateTime = DateTime.Now.ToString("HH:mm:ss.fff");
             var timeSpan = DateTime.Now.Subtract(context.Tags["BeginTime"].As<DateTime>());

WebApiClient/Attributes/FilterAttributes/ApiActionFilterAttribute.cs

@@ -38,23 +38,12 @@ public virtual Task OnBeginRequestAsync(ApiActionContext context)
 
         /// <summary>
         /// 请求完成之后
-        /// 
         /// </summary>
         /// <param name="context">上下文</param>
         /// <returns></returns>
         public virtual Task OnEndRequestAsync(ApiActionContext context)
         {
             return ApiTask.CompletedTask;
         }
-
-        /// <summary>
-        /// 执行请求异常时
-        /// </summary>
-        /// <param name="context">上下文</param>
-        /// <returns></returns>
-        public virtual Task OnRequestExceptionAsync(ApiActionContext context)
-        {
-            return ApiTask.CompletedTask;
-        }
     }
 }

WebApiClient/AuthTokens/AuthTokenFilter.cs

@@ -84,16 +84,6 @@ Task IApiActionFilter.OnEndRequestAsync(ApiActionContext context)
             return ApiTask.CompletedTask;
         }
 
-        /// <summary>
-        /// 执行请求异常时
-        /// </summary>
-        /// <param name="context">上下文</param>
-        /// <returns></returns>
-        Task IApiActionFilter.OnRequestExceptionAsync(ApiActionContext context)
-        {
-            return ApiTask.CompletedTask;
-        }
-
         /// <summary>
         /// 准备请求之前
         /// </summary>

WebApiClient/Contexts/ApiActionContext.cs

@@ -98,8 +98,6 @@ internal async Task ExecRequestAsync()
             catch (Exception ex)
             {
                 this.Exception = ex;
-                await this.ExecFiltersAsync(filter => filter.OnRequestExceptionAsync);
-                throw ex;
             }
         }
 

WebApiClient/IApiActionFilter.cs

@@ -22,12 +22,5 @@ public interface IApiActionFilter
         /// <param name="context">上下文</param>
         /// <returns></returns>
         Task OnEndRequestAsync(ApiActionContext context);
-
-        /// <summary>
-        /// 执行请求异常时
-        /// </summary>
-        /// <param name="context">上下文</param>
-        /// <returns></returns>
-        Task OnRequestExceptionAsync(ApiActionContext context);
     }
 }

WebApiClient/Internal/Tasks/ApiTask.cs

@@ -134,6 +134,10 @@ private async Task<TResult> RequestAsync()
                 await context.ExecRequestAsync();
                 await context.ExecFiltersAsync(filter => filter.OnEndRequestAsync);
 
+                if (context.Exception != null)
+                {
+                    throw context.Exception;
+                }
                 return (TResult)context.Result;
             }
         }