blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gordon 2021-12-07 21:22:00 +08:00
commit f1aab5ad3b
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/api/conversation/conversation.go
View File

@ -82,7 +82,7 @@ func GetAllConversationMessageOpt(c *gin.Context) {
ginResp.ErrMsg = resp.ErrMsg ginResp.ErrMsg = resp.ErrMsg
for _, v := range resp.ConversationOptResult { for _, v := range resp.ConversationOptResult {
var opt OptResult var opt OptResult
err := utils.CopyStructFields(&opt, v) err := utils.CopyStructFields(&opt, *v, "ConversationId", "Result")
if err != nil { if err != nil {
log.NewError(req.OperationID, "CopyStructFields failed ", err.Error()) log.NewError(req.OperationID, "CopyStructFields failed ", err.Error())
continue continue
@ -122,15 +122,16 @@ func GetReceiveMessageOpt(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"errCode": 401, "errMsg": "GetReceiveMessageOpt rpc failed, " + err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"errCode": 401, "errMsg": "GetReceiveMessageOpt rpc failed, " + err.Error()})
return return
} }
log.NewInfo(req.OperationID, "GetReceiveMessageOptReq req: ", req, resp)
var ginResp GetReceiveMessageOptResp var ginResp GetReceiveMessageOptResp
ginResp.ErrCode = resp.ErrCode ginResp.ErrCode = resp.ErrCode
ginResp.ErrMsg = resp.ErrMsg ginResp.ErrMsg = resp.ErrMsg
for _, v := range resp.ConversationOptResult { for _, v := range resp.ConversationOptResult {
var opt OptResult var opt OptResult
log.NewDebug("CopyStructFields begin ", v, req.OperationID) log.NewInfo("CopyStructFields begin ", v, req.OperationID)
err := utils.CopyStructFields(&opt, v) err := utils.CopyStructFields(&opt, *v, "ConversationId", "Result")
log.NewDebug("CopyStructFields end ", v, req.OperationID) log.NewInfo("CopyStructFields end ", v, req.OperationID)
if err != nil { if err != nil {
log.NewError(req.OperationID, "CopyStructFields failed ", err.Error()) log.NewError(req.OperationID, "CopyStructFields failed ", err.Error())
continue continue
@ -171,7 +172,7 @@ func SetReceiveMessageOpt(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"errCode": 401, "errMsg": "SetReceiveMessageOpt rpc failed, " + err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"errCode": 401, "errMsg": "SetReceiveMessageOpt rpc failed, " + err.Error()})
return return
} }
log.NewInfo(req.OperationID, "SetReceiveMessageOpt req: ", req, resp)
ginResp := SetReceiveMessageOptResp{ ginResp := SetReceiveMessageOptResp{
ErrCode: resp.ErrCode, ErrCode: resp.ErrCode,
ErrMsg: resp.ErrMsg, ErrMsg: resp.ErrMsg,
@ -179,7 +180,9 @@ func SetReceiveMessageOpt(c *gin.Context) {
for _, v := range resp.OptResult { for _, v := range resp.OptResult {
var opt OptResult var opt OptResult
err := utils.CopyStructFields(&opt, v) log.NewDebug("CopyStructFields begin ", v, req.OperationID)
err := utils.CopyStructFields(&opt, *v, "ConversationId", "Result")
log.NewDebug("CopyStructFields end ", v, req.OperationID)
if err != nil { if err != nil {
log.NewError(req.OperationID, "CopyStructFields failed ", err.Error()) log.NewError(req.OperationID, "CopyStructFields failed ", err.Error())
continue continue