IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-12 21:16:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/errcode' into errcode

Browse Source 
# Conflicts:
#	internal/api_to_rpc/api.go
This commit is contained in:
withchao
2023-01-12 16:06:46 +08:00
parent 69e94c25f4 ff524b0ee7
commit be39542832
17 changed files with 308 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api_to_rpc/api.go
+18 -9
View File
@@ -11,16 +11,16 @@ import (
"reflect"
)
func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, rpcClientFunc interface{}, rpcFuncName string) {
func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, rpcClientFunc interface{}, rpcFuncName string, tokenFunc func(token string, operationID string) (string, error)) {
logFuncName := fmt.Sprintf("[ApiToRpc: %s]%s", utils2.GetFuncName(1), rpcFuncName)
operationID := c.GetString("operationID")
operationID := c.GetHeader("operationID")
nCtx := trace_log.NewCtx1(c, rpcFuncName, operationID)
defer trace_log.ShowLog(nCtx)
defer log.ShowLog(nCtx)
if err := c.BindJSON(apiReq); err != nil {
trace_log.WriteErrorResponse(nCtx, "BindJSON", err)
return
}
trace_log.SetContextInfo(nCtx, logFuncName, nil, "apiReq", apiReq)
trace_log.SetCtxInfo(nCtx, logFuncName, nil, "apiReq", apiReq)
etcdConn, err := getcdv3.GetConn(nCtx, rpcName)
if err != nil {
trace_log.WriteErrorResponse(nCtx, "GetDefaultConn", err)
@@ -30,11 +30,20 @@ func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, rpcCl
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 err := utils.CopyStructFields(rpcReqPtr.Interface(), apiReq); err != nil {
trace_log.WriteErrorResponse(nCtx, "CopyStructFields_RpcReq", err)
return
}
trace_log.SetContextInfo(nCtx, logFuncName, nil, "opUserID", "callRpcReq", rpcString(rpcReqPtr.Elem().Interface()))
trace_log.SetCtxInfo(nCtx, logFuncName, nil, "opUserID", opUserID, "callRpcReq", rpcString(rpcReqPtr.Elem().Interface()))
//md := metadata.Pairs("operationID", operationID, "opUserID", opUserID)
respArr := rpc.Call([]reflect.Value{
//reflect.ValueOf(metadata.NewOutgoingContext(c, md)), // context.Context
@@ -47,10 +56,10 @@ func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, rpcCl
return
}
rpcResp := respArr[0].Elem()
trace_log.SetContextInfo(nCtx, rpcFuncName, nil, "callRpcResp", rpcString(rpcResp.Interface()))
trace_log.SetCtxInfo(nCtx, rpcFuncName, nil, "callRpcResp", rpcString(rpcResp.Interface()))
if apiResp != nil {
if err := utils.CopyStructFields(apiResp, rpcResp.Interface()); err != nil {
trace_log.SetContextInfo(nCtx, "CopyStructFields_RpcResp", err, "apiResp", fmt.Sprintf("%T", apiResp), "rpcResp", fmt.Sprintf("%T", rpcResp.Interface()))
trace_log.SetCtxInfo(nCtx, "CopyStructFields_RpcResp", err, "apiResp", fmt.Sprintf("%T", apiResp), "rpcResp", fmt.Sprintf("%T", rpcResp.Interface()))
}
}
trace_log.SetSuccess(nCtx, rpcFuncName, apiResp)
@@ -73,7 +82,7 @@ func rpcString(v interface{}) string {
// reqValue := reflect.ValueOf(apiReq).Elem()
// operationID := reqValue.FieldByName("OperationID").String()
// trace_log.SetOperationID(nCtx, operationID)
// trace_log.SetContextInfo(nCtx, "BindJSON", nil, "params", apiReq)
// trace_log.SetCtxInfo(nCtx, "BindJSON", nil, "params", apiReq)
// etcdConn, err := utils2.GetConn(c, rpcName)
// if err != nil {
// trace_log.WriteErrorResponse(nCtx, "GetDefaultConn", err)
@@ -116,7 +125,7 @@ func rpcString(v interface{}) string {
// return
// }
// rpcResp := respArr[0].Elem()
// trace_log.SetContextInfo(nCtx, rpcFuncName, nil, "rpc req", rpcReqPtr.Interface(), "resp", rpcResp.Interface())
// trace_log.SetCtxInfo(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)