From 957e11eff0fbc4b3dba53bd36767181fb99ea23b Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 19 Apr 2022 13:05:54 +0800 Subject: [PATCH 01/10] workMoments --- internal/api/office/work_moments.go | 7 +- internal/rpc/office/office.go | 39 ++-- pkg/base_info/work_moments_struct.go | 1 - pkg/common/db/mongoModel.go | 14 +- pkg/proto/office/office.pb.go | 292 +++++++++++++-------------- pkg/proto/office/office.proto | 3 +- 6 files changed, 178 insertions(+), 178 deletions(-) diff --git a/internal/api/office/work_moments.go b/internal/api/office/work_moments.go index d1be4cb4e..108ab5858 100644 --- a/internal/api/office/work_moments.go +++ b/internal/api/office/work_moments.go @@ -37,7 +37,7 @@ func CreateOneWorkMoment(c *gin.Context) { if err := utils.CopyStructFields(&reqPb, req); err != nil { log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error()) } - reqPb.UserID = userID + reqPb.WorkMoment.UserID = userID etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName) client := pbOffice.NewOfficeServiceClient(etcdConn) respPb, err := client.CreateOneWorkMoment(context.Background(), &reqPb) @@ -46,8 +46,9 @@ func CreateOneWorkMoment(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "CreateOneWorkMoment rpc server failed" + err.Error()}) return } - if err := utils.CopyStructFields(&resp, respPb.CommonResp); err != nil { - log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error()) + resp.CommResp = apiStruct.CommResp{ + ErrCode: respPb.CommonResp.ErrCode, + ErrMsg: respPb.CommonResp.ErrMsg, } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp) c.JSON(http.StatusOK, resp) diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index 9dc7d91db..1fd328650 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -269,7 +269,7 @@ func (s *officeServer) GetUserTagByID(_ context.Context, req *pbOffice.GetUserTa func (s *officeServer) CreateOneWorkMoment(_ context.Context, req *pbOffice.CreateOneWorkMomentReq) (resp *pbOffice.CreateOneWorkMomentResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp = &pbOffice.CreateOneWorkMomentResp{} + resp = &pbOffice.CreateOneWorkMomentResp{CommonResp: &pbOffice.CommonResp{}} workMoment := db.WorkMoment{} if err := utils.CopyStructFields(&workMoment, req.WorkMoment); err != nil { log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error()) @@ -286,7 +286,7 @@ func (s *officeServer) CreateOneWorkMoment(_ context.Context, req *pbOffice.Crea func (s *officeServer) DeleteOneWorkMoment(_ context.Context, req *pbOffice.DeleteOneWorkMomentReq) (resp *pbOffice.DeleteOneWorkMomentResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp = &pbOffice.DeleteOneWorkMomentResp{} + resp = &pbOffice.DeleteOneWorkMomentResp{CommonResp: &pbOffice.CommonResp{}} workMoment, err := db.DB.GetWorkMomentByID(req.WorkMomentID) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetWorkMomentByID failed", err.Error()) @@ -326,8 +326,14 @@ func isUserCanSeeWorkMoment(userID string, workMoment db.WorkMoment) bool { func (s *officeServer) LikeOneWorkMoment(_ context.Context, req *pbOffice.LikeOneWorkMomentReq) (resp *pbOffice.LikeOneWorkMomentResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp = &pbOffice.LikeOneWorkMomentResp{} - if err = db.DB.LikeOneWorkMoment(req.UserID, req.WorkMomentID); err != nil { + resp = &pbOffice.LikeOneWorkMomentResp{CommonResp: &pbOffice.CommonResp{}} + userName, err := imdb.GetUserNameByUserID(req.UserID) + if err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserNameByUserID failed", err.Error()) + resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg} + return resp, nil + } + if err = db.DB.LikeOneWorkMoment(req.UserID, userName, req.WorkMomentID); err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "LikeOneWorkMoment failed ", err.Error()) resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg} return resp, nil @@ -338,7 +344,7 @@ func (s *officeServer) LikeOneWorkMoment(_ context.Context, req *pbOffice.LikeOn func (s *officeServer) CommentOneWorkMoment(_ context.Context, req *pbOffice.CommentOneWorkMomentReq) (resp *pbOffice.CommentOneWorkMomentResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp = &pbOffice.CommentOneWorkMomentResp{} + resp = &pbOffice.CommentOneWorkMomentResp{CommonResp: &pbOffice.CommonResp{}} commentUser, err := imdb.GetUserByUserID(req.UserID) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserNameByUserID commentUserName failed", req.UserID, err.Error()) @@ -383,7 +389,10 @@ func (s *officeServer) CommentOneWorkMoment(_ context.Context, req *pbOffice.Com func (s *officeServer) GetWorkMomentByID(_ context.Context, req *pbOffice.GetWorkMomentByIDReq) (resp *pbOffice.GetWorkMomentByIDResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp = &pbOffice.GetWorkMomentByIDResp{} + resp = &pbOffice.GetWorkMomentByIDResp{ + WorkMoment: &pbOffice.WorkMoment{}, + CommonResp: &pbOffice.CommonResp{}, + } workMoment, err := db.DB.GetWorkMomentByID(req.WorkMomentID) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetWorkMomentByID failed", err.Error()) @@ -391,7 +400,7 @@ func (s *officeServer) GetWorkMomentByID(_ context.Context, req *pbOffice.GetWor return resp, nil } canSee := isUserCanSeeWorkMoment(req.OpUserID, *workMoment) - log.Debug(req.OperationID, utils.GetSelfFuncName(), canSee, req.OpUserID, workMoment) + log.Debug(req.OperationID, utils.GetSelfFuncName(), canSee, req.OpUserID, *workMoment) if err := utils.CopyStructFields(resp.WorkMoment, workMoment); err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields", err.Error()) } @@ -401,8 +410,8 @@ func (s *officeServer) GetWorkMomentByID(_ context.Context, req *pbOffice.GetWor func (s *officeServer) GetUserWorkMoments(_ context.Context, req *pbOffice.GetUserWorkMomentsReq) (resp *pbOffice.GetUserWorkMomentsResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp = &pbOffice.GetUserWorkMomentsResp{} - resp.WorkMoments = make([]*pbOffice.WorkMoment, req.Pagination.ShowNumber) + resp = &pbOffice.GetUserWorkMomentsResp{CommonResp: &pbOffice.CommonResp{}} + resp.WorkMoments = make([]*pbOffice.WorkMoment, 0) workMoments, err := db.DB.GetUserWorkMoments(req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), err) @@ -419,8 +428,8 @@ func (s *officeServer) GetUserWorkMoments(_ context.Context, req *pbOffice.GetUs func (s *officeServer) GetUserFriendWorkMoments(_ context.Context, req *pbOffice.GetUserFriendWorkMomentsReq) (resp *pbOffice.GetUserFriendWorkMomentsResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp = &pbOffice.GetUserFriendWorkMomentsResp{} - resp.WorkMoments = make([]*pbOffice.WorkMoment, req.Pagination.ShowNumber) + resp = &pbOffice.GetUserFriendWorkMomentsResp{CommonResp: &pbOffice.CommonResp{}} + resp.WorkMoments = make([]*pbOffice.WorkMoment, 0) friendIDList, err := imdb.GetFriendIDListByUserID(req.UserID) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetFriendIDListByUserID", err.Error()) @@ -444,8 +453,8 @@ func (s *officeServer) GetUserFriendWorkMoments(_ context.Context, req *pbOffice func (s *officeServer) GetUserWorkMomentsCommentsMsg(_ context.Context, req *pbOffice.GetUserWorkMomentsCommentsMsgReq) (resp *pbOffice.GetUserWorkMomentsCommentsMsgResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp = &pbOffice.GetUserWorkMomentsCommentsMsgResp{} - resp.CommentsMsgs = make([]*pbOffice.CommentsMsg, req.Pagination.ShowNumber) + resp = &pbOffice.GetUserWorkMomentsCommentsMsgResp{CommonResp: &pbOffice.CommonResp{}} + resp.CommentsMsgs = make([]*pbOffice.CommentsMsg, 0) workMomentsCommentMsgs, err := db.DB.GetUserWorkMomentsCommentsMsg(req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserWorkMomentsCommentsMsg", err.Error()) @@ -470,7 +479,7 @@ func (s *officeServer) GetUserWorkMomentsCommentsMsg(_ context.Context, req *pbO func (s *officeServer) SetUserWorkMomentsLevel(_ context.Context, req *pbOffice.SetUserWorkMomentsLevelReq) (resp *pbOffice.SetUserWorkMomentsLevelResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp = &pbOffice.SetUserWorkMomentsLevelResp{} + resp = &pbOffice.SetUserWorkMomentsLevelResp{CommonResp: &pbOffice.CommonResp{}} if err := db.DB.SetUserWorkMomentsLevel(req.UserID, req.Level); err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "SetUserWorkMomentsLevel failed", err.Error()) resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg} @@ -482,7 +491,7 @@ func (s *officeServer) SetUserWorkMomentsLevel(_ context.Context, req *pbOffice. func (s *officeServer) ClearUserWorkMomentsCommentsMsg(_ context.Context, req *pbOffice.ClearUserWorkMomentsCommentsMsgReq) (resp *pbOffice.ClearUserWorkMomentsCommentsMsgResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp = &pbOffice.ClearUserWorkMomentsCommentsMsgResp{} + resp = &pbOffice.ClearUserWorkMomentsCommentsMsgResp{CommonResp: &pbOffice.CommonResp{}} if err := db.DB.ClearUserWorkMomentsCommentsMsg(req.UserID); err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "ClearUserWorkMomentsCommentsMsg", err.Error()) resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg} diff --git a/pkg/base_info/work_moments_struct.go b/pkg/base_info/work_moments_struct.go index c9feb5c0a..107b74b70 100644 --- a/pkg/base_info/work_moments_struct.go +++ b/pkg/base_info/work_moments_struct.go @@ -38,7 +38,6 @@ type WorkMomentsUserCommonReq struct { PageNumber int32 `json:"pageNumber" binding:"required"` ShowNumber int32 `json:"showNumber" binding:"required"` OperationID string `json:"operationID" binding:"required"` - UserID string `json:"UserID" binding:"required"` } type GetWorkMomentByIDReq struct { diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index ff7cc0d35..4d75da427 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -617,25 +617,25 @@ func (d *DataBases) GetWorkMomentByID(workMomentID string) (*WorkMoment, error) return workMoment, err } -func (d *DataBases) LikeOneWorkMoment(likeUserID, workMomentID string) error { +func (d *DataBases) LikeOneWorkMoment(likeUserID, userName, workMomentID string) error { workMoment, err := d.GetWorkMomentByID(workMomentID) if err != nil { return err } + var isAlreadyLike bool for i, user := range workMoment.LikeUsers { if likeUserID == user.UserID { + isAlreadyLike = true workMoment.LikeUsers = append(workMoment.LikeUsers[0:i], workMoment.LikeUsers[i+1:]...) - return nil } } - workMoment.LikeUsers = append(workMoment.LikeUsers, &LikeUser{UserID: likeUserID}) + if !isAlreadyLike { + workMoment.LikeUsers = append(workMoment.LikeUsers, &LikeUser{UserID: likeUserID, UserName: userName}) + } ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cWorkMoment) _, err = c.UpdateOne(ctx, bson.M{"work_id": workMomentID}, bson.M{"$set": bson.M{"like_users": workMoment.LikeUsers}}) - if err != nil { - return err - } - return nil + return err } func (d *DataBases) SetUserWorkMomentsLevel(userID string, level int32) error { diff --git a/pkg/proto/office/office.pb.go b/pkg/proto/office/office.pb.go index 30eed4b2e..a9c0a2fc7 100644 --- a/pkg/proto/office/office.pb.go +++ b/pkg/proto/office/office.pb.go @@ -36,7 +36,7 @@ func (m *CommonResp) Reset() { *m = CommonResp{} } func (m *CommonResp) String() string { return proto.CompactTextString(m) } func (*CommonResp) ProtoMessage() {} func (*CommonResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{0} + return fileDescriptor_office_373be750de153751, []int{0} } func (m *CommonResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommonResp.Unmarshal(m, b) @@ -82,7 +82,7 @@ func (m *TagUser) Reset() { *m = TagUser{} } func (m *TagUser) String() string { return proto.CompactTextString(m) } func (*TagUser) ProtoMessage() {} func (*TagUser) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{1} + return fileDescriptor_office_373be750de153751, []int{1} } func (m *TagUser) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TagUser.Unmarshal(m, b) @@ -129,7 +129,7 @@ func (m *Tag) Reset() { *m = Tag{} } func (m *Tag) String() string { return proto.CompactTextString(m) } func (*Tag) ProtoMessage() {} func (*Tag) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{2} + return fileDescriptor_office_373be750de153751, []int{2} } func (m *Tag) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Tag.Unmarshal(m, b) @@ -182,7 +182,7 @@ func (m *GetUserTagsReq) Reset() { *m = GetUserTagsReq{} } func (m *GetUserTagsReq) String() string { return proto.CompactTextString(m) } func (*GetUserTagsReq) ProtoMessage() {} func (*GetUserTagsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{3} + return fileDescriptor_office_373be750de153751, []int{3} } func (m *GetUserTagsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserTagsReq.Unmarshal(m, b) @@ -228,7 +228,7 @@ func (m *GetUserTagsResp) Reset() { *m = GetUserTagsResp{} } func (m *GetUserTagsResp) String() string { return proto.CompactTextString(m) } func (*GetUserTagsResp) ProtoMessage() {} func (*GetUserTagsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{4} + return fileDescriptor_office_373be750de153751, []int{4} } func (m *GetUserTagsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserTagsResp.Unmarshal(m, b) @@ -276,7 +276,7 @@ func (m *CreateTagReq) Reset() { *m = CreateTagReq{} } func (m *CreateTagReq) String() string { return proto.CompactTextString(m) } func (*CreateTagReq) ProtoMessage() {} func (*CreateTagReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{5} + return fileDescriptor_office_373be750de153751, []int{5} } func (m *CreateTagReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateTagReq.Unmarshal(m, b) @@ -335,7 +335,7 @@ func (m *CreateTagResp) Reset() { *m = CreateTagResp{} } func (m *CreateTagResp) String() string { return proto.CompactTextString(m) } func (*CreateTagResp) ProtoMessage() {} func (*CreateTagResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{6} + return fileDescriptor_office_373be750de153751, []int{6} } func (m *CreateTagResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateTagResp.Unmarshal(m, b) @@ -375,7 +375,7 @@ func (m *DeleteTagReq) Reset() { *m = DeleteTagReq{} } func (m *DeleteTagReq) String() string { return proto.CompactTextString(m) } func (*DeleteTagReq) ProtoMessage() {} func (*DeleteTagReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{7} + return fileDescriptor_office_373be750de153751, []int{7} } func (m *DeleteTagReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteTagReq.Unmarshal(m, b) @@ -427,7 +427,7 @@ func (m *DeleteTagResp) Reset() { *m = DeleteTagResp{} } func (m *DeleteTagResp) String() string { return proto.CompactTextString(m) } func (*DeleteTagResp) ProtoMessage() {} func (*DeleteTagResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{8} + return fileDescriptor_office_373be750de153751, []int{8} } func (m *DeleteTagResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteTagResp.Unmarshal(m, b) @@ -470,7 +470,7 @@ func (m *SetTagReq) Reset() { *m = SetTagReq{} } func (m *SetTagReq) String() string { return proto.CompactTextString(m) } func (*SetTagReq) ProtoMessage() {} func (*SetTagReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{9} + return fileDescriptor_office_373be750de153751, []int{9} } func (m *SetTagReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetTagReq.Unmarshal(m, b) @@ -543,7 +543,7 @@ func (m *SetTagResp) Reset() { *m = SetTagResp{} } func (m *SetTagResp) String() string { return proto.CompactTextString(m) } func (*SetTagResp) ProtoMessage() {} func (*SetTagResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{10} + return fileDescriptor_office_373be750de153751, []int{10} } func (m *SetTagResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetTagResp.Unmarshal(m, b) @@ -587,7 +587,7 @@ func (m *SendMsg2TagReq) Reset() { *m = SendMsg2TagReq{} } func (m *SendMsg2TagReq) String() string { return proto.CompactTextString(m) } func (*SendMsg2TagReq) ProtoMessage() {} func (*SendMsg2TagReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{11} + return fileDescriptor_office_373be750de153751, []int{11} } func (m *SendMsg2TagReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SendMsg2TagReq.Unmarshal(m, b) @@ -667,7 +667,7 @@ func (m *SendMsg2TagResp) Reset() { *m = SendMsg2TagResp{} } func (m *SendMsg2TagResp) String() string { return proto.CompactTextString(m) } func (*SendMsg2TagResp) ProtoMessage() {} func (*SendMsg2TagResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{12} + return fileDescriptor_office_373be750de153751, []int{12} } func (m *SendMsg2TagResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SendMsg2TagResp.Unmarshal(m, b) @@ -707,7 +707,7 @@ func (m *GetTagSendLogsReq) Reset() { *m = GetTagSendLogsReq{} } func (m *GetTagSendLogsReq) String() string { return proto.CompactTextString(m) } func (*GetTagSendLogsReq) ProtoMessage() {} func (*GetTagSendLogsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{13} + return fileDescriptor_office_373be750de153751, []int{13} } func (m *GetTagSendLogsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetTagSendLogsReq.Unmarshal(m, b) @@ -761,7 +761,7 @@ func (m *TagSendLog) Reset() { *m = TagSendLog{} } func (m *TagSendLog) String() string { return proto.CompactTextString(m) } func (*TagSendLog) ProtoMessage() {} func (*TagSendLog) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{14} + return fileDescriptor_office_373be750de153751, []int{14} } func (m *TagSendLog) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TagSendLog.Unmarshal(m, b) @@ -815,7 +815,7 @@ func (m *GetTagSendLogsResp) Reset() { *m = GetTagSendLogsResp{} } func (m *GetTagSendLogsResp) String() string { return proto.CompactTextString(m) } func (*GetTagSendLogsResp) ProtoMessage() {} func (*GetTagSendLogsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{15} + return fileDescriptor_office_373be750de153751, []int{15} } func (m *GetTagSendLogsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetTagSendLogsResp.Unmarshal(m, b) @@ -869,7 +869,7 @@ func (m *GetUserTagByIDReq) Reset() { *m = GetUserTagByIDReq{} } func (m *GetUserTagByIDReq) String() string { return proto.CompactTextString(m) } func (*GetUserTagByIDReq) ProtoMessage() {} func (*GetUserTagByIDReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{16} + return fileDescriptor_office_373be750de153751, []int{16} } func (m *GetUserTagByIDReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserTagByIDReq.Unmarshal(m, b) @@ -922,7 +922,7 @@ func (m *GetUserTagByIDResp) Reset() { *m = GetUserTagByIDResp{} } func (m *GetUserTagByIDResp) String() string { return proto.CompactTextString(m) } func (*GetUserTagByIDResp) ProtoMessage() {} func (*GetUserTagByIDResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{17} + return fileDescriptor_office_373be750de153751, []int{17} } func (m *GetUserTagByIDResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserTagByIDResp.Unmarshal(m, b) @@ -968,7 +968,7 @@ func (m *LikeUser) Reset() { *m = LikeUser{} } func (m *LikeUser) String() string { return proto.CompactTextString(m) } func (*LikeUser) ProtoMessage() {} func (*LikeUser) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{18} + return fileDescriptor_office_373be750de153751, []int{18} } func (m *LikeUser) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LikeUser.Unmarshal(m, b) @@ -1019,7 +1019,7 @@ func (m *Comment) Reset() { *m = Comment{} } func (m *Comment) String() string { return proto.CompactTextString(m) } func (*Comment) ProtoMessage() {} func (*Comment) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{19} + return fileDescriptor_office_373be750de153751, []int{19} } func (m *Comment) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Comment.Unmarshal(m, b) @@ -1107,7 +1107,7 @@ func (m *WorkMoment) Reset() { *m = WorkMoment{} } func (m *WorkMoment) String() string { return proto.CompactTextString(m) } func (*WorkMoment) ProtoMessage() {} func (*WorkMoment) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{20} + return fileDescriptor_office_373be750de153751, []int{20} } func (m *WorkMoment) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WorkMoment.Unmarshal(m, b) @@ -1192,8 +1192,7 @@ func (m *WorkMoment) GetCreateTime() int32 { type CreateOneWorkMomentReq struct { WorkMoment *WorkMoment `protobuf:"bytes,1,opt,name=workMoment" json:"workMoment,omitempty"` - UserID string `protobuf:"bytes,2,opt,name=userID" json:"userID,omitempty"` - OperationID string `protobuf:"bytes,3,opt,name=operationID" json:"operationID,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1203,7 +1202,7 @@ func (m *CreateOneWorkMomentReq) Reset() { *m = CreateOneWorkMomentReq{} func (m *CreateOneWorkMomentReq) String() string { return proto.CompactTextString(m) } func (*CreateOneWorkMomentReq) ProtoMessage() {} func (*CreateOneWorkMomentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{21} + return fileDescriptor_office_373be750de153751, []int{21} } func (m *CreateOneWorkMomentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateOneWorkMomentReq.Unmarshal(m, b) @@ -1230,13 +1229,6 @@ func (m *CreateOneWorkMomentReq) GetWorkMoment() *WorkMoment { return nil } -func (m *CreateOneWorkMomentReq) GetUserID() string { - if m != nil { - return m.UserID - } - return "" -} - func (m *CreateOneWorkMomentReq) GetOperationID() string { if m != nil { return m.OperationID @@ -1255,7 +1247,7 @@ func (m *CreateOneWorkMomentResp) Reset() { *m = CreateOneWorkMomentResp func (m *CreateOneWorkMomentResp) String() string { return proto.CompactTextString(m) } func (*CreateOneWorkMomentResp) ProtoMessage() {} func (*CreateOneWorkMomentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{22} + return fileDescriptor_office_373be750de153751, []int{22} } func (m *CreateOneWorkMomentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateOneWorkMomentResp.Unmarshal(m, b) @@ -1295,7 +1287,7 @@ func (m *DeleteOneWorkMomentReq) Reset() { *m = DeleteOneWorkMomentReq{} func (m *DeleteOneWorkMomentReq) String() string { return proto.CompactTextString(m) } func (*DeleteOneWorkMomentReq) ProtoMessage() {} func (*DeleteOneWorkMomentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{23} + return fileDescriptor_office_373be750de153751, []int{23} } func (m *DeleteOneWorkMomentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteOneWorkMomentReq.Unmarshal(m, b) @@ -1347,7 +1339,7 @@ func (m *DeleteOneWorkMomentResp) Reset() { *m = DeleteOneWorkMomentResp func (m *DeleteOneWorkMomentResp) String() string { return proto.CompactTextString(m) } func (*DeleteOneWorkMomentResp) ProtoMessage() {} func (*DeleteOneWorkMomentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{24} + return fileDescriptor_office_373be750de153751, []int{24} } func (m *DeleteOneWorkMomentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteOneWorkMomentResp.Unmarshal(m, b) @@ -1387,7 +1379,7 @@ func (m *LikeOneWorkMomentReq) Reset() { *m = LikeOneWorkMomentReq{} } func (m *LikeOneWorkMomentReq) String() string { return proto.CompactTextString(m) } func (*LikeOneWorkMomentReq) ProtoMessage() {} func (*LikeOneWorkMomentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{25} + return fileDescriptor_office_373be750de153751, []int{25} } func (m *LikeOneWorkMomentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LikeOneWorkMomentReq.Unmarshal(m, b) @@ -1439,7 +1431,7 @@ func (m *LikeOneWorkMomentResp) Reset() { *m = LikeOneWorkMomentResp{} } func (m *LikeOneWorkMomentResp) String() string { return proto.CompactTextString(m) } func (*LikeOneWorkMomentResp) ProtoMessage() {} func (*LikeOneWorkMomentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{26} + return fileDescriptor_office_373be750de153751, []int{26} } func (m *LikeOneWorkMomentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LikeOneWorkMomentResp.Unmarshal(m, b) @@ -1481,7 +1473,7 @@ func (m *CommentOneWorkMomentReq) Reset() { *m = CommentOneWorkMomentReq func (m *CommentOneWorkMomentReq) String() string { return proto.CompactTextString(m) } func (*CommentOneWorkMomentReq) ProtoMessage() {} func (*CommentOneWorkMomentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{27} + return fileDescriptor_office_373be750de153751, []int{27} } func (m *CommentOneWorkMomentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommentOneWorkMomentReq.Unmarshal(m, b) @@ -1547,7 +1539,7 @@ func (m *CommentOneWorkMomentResp) Reset() { *m = CommentOneWorkMomentRe func (m *CommentOneWorkMomentResp) String() string { return proto.CompactTextString(m) } func (*CommentOneWorkMomentResp) ProtoMessage() {} func (*CommentOneWorkMomentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{28} + return fileDescriptor_office_373be750de153751, []int{28} } func (m *CommentOneWorkMomentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommentOneWorkMomentResp.Unmarshal(m, b) @@ -1587,7 +1579,7 @@ func (m *GetWorkMomentByIDReq) Reset() { *m = GetWorkMomentByIDReq{} } func (m *GetWorkMomentByIDReq) String() string { return proto.CompactTextString(m) } func (*GetWorkMomentByIDReq) ProtoMessage() {} func (*GetWorkMomentByIDReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{29} + return fileDescriptor_office_373be750de153751, []int{29} } func (m *GetWorkMomentByIDReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetWorkMomentByIDReq.Unmarshal(m, b) @@ -1640,7 +1632,7 @@ func (m *GetWorkMomentByIDResp) Reset() { *m = GetWorkMomentByIDResp{} } func (m *GetWorkMomentByIDResp) String() string { return proto.CompactTextString(m) } func (*GetWorkMomentByIDResp) ProtoMessage() {} func (*GetWorkMomentByIDResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{30} + return fileDescriptor_office_373be750de153751, []int{30} } func (m *GetWorkMomentByIDResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetWorkMomentByIDResp.Unmarshal(m, b) @@ -1687,7 +1679,7 @@ func (m *GetUserWorkMomentsReq) Reset() { *m = GetUserWorkMomentsReq{} } func (m *GetUserWorkMomentsReq) String() string { return proto.CompactTextString(m) } func (*GetUserWorkMomentsReq) ProtoMessage() {} func (*GetUserWorkMomentsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{31} + return fileDescriptor_office_373be750de153751, []int{31} } func (m *GetUserWorkMomentsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserWorkMomentsReq.Unmarshal(m, b) @@ -1741,7 +1733,7 @@ func (m *GetUserWorkMomentsResp) Reset() { *m = GetUserWorkMomentsResp{} func (m *GetUserWorkMomentsResp) String() string { return proto.CompactTextString(m) } func (*GetUserWorkMomentsResp) ProtoMessage() {} func (*GetUserWorkMomentsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{32} + return fileDescriptor_office_373be750de153751, []int{32} } func (m *GetUserWorkMomentsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserWorkMomentsResp.Unmarshal(m, b) @@ -1795,7 +1787,7 @@ func (m *GetUserFriendWorkMomentsReq) Reset() { *m = GetUserFriendWorkMo func (m *GetUserFriendWorkMomentsReq) String() string { return proto.CompactTextString(m) } func (*GetUserFriendWorkMomentsReq) ProtoMessage() {} func (*GetUserFriendWorkMomentsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{33} + return fileDescriptor_office_373be750de153751, []int{33} } func (m *GetUserFriendWorkMomentsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserFriendWorkMomentsReq.Unmarshal(m, b) @@ -1849,7 +1841,7 @@ func (m *GetUserFriendWorkMomentsResp) Reset() { *m = GetUserFriendWorkM func (m *GetUserFriendWorkMomentsResp) String() string { return proto.CompactTextString(m) } func (*GetUserFriendWorkMomentsResp) ProtoMessage() {} func (*GetUserFriendWorkMomentsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{34} + return fileDescriptor_office_373be750de153751, []int{34} } func (m *GetUserFriendWorkMomentsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserFriendWorkMomentsResp.Unmarshal(m, b) @@ -1903,7 +1895,7 @@ func (m *CommentsMsg) Reset() { *m = CommentsMsg{} } func (m *CommentsMsg) String() string { return proto.CompactTextString(m) } func (*CommentsMsg) ProtoMessage() {} func (*CommentsMsg) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{35} + return fileDescriptor_office_373be750de153751, []int{35} } func (m *CommentsMsg) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommentsMsg.Unmarshal(m, b) @@ -1957,7 +1949,7 @@ func (m *GetUserWorkMomentsCommentsMsgReq) Reset() { *m = GetUserWorkMom func (m *GetUserWorkMomentsCommentsMsgReq) String() string { return proto.CompactTextString(m) } func (*GetUserWorkMomentsCommentsMsgReq) ProtoMessage() {} func (*GetUserWorkMomentsCommentsMsgReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{36} + return fileDescriptor_office_373be750de153751, []int{36} } func (m *GetUserWorkMomentsCommentsMsgReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserWorkMomentsCommentsMsgReq.Unmarshal(m, b) @@ -2011,7 +2003,7 @@ func (m *GetUserWorkMomentsCommentsMsgResp) Reset() { *m = GetUserWorkMo func (m *GetUserWorkMomentsCommentsMsgResp) String() string { return proto.CompactTextString(m) } func (*GetUserWorkMomentsCommentsMsgResp) ProtoMessage() {} func (*GetUserWorkMomentsCommentsMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{37} + return fileDescriptor_office_373be750de153751, []int{37} } func (m *GetUserWorkMomentsCommentsMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserWorkMomentsCommentsMsgResp.Unmarshal(m, b) @@ -2064,7 +2056,7 @@ func (m *ClearUserWorkMomentsCommentsMsgReq) Reset() { *m = ClearUserWor func (m *ClearUserWorkMomentsCommentsMsgReq) String() string { return proto.CompactTextString(m) } func (*ClearUserWorkMomentsCommentsMsgReq) ProtoMessage() {} func (*ClearUserWorkMomentsCommentsMsgReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{38} + return fileDescriptor_office_373be750de153751, []int{38} } func (m *ClearUserWorkMomentsCommentsMsgReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ClearUserWorkMomentsCommentsMsgReq.Unmarshal(m, b) @@ -2109,7 +2101,7 @@ func (m *ClearUserWorkMomentsCommentsMsgResp) Reset() { *m = ClearUserWo func (m *ClearUserWorkMomentsCommentsMsgResp) String() string { return proto.CompactTextString(m) } func (*ClearUserWorkMomentsCommentsMsgResp) ProtoMessage() {} func (*ClearUserWorkMomentsCommentsMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{39} + return fileDescriptor_office_373be750de153751, []int{39} } func (m *ClearUserWorkMomentsCommentsMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ClearUserWorkMomentsCommentsMsgResp.Unmarshal(m, b) @@ -2149,7 +2141,7 @@ func (m *SetUserWorkMomentsLevelReq) Reset() { *m = SetUserWorkMomentsLe func (m *SetUserWorkMomentsLevelReq) String() string { return proto.CompactTextString(m) } func (*SetUserWorkMomentsLevelReq) ProtoMessage() {} func (*SetUserWorkMomentsLevelReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{40} + return fileDescriptor_office_373be750de153751, []int{40} } func (m *SetUserWorkMomentsLevelReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetUserWorkMomentsLevelReq.Unmarshal(m, b) @@ -2201,7 +2193,7 @@ func (m *SetUserWorkMomentsLevelResp) Reset() { *m = SetUserWorkMomentsL func (m *SetUserWorkMomentsLevelResp) String() string { return proto.CompactTextString(m) } func (*SetUserWorkMomentsLevelResp) ProtoMessage() {} func (*SetUserWorkMomentsLevelResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_7066d9c5c43d9815, []int{41} + return fileDescriptor_office_373be750de153751, []int{41} } func (m *SetUserWorkMomentsLevelResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetUserWorkMomentsLevelResp.Unmarshal(m, b) @@ -2877,104 +2869,104 @@ var _OfficeService_serviceDesc = grpc.ServiceDesc{ Metadata: "office/office.proto", } -func init() { proto.RegisterFile("office/office.proto", fileDescriptor_office_7066d9c5c43d9815) } +func init() { proto.RegisterFile("office/office.proto", fileDescriptor_office_373be750de153751) } -var fileDescriptor_office_7066d9c5c43d9815 = []byte{ - // 1531 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcf, 0x6f, 0x1b, 0xc5, - 0x17, 0xd7, 0xda, 0x49, 0x1c, 0x3f, 0xa7, 0x4d, 0x33, 0x49, 0x13, 0x7f, 0xb7, 0x4d, 0xe2, 0x6e, - 0xfb, 0x95, 0xd2, 0x56, 0x72, 0x90, 0xa9, 0x04, 0x12, 0xa2, 0x42, 0xb5, 0x4b, 0x14, 0x48, 0xda, - 0xb0, 0x4e, 0xa8, 0xca, 0xa1, 0xd1, 0xd6, 0x9e, 0x2c, 0xab, 0xd8, 0xbb, 0xdb, 0x9d, 0x8d, 0x4d, - 0xb9, 0x20, 0x71, 0x80, 0x3f, 0x80, 0x03, 0x27, 0x2e, 0xfc, 0x0b, 0xfc, 0x0d, 0x1c, 0x38, 0x21, - 0x4e, 0x9c, 0x38, 0xc1, 0x1f, 0x82, 0x66, 0xf6, 0xc7, 0xcc, 0xec, 0x0f, 0xdb, 0xdd, 0x52, 0x09, - 0x4e, 0xf1, 0x7b, 0xf3, 0xe6, 0xcd, 0xe7, 0x7d, 0xde, 0xcc, 0x9b, 0xb7, 0x13, 0x58, 0x75, 0xce, - 0xce, 0xac, 0x1e, 0xde, 0x0d, 0xfe, 0x34, 0x5d, 0xcf, 0xf1, 0x1d, 0xb4, 0x10, 0x48, 0xea, 0x8d, - 0xc7, 0x2e, 0xb6, 0x4f, 0xf7, 0x0f, 0x77, 0xdd, 0x73, 0x73, 0x97, 0x0d, 0xed, 0x92, 0xfe, 0xf9, - 0xe9, 0x98, 0xec, 0x8e, 0x49, 0x60, 0xaa, 0xdd, 0x07, 0x68, 0x3b, 0xc3, 0xa1, 0x63, 0xeb, 0x98, - 0xb8, 0xa8, 0x0e, 0x15, 0xec, 0x79, 0x6d, 0xa7, 0x8f, 0xeb, 0x4a, 0x43, 0xd9, 0x99, 0xd7, 0x23, - 0x11, 0xad, 0xc3, 0x02, 0xf6, 0xbc, 0x43, 0x62, 0xd6, 0x4b, 0x0d, 0x65, 0xa7, 0xaa, 0x87, 0x92, - 0xf6, 0x3e, 0x54, 0x8e, 0x0d, 0xf3, 0x84, 0x60, 0x8f, 0x9a, 0x5c, 0x10, 0xec, 0xed, 0x77, 0xd8, - 0xdc, 0xaa, 0x1e, 0x4a, 0x48, 0x85, 0x45, 0xfa, 0xeb, 0x91, 0x31, 0xc4, 0xe1, 0xe4, 0x58, 0xd6, - 0x9e, 0x43, 0xf9, 0xd8, 0x30, 0xd1, 0x1a, 0xcc, 0xfb, 0x86, 0x19, 0xcf, 0x0c, 0x04, 0x8a, 0xc6, - 0x37, 0x4c, 0x61, 0x5e, 0x24, 0xa2, 0xbb, 0x81, 0xcb, 0x03, 0x8b, 0xf8, 0xf5, 0x72, 0xa3, 0xbc, - 0x53, 0x6b, 0x2d, 0x37, 0x43, 0x06, 0x42, 0x34, 0x7a, 0x6c, 0xa0, 0x7d, 0x04, 0x97, 0xf7, 0xb0, - 0x4f, 0x95, 0xc7, 0x86, 0x49, 0x74, 0xfc, 0x22, 0x17, 0x69, 0x03, 0x6a, 0x8e, 0x8b, 0x3d, 0xc3, - 0xb7, 0x1c, 0x7b, 0xbf, 0x13, 0x2e, 0x2a, 0xaa, 0xb4, 0x33, 0x58, 0x96, 0x7c, 0x11, 0x17, 0xb5, - 0x00, 0x7a, 0x31, 0x83, 0xcc, 0x61, 0xad, 0x85, 0x22, 0x34, 0x9c, 0x5b, 0x5d, 0xb0, 0x42, 0xdb, - 0x30, 0xe7, 0x1b, 0x26, 0xa9, 0x97, 0x18, 0xf6, 0x9a, 0x80, 0x5d, 0x67, 0x03, 0xda, 0xd7, 0x0a, - 0x2c, 0xb5, 0x3d, 0x6c, 0xf8, 0x98, 0xea, 0xf0, 0x0b, 0x91, 0x0b, 0x45, 0xe6, 0x82, 0x07, 0x53, - 0x92, 0x82, 0xd9, 0x02, 0x08, 0x7e, 0xc5, 0x2c, 0x55, 0x75, 0x41, 0x93, 0x0c, 0x76, 0x2e, 0x1d, - 0x6c, 0x1b, 0x2e, 0x09, 0x18, 0x8a, 0x85, 0xaa, 0x3d, 0x83, 0xa5, 0x0e, 0x1e, 0xe0, 0x38, 0x90, - 0x3c, 0xee, 0xe3, 0x2d, 0x50, 0x12, 0xb7, 0x40, 0x02, 0x64, 0x39, 0x13, 0xa4, 0xe0, 0xbf, 0x20, - 0xc8, 0xdf, 0x14, 0xa8, 0x76, 0xb1, 0x5f, 0x08, 0x62, 0x1d, 0x2a, 0x36, 0x1e, 0xb3, 0xcc, 0x04, - 0xf0, 0x22, 0x11, 0x35, 0x01, 0x59, 0x76, 0xcf, 0xc3, 0x06, 0xc1, 0x27, 0x3c, 0x13, 0x73, 0x2c, - 0x13, 0x19, 0x23, 0xe8, 0x0e, 0x5c, 0xf1, 0x70, 0xff, 0xa2, 0x27, 0x5a, 0xcf, 0x33, 0xeb, 0x94, - 0x3e, 0x49, 0xcc, 0x42, 0x9a, 0x98, 0x0f, 0x00, 0xa2, 0x90, 0x0a, 0xb2, 0xf2, 0x97, 0x02, 0x97, - 0xbb, 0xd8, 0xee, 0x1f, 0x12, 0xb3, 0x25, 0x6d, 0x43, 0x86, 0x4c, 0x61, 0xc8, 0x22, 0x91, 0x9e, - 0xf2, 0x93, 0xe8, 0x48, 0x96, 0xd8, 0x50, 0x2c, 0xa3, 0xeb, 0x50, 0xdd, 0xf3, 0x9c, 0x0b, 0x57, - 0xd8, 0x89, 0x5c, 0x41, 0xe9, 0x26, 0xd8, 0xee, 0xc7, 0x7b, 0x30, 0x94, 0x28, 0x1d, 0xf4, 0x17, - 0xf6, 0x8e, 0x06, 0x86, 0x7f, 0xe6, 0x78, 0xc3, 0xfd, 0x4e, 0x7d, 0x9e, 0x55, 0xa5, 0x94, 0x9e, - 0xe2, 0xea, 0x39, 0xb6, 0x8f, 0x6d, 0x3f, 0xa4, 0x22, 0x12, 0x93, 0x44, 0x55, 0xd2, 0x44, 0x3d, - 0x84, 0x65, 0x29, 0xca, 0x82, 0x6c, 0x7d, 0xa7, 0xc0, 0xca, 0x1e, 0x23, 0x9c, 0x7a, 0x3b, 0x70, - 0x82, 0x52, 0xd3, 0x01, 0x38, 0x32, 0x4c, 0xcb, 0x66, 0x8b, 0x85, 0x9e, 0x6e, 0x35, 0x09, 0xf6, - 0x46, 0xd8, 0x3b, 0x35, 0x5c, 0xeb, 0xd4, 0x35, 0x3c, 0x63, 0x48, 0x9a, 0x3a, 0x7e, 0x71, 0x81, - 0x89, 0xcf, 0x6d, 0x75, 0x61, 0x5e, 0xee, 0x19, 0x9f, 0x7e, 0x3c, 0x1c, 0x00, 0x8e, 0x48, 0xaa, - 0x9b, 0xca, 0x94, 0xba, 0x29, 0x72, 0x5a, 0x92, 0x39, 0x55, 0x61, 0x91, 0x66, 0xe0, 0xd8, 0x0a, - 0xf7, 0x7c, 0x59, 0x8f, 0x65, 0xed, 0x67, 0x05, 0x50, 0x92, 0x86, 0x82, 0x55, 0xf2, 0xa1, 0xc4, - 0x5d, 0x89, 0xcd, 0xf9, 0x7f, 0x26, 0x77, 0xc4, 0x75, 0x6c, 0x82, 0x73, 0xc8, 0xbb, 0x07, 0x35, - 0x9f, 0xa3, 0x09, 0xef, 0x0b, 0x24, 0xc4, 0x1d, 0x0e, 0xe9, 0xa2, 0x99, 0xd6, 0x63, 0xd9, 0x0c, - 0x2b, 0xfd, 0x83, 0x97, 0xfb, 0x9d, 0x37, 0x51, 0xbc, 0x4c, 0xc6, 0x95, 0xb4, 0x48, 0x41, 0xae, - 0x36, 0xa1, 0xec, 0x1b, 0x66, 0x48, 0x92, 0x74, 0xa1, 0x50, 0xbd, 0x76, 0x1f, 0x16, 0x0f, 0xac, - 0x73, 0x5c, 0xf8, 0x9e, 0xfe, 0x43, 0x81, 0x0a, 0x5d, 0x99, 0x66, 0xbf, 0xc0, 0x7c, 0x4a, 0x85, - 0x87, 0xdd, 0xc1, 0xcb, 0xa0, 0x82, 0x45, 0x54, 0x08, 0x2a, 0x74, 0x0b, 0x2e, 0xc5, 0x22, 0x73, - 0x11, 0x14, 0x03, 0x59, 0x49, 0x2b, 0x49, 0xb8, 0x09, 0xc3, 0x62, 0x50, 0xd5, 0xb9, 0x62, 0x42, - 0x15, 0xd8, 0x02, 0xe8, 0x05, 0x57, 0x19, 0xdd, 0xb3, 0x15, 0x56, 0x45, 0x04, 0x8d, 0xf6, 0x67, - 0x09, 0xe0, 0x89, 0xe3, 0x9d, 0x1f, 0x3a, 0x2c, 0x44, 0x0d, 0x96, 0xc6, 0xb1, 0x14, 0x07, 0x2a, - 0xe9, 0x72, 0xcf, 0xa4, 0x00, 0xa2, 0x2c, 0x83, 0x68, 0x42, 0x75, 0x10, 0x26, 0x81, 0xb0, 0x6b, - 0xa0, 0xd6, 0xba, 0x12, 0x65, 0x2a, 0xca, 0x8e, 0xce, 0x4d, 0xe8, 0x69, 0xed, 0x05, 0x9c, 0x13, - 0x76, 0x0f, 0x08, 0xa7, 0x35, 0xcc, 0x85, 0x1e, 0x1b, 0xa0, 0xb7, 0x60, 0x75, 0xfc, 0xb9, 0xd3, - 0x36, 0xec, 0x2e, 0x16, 0xef, 0x8f, 0x05, 0x56, 0x6d, 0xb3, 0x86, 0x50, 0x0b, 0xd6, 0x02, 0xb5, - 0x2f, 0x4f, 0xa9, 0xb0, 0x29, 0x99, 0x63, 0x94, 0x7f, 0x8b, 0x1c, 0x79, 0xd6, 0xc8, 0xf0, 0x71, - 0x7d, 0xb1, 0xa1, 0xec, 0x2c, 0xea, 0x5c, 0x41, 0x59, 0x6e, 0x73, 0x96, 0x21, 0x60, 0x99, 0x6b, - 0xb4, 0x6f, 0x14, 0x58, 0x0f, 0xc4, 0xc7, 0x36, 0xe6, 0x74, 0xd3, 0x93, 0xd5, 0x02, 0xe0, 0xec, - 0x26, 0xf7, 0xbc, 0x60, 0x2a, 0x58, 0xbd, 0x46, 0x55, 0x3c, 0x84, 0x8d, 0x4c, 0x1c, 0x05, 0x4b, - 0xff, 0x08, 0xd6, 0x83, 0x1e, 0x24, 0x15, 0xd6, 0xeb, 0x6c, 0xa4, 0x99, 0xc2, 0xc8, 0x5c, 0xb7, - 0x60, 0x18, 0x3e, 0xac, 0xd1, 0x6d, 0x98, 0x0a, 0x22, 0xef, 0xc0, 0x6b, 0xb0, 0xf4, 0x44, 0x0c, - 0x2e, 0x80, 0x2f, 0xe9, 0x66, 0x08, 0xe2, 0x63, 0xb8, 0x9a, 0xb1, 0x6a, 0xc1, 0x10, 0x7e, 0x52, - 0x60, 0x23, 0x3c, 0x1b, 0xaf, 0x12, 0xc6, 0x38, 0x23, 0x8c, 0x71, 0x22, 0x8c, 0x29, 0xf5, 0x4b, - 0x38, 0xf6, 0x73, 0x13, 0x3b, 0x90, 0xf9, 0x34, 0x05, 0x8f, 0xa0, 0x9e, 0x0d, 0xba, 0x20, 0x0b, - 0x5f, 0xc0, 0xda, 0x1e, 0xf6, 0xb9, 0xa3, 0xe8, 0xfa, 0x9a, 0x65, 0x37, 0xaa, 0xb0, 0xe8, 0xb8, - 0x27, 0xe2, 0x7e, 0x8c, 0xe5, 0x19, 0x92, 0xf9, 0x15, 0x5c, 0xcd, 0x58, 0xb9, 0xe0, 0x9d, 0x26, - 0xd7, 0x84, 0xd2, 0x2c, 0x35, 0x41, 0xfb, 0x5e, 0x61, 0x08, 0x28, 0x60, 0x6e, 0x31, 0xf1, 0xa3, - 0xaf, 0x93, 0xd1, 0x65, 0xbc, 0x7a, 0x87, 0x36, 0x9d, 0x9a, 0x5f, 0x14, 0x58, 0xcf, 0x42, 0x56, - 0x90, 0x9c, 0x7b, 0x50, 0xe3, 0x61, 0x47, 0x5f, 0x92, 0x59, 0xec, 0x88, 0x66, 0x89, 0x96, 0xaa, - 0x5c, 0xb0, 0xa5, 0xd2, 0x7e, 0x50, 0xe0, 0x5a, 0x18, 0xcb, 0x87, 0x9e, 0x85, 0xed, 0xfe, 0xbf, - 0x8c, 0xeb, 0x5f, 0x15, 0xb8, 0x9e, 0x8f, 0xef, 0xbf, 0xc8, 0xf8, 0x08, 0x6a, 0x61, 0x89, 0x20, - 0x87, 0xc4, 0x44, 0xb7, 0x69, 0xb5, 0x19, 0x0a, 0x77, 0x65, 0xaa, 0x33, 0x88, 0xc6, 0x67, 0x2a, - 0x6f, 0xb9, 0x3d, 0x8b, 0xf6, 0xa3, 0x02, 0x8d, 0xf4, 0xae, 0x15, 0xa0, 0xbc, 0xd6, 0x7b, 0x4a, - 0x62, 0x43, 0x94, 0x8b, 0x6d, 0x08, 0xed, 0x77, 0x05, 0x6e, 0x4c, 0x01, 0x59, 0x30, 0xe7, 0xef, - 0xc0, 0x52, 0x8f, 0xbb, 0x89, 0x92, 0xbe, 0x9a, 0x20, 0x9b, 0x2d, 0x21, 0x19, 0xfe, 0x53, 0x69, - 0x7f, 0x06, 0x5a, 0x7b, 0x80, 0x0d, 0xef, 0x0d, 0xf1, 0xaf, 0x3d, 0x85, 0x9b, 0x53, 0xfd, 0x17, - 0xbc, 0x84, 0x06, 0xa0, 0x76, 0x53, 0x39, 0x39, 0xc0, 0x23, 0x3c, 0x98, 0xf2, 0x25, 0x35, 0xa0, - 0x36, 0x0c, 0xec, 0xbc, 0x1e, 0x08, 0x33, 0x9c, 0xf8, 0x4f, 0xe0, 0x5a, 0xee, 0x6a, 0xc5, 0x02, - 0x68, 0x7d, 0x5b, 0x83, 0x4b, 0x8f, 0x99, 0x45, 0x17, 0x7b, 0x23, 0xab, 0x87, 0xd1, 0x7d, 0xa8, - 0x09, 0xaf, 0x7f, 0x68, 0x3d, 0x72, 0x20, 0x3f, 0x2f, 0xaa, 0x1b, 0x99, 0x7a, 0xe2, 0xa2, 0x77, - 0xa1, 0x1a, 0x3f, 0xa8, 0xa1, 0xb5, 0x78, 0x79, 0xe1, 0x9d, 0x4f, 0xbd, 0x9a, 0xa1, 0x0d, 0x66, - 0xc6, 0xaf, 0x5c, 0x7c, 0xa6, 0xf8, 0xb0, 0xc6, 0x67, 0xca, 0xcf, 0x61, 0xbb, 0xb0, 0x10, 0x3c, - 0x03, 0xa1, 0x95, 0xc8, 0x20, 0x7e, 0xe9, 0x52, 0x51, 0x52, 0x45, 0x5c, 0x1a, 0xa4, 0xf0, 0x1c, - 0xc2, 0x83, 0x94, 0x5f, 0x82, 0x78, 0x90, 0xc9, 0xb7, 0x93, 0x3d, 0xf6, 0xdc, 0x2a, 0x7c, 0xff, - 0xa3, 0xff, 0x09, 0x7c, 0xc8, 0xcf, 0x23, 0xaa, 0x9a, 0x37, 0x14, 0x3b, 0x12, 0x3e, 0x8e, 0x25, - 0x47, 0xf2, 0x97, 0xb9, 0xe4, 0x28, 0xf9, 0x3d, 0xfd, 0x29, 0xac, 0x66, 0x74, 0xfb, 0x68, 0x4b, - 0xa6, 0x3a, 0xd9, 0x2f, 0xaa, 0xdb, 0x13, 0xc7, 0x03, 0xbf, 0x19, 0xed, 0x37, 0xf7, 0x9b, 0xfd, - 0x4d, 0xc0, 0xfd, 0xe6, 0xf5, 0xee, 0x47, 0xb0, 0x92, 0xea, 0x88, 0xd1, 0x75, 0xf1, 0x4b, 0x31, - 0xe5, 0x73, 0x73, 0xc2, 0x28, 0x71, 0xd1, 0x53, 0x58, 0xcb, 0x6a, 0x30, 0xd1, 0x76, 0xa2, 0x90, - 0xa5, 0xfc, 0x36, 0x26, 0x1b, 0x04, 0x60, 0x53, 0x1d, 0x1f, 0x07, 0x9b, 0xd5, 0x86, 0x72, 0xb0, - 0xd9, 0xad, 0x62, 0x37, 0x7e, 0x14, 0x11, 0x8e, 0x32, 0xda, 0x4c, 0x24, 0x58, 0xee, 0x38, 0xd4, - 0xad, 0x49, 0xc3, 0xc4, 0x45, 0x18, 0xea, 0x79, 0x0d, 0x01, 0xba, 0x99, 0x98, 0x9b, 0xd5, 0xd2, - 0xa8, 0xb7, 0xa6, 0x1b, 0x11, 0x17, 0xf9, 0xb0, 0x39, 0xf1, 0x22, 0x42, 0x3b, 0xf9, 0x38, 0xe5, - 0xa2, 0xae, 0xde, 0x9e, 0xd1, 0x92, 0xb8, 0xe8, 0x4b, 0xd8, 0x9e, 0x52, 0xc5, 0xd1, 0x9d, 0x38, - 0x91, 0x53, 0xaf, 0x13, 0xf5, 0xee, 0xcc, 0xb6, 0xc4, 0x45, 0xcf, 0x61, 0x23, 0xa7, 0xf0, 0x22, - 0x4d, 0xa8, 0x2e, 0x39, 0xf7, 0x80, 0x7a, 0x73, 0xaa, 0x0d, 0x71, 0x1f, 0xac, 0x7c, 0xb6, 0xdc, - 0x0c, 0xff, 0xc3, 0xf5, 0x5e, 0xf0, 0xe7, 0xf9, 0x02, 0xfb, 0xf7, 0xd5, 0xdb, 0x7f, 0x07, 0x00, - 0x00, 0xff, 0xff, 0xc0, 0xa8, 0x93, 0x9b, 0x00, 0x1b, 0x00, 0x00, +var fileDescriptor_office_373be750de153751 = []byte{ + // 1530 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0x4f, 0x6f, 0x1b, 0x45, + 0x14, 0xd7, 0xda, 0x49, 0x1c, 0x3f, 0xa7, 0x4d, 0x33, 0x49, 0x13, 0xb3, 0x6d, 0x12, 0x77, 0x5b, + 0xa4, 0xb4, 0x95, 0x1c, 0x64, 0x2a, 0x81, 0x84, 0xa8, 0x50, 0xed, 0x12, 0x05, 0xe2, 0x36, 0x6c, + 0x12, 0xaa, 0x72, 0x68, 0xb4, 0x75, 0x26, 0xcb, 0x2a, 0xce, 0xee, 0x76, 0x67, 0x63, 0x53, 0x2e, + 0x48, 0x5c, 0xf8, 0x00, 0x1c, 0x38, 0x71, 0xe1, 0x2b, 0xf0, 0x19, 0x38, 0x70, 0x42, 0x9c, 0x38, + 0x71, 0x82, 0x0f, 0x82, 0x66, 0xf6, 0xcf, 0xcc, 0xec, 0x1f, 0xaf, 0xbb, 0xa5, 0x12, 0x9c, 0xe2, + 0xf7, 0xe6, 0xcd, 0x9b, 0xdf, 0xfb, 0xbd, 0x99, 0x37, 0x6f, 0x27, 0xb0, 0xec, 0x9c, 0x9e, 0x5a, + 0x03, 0xbc, 0x1d, 0xfc, 0x69, 0xbb, 0x9e, 0xe3, 0x3b, 0x68, 0x2e, 0x90, 0xd4, 0x1b, 0x8f, 0x5d, + 0x6c, 0x1f, 0xef, 0xf6, 0xb7, 0xdd, 0x33, 0x73, 0x9b, 0x0d, 0x6d, 0x93, 0x93, 0xb3, 0xe3, 0x31, + 0xd9, 0x1e, 0x93, 0xc0, 0x54, 0xbb, 0x0f, 0xd0, 0x75, 0xce, 0xcf, 0x1d, 0x5b, 0xc7, 0xc4, 0x45, + 0x4d, 0xa8, 0x61, 0xcf, 0xeb, 0x3a, 0x27, 0xb8, 0xa9, 0xb4, 0x94, 0xad, 0x59, 0x3d, 0x12, 0xd1, + 0x2a, 0xcc, 0x61, 0xcf, 0xeb, 0x13, 0xb3, 0x59, 0x69, 0x29, 0x5b, 0x75, 0x3d, 0x94, 0xb4, 0x0f, + 0xa1, 0x76, 0x68, 0x98, 0x47, 0x04, 0x7b, 0xd4, 0xe4, 0x82, 0x60, 0x6f, 0xb7, 0xc7, 0xe6, 0xd6, + 0xf5, 0x50, 0x42, 0x2a, 0xcc, 0xd3, 0x5f, 0x8f, 0x8c, 0x73, 0x1c, 0x4e, 0x8e, 0x65, 0xed, 0x39, + 0x54, 0x0f, 0x0d, 0x13, 0xad, 0xc0, 0xac, 0x6f, 0x98, 0xf1, 0xcc, 0x40, 0xa0, 0x68, 0x7c, 0xc3, + 0x14, 0xe6, 0x45, 0x22, 0xba, 0x1b, 0xb8, 0xdc, 0xb3, 0x88, 0xdf, 0xac, 0xb6, 0xaa, 0x5b, 0x8d, + 0xce, 0x62, 0x3b, 0x64, 0x20, 0x44, 0xa3, 0xc7, 0x06, 0xda, 0x27, 0x70, 0x79, 0x07, 0xfb, 0x54, + 0x79, 0x68, 0x98, 0x44, 0xc7, 0x2f, 0x72, 0x91, 0xb6, 0xa0, 0xe1, 0xb8, 0xd8, 0x33, 0x7c, 0xcb, + 0xb1, 0x77, 0x7b, 0xe1, 0xa2, 0xa2, 0x4a, 0x3b, 0x85, 0x45, 0xc9, 0x17, 0x71, 0x51, 0x07, 0x60, + 0x10, 0x33, 0xc8, 0x1c, 0x36, 0x3a, 0x28, 0x42, 0xc3, 0xb9, 0xd5, 0x05, 0x2b, 0xb4, 0x09, 0x33, + 0xbe, 0x61, 0x92, 0x66, 0x85, 0x61, 0x6f, 0x08, 0xd8, 0x75, 0x36, 0xa0, 0x7d, 0xab, 0xc0, 0x42, + 0xd7, 0xc3, 0x86, 0x8f, 0xa9, 0x0e, 0xbf, 0x10, 0xb9, 0x50, 0x64, 0x2e, 0x78, 0x30, 0x15, 0x29, + 0x98, 0x0d, 0x80, 0xe0, 0x57, 0xcc, 0x52, 0x5d, 0x17, 0x34, 0xc9, 0x60, 0x67, 0xd2, 0xc1, 0x76, + 0xe1, 0x92, 0x80, 0xa1, 0x5c, 0xa8, 0xda, 0x33, 0x58, 0xe8, 0xe1, 0x21, 0x8e, 0x03, 0xc9, 0xe3, + 0x3e, 0xde, 0x02, 0x15, 0x71, 0x0b, 0x24, 0x40, 0x56, 0x33, 0x41, 0x0a, 0xfe, 0x4b, 0x82, 0xfc, + 0x5d, 0x81, 0xfa, 0x01, 0xf6, 0x4b, 0x41, 0x6c, 0x42, 0xcd, 0xc6, 0x63, 0x96, 0x99, 0x00, 0x5e, + 0x24, 0xa2, 0x36, 0x20, 0xcb, 0x1e, 0x78, 0xd8, 0x20, 0xf8, 0x88, 0x67, 0x62, 0x86, 0x65, 0x22, + 0x63, 0x04, 0xdd, 0x81, 0x2b, 0x1e, 0x3e, 0xb9, 0x18, 0x88, 0xd6, 0xb3, 0xcc, 0x3a, 0xa5, 0x4f, + 0x12, 0x33, 0x97, 0x26, 0xe6, 0x23, 0x80, 0x28, 0xa4, 0x92, 0xac, 0xfc, 0xad, 0xc0, 0xe5, 0x03, + 0x6c, 0x9f, 0xf4, 0x89, 0xd9, 0x91, 0xb6, 0x21, 0x43, 0xa6, 0x30, 0x64, 0x91, 0x48, 0x4f, 0xf9, + 0x51, 0x74, 0x24, 0x2b, 0x6c, 0x28, 0x96, 0xd1, 0x75, 0xa8, 0xef, 0x78, 0xce, 0x85, 0x2b, 0xec, + 0x44, 0xae, 0xa0, 0x74, 0x13, 0x6c, 0x9f, 0xc4, 0x7b, 0x30, 0x94, 0x28, 0x1d, 0xf4, 0x17, 0xf6, + 0xf6, 0x87, 0x86, 0x7f, 0xea, 0x78, 0xe7, 0xbb, 0xbd, 0xe6, 0x2c, 0xab, 0x4a, 0x29, 0x3d, 0xc5, + 0x35, 0x70, 0x6c, 0x1f, 0xdb, 0x7e, 0x48, 0x45, 0x24, 0x26, 0x89, 0xaa, 0xa5, 0x89, 0x7a, 0x08, + 0x8b, 0x52, 0x94, 0x25, 0xd9, 0xfa, 0x5e, 0x81, 0xa5, 0x1d, 0x46, 0x38, 0xf5, 0xb6, 0xe7, 0x04, + 0xa5, 0xa6, 0x07, 0xb0, 0x6f, 0x98, 0x96, 0xcd, 0x16, 0x0b, 0x3d, 0xdd, 0x6a, 0x13, 0xec, 0x8d, + 0xb0, 0x77, 0x6c, 0xb8, 0xd6, 0xb1, 0x6b, 0x78, 0xc6, 0x39, 0x69, 0xeb, 0xf8, 0xc5, 0x05, 0x26, + 0x3e, 0xb7, 0xd5, 0x85, 0x79, 0xb9, 0x67, 0xbc, 0xf8, 0x78, 0x38, 0x00, 0x1c, 0x91, 0x54, 0x37, + 0x95, 0x82, 0xba, 0x29, 0x72, 0x5a, 0x91, 0x39, 0x55, 0x61, 0x9e, 0x66, 0xe0, 0xd0, 0x0a, 0xf7, + 0x7c, 0x55, 0x8f, 0x65, 0xed, 0x17, 0x05, 0x50, 0x92, 0x86, 0x92, 0x55, 0xf2, 0xa1, 0xc4, 0x5d, + 0x85, 0xcd, 0x79, 0x3b, 0x93, 0x3b, 0xe2, 0x3a, 0x36, 0xc1, 0x39, 0xe4, 0xdd, 0x83, 0x86, 0xcf, + 0xd1, 0x84, 0xf7, 0x05, 0x12, 0xe2, 0x0e, 0x87, 0x74, 0xd1, 0x4c, 0x1b, 0xb0, 0x6c, 0x86, 0x95, + 0xfe, 0xc1, 0xcb, 0xdd, 0xde, 0x9b, 0x28, 0x5e, 0x26, 0xe3, 0x4a, 0x5a, 0xa4, 0x24, 0x57, 0xeb, + 0x50, 0xf5, 0x0d, 0x33, 0x24, 0x49, 0xba, 0x50, 0xa8, 0x5e, 0xbb, 0x0f, 0xf3, 0x7b, 0xd6, 0x19, + 0x2e, 0x7d, 0x4f, 0xff, 0xa9, 0x40, 0x8d, 0xae, 0x4c, 0xb3, 0x5f, 0x62, 0x3e, 0xa5, 0xc2, 0xc3, + 0xee, 0xf0, 0x65, 0x50, 0xc1, 0x22, 0x2a, 0x04, 0x15, 0xba, 0x05, 0x97, 0x62, 0x91, 0xb9, 0x08, + 0x8a, 0x81, 0xac, 0xa4, 0x95, 0x24, 0xdc, 0x84, 0x61, 0x31, 0xa8, 0xeb, 0x5c, 0x31, 0xa1, 0x0a, + 0x6c, 0x00, 0x0c, 0x82, 0xab, 0x8c, 0xee, 0xd9, 0x1a, 0xab, 0x22, 0x82, 0x46, 0xfb, 0xab, 0x02, + 0xf0, 0xc4, 0xf1, 0xce, 0xfa, 0x0e, 0x0b, 0x51, 0x83, 0x85, 0x71, 0x2c, 0xc5, 0x81, 0x4a, 0xba, + 0xdc, 0x33, 0x29, 0x80, 0xa8, 0xca, 0x20, 0xda, 0x50, 0x1f, 0x86, 0x49, 0x20, 0xec, 0x1a, 0x68, + 0x74, 0xae, 0x44, 0x99, 0x8a, 0xb2, 0xa3, 0x73, 0x13, 0x7a, 0x5a, 0x07, 0x01, 0xe7, 0x84, 0xdd, + 0x03, 0xc2, 0x69, 0x0d, 0x73, 0xa1, 0xc7, 0x06, 0xe8, 0x1d, 0x58, 0x1e, 0x7f, 0xe9, 0x74, 0x0d, + 0xfb, 0x00, 0x8b, 0xf7, 0xc7, 0x1c, 0xab, 0xb6, 0x59, 0x43, 0xa8, 0x03, 0x2b, 0x81, 0xda, 0x97, + 0xa7, 0xd4, 0xd8, 0x94, 0xcc, 0x31, 0xca, 0xbf, 0x45, 0xf6, 0x3d, 0x6b, 0x64, 0xf8, 0xb8, 0x39, + 0xdf, 0x52, 0xb6, 0xe6, 0x75, 0xae, 0xa0, 0x2c, 0x77, 0x39, 0xcb, 0x10, 0xb0, 0xcc, 0x35, 0x9a, + 0x0d, 0xab, 0x81, 0xf4, 0xd8, 0xc6, 0x9c, 0x6d, 0x7a, 0xb0, 0x3a, 0x00, 0x9c, 0xdc, 0xe4, 0x96, + 0x17, 0x4c, 0x05, 0xab, 0x29, 0xba, 0xb5, 0x3e, 0xac, 0x65, 0xae, 0x57, 0xb2, 0xc2, 0x8f, 0x60, + 0x35, 0x68, 0x35, 0x52, 0xf0, 0x5f, 0x67, 0xbf, 0x14, 0x57, 0x89, 0x3e, 0xac, 0x65, 0xae, 0x5b, + 0x32, 0x0c, 0x1f, 0x56, 0xe8, 0x6e, 0x4b, 0x05, 0x91, 0x77, 0xae, 0x35, 0x58, 0x78, 0x22, 0x06, + 0x17, 0xc0, 0x97, 0x74, 0x53, 0x04, 0xf1, 0x29, 0x5c, 0xcd, 0x58, 0xb5, 0x64, 0x08, 0x3f, 0x2b, + 0xb0, 0x16, 0x1e, 0x81, 0x57, 0x09, 0x63, 0x9c, 0x11, 0xc6, 0x38, 0x11, 0x46, 0x41, 0x99, 0x12, + 0x4e, 0xf7, 0xcc, 0xc4, 0x46, 0x63, 0x36, 0x4d, 0xc1, 0x23, 0x68, 0x66, 0x83, 0x2e, 0xc9, 0xc2, + 0x57, 0xb0, 0xb2, 0x83, 0x7d, 0xee, 0x28, 0xba, 0xa5, 0xa6, 0xd9, 0x8d, 0x2a, 0xcc, 0x3b, 0xee, + 0x91, 0xb8, 0x1f, 0x63, 0x79, 0x8a, 0x64, 0x7e, 0x03, 0x57, 0x33, 0x56, 0x2e, 0x79, 0x75, 0xc9, + 0x67, 0xbf, 0x32, 0xcd, 0xd9, 0xd7, 0x7e, 0x50, 0x18, 0x02, 0x0a, 0x98, 0x5b, 0x4c, 0xfc, 0xb6, + 0xeb, 0x65, 0x34, 0x13, 0xaf, 0xde, 0x88, 0x15, 0x53, 0xf3, 0xab, 0x02, 0xab, 0x59, 0xc8, 0x4a, + 0x92, 0x73, 0x0f, 0x1a, 0x3c, 0xec, 0xe8, 0x83, 0x31, 0x8b, 0x1d, 0xd1, 0x2c, 0xd1, 0x39, 0x55, + 0x4b, 0x76, 0x4e, 0xda, 0x8f, 0x0a, 0x5c, 0x0b, 0x63, 0xf9, 0xd8, 0xb3, 0xb0, 0x7d, 0xf2, 0x1f, + 0xe3, 0xfa, 0x37, 0x05, 0xae, 0xe7, 0xe3, 0xfb, 0x3f, 0x32, 0x3e, 0x82, 0x46, 0x58, 0x22, 0x48, + 0x9f, 0x98, 0xe8, 0x36, 0xad, 0x36, 0xe7, 0xc2, 0x9d, 0x98, 0x6a, 0x00, 0xa2, 0xf1, 0xa9, 0xca, + 0x5b, 0x6e, 0x6b, 0xa2, 0xfd, 0xa4, 0x40, 0x2b, 0xbd, 0x6b, 0x05, 0x28, 0xaf, 0xf5, 0x6c, 0x92, + 0xd8, 0x10, 0xd5, 0x72, 0x1b, 0x42, 0xfb, 0x43, 0x81, 0x1b, 0x05, 0x20, 0x4b, 0xe6, 0xfc, 0x3d, + 0x58, 0x18, 0x70, 0x37, 0x51, 0xd2, 0x97, 0x13, 0x64, 0xb3, 0x25, 0x24, 0xc3, 0x7f, 0x2b, 0xed, + 0xcf, 0x40, 0xeb, 0x0e, 0xb1, 0xe1, 0xbd, 0x21, 0xfe, 0xb5, 0xa7, 0x70, 0xb3, 0xd0, 0x7f, 0xc9, + 0x4b, 0x68, 0x08, 0xea, 0x41, 0x2a, 0x27, 0x7b, 0x78, 0x84, 0x87, 0x05, 0x1f, 0x4c, 0x43, 0x6a, + 0xc3, 0xc0, 0xce, 0xea, 0x81, 0x30, 0xc5, 0x89, 0xff, 0x0c, 0xae, 0xe5, 0xae, 0x56, 0x2e, 0x80, + 0xce, 0x77, 0x0d, 0xb8, 0xf4, 0x98, 0x59, 0x1c, 0x60, 0x6f, 0x64, 0x0d, 0x30, 0xba, 0x0f, 0x0d, + 0xe1, 0x91, 0x0f, 0xad, 0x46, 0x0e, 0xe4, 0x57, 0x44, 0x75, 0x2d, 0x53, 0x4f, 0x5c, 0xf4, 0x3e, + 0xd4, 0xe3, 0x77, 0x33, 0xb4, 0x12, 0x2f, 0x2f, 0x3c, 0xe7, 0xa9, 0x57, 0x33, 0xb4, 0xc1, 0xcc, + 0xf8, 0x31, 0x8b, 0xcf, 0x14, 0xdf, 0xcf, 0xf8, 0x4c, 0xf9, 0xd5, 0x6b, 0x1b, 0xe6, 0x82, 0xd7, + 0x1e, 0xb4, 0x14, 0x19, 0xc4, 0x0f, 0x5a, 0x2a, 0x4a, 0xaa, 0x88, 0x4b, 0x83, 0x14, 0x5e, 0x3d, + 0x78, 0x90, 0xf2, 0x83, 0x0f, 0x0f, 0x32, 0xf9, 0x44, 0xb2, 0xc3, 0x5e, 0x55, 0x85, 0xcf, 0x7c, + 0xf4, 0x96, 0xc0, 0x87, 0xfc, 0x0a, 0xa2, 0xaa, 0x79, 0x43, 0xb1, 0x23, 0xe1, 0x1b, 0x58, 0x72, + 0x24, 0x7f, 0x80, 0x4b, 0x8e, 0x92, 0x9f, 0xcd, 0x9f, 0xc3, 0x72, 0x46, 0xb7, 0x8f, 0x36, 0x64, + 0xaa, 0x93, 0xfd, 0xa2, 0xba, 0x39, 0x71, 0x3c, 0xf0, 0x9b, 0xd1, 0x7e, 0x73, 0xbf, 0xd9, 0xdf, + 0x04, 0xdc, 0x6f, 0x5e, 0xef, 0xbe, 0x0f, 0x4b, 0xa9, 0x8e, 0x18, 0x5d, 0x17, 0x3f, 0x08, 0x53, + 0x3e, 0xd7, 0x27, 0x8c, 0x12, 0x17, 0x3d, 0x85, 0x95, 0xac, 0x06, 0x13, 0x6d, 0x26, 0x0a, 0x59, + 0xca, 0x6f, 0x6b, 0xb2, 0x41, 0x00, 0x36, 0xd5, 0xf1, 0x71, 0xb0, 0x59, 0x6d, 0x28, 0x07, 0x9b, + 0xdd, 0x2a, 0x1e, 0xc4, 0x6f, 0x1f, 0xc2, 0x51, 0x46, 0xeb, 0x89, 0x04, 0xcb, 0x1d, 0x87, 0xba, + 0x31, 0x69, 0x98, 0xb8, 0x08, 0x43, 0x33, 0xaf, 0x21, 0x40, 0x37, 0x13, 0x73, 0xb3, 0x5a, 0x1a, + 0xf5, 0x56, 0xb1, 0x11, 0x71, 0x91, 0x0f, 0xeb, 0x13, 0x2f, 0x22, 0xb4, 0x95, 0x8f, 0x53, 0x2e, + 0xea, 0xea, 0xed, 0x29, 0x2d, 0x89, 0x8b, 0xbe, 0x86, 0xcd, 0x82, 0x2a, 0x8e, 0xee, 0xc4, 0x89, + 0x2c, 0xbc, 0x4e, 0xd4, 0xbb, 0x53, 0xdb, 0x12, 0x17, 0x3d, 0x87, 0xb5, 0x9c, 0xc2, 0x8b, 0x34, + 0xa1, 0xba, 0xe4, 0xdc, 0x03, 0xea, 0xcd, 0x42, 0x1b, 0xe2, 0x3e, 0x58, 0xfa, 0x62, 0xb1, 0x1d, + 0xfe, 0x23, 0xeb, 0x83, 0xe0, 0xcf, 0xf3, 0x39, 0xf6, 0x5f, 0xaa, 0x77, 0xff, 0x09, 0x00, 0x00, + 0xff, 0xff, 0x47, 0x04, 0x0d, 0x95, 0xe7, 0x1a, 0x00, 0x00, } diff --git a/pkg/proto/office/office.proto b/pkg/proto/office/office.proto index c57c72f2e..d5be34416 100644 --- a/pkg/proto/office/office.proto +++ b/pkg/proto/office/office.proto @@ -137,8 +137,7 @@ message WorkMoment { message CreateOneWorkMomentReq { WorkMoment workMoment = 1; - string userID = 2; - string operationID = 3; + string operationID = 2; } message CreateOneWorkMomentResp { From 50696d2e8844a4433740ba93cdc2e8b1f73b71bd Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 19 Apr 2022 14:12:30 +0800 Subject: [PATCH 02/10] workMoments --- internal/rpc/office/office.go | 12 ++++++------ pkg/common/db/mongoModel.go | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index 1fd328650..34a266897 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -410,8 +410,8 @@ func (s *officeServer) GetWorkMomentByID(_ context.Context, req *pbOffice.GetWor func (s *officeServer) GetUserWorkMoments(_ context.Context, req *pbOffice.GetUserWorkMomentsReq) (resp *pbOffice.GetUserWorkMomentsResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp = &pbOffice.GetUserWorkMomentsResp{CommonResp: &pbOffice.CommonResp{}} - resp.WorkMoments = make([]*pbOffice.WorkMoment, 0) + resp = &pbOffice.GetUserWorkMomentsResp{CommonResp: &pbOffice.CommonResp{}, WorkMoments: []*pbOffice.WorkMoment{}} + //resp.WorkMoments = make([]*pbOffice.WorkMoment, 0) workMoments, err := db.DB.GetUserWorkMoments(req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), err) @@ -428,8 +428,8 @@ func (s *officeServer) GetUserWorkMoments(_ context.Context, req *pbOffice.GetUs func (s *officeServer) GetUserFriendWorkMoments(_ context.Context, req *pbOffice.GetUserFriendWorkMomentsReq) (resp *pbOffice.GetUserFriendWorkMomentsResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp = &pbOffice.GetUserFriendWorkMomentsResp{CommonResp: &pbOffice.CommonResp{}} - resp.WorkMoments = make([]*pbOffice.WorkMoment, 0) + resp = &pbOffice.GetUserFriendWorkMomentsResp{CommonResp: &pbOffice.CommonResp{}, WorkMoments: []*pbOffice.WorkMoment{}} + //resp.WorkMoments = make([]*pbOffice.WorkMoment, 0) friendIDList, err := imdb.GetFriendIDListByUserID(req.UserID) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetFriendIDListByUserID", err.Error()) @@ -453,8 +453,8 @@ func (s *officeServer) GetUserFriendWorkMoments(_ context.Context, req *pbOffice func (s *officeServer) GetUserWorkMomentsCommentsMsg(_ context.Context, req *pbOffice.GetUserWorkMomentsCommentsMsgReq) (resp *pbOffice.GetUserWorkMomentsCommentsMsgResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp = &pbOffice.GetUserWorkMomentsCommentsMsgResp{CommonResp: &pbOffice.CommonResp{}} - resp.CommentsMsgs = make([]*pbOffice.CommentsMsg, 0) + resp = &pbOffice.GetUserWorkMomentsCommentsMsgResp{CommonResp: &pbOffice.CommonResp{}, CommentsMsgs: []*pbOffice.CommentsMsg{}} + //resp.CommentsMsgs = make([]*pbOffice.CommentsMsg, 0) workMomentsCommentMsgs, err := db.DB.GetUserWorkMomentsCommentsMsg(req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserWorkMomentsCommentsMsg", err.Error()) diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index 4d75da427..29ea41f1e 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -632,6 +632,7 @@ func (d *DataBases) LikeOneWorkMoment(likeUserID, userName, workMomentID string) if !isAlreadyLike { workMoment.LikeUsers = append(workMoment.LikeUsers, &LikeUser{UserID: likeUserID, UserName: userName}) } + log.Info("", utils.GetSelfFuncName(), workMoment) ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cWorkMoment) _, err = c.UpdateOne(ctx, bson.M{"work_id": workMomentID}, bson.M{"$set": bson.M{"like_users": workMoment.LikeUsers}}) From b5c11ece5709778f04537f41848af5fdebece4e6 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 19 Apr 2022 14:33:48 +0800 Subject: [PATCH 03/10] workMoments --- internal/rpc/office/office.go | 4 ++-- pkg/common/db/mongoModel.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index 34a266897..722cc9ce0 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -418,7 +418,7 @@ func (s *officeServer) GetUserWorkMoments(_ context.Context, req *pbOffice.GetUs resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg} return resp, nil } - if err := utils.CopyStructFields(resp.WorkMoments, workMoments); err != nil { + if err := utils.CopyStructFields(&resp.WorkMoments, workMoments); err != nil { log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error()) } resp.Pagination = &pbCommon.ResponsePagination{CurrentPage: req.Pagination.PageNumber, ShowNumber: req.Pagination.ShowNumber} @@ -443,7 +443,7 @@ func (s *officeServer) GetUserFriendWorkMoments(_ context.Context, req *pbOffice resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg} return resp, nil } - if err := utils.CopyStructFields(resp.WorkMoments, workMoments); err != nil { + if err := utils.CopyStructFields(&resp.WorkMoments, workMoments); err != nil { log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error()) } resp.Pagination = &pbCommon.ResponsePagination{CurrentPage: req.Pagination.PageNumber, ShowNumber: req.Pagination.ShowNumber} diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index 29ea41f1e..29dd754ff 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -584,7 +584,7 @@ type LikeUser struct { type Comment struct { UserID string `bson:"user_id" json:"user_id"` - UserName string `bson:"user_id" json:"user_name"` + UserName string `bson:"user_name" json:"user_name"` ReplyUserID string `bson:"reply_user_id" json:"reply_user_id"` ReplyUserName string `bson:"reply_user_name" json:"reply_user_name"` ContentID string `bson:"content_id" json:"content_id"` @@ -635,7 +635,7 @@ func (d *DataBases) LikeOneWorkMoment(likeUserID, userName, workMomentID string) log.Info("", utils.GetSelfFuncName(), workMoment) ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cWorkMoment) - _, err = c.UpdateOne(ctx, bson.M{"work_id": workMomentID}, bson.M{"$set": bson.M{"like_users": workMoment.LikeUsers}}) + _, err = c.UpdateOne(ctx, bson.M{"work_moment_id": workMomentID}, bson.M{"$set": bson.M{"like_users": workMoment.LikeUsers}}) return err } From 6c4acbad687a8474b680f399be4c5149aa3d7d7a Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 19 Apr 2022 14:54:43 +0800 Subject: [PATCH 04/10] workMoments --- internal/rpc/office/office.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index 722cc9ce0..c12657f28 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -270,7 +270,7 @@ func (s *officeServer) GetUserTagByID(_ context.Context, req *pbOffice.GetUserTa func (s *officeServer) CreateOneWorkMoment(_ context.Context, req *pbOffice.CreateOneWorkMomentReq) (resp *pbOffice.CreateOneWorkMomentResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) resp = &pbOffice.CreateOneWorkMomentResp{CommonResp: &pbOffice.CommonResp{}} - workMoment := db.WorkMoment{} + workMoment := db.WorkMoment{Comments: []*db.Comment{}, LikeUsers: []*db.LikeUser{}} if err := utils.CopyStructFields(&workMoment, req.WorkMoment); err != nil { log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error()) } @@ -453,8 +453,8 @@ func (s *officeServer) GetUserFriendWorkMoments(_ context.Context, req *pbOffice func (s *officeServer) GetUserWorkMomentsCommentsMsg(_ context.Context, req *pbOffice.GetUserWorkMomentsCommentsMsgReq) (resp *pbOffice.GetUserWorkMomentsCommentsMsgResp, err error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp = &pbOffice.GetUserWorkMomentsCommentsMsgResp{CommonResp: &pbOffice.CommonResp{}, CommentsMsgs: []*pbOffice.CommentsMsg{}} - //resp.CommentsMsgs = make([]*pbOffice.CommentsMsg, 0) + resp = &pbOffice.GetUserWorkMomentsCommentsMsgResp{CommonResp: &pbOffice.CommonResp{}} + resp.CommentsMsgs = make([]*pbOffice.CommentsMsg, 0) workMomentsCommentMsgs, err := db.DB.GetUserWorkMomentsCommentsMsg(req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserWorkMomentsCommentsMsg", err.Error()) From 040b1d9bc831e796fe0fd539866aac434e14e689 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 19 Apr 2022 15:37:20 +0800 Subject: [PATCH 05/10] workMoments --- pkg/common/db/mysql_model/im_mysql_model/friend_model.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/common/db/mysql_model/im_mysql_model/friend_model.go b/pkg/common/db/mysql_model/im_mysql_model/friend_model.go index a7b14f198..08d4597dc 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/friend_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/friend_model.go @@ -49,12 +49,12 @@ func GetFriendListByUserID(OwnerUserID string) ([]db.Friend, error) { return friends, nil } -func GetFriendIDListByUserID(OwnerUserID string) ([]string, error) { +func GetFriendIDListByUserID(OwnerUserID string) ([]*string, error) { dbConn, err := db.DB.MysqlDB.DefaultGormDB() if err != nil { return nil, err } - var friendIDList []string + var friendIDList []*string err = dbConn.Table("friends").Select("friend_user_id").Where("owner_user_id=?", OwnerUserID).Find(&friendIDList).Error if err != nil { return nil, err From 01c066419d533ad1c1c4db8296f8806fe9eaeed2 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 19 Apr 2022 15:38:16 +0800 Subject: [PATCH 06/10] workMoments --- pkg/common/db/mongoModel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index 29dd754ff..18406df36 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -748,7 +748,7 @@ func (d *DataBases) GetUserFriendWorkMomentsRecursion(friendIDList []string, sho return workMomentList, err } -func (d *DataBases) GetUserFriendWorkMoments(friendIDList []string, showNumber, pageNumber int32, userID string) ([]WorkMoment, error) { +func (d *DataBases) GetUserFriendWorkMoments(friendIDList []*string, showNumber, pageNumber int32, userID string) ([]WorkMoment, error) { ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cWorkMoment) var workMomentList []WorkMoment From 3854c7bba2a061480ffa6032b940e063acae808c Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 19 Apr 2022 15:52:44 +0800 Subject: [PATCH 07/10] workMoments --- internal/rpc/office/office.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index c12657f28..db5da07b7 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -379,6 +379,9 @@ func (s *officeServer) CommentOneWorkMoment(_ context.Context, req *pbOffice.Com WorkMomentID: workMoment.WorkMomentID, WorkMomentContent: workMoment.Content, } + if err = db.DB.CreateUserWorkMomentsCommentsMsg(commentMsg); err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error()) + } msg.CommentOneWorkMomentNotification(req.OperationID, workMoment.UserID, commentMsg, *commentUser) if req.ReplyUserID != "" { msg.CommentOneWorkMomentNotification(req.OperationID, req.ReplyUserID, commentMsg, *commentUser) From dfe854a236f7f49b481a16e5ff65cafb7499d6e2 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 19 Apr 2022 16:15:41 +0800 Subject: [PATCH 08/10] workMoments --- internal/rpc/office/office.go | 1 + pkg/common/db/mongoModel.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index db5da07b7..4cf783194 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -464,6 +464,7 @@ func (s *officeServer) GetUserWorkMomentsCommentsMsg(_ context.Context, req *pbO resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg} return resp, nil } + log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "workMomentsCommentMsgs: ", workMomentsCommentMsgs) for _, commentMsg := range workMomentsCommentMsgs { comment := pbOffice.Comment{} if err := utils.CopyStructFields(&comment, commentMsg); err != nil { diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index 18406df36..2a9de60d3 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -668,7 +668,7 @@ func (d *DataBases) GetUserWorkMomentsCommentsMsg(userID string, showNumber, pag c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cCommentMsg) var commentMsgList []CommentMsg findOpts := options.Find().SetLimit(int64(showNumber)).SetSkip(int64(showNumber) * (int64(pageNumber) - 1)).SetSort(bson.M{"create_time": -1}) - result, err := c.Find(ctx, bson.M{"user_id": userID}, findOpts) + result, err := c.Find(ctx, bson.M{"comment.user_id": userID}, findOpts) if err != nil { return commentMsgList, err } From 3f287eb148a67bbb1a281ec7b6f4ea50f14fbc5e Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 19 Apr 2022 16:28:03 +0800 Subject: [PATCH 09/10] workMoments --- internal/rpc/office/office.go | 3 +- pkg/common/db/mongoModel.go | 1 + pkg/proto/office/office.pb.go | 293 ++++++++++++++++++---------------- pkg/proto/office/office.proto | 3 +- 4 files changed, 156 insertions(+), 144 deletions(-) diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index 4cf783194..91d12666f 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -376,6 +376,7 @@ func (s *officeServer) CommentOneWorkMoment(_ context.Context, req *pbOffice.Com } commentMsg := db.CommentMsg{ Comment: comment, + UserID: workMoment.UserID, WorkMomentID: workMoment.WorkMomentID, WorkMomentContent: workMoment.Content, } @@ -473,7 +474,7 @@ func (s *officeServer) GetUserWorkMomentsCommentsMsg(_ context.Context, req *pbO resp.CommentsMsgs = append(resp.CommentsMsgs, &pbOffice.CommentsMsg{ Comment: &comment, WorkMomentID: commentMsg.WorkMomentID, - Content: commentMsg.Content, + Content: commentMsg.WorkMomentContent, }) } resp.Pagination = &pbCommon.ResponsePagination{CurrentPage: req.Pagination.PageNumber, ShowNumber: req.Pagination.ShowNumber} diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index 2a9de60d3..1dbec46a7 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -660,6 +660,7 @@ func (d *DataBases) ClearUserWorkMomentsCommentsMsg(userID string) error { type CommentMsg struct { WorkMomentID string `bson:"work_moment" json:"work_moment"` WorkMomentContent string `bson:"work_moment_content" json:"work_moment_content"` + UserID string `bson:"user_id" json:"user_id"` Comment } diff --git a/pkg/proto/office/office.pb.go b/pkg/proto/office/office.pb.go index a9c0a2fc7..b9e3ad6c1 100644 --- a/pkg/proto/office/office.pb.go +++ b/pkg/proto/office/office.pb.go @@ -36,7 +36,7 @@ func (m *CommonResp) Reset() { *m = CommonResp{} } func (m *CommonResp) String() string { return proto.CompactTextString(m) } func (*CommonResp) ProtoMessage() {} func (*CommonResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{0} + return fileDescriptor_office_282f0d3c571a3eb6, []int{0} } func (m *CommonResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommonResp.Unmarshal(m, b) @@ -82,7 +82,7 @@ func (m *TagUser) Reset() { *m = TagUser{} } func (m *TagUser) String() string { return proto.CompactTextString(m) } func (*TagUser) ProtoMessage() {} func (*TagUser) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{1} + return fileDescriptor_office_282f0d3c571a3eb6, []int{1} } func (m *TagUser) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TagUser.Unmarshal(m, b) @@ -129,7 +129,7 @@ func (m *Tag) Reset() { *m = Tag{} } func (m *Tag) String() string { return proto.CompactTextString(m) } func (*Tag) ProtoMessage() {} func (*Tag) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{2} + return fileDescriptor_office_282f0d3c571a3eb6, []int{2} } func (m *Tag) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Tag.Unmarshal(m, b) @@ -182,7 +182,7 @@ func (m *GetUserTagsReq) Reset() { *m = GetUserTagsReq{} } func (m *GetUserTagsReq) String() string { return proto.CompactTextString(m) } func (*GetUserTagsReq) ProtoMessage() {} func (*GetUserTagsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{3} + return fileDescriptor_office_282f0d3c571a3eb6, []int{3} } func (m *GetUserTagsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserTagsReq.Unmarshal(m, b) @@ -228,7 +228,7 @@ func (m *GetUserTagsResp) Reset() { *m = GetUserTagsResp{} } func (m *GetUserTagsResp) String() string { return proto.CompactTextString(m) } func (*GetUserTagsResp) ProtoMessage() {} func (*GetUserTagsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{4} + return fileDescriptor_office_282f0d3c571a3eb6, []int{4} } func (m *GetUserTagsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserTagsResp.Unmarshal(m, b) @@ -276,7 +276,7 @@ func (m *CreateTagReq) Reset() { *m = CreateTagReq{} } func (m *CreateTagReq) String() string { return proto.CompactTextString(m) } func (*CreateTagReq) ProtoMessage() {} func (*CreateTagReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{5} + return fileDescriptor_office_282f0d3c571a3eb6, []int{5} } func (m *CreateTagReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateTagReq.Unmarshal(m, b) @@ -335,7 +335,7 @@ func (m *CreateTagResp) Reset() { *m = CreateTagResp{} } func (m *CreateTagResp) String() string { return proto.CompactTextString(m) } func (*CreateTagResp) ProtoMessage() {} func (*CreateTagResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{6} + return fileDescriptor_office_282f0d3c571a3eb6, []int{6} } func (m *CreateTagResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateTagResp.Unmarshal(m, b) @@ -375,7 +375,7 @@ func (m *DeleteTagReq) Reset() { *m = DeleteTagReq{} } func (m *DeleteTagReq) String() string { return proto.CompactTextString(m) } func (*DeleteTagReq) ProtoMessage() {} func (*DeleteTagReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{7} + return fileDescriptor_office_282f0d3c571a3eb6, []int{7} } func (m *DeleteTagReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteTagReq.Unmarshal(m, b) @@ -427,7 +427,7 @@ func (m *DeleteTagResp) Reset() { *m = DeleteTagResp{} } func (m *DeleteTagResp) String() string { return proto.CompactTextString(m) } func (*DeleteTagResp) ProtoMessage() {} func (*DeleteTagResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{8} + return fileDescriptor_office_282f0d3c571a3eb6, []int{8} } func (m *DeleteTagResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteTagResp.Unmarshal(m, b) @@ -470,7 +470,7 @@ func (m *SetTagReq) Reset() { *m = SetTagReq{} } func (m *SetTagReq) String() string { return proto.CompactTextString(m) } func (*SetTagReq) ProtoMessage() {} func (*SetTagReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{9} + return fileDescriptor_office_282f0d3c571a3eb6, []int{9} } func (m *SetTagReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetTagReq.Unmarshal(m, b) @@ -543,7 +543,7 @@ func (m *SetTagResp) Reset() { *m = SetTagResp{} } func (m *SetTagResp) String() string { return proto.CompactTextString(m) } func (*SetTagResp) ProtoMessage() {} func (*SetTagResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{10} + return fileDescriptor_office_282f0d3c571a3eb6, []int{10} } func (m *SetTagResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetTagResp.Unmarshal(m, b) @@ -587,7 +587,7 @@ func (m *SendMsg2TagReq) Reset() { *m = SendMsg2TagReq{} } func (m *SendMsg2TagReq) String() string { return proto.CompactTextString(m) } func (*SendMsg2TagReq) ProtoMessage() {} func (*SendMsg2TagReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{11} + return fileDescriptor_office_282f0d3c571a3eb6, []int{11} } func (m *SendMsg2TagReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SendMsg2TagReq.Unmarshal(m, b) @@ -667,7 +667,7 @@ func (m *SendMsg2TagResp) Reset() { *m = SendMsg2TagResp{} } func (m *SendMsg2TagResp) String() string { return proto.CompactTextString(m) } func (*SendMsg2TagResp) ProtoMessage() {} func (*SendMsg2TagResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{12} + return fileDescriptor_office_282f0d3c571a3eb6, []int{12} } func (m *SendMsg2TagResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SendMsg2TagResp.Unmarshal(m, b) @@ -707,7 +707,7 @@ func (m *GetTagSendLogsReq) Reset() { *m = GetTagSendLogsReq{} } func (m *GetTagSendLogsReq) String() string { return proto.CompactTextString(m) } func (*GetTagSendLogsReq) ProtoMessage() {} func (*GetTagSendLogsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{13} + return fileDescriptor_office_282f0d3c571a3eb6, []int{13} } func (m *GetTagSendLogsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetTagSendLogsReq.Unmarshal(m, b) @@ -761,7 +761,7 @@ func (m *TagSendLog) Reset() { *m = TagSendLog{} } func (m *TagSendLog) String() string { return proto.CompactTextString(m) } func (*TagSendLog) ProtoMessage() {} func (*TagSendLog) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{14} + return fileDescriptor_office_282f0d3c571a3eb6, []int{14} } func (m *TagSendLog) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TagSendLog.Unmarshal(m, b) @@ -815,7 +815,7 @@ func (m *GetTagSendLogsResp) Reset() { *m = GetTagSendLogsResp{} } func (m *GetTagSendLogsResp) String() string { return proto.CompactTextString(m) } func (*GetTagSendLogsResp) ProtoMessage() {} func (*GetTagSendLogsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{15} + return fileDescriptor_office_282f0d3c571a3eb6, []int{15} } func (m *GetTagSendLogsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetTagSendLogsResp.Unmarshal(m, b) @@ -869,7 +869,7 @@ func (m *GetUserTagByIDReq) Reset() { *m = GetUserTagByIDReq{} } func (m *GetUserTagByIDReq) String() string { return proto.CompactTextString(m) } func (*GetUserTagByIDReq) ProtoMessage() {} func (*GetUserTagByIDReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{16} + return fileDescriptor_office_282f0d3c571a3eb6, []int{16} } func (m *GetUserTagByIDReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserTagByIDReq.Unmarshal(m, b) @@ -922,7 +922,7 @@ func (m *GetUserTagByIDResp) Reset() { *m = GetUserTagByIDResp{} } func (m *GetUserTagByIDResp) String() string { return proto.CompactTextString(m) } func (*GetUserTagByIDResp) ProtoMessage() {} func (*GetUserTagByIDResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{17} + return fileDescriptor_office_282f0d3c571a3eb6, []int{17} } func (m *GetUserTagByIDResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserTagByIDResp.Unmarshal(m, b) @@ -968,7 +968,7 @@ func (m *LikeUser) Reset() { *m = LikeUser{} } func (m *LikeUser) String() string { return proto.CompactTextString(m) } func (*LikeUser) ProtoMessage() {} func (*LikeUser) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{18} + return fileDescriptor_office_282f0d3c571a3eb6, []int{18} } func (m *LikeUser) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LikeUser.Unmarshal(m, b) @@ -1019,7 +1019,7 @@ func (m *Comment) Reset() { *m = Comment{} } func (m *Comment) String() string { return proto.CompactTextString(m) } func (*Comment) ProtoMessage() {} func (*Comment) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{19} + return fileDescriptor_office_282f0d3c571a3eb6, []int{19} } func (m *Comment) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Comment.Unmarshal(m, b) @@ -1107,7 +1107,7 @@ func (m *WorkMoment) Reset() { *m = WorkMoment{} } func (m *WorkMoment) String() string { return proto.CompactTextString(m) } func (*WorkMoment) ProtoMessage() {} func (*WorkMoment) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{20} + return fileDescriptor_office_282f0d3c571a3eb6, []int{20} } func (m *WorkMoment) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WorkMoment.Unmarshal(m, b) @@ -1202,7 +1202,7 @@ func (m *CreateOneWorkMomentReq) Reset() { *m = CreateOneWorkMomentReq{} func (m *CreateOneWorkMomentReq) String() string { return proto.CompactTextString(m) } func (*CreateOneWorkMomentReq) ProtoMessage() {} func (*CreateOneWorkMomentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{21} + return fileDescriptor_office_282f0d3c571a3eb6, []int{21} } func (m *CreateOneWorkMomentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateOneWorkMomentReq.Unmarshal(m, b) @@ -1247,7 +1247,7 @@ func (m *CreateOneWorkMomentResp) Reset() { *m = CreateOneWorkMomentResp func (m *CreateOneWorkMomentResp) String() string { return proto.CompactTextString(m) } func (*CreateOneWorkMomentResp) ProtoMessage() {} func (*CreateOneWorkMomentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{22} + return fileDescriptor_office_282f0d3c571a3eb6, []int{22} } func (m *CreateOneWorkMomentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateOneWorkMomentResp.Unmarshal(m, b) @@ -1287,7 +1287,7 @@ func (m *DeleteOneWorkMomentReq) Reset() { *m = DeleteOneWorkMomentReq{} func (m *DeleteOneWorkMomentReq) String() string { return proto.CompactTextString(m) } func (*DeleteOneWorkMomentReq) ProtoMessage() {} func (*DeleteOneWorkMomentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{23} + return fileDescriptor_office_282f0d3c571a3eb6, []int{23} } func (m *DeleteOneWorkMomentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteOneWorkMomentReq.Unmarshal(m, b) @@ -1339,7 +1339,7 @@ func (m *DeleteOneWorkMomentResp) Reset() { *m = DeleteOneWorkMomentResp func (m *DeleteOneWorkMomentResp) String() string { return proto.CompactTextString(m) } func (*DeleteOneWorkMomentResp) ProtoMessage() {} func (*DeleteOneWorkMomentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{24} + return fileDescriptor_office_282f0d3c571a3eb6, []int{24} } func (m *DeleteOneWorkMomentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteOneWorkMomentResp.Unmarshal(m, b) @@ -1379,7 +1379,7 @@ func (m *LikeOneWorkMomentReq) Reset() { *m = LikeOneWorkMomentReq{} } func (m *LikeOneWorkMomentReq) String() string { return proto.CompactTextString(m) } func (*LikeOneWorkMomentReq) ProtoMessage() {} func (*LikeOneWorkMomentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{25} + return fileDescriptor_office_282f0d3c571a3eb6, []int{25} } func (m *LikeOneWorkMomentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LikeOneWorkMomentReq.Unmarshal(m, b) @@ -1431,7 +1431,7 @@ func (m *LikeOneWorkMomentResp) Reset() { *m = LikeOneWorkMomentResp{} } func (m *LikeOneWorkMomentResp) String() string { return proto.CompactTextString(m) } func (*LikeOneWorkMomentResp) ProtoMessage() {} func (*LikeOneWorkMomentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{26} + return fileDescriptor_office_282f0d3c571a3eb6, []int{26} } func (m *LikeOneWorkMomentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LikeOneWorkMomentResp.Unmarshal(m, b) @@ -1473,7 +1473,7 @@ func (m *CommentOneWorkMomentReq) Reset() { *m = CommentOneWorkMomentReq func (m *CommentOneWorkMomentReq) String() string { return proto.CompactTextString(m) } func (*CommentOneWorkMomentReq) ProtoMessage() {} func (*CommentOneWorkMomentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{27} + return fileDescriptor_office_282f0d3c571a3eb6, []int{27} } func (m *CommentOneWorkMomentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommentOneWorkMomentReq.Unmarshal(m, b) @@ -1539,7 +1539,7 @@ func (m *CommentOneWorkMomentResp) Reset() { *m = CommentOneWorkMomentRe func (m *CommentOneWorkMomentResp) String() string { return proto.CompactTextString(m) } func (*CommentOneWorkMomentResp) ProtoMessage() {} func (*CommentOneWorkMomentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{28} + return fileDescriptor_office_282f0d3c571a3eb6, []int{28} } func (m *CommentOneWorkMomentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommentOneWorkMomentResp.Unmarshal(m, b) @@ -1579,7 +1579,7 @@ func (m *GetWorkMomentByIDReq) Reset() { *m = GetWorkMomentByIDReq{} } func (m *GetWorkMomentByIDReq) String() string { return proto.CompactTextString(m) } func (*GetWorkMomentByIDReq) ProtoMessage() {} func (*GetWorkMomentByIDReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{29} + return fileDescriptor_office_282f0d3c571a3eb6, []int{29} } func (m *GetWorkMomentByIDReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetWorkMomentByIDReq.Unmarshal(m, b) @@ -1632,7 +1632,7 @@ func (m *GetWorkMomentByIDResp) Reset() { *m = GetWorkMomentByIDResp{} } func (m *GetWorkMomentByIDResp) String() string { return proto.CompactTextString(m) } func (*GetWorkMomentByIDResp) ProtoMessage() {} func (*GetWorkMomentByIDResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{30} + return fileDescriptor_office_282f0d3c571a3eb6, []int{30} } func (m *GetWorkMomentByIDResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetWorkMomentByIDResp.Unmarshal(m, b) @@ -1679,7 +1679,7 @@ func (m *GetUserWorkMomentsReq) Reset() { *m = GetUserWorkMomentsReq{} } func (m *GetUserWorkMomentsReq) String() string { return proto.CompactTextString(m) } func (*GetUserWorkMomentsReq) ProtoMessage() {} func (*GetUserWorkMomentsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{31} + return fileDescriptor_office_282f0d3c571a3eb6, []int{31} } func (m *GetUserWorkMomentsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserWorkMomentsReq.Unmarshal(m, b) @@ -1733,7 +1733,7 @@ func (m *GetUserWorkMomentsResp) Reset() { *m = GetUserWorkMomentsResp{} func (m *GetUserWorkMomentsResp) String() string { return proto.CompactTextString(m) } func (*GetUserWorkMomentsResp) ProtoMessage() {} func (*GetUserWorkMomentsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{32} + return fileDescriptor_office_282f0d3c571a3eb6, []int{32} } func (m *GetUserWorkMomentsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserWorkMomentsResp.Unmarshal(m, b) @@ -1787,7 +1787,7 @@ func (m *GetUserFriendWorkMomentsReq) Reset() { *m = GetUserFriendWorkMo func (m *GetUserFriendWorkMomentsReq) String() string { return proto.CompactTextString(m) } func (*GetUserFriendWorkMomentsReq) ProtoMessage() {} func (*GetUserFriendWorkMomentsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{33} + return fileDescriptor_office_282f0d3c571a3eb6, []int{33} } func (m *GetUserFriendWorkMomentsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserFriendWorkMomentsReq.Unmarshal(m, b) @@ -1841,7 +1841,7 @@ func (m *GetUserFriendWorkMomentsResp) Reset() { *m = GetUserFriendWorkM func (m *GetUserFriendWorkMomentsResp) String() string { return proto.CompactTextString(m) } func (*GetUserFriendWorkMomentsResp) ProtoMessage() {} func (*GetUserFriendWorkMomentsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{34} + return fileDescriptor_office_282f0d3c571a3eb6, []int{34} } func (m *GetUserFriendWorkMomentsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserFriendWorkMomentsResp.Unmarshal(m, b) @@ -1885,7 +1885,8 @@ func (m *GetUserFriendWorkMomentsResp) GetPagination() *sdk_ws.ResponsePaginatio type CommentsMsg struct { Comment *Comment `protobuf:"bytes,1,opt,name=comment" json:"comment,omitempty"` WorkMomentID string `protobuf:"bytes,2,opt,name=workMomentID" json:"workMomentID,omitempty"` - Content string `protobuf:"bytes,3,opt,name=content" json:"content,omitempty"` + UserID string `protobuf:"bytes,3,opt,name=userID" json:"userID,omitempty"` + Content string `protobuf:"bytes,4,opt,name=content" json:"content,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1895,7 +1896,7 @@ func (m *CommentsMsg) Reset() { *m = CommentsMsg{} } func (m *CommentsMsg) String() string { return proto.CompactTextString(m) } func (*CommentsMsg) ProtoMessage() {} func (*CommentsMsg) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{35} + return fileDescriptor_office_282f0d3c571a3eb6, []int{35} } func (m *CommentsMsg) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommentsMsg.Unmarshal(m, b) @@ -1929,6 +1930,13 @@ func (m *CommentsMsg) GetWorkMomentID() string { return "" } +func (m *CommentsMsg) GetUserID() string { + if m != nil { + return m.UserID + } + return "" +} + func (m *CommentsMsg) GetContent() string { if m != nil { return m.Content @@ -1949,7 +1957,7 @@ func (m *GetUserWorkMomentsCommentsMsgReq) Reset() { *m = GetUserWorkMom func (m *GetUserWorkMomentsCommentsMsgReq) String() string { return proto.CompactTextString(m) } func (*GetUserWorkMomentsCommentsMsgReq) ProtoMessage() {} func (*GetUserWorkMomentsCommentsMsgReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{36} + return fileDescriptor_office_282f0d3c571a3eb6, []int{36} } func (m *GetUserWorkMomentsCommentsMsgReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserWorkMomentsCommentsMsgReq.Unmarshal(m, b) @@ -2003,7 +2011,7 @@ func (m *GetUserWorkMomentsCommentsMsgResp) Reset() { *m = GetUserWorkMo func (m *GetUserWorkMomentsCommentsMsgResp) String() string { return proto.CompactTextString(m) } func (*GetUserWorkMomentsCommentsMsgResp) ProtoMessage() {} func (*GetUserWorkMomentsCommentsMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{37} + return fileDescriptor_office_282f0d3c571a3eb6, []int{37} } func (m *GetUserWorkMomentsCommentsMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserWorkMomentsCommentsMsgResp.Unmarshal(m, b) @@ -2056,7 +2064,7 @@ func (m *ClearUserWorkMomentsCommentsMsgReq) Reset() { *m = ClearUserWor func (m *ClearUserWorkMomentsCommentsMsgReq) String() string { return proto.CompactTextString(m) } func (*ClearUserWorkMomentsCommentsMsgReq) ProtoMessage() {} func (*ClearUserWorkMomentsCommentsMsgReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{38} + return fileDescriptor_office_282f0d3c571a3eb6, []int{38} } func (m *ClearUserWorkMomentsCommentsMsgReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ClearUserWorkMomentsCommentsMsgReq.Unmarshal(m, b) @@ -2101,7 +2109,7 @@ func (m *ClearUserWorkMomentsCommentsMsgResp) Reset() { *m = ClearUserWo func (m *ClearUserWorkMomentsCommentsMsgResp) String() string { return proto.CompactTextString(m) } func (*ClearUserWorkMomentsCommentsMsgResp) ProtoMessage() {} func (*ClearUserWorkMomentsCommentsMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{39} + return fileDescriptor_office_282f0d3c571a3eb6, []int{39} } func (m *ClearUserWorkMomentsCommentsMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ClearUserWorkMomentsCommentsMsgResp.Unmarshal(m, b) @@ -2141,7 +2149,7 @@ func (m *SetUserWorkMomentsLevelReq) Reset() { *m = SetUserWorkMomentsLe func (m *SetUserWorkMomentsLevelReq) String() string { return proto.CompactTextString(m) } func (*SetUserWorkMomentsLevelReq) ProtoMessage() {} func (*SetUserWorkMomentsLevelReq) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{40} + return fileDescriptor_office_282f0d3c571a3eb6, []int{40} } func (m *SetUserWorkMomentsLevelReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetUserWorkMomentsLevelReq.Unmarshal(m, b) @@ -2193,7 +2201,7 @@ func (m *SetUserWorkMomentsLevelResp) Reset() { *m = SetUserWorkMomentsL func (m *SetUserWorkMomentsLevelResp) String() string { return proto.CompactTextString(m) } func (*SetUserWorkMomentsLevelResp) ProtoMessage() {} func (*SetUserWorkMomentsLevelResp) Descriptor() ([]byte, []int) { - return fileDescriptor_office_373be750de153751, []int{41} + return fileDescriptor_office_282f0d3c571a3eb6, []int{41} } func (m *SetUserWorkMomentsLevelResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetUserWorkMomentsLevelResp.Unmarshal(m, b) @@ -2869,104 +2877,105 @@ var _OfficeService_serviceDesc = grpc.ServiceDesc{ Metadata: "office/office.proto", } -func init() { proto.RegisterFile("office/office.proto", fileDescriptor_office_373be750de153751) } +func init() { proto.RegisterFile("office/office.proto", fileDescriptor_office_282f0d3c571a3eb6) } -var fileDescriptor_office_373be750de153751 = []byte{ - // 1530 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xd7, 0xda, 0x49, 0x1c, 0x3f, 0xa7, 0x4d, 0x33, 0x49, 0x13, 0xb3, 0x6d, 0x12, 0x77, 0x5b, - 0xa4, 0xb4, 0x95, 0x1c, 0x64, 0x2a, 0x81, 0x84, 0xa8, 0x50, 0xed, 0x12, 0x05, 0xe2, 0x36, 0x6c, - 0x12, 0xaa, 0x72, 0x68, 0xb4, 0x75, 0x26, 0xcb, 0x2a, 0xce, 0xee, 0x76, 0x67, 0x63, 0x53, 0x2e, - 0x48, 0x5c, 0xf8, 0x00, 0x1c, 0x38, 0x71, 0xe1, 0x2b, 0xf0, 0x19, 0x38, 0x70, 0x42, 0x9c, 0x38, - 0x71, 0x82, 0x0f, 0x82, 0x66, 0xf6, 0xcf, 0xcc, 0xec, 0x1f, 0xaf, 0xbb, 0xa5, 0x12, 0x9c, 0xe2, - 0xf7, 0xe6, 0xcd, 0x9b, 0xdf, 0xfb, 0xbd, 0x99, 0x37, 0x6f, 0x27, 0xb0, 0xec, 0x9c, 0x9e, 0x5a, - 0x03, 0xbc, 0x1d, 0xfc, 0x69, 0xbb, 0x9e, 0xe3, 0x3b, 0x68, 0x2e, 0x90, 0xd4, 0x1b, 0x8f, 0x5d, - 0x6c, 0x1f, 0xef, 0xf6, 0xb7, 0xdd, 0x33, 0x73, 0x9b, 0x0d, 0x6d, 0x93, 0x93, 0xb3, 0xe3, 0x31, - 0xd9, 0x1e, 0x93, 0xc0, 0x54, 0xbb, 0x0f, 0xd0, 0x75, 0xce, 0xcf, 0x1d, 0x5b, 0xc7, 0xc4, 0x45, - 0x4d, 0xa8, 0x61, 0xcf, 0xeb, 0x3a, 0x27, 0xb8, 0xa9, 0xb4, 0x94, 0xad, 0x59, 0x3d, 0x12, 0xd1, - 0x2a, 0xcc, 0x61, 0xcf, 0xeb, 0x13, 0xb3, 0x59, 0x69, 0x29, 0x5b, 0x75, 0x3d, 0x94, 0xb4, 0x0f, - 0xa1, 0x76, 0x68, 0x98, 0x47, 0x04, 0x7b, 0xd4, 0xe4, 0x82, 0x60, 0x6f, 0xb7, 0xc7, 0xe6, 0xd6, - 0xf5, 0x50, 0x42, 0x2a, 0xcc, 0xd3, 0x5f, 0x8f, 0x8c, 0x73, 0x1c, 0x4e, 0x8e, 0x65, 0xed, 0x39, - 0x54, 0x0f, 0x0d, 0x13, 0xad, 0xc0, 0xac, 0x6f, 0x98, 0xf1, 0xcc, 0x40, 0xa0, 0x68, 0x7c, 0xc3, - 0x14, 0xe6, 0x45, 0x22, 0xba, 0x1b, 0xb8, 0xdc, 0xb3, 0x88, 0xdf, 0xac, 0xb6, 0xaa, 0x5b, 0x8d, - 0xce, 0x62, 0x3b, 0x64, 0x20, 0x44, 0xa3, 0xc7, 0x06, 0xda, 0x27, 0x70, 0x79, 0x07, 0xfb, 0x54, - 0x79, 0x68, 0x98, 0x44, 0xc7, 0x2f, 0x72, 0x91, 0xb6, 0xa0, 0xe1, 0xb8, 0xd8, 0x33, 0x7c, 0xcb, - 0xb1, 0x77, 0x7b, 0xe1, 0xa2, 0xa2, 0x4a, 0x3b, 0x85, 0x45, 0xc9, 0x17, 0x71, 0x51, 0x07, 0x60, - 0x10, 0x33, 0xc8, 0x1c, 0x36, 0x3a, 0x28, 0x42, 0xc3, 0xb9, 0xd5, 0x05, 0x2b, 0xb4, 0x09, 0x33, - 0xbe, 0x61, 0x92, 0x66, 0x85, 0x61, 0x6f, 0x08, 0xd8, 0x75, 0x36, 0xa0, 0x7d, 0xab, 0xc0, 0x42, - 0xd7, 0xc3, 0x86, 0x8f, 0xa9, 0x0e, 0xbf, 0x10, 0xb9, 0x50, 0x64, 0x2e, 0x78, 0x30, 0x15, 0x29, - 0x98, 0x0d, 0x80, 0xe0, 0x57, 0xcc, 0x52, 0x5d, 0x17, 0x34, 0xc9, 0x60, 0x67, 0xd2, 0xc1, 0x76, - 0xe1, 0x92, 0x80, 0xa1, 0x5c, 0xa8, 0xda, 0x33, 0x58, 0xe8, 0xe1, 0x21, 0x8e, 0x03, 0xc9, 0xe3, - 0x3e, 0xde, 0x02, 0x15, 0x71, 0x0b, 0x24, 0x40, 0x56, 0x33, 0x41, 0x0a, 0xfe, 0x4b, 0x82, 0xfc, - 0x5d, 0x81, 0xfa, 0x01, 0xf6, 0x4b, 0x41, 0x6c, 0x42, 0xcd, 0xc6, 0x63, 0x96, 0x99, 0x00, 0x5e, - 0x24, 0xa2, 0x36, 0x20, 0xcb, 0x1e, 0x78, 0xd8, 0x20, 0xf8, 0x88, 0x67, 0x62, 0x86, 0x65, 0x22, - 0x63, 0x04, 0xdd, 0x81, 0x2b, 0x1e, 0x3e, 0xb9, 0x18, 0x88, 0xd6, 0xb3, 0xcc, 0x3a, 0xa5, 0x4f, - 0x12, 0x33, 0x97, 0x26, 0xe6, 0x23, 0x80, 0x28, 0xa4, 0x92, 0xac, 0xfc, 0xad, 0xc0, 0xe5, 0x03, - 0x6c, 0x9f, 0xf4, 0x89, 0xd9, 0x91, 0xb6, 0x21, 0x43, 0xa6, 0x30, 0x64, 0x91, 0x48, 0x4f, 0xf9, - 0x51, 0x74, 0x24, 0x2b, 0x6c, 0x28, 0x96, 0xd1, 0x75, 0xa8, 0xef, 0x78, 0xce, 0x85, 0x2b, 0xec, - 0x44, 0xae, 0xa0, 0x74, 0x13, 0x6c, 0x9f, 0xc4, 0x7b, 0x30, 0x94, 0x28, 0x1d, 0xf4, 0x17, 0xf6, - 0xf6, 0x87, 0x86, 0x7f, 0xea, 0x78, 0xe7, 0xbb, 0xbd, 0xe6, 0x2c, 0xab, 0x4a, 0x29, 0x3d, 0xc5, - 0x35, 0x70, 0x6c, 0x1f, 0xdb, 0x7e, 0x48, 0x45, 0x24, 0x26, 0x89, 0xaa, 0xa5, 0x89, 0x7a, 0x08, - 0x8b, 0x52, 0x94, 0x25, 0xd9, 0xfa, 0x5e, 0x81, 0xa5, 0x1d, 0x46, 0x38, 0xf5, 0xb6, 0xe7, 0x04, - 0xa5, 0xa6, 0x07, 0xb0, 0x6f, 0x98, 0x96, 0xcd, 0x16, 0x0b, 0x3d, 0xdd, 0x6a, 0x13, 0xec, 0x8d, - 0xb0, 0x77, 0x6c, 0xb8, 0xd6, 0xb1, 0x6b, 0x78, 0xc6, 0x39, 0x69, 0xeb, 0xf8, 0xc5, 0x05, 0x26, - 0x3e, 0xb7, 0xd5, 0x85, 0x79, 0xb9, 0x67, 0xbc, 0xf8, 0x78, 0x38, 0x00, 0x1c, 0x91, 0x54, 0x37, - 0x95, 0x82, 0xba, 0x29, 0x72, 0x5a, 0x91, 0x39, 0x55, 0x61, 0x9e, 0x66, 0xe0, 0xd0, 0x0a, 0xf7, - 0x7c, 0x55, 0x8f, 0x65, 0xed, 0x17, 0x05, 0x50, 0x92, 0x86, 0x92, 0x55, 0xf2, 0xa1, 0xc4, 0x5d, - 0x85, 0xcd, 0x79, 0x3b, 0x93, 0x3b, 0xe2, 0x3a, 0x36, 0xc1, 0x39, 0xe4, 0xdd, 0x83, 0x86, 0xcf, - 0xd1, 0x84, 0xf7, 0x05, 0x12, 0xe2, 0x0e, 0x87, 0x74, 0xd1, 0x4c, 0x1b, 0xb0, 0x6c, 0x86, 0x95, - 0xfe, 0xc1, 0xcb, 0xdd, 0xde, 0x9b, 0x28, 0x5e, 0x26, 0xe3, 0x4a, 0x5a, 0xa4, 0x24, 0x57, 0xeb, - 0x50, 0xf5, 0x0d, 0x33, 0x24, 0x49, 0xba, 0x50, 0xa8, 0x5e, 0xbb, 0x0f, 0xf3, 0x7b, 0xd6, 0x19, - 0x2e, 0x7d, 0x4f, 0xff, 0xa9, 0x40, 0x8d, 0xae, 0x4c, 0xb3, 0x5f, 0x62, 0x3e, 0xa5, 0xc2, 0xc3, - 0xee, 0xf0, 0x65, 0x50, 0xc1, 0x22, 0x2a, 0x04, 0x15, 0xba, 0x05, 0x97, 0x62, 0x91, 0xb9, 0x08, - 0x8a, 0x81, 0xac, 0xa4, 0x95, 0x24, 0xdc, 0x84, 0x61, 0x31, 0xa8, 0xeb, 0x5c, 0x31, 0xa1, 0x0a, - 0x6c, 0x00, 0x0c, 0x82, 0xab, 0x8c, 0xee, 0xd9, 0x1a, 0xab, 0x22, 0x82, 0x46, 0xfb, 0xab, 0x02, - 0xf0, 0xc4, 0xf1, 0xce, 0xfa, 0x0e, 0x0b, 0x51, 0x83, 0x85, 0x71, 0x2c, 0xc5, 0x81, 0x4a, 0xba, - 0xdc, 0x33, 0x29, 0x80, 0xa8, 0xca, 0x20, 0xda, 0x50, 0x1f, 0x86, 0x49, 0x20, 0xec, 0x1a, 0x68, - 0x74, 0xae, 0x44, 0x99, 0x8a, 0xb2, 0xa3, 0x73, 0x13, 0x7a, 0x5a, 0x07, 0x01, 0xe7, 0x84, 0xdd, - 0x03, 0xc2, 0x69, 0x0d, 0x73, 0xa1, 0xc7, 0x06, 0xe8, 0x1d, 0x58, 0x1e, 0x7f, 0xe9, 0x74, 0x0d, - 0xfb, 0x00, 0x8b, 0xf7, 0xc7, 0x1c, 0xab, 0xb6, 0x59, 0x43, 0xa8, 0x03, 0x2b, 0x81, 0xda, 0x97, - 0xa7, 0xd4, 0xd8, 0x94, 0xcc, 0x31, 0xca, 0xbf, 0x45, 0xf6, 0x3d, 0x6b, 0x64, 0xf8, 0xb8, 0x39, - 0xdf, 0x52, 0xb6, 0xe6, 0x75, 0xae, 0xa0, 0x2c, 0x77, 0x39, 0xcb, 0x10, 0xb0, 0xcc, 0x35, 0x9a, - 0x0d, 0xab, 0x81, 0xf4, 0xd8, 0xc6, 0x9c, 0x6d, 0x7a, 0xb0, 0x3a, 0x00, 0x9c, 0xdc, 0xe4, 0x96, - 0x17, 0x4c, 0x05, 0xab, 0x29, 0xba, 0xb5, 0x3e, 0xac, 0x65, 0xae, 0x57, 0xb2, 0xc2, 0x8f, 0x60, - 0x35, 0x68, 0x35, 0x52, 0xf0, 0x5f, 0x67, 0xbf, 0x14, 0x57, 0x89, 0x3e, 0xac, 0x65, 0xae, 0x5b, - 0x32, 0x0c, 0x1f, 0x56, 0xe8, 0x6e, 0x4b, 0x05, 0x91, 0x77, 0xae, 0x35, 0x58, 0x78, 0x22, 0x06, - 0x17, 0xc0, 0x97, 0x74, 0x53, 0x04, 0xf1, 0x29, 0x5c, 0xcd, 0x58, 0xb5, 0x64, 0x08, 0x3f, 0x2b, - 0xb0, 0x16, 0x1e, 0x81, 0x57, 0x09, 0x63, 0x9c, 0x11, 0xc6, 0x38, 0x11, 0x46, 0x41, 0x99, 0x12, - 0x4e, 0xf7, 0xcc, 0xc4, 0x46, 0x63, 0x36, 0x4d, 0xc1, 0x23, 0x68, 0x66, 0x83, 0x2e, 0xc9, 0xc2, - 0x57, 0xb0, 0xb2, 0x83, 0x7d, 0xee, 0x28, 0xba, 0xa5, 0xa6, 0xd9, 0x8d, 0x2a, 0xcc, 0x3b, 0xee, - 0x91, 0xb8, 0x1f, 0x63, 0x79, 0x8a, 0x64, 0x7e, 0x03, 0x57, 0x33, 0x56, 0x2e, 0x79, 0x75, 0xc9, - 0x67, 0xbf, 0x32, 0xcd, 0xd9, 0xd7, 0x7e, 0x50, 0x18, 0x02, 0x0a, 0x98, 0x5b, 0x4c, 0xfc, 0xb6, - 0xeb, 0x65, 0x34, 0x13, 0xaf, 0xde, 0x88, 0x15, 0x53, 0xf3, 0xab, 0x02, 0xab, 0x59, 0xc8, 0x4a, - 0x92, 0x73, 0x0f, 0x1a, 0x3c, 0xec, 0xe8, 0x83, 0x31, 0x8b, 0x1d, 0xd1, 0x2c, 0xd1, 0x39, 0x55, - 0x4b, 0x76, 0x4e, 0xda, 0x8f, 0x0a, 0x5c, 0x0b, 0x63, 0xf9, 0xd8, 0xb3, 0xb0, 0x7d, 0xf2, 0x1f, - 0xe3, 0xfa, 0x37, 0x05, 0xae, 0xe7, 0xe3, 0xfb, 0x3f, 0x32, 0x3e, 0x82, 0x46, 0x58, 0x22, 0x48, - 0x9f, 0x98, 0xe8, 0x36, 0xad, 0x36, 0xe7, 0xc2, 0x9d, 0x98, 0x6a, 0x00, 0xa2, 0xf1, 0xa9, 0xca, - 0x5b, 0x6e, 0x6b, 0xa2, 0xfd, 0xa4, 0x40, 0x2b, 0xbd, 0x6b, 0x05, 0x28, 0xaf, 0xf5, 0x6c, 0x92, - 0xd8, 0x10, 0xd5, 0x72, 0x1b, 0x42, 0xfb, 0x43, 0x81, 0x1b, 0x05, 0x20, 0x4b, 0xe6, 0xfc, 0x3d, - 0x58, 0x18, 0x70, 0x37, 0x51, 0xd2, 0x97, 0x13, 0x64, 0xb3, 0x25, 0x24, 0xc3, 0x7f, 0x2b, 0xed, - 0xcf, 0x40, 0xeb, 0x0e, 0xb1, 0xe1, 0xbd, 0x21, 0xfe, 0xb5, 0xa7, 0x70, 0xb3, 0xd0, 0x7f, 0xc9, - 0x4b, 0x68, 0x08, 0xea, 0x41, 0x2a, 0x27, 0x7b, 0x78, 0x84, 0x87, 0x05, 0x1f, 0x4c, 0x43, 0x6a, - 0xc3, 0xc0, 0xce, 0xea, 0x81, 0x30, 0xc5, 0x89, 0xff, 0x0c, 0xae, 0xe5, 0xae, 0x56, 0x2e, 0x80, - 0xce, 0x77, 0x0d, 0xb8, 0xf4, 0x98, 0x59, 0x1c, 0x60, 0x6f, 0x64, 0x0d, 0x30, 0xba, 0x0f, 0x0d, - 0xe1, 0x91, 0x0f, 0xad, 0x46, 0x0e, 0xe4, 0x57, 0x44, 0x75, 0x2d, 0x53, 0x4f, 0x5c, 0xf4, 0x3e, - 0xd4, 0xe3, 0x77, 0x33, 0xb4, 0x12, 0x2f, 0x2f, 0x3c, 0xe7, 0xa9, 0x57, 0x33, 0xb4, 0xc1, 0xcc, - 0xf8, 0x31, 0x8b, 0xcf, 0x14, 0xdf, 0xcf, 0xf8, 0x4c, 0xf9, 0xd5, 0x6b, 0x1b, 0xe6, 0x82, 0xd7, - 0x1e, 0xb4, 0x14, 0x19, 0xc4, 0x0f, 0x5a, 0x2a, 0x4a, 0xaa, 0x88, 0x4b, 0x83, 0x14, 0x5e, 0x3d, - 0x78, 0x90, 0xf2, 0x83, 0x0f, 0x0f, 0x32, 0xf9, 0x44, 0xb2, 0xc3, 0x5e, 0x55, 0x85, 0xcf, 0x7c, - 0xf4, 0x96, 0xc0, 0x87, 0xfc, 0x0a, 0xa2, 0xaa, 0x79, 0x43, 0xb1, 0x23, 0xe1, 0x1b, 0x58, 0x72, - 0x24, 0x7f, 0x80, 0x4b, 0x8e, 0x92, 0x9f, 0xcd, 0x9f, 0xc3, 0x72, 0x46, 0xb7, 0x8f, 0x36, 0x64, - 0xaa, 0x93, 0xfd, 0xa2, 0xba, 0x39, 0x71, 0x3c, 0xf0, 0x9b, 0xd1, 0x7e, 0x73, 0xbf, 0xd9, 0xdf, - 0x04, 0xdc, 0x6f, 0x5e, 0xef, 0xbe, 0x0f, 0x4b, 0xa9, 0x8e, 0x18, 0x5d, 0x17, 0x3f, 0x08, 0x53, - 0x3e, 0xd7, 0x27, 0x8c, 0x12, 0x17, 0x3d, 0x85, 0x95, 0xac, 0x06, 0x13, 0x6d, 0x26, 0x0a, 0x59, - 0xca, 0x6f, 0x6b, 0xb2, 0x41, 0x00, 0x36, 0xd5, 0xf1, 0x71, 0xb0, 0x59, 0x6d, 0x28, 0x07, 0x9b, - 0xdd, 0x2a, 0x1e, 0xc4, 0x6f, 0x1f, 0xc2, 0x51, 0x46, 0xeb, 0x89, 0x04, 0xcb, 0x1d, 0x87, 0xba, - 0x31, 0x69, 0x98, 0xb8, 0x08, 0x43, 0x33, 0xaf, 0x21, 0x40, 0x37, 0x13, 0x73, 0xb3, 0x5a, 0x1a, - 0xf5, 0x56, 0xb1, 0x11, 0x71, 0x91, 0x0f, 0xeb, 0x13, 0x2f, 0x22, 0xb4, 0x95, 0x8f, 0x53, 0x2e, - 0xea, 0xea, 0xed, 0x29, 0x2d, 0x89, 0x8b, 0xbe, 0x86, 0xcd, 0x82, 0x2a, 0x8e, 0xee, 0xc4, 0x89, - 0x2c, 0xbc, 0x4e, 0xd4, 0xbb, 0x53, 0xdb, 0x12, 0x17, 0x3d, 0x87, 0xb5, 0x9c, 0xc2, 0x8b, 0x34, - 0xa1, 0xba, 0xe4, 0xdc, 0x03, 0xea, 0xcd, 0x42, 0x1b, 0xe2, 0x3e, 0x58, 0xfa, 0x62, 0xb1, 0x1d, - 0xfe, 0x23, 0xeb, 0x83, 0xe0, 0xcf, 0xf3, 0x39, 0xf6, 0x5f, 0xaa, 0x77, 0xff, 0x09, 0x00, 0x00, - 0xff, 0xff, 0x47, 0x04, 0x0d, 0x95, 0xe7, 0x1a, 0x00, 0x00, +var fileDescriptor_office_282f0d3c571a3eb6 = []byte{ + // 1539 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcf, 0x6f, 0x1b, 0xc5, + 0x17, 0xd7, 0xda, 0x49, 0x1c, 0x3f, 0xa7, 0x4d, 0x33, 0x49, 0x13, 0x7f, 0xb7, 0x4d, 0xe2, 0x6e, + 0xfb, 0x95, 0xd2, 0x56, 0x72, 0x90, 0xa9, 0x04, 0x12, 0xa2, 0x42, 0xb5, 0x4b, 0x14, 0x88, 0xdb, + 0xb0, 0x49, 0xa8, 0xca, 0xa1, 0xd1, 0xd6, 0x99, 0x2c, 0xab, 0xd8, 0xbb, 0xdb, 0x9d, 0x4d, 0x4c, + 0xb9, 0x20, 0x71, 0xe1, 0xc6, 0x85, 0x03, 0x27, 0x2e, 0xfc, 0x0b, 0xfc, 0x0d, 0x1c, 0x38, 0x21, + 0x4e, 0x9c, 0x38, 0xc1, 0x1f, 0x82, 0x66, 0xf6, 0xc7, 0xcc, 0xec, 0x0f, 0xaf, 0xbb, 0xa5, 0x12, + 0x9c, 0xe2, 0xf7, 0xe6, 0xcd, 0x9b, 0xcf, 0xfb, 0xcc, 0x9b, 0x37, 0x6f, 0x27, 0xb0, 0xec, 0x9c, + 0x9e, 0x5a, 0x03, 0xbc, 0x1d, 0xfc, 0x69, 0xbb, 0x9e, 0xe3, 0x3b, 0x68, 0x2e, 0x90, 0xd4, 0x1b, + 0x8f, 0x5d, 0x6c, 0x1f, 0xef, 0xf6, 0xb7, 0xdd, 0x33, 0x73, 0x9b, 0x0d, 0x6d, 0x93, 0x93, 0xb3, + 0xe3, 0x31, 0xd9, 0x1e, 0x93, 0xc0, 0x54, 0xbb, 0x0f, 0xd0, 0x75, 0x46, 0x23, 0xc7, 0xd6, 0x31, + 0x71, 0x51, 0x13, 0x6a, 0xd8, 0xf3, 0xba, 0xce, 0x09, 0x6e, 0x2a, 0x2d, 0x65, 0x6b, 0x56, 0x8f, + 0x44, 0xb4, 0x0a, 0x73, 0xd8, 0xf3, 0xfa, 0xc4, 0x6c, 0x56, 0x5a, 0xca, 0x56, 0x5d, 0x0f, 0x25, + 0xed, 0x7d, 0xa8, 0x1d, 0x1a, 0xe6, 0x11, 0xc1, 0x1e, 0x35, 0x39, 0x27, 0xd8, 0xdb, 0xed, 0xb1, + 0xb9, 0x75, 0x3d, 0x94, 0x90, 0x0a, 0xf3, 0xf4, 0xd7, 0x23, 0x63, 0x84, 0xc3, 0xc9, 0xb1, 0xac, + 0x3d, 0x87, 0xea, 0xa1, 0x61, 0xa2, 0x15, 0x98, 0xf5, 0x0d, 0x33, 0x9e, 0x19, 0x08, 0x14, 0x8d, + 0x6f, 0x98, 0xc2, 0xbc, 0x48, 0x44, 0x77, 0x03, 0x97, 0x7b, 0x16, 0xf1, 0x9b, 0xd5, 0x56, 0x75, + 0xab, 0xd1, 0x59, 0x6c, 0x87, 0x0c, 0x84, 0x68, 0xf4, 0xd8, 0x40, 0xfb, 0x08, 0x2e, 0xef, 0x60, + 0x9f, 0x2a, 0x0f, 0x0d, 0x93, 0xe8, 0xf8, 0x45, 0x2e, 0xd2, 0x16, 0x34, 0x1c, 0x17, 0x7b, 0x86, + 0x6f, 0x39, 0xf6, 0x6e, 0x2f, 0x5c, 0x54, 0x54, 0x69, 0xa7, 0xb0, 0x28, 0xf9, 0x22, 0x2e, 0xea, + 0x00, 0x0c, 0x62, 0x06, 0x99, 0xc3, 0x46, 0x07, 0x45, 0x68, 0x38, 0xb7, 0xba, 0x60, 0x85, 0x36, + 0x61, 0xc6, 0x37, 0x4c, 0xd2, 0xac, 0x30, 0xec, 0x0d, 0x01, 0xbb, 0xce, 0x06, 0xb4, 0xaf, 0x15, + 0x58, 0xe8, 0x7a, 0xd8, 0xf0, 0x31, 0xd5, 0xe1, 0x17, 0x22, 0x17, 0x8a, 0xcc, 0x05, 0x0f, 0xa6, + 0x22, 0x05, 0xb3, 0x01, 0x10, 0xfc, 0x8a, 0x59, 0xaa, 0xeb, 0x82, 0x26, 0x19, 0xec, 0x4c, 0x3a, + 0xd8, 0x2e, 0x5c, 0x12, 0x30, 0x94, 0x0b, 0x55, 0x7b, 0x06, 0x0b, 0x3d, 0x3c, 0xc4, 0x71, 0x20, + 0x79, 0xdc, 0xc7, 0x29, 0x50, 0x11, 0x53, 0x20, 0x01, 0xb2, 0x9a, 0x09, 0x52, 0xf0, 0x5f, 0x12, + 0xe4, 0x6f, 0x0a, 0xd4, 0x0f, 0xb0, 0x5f, 0x0a, 0x62, 0x13, 0x6a, 0x36, 0x1e, 0xb3, 0x9d, 0x09, + 0xe0, 0x45, 0x22, 0x6a, 0x03, 0xb2, 0xec, 0x81, 0x87, 0x0d, 0x82, 0x8f, 0xf8, 0x4e, 0xcc, 0xb0, + 0x9d, 0xc8, 0x18, 0x41, 0x77, 0xe0, 0x8a, 0x87, 0x4f, 0xce, 0x07, 0xa2, 0xf5, 0x2c, 0xb3, 0x4e, + 0xe9, 0x93, 0xc4, 0xcc, 0xa5, 0x89, 0xf9, 0x00, 0x20, 0x0a, 0xa9, 0x24, 0x2b, 0x7f, 0x29, 0x70, + 0xf9, 0x00, 0xdb, 0x27, 0x7d, 0x62, 0x76, 0xa4, 0x34, 0x64, 0xc8, 0x14, 0x86, 0x2c, 0x12, 0xe9, + 0x29, 0x3f, 0x8a, 0x8e, 0x64, 0x85, 0x0d, 0xc5, 0x32, 0xba, 0x0e, 0xf5, 0x1d, 0xcf, 0x39, 0x77, + 0x85, 0x4c, 0xe4, 0x0a, 0x4a, 0x37, 0xc1, 0xf6, 0x49, 0x9c, 0x83, 0xa1, 0x44, 0xe9, 0xa0, 0xbf, + 0xb0, 0xb7, 0x3f, 0x34, 0xfc, 0x53, 0xc7, 0x1b, 0xed, 0xf6, 0x9a, 0xb3, 0xac, 0x2a, 0xa5, 0xf4, + 0x14, 0xd7, 0xc0, 0xb1, 0x7d, 0x6c, 0xfb, 0x21, 0x15, 0x91, 0x98, 0x24, 0xaa, 0x96, 0x26, 0xea, + 0x21, 0x2c, 0x4a, 0x51, 0x96, 0x64, 0xeb, 0x3b, 0x05, 0x96, 0x76, 0x18, 0xe1, 0xd4, 0xdb, 0x9e, + 0x13, 0x94, 0x9a, 0x1e, 0xc0, 0xbe, 0x61, 0x5a, 0x36, 0x5b, 0x2c, 0xf4, 0x74, 0xab, 0x4d, 0xb0, + 0x77, 0x81, 0xbd, 0x63, 0xc3, 0xb5, 0x8e, 0x5d, 0xc3, 0x33, 0x46, 0xa4, 0xad, 0xe3, 0x17, 0xe7, + 0x98, 0xf8, 0xdc, 0x56, 0x17, 0xe6, 0xe5, 0x9e, 0xf1, 0xe2, 0xe3, 0xe1, 0x00, 0x70, 0x44, 0x52, + 0xdd, 0x54, 0x0a, 0xea, 0xa6, 0xc8, 0x69, 0x45, 0xe6, 0x54, 0x85, 0x79, 0xba, 0x03, 0x87, 0x56, + 0x98, 0xf3, 0x55, 0x3d, 0x96, 0xb5, 0x9f, 0x15, 0x40, 0x49, 0x1a, 0x4a, 0x56, 0xc9, 0x87, 0x12, + 0x77, 0x15, 0x36, 0xe7, 0xff, 0x99, 0xdc, 0x11, 0xd7, 0xb1, 0x09, 0xce, 0x21, 0xef, 0x1e, 0x34, + 0x7c, 0x8e, 0x26, 0xbc, 0x2f, 0x90, 0x10, 0x77, 0x38, 0xa4, 0x8b, 0x66, 0xda, 0x80, 0xed, 0x66, + 0x58, 0xe9, 0x1f, 0xbc, 0xdc, 0xed, 0xbd, 0x89, 0xe2, 0x65, 0x32, 0xae, 0xa4, 0x45, 0x4a, 0x72, + 0xb5, 0x0e, 0x55, 0xdf, 0x30, 0x43, 0x92, 0xa4, 0x0b, 0x85, 0xea, 0xb5, 0xfb, 0x30, 0xbf, 0x67, + 0x9d, 0xe1, 0xd2, 0xf7, 0xf4, 0x1f, 0x0a, 0xd4, 0xe8, 0xca, 0x74, 0xf7, 0x4b, 0xcc, 0xa7, 0x54, + 0x78, 0xd8, 0x1d, 0xbe, 0x0c, 0x2a, 0x58, 0x44, 0x85, 0xa0, 0x42, 0xb7, 0xe0, 0x52, 0x2c, 0x32, + 0x17, 0x41, 0x31, 0x90, 0x95, 0xb4, 0x92, 0x84, 0x49, 0x18, 0x16, 0x83, 0xba, 0xce, 0x15, 0x13, + 0xaa, 0xc0, 0x06, 0xc0, 0x20, 0xb8, 0xca, 0x68, 0xce, 0xd6, 0x58, 0x15, 0x11, 0x34, 0xda, 0x9f, + 0x15, 0x80, 0x27, 0x8e, 0x77, 0xd6, 0x77, 0x58, 0x88, 0x1a, 0x2c, 0x8c, 0x63, 0x29, 0x0e, 0x54, + 0xd2, 0xe5, 0x9e, 0x49, 0x01, 0x44, 0x55, 0x06, 0xd1, 0x86, 0xfa, 0x30, 0xdc, 0x04, 0xc2, 0xae, + 0x81, 0x46, 0xe7, 0x4a, 0xb4, 0x53, 0xd1, 0xee, 0xe8, 0xdc, 0x84, 0x9e, 0xd6, 0x41, 0xc0, 0x39, + 0x61, 0xf7, 0x80, 0x70, 0x5a, 0xc3, 0xbd, 0xd0, 0x63, 0x03, 0xf4, 0x16, 0x2c, 0x8f, 0x3f, 0x77, + 0xba, 0x86, 0x7d, 0x80, 0xc5, 0xfb, 0x63, 0x8e, 0x55, 0xdb, 0xac, 0x21, 0xd4, 0x81, 0x95, 0x40, + 0xed, 0xcb, 0x53, 0x6a, 0x6c, 0x4a, 0xe6, 0x18, 0xe5, 0xdf, 0x22, 0xfb, 0x9e, 0x75, 0x61, 0xf8, + 0xb8, 0x39, 0xdf, 0x52, 0xb6, 0xe6, 0x75, 0xae, 0xa0, 0x2c, 0x77, 0x39, 0xcb, 0x10, 0xb0, 0xcc, + 0x35, 0x9a, 0x0d, 0xab, 0x81, 0xf4, 0xd8, 0xc6, 0x9c, 0x6d, 0x7a, 0xb0, 0x3a, 0x00, 0x9c, 0xdc, + 0x64, 0xca, 0x0b, 0xa6, 0x82, 0xd5, 0x14, 0xdd, 0x5a, 0x1f, 0xd6, 0x32, 0xd7, 0x2b, 0x59, 0xe1, + 0x2f, 0x60, 0x35, 0x68, 0x35, 0x52, 0xf0, 0x5f, 0x27, 0x5f, 0x8a, 0xab, 0x44, 0x1f, 0xd6, 0x32, + 0xd7, 0x2d, 0x19, 0x86, 0x0f, 0x2b, 0x34, 0xdb, 0x52, 0x41, 0xe4, 0x9d, 0x6b, 0x0d, 0x16, 0x9e, + 0x88, 0xc1, 0x05, 0xf0, 0x25, 0xdd, 0x14, 0x41, 0x7c, 0x0c, 0x57, 0x33, 0x56, 0x2d, 0x19, 0xc2, + 0x4f, 0x0a, 0xac, 0x85, 0x47, 0xe0, 0x55, 0xc2, 0x18, 0x67, 0x84, 0x31, 0x4e, 0x84, 0x51, 0x50, + 0xa6, 0x84, 0xd3, 0x3d, 0x33, 0xb1, 0xd1, 0x98, 0x4d, 0x53, 0xf0, 0x08, 0x9a, 0xd9, 0xa0, 0x4b, + 0xb2, 0xf0, 0x05, 0xac, 0xec, 0x60, 0x9f, 0x3b, 0x8a, 0x6e, 0xa9, 0x69, 0xb2, 0x51, 0x85, 0x79, + 0xc7, 0x3d, 0x12, 0xf3, 0x31, 0x96, 0xa7, 0xd8, 0xcc, 0xaf, 0xe0, 0x6a, 0xc6, 0xca, 0x25, 0xaf, + 0x2e, 0xf9, 0xec, 0x57, 0xa6, 0x39, 0xfb, 0xda, 0xf7, 0x0a, 0x43, 0x40, 0x01, 0x73, 0x8b, 0x89, + 0xdf, 0x76, 0xbd, 0x8c, 0x66, 0xe2, 0xd5, 0x1b, 0xb1, 0x62, 0x6a, 0x7e, 0x51, 0x60, 0x35, 0x0b, + 0x59, 0x49, 0x72, 0xee, 0x41, 0x83, 0x87, 0x1d, 0x7d, 0x30, 0x66, 0xb1, 0x23, 0x9a, 0x25, 0x3a, + 0xa7, 0x6a, 0xc9, 0xce, 0x49, 0xfb, 0x41, 0x81, 0x6b, 0x61, 0x2c, 0x1f, 0x7a, 0x16, 0xb6, 0x4f, + 0xfe, 0x65, 0x5c, 0xff, 0xaa, 0xc0, 0xf5, 0x7c, 0x7c, 0xff, 0x45, 0xc6, 0xbf, 0x55, 0xa0, 0x11, + 0xd6, 0x08, 0xd2, 0x27, 0x26, 0xba, 0x4d, 0xcb, 0xcd, 0x48, 0xb8, 0x14, 0x53, 0x1d, 0x40, 0x34, + 0x3e, 0x55, 0x7d, 0xe3, 0x1b, 0x56, 0xcd, 0xeb, 0x59, 0xe4, 0xaa, 0xa6, 0xfd, 0xa8, 0x40, 0x2b, + 0x9d, 0xce, 0x02, 0xc4, 0xd7, 0x7a, 0x4f, 0x49, 0x64, 0x4a, 0xb5, 0x5c, 0xa6, 0x68, 0xbf, 0x2b, + 0x70, 0xa3, 0x00, 0x64, 0xc9, 0x64, 0x78, 0x07, 0x16, 0x06, 0xdc, 0x4d, 0x94, 0x0d, 0xcb, 0x89, + 0x4d, 0x60, 0x4b, 0x48, 0x86, 0xff, 0x54, 0x3e, 0x3c, 0x03, 0xad, 0x3b, 0xc4, 0x86, 0xf7, 0x86, + 0xf8, 0xd7, 0x9e, 0xc2, 0xcd, 0x42, 0xff, 0x25, 0x6f, 0xa7, 0x21, 0xa8, 0x07, 0xa9, 0x3d, 0xd9, + 0xc3, 0x17, 0x78, 0x58, 0xf0, 0x25, 0x35, 0xa4, 0x36, 0x0c, 0xec, 0xac, 0x1e, 0x08, 0x53, 0x94, + 0x82, 0x4f, 0xe0, 0x5a, 0xee, 0x6a, 0xe5, 0x02, 0xe8, 0x7c, 0xd3, 0x80, 0x4b, 0x8f, 0x99, 0xc5, + 0x01, 0xf6, 0x2e, 0xac, 0x01, 0x46, 0xf7, 0xa1, 0x21, 0xbc, 0xfe, 0xa1, 0xd5, 0xc8, 0x81, 0xfc, + 0xbc, 0xa8, 0xae, 0x65, 0xea, 0x89, 0x8b, 0xde, 0x85, 0x7a, 0xfc, 0xa0, 0x86, 0x56, 0xe2, 0xe5, + 0x85, 0x77, 0x3e, 0xf5, 0x6a, 0x86, 0x36, 0x98, 0x19, 0xbf, 0x72, 0xf1, 0x99, 0xe2, 0xc3, 0x1a, + 0x9f, 0x29, 0x3f, 0x87, 0x6d, 0xc3, 0x5c, 0xf0, 0x0c, 0x84, 0x96, 0x22, 0x83, 0xf8, 0xa5, 0x4b, + 0x45, 0x49, 0x15, 0x71, 0x69, 0x90, 0xc2, 0x73, 0x08, 0x0f, 0x52, 0x7e, 0x09, 0xe2, 0x41, 0x26, + 0xdf, 0x4e, 0x76, 0xd8, 0x73, 0xab, 0xf0, 0xfd, 0x8f, 0xfe, 0x27, 0xf0, 0x21, 0x3f, 0x8f, 0xa8, + 0x6a, 0xde, 0x50, 0xec, 0x48, 0xf8, 0x38, 0x96, 0x1c, 0xc9, 0x5f, 0xe6, 0x92, 0xa3, 0xe4, 0xf7, + 0xf4, 0xa7, 0xb0, 0x9c, 0xf1, 0x19, 0x80, 0x36, 0x64, 0xaa, 0x93, 0x8d, 0xa4, 0xba, 0x39, 0x71, + 0x3c, 0xf0, 0x9b, 0xd1, 0x97, 0x73, 0xbf, 0xd9, 0x1f, 0x0b, 0xdc, 0x6f, 0x5e, 0x53, 0xbf, 0x0f, + 0x4b, 0xa9, 0x56, 0x19, 0x5d, 0x17, 0xbf, 0x14, 0x53, 0x3e, 0xd7, 0x27, 0x8c, 0x12, 0x17, 0x3d, + 0x85, 0x95, 0xac, 0xce, 0x13, 0x6d, 0x26, 0x0a, 0x59, 0xca, 0x6f, 0x6b, 0xb2, 0x41, 0x00, 0x36, + 0xd5, 0x0a, 0x72, 0xb0, 0x59, 0xfd, 0x29, 0x07, 0x9b, 0xdd, 0x43, 0x1e, 0xc4, 0x8f, 0x22, 0xc2, + 0x51, 0x46, 0xeb, 0x89, 0x0d, 0x96, 0x5b, 0x11, 0x75, 0x63, 0xd2, 0x30, 0x71, 0x11, 0x86, 0x66, + 0x5e, 0xa7, 0x80, 0x6e, 0x26, 0xe6, 0x66, 0xf5, 0x3a, 0xea, 0xad, 0x62, 0x23, 0xe2, 0x22, 0x1f, + 0xd6, 0x27, 0x5e, 0x44, 0x68, 0x2b, 0x1f, 0xa7, 0x5c, 0xd4, 0xd5, 0xdb, 0x53, 0x5a, 0x12, 0x17, + 0x7d, 0x09, 0x9b, 0x05, 0x55, 0x1c, 0xdd, 0x89, 0x37, 0xb2, 0xf0, 0x3a, 0x51, 0xef, 0x4e, 0x6d, + 0x4b, 0x5c, 0xf4, 0x1c, 0xd6, 0x72, 0x0a, 0x2f, 0xd2, 0x84, 0xea, 0x92, 0x73, 0x0f, 0xa8, 0x37, + 0x0b, 0x6d, 0x88, 0xfb, 0x60, 0xe9, 0xb3, 0xc5, 0x76, 0xf8, 0x1f, 0xae, 0xf7, 0x82, 0x3f, 0xcf, + 0xe7, 0xd8, 0xbf, 0xaf, 0xde, 0xfe, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x5e, 0xd9, 0x76, 0xae, 0x00, + 0x1b, 0x00, 0x00, } diff --git a/pkg/proto/office/office.proto b/pkg/proto/office/office.proto index d5be34416..0aca5fe82 100644 --- a/pkg/proto/office/office.proto +++ b/pkg/proto/office/office.proto @@ -214,7 +214,8 @@ message GetUserFriendWorkMomentsResp { message CommentsMsg { Comment comment = 1; string workMomentID = 2; - string content = 3; + string userID = 3; + string content = 4; } message GetUserWorkMomentsCommentsMsgReq { From 3e5d9a394fbda890b9c21e33b7ebeb4ee10a5ef5 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 19 Apr 2022 16:33:44 +0800 Subject: [PATCH 10/10] workMoments --- internal/rpc/office/office.go | 1 + pkg/common/db/mongoModel.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index 91d12666f..3849f17d2 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -475,6 +475,7 @@ func (s *officeServer) GetUserWorkMomentsCommentsMsg(_ context.Context, req *pbO Comment: &comment, WorkMomentID: commentMsg.WorkMomentID, Content: commentMsg.WorkMomentContent, + UserID: req.UserID, }) } resp.Pagination = &pbCommon.ResponsePagination{CurrentPage: req.Pagination.PageNumber, ShowNumber: req.Pagination.ShowNumber} diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index 1dbec46a7..c0107dd65 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -669,7 +669,7 @@ func (d *DataBases) GetUserWorkMomentsCommentsMsg(userID string, showNumber, pag c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cCommentMsg) var commentMsgList []CommentMsg findOpts := options.Find().SetLimit(int64(showNumber)).SetSkip(int64(showNumber) * (int64(pageNumber) - 1)).SetSort(bson.M{"create_time": -1}) - result, err := c.Find(ctx, bson.M{"comment.user_id": userID}, findOpts) + result, err := c.Find(ctx, bson.M{"user_id": userID}, findOpts) if err != nil { return commentMsgList, err }