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

redis add get message

Browse Source
This commit is contained in:
Gordon 2022-05-24 19:24:11 +08:00
parent d6742812c8
commit 79ff36d49a
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/common/db/redisModel.go
View File

@ -11,6 +11,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/garyburd/redigo/redis" "github.com/garyburd/redigo/redis"
"github.com/golang/protobuf/jsonpb"
"strconv" "strconv"
) )
@ -269,18 +270,14 @@ func (d *DataBases) GetMessageListBySeq(userID string, seqList []uint32, operati
//MESSAGE_CACHE:169.254.225.224_reliability1653387820_0_1 //MESSAGE_CACHE:169.254.225.224_reliability1653387820_0_1
key := messageCache + userID + "_" + strconv.Itoa(int(v)) key := messageCache + userID + "_" + strconv.Itoa(int(v))
result, err := redis.Values(d.Exec("HGETALL", key)) result, err := redis.String(d.Exec("GET", key))
if err != nil { if err != nil {
errResult = err errResult = err
failedSeqList = append(failedSeqList, v) failedSeqList = append(failedSeqList, v)
log2.NewWarn(operationID, "redis get message error:", err.Error(), v) log2.NewWarn(operationID, "redis get message error:", err.Error(), v)
} else { } else {
var a []byte
for _, v := range result {
a = append(a, v.(byte))
}
msg := pbCommon.MsgData{} msg := pbCommon.MsgData{}
err = json.Unmarshal(a, &msg) err = jsonpb.UnmarshalString(result, &msg)
if err != nil { if err != nil {
errResult = err errResult = err
failedSeqList = append(failedSeqList, v) failedSeqList = append(failedSeqList, v)
@ -299,15 +296,15 @@ func (d *DataBases) SetMessageToCache(msgList []*pbChat.MsgDataToMQ, uid string,
var failedList []pbChat.MsgDataToMQ var failedList []pbChat.MsgDataToMQ
for _, msg := range msgList { for _, msg := range msgList {
key := messageCache + uid + "_" + strconv.Itoa(int(msg.MsgData.Seq)) key := messageCache + uid + "_" + strconv.Itoa(int(msg.MsgData.Seq))
m, err := utils.Pb2Map(msg.MsgData) s, err := utils.Pb2String(msg.MsgData)
if err != nil { if err != nil {
log2.NewWarn(operationID, utils.GetSelfFuncName(), "Pb2Map failed", msg.MsgData.String(), uid, err.Error()) log2.NewWarn(operationID, utils.GetSelfFuncName(), "Pb2String failed", msg.MsgData.String(), uid, err.Error())
continue continue
} }
log2.NewDebug(operationID, "convert map is ", m) log2.NewDebug(operationID, "convert string is ", s)
_, err = d.Exec("hmset", key, redis.Args{}.Add("TIMEOUT", config.Config.MsgCacheTimeout).AddFlat(m)...) _, err = d.Exec("SET", key, s, "ex", config.Config.MsgCacheTimeout)
if err != nil { if err != nil {
log2.NewWarn(operationID, utils.GetSelfFuncName(), "redis failed", "args:", key, *msg, uid, m) log2.NewWarn(operationID, utils.GetSelfFuncName(), "redis failed", "args:", key, *msg, uid, s)
failedList = append(failedList, *msg) failedList = append(failedList, *msg)
} }
} }

28
pkg/utils/utils.go
View File

@ -1,7 +1,6 @@
package utils package utils
import ( import (
"bytes"
"encoding/json" "encoding/json"
"github.com/gogo/protobuf/jsonpb" "github.com/gogo/protobuf/jsonpb"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
@ -136,16 +135,23 @@ func RemoveRepeatedStringInList(slc []string) []string {
return result return result
} }
func Pb2Map(pb proto.Message) (map[string]interface{}, error) { func Pb2String(pb proto.Message) (string, error) {
_buffer := bytes.Buffer{} marshaler := jsonpb.Marshaler{
jsonbMarshaller := &jsonpb.Marshaler{
OrigName: true, OrigName: true,
EnumsAsInts: true, EnumsAsInts: false,
EmitDefaults: true, EmitDefaults: false,
} }
_ = jsonbMarshaller.Marshal(&_buffer, pb) return marshaler.MarshalToString(pb)
jsonCnt := _buffer.Bytes()
var out map[string]interface{} }
err := json.Unmarshal(jsonCnt, &out) func Map2Pb(m map[string]interface{}) (pb proto.Message, err error) {
return out, err b, err := json.Marshal(m)
if err != nil {
return nil, err
}
err = proto.Unmarshal(b, pb)
if err != nil {
return nil, err
}
return pb, nil
} }