姐姐冲突

api/internal/handler/routes.go

@@ -48,7 +48,7 @@ func RegisterHandlers(engine *rest.Server, serverCtx *svc.ServiceContext) {
 				Handler: MessageTypeHandler(serverCtx),
 			},
 			{
-				Method:  http.MethodGet,
+				Method:  http.MethodPost,
 				Path:    "/message/messageSetReadStatus",
 				Handler: MessageSetReadStatusHandler(serverCtx),
 			},

api/internal/logic/messagedetaillogic.go

@@ -26,10 +26,6 @@ func NewMessageDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) Mess
 }
 
 func (l *MessageDetailLogic) MessageDetail(req types.MessageDetailReq) (*types.MessageDetailResp, error) {
-<<<<<<< HEAD
-=======
-
->>>>>>> 6f28afb30f4f6a2d23106a4b3b3ade24e733f2c0
 	result := &types.MessageDetailResp{}
 	log.Println(req)
 	lsi := l.svcCtx.MessageCenter

api/internal/logic/messagegetlastlogic.go

@@ -27,7 +27,7 @@ func NewMessageGetLastLogic(ctx context.Context, svcCtx *svc.ServiceContext) Mes
 func (l *MessageGetLastLogic) MessageGetLast(req types.MessageGetLastReq) (*types.MessageGetLastRes, error) {
 	// todo: add your logic here and delete this line
 	result := &types.MessageGetLastRes{}
-	//log.Println(req)
+	log.Println("MessageGetLast",req)
 	lsi := l.svcCtx.MessageCenter
 	resp, err := lsi.GetLastMessage(l.ctx, &messageclient.GetLastMessageReq{
 		MsgType: req.MsgType,

api/internal/types/types.go

@@ -59,7 +59,6 @@ type MessageUnreadClassCountRes struct {
 	Code    int64                    `json:"code"`
 	Message string                   `json:"message"`
 	Data    []map[string]interface{} `json:"data"`
-	Info    []map[string]interface{} `json:"info"`
 }
 
 type MessageUnreadCountReq struct {

api/message.api

@@ -61,7 +61,6 @@ type MessageUnreadClassCountRes {
 	Code    int64                    `json:"code"`
 	Message string                   `json:"message"`
 	Data    []map[string]interface{} `json:"data"`
-	Info    []map[string]interface{} `json:"info"`
 }
 type MessageUnreadCountReq {
 	UserId string `form:"userId"`
@@ -147,7 +146,7 @@ service message-api {
 	get /message/messageType (MessageTypeReq) returns (MessageTypeRes)
 	// 修改指定用户的某个分类的消息为已读
 	@handler MessageSetReadStatusHandler
-	get /message/messageSetReadStatus (MsgReadStatusReq) returns (MsgReadStatusResp)
+	post /message/messageSetReadStatus (MsgReadStatusReq) returns (MsgReadStatusResp)
 	// 标记为已读
 	@handler MarkReadHandler
 	post /message/markRead (MarkReadReq) returns (MarkReadRes)

rpc/internal/logic/updatemessagereadlogic.go

@@ -29,13 +29,9 @@ func NewUpdateMessageReadLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 // 修改用户指定分类下的消息已读未读
 func (l *UpdateMessageReadLogic) UpdateMessageRead(in *message.UpdateMessageReadReq) (*message.UpdateMessageReadResp, error) {
 	// todo: add your logic here and delete this line
-<<<<<<< HEAD
-	service := &service.MessageService{}
-	status, err := service.UpdateMessageReadStatus(int(in.MsgType), in.ReceiveUserid, in.AppId)
-=======
+
 	m := service.MessageService{}
 	status, err := m.UpdateMessageReadStatus(int(in.MsgType), in.ReceiveUserid, in.AppId)
->>>>>>> 6f28afb30f4f6a2d23106a4b3b3ade24e733f2c0
 	if status == 0 && err != nil {
 		return &message.UpdateMessageReadResp{
 			Code:    1,