Merge branch 'dev/v1.2.7_rjj' of moapp/MessageCenter into feature/v1.2.7

api/message.api

@@ -200,8 +200,8 @@ service message-api {
 	@handler MessageTypeHandler
 	get /messageCenter/messageType (MessageTypeReq) returns (MessageTypeRes)
 	// 修改指定用户的某个分类的消息为已读
-	@handler MessageSetReadStatusHandler
-	post /messageCenter/messageSetReadStatus (MsgReadStatusReq) returns (MsgReadStatusResp)
+//	@handler MessageSetReadStatusHandler
+//	post /messageCenter/messageSetReadStatus (MsgReadStatusReq) returns (MsgReadStatusResp)
 	// 标记为已读
 	@handler MarkReadHandler
 	post /messageCenter/markRead (MarkReadReq) returns (MarkReadRes)

rpc/internal/logic/deletemultiplemessagelogic.go

@@ -1,42 +0,0 @@
-package logic
-
-import (
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
-	"app.yhyue.com/moapp/MessageCenter/service"
-	"context"
-	"strings"
-
-	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type DeleteMultipleMessageLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewDeleteMultipleMessageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeleteMultipleMessageLogic {
-	return &DeleteMultipleMessageLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-//  删除多条消息
-func (l *DeleteMultipleMessageLogic) DeleteMultipleMessage(in *messageclient.DeleteMultipleMessageRequest) (*messageclient.Response, error) {
-	// todo: add your logic here and delete this line
-	m := &service.MessageService{}
-	var idSlice []string
-	tmpList := strings.Split(in.Id, ",")
-	for _, v := range tmpList {
-		idSlice = append(idSlice, v)
-	}
-	code, msg := m.DeleteMessage(idSlice, in.Appid)
-	return &message.Response{
-		Code:    code,
-		Message: msg,
-	}, nil
-}

rpc/internal/logic/deletesinglemessagelogic.go

@@ -1,38 +0,0 @@
-package logic
-
-import (
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	"app.yhyue.com/moapp/MessageCenter/service"
-	"context"
-
-	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type DeleteSingleMessageLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewDeleteSingleMessageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeleteSingleMessageLogic {
-	return &DeleteSingleMessageLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-//  删除单一消息
-func (l *DeleteSingleMessageLogic) DeleteSingleMessage(in *messageclient.DeleteSingleMessageRequest) (*messageclient.Response, error) {
-	// todo: add your logic here and delete this line
-
-	m := &service.MessageService{}
-	var idSlice []string
-	idSlice = append(idSlice, in.Id)
-	code, msg := m.DeleteMessage(idSlice, in.Appid)
-	return &messageclient.Response{
-		Code:    code,
-		Message: msg,
-	}, nil
-}

rpc/internal/server/messageserver.go

@@ -8,7 +8,7 @@ import (
 
 	"app.yhyue.com/moapp/MessageCenter/rpc/internal/logic"
 	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
-	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
+	"app.yhyue.com/moapp/MessageCenter/rpc/pb/message"
 )
 
 type MessageServer struct {
@@ -29,7 +29,7 @@ func (s *MessageServer) MultipleSaveMsg(ctx context.Context, in *message.Multipl
 }
 
 //  修改消息阅读状态
-func (s *MessageServer) ChangeReadStatus(ctx context.Context, in *message.ChangeReadStatusRequest) (*message.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)
 }
@@ -40,18 +40,6 @@ func (s *MessageServer) SendUserMsg(ctx context.Context, in *message.SendMsgRequ
 	return l.SendUserMsg(in)
 }
 
-//  删除单一消息
-func (s *MessageServer) DeleteSingleMessage(ctx context.Context, in *message.DeleteSingleMessageRequest) (*message.Response, error) {
-	l := logic.NewDeleteSingleMessageLogic(ctx, s.svcCtx)
-	return l.DeleteSingleMessage(in)
-}
-
-//  删除多条消息
-func (s *MessageServer) DeleteMultipleMessage(ctx context.Context, in *message.DeleteMultipleMessageRequest) (*message.Response, error) {
-	l := logic.NewDeleteMultipleMessageLogic(ctx, s.svcCtx)
-	return l.DeleteMultipleMessage(in)
-}
-
 //   查询指定用户未读消息合计
 func (s *MessageServer) GetUnreadCount(ctx context.Context, in *message.GetUnreadCountRequest) (*message.GetUnreadCountResponse, error) {
 	l := logic.NewGetUnreadCountLogic(ctx, s.svcCtx)
@@ -94,12 +82,6 @@ func (s *MessageServer) GetMsgType(ctx context.Context, in *message.GetMsgTypeRe
 	return l.GetMsgType(in)
 }
 
-// 修改用户指定分类下的消息已读未读
-func (s *MessageServer) UpdateMessageRead(ctx context.Context, in *message.UpdateMessageReadReq) (*message.UpdateMessageReadResp, error) {
-	l := logic.NewUpdateMessageReadLogic(ctx, s.svcCtx)
-	return l.UpdateMessageRead(in)
-}
-
 //   查询指定用户的浮标消息
 func (s *MessageServer) FindUserBuoyMsg(ctx context.Context, in *message.FindUserBuoyMsgReq) (*message.FindUserBuoyMsgRes, error) {
 	l := logic.NewFindUserBuoyMsgLogic(ctx, s.svcCtx)

rpc/message.proto

@@ -16,7 +16,7 @@ message SendMsgRequest {
     string appid = 10; //应用标识
 }
 
-message ChangeReadStatusRequest {
+message ChangeReadStatusReq {
     string id = 1; // 消息id
     int64 readStatus = 2; // 阅读状态 0-未读 1-已读
     string appid = 3; //应用标识
@@ -25,16 +25,6 @@ message ResCount {
     int64 msgType = 1; // 类型及未读数量
     int64 count = 2; // 类型及未读数量
 }
-// 删除单一消息
-message DeleteSingleMessageRequest {
-    string id = 1; // 消息id
-    string appid = 3; //应用标识
-}
-// 批量删除消息
-message DeleteMultipleMessageRequest {
-    string id = 1; // 多条消息id, 逗号分隔
-    string appid = 3; //应用标识
-}
 // 查询指定用户未读消息合计
 message GetUnreadCountRequest {
     string userId = 1; // 用户id
@@ -135,18 +125,6 @@ message GetMsgTypeRes {
     repeated int64 data = 3; //
 }
 
-//更新分类下消息状态 已读、未读
-message UpdateMessageReadReq {
-    int64 msgType = 1;
-    string receiveUserid = 2;
-    string appId = 3;
-}
-message UpdateMessageReadResp {
-    int64 code = 1; //状态码
-    string message = 2; //响应消息
-    int64 status = 3;
-}
-
 message user {
     string userId = 1;
     string userName = 2;
@@ -241,13 +219,9 @@ service Message {
     //批量保存消息
     rpc multipleSaveMsg (multipleSaveMsgReq) returns (multipleSaveMsgResp);
     // 修改消息阅读状态
-    rpc ChangeReadStatus (ChangeReadStatusRequest) returns (Response);
+    rpc ChangeReadStatus (ChangeReadStatusReq) returns (Response);
     //指定用户发消息
     rpc SendUserMsg (SendMsgRequest) returns (Response);
-    // 删除单一消息
-    rpc DeleteSingleMessage (DeleteSingleMessageRequest) returns (Response);
-    // 删除多条消息
-    rpc DeleteMultipleMessage (DeleteMultipleMessageRequest) returns (Response);
     //  查询指定用户未读消息合计
     rpc GetUnreadCount (GetUnreadCountRequest) returns (GetUnreadCountResponse);
     //  查询指定用户的历史消息记录
@@ -262,8 +236,6 @@ service Message {
     rpc GetUnreadClassCount (GetUnreadClassCountReq) returns (GetUnreadClassCountRes);
     //  获取指定用户收到消息的分类
     rpc GetMsgType (GetMsgTypeReq) returns (GetMsgTypeRes);
-    //修改用户指定分类下的消息已读未读
-    rpc UpdateMessageRead (UpdateMessageReadReq) returns (UpdateMessageReadResp);
     //  查询指定用户的浮标消息
     rpc FindUserBuoyMsg (FindUserBuoyMsgReq) returns (FindUserBuoyMsgRes);