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

This commit is contained in:
withchao 2023-01-11 19:28:12 +08:00
commit 6dafbf2165
2 changed files with 1 additions and 2 deletions

View File

@ -1295,8 +1295,6 @@ func GetGroupAbstractInfo(c *gin.Context) {
trace_log.WriteErrorResponse(nCtx, "GetGroupAbstractInfo", utils.Wrap(err, ""))
return
}
resp.ErrMsg = respPb.CommonResp.ErrMsg
resp.ErrCode = respPb.CommonResp.ErrCode
resp.GroupMemberNumber = respPb.GroupMemberNumber
resp.GroupMemberListHash = respPb.GroupMemberListHash
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api return ", resp)

View File

@ -366,6 +366,7 @@ func GetGroupInfoFromCache(ctx context.Context, groupID string) (groupInfo *imdb
}
return string(bytes), nil
}
groupInfo = &imdb.Group{}
defer func() {
trace_log.SetContextInfo(ctx, utils.GetFuncName(1), err, "groupID", groupID, "groupInfo", groupInfo)
}()