From 9b5028e9de2981a4ac07f76107293ee3e12aa803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B0=E4=BA=AE?= Date: Sat, 20 Feb 2021 09:59:36 +0800 Subject: [PATCH] upgrade --- internal/pkg/core/core.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/internal/pkg/core/core.go b/internal/pkg/core/core.go index 7e750d6..190646f 100644 --- a/internal/pkg/core/core.go +++ b/internal/pkg/core/core.go @@ -371,26 +371,27 @@ func New(logger *zap.Logger, options ...Option) (Mux, error) { businessCode = err.GetBusinessCode() businessCodeMsg = err.GetMsg() - reply := &code.Failure{ + if x := context.Trace(); x != nil { + context.SetHeader(trace.Header, x.ID()) + traceId = x.ID() + } + + ctx.JSON(err.GetHttpCode(), &code.Failure{ Code: businessCode, Message: businessCodeMsg, - } - ctx.JSON(err.GetHttpCode(), reply) + }) } } else { response = context.getPayload() if response != nil { + if x := context.Trace(); x != nil { + context.SetHeader(trace.Header, x.ID()) + traceId = x.ID() + } ctx.JSON(http.StatusOK, response) } } - if response != nil { - if x := context.Trace(); x != nil { - context.SetHeader(trace.Header, x.ID()) - traceId = x.ID() - } - } - graphResponse = context.getGraphPayload() if opt.recordMetrics != nil {