fix: 调整 结果过滤器

Author: jianxuanbing

framework/src/Bing.AspNetCore/Bing/AspNetCore/Mvc/Filters/ResultHandlerAttribute.cs

@@ -17,34 +17,24 @@ public class ResultHandlerAttribute : ResultFilterAttribute
         /// <param name="context">结果执行上下文</param>
         public override void OnResultExecuting(ResultExecutingContext context)
         {
-            // 控制器过滤
-            if (context.Controller.GetType().GetCustomAttributes<IgnoreResultHandlerAttribute>().Any())
-            {
+            if (HasIgnoreResultHandler(context))
+                return;
+            if (HasIgnoreHandle(context.Result))
                 return;
-            }
-            // Action过滤
-            if (context.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor)
-            {
-                var ignore = controllerActionDescriptor.MethodInfo
-                    .GetCustomAttributes<IgnoreResultHandlerAttribute>().Any();
-                if (ignore)
-                    return;
-            }
 
             if (context.Result is ValidationFailedResult validationFailedResult)
             {
-                context.Result=new JsonResult(new
+                context.Result = new JsonResult(new
                 {
                     Code = (int)StatusCode.Fail,
-                    Message = validationFailedResult.AllowMultipleResult ? validationFailedResult.Errors.FirstOrDefault()?.Message : "验证数据失败!",
+                    Message = validationFailedResult.AllowMultipleResult
+                        ? validationFailedResult.Errors.FirstOrDefault()?.Message
+                        : "验证数据失败!",
                     Errors = validationFailedResult.Errors
                 });
                 return;
             }
 
-            if (context.Result is ApiResult)
-                return;
-
             if (context.Result is BadRequestObjectResult badRequestObjectResult)
             {
                 if (badRequestObjectResult.Value is ValidationProblemDetails details)
@@ -68,5 +58,35 @@ public override void OnResultExecuting(ResultExecutingContext context)
                 context.Result = new ApiResult(StatusCode.Ok, string.Empty, jsonResult.Value);
             }
         }
+
+        /// <summary>
+        /// 是否忽略结果处理
+        /// </summary>
+        /// <param name="context">结果执行上下文</param>
+        private bool HasIgnoreResultHandler(ResultExecutingContext context)
+        {
+            // 控制器过滤
+            if (context.Controller.GetType().GetCustomAttributes<IgnoreResultHandlerAttribute>().Any())
+                return true;
+            // Action过滤
+            if (context.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor)
+            {
+                var ignore = controllerActionDescriptor.MethodInfo.GetCustomAttributes<IgnoreResultHandlerAttribute>().Any();
+                if (ignore)
+                    return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 是否忽略处理
+        /// </summary>
+        /// <param name="result">操作结果</param>
+        private bool HasIgnoreHandle(IActionResult result)
+        {
+            if (result is ApiResult)
+                return true;
+            return false;
+        }
     }
 }

framework/src/Bing.AspNetCore/Microsoft/AspNetCore/Http/BingHttpContextExtensions.cs

@@ -15,7 +15,15 @@ public static string GetRemoteIpAddress(this HttpContext context)
         {
             var ip = context.Request.Headers["X-Forwarded-For"].FirstOrDefault();
             if (string.IsNullOrEmpty(ip))
+            {
                 ip = context.Connection.RemoteIpAddress?.ToString();
+#if DEBUG
+                if (ip.Contains("::ffff:"))
+                    return ip.Split("::ffff:")[1];
+                if (ip == "::1" || ip.Contains("127.0.0.1"))
+                    return "127.0.0.1";
+#endif
+            }
             return ip;
         }
     }