diff --git a/internal/rpc/msg/work_moments_notification.go b/internal/rpc/msg/work_moments_notification.go index f9f64774e..807266dfa 100644 --- a/internal/rpc/msg/work_moments_notification.go +++ b/internal/rpc/msg/work_moments_notification.go @@ -4,7 +4,6 @@ import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" pbOffice "Open_IM/pkg/proto/office" - open_im_sdk "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" @@ -16,14 +15,13 @@ func WorkMomentSendNotification(operationID, sendID, recvID string, notification } func WorkMomentNotification(operationID, sendID, recvID string, m proto.Message) { + //var tips open_im_sdk.TipsComm marshaler := jsonpb.Marshaler{ OrigName: true, EnumsAsInts: false, EmitDefaults: false, } - var tips open_im_sdk.TipsComm - var err error - tips.JsonDetail, _ = marshaler.MarshalToString(m) + JsonDetail, _ := marshaler.MarshalToString(m) n := &NotificationMsg{ SendID: sendID, RecvID: recvID, @@ -32,10 +30,7 @@ func WorkMomentNotification(operationID, sendID, recvID string, m proto.Message) SessionType: constant.SingleChatType, OperationID: operationID, } - n.Content, err = proto.Marshal(m) - if err != nil { - log.NewError(operationID, utils.GetSelfFuncName(), "proto marshal falied", err.Error()) - return - } + n.Content = []byte(JsonDetail) + log.NewInfo(operationID, utils.GetSelfFuncName(), JsonDetail) Notification(n) }