From b14863aea6f177e4088d9d68eaf6ad9b171a828f Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Mon, 16 Jan 2023 16:21:39 +0800 Subject: [PATCH] 1 --- internal/api_to_rpc/api.go | 3 +-- pkg/common/trace_log/ctx.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/internal/api_to_rpc/api.go b/internal/api_to_rpc/api.go index 19c965b86..5cc1a9ac4 100644 --- a/internal/api_to_rpc/api.go +++ b/internal/api_to_rpc/api.go @@ -13,8 +13,7 @@ import ( func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, rpcClientFunc interface{}, rpcFuncName string) { logFuncName := fmt.Sprintf("[ApiToRpc: %s]%s", utils2.GetFuncName(1), rpcFuncName) - operationID := c.GetHeader("operationID") - nCtx := trace_log.NewCtx1(c, rpcFuncName, operationID) + nCtx := trace_log.NewCtx1(c, rpcFuncName) defer log.ShowLog(nCtx) if err := c.BindJSON(apiReq); err != nil { trace_log.WriteErrorResponse(nCtx, "BindJSON", err) diff --git a/pkg/common/trace_log/ctx.go b/pkg/common/trace_log/ctx.go index 1e431e5b8..faf7d7740 100644 --- a/pkg/common/trace_log/ctx.go +++ b/pkg/common/trace_log/ctx.go @@ -22,8 +22,8 @@ func NewCtx(c *gin.Context, api string) context.Context { return context.WithValue(c, TraceLogKey, req) } -func NewCtx1(c *gin.Context, api, operationID string) context.Context { - req := &ApiInfo{ApiName: api, GinCtx: c, OperationID: operationID, Funcs: &[]FuncInfo{}} +func NewCtx1(c *gin.Context, api string) context.Context { + req := &ApiInfo{ApiName: api, GinCtx: c, OperationID: c.GetHeader("operationID"), Funcs: &[]FuncInfo{}} return context.WithValue(c, TraceLogKey, req) }