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

conversation fix

Browse Source
This commit is contained in:
wangchuxiao 2022-08-22 15:47:50 +08:00
parent 782ad07940
commit 7d04f06f7d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/api/manage/management_chat.go
View File

@ -336,6 +336,10 @@ func ManagementBatchSendMsg(c *gin.Context) {
var recvList []string var recvList []string
if params.IsSendAll { if params.IsSendAll {
recvList, err = im_mysql_model.SelectAllUserID() recvList, err = im_mysql_model.SelectAllUserID()
if err != nil {
log.NewError(params.OperationID, utils.GetSelfFuncName(), err.Error())
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
}
} else { } else {
recvList = params.RecvIDList recvList = params.RecvIDList
} }

6
pkg/common/db/rocks_cache/rocks_cache.go
View File

@ -460,16 +460,16 @@ func GetConversationFromCache(ownerUserID, conversationID string) (*db.Conversat
getConversation := func() (string, error) { getConversation := func() (string, error) {
conversation, err := imdb.GetConversation(ownerUserID, conversationID) conversation, err := imdb.GetConversation(ownerUserID, conversationID)
if err != nil { if err != nil {
return "", utils.Wrap(err, "") return "", utils.Wrap(err, "get failed")
} }
bytes, err := json.Marshal(conversation) bytes, err := json.Marshal(conversation)
return string(bytes), utils.Wrap(err, "") return string(bytes), utils.Wrap(err, "Marshal failed")
} }
conversationStr, err := db.DB.Rc.Fetch(conversationCache+ownerUserID+":"+conversationID, time.Second*30*60, getConversation) conversationStr, err := db.DB.Rc.Fetch(conversationCache+ownerUserID+":"+conversationID, time.Second*30*60, getConversation)
conversation := db.Conversation{} conversation := db.Conversation{}
err = json.Unmarshal([]byte(conversationStr), &conversation) err = json.Unmarshal([]byte(conversationStr), &conversation)
if err != nil { if err != nil {
return nil, err return nil, utils.Wrap(err, "Unmarshal failed")
} }
return &conversation, nil return &conversation, nil
} }