网络请求异常也执行Filter

Author: xljiulang

WebApiClientCore/Implementations/ApiRequestExecuter.cs

@@ -77,26 +77,34 @@ private static async Task HandleRequestAsync(ApiRequestContext context)
         private static async Task HandleResponseAsync(ApiResponseContext context)
         {
             // Return特性请求后执行
-            foreach (var @return in context.ActionDescriptor.Return.Attributes)
+            var returns = context.ActionDescriptor.Return.Attributes.GetEnumerator();
+            while (context.ResultStatus == ResultStatus.None && returns.MoveNext())
             {
                 try
                 {
-                    await @return.OnResponseAsync(context).ConfigureAwait(false);
+                    await returns.Current.OnResponseAsync(context).ConfigureAwait(false);
                 }
                 catch (Exception ex)
                 {
                     context.Exception = ex;
                 }
+            }
 
-                if (context.ResultStatus != ResultStatus.None)
+            // 结果验证
+            if (context.ResultStatus == ResultStatus.HasResult &&
+                context.ActionDescriptor.Return.DataType.IsRawType == false &&
+                context.HttpContext.HttpApiOptions.UseReturnValuePropertyValidate)
+            {
+                try
                 {
-                    break;
+                    DataValidator.ValidateReturnValue(context.Result);
+                }
+                catch (Exception ex)
+                {
+                    context.Exception = ex;
                 }
             }
 
-            // 结果验证
-            DataValidator.ValidateReturnValue(context);
-
             // GlobalFilter请求后执行 
             foreach (var filter in context.HttpContext.HttpApiOptions.GlobalFilters)
             {

WebApiClientCore/Implementations/ApiRequestSender.cs

@@ -17,7 +17,6 @@ static class ApiRequestSender
         /// 发送http请求
         /// </summary>
         /// <param name="context"></param>
-        /// <exception cref="HttpRequestException"></exception>
         /// <exception cref="ApiInvalidConfigException"></exception>
         /// <returns></returns>
         public static async Task<ApiResponseContext> SendAsync(ApiRequestContext context)
@@ -27,6 +26,25 @@ public static async Task<ApiResponseContext> SendAsync(ApiRequestContext context
                 throw new ApiInvalidConfigException(Resx.required_HttpHost);
             }
 
+            try
+            {
+                await SendCoreAsync(context).ConfigureAwait(false);
+                return new ApiResponseContext(context);
+            }
+            catch (Exception ex)
+            {
+                return new ApiResponseContext(context) { Exception = ex };
+            }
+        }
+
+        /// <summary>
+        /// 发送http请求
+        /// </summary>
+        /// <param name="context"></param>
+        /// <exception cref="HttpRequestException"></exception> 
+        /// <returns></returns>
+        private static async Task SendCoreAsync(ApiRequestContext context)
+        {
             var actionCache = await context.GetCaheAsync().ConfigureAwait(false);
             if (actionCache != null && actionCache.Value != null)
             {
@@ -44,7 +62,6 @@ public static async Task<ApiResponseContext> SendAsync(ApiRequestContext context
                 context.HttpContext.ResponseMessage = response;
                 await context.SetCacheAsync(actionCache?.Key, response).ConfigureAwait(false);
             }
-            return new ApiResponseContext(context);
         }
 
         /// <summary>

WebApiClientCore/Implementations/DataValidator.cs

@@ -39,38 +39,6 @@ public static void ValidateParameter(ApiParameterDescriptor parameter, object? p
             }
         }
 
-        /// <summary>
-        /// 验证参返回的结果
-        /// </summary>
-        /// <param name="context">上下文</param>  
-        public static void ValidateReturnValue(ApiResponseContext context)
-        {
-            if (context.ActionDescriptor.Return.DataType.IsRawType == true)
-            {
-                return;
-            }
-
-            if (context.ResultStatus != ResultStatus.HasResult)
-            {
-                return;
-            }
-
-            if (context.HttpContext.HttpApiOptions.UseReturnValuePropertyValidate == false)
-            {
-                return;
-            }
-
-            try
-            {
-                ValidateReturnValue(context.Result);
-            }
-            catch (Exception ex)
-            {
-                context.Exception = ex;
-            }
-        }
-
-
         /// <summary>
         /// 验证参返回的结果
         /// </summary>
@@ -85,7 +53,6 @@ public static void ValidateReturnValue(object? value)
             }
         }
 
-
         /// <summary>
         /// 返回是否需要进行属性验证
         /// </summary>