[feat] 解析Http400响应中的错误内容，便于分析接口的BadRequest错误原因

NewLifeX · Oct 7, 2023 · 39eef57 · 39eef57
1 parent 82b044d
commit 39eef57
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/NewLife.Core/Log/ITracer.cs b/NewLife.Core/Log/ITracer.cs
@@ -149,9 +149,12 @@ protected virtual void ProcessSpans(ISpanBuilder[] builders)
                 WriteLog("Tracer[{0}] Total={1:n0} Errors={2:n0} Speed={3:n2}tps Cost={4:n0}ms MaxCost={5:n0}ms MinCost={6:n0}ms", bd.Name, bd.Total, bd.Errors, speed, bd.Cost / bd.Total, bd.MaxCost, bd.MinCost);
 
 #if DEBUG
-                foreach (var span in bd.Samples)
+                if (bd.Samples != null)
                 {
-                    WriteLog("Span Id={0} ParentId={1} TraceId={2} Tag={3} Error={4}", span.Id, span.ParentId, span.TraceId, span.Tag, span.Error);
+                    foreach (var span in bd.Samples)
+                    {
+                        WriteLog("Span Id={0} ParentId={1} TraceId={2} Tag={3} Error={4}", span.Id, span.ParentId, span.TraceId, span.Tag, span.Error);
+                    }
                 }
 #endif
             }

diff --git a/NewLife.Core/Net/TcpSession.cs b/NewLife.Core/Net/TcpSession.cs
@@ -355,7 +355,6 @@ internal override Boolean OnReceiveAsync(SocketAsyncEventArgs se)
     /// <param name="ar"></param>
     private void OnEndRead(IAsyncResult ar)
     {
-        var se = ar.AsyncState as SocketAsyncEventArgs;
         Int32 bytes;
         try
         {
@@ -375,7 +374,7 @@ private void OnEndRead(IAsyncResult ar)
             return;
         }
 
-        if (se != null) ProcessEvent(se, bytes, true);
+        if (ar.AsyncState is SocketAsyncEventArgs se) ProcessEvent(se, bytes, true);
     }
 
     private Int32 _empty;

diff --git a/NewLife.Core/Remoting/ApiHelper.cs b/NewLife.Core/Remoting/ApiHelper.cs
@@ -236,6 +236,18 @@ public static HttpContent BuildContent(Packet pk)
         if (response.StatusCode >= HttpStatusCode.BadRequest)
         {
             var msg = buf?.ToStr().Trim('\"');
+            // 400响应可能包含错误信息
+            if (!msg.IsNullOrEmpty() && msg.StartsWith("{") && msg.EndsWith("}"))
+            {
+                var dic = JsonParser.Decode(msg);
+                if (dic != null)
+                {
+                    var msg2 = "";
+                    if (dic.TryGetValue("title", out var v)) msg2 = v + "";
+                    if (dic.TryGetValue("errors", out v)) msg2 += v?.ToJson();
+                    if (!msg2.IsNullOrEmpty()) msg = msg2.Trim();
+                }
+            }
             if (msg.IsNullOrEmpty()) msg = response.ReasonPhrase;
             if (msg.IsNullOrEmpty()) msg = response.StatusCode + "";
             throw new ApiException((Int32)response.StatusCode, msg);

diff --git a/NewLife.Core/Remoting/ApiHttpClient.cs b/NewLife.Core/Remoting/ApiHttpClient.cs
@@ -468,8 +468,8 @@ protected virtual async Task<HttpResponseMessage> SendOnServiceAsync(HttpRequest
 
         if (filter != null) await filter.OnResponse(client, response, this, cancellationToken);
 
-        // 业务层只会返回200 OK
-        response.EnsureSuccessStatusCode();
+        //// 业务层只会返回200 OK
+        //response.EnsureSuccessStatusCode();
 
         return response;
     }