合并代码

rpc/internal/server/messageserver.go

@@ -4,16 +4,16 @@
 package server
 
 import (
-	message2 "app.yhyue.com/moapp/MessageCenter/rpc/type/message"
 	"context"
 
 	"app.yhyue.com/moapp/MessageCenter/rpc/internal/logic"
 	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
+	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
 )
 
 type MessageServer struct {
 	svcCtx *svc.ServiceContext
-	message2.UnimplementedMessageServer
+	message.UnimplementedMessageServer
 }
 
 func NewMessageServer(svcCtx *svc.ServiceContext) *MessageServer {
@@ -23,91 +23,85 @@ func NewMessageServer(svcCtx *svc.ServiceContext) *MessageServer {
 }
 
 // 批量保存消息
-func (s *MessageServer) MultipleSaveMsg(ctx context.Context, in *message2.MultipleSaveMsgReq) (*message2.MultipleSaveMsgResp, error) {
+func (s *MessageServer) MultipleSaveMsg(ctx context.Context, in *message.MultipleSaveMsgReq) (*message.MultipleSaveMsgResp, error) {
 	l := logic.NewMultipleSaveMsgLogic(ctx, s.svcCtx)
 	return l.MultipleSaveMsg(in)
 }
 
 //  修改消息阅读状态
-func (s *MessageServer) ChangeReadStatus(ctx context.Context, in *message2.ChangeReadStatusReq) (*message2.Response, error) {
+func (s *MessageServer) ChangeReadStatus(ctx context.Context, in *message.ChangeReadStatusReq) (*message.Response, error) {
 	l := logic.NewChangeReadStatusLogic(ctx, s.svcCtx)
 	return l.ChangeReadStatus(in)
 }
 
-// 指定用户发消息
-func (s *MessageServer) SendUserMsg(ctx context.Context, in *message2.SendMsgRequest) (*message2.Response, error) {
-	l := logic.NewSendUserMsgLogic(ctx, s.svcCtx)
-	return l.SendUserMsg(in)
-}
-
 //   查询指定用户未读消息合计
-func (s *MessageServer) GetUnreadCount(ctx context.Context, in *message2.GetUnreadCountRequest) (*message2.GetUnreadCountResponse, error) {
+func (s *MessageServer) GetUnreadCount(ctx context.Context, in *message.GetUnreadCountRequest) (*message.GetUnreadCountResponse, error) {
 	l := logic.NewGetUnreadCountLogic(ctx, s.svcCtx)
 	return l.GetUnreadCount(in)
 }
 
 //   查询指定用户的历史消息记录
-func (s *MessageServer) FindUserMsg(ctx context.Context, in *message2.FindUserMsgReq) (*message2.FindUserMsgRes, error) {
+func (s *MessageServer) FindUserMsg(ctx context.Context, in *message.FindUserMsgReq) (*message.FindUserMsgRes, error) {
 	l := logic.NewFindUserMsgLogic(ctx, s.svcCtx)
 	return l.FindUserMsg(in)
 }
 
 //   查询指定用户指定分类的未读消息合计
-func (s *MessageServer) GetClassUnreadCount(ctx context.Context, in *message2.GetClassUnreadCountReq) (*message2.GetUnreadCountResponse, error) {
+func (s *MessageServer) GetClassUnreadCount(ctx context.Context, in *message.GetClassUnreadCountReq) (*message.GetUnreadCountResponse, error) {
 	l := logic.NewGetClassUnreadCountLogic(ctx, s.svcCtx)
 	return l.GetClassUnreadCount(in)
 }
 
 //   获取指定用户指定分类的最新一条消息
-func (s *MessageServer) GetLastMessage(ctx context.Context, in *message2.GetLastMessageReq) (*message2.GetLastMessageRes, error) {
+func (s *MessageServer) GetLastMessage(ctx context.Context, in *message.GetLastMessageReq) (*message.GetLastMessageRes, error) {
 	l := logic.NewGetLastMessageLogic(ctx, s.svcCtx)
 	return l.GetLastMessage(in)
 }
 
 // 查看详细详情
-func (s *MessageServer) FindMessageDetail(ctx context.Context, in *message2.MessageDetailReq) (*message2.MessageDetailResp, error) {
+func (s *MessageServer) FindMessageDetail(ctx context.Context, in *message.MessageDetailReq) (*message.MessageDetailResp, error) {
 	l := logic.NewFindMessageDetailLogic(ctx, s.svcCtx)
 	return l.FindMessageDetail(in)
 }
 
 //   获取指定用户的分类及未读消息数量
-func (s *MessageServer) GetUnreadClassCount(ctx context.Context, in *message2.GetUnreadClassCountReq) (*message2.GetUnreadClassCountRes, error) {
+func (s *MessageServer) GetUnreadClassCount(ctx context.Context, in *message.GetUnreadClassCountReq) (*message.GetUnreadClassCountRes, error) {
 	l := logic.NewGetUnreadClassCountLogic(ctx, s.svcCtx)
 	return l.GetUnreadClassCount(in)
 }
 
 //   获取指定用户收到消息的分类
-func (s *MessageServer) GetMsgType(ctx context.Context, in *message2.GetMsgTypeReq) (*message2.GetMsgTypeRes, error) {
+func (s *MessageServer) GetMsgType(ctx context.Context, in *message.GetMsgTypeReq) (*message.GetMsgTypeRes, error) {
 	l := logic.NewGetMsgTypeLogic(ctx, s.svcCtx)
 	return l.GetMsgType(in)
 }
 
 //   查询指定用户的浮标消息
-func (s *MessageServer) FindUserBuoyMsg(ctx context.Context, in *message2.FindUserBuoyMsgReq) (*message2.FindUserBuoyMsgRes, error) {
+func (s *MessageServer) FindUserBuoyMsg(ctx context.Context, in *message.FindUserBuoyMsgReq) (*message.FindUserBuoyMsgRes, error) {
 	l := logic.NewFindUserBuoyMsgLogic(ctx, s.svcCtx)
 	return l.FindUserBuoyMsg(in)
 }
 
 //    一键清空未读消息
-func (s *MessageServer) ClearUnreadMsg(ctx context.Context, in *message2.ClearUnreadMsgReq) (*message2.Response, error) {
+func (s *MessageServer) ClearUnreadMsg(ctx context.Context, in *message.ClearUnreadMsgReq) (*message.Response, error) {
 	l := logic.NewClearUnreadMsgLogic(ctx, s.svcCtx)
 	return l.ClearUnreadMsg(in)
 }
 
 //    new用户消息列表
-func (s *MessageServer) UserMsgList(ctx context.Context, in *message2.UserMsgListReq) (*message2.UserMsgListRes, error) {
+func (s *MessageServer) UserMsgList(ctx context.Context, in *message.UserMsgListReq) (*message.UserMsgListRes, error) {
 	l := logic.NewUserMsgListLogic(ctx, s.svcCtx)
 	return l.UserMsgList(in)
 }
 
 //   发送微信模版消息
-func (s *MessageServer) SendWxTmplMsg(ctx context.Context, in *message2.WxTmplMsg) (*message2.Response, error) {
+func (s *MessageServer) SendWxTmplMsg(ctx context.Context, in *message.WxTmplMsg) (*message.Response, error) {
 	l := logic.NewSendWxTmplMsgLogic(ctx, s.svcCtx)
 	return l.SendWxTmplMsg(in)
 }
 
 //    官网、移动端首页、工作桌面消息滚动
-func (s *MessageServer) UserUnreadMsgList(ctx context.Context, in *message2.UserUnreadMsgListReq) (*message2.UserUnreadMsgListRes, error) {
+func (s *MessageServer) UserUnreadMsgList(ctx context.Context, in *message.UserUnreadMsgListReq) (*message.UserUnreadMsgListRes, error) {
 	l := logic.NewUserUnreadMsgListLogic(ctx, s.svcCtx)
 	return l.UserUnreadMsgList(in)
 }

rpc/messageclient/message.go

@@ -37,7 +37,6 @@ type (
 	MultipleSaveMsgResp    = message.MultipleSaveMsgResp
 	ResCount               = message.ResCount
 	Response               = message.Response
-	SendMsgRequest         = message.SendMsgRequest
 	User                   = message.User
 	UserMsgList            = message.UserMsgList
 	UserMsgListReq         = message.UserMsgListReq
@@ -46,46 +45,12 @@ type (
 	UserUnreadMsgListRes   = message.UserUnreadMsgListRes
 	WxTmplMsg              = message.WxTmplMsg
 	WxTmplResponse         = message.WxTmplResponse
-	AllSortData            = message2.AllSortData
-	BuoyMessages           = message2.BuoyMessages
-	ChangeReadStatusReq    = message2.ChangeReadStatusReq
-	ClearUnreadMsgReq      = message2.ClearUnreadMsgReq
-	FindUserBuoyMsgReq     = message2.FindUserBuoyMsgReq
-	FindUserBuoyMsgRes     = message2.FindUserBuoyMsgRes
-	FindUserMsgReq         = message2.FindUserMsgReq
-	FindUserMsgRes         = message2.FindUserMsgRes
-	GetClassUnreadCountReq = message2.GetClassUnreadCountReq
-	GetLastMessageReq      = message2.GetLastMessageReq
-	GetLastMessageRes      = message2.GetLastMessageRes
-	GetMsgTypeReq          = message2.GetMsgTypeReq
-	GetMsgTypeRes          = message2.GetMsgTypeRes
-	GetUnreadClassCountReq = message2.GetUnreadClassCountReq
-	GetUnreadClassCountRes = message2.GetUnreadClassCountRes
-	GetUnreadCountRequest  = message2.GetUnreadCountRequest
-	GetUnreadCountResponse = message2.GetUnreadCountResponse
-	MessageDetailReq       = message2.MessageDetailReq
-	MessageDetailResp      = message2.MessageDetailResp
-	Messages               = message2.Messages
-	MultipleSaveMsgReq     = message2.MultipleSaveMsgReq
-	MultipleSaveMsgResp    = message2.MultipleSaveMsgResp
-	ResCount               = message2.ResCount
-	Response               = message2.Response
-	User                   = message2.User
-	UserMsgList            = message2.UserMsgList
-	UserMsgListReq         = message2.UserMsgListReq
-	UserMsgListRes         = message2.UserMsgListRes
-	UserUnreadMsgListReq   = message2.UserUnreadMsgListReq
-	UserUnreadMsgListRes   = message2.UserUnreadMsgListRes
-	WxTmplMsg              = message2.WxTmplMsg
-	WxTmplResponse         = message2.WxTmplResponse
 
 	Message interface {
 		// 批量保存消息
 		MultipleSaveMsg(ctx context.Context, in *MultipleSaveMsgReq, opts ...grpc.CallOption) (*MultipleSaveMsgResp, error)
 		//  修改消息阅读状态
 		ChangeReadStatus(ctx context.Context, in *ChangeReadStatusReq, opts ...grpc.CallOption) (*Response, error)
-		// 指定用户发消息
-		SendUserMsg(ctx context.Context, in *SendMsgRequest, opts ...grpc.CallOption) (*Response, error)
 		//   查询指定用户未读消息合计
 		GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
 		//   查询指定用户的历史消息记录
@@ -125,90 +90,84 @@ func NewMessage(cli zrpc.Client) Message {
 
 // 批量保存消息
 func (m *defaultMessage) MultipleSaveMsg(ctx context.Context, in *MultipleSaveMsgReq, opts ...grpc.CallOption) (*MultipleSaveMsgResp, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
+	client := message.NewMessageClient(m.cli.Conn())
 	return client.MultipleSaveMsg(ctx, in, opts...)
 }
 
 //  修改消息阅读状态
 func (m *defaultMessage) ChangeReadStatus(ctx context.Context, in *ChangeReadStatusReq, opts ...grpc.CallOption) (*Response, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
+	client := message.NewMessageClient(m.cli.Conn())
 	return client.ChangeReadStatus(ctx, in, opts...)
 }
 
-// 指定用户发消息
-func (m *defaultMessage) SendUserMsg(ctx context.Context, in *SendMsgRequest, opts ...grpc.CallOption) (*Response, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
-	return client.SendUserMsg(ctx, in, opts...)
-}
-
 //   查询指定用户未读消息合计
 func (m *defaultMessage) GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
+	client := message.NewMessageClient(m.cli.Conn())
 	return client.GetUnreadCount(ctx, in, opts...)
 }
 
 //   查询指定用户的历史消息记录
 func (m *defaultMessage) FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
+	client := message.NewMessageClient(m.cli.Conn())
 	return client.FindUserMsg(ctx, in, opts...)
 }
 
 //   查询指定用户指定分类的未读消息合计
 func (m *defaultMessage) GetClassUnreadCount(ctx context.Context, in *GetClassUnreadCountReq, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
+	client := message.NewMessageClient(m.cli.Conn())
 	return client.GetClassUnreadCount(ctx, in, opts...)
 }
 
 //   获取指定用户指定分类的最新一条消息
 func (m *defaultMessage) GetLastMessage(ctx context.Context, in *GetLastMessageReq, opts ...grpc.CallOption) (*GetLastMessageRes, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
+	client := message.NewMessageClient(m.cli.Conn())
 	return client.GetLastMessage(ctx, in, opts...)
 }
 
 // 查看详细详情
 func (m *defaultMessage) FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
+	client := message.NewMessageClient(m.cli.Conn())
 	return client.FindMessageDetail(ctx, in, opts...)
 }
 
 //   获取指定用户的分类及未读消息数量
 func (m *defaultMessage) GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq, opts ...grpc.CallOption) (*GetUnreadClassCountRes, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
+	client := message.NewMessageClient(m.cli.Conn())
 	return client.GetUnreadClassCount(ctx, in, opts...)
 }
 
 //   获取指定用户收到消息的分类
 func (m *defaultMessage) GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
+	client := message.NewMessageClient(m.cli.Conn())
 	return client.GetMsgType(ctx, in, opts...)
 }
 
 //   查询指定用户的浮标消息
 func (m *defaultMessage) FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
+	client := message.NewMessageClient(m.cli.Conn())
 	return client.FindUserBuoyMsg(ctx, in, opts...)
 }
 
 //    一键清空未读消息
 func (m *defaultMessage) ClearUnreadMsg(ctx context.Context, in *ClearUnreadMsgReq, opts ...grpc.CallOption) (*Response, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
+	client := message.NewMessageClient(m.cli.Conn())
 	return client.ClearUnreadMsg(ctx, in, opts...)
 }
 
 //    new用户消息列表
 func (m *defaultMessage) UserMsgList(ctx context.Context, in *UserMsgListReq, opts ...grpc.CallOption) (*UserMsgListRes, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
+	client := message.NewMessageClient(m.cli.Conn())
 	return client.UserMsgList(ctx, in, opts...)
 }
 
 //   发送微信模版消息
 func (m *defaultMessage) SendWxTmplMsg(ctx context.Context, in *WxTmplMsg, opts ...grpc.CallOption) (*Response, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
+	client := message.NewMessageClient(m.cli.Conn())
 	return client.SendWxTmplMsg(ctx, in, opts...)
 }
 
 //    官网、移动端首页、工作桌面消息滚动
 func (m *defaultMessage) UserUnreadMsgList(ctx context.Context, in *UserUnreadMsgListReq, opts ...grpc.CallOption) (*UserUnreadMsgListRes, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
+	client := message.NewMessageClient(m.cli.Conn())
 	return client.UserUnreadMsgList(ctx, in, opts...)
 }

rpc/type/message/message_grpc.pb.go

@@ -26,8 +26,6 @@ type MessageClient interface {
 	MultipleSaveMsg(ctx context.Context, in *MultipleSaveMsgReq, opts ...grpc.CallOption) (*MultipleSaveMsgResp, error)
 	// 修改消息阅读状态
 	ChangeReadStatus(ctx context.Context, in *ChangeReadStatusReq, opts ...grpc.CallOption) (*Response, error)
-	//指定用户发消息
-	SendUserMsg(ctx context.Context, in *SendMsgRequest, opts ...grpc.CallOption) (*Response, error)
 	//  查询指定用户未读消息合计
 	GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
 	//  查询指定用户的历史消息记录
@@ -80,15 +78,6 @@ func (c *messageClient) ChangeReadStatus(ctx context.Context, in *ChangeReadStat
 	return out, nil
 }
 
-func (c *messageClient) SendUserMsg(ctx context.Context, in *SendMsgRequest, opts ...grpc.CallOption) (*Response, error) {
-	out := new(Response)
-	err := c.cc.Invoke(ctx, "/message.Message/SendUserMsg", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *messageClient) GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
 	out := new(GetUnreadCountResponse)
 	err := c.cc.Invoke(ctx, "/message.Message/GetUnreadCount", in, out, opts...)
@@ -205,8 +194,6 @@ type MessageServer interface {
 	MultipleSaveMsg(context.Context, *MultipleSaveMsgReq) (*MultipleSaveMsgResp, error)
 	// 修改消息阅读状态
 	ChangeReadStatus(context.Context, *ChangeReadStatusReq) (*Response, error)
-	//指定用户发消息
-	SendUserMsg(context.Context, *SendMsgRequest) (*Response, error)
 	//  查询指定用户未读消息合计
 	GetUnreadCount(context.Context, *GetUnreadCountRequest) (*GetUnreadCountResponse, error)
 	//  查询指定用户的历史消息记录
@@ -244,9 +231,6 @@ func (UnimplementedMessageServer) MultipleSaveMsg(context.Context, *MultipleSave
 func (UnimplementedMessageServer) ChangeReadStatus(context.Context, *ChangeReadStatusReq) (*Response, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ChangeReadStatus not implemented")
 }
-func (UnimplementedMessageServer) SendUserMsg(context.Context, *SendMsgRequest) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SendUserMsg not implemented")
-}
 func (UnimplementedMessageServer) GetUnreadCount(context.Context, *GetUnreadCountRequest) (*GetUnreadCountResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUnreadCount not implemented")
 }
@@ -332,24 +316,6 @@ func _Message_ChangeReadStatus_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Message_SendUserMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SendMsgRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).SendUserMsg(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/message.Message/SendUserMsg",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).SendUserMsg(ctx, req.(*SendMsgRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Message_GetUnreadCount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetUnreadCountRequest)
 	if err := dec(in); err != nil {
@@ -581,10 +547,6 @@ var Message_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "ChangeReadStatus",
 			Handler:    _Message_ChangeReadStatus_Handler,
 		},
-		{
-			MethodName: "SendUserMsg",
-			Handler:    _Message_SendUserMsg_Handler,
-		},
 		{
 			MethodName: "GetUnreadCount",
 			Handler:    _Message_GetUnreadCount_Handler,