From 2841109f31b22250102e6317935d8c36415b81ec Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Thu, 12 Jan 2023 10:07:08 +0800
Subject: [PATCH] 1

---
 internal/api_to_rpc/api.go  | 4 ++--
 pkg/common/trace_log/ctx.go | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/internal/api_to_rpc/api.go b/internal/api_to_rpc/api.go
index 57ac1f4ff..39b080051 100644
--- a/internal/api_to_rpc/api.go
+++ b/internal/api_to_rpc/api.go
@@ -11,13 +11,13 @@ import (
 
 func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, rpcClientFunc interface{}, rpcFuncName string, tokenFunc func(token string, operationID string) (string, error)) {
 	operationID := c.GetHeader("operationID")
-	nCtx := trace_log.NewCtx(c, rpcFuncName)
+	nCtx := trace_log.NewCtx1(c, rpcFuncName, operationID)
+	//trace_log.SetOperationID(nCtx, operationID)
 	defer trace_log.ShowLog(nCtx)
 	if err := c.BindJSON(apiReq); err != nil {
 		trace_log.WriteErrorResponse(nCtx, "BindJSON", err)
 		return
 	}
-	trace_log.SetOperationID(nCtx, operationID)
 	trace_log.SetContextInfo(nCtx, "BindJSON", nil, "params", apiReq)
 	etcdConn, err := getcdv3.GetConn(c, rpcName)
 	if err != nil {
diff --git a/pkg/common/trace_log/ctx.go b/pkg/common/trace_log/ctx.go
index bf8565e5e..47f77bafe 100644
--- a/pkg/common/trace_log/ctx.go
+++ b/pkg/common/trace_log/ctx.go
@@ -20,6 +20,11 @@ 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{}}
+	return context.WithValue(c, TraceLogKey, req)
+}
+
 func NewRpcCtx(c context.Context, rpc string, operationID string) context.Context {
 	req := &ApiInfo{ApiName: rpc, Funcs: &[]FuncInfo{}}
 	ctx := context.WithValue(c, TraceLogKey, req)