删除没有用的接口

api/internal/handler/routes.go

@@ -57,11 +57,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/messageCenter/MessageList",
 				Handler: MessageListHandler(serverCtx),
 			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/messageCenter/unreadMessages",
-				Handler: UnreadMessagesHandler(serverCtx),
-			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/messageCenter/sendWxTmplMsg",

api/internal/handler/unreadmessageshandler.go

@@ -1,28 +0,0 @@
-package handler
-
-import (
-	"net/http"
-
-	"app.yhyue.com/moapp/MessageCenter/api/internal/logic"
-	"app.yhyue.com/moapp/MessageCenter/api/internal/svc"
-	"app.yhyue.com/moapp/MessageCenter/api/internal/types"
-	"github.com/zeromicro/go-zero/rest/httpx"
-)
-
-func UnreadMessagesHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.UnreadMessageReq
-		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
-			return
-		}
-
-		l := logic.NewUnreadMessagesLogic(r.Context(), svcCtx)
-		resp, err := l.UnreadMessages(&req)
-		if err != nil {
-			httpx.Error(w, err)
-		} else {
-			httpx.OkJson(w, resp)
-		}
-	}
-}

api/internal/types/types.go

@@ -115,21 +115,6 @@ type MessageListResp struct {
 	RollingTiming int64                    `json:"rollingTiming"`
 }
 
-type UnreadMessageReq struct {
-	UserId     string `header:"mgoUserId"`
-	AppId      string `header:"appId"`
-	Offset     int64  `json:"offset"` //
-	PageSize   int64  `json:"pageSize"`
-	IsNeedData int64  `json:"isNeedData"` //是否需要未读消息数据 0 不需要  1 需要
-}
-
-type UnreadMessageResp struct {
-	Code    int64                    `json:"code"`
-	Message string                   `json:"message"`
-	Data    []map[string]interface{} `json:"data"`
-	Total   int64                    `json:"total"`
-}
-
 type WxTmplMessageReq struct {
 	UserIds     string `json:"userIds,optional"`     // 用户id如果是多个就逗号分割
 	PositionIds string `json:"positionIds,optional"` //用户职位id

api/message.api

@@ -118,19 +118,19 @@ type MessageListResp {
 	Unread        int64                    `json:"unread"`
 	RollingTiming int64                    `json:"rollingTiming"`
 }
-type UnreadMessageReq {
-	UserId     string `header:"mgoUserId"`
-	AppId      string `header:"appId"`
-	Offset     int64  `json:"offset"` //
-	PageSize   int64  `json:"pageSize"`
-	IsNeedData int64  `json:"isNeedData"` //是否需要未读消息数据 0 不需要  1 需要
-}
-type UnreadMessageResp {
-	Code    int64                    `json:"code"`
-	Message string                   `json:"message"`
-	Data    []map[string]interface{} `json:"data"`
-	Total   int64                    `json:"total"`
-}
+//type UnreadMessageReq {
+//	UserId     string `header:"mgoUserId"`
+//	AppId      string `header:"appId"`
+//	Offset     int64  `json:"offset"` //
+//	PageSize   int64  `json:"pageSize"`
+//	IsNeedData int64  `json:"isNeedData"` //是否需要未读消息数据 0 不需要  1 需要
+//}
+//type UnreadMessageResp {
+//	Code    int64                    `json:"code"`
+//	Message string                   `json:"message"`
+//	Data    []map[string]interface{} `json:"data"`
+//	Total   int64                    `json:"total"`
+//}
 
 type WxTmplMessageReq {
 	UserIds     string `json:"userIds,optional"`     // 用户id如果是多个就逗号分割
@@ -211,8 +211,8 @@ service message-api {
 	post /messageCenter/MessageList (MessageListReq) returns (MessageListResp)
 	
 	//未读消息列表
-	@handler UnreadMessages
-	post /messageCenter/unreadMessages (UnreadMessageReq) returns (UnreadMessageResp)
+	//	@handler UnreadMessages
+	//	post /messageCenter/unreadMessages (UnreadMessageReq) returns (UnreadMessageResp)
 	
 	// 发送微信模版消息
 	@handler SendWxTmplMsg

rpc/internal/server/messageserver.go

@@ -65,12 +65,6 @@ func (s *MessageServer) FindMessageDetail(ctx context.Context, in *message.Messa
 }
 
 //   消息的分类
-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 *message.FindUserBuoyMsgReq) (*message.FindUserBuoyMsgRes, error) {
 	l := logic.NewFindUserBuoyMsgLogic(ctx, s.svcCtx)
 	return l.FindUserBuoyMsg(in)
@@ -95,12 +89,6 @@ func (s *MessageServer) SendWxTmplMsg(ctx context.Context, in *message.WxTmplMsg
 }
 
 //    官网、移动端首页、工作桌面消息滚动
-func (s *MessageServer) UserUnreadMsgList(ctx context.Context, in *message.UserUnreadMsgListReq) (*message.UserUnreadMsgListRes, error) {
-	l := logic.NewUserUnreadMsgListLogic(ctx, s.svcCtx)
-	return l.UserUnreadMsgList(in)
-}
-
-//  点击消息-存查看记录
 func (s *MessageServer) MsgOpenLog(ctx context.Context, in *message.MsgOpenLogReq) (*message.Response, error) {
 	l := logic.NewMsgOpenLogLogic(ctx, s.svcCtx)
 	return l.MsgOpenLog(in)

rpc/message.proto

@@ -94,10 +94,10 @@ message GetUnreadClassCountRes {
     repeated ResCount data = 3; //
     repeated Messages info = 4; // 每个类型最新消息列表
 }
-message GetMsgTypeReq {
+/*message GetMsgTypeReq {
     string userId = 1; // 用户id
     string appid = 2; //应用标识
-}
+}*/
 message MsgTypes{
     int64 msgType =1;
     string img = 2;
@@ -105,11 +105,11 @@ message MsgTypes{
     string code = 4;
     string displayPlatform = 5;
 }
-message GetMsgTypeRes {
+/*message GetMsgTypeRes {
     int64 code = 1; //状态码
     string message = 2; //响应消息
     repeated MsgTypes data = 3; //
-}
+}*/
 
 message user {
     string userId = 1;
@@ -236,20 +236,20 @@ message WxTmplResponse {
     string message = 2; //信息
 }
 
-message UserUnreadMsgListReq {
+/*message UserUnreadMsgListReq {
     string userId = 1; //用户id
     string appid = 3; //应用标识
     int64 offSet = 4; //当前
     int64 pageSize = 5; //大小
     int64 isNeedData = 6; //是否需要未读的消息数据，0 不需要  1需要
-}
+}*/
 
-message UserUnreadMsgListRes {
+/*message UserUnreadMsgListRes {
     int64 code = 1; //状态码
     string message = 2; //响应消息
     repeated Messages list = 3;
     int64 count = 4; //总数
-}
+}*/
 
 // 剑鱼系统通用模版
 message WxTmplMsgRequest {
@@ -335,7 +335,7 @@ service Message {
     //查看详细详情
     rpc FindMessageDetail (MessageDetailReq) returns (MessageDetailResp);
     //  消息的分类
-    rpc GetMsgType (GetMsgTypeReq) returns (GetMsgTypeRes);
+//    rpc GetMsgType (GetMsgTypeReq) returns (GetMsgTypeRes);
     //  查询指定用户的浮标消息
     rpc FindUserBuoyMsg (FindUserBuoyMsgReq) returns (FindUserBuoyMsgRes);
 
@@ -347,7 +347,7 @@ service Message {
     //  发送剑鱼微信模版消息
     rpc SendWxTmplMsg (WxTmplMsgRequest) returns(SendMsgResponse);
     //   官网、移动端首页、工作桌面消息滚动
-    rpc UserUnreadMsgList (UserUnreadMsgListReq) returns (UserUnreadMsgListRes);
+//    rpc UserUnreadMsgList (UserUnreadMsgListReq) returns (UserUnreadMsgListRes);
     // 点击消息-存查看记录
     rpc MsgOpenLog (MsgOpenLogReq) returns (Response);
 

rpc/messageclient/message.go

@@ -26,8 +26,6 @@ type (
 	GetClassUnreadCountReq = message.GetClassUnreadCountReq
 	GetLastMessageReq      = message.GetLastMessageReq
 	GetLastMessageRes      = message.GetLastMessageRes
-	GetMsgTypeReq          = message.GetMsgTypeReq
-	GetMsgTypeRes          = message.GetMsgTypeRes
 	GetUnreadClassCountReq = message.GetUnreadClassCountReq
 	GetUnreadClassCountRes = message.GetUnreadClassCountRes
 	MessageDetailReq       = message.MessageDetailReq
@@ -47,8 +45,6 @@ type (
 	UserMsgList            = message.UserMsgList
 	UserMsgListReq         = message.UserMsgListReq
 	UserMsgListRes         = message.UserMsgListRes
-	UserUnreadMsgListReq   = message.UserUnreadMsgListReq
-	UserUnreadMsgListRes   = message.UserUnreadMsgListRes
 	WxTmplMsgRequest       = message.WxTmplMsgRequest
 	WxTmplResponse         = message.WxTmplResponse
 
@@ -68,8 +64,6 @@ type (
 		// 查看详细详情
 		FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error)
 		//   消息的分类
-		GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error)
-		//   查询指定用户的浮标消息
 		FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error)
 		//    一键清空未读消息
 		ClearUnreadMsg(ctx context.Context, in *ClearUnreadMsgReq, opts ...grpc.CallOption) (*Response, error)
@@ -78,8 +72,6 @@ type (
 		//   发送剑鱼微信模版消息
 		SendWxTmplMsg(ctx context.Context, in *WxTmplMsgRequest, opts ...grpc.CallOption) (*SendMsgResponse, error)
 		//    官网、移动端首页、工作桌面消息滚动
-		UserUnreadMsgList(ctx context.Context, in *UserUnreadMsgListReq, opts ...grpc.CallOption) (*UserUnreadMsgListRes, error)
-		//  点击消息-存查看记录
 		MsgOpenLog(ctx context.Context, in *MsgOpenLogReq, opts ...grpc.CallOption) (*Response, error)
 		//   发送剑鱼微信模版消息
 		AppLetterPush(ctx context.Context, in *WxTmplMsgRequest, opts ...grpc.CallOption) (*SendMsgResponse, error)
@@ -139,12 +131,6 @@ func (m *defaultMessage) FindMessageDetail(ctx context.Context, in *MessageDetai
 }
 
 //   消息的分类
-func (m *defaultMessage) GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error) {
-	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 := message.NewMessageClient(m.cli.Conn())
 	return client.FindUserBuoyMsg(ctx, in, opts...)
@@ -169,12 +155,6 @@ func (m *defaultMessage) SendWxTmplMsg(ctx context.Context, in *WxTmplMsgRequest
 }
 
 //    官网、移动端首页、工作桌面消息滚动
-func (m *defaultMessage) UserUnreadMsgList(ctx context.Context, in *UserUnreadMsgListReq, opts ...grpc.CallOption) (*UserUnreadMsgListRes, error) {
-	client := message.NewMessageClient(m.cli.Conn())
-	return client.UserUnreadMsgList(ctx, in, opts...)
-}
-
-//  点击消息-存查看记录
 func (m *defaultMessage) MsgOpenLog(ctx context.Context, in *MsgOpenLogReq, opts ...grpc.CallOption) (*Response, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.MsgOpenLog(ctx, in, opts...)

rpc/type/message/message_grpc.pb.go

@@ -37,7 +37,7 @@ type MessageClient interface {
 	//查看详细详情
 	FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error)
 	//  消息的分类
-	GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error)
+	//    rpc GetMsgType (GetMsgTypeReq) returns (GetMsgTypeRes);
 	//  查询指定用户的浮标消息
 	FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error)
 	//   一键清空未读消息
@@ -47,7 +47,7 @@ type MessageClient interface {
 	//  发送剑鱼微信模版消息
 	SendWxTmplMsg(ctx context.Context, in *WxTmplMsgRequest, opts ...grpc.CallOption) (*SendMsgResponse, error)
 	//   官网、移动端首页、工作桌面消息滚动
-	UserUnreadMsgList(ctx context.Context, in *UserUnreadMsgListReq, opts ...grpc.CallOption) (*UserUnreadMsgListRes, error)
+	//    rpc UserUnreadMsgList (UserUnreadMsgListReq) returns (UserUnreadMsgListRes);
 	// 点击消息-存查看记录
 	MsgOpenLog(ctx context.Context, in *MsgOpenLogReq, opts ...grpc.CallOption) (*Response, error)
 	//  发送剑鱼微信模版消息
@@ -125,15 +125,6 @@ func (c *messageClient) FindMessageDetail(ctx context.Context, in *MessageDetail
 	return out, nil
 }
 
-func (c *messageClient) GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error) {
-	out := new(GetMsgTypeRes)
-	err := c.cc.Invoke(ctx, "/message.Message/GetMsgType", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *messageClient) FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error) {
 	out := new(FindUserBuoyMsgRes)
 	err := c.cc.Invoke(ctx, "/message.Message/FindUserBuoyMsg", in, out, opts...)
@@ -170,15 +161,6 @@ func (c *messageClient) SendWxTmplMsg(ctx context.Context, in *WxTmplMsgRequest,
 	return out, nil
 }
 
-func (c *messageClient) UserUnreadMsgList(ctx context.Context, in *UserUnreadMsgListReq, opts ...grpc.CallOption) (*UserUnreadMsgListRes, error) {
-	out := new(UserUnreadMsgListRes)
-	err := c.cc.Invoke(ctx, "/message.Message/UserUnreadMsgList", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *messageClient) MsgOpenLog(ctx context.Context, in *MsgOpenLogReq, opts ...grpc.CallOption) (*Response, error) {
 	out := new(Response)
 	err := c.cc.Invoke(ctx, "/message.Message/MsgOpenLog", in, out, opts...)
@@ -216,7 +198,7 @@ type MessageServer interface {
 	//查看详细详情
 	FindMessageDetail(context.Context, *MessageDetailReq) (*MessageDetailResp, error)
 	//  消息的分类
-	GetMsgType(context.Context, *GetMsgTypeReq) (*GetMsgTypeRes, error)
+	//    rpc GetMsgType (GetMsgTypeReq) returns (GetMsgTypeRes);
 	//  查询指定用户的浮标消息
 	FindUserBuoyMsg(context.Context, *FindUserBuoyMsgReq) (*FindUserBuoyMsgRes, error)
 	//   一键清空未读消息
@@ -226,7 +208,7 @@ type MessageServer interface {
 	//  发送剑鱼微信模版消息
 	SendWxTmplMsg(context.Context, *WxTmplMsgRequest) (*SendMsgResponse, error)
 	//   官网、移动端首页、工作桌面消息滚动
-	UserUnreadMsgList(context.Context, *UserUnreadMsgListReq) (*UserUnreadMsgListRes, error)
+	//    rpc UserUnreadMsgList (UserUnreadMsgListReq) returns (UserUnreadMsgListRes);
 	// 点击消息-存查看记录
 	MsgOpenLog(context.Context, *MsgOpenLogReq) (*Response, error)
 	//  发送剑鱼微信模版消息
@@ -259,9 +241,6 @@ func (UnimplementedMessageServer) FindUserMsg(context.Context, *FindUserMsgReq)
 func (UnimplementedMessageServer) FindMessageDetail(context.Context, *MessageDetailReq) (*MessageDetailResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindMessageDetail not implemented")
 }
-func (UnimplementedMessageServer) GetMsgType(context.Context, *GetMsgTypeReq) (*GetMsgTypeRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetMsgType not implemented")
-}
 func (UnimplementedMessageServer) FindUserBuoyMsg(context.Context, *FindUserBuoyMsgReq) (*FindUserBuoyMsgRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindUserBuoyMsg not implemented")
 }
@@ -274,9 +253,6 @@ func (UnimplementedMessageServer) UserMsgList(context.Context, *UserMsgListReq)
 func (UnimplementedMessageServer) SendWxTmplMsg(context.Context, *WxTmplMsgRequest) (*SendMsgResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendWxTmplMsg not implemented")
 }
-func (UnimplementedMessageServer) UserUnreadMsgList(context.Context, *UserUnreadMsgListReq) (*UserUnreadMsgListRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UserUnreadMsgList not implemented")
-}
 func (UnimplementedMessageServer) MsgOpenLog(context.Context, *MsgOpenLogReq) (*Response, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method MsgOpenLog not implemented")
 }
@@ -422,24 +398,6 @@ func _Message_FindMessageDetail_Handler(srv interface{}, ctx context.Context, de
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Message_GetMsgType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetMsgTypeReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).GetMsgType(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/message.Message/GetMsgType",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).GetMsgType(ctx, req.(*GetMsgTypeReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Message_FindUserBuoyMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(FindUserBuoyMsgReq)
 	if err := dec(in); err != nil {
@@ -512,24 +470,6 @@ func _Message_SendWxTmplMsg_Handler(srv interface{}, ctx context.Context, dec fu
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Message_UserUnreadMsgList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UserUnreadMsgListReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).UserUnreadMsgList(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/message.Message/UserUnreadMsgList",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).UserUnreadMsgList(ctx, req.(*UserUnreadMsgListReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Message_MsgOpenLog_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(MsgOpenLogReq)
 	if err := dec(in); err != nil {
@@ -601,10 +541,6 @@ var Message_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "FindMessageDetail",
 			Handler:    _Message_FindMessageDetail_Handler,
 		},
-		{
-			MethodName: "GetMsgType",
-			Handler:    _Message_GetMsgType_Handler,
-		},
 		{
 			MethodName: "FindUserBuoyMsg",
 			Handler:    _Message_FindUserBuoyMsg_Handler,
@@ -621,10 +557,6 @@ var Message_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "SendWxTmplMsg",
 			Handler:    _Message_SendWxTmplMsg_Handler,
 		},
-		{
-			MethodName: "UserUnreadMsgList",
-			Handler:    _Message_UserUnreadMsgList_Handler,
-		},
 		{
 			MethodName: "MsgOpenLog",
 			Handler:    _Message_MsgOpenLog_Handler,