查询用户未读消息

api/internal/logic/messagedeletelogic.go

@@ -1,40 +0,0 @@
-package logic
-
-import (
-	"app.yhyue.com/moapp/MessageCenter/api/internal/svc"
-	"app.yhyue.com/moapp/MessageCenter/api/internal/types"
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	"context"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type MessageDeleteLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewMessageDeleteLogic(ctx context.Context, svcCtx *svc.ServiceContext) MessageDeleteLogic {
-	return MessageDeleteLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *MessageDeleteLogic) MessageDelete(req types.MessageDeleteReq) (*types.Response, error) {
-	result := &types.Response{}
-	lsi := l.svcCtx.MessageCenter
-	resp, err := lsi.DeleteMultipleMessage(l.ctx, &messageclient.DeleteMultipleMessageRequest{
-		Id:    req.Id,
-		Appid: req.AppId,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	result.Code = resp.Code
-	result.Message = resp.Message
-	return result, nil
-}

api/message.api

@@ -178,9 +178,7 @@ type MessageListResp {
 }
 
 service message-api {
-	//删除消息
-	@handler MessageDeleteHandler // TODO: set handler name and delete this comment
-	get /messageCenter/messageDelete (MessageDeleteReq) returns (response)
+
 	//查询消息详情
 	@handler MessageDetailHandler // TODO: set handler name and delete this comment
 	get /messageCenter/messageDetail (MessageDetailReq) returns (MessageDetailResp)
@@ -199,9 +197,6 @@ service message-api {
 	// 获取用户接收到的消息分类
 	@handler MessageTypeHandler
 	get /messageCenter/messageType (MessageTypeReq) returns (MessageTypeRes)
-	// 修改指定用户的某个分类的消息为已读
-//	@handler MessageSetReadStatusHandler
-//	post /messageCenter/messageSetReadStatus (MsgReadStatusReq) returns (MsgReadStatusResp)
 	// 标记为已读
 	@handler MarkReadHandler
 	post /messageCenter/markRead (MarkReadReq) returns (MarkReadRes)

rpc/internal/common/sendMsg.go

@@ -260,6 +260,53 @@ func UserMsgList(this *message.UserMsgListReq) *message.UserMsgList {
 	return data
 }
 
+func UserUnreadMsgList(this *message.UserUnreadMsgListReq) (int64, []*message.Messages) {
+	var count int64
+	var data []*message.Messages
+	cquery := map[string]interface{}{
+		"receive_userid": this.UserId,
+		"isdel":          1,
+		"appid":          this.Appid,
+		"isRead":         0,
+	}
+	count = entity.Mysql.Count("message", cquery)
+	if count > 0 {
+		res := entity.Mysql.Find("message", cquery, "", "createtime desc", (int(this.OffSet)-1)*int(this.PageSize), int(this.PageSize))
+		if res != nil && len(*res) > 0 {
+			for _, val := range *res {
+				_id := util.Int64All(val["id"])
+				id := strconv.FormatInt(_id, 10)
+				links4 := common.InterfaceToStr(val["link"])
+				link4, androidUrl4, iosUrl4, weChatUrl4 := util.LinkSplit(links4)
+				url := map[string]string{
+					"androidUrl": androidUrl4,
+					"iosUrl":     iosUrl4,
+					"weChatUrl":  weChatUrl4,
+				}
+				data = append(data, &message.Messages{
+					Id:            id,
+					Appid:         common.InterfaceToStr(val["appid"]),
+					ReceiveUserId: common.InterfaceToStr(val["receive_userid"]),
+					ReceiveName:   common.InterfaceToStr(val["receive_name"]),
+					SendUserId:    common.InterfaceToStr(val["send_userid"]),
+					SendName:      common.InterfaceToStr(val["send_name"]),
+					Createtime:    common.InterfaceToStr(val["createtime"]),
+					Title:         common.InterfaceToStr(val["title"]),
+					MsgType:       common.Int64All(val["msg_type"]),
+					Link:          link4,
+					CiteId:        common.Int64All(val["cite_id"]),
+					Content:       common.InterfaceToStr(val["content"]),
+					IsRead:        common.Int64All(val["isRead"]),
+					MsgLogId:      common.Int64All(val["msg_log_id"]),
+					Url:           url,
+				})
+			}
+		}
+	}
+
+	return count, data
+}
+
 func MessageGetLast(this *message.UserMsgListReq) *message.Messages {
 	if this.IsPc || this.MobileHome {
 		query := map[string]interface{}{

rpc/internal/logic/deletemultiplemessagelogic.go

@@ -1,42 +0,0 @@
-package logic
-
-import (
-	service "app.yhyue.com/moapp/MessageCenter/rpc/internal/common"
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
-	"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 (
-	service "app.yhyue.com/moapp/MessageCenter/rpc/internal/common"
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	"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/logic/updatemessagereadlogic.go

@@ -1,43 +0,0 @@
-package logic
-
-import (
-	service "app.yhyue.com/moapp/MessageCenter/rpc/internal/common"
-	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	"context"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type UpdateMessageReadLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewUpdateMessageReadLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateMessageReadLogic {
-	return &UpdateMessageReadLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-// 修改用户指定分类下的消息已读未读
-func (l *UpdateMessageReadLogic) UpdateMessageRead(in *messageclient.UpdateMessageReadReq) (*messageclient.UpdateMessageReadResp, error) {
-	// todo: add your logic here and delete this line
-	m := service.MessageService{}
-	status, err := m.UpdateMessageReadStatus(int(in.MsgType), in.ReceiveUserid, in.AppId)
-	if status == 0 && err != nil {
-		return &messageclient.UpdateMessageReadResp{
-			Code:    1,
-			Message: "修改消息已读失败",
-			Status:  0,
-		}, err
-	}
-	return &messageclient.UpdateMessageReadResp{
-		Code:    1,
-		Message: "修改消息已读成功",
-		Status:  1,
-	}, nil
-}

rpc/internal/server/messageserver.go

@@ -1,19 +1,19 @@
-// Code generated by goctl. DO NOT EDIT.
+// Code generated by goctl. DO NOT EDIT!
 // Source: message.proto
 
 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
-	message.UnimplementedMessageServer
+	message2.UnimplementedMessageServer
 }
 
 func NewMessageServer(svcCtx *svc.ServiceContext) *MessageServer {
@@ -23,103 +23,91 @@ func NewMessageServer(svcCtx *svc.ServiceContext) *MessageServer {
 }
 
 // 批量保存消息
-func (s *MessageServer) MultipleSaveMsg(ctx context.Context, in *message.MultipleSaveMsgReq) (*message.MultipleSaveMsgResp, error) {
+func (s *MessageServer) MultipleSaveMsg(ctx context.Context, in *message2.MultipleSaveMsgReq) (*message2.MultipleSaveMsgResp, error) {
 	l := logic.NewMultipleSaveMsgLogic(ctx, s.svcCtx)
 	return l.MultipleSaveMsg(in)
 }
 
-// 修改消息阅读状态
-func (s *MessageServer) ChangeReadStatus(ctx context.Context, in *message.ChangeReadStatusRequest) (*message.Response, error) {
+//  修改消息阅读状态
+func (s *MessageServer) ChangeReadStatus(ctx context.Context, in *message2.ChangeReadStatusReq) (*message2.Response, error) {
 	l := logic.NewChangeReadStatusLogic(ctx, s.svcCtx)
 	return l.ChangeReadStatus(in)
 }
 
 // 指定用户发消息
-func (s *MessageServer) SendUserMsg(ctx context.Context, in *message.SendMsgRequest) (*message.Response, error) {
+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) 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) {
+//   查询指定用户未读消息合计
+func (s *MessageServer) GetUnreadCount(ctx context.Context, in *message2.GetUnreadCountRequest) (*message2.GetUnreadCountResponse, error) {
 	l := logic.NewGetUnreadCountLogic(ctx, s.svcCtx)
 	return l.GetUnreadCount(in)
 }
 
-// 查询指定用户的历史消息记录
-func (s *MessageServer) FindUserMsg(ctx context.Context, in *message.FindUserMsgReq) (*message.FindUserMsgRes, error) {
+//   查询指定用户的历史消息记录
+func (s *MessageServer) FindUserMsg(ctx context.Context, in *message2.FindUserMsgReq) (*message2.FindUserMsgRes, error) {
 	l := logic.NewFindUserMsgLogic(ctx, s.svcCtx)
 	return l.FindUserMsg(in)
 }
 
-// 查询指定用户指定分类的未读消息合计
-func (s *MessageServer) GetClassUnreadCount(ctx context.Context, in *message.GetClassUnreadCountReq) (*message.GetUnreadCountResponse, error) {
+//   查询指定用户指定分类的未读消息合计
+func (s *MessageServer) GetClassUnreadCount(ctx context.Context, in *message2.GetClassUnreadCountReq) (*message2.GetUnreadCountResponse, error) {
 	l := logic.NewGetClassUnreadCountLogic(ctx, s.svcCtx)
 	return l.GetClassUnreadCount(in)
 }
 
-// 获取指定用户指定分类的最新一条消息
-func (s *MessageServer) GetLastMessage(ctx context.Context, in *message.GetLastMessageReq) (*message.GetLastMessageRes, error) {
+//   获取指定用户指定分类的最新一条消息
+func (s *MessageServer) GetLastMessage(ctx context.Context, in *message2.GetLastMessageReq) (*message2.GetLastMessageRes, error) {
 	l := logic.NewGetLastMessageLogic(ctx, s.svcCtx)
 	return l.GetLastMessage(in)
 }
 
 // 查看详细详情
-func (s *MessageServer) FindMessageDetail(ctx context.Context, in *message.MessageDetailReq) (*message.MessageDetailResp, error) {
+func (s *MessageServer) FindMessageDetail(ctx context.Context, in *message2.MessageDetailReq) (*message2.MessageDetailResp, error) {
 	l := logic.NewFindMessageDetailLogic(ctx, s.svcCtx)
 	return l.FindMessageDetail(in)
 }
 
-// 获取指定用户的分类及未读消息数量
-func (s *MessageServer) GetUnreadClassCount(ctx context.Context, in *message.GetUnreadClassCountReq) (*message.GetUnreadClassCountRes, error) {
+//   获取指定用户的分类及未读消息数量
+func (s *MessageServer) GetUnreadClassCount(ctx context.Context, in *message2.GetUnreadClassCountReq) (*message2.GetUnreadClassCountRes, error) {
 	l := logic.NewGetUnreadClassCountLogic(ctx, s.svcCtx)
 	return l.GetUnreadClassCount(in)
 }
 
-// 获取指定用户收到消息的分类
-func (s *MessageServer) GetMsgType(ctx context.Context, in *message.GetMsgTypeReq) (*message.GetMsgTypeRes, error) {
+//   获取指定用户收到消息的分类
+func (s *MessageServer) GetMsgType(ctx context.Context, in *message2.GetMsgTypeReq) (*message2.GetMsgTypeRes, error) {
 	l := logic.NewGetMsgTypeLogic(ctx, s.svcCtx)
 	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) {
+//   查询指定用户的浮标消息
+func (s *MessageServer) FindUserBuoyMsg(ctx context.Context, in *message2.FindUserBuoyMsgReq) (*message2.FindUserBuoyMsgRes, error) {
 	l := logic.NewFindUserBuoyMsgLogic(ctx, s.svcCtx)
 	return l.FindUserBuoyMsg(in)
 }
 
-// 一键清空未读消息
-func (s *MessageServer) ClearUnreadMsg(ctx context.Context, in *message.ClearUnreadMsgReq) (*message.Response, error) {
+//    一键清空未读消息
+func (s *MessageServer) ClearUnreadMsg(ctx context.Context, in *message2.ClearUnreadMsgReq) (*message2.Response, error) {
 	l := logic.NewClearUnreadMsgLogic(ctx, s.svcCtx)
 	return l.ClearUnreadMsg(in)
 }
 
-// new用户消息列表
-func (s *MessageServer) UserMsgList(ctx context.Context, in *message.UserMsgListReq) (*message.UserMsgListRes, error) {
+//    new用户消息列表
+func (s *MessageServer) UserMsgList(ctx context.Context, in *message2.UserMsgListReq) (*message2.UserMsgListRes, error) {
 	l := logic.NewUserMsgListLogic(ctx, s.svcCtx)
 	return l.UserMsgList(in)
 }
 
-// 发送微信模版消息
-func (s *MessageServer) SendWxTmplMsg(ctx context.Context, in *message.WxTmplMsg) (*message.Response, error) {
+//   发送微信模版消息
+func (s *MessageServer) SendWxTmplMsg(ctx context.Context, in *message2.WxTmplMsg) (*message2.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) {
+	l := logic.NewUserUnreadMsgListLogic(ctx, s.svcCtx)
+	return l.UserUnreadMsgList(in)
+}

rpc/message.proto

@@ -233,6 +233,20 @@ message WxTmplResponse {
     string message = 2; //信息
 }
 
+message UserUnreadMsgListReq {
+    string userId = 1; //用户id
+    string appid = 3; //应用标识
+    int64 offSet = 4; //当前
+    int64 pageSize = 5; //大小
+}
+
+message UserUnreadMsgListRes {
+    int64 code = 1; //状态码
+    string message = 2; //响应消息
+    repeated Messages list = 3;
+    int64 count = 4; //总数
+}
+
 
 service Message {
     //批量保存消息
@@ -265,4 +279,6 @@ service Message {
     rpc UserMsgList (UserMsgListReq) returns (UserMsgListRes);
     //  发送微信模版消息
     rpc SendWxTmplMsg (WxTmplMsg) returns(Response);
+    //   官网、移动端首页、工作桌面消息滚动
+    rpc UserUnreadMsgList (UserUnreadMsgListReq) returns (UserUnreadMsgListRes);
 }

rpc/messageclient/message.go

@@ -1,4 +1,4 @@
-// Code generated by goctl. DO NOT EDIT.
+// Code generated by goctl. DO NOT EDIT!
 // Source: message.proto
 
 package messageclient
@@ -13,77 +13,54 @@ import (
 )
 
 type (
-	AllSortData                  = message.AllSortData
-	BuoyMessages                 = message.BuoyMessages
-	ChangeReadStatusRequest      = message.ChangeReadStatusRequest
-	ClearUnreadMsgReq            = message.ClearUnreadMsgReq
-	DeleteMultipleMessageRequest = message.DeleteMultipleMessageRequest
-	DeleteSingleMessageRequest   = message.DeleteSingleMessageRequest
-	FindUserBuoyMsgReq           = message.FindUserBuoyMsgReq
-	FindUserBuoyMsgRes           = message.FindUserBuoyMsgRes
-	FindUserMsgReq               = message.FindUserMsgReq
-	FindUserMsgRes               = message.FindUserMsgRes
-	GetClassUnreadCountReq       = message.GetClassUnreadCountReq
-	GetLastMessageReq            = message.GetLastMessageReq
-	GetLastMessageRes            = message.GetLastMessageRes
-	GetMsgTypeReq                = message.GetMsgTypeReq
-	GetMsgTypeRes                = message.GetMsgTypeRes
-	GetUnreadClassCountReq       = message.GetUnreadClassCountReq
-	GetUnreadClassCountRes       = message.GetUnreadClassCountRes
-	GetUnreadCountRequest        = message.GetUnreadCountRequest
-	GetUnreadCountResponse       = message.GetUnreadCountResponse
-	MessageDetailReq             = message.MessageDetailReq
-	MessageDetailResp            = message.MessageDetailResp
-	Messages                     = message.Messages
-	MultipleSaveMsgReq           = message.MultipleSaveMsgReq
-	MultipleSaveMsgResp          = message.MultipleSaveMsgResp
-	ResCount                     = message.ResCount
-	Response                     = message.Response
-	SendMsgRequest               = message.SendMsgRequest
-	UpdateMessageReadReq         = message.UpdateMessageReadReq
-	UpdateMessageReadResp        = message.UpdateMessageReadResp
-	User                         = message.User
-	UserMsgList                  = message.UserMsgList
-	UserMsgListReq               = message.UserMsgListReq
-	UserMsgListRes               = message.UserMsgListRes
-	WxTmplMsg                    = message.WxTmplMsg
-	WxTmplResponse               = message.WxTmplResponse
+	BuoyMessages            = message.BuoyMessages
+	ChangeReadStatusRequest = message.ChangeReadStatusReq
+	FindUserBuoyMsgReq      = message.FindUserBuoyMsgReq
+	FindUserBuoyMsgRes      = message.FindUserBuoyMsgRes
+	FindUserMsgReq          = message.FindUserMsgReq
+	FindUserMsgRes          = message.FindUserMsgRes
+	GetClassUnreadCountReq  = message.GetClassUnreadCountReq
+	GetLastMessageReq       = message.GetLastMessageReq
+	GetLastMessageRes       = message.GetLastMessageRes
+	GetMsgTypeReq           = message.GetMsgTypeReq
+	GetMsgTypeRes           = message.GetMsgTypeRes
+	GetUnreadClassCountReq  = message.GetUnreadClassCountReq
+	GetUnreadClassCountRes  = message.GetUnreadClassCountRes
+	GetUnreadCountRequest   = message.GetUnreadCountRequest
+	GetUnreadCountResponse  = message.GetUnreadCountResponse
+	MessageDetailReq        = message.MessageDetailReq
+	MessageDetailResp       = message.MessageDetailResp
+	Messages                = message.Messages
+	MultipleSaveMsgReq      = message.MultipleSaveMsgReq
+	MultipleSaveMsgResp     = message.MultipleSaveMsgResp
+	ResCount                = message.ResCount
+	Response                = message.Response
+	SendMsgRequest          = message.SendMsgRequest
+	User                    = message.User
 
 	Message interface {
 		// 批量保存消息
 		MultipleSaveMsg(ctx context.Context, in *MultipleSaveMsgReq, opts ...grpc.CallOption) (*MultipleSaveMsgResp, error)
-		// 修改消息阅读状态
+		//  修改消息阅读状态
 		ChangeReadStatus(ctx context.Context, in *ChangeReadStatusRequest, opts ...grpc.CallOption) (*Response, error)
 		// 指定用户发消息
 		SendUserMsg(ctx context.Context, in *SendMsgRequest, opts ...grpc.CallOption) (*Response, error)
-		// 删除单一消息
-		DeleteSingleMessage(ctx context.Context, in *DeleteSingleMessageRequest, opts ...grpc.CallOption) (*Response, error)
-		// 删除多条消息
-		DeleteMultipleMessage(ctx context.Context, in *DeleteMultipleMessageRequest, opts ...grpc.CallOption) (*Response, error)
-		// 查询指定用户未读消息合计
+		//   查询指定用户未读消息合计
 		GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
-		// 查询指定用户的历史消息记录
+		//   查询指定用户的历史消息记录
 		FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error)
-		// 查询指定用户指定分类的未读消息合计
+		//   查询指定用户指定分类的未读消息合计
 		GetClassUnreadCount(ctx context.Context, in *GetClassUnreadCountReq, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
-		// 获取指定用户指定分类的最新一条消息
+		//   获取指定用户指定分类的最新一条消息
 		GetLastMessage(ctx context.Context, in *GetLastMessageReq, opts ...grpc.CallOption) (*GetLastMessageRes, error)
 		// 查看详细详情
 		FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error)
-		// 获取指定用户的分类及未读消息数量
+		//   获取指定用户的分类及未读消息数量
 		GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq, opts ...grpc.CallOption) (*GetUnreadClassCountRes, error)
-		// 获取指定用户收到消息的分类
+		//   获取指定用户收到消息的分类
 		GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error)
-		// 修改用户指定分类下的消息已读未读
-		UpdateMessageRead(ctx context.Context, in *UpdateMessageReadReq, opts ...grpc.CallOption) (*UpdateMessageReadResp, error)
-		// 查询指定用户的浮标消息
+		//   查询指定用户的浮标消息
 		FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error)
-		// 一键清空未读消息
-		ClearUnreadMsg(ctx context.Context, in *ClearUnreadMsgReq, opts ...grpc.CallOption) (*Response, error)
-		// new用户消息列表
-		UserMsgList(ctx context.Context, in *UserMsgListReq, opts ...grpc.CallOption) (*UserMsgListRes, error)
-		// 发送微信模版消息
-		SendWxTmplMsg(ctx context.Context, in *WxTmplMsg, opts ...grpc.CallOption) (*Response, error)
 	}
 
 	defaultMessage struct {
@@ -103,7 +80,7 @@ func (m *defaultMessage) MultipleSaveMsg(ctx context.Context, in *MultipleSaveMs
 	return client.MultipleSaveMsg(ctx, in, opts...)
 }
 
-// 修改消息阅读状态
+//  修改消息阅读状态
 func (m *defaultMessage) ChangeReadStatus(ctx context.Context, in *ChangeReadStatusRequest, opts ...grpc.CallOption) (*Response, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.ChangeReadStatus(ctx, in, opts...)
@@ -115,37 +92,25 @@ func (m *defaultMessage) SendUserMsg(ctx context.Context, in *SendMsgRequest, op
 	return client.SendUserMsg(ctx, in, opts...)
 }
 
-// 删除单一消息
-func (m *defaultMessage) DeleteSingleMessage(ctx context.Context, in *DeleteSingleMessageRequest, opts ...grpc.CallOption) (*Response, error) {
-	client := message.NewMessageClient(m.cli.Conn())
-	return client.DeleteSingleMessage(ctx, in, opts...)
-}
-
-// 删除多条消息
-func (m *defaultMessage) DeleteMultipleMessage(ctx context.Context, in *DeleteMultipleMessageRequest, opts ...grpc.CallOption) (*Response, error) {
-	client := message.NewMessageClient(m.cli.Conn())
-	return client.DeleteMultipleMessage(ctx, in, opts...)
-}
-
-// 查询指定用户未读消息合计
+//   查询指定用户未读消息合计
 func (m *defaultMessage) GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
 	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 := 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 := 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 := message.NewMessageClient(m.cli.Conn())
 	return client.GetLastMessage(ctx, in, opts...)
@@ -157,44 +122,20 @@ func (m *defaultMessage) FindMessageDetail(ctx context.Context, in *MessageDetai
 	return client.FindMessageDetail(ctx, in, opts...)
 }
 
-// 获取指定用户的分类及未读消息数量
+//   获取指定用户的分类及未读消息数量
 func (m *defaultMessage) GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq, opts ...grpc.CallOption) (*GetUnreadClassCountRes, error) {
 	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 := message.NewMessageClient(m.cli.Conn())
 	return client.GetMsgType(ctx, in, opts...)
 }
 
-// 修改用户指定分类下的消息已读未读
-func (m *defaultMessage) UpdateMessageRead(ctx context.Context, in *UpdateMessageReadReq, opts ...grpc.CallOption) (*UpdateMessageReadResp, error) {
-	client := message.NewMessageClient(m.cli.Conn())
-	return client.UpdateMessageRead(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...)
 }
-
-// 一键清空未读消息
-func (m *defaultMessage) ClearUnreadMsg(ctx context.Context, in *ClearUnreadMsgReq, opts ...grpc.CallOption) (*Response, error) {
-	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 := 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 := message.NewMessageClient(m.cli.Conn())
-	return client.SendWxTmplMsg(ctx, in, opts...)
-}

rpc/type/message/message_grpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.3.0
-// - protoc             v3.21.12
+// - protoc-gen-go-grpc v1.2.0
+// - protoc             v3.19.4
 // source: message.proto
 
 package message
@@ -18,64 +18,40 @@ import (
 // Requires gRPC-Go v1.32.0 or later.
 const _ = grpc.SupportPackageIsVersion7
 
-const (
-	Message_MultipleSaveMsg_FullMethodName       = "/message.Message/multipleSaveMsg"
-	Message_ChangeReadStatus_FullMethodName      = "/message.Message/ChangeReadStatus"
-	Message_SendUserMsg_FullMethodName           = "/message.Message/SendUserMsg"
-	Message_DeleteSingleMessage_FullMethodName   = "/message.Message/DeleteSingleMessage"
-	Message_DeleteMultipleMessage_FullMethodName = "/message.Message/DeleteMultipleMessage"
-	Message_GetUnreadCount_FullMethodName        = "/message.Message/GetUnreadCount"
-	Message_FindUserMsg_FullMethodName           = "/message.Message/FindUserMsg"
-	Message_GetClassUnreadCount_FullMethodName   = "/message.Message/GetClassUnreadCount"
-	Message_GetLastMessage_FullMethodName        = "/message.Message/GetLastMessage"
-	Message_FindMessageDetail_FullMethodName     = "/message.Message/FindMessageDetail"
-	Message_GetUnreadClassCount_FullMethodName   = "/message.Message/GetUnreadClassCount"
-	Message_GetMsgType_FullMethodName            = "/message.Message/GetMsgType"
-	Message_UpdateMessageRead_FullMethodName     = "/message.Message/UpdateMessageRead"
-	Message_FindUserBuoyMsg_FullMethodName       = "/message.Message/FindUserBuoyMsg"
-	Message_ClearUnreadMsg_FullMethodName        = "/message.Message/ClearUnreadMsg"
-	Message_UserMsgList_FullMethodName           = "/message.Message/UserMsgList"
-	Message_SendWxTmplMsg_FullMethodName         = "/message.Message/SendWxTmplMsg"
-)
-
 // MessageClient is the client API for Message service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type MessageClient interface {
-	// 批量保存消息
+	//批量保存消息
 	MultipleSaveMsg(ctx context.Context, in *MultipleSaveMsgReq, opts ...grpc.CallOption) (*MultipleSaveMsgResp, error)
 	// 修改消息阅读状态
-	ChangeReadStatus(ctx context.Context, in *ChangeReadStatusRequest, opts ...grpc.CallOption) (*Response, error)
-	// 指定用户发消息
+	ChangeReadStatus(ctx context.Context, in *ChangeReadStatusReq, opts ...grpc.CallOption) (*Response, error)
+	//指定用户发消息
 	SendUserMsg(ctx context.Context, in *SendMsgRequest, opts ...grpc.CallOption) (*Response, error)
-	// 删除单一消息
-	DeleteSingleMessage(ctx context.Context, in *DeleteSingleMessageRequest, opts ...grpc.CallOption) (*Response, error)
-	// 删除多条消息
-	DeleteMultipleMessage(ctx context.Context, in *DeleteMultipleMessageRequest, opts ...grpc.CallOption) (*Response, error)
-	// 查询指定用户未读消息合计
+	//  查询指定用户未读消息合计
 	GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
-	// 查询指定用户的历史消息记录
+	//  查询指定用户的历史消息记录
 	FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error)
-	// 查询指定用户指定分类的未读消息合计
+	//  查询指定用户指定分类的未读消息合计
 	GetClassUnreadCount(ctx context.Context, in *GetClassUnreadCountReq, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
-	// 获取指定用户指定分类的最新一条消息
+	//  获取指定用户指定分类的最新一条消息
 	GetLastMessage(ctx context.Context, in *GetLastMessageReq, opts ...grpc.CallOption) (*GetLastMessageRes, error)
-	// 查看详细详情
+	//查看详细详情
 	FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error)
-	// 获取指定用户的分类及未读消息数量
+	//  获取指定用户的分类及未读消息数量
 	GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq, opts ...grpc.CallOption) (*GetUnreadClassCountRes, error)
-	// 获取指定用户收到消息的分类
+	//  获取指定用户收到消息的分类
 	GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error)
-	// 修改用户指定分类下的消息已读未读
-	UpdateMessageRead(ctx context.Context, in *UpdateMessageReadReq, opts ...grpc.CallOption) (*UpdateMessageReadResp, error)
-	// 查询指定用户的浮标消息
+	//  查询指定用户的浮标消息
 	FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error)
-	// 一键清空未读消息
+	//   一键清空未读消息
 	ClearUnreadMsg(ctx context.Context, in *ClearUnreadMsgReq, opts ...grpc.CallOption) (*Response, error)
-	// new用户消息列表
+	//   new用户消息列表
 	UserMsgList(ctx context.Context, in *UserMsgListReq, opts ...grpc.CallOption) (*UserMsgListRes, error)
-	// 发送微信模版消息
+	//  发送微信模版消息
 	SendWxTmplMsg(ctx context.Context, in *WxTmplMsg, opts ...grpc.CallOption) (*Response, error)
+	//   官网、移动端首页、工作桌面消息滚动
+	UserUnreadMsgList(ctx context.Context, in *UserUnreadMsgListReq, opts ...grpc.CallOption) (*UserUnreadMsgListRes, error)
 }
 
 type messageClient struct {
@@ -88,16 +64,16 @@ func NewMessageClient(cc grpc.ClientConnInterface) MessageClient {
 
 func (c *messageClient) MultipleSaveMsg(ctx context.Context, in *MultipleSaveMsgReq, opts ...grpc.CallOption) (*MultipleSaveMsgResp, error) {
 	out := new(MultipleSaveMsgResp)
-	err := c.cc.Invoke(ctx, Message_MultipleSaveMsg_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/message.Message/multipleSaveMsg", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *messageClient) ChangeReadStatus(ctx context.Context, in *ChangeReadStatusRequest, opts ...grpc.CallOption) (*Response, error) {
+func (c *messageClient) ChangeReadStatus(ctx context.Context, in *ChangeReadStatusReq, opts ...grpc.CallOption) (*Response, error) {
 	out := new(Response)
-	err := c.cc.Invoke(ctx, Message_ChangeReadStatus_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/message.Message/ChangeReadStatus", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -106,25 +82,7 @@ func (c *messageClient) ChangeReadStatus(ctx context.Context, in *ChangeReadStat
 
 func (c *messageClient) SendUserMsg(ctx context.Context, in *SendMsgRequest, opts ...grpc.CallOption) (*Response, error) {
 	out := new(Response)
-	err := c.cc.Invoke(ctx, Message_SendUserMsg_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *messageClient) DeleteSingleMessage(ctx context.Context, in *DeleteSingleMessageRequest, opts ...grpc.CallOption) (*Response, error) {
-	out := new(Response)
-	err := c.cc.Invoke(ctx, Message_DeleteSingleMessage_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *messageClient) DeleteMultipleMessage(ctx context.Context, in *DeleteMultipleMessageRequest, opts ...grpc.CallOption) (*Response, error) {
-	out := new(Response)
-	err := c.cc.Invoke(ctx, Message_DeleteMultipleMessage_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/message.Message/SendUserMsg", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -133,7 +91,7 @@ func (c *messageClient) DeleteMultipleMessage(ctx context.Context, in *DeleteMul
 
 func (c *messageClient) GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
 	out := new(GetUnreadCountResponse)
-	err := c.cc.Invoke(ctx, Message_GetUnreadCount_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/message.Message/GetUnreadCount", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -142,7 +100,7 @@ func (c *messageClient) GetUnreadCount(ctx context.Context, in *GetUnreadCountRe
 
 func (c *messageClient) FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error) {
 	out := new(FindUserMsgRes)
-	err := c.cc.Invoke(ctx, Message_FindUserMsg_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/message.Message/FindUserMsg", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -151,7 +109,7 @@ func (c *messageClient) FindUserMsg(ctx context.Context, in *FindUserMsgReq, opt
 
 func (c *messageClient) GetClassUnreadCount(ctx context.Context, in *GetClassUnreadCountReq, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
 	out := new(GetUnreadCountResponse)
-	err := c.cc.Invoke(ctx, Message_GetClassUnreadCount_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/message.Message/GetClassUnreadCount", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -160,7 +118,7 @@ func (c *messageClient) GetClassUnreadCount(ctx context.Context, in *GetClassUnr
 
 func (c *messageClient) GetLastMessage(ctx context.Context, in *GetLastMessageReq, opts ...grpc.CallOption) (*GetLastMessageRes, error) {
 	out := new(GetLastMessageRes)
-	err := c.cc.Invoke(ctx, Message_GetLastMessage_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/message.Message/GetLastMessage", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -169,7 +127,7 @@ func (c *messageClient) GetLastMessage(ctx context.Context, in *GetLastMessageRe
 
 func (c *messageClient) FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error) {
 	out := new(MessageDetailResp)
-	err := c.cc.Invoke(ctx, Message_FindMessageDetail_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/message.Message/FindMessageDetail", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -178,7 +136,7 @@ func (c *messageClient) FindMessageDetail(ctx context.Context, in *MessageDetail
 
 func (c *messageClient) GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq, opts ...grpc.CallOption) (*GetUnreadClassCountRes, error) {
 	out := new(GetUnreadClassCountRes)
-	err := c.cc.Invoke(ctx, Message_GetUnreadClassCount_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/message.Message/GetUnreadClassCount", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -187,16 +145,7 @@ func (c *messageClient) GetUnreadClassCount(ctx context.Context, in *GetUnreadCl
 
 func (c *messageClient) GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error) {
 	out := new(GetMsgTypeRes)
-	err := c.cc.Invoke(ctx, Message_GetMsgType_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *messageClient) UpdateMessageRead(ctx context.Context, in *UpdateMessageReadReq, opts ...grpc.CallOption) (*UpdateMessageReadResp, error) {
-	out := new(UpdateMessageReadResp)
-	err := c.cc.Invoke(ctx, Message_UpdateMessageRead_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/message.Message/GetMsgType", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -205,7 +154,7 @@ func (c *messageClient) UpdateMessageRead(ctx context.Context, in *UpdateMessage
 
 func (c *messageClient) FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error) {
 	out := new(FindUserBuoyMsgRes)
-	err := c.cc.Invoke(ctx, Message_FindUserBuoyMsg_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/message.Message/FindUserBuoyMsg", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -214,7 +163,7 @@ func (c *messageClient) FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsg
 
 func (c *messageClient) ClearUnreadMsg(ctx context.Context, in *ClearUnreadMsgReq, opts ...grpc.CallOption) (*Response, error) {
 	out := new(Response)
-	err := c.cc.Invoke(ctx, Message_ClearUnreadMsg_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/message.Message/ClearUnreadMsg", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -223,7 +172,7 @@ func (c *messageClient) ClearUnreadMsg(ctx context.Context, in *ClearUnreadMsgRe
 
 func (c *messageClient) UserMsgList(ctx context.Context, in *UserMsgListReq, opts ...grpc.CallOption) (*UserMsgListRes, error) {
 	out := new(UserMsgListRes)
-	err := c.cc.Invoke(ctx, Message_UserMsgList_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/message.Message/UserMsgList", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -232,7 +181,16 @@ func (c *messageClient) UserMsgList(ctx context.Context, in *UserMsgListReq, opt
 
 func (c *messageClient) SendWxTmplMsg(ctx context.Context, in *WxTmplMsg, opts ...grpc.CallOption) (*Response, error) {
 	out := new(Response)
-	err := c.cc.Invoke(ctx, Message_SendWxTmplMsg_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/message.Message/SendWxTmplMsg", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	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
 	}
@@ -243,40 +201,36 @@ func (c *messageClient) SendWxTmplMsg(ctx context.Context, in *WxTmplMsg, opts .
 // All implementations must embed UnimplementedMessageServer
 // for forward compatibility
 type MessageServer interface {
-	// 批量保存消息
+	//批量保存消息
 	MultipleSaveMsg(context.Context, *MultipleSaveMsgReq) (*MultipleSaveMsgResp, error)
 	// 修改消息阅读状态
-	ChangeReadStatus(context.Context, *ChangeReadStatusRequest) (*Response, error)
-	// 指定用户发消息
+	ChangeReadStatus(context.Context, *ChangeReadStatusReq) (*Response, error)
+	//指定用户发消息
 	SendUserMsg(context.Context, *SendMsgRequest) (*Response, error)
-	// 删除单一消息
-	DeleteSingleMessage(context.Context, *DeleteSingleMessageRequest) (*Response, error)
-	// 删除多条消息
-	DeleteMultipleMessage(context.Context, *DeleteMultipleMessageRequest) (*Response, error)
-	// 查询指定用户未读消息合计
+	//  查询指定用户未读消息合计
 	GetUnreadCount(context.Context, *GetUnreadCountRequest) (*GetUnreadCountResponse, error)
-	// 查询指定用户的历史消息记录
+	//  查询指定用户的历史消息记录
 	FindUserMsg(context.Context, *FindUserMsgReq) (*FindUserMsgRes, error)
-	// 查询指定用户指定分类的未读消息合计
+	//  查询指定用户指定分类的未读消息合计
 	GetClassUnreadCount(context.Context, *GetClassUnreadCountReq) (*GetUnreadCountResponse, error)
-	// 获取指定用户指定分类的最新一条消息
+	//  获取指定用户指定分类的最新一条消息
 	GetLastMessage(context.Context, *GetLastMessageReq) (*GetLastMessageRes, error)
-	// 查看详细详情
+	//查看详细详情
 	FindMessageDetail(context.Context, *MessageDetailReq) (*MessageDetailResp, error)
-	// 获取指定用户的分类及未读消息数量
+	//  获取指定用户的分类及未读消息数量
 	GetUnreadClassCount(context.Context, *GetUnreadClassCountReq) (*GetUnreadClassCountRes, error)
-	// 获取指定用户收到消息的分类
+	//  获取指定用户收到消息的分类
 	GetMsgType(context.Context, *GetMsgTypeReq) (*GetMsgTypeRes, error)
-	// 修改用户指定分类下的消息已读未读
-	UpdateMessageRead(context.Context, *UpdateMessageReadReq) (*UpdateMessageReadResp, error)
-	// 查询指定用户的浮标消息
+	//  查询指定用户的浮标消息
 	FindUserBuoyMsg(context.Context, *FindUserBuoyMsgReq) (*FindUserBuoyMsgRes, error)
-	// 一键清空未读消息
+	//   一键清空未读消息
 	ClearUnreadMsg(context.Context, *ClearUnreadMsgReq) (*Response, error)
-	// new用户消息列表
+	//   new用户消息列表
 	UserMsgList(context.Context, *UserMsgListReq) (*UserMsgListRes, error)
-	// 发送微信模版消息
+	//  发送微信模版消息
 	SendWxTmplMsg(context.Context, *WxTmplMsg) (*Response, error)
+	//   官网、移动端首页、工作桌面消息滚动
+	UserUnreadMsgList(context.Context, *UserUnreadMsgListReq) (*UserUnreadMsgListRes, error)
 	mustEmbedUnimplementedMessageServer()
 }
 
@@ -287,18 +241,12 @@ type UnimplementedMessageServer struct {
 func (UnimplementedMessageServer) MultipleSaveMsg(context.Context, *MultipleSaveMsgReq) (*MultipleSaveMsgResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method MultipleSaveMsg not implemented")
 }
-func (UnimplementedMessageServer) ChangeReadStatus(context.Context, *ChangeReadStatusRequest) (*Response, error) {
+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) DeleteSingleMessage(context.Context, *DeleteSingleMessageRequest) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DeleteSingleMessage not implemented")
-}
-func (UnimplementedMessageServer) DeleteMultipleMessage(context.Context, *DeleteMultipleMessageRequest) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DeleteMultipleMessage not implemented")
-}
 func (UnimplementedMessageServer) GetUnreadCount(context.Context, *GetUnreadCountRequest) (*GetUnreadCountResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUnreadCount not implemented")
 }
@@ -320,9 +268,6 @@ func (UnimplementedMessageServer) GetUnreadClassCount(context.Context, *GetUnrea
 func (UnimplementedMessageServer) GetMsgType(context.Context, *GetMsgTypeReq) (*GetMsgTypeRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetMsgType not implemented")
 }
-func (UnimplementedMessageServer) UpdateMessageRead(context.Context, *UpdateMessageReadReq) (*UpdateMessageReadResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UpdateMessageRead not implemented")
-}
 func (UnimplementedMessageServer) FindUserBuoyMsg(context.Context, *FindUserBuoyMsgReq) (*FindUserBuoyMsgRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindUserBuoyMsg not implemented")
 }
@@ -335,6 +280,9 @@ func (UnimplementedMessageServer) UserMsgList(context.Context, *UserMsgListReq)
 func (UnimplementedMessageServer) SendWxTmplMsg(context.Context, *WxTmplMsg) (*Response, 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) mustEmbedUnimplementedMessageServer() {}
 
 // UnsafeMessageServer may be embedded to opt out of forward compatibility for this service.
@@ -358,7 +306,7 @@ func _Message_MultipleSaveMsg_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: Message_MultipleSaveMsg_FullMethodName,
+		FullMethod: "/message.Message/multipleSaveMsg",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).MultipleSaveMsg(ctx, req.(*MultipleSaveMsgReq))
@@ -367,7 +315,7 @@ func _Message_MultipleSaveMsg_Handler(srv interface{}, ctx context.Context, dec
 }
 
 func _Message_ChangeReadStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ChangeReadStatusRequest)
+	in := new(ChangeReadStatusReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -376,10 +324,10 @@ func _Message_ChangeReadStatus_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: Message_ChangeReadStatus_FullMethodName,
+		FullMethod: "/message.Message/ChangeReadStatus",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).ChangeReadStatus(ctx, req.(*ChangeReadStatusRequest))
+		return srv.(MessageServer).ChangeReadStatus(ctx, req.(*ChangeReadStatusReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -394,7 +342,7 @@ func _Message_SendUserMsg_Handler(srv interface{}, ctx context.Context, dec func
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: Message_SendUserMsg_FullMethodName,
+		FullMethod: "/message.Message/SendUserMsg",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).SendUserMsg(ctx, req.(*SendMsgRequest))
@@ -402,42 +350,6 @@ func _Message_SendUserMsg_Handler(srv interface{}, ctx context.Context, dec func
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Message_DeleteSingleMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteSingleMessageRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).DeleteSingleMessage(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: Message_DeleteSingleMessage_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).DeleteSingleMessage(ctx, req.(*DeleteSingleMessageRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Message_DeleteMultipleMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteMultipleMessageRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).DeleteMultipleMessage(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: Message_DeleteMultipleMessage_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).DeleteMultipleMessage(ctx, req.(*DeleteMultipleMessageRequest))
-	}
-	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 {
@@ -448,7 +360,7 @@ func _Message_GetUnreadCount_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: Message_GetUnreadCount_FullMethodName,
+		FullMethod: "/message.Message/GetUnreadCount",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).GetUnreadCount(ctx, req.(*GetUnreadCountRequest))
@@ -466,7 +378,7 @@ func _Message_FindUserMsg_Handler(srv interface{}, ctx context.Context, dec func
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: Message_FindUserMsg_FullMethodName,
+		FullMethod: "/message.Message/FindUserMsg",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).FindUserMsg(ctx, req.(*FindUserMsgReq))
@@ -484,7 +396,7 @@ func _Message_GetClassUnreadCount_Handler(srv interface{}, ctx context.Context,
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: Message_GetClassUnreadCount_FullMethodName,
+		FullMethod: "/message.Message/GetClassUnreadCount",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).GetClassUnreadCount(ctx, req.(*GetClassUnreadCountReq))
@@ -502,7 +414,7 @@ func _Message_GetLastMessage_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: Message_GetLastMessage_FullMethodName,
+		FullMethod: "/message.Message/GetLastMessage",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).GetLastMessage(ctx, req.(*GetLastMessageReq))
@@ -520,7 +432,7 @@ func _Message_FindMessageDetail_Handler(srv interface{}, ctx context.Context, de
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: Message_FindMessageDetail_FullMethodName,
+		FullMethod: "/message.Message/FindMessageDetail",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).FindMessageDetail(ctx, req.(*MessageDetailReq))
@@ -538,7 +450,7 @@ func _Message_GetUnreadClassCount_Handler(srv interface{}, ctx context.Context,
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: Message_GetUnreadClassCount_FullMethodName,
+		FullMethod: "/message.Message/GetUnreadClassCount",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).GetUnreadClassCount(ctx, req.(*GetUnreadClassCountReq))
@@ -556,7 +468,7 @@ func _Message_GetMsgType_Handler(srv interface{}, ctx context.Context, dec func(
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: Message_GetMsgType_FullMethodName,
+		FullMethod: "/message.Message/GetMsgType",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).GetMsgType(ctx, req.(*GetMsgTypeReq))
@@ -564,24 +476,6 @@ func _Message_GetMsgType_Handler(srv interface{}, ctx context.Context, dec func(
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Message_UpdateMessageRead_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateMessageReadReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).UpdateMessageRead(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: Message_UpdateMessageRead_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).UpdateMessageRead(ctx, req.(*UpdateMessageReadReq))
-	}
-	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 {
@@ -592,7 +486,7 @@ func _Message_FindUserBuoyMsg_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: Message_FindUserBuoyMsg_FullMethodName,
+		FullMethod: "/message.Message/FindUserBuoyMsg",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).FindUserBuoyMsg(ctx, req.(*FindUserBuoyMsgReq))
@@ -610,7 +504,7 @@ func _Message_ClearUnreadMsg_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: Message_ClearUnreadMsg_FullMethodName,
+		FullMethod: "/message.Message/ClearUnreadMsg",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).ClearUnreadMsg(ctx, req.(*ClearUnreadMsgReq))
@@ -628,7 +522,7 @@ func _Message_UserMsgList_Handler(srv interface{}, ctx context.Context, dec func
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: Message_UserMsgList_FullMethodName,
+		FullMethod: "/message.Message/UserMsgList",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).UserMsgList(ctx, req.(*UserMsgListReq))
@@ -646,7 +540,7 @@ func _Message_SendWxTmplMsg_Handler(srv interface{}, ctx context.Context, dec fu
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: Message_SendWxTmplMsg_FullMethodName,
+		FullMethod: "/message.Message/SendWxTmplMsg",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).SendWxTmplMsg(ctx, req.(*WxTmplMsg))
@@ -654,6 +548,24 @@ 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)
+}
+
 // Message_ServiceDesc is the grpc.ServiceDesc for Message service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -673,14 +585,6 @@ var Message_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "SendUserMsg",
 			Handler:    _Message_SendUserMsg_Handler,
 		},
-		{
-			MethodName: "DeleteSingleMessage",
-			Handler:    _Message_DeleteSingleMessage_Handler,
-		},
-		{
-			MethodName: "DeleteMultipleMessage",
-			Handler:    _Message_DeleteMultipleMessage_Handler,
-		},
 		{
 			MethodName: "GetUnreadCount",
 			Handler:    _Message_GetUnreadCount_Handler,
@@ -709,10 +613,6 @@ var Message_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "GetMsgType",
 			Handler:    _Message_GetMsgType_Handler,
 		},
-		{
-			MethodName: "UpdateMessageRead",
-			Handler:    _Message_UpdateMessageRead_Handler,
-		},
 		{
 			MethodName: "FindUserBuoyMsg",
 			Handler:    _Message_FindUserBuoyMsg_Handler,
@@ -729,6 +629,10 @@ var Message_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "SendWxTmplMsg",
 			Handler:    _Message_SendWxTmplMsg_Handler,
 		},
+		{
+			MethodName: "UserUnreadMsgList",
+			Handler:    _Message_UserUnreadMsgList_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "message.proto",