diff --git a/internal/api_to_rpc/api.go b/internal/api_to_rpc/api.go
index e77f8d340..b736bac37 100644
--- a/internal/api_to_rpc/api.go
+++ b/internal/api_to_rpc/api.go
@@ -1,24 +1,22 @@
 package common
 
 import (
-	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/trace_log"
 	utils2 "Open_IM/pkg/utils"
-	"context"
 	utils "github.com/OpenIMSDK/open_utils"
 	"github.com/gin-gonic/gin"
+	"google.golang.org/grpc/metadata"
 	"reflect"
 )
 
 func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, fn interface{}, rpcFuncName string, tokenFunc func(token string, operationID string) (string, error)) {
+	operationID := c.GetHeader("operationID")
 	nCtx := trace_log.NewCtx(c, rpcFuncName)
 	defer trace_log.ShowLog(nCtx)
 	if err := c.BindJSON(apiReq); err != nil {
 		trace_log.WriteErrorResponse(nCtx, "BindJSON", err)
 		return
 	}
-	reqValue := reflect.ValueOf(apiReq).Elem()
-	operationID := reqValue.FieldByName("OperationID").String()
 	trace_log.SetOperationID(nCtx, operationID)
 	trace_log.SetContextInfo(nCtx, "BindJSON", nil, "params", apiReq)
 	etcdConn, err := utils2.GetConn(c, rpcName)
@@ -39,23 +37,14 @@ func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, fn in
 			return
 		}
 	}
-	if opID := rpcReqPtr.Elem().FieldByName("OperationID"); opID.IsValid() {
-		opID.SetString(operationID)
-		if opU := rpcReqPtr.Elem().FieldByName("OpUserID"); opU.IsValid() {
-			opU.SetString(opUserID)
-		}
-	} else {
-		op := rpcReqPtr.Elem().FieldByName("Operation").Elem()
-		op.FieldByName("OperationID").SetString(operationID)
-		op.FieldByName("OpUserID").SetString(opUserID)
-	}
 	if err := utils.CopyStructFields(rpcReqPtr.Interface(), apiReq); err != nil {
 		trace_log.WriteErrorResponse(nCtx, "CopyStructFields_RpcReq", err)
 		return
 	}
+	md := metadata.Pairs("operationID", operationID, "opUserID", opUserID)
 	respArr := rpc.Call([]reflect.Value{
-		reflect.ValueOf(context.Context(c)), // context.Context
-		rpcReqPtr,                           // rpc apiReq
+		reflect.ValueOf(metadata.NewOutgoingContext(c, md)), // context.Context
+		rpcReqPtr, // rpc apiReq
 	}) // respArr => (apiResp, error)
 	if !respArr[1].IsNil() { // rpc err != nil
 		err := respArr[1].Interface().(error)
@@ -64,17 +53,6 @@ func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, fn in
 	}
 	rpcResp := respArr[0].Elem()
 	trace_log.SetContextInfo(nCtx, rpcFuncName, nil, "rpc req", rpcReqPtr.Interface(), "resp", rpcResp.Interface())
-	commonResp := rpcResp.FieldByName("CommonResp").Elem()
-	errCodeVal := commonResp.FieldByName("ErrCode")
-	errMsgVal := commonResp.FieldByName("ErrMsg").Interface().(string)
-	errCode := errCodeVal.Interface().(int32)
-	if errCode != 0 {
-		trace_log.WriteErrorResponse(nCtx, "RpcErrCode", &constant.ErrInfo{
-			ErrCode: errCode,
-			ErrMsg:  errMsgVal,
-		})
-		return
-	}
 	if apiResp != nil {
 		if err := utils.CopyStructFields(apiResp, rpcResp.Interface()); err != nil {
 			trace_log.WriteErrorResponse(nCtx, "CopyStructFields_RpcResp", err)
@@ -83,3 +61,77 @@ func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, fn in
 	}
 	trace_log.SetSuccess(nCtx, rpcFuncName, apiResp)
 }
+
+//func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, fn interface{}, rpcFuncName string, tokenFunc func(token string, operationID string) (string, error)) {
+//	nCtx := trace_log.NewCtx(c, rpcFuncName)
+//	defer trace_log.ShowLog(nCtx)
+//	if err := c.BindJSON(apiReq); err != nil {
+//		trace_log.WriteErrorResponse(nCtx, "BindJSON", err)
+//		return
+//	}
+//	reqValue := reflect.ValueOf(apiReq).Elem()
+//	operationID := reqValue.FieldByName("OperationID").String()
+//	trace_log.SetOperationID(nCtx, operationID)
+//	trace_log.SetContextInfo(nCtx, "BindJSON", nil, "params", apiReq)
+//	etcdConn, err := utils2.GetConn(c, rpcName)
+//	if err != nil {
+//		trace_log.WriteErrorResponse(nCtx, "GetDefaultConn", err)
+//		return
+//	}
+//	rpc := reflect.ValueOf(fn).Call([]reflect.Value{
+//		reflect.ValueOf(etcdConn),
+//	})[0].MethodByName(rpcFuncName) // rpc func
+//	rpcReqPtr := reflect.New(rpc.Type().In(1).Elem()) // *req参数
+//	var opUserID string
+//	if tokenFunc != nil {
+//		var err error
+//		opUserID, err = tokenFunc(c.GetHeader("token"), operationID)
+//		if err != nil {
+//			trace_log.WriteErrorResponse(nCtx, "TokenFunc", err)
+//			return
+//		}
+//	}
+//	if opID := rpcReqPtr.Elem().FieldByName("OperationID"); opID.IsValid() {
+//		opID.SetString(operationID)
+//		if opU := rpcReqPtr.Elem().FieldByName("OpUserID"); opU.IsValid() {
+//			opU.SetString(opUserID)
+//		}
+//	} else {
+//		op := rpcReqPtr.Elem().FieldByName("Operation").Elem()
+//		op.FieldByName("OperationID").SetString(operationID)
+//		op.FieldByName("OpUserID").SetString(opUserID)
+//	}
+//	if err := utils.CopyStructFields(rpcReqPtr.Interface(), apiReq); err != nil {
+//		trace_log.WriteErrorResponse(nCtx, "CopyStructFields_RpcReq", err)
+//		return
+//	}
+//	respArr := rpc.Call([]reflect.Value{
+//		reflect.ValueOf(context.Context(c)), // context.Context
+//		rpcReqPtr,                           // rpc apiReq
+//	}) // respArr => (apiResp, error)
+//	if !respArr[1].IsNil() { // rpc err != nil
+//		err := respArr[1].Interface().(error)
+//		trace_log.WriteErrorResponse(nCtx, rpcFuncName, err, "rpc req", rpcReqPtr.Interface())
+//		return
+//	}
+//	rpcResp := respArr[0].Elem()
+//	trace_log.SetContextInfo(nCtx, rpcFuncName, nil, "rpc req", rpcReqPtr.Interface(), "resp", rpcResp.Interface())
+//	commonResp := rpcResp.FieldByName("CommonResp").Elem()
+//	errCodeVal := commonResp.FieldByName("ErrCode")
+//	errMsgVal := commonResp.FieldByName("ErrMsg").Interface().(string)
+//	errCode := errCodeVal.Interface().(int32)
+//	if errCode != 0 {
+//		trace_log.WriteErrorResponse(nCtx, "RpcErrCode", &constant.ErrInfo{
+//			ErrCode: errCode,
+//			ErrMsg:  errMsgVal,
+//		})
+//		return
+//	}
+//	if apiResp != nil {
+//		if err := utils.CopyStructFields(apiResp, rpcResp.Interface()); err != nil {
+//			trace_log.WriteErrorResponse(nCtx, "CopyStructFields_RpcResp", err)
+//			return
+//		}
+//	}
+//	trace_log.SetSuccess(nCtx, rpcFuncName, apiResp)
+//}
diff --git a/pkg/common/middleware/gin.go b/pkg/common/middleware/gin.go
index c25b0c3fc..8155086cd 100644
--- a/pkg/common/middleware/gin.go
+++ b/pkg/common/middleware/gin.go
@@ -33,6 +33,7 @@ func GinParseOperationID(c *gin.Context) {
 			}
 			c.Request.Body = ioutil.NopCloser(bytes.NewReader(body))
 			operationID = req.OperationID
+			c.Request.Header.Set("operationID", operationID)
 		}
 		c.Set("operationID", operationID)
 		c.Next()