diff --git a/pkg/common/db/RedisModel.go b/pkg/common/db/RedisModel.go index 29e2772a0..a133b624c 100644 --- a/pkg/common/db/RedisModel.go +++ b/pkg/common/db/RedisModel.go @@ -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 } diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 8669e80f7..e925ab994 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -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) {