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

fix Pb2String

Browse Source
This commit is contained in:
wangchuxiao 2023-01-10 13:07:42 +08:00
parent 4f322254b0
commit 818ed107c6
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/common/db/RedisModel.go
View File

@ -374,7 +374,7 @@ func (d *DataBases) DelMsgFromCache(uid string, seqList []uint32, operationID st
continue
}
var msg pbCommon.MsgData
if err := utils.String2Pb(result, &msg); err != nil {
if err := jsonpb.UnmarshalString(result, &msg); err != nil {
log2.Error(operationID, utils.GetSelfFuncName(), "String2Pb failed", msg, result, key, err.Error())
continue
}

18
pkg/utils/utils.go
View File

@ -137,21 +137,17 @@ func RemoveRepeatedStringInList(slc []string) []string {
}
func Pb2String(pb proto.Message) (string, error) {
//marshaler := jsonpb.Marshaler{
// OrigName: true,
// EnumsAsInts: false,
// EmitDefaults: false,
//}
//return marshaler.MarshalToString(pb)
bytes, err := proto.Marshal(pb)
if err != nil {
return "", err
marshaler := jsonpb.Marshaler{
OrigName: true,
EnumsAsInts: false,
EmitDefaults: false,
}
return string(bytes), nil
return marshaler.MarshalToString(pb)
}
func String2Pb(s string, pb proto.Message) error {
return proto.Unmarshal([]byte(s), pb)
err := jsonpb.UnmarshalString(s, pb)
return err
}
func Map2Pb(m map[string]string) (pb proto.Message, err error) {