|
@@ -38,33 +38,30 @@ type MessageCenterClient interface {
|
|
|
SaveAutoReplyMsg(ctx context.Context, in *SaveAutoReplyReq, opts ...grpc.CallOption) (*MessageResp, error)
|
|
|
// 根据消息修改已读状态
|
|
|
UpdateReadById(ctx context.Context, in *ReadStateReq, opts ...grpc.CallOption) (*CurrencyResp, error)
|
|
|
-<<<<<<< HEAD
|
|
|
- //群组列表查询
|
|
|
+ // 群组列表查询
|
|
|
ChatGroupList(ctx context.Context, in *ChatGroupListReq, opts ...grpc.CallOption) (*ChatGroupListResp, error)
|
|
|
- //群组新增
|
|
|
+ // 群组新增
|
|
|
ChatGroupAdd(ctx context.Context, in *ChatGroupAddReq, opts ...grpc.CallOption) (*CommonReq, error)
|
|
|
- //群组成员查询
|
|
|
+ // 群组成员查询
|
|
|
ChatGroupPerson(ctx context.Context, in *ChatGroupPersonReq, opts ...grpc.CallOption) (*ChatGroupPersonResp, error)
|
|
|
- //加入群组
|
|
|
+ // 加入群组
|
|
|
ChatGroupJoin(ctx context.Context, in *ChatGroupJoinReq, opts ...grpc.CallOption) (*CommonReq, error)
|
|
|
- //群组名称修改
|
|
|
+ // 群组名称修改
|
|
|
GroupNameUpdate(ctx context.Context, in *GroupNameUpdateReq, opts ...grpc.CallOption) (*CommonReq, error)
|
|
|
- //群任务新增
|
|
|
+ // 群任务新增
|
|
|
GroupNoticeAdd(ctx context.Context, in *GroupNoticeAddReq, opts ...grpc.CallOption) (*CommonReq, error)
|
|
|
- //群任务编辑
|
|
|
+ // 群任务编辑
|
|
|
GroupNoticeUpdate(ctx context.Context, in *GroupNoticeUpdateReq, opts ...grpc.CallOption) (*CommonReq, error)
|
|
|
- //群任务详情
|
|
|
+ // 群任务详情
|
|
|
GroupNoticeGet(ctx context.Context, in *ChatGroupPersonReq, opts ...grpc.CallOption) (*GroupNoticeGetResp, error)
|
|
|
- //通讯录 -企业人员列表
|
|
|
+ // 通讯录 -企业人员列表
|
|
|
EntPersonsList(ctx context.Context, in *EntPersonsListReq, opts ...grpc.CallOption) (*EntPersonListResp, error)
|
|
|
-=======
|
|
|
// 用户撤回消息
|
|
|
WithdrawMessage(ctx context.Context, in *ReadWithdrawReq, opts ...grpc.CallOption) (*CurrencyResp, error)
|
|
|
// 用户评价回复
|
|
|
AppraiseMessage(ctx context.Context, in *AppraiseReq, opts ...grpc.CallOption) (*CurrencyResp, error)
|
|
|
// 客服列表查询
|
|
|
ConversationList(ctx context.Context, in *ConversationReq, opts ...grpc.CallOption) (*UserResp, error)
|
|
|
->>>>>>> master
|
|
|
}
|
|
|
|
|
|
type messageCenterClient struct {
|
|
@@ -147,37 +144,24 @@ func (c *messageCenterClient) UpdateReadById(ctx context.Context, in *ReadStateR
|
|
|
return out, nil
|
|
|
}
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
func (c *messageCenterClient) ChatGroupList(ctx context.Context, in *ChatGroupListReq, opts ...grpc.CallOption) (*ChatGroupListResp, error) {
|
|
|
out := new(ChatGroupListResp)
|
|
|
err := c.cc.Invoke(ctx, "/messagecenter.messageCenter/ChatGroupList", in, out, opts...)
|
|
|
-=======
|
|
|
-func (c *messageCenterClient) WithdrawMessage(ctx context.Context, in *ReadWithdrawReq, opts ...grpc.CallOption) (*CurrencyResp, error) {
|
|
|
- out := new(CurrencyResp)
|
|
|
- err := c.cc.Invoke(ctx, "/messagecenter.messageCenter/WithdrawMessage", in, out, opts...)
|
|
|
->>>>>>> master
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
return out, nil
|
|
|
}
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
func (c *messageCenterClient) ChatGroupAdd(ctx context.Context, in *ChatGroupAddReq, opts ...grpc.CallOption) (*CommonReq, error) {
|
|
|
out := new(CommonReq)
|
|
|
err := c.cc.Invoke(ctx, "/messagecenter.messageCenter/ChatGroupAdd", in, out, opts...)
|
|
|
-=======
|
|
|
-func (c *messageCenterClient) AppraiseMessage(ctx context.Context, in *AppraiseReq, opts ...grpc.CallOption) (*CurrencyResp, error) {
|
|
|
- out := new(CurrencyResp)
|
|
|
- err := c.cc.Invoke(ctx, "/messagecenter.messageCenter/AppraiseMessage", in, out, opts...)
|
|
|
->>>>>>> master
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
return out, nil
|
|
|
}
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
func (c *messageCenterClient) ChatGroupPerson(ctx context.Context, in *ChatGroupPersonReq, opts ...grpc.CallOption) (*ChatGroupPersonResp, error) {
|
|
|
out := new(ChatGroupPersonResp)
|
|
|
err := c.cc.Invoke(ctx, "/messagecenter.messageCenter/ChatGroupPerson", in, out, opts...)
|
|
@@ -235,11 +219,33 @@ func (c *messageCenterClient) GroupNoticeGet(ctx context.Context, in *ChatGroupP
|
|
|
func (c *messageCenterClient) EntPersonsList(ctx context.Context, in *EntPersonsListReq, opts ...grpc.CallOption) (*EntPersonListResp, error) {
|
|
|
out := new(EntPersonListResp)
|
|
|
err := c.cc.Invoke(ctx, "/messagecenter.messageCenter/EntPersonsList", in, out, opts...)
|
|
|
-=======
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ return out, nil
|
|
|
+}
|
|
|
+
|
|
|
+func (c *messageCenterClient) WithdrawMessage(ctx context.Context, in *ReadWithdrawReq, opts ...grpc.CallOption) (*CurrencyResp, error) {
|
|
|
+ out := new(CurrencyResp)
|
|
|
+ err := c.cc.Invoke(ctx, "/messagecenter.messageCenter/WithdrawMessage", in, out, opts...)
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ return out, nil
|
|
|
+}
|
|
|
+
|
|
|
+func (c *messageCenterClient) AppraiseMessage(ctx context.Context, in *AppraiseReq, opts ...grpc.CallOption) (*CurrencyResp, error) {
|
|
|
+ out := new(CurrencyResp)
|
|
|
+ err := c.cc.Invoke(ctx, "/messagecenter.messageCenter/AppraiseMessage", in, out, opts...)
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ return out, nil
|
|
|
+}
|
|
|
+
|
|
|
func (c *messageCenterClient) ConversationList(ctx context.Context, in *ConversationReq, opts ...grpc.CallOption) (*UserResp, error) {
|
|
|
out := new(UserResp)
|
|
|
err := c.cc.Invoke(ctx, "/messagecenter.messageCenter/ConversationList", in, out, opts...)
|
|
|
->>>>>>> master
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
@@ -266,33 +272,30 @@ type MessageCenterServer interface {
|
|
|
SaveAutoReplyMsg(context.Context, *SaveAutoReplyReq) (*MessageResp, error)
|
|
|
// 根据消息修改已读状态
|
|
|
UpdateReadById(context.Context, *ReadStateReq) (*CurrencyResp, error)
|
|
|
-<<<<<<< HEAD
|
|
|
- //群组列表查询
|
|
|
+ // 群组列表查询
|
|
|
ChatGroupList(context.Context, *ChatGroupListReq) (*ChatGroupListResp, error)
|
|
|
- //群组新增
|
|
|
+ // 群组新增
|
|
|
ChatGroupAdd(context.Context, *ChatGroupAddReq) (*CommonReq, error)
|
|
|
- //群组成员查询
|
|
|
+ // 群组成员查询
|
|
|
ChatGroupPerson(context.Context, *ChatGroupPersonReq) (*ChatGroupPersonResp, error)
|
|
|
- //加入群组
|
|
|
+ // 加入群组
|
|
|
ChatGroupJoin(context.Context, *ChatGroupJoinReq) (*CommonReq, error)
|
|
|
- //群组名称修改
|
|
|
+ // 群组名称修改
|
|
|
GroupNameUpdate(context.Context, *GroupNameUpdateReq) (*CommonReq, error)
|
|
|
- //群任务新增
|
|
|
+ // 群任务新增
|
|
|
GroupNoticeAdd(context.Context, *GroupNoticeAddReq) (*CommonReq, error)
|
|
|
- //群任务编辑
|
|
|
+ // 群任务编辑
|
|
|
GroupNoticeUpdate(context.Context, *GroupNoticeUpdateReq) (*CommonReq, error)
|
|
|
- //群任务详情
|
|
|
+ // 群任务详情
|
|
|
GroupNoticeGet(context.Context, *ChatGroupPersonReq) (*GroupNoticeGetResp, error)
|
|
|
- //通讯录 -企业人员列表
|
|
|
+ // 通讯录 -企业人员列表
|
|
|
EntPersonsList(context.Context, *EntPersonsListReq) (*EntPersonListResp, error)
|
|
|
-=======
|
|
|
// 用户撤回消息
|
|
|
WithdrawMessage(context.Context, *ReadWithdrawReq) (*CurrencyResp, error)
|
|
|
// 用户评价回复
|
|
|
AppraiseMessage(context.Context, *AppraiseReq) (*CurrencyResp, error)
|
|
|
// 客服列表查询
|
|
|
ConversationList(context.Context, *ConversationReq) (*UserResp, error)
|
|
|
->>>>>>> master
|
|
|
mustEmbedUnimplementedMessageCenterServer()
|
|
|
}
|
|
|
|
|
@@ -324,7 +327,6 @@ func (UnimplementedMessageCenterServer) SaveAutoReplyMsg(context.Context, *SaveA
|
|
|
func (UnimplementedMessageCenterServer) UpdateReadById(context.Context, *ReadStateReq) (*CurrencyResp, error) {
|
|
|
return nil, status.Errorf(codes.Unimplemented, "method UpdateReadById not implemented")
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
func (UnimplementedMessageCenterServer) ChatGroupList(context.Context, *ChatGroupListReq) (*ChatGroupListResp, error) {
|
|
|
return nil, status.Errorf(codes.Unimplemented, "method ChatGroupList not implemented")
|
|
|
}
|
|
@@ -351,7 +353,7 @@ func (UnimplementedMessageCenterServer) GroupNoticeGet(context.Context, *ChatGro
|
|
|
}
|
|
|
func (UnimplementedMessageCenterServer) EntPersonsList(context.Context, *EntPersonsListReq) (*EntPersonListResp, error) {
|
|
|
return nil, status.Errorf(codes.Unimplemented, "method EntPersonsList not implemented")
|
|
|
-=======
|
|
|
+}
|
|
|
func (UnimplementedMessageCenterServer) WithdrawMessage(context.Context, *ReadWithdrawReq) (*CurrencyResp, error) {
|
|
|
return nil, status.Errorf(codes.Unimplemented, "method WithdrawMessage not implemented")
|
|
|
}
|
|
@@ -360,7 +362,6 @@ func (UnimplementedMessageCenterServer) AppraiseMessage(context.Context, *Apprai
|
|
|
}
|
|
|
func (UnimplementedMessageCenterServer) ConversationList(context.Context, *ConversationReq) (*UserResp, error) {
|
|
|
return nil, status.Errorf(codes.Unimplemented, "method ConversationList not implemented")
|
|
|
->>>>>>> master
|
|
|
}
|
|
|
func (UnimplementedMessageCenterServer) mustEmbedUnimplementedMessageCenterServer() {}
|
|
|
|
|
@@ -519,18 +520,12 @@ func _MessageCenter_UpdateReadById_Handler(srv interface{}, ctx context.Context,
|
|
|
return interceptor(ctx, in, info, handler)
|
|
|
}
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
func _MessageCenter_ChatGroupList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
|
|
in := new(ChatGroupListReq)
|
|
|
-=======
|
|
|
-func _MessageCenter_WithdrawMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
|
|
- in := new(ReadWithdrawReq)
|
|
|
->>>>>>> master
|
|
|
if err := dec(in); err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
if interceptor == nil {
|
|
|
-<<<<<<< HEAD
|
|
|
return srv.(MessageCenterServer).ChatGroupList(ctx, in)
|
|
|
}
|
|
|
info := &grpc.UnaryServerInfo{
|
|
@@ -539,32 +534,16 @@ func _MessageCenter_WithdrawMessage_Handler(srv interface{}, ctx context.Context
|
|
|
}
|
|
|
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
|
|
return srv.(MessageCenterServer).ChatGroupList(ctx, req.(*ChatGroupListReq))
|
|
|
-=======
|
|
|
- return srv.(MessageCenterServer).WithdrawMessage(ctx, in)
|
|
|
- }
|
|
|
- info := &grpc.UnaryServerInfo{
|
|
|
- Server: srv,
|
|
|
- FullMethod: "/messagecenter.messageCenter/WithdrawMessage",
|
|
|
- }
|
|
|
- handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
|
|
- return srv.(MessageCenterServer).WithdrawMessage(ctx, req.(*ReadWithdrawReq))
|
|
|
->>>>>>> master
|
|
|
}
|
|
|
return interceptor(ctx, in, info, handler)
|
|
|
}
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
func _MessageCenter_ChatGroupAdd_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
|
|
in := new(ChatGroupAddReq)
|
|
|
-=======
|
|
|
-func _MessageCenter_AppraiseMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
|
|
- in := new(AppraiseReq)
|
|
|
->>>>>>> master
|
|
|
if err := dec(in); err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
if interceptor == nil {
|
|
|
-<<<<<<< HEAD
|
|
|
return srv.(MessageCenterServer).ChatGroupAdd(ctx, in)
|
|
|
}
|
|
|
info := &grpc.UnaryServerInfo{
|
|
@@ -573,32 +552,16 @@ func _MessageCenter_AppraiseMessage_Handler(srv interface{}, ctx context.Context
|
|
|
}
|
|
|
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
|
|
return srv.(MessageCenterServer).ChatGroupAdd(ctx, req.(*ChatGroupAddReq))
|
|
|
-=======
|
|
|
- return srv.(MessageCenterServer).AppraiseMessage(ctx, in)
|
|
|
- }
|
|
|
- info := &grpc.UnaryServerInfo{
|
|
|
- Server: srv,
|
|
|
- FullMethod: "/messagecenter.messageCenter/AppraiseMessage",
|
|
|
- }
|
|
|
- handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
|
|
- return srv.(MessageCenterServer).AppraiseMessage(ctx, req.(*AppraiseReq))
|
|
|
->>>>>>> master
|
|
|
}
|
|
|
return interceptor(ctx, in, info, handler)
|
|
|
}
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
func _MessageCenter_ChatGroupPerson_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
|
|
in := new(ChatGroupPersonReq)
|
|
|
-=======
|
|
|
-func _MessageCenter_ConversationList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
|
|
- in := new(ConversationReq)
|
|
|
->>>>>>> master
|
|
|
if err := dec(in); err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
if interceptor == nil {
|
|
|
-<<<<<<< HEAD
|
|
|
return srv.(MessageCenterServer).ChatGroupPerson(ctx, in)
|
|
|
}
|
|
|
info := &grpc.UnaryServerInfo{
|
|
@@ -715,7 +678,52 @@ func _MessageCenter_EntPersonsList_Handler(srv interface{}, ctx context.Context,
|
|
|
}
|
|
|
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
|
|
return srv.(MessageCenterServer).EntPersonsList(ctx, req.(*EntPersonsListReq))
|
|
|
-=======
|
|
|
+ }
|
|
|
+ return interceptor(ctx, in, info, handler)
|
|
|
+}
|
|
|
+
|
|
|
+func _MessageCenter_WithdrawMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
|
|
+ in := new(ReadWithdrawReq)
|
|
|
+ if err := dec(in); err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ if interceptor == nil {
|
|
|
+ return srv.(MessageCenterServer).WithdrawMessage(ctx, in)
|
|
|
+ }
|
|
|
+ info := &grpc.UnaryServerInfo{
|
|
|
+ Server: srv,
|
|
|
+ FullMethod: "/messagecenter.messageCenter/WithdrawMessage",
|
|
|
+ }
|
|
|
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
|
|
+ return srv.(MessageCenterServer).WithdrawMessage(ctx, req.(*ReadWithdrawReq))
|
|
|
+ }
|
|
|
+ return interceptor(ctx, in, info, handler)
|
|
|
+}
|
|
|
+
|
|
|
+func _MessageCenter_AppraiseMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
|
|
+ in := new(AppraiseReq)
|
|
|
+ if err := dec(in); err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ if interceptor == nil {
|
|
|
+ return srv.(MessageCenterServer).AppraiseMessage(ctx, in)
|
|
|
+ }
|
|
|
+ info := &grpc.UnaryServerInfo{
|
|
|
+ Server: srv,
|
|
|
+ FullMethod: "/messagecenter.messageCenter/AppraiseMessage",
|
|
|
+ }
|
|
|
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
|
|
+ return srv.(MessageCenterServer).AppraiseMessage(ctx, req.(*AppraiseReq))
|
|
|
+ }
|
|
|
+ return interceptor(ctx, in, info, handler)
|
|
|
+}
|
|
|
+
|
|
|
+func _MessageCenter_ConversationList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
|
|
+ in := new(ConversationReq)
|
|
|
+ if err := dec(in); err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ if interceptor == nil {
|
|
|
return srv.(MessageCenterServer).ConversationList(ctx, in)
|
|
|
}
|
|
|
info := &grpc.UnaryServerInfo{
|
|
@@ -724,7 +732,6 @@ func _MessageCenter_EntPersonsList_Handler(srv interface{}, ctx context.Context,
|
|
|
}
|
|
|
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
|
|
return srv.(MessageCenterServer).ConversationList(ctx, req.(*ConversationReq))
|
|
|
->>>>>>> master
|
|
|
}
|
|
|
return interceptor(ctx, in, info, handler)
|
|
|
}
|
|
@@ -769,7 +776,6 @@ var MessageCenter_ServiceDesc = grpc.ServiceDesc{
|
|
|
Handler: _MessageCenter_UpdateReadById_Handler,
|
|
|
},
|
|
|
{
|
|
|
-<<<<<<< HEAD
|
|
|
MethodName: "ChatGroupList",
|
|
|
Handler: _MessageCenter_ChatGroupList_Handler,
|
|
|
},
|
|
@@ -804,7 +810,8 @@ var MessageCenter_ServiceDesc = grpc.ServiceDesc{
|
|
|
{
|
|
|
MethodName: "EntPersonsList",
|
|
|
Handler: _MessageCenter_EntPersonsList_Handler,
|
|
|
-=======
|
|
|
+ },
|
|
|
+ {
|
|
|
MethodName: "WithdrawMessage",
|
|
|
Handler: _MessageCenter_WithdrawMessage_Handler,
|
|
|
},
|
|
@@ -815,7 +822,6 @@ var MessageCenter_ServiceDesc = grpc.ServiceDesc{
|
|
|
{
|
|
|
MethodName: "ConversationList",
|
|
|
Handler: _MessageCenter_ConversationList_Handler,
|
|
|
->>>>>>> master
|
|
|
},
|
|
|
},
|
|
|
Streams: []grpc.StreamDesc{},
|