Merge pull request #35 from 1005281342/main

fix: warning: "Breif" is a misspelling of "Brief"
pull/37/head
ROC 3 years ago committed by GitHub
commit ca27747231
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -20,7 +20,7 @@ type Message struct {
SenderUserID int64 `json:"sender_user_id"` SenderUserID int64 `json:"sender_user_id"`
ReceiverUserID int64 `json:"receiver_user_id"` ReceiverUserID int64 `json:"receiver_user_id"`
Type MessageT `json:"type"` Type MessageT `json:"type"`
Breif string `json:"breif"` Brief string `json:"brief"`
Content string `json:"content"` Content string `json:"content"`
PostID int64 `json:"post_id"` PostID int64 `json:"post_id"`
CommentID int64 `json:"comment_id"` CommentID int64 `json:"comment_id"`
@ -34,7 +34,7 @@ type MessageFormated struct {
SenderUser *UserFormated `json:"sender_user"` SenderUser *UserFormated `json:"sender_user"`
ReceiverUserID int64 `json:"receiver_user_id"` ReceiverUserID int64 `json:"receiver_user_id"`
Type MessageT `json:"type"` Type MessageT `json:"type"`
Breif string `json:"breif"` Brief string `json:"brief"`
Content string `json:"content"` Content string `json:"content"`
PostID int64 `json:"post_id"` PostID int64 `json:"post_id"`
Post *PostFormated `json:"post"` Post *PostFormated `json:"post"`
@ -57,7 +57,7 @@ func (m *Message) Format() *MessageFormated {
SenderUser: &UserFormated{}, SenderUser: &UserFormated{},
ReceiverUserID: m.ReceiverUserID, ReceiverUserID: m.ReceiverUserID,
Type: m.Type, Type: m.Type,
Breif: m.Breif, Brief: m.Brief,
Content: m.Content, Content: m.Content,
PostID: m.PostID, PostID: m.PostID,
Post: &PostFormated{}, Post: &PostFormated{},

@ -86,7 +86,7 @@ func SendUserWhisper(c *gin.Context) {
SenderUserID: userID.(int64), SenderUserID: userID.(int64),
ReceiverUserID: param.UserID, ReceiverUserID: param.UserID,
Type: model.MESSAGE_WHISPER, Type: model.MESSAGE_WHISPER,
Breif: "给你发送新私信了", Brief: "给你发送新私信了",
Content: param.Content, Content: param.Content,
}) })

@ -145,7 +145,7 @@ func (svc *Service) CreatePostComment(userID int64, param CommentCreationReq) (*
SenderUserID: userID, SenderUserID: userID,
ReceiverUserID: postMaster.ID, ReceiverUserID: postMaster.ID,
Type: model.MESSAGE_COMMENT, Type: model.MESSAGE_COMMENT,
Breif: "在泡泡中评论了你", Brief: "在泡泡中评论了你",
PostID: post.ID, PostID: post.ID,
CommentID: comment.ID, CommentID: comment.ID,
}) })
@ -161,7 +161,7 @@ func (svc *Service) CreatePostComment(userID int64, param CommentCreationReq) (*
SenderUserID: userID, SenderUserID: userID,
ReceiverUserID: user.ID, ReceiverUserID: user.ID,
Type: model.MESSAGE_COMMENT, Type: model.MESSAGE_COMMENT,
Breif: "在泡泡评论中@了你", Brief: "在泡泡评论中@了你",
PostID: post.ID, PostID: post.ID,
CommentID: comment.ID, CommentID: comment.ID,
}) })
@ -246,7 +246,7 @@ func (svc *Service) CreatePostCommentReply(commentID int64, content string, user
SenderUserID: userID, SenderUserID: userID,
ReceiverUserID: commentMaster.ID, ReceiverUserID: commentMaster.ID,
Type: model.MESSAGE_REPLY, Type: model.MESSAGE_REPLY,
Breif: "在泡泡评论下回复了你", Brief: "在泡泡评论下回复了你",
PostID: post.ID, PostID: post.ID,
CommentID: comment.ID, CommentID: comment.ID,
ReplyID: reply.ID, ReplyID: reply.ID,
@ -258,7 +258,7 @@ func (svc *Service) CreatePostCommentReply(commentID int64, content string, user
SenderUserID: userID, SenderUserID: userID,
ReceiverUserID: postMaster.ID, ReceiverUserID: postMaster.ID,
Type: model.MESSAGE_REPLY, Type: model.MESSAGE_REPLY,
Breif: "在泡泡评论下发布了新回复", Brief: "在泡泡评论下发布了新回复",
PostID: post.ID, PostID: post.ID,
CommentID: comment.ID, CommentID: comment.ID,
ReplyID: reply.ID, ReplyID: reply.ID,
@ -272,7 +272,7 @@ func (svc *Service) CreatePostCommentReply(commentID int64, content string, user
SenderUserID: userID, SenderUserID: userID,
ReceiverUserID: user.ID, ReceiverUserID: user.ID,
Type: model.MESSAGE_REPLY, Type: model.MESSAGE_REPLY,
Breif: "在泡泡评论的回复中@了你", Brief: "在泡泡评论的回复中@了你",
PostID: post.ID, PostID: post.ID,
CommentID: comment.ID, CommentID: comment.ID,
ReplyID: reply.ID, ReplyID: reply.ID,

@ -125,7 +125,7 @@ func (svc *Service) CreatePost(userID int64, param PostCreationReq) (*model.Post
SenderUserID: userID, SenderUserID: userID,
ReceiverUserID: user.ID, ReceiverUserID: user.ID,
Type: model.MESSAGE_POST, Type: model.MESSAGE_POST,
Breif: "在新发布的泡泡动态中@了你", Brief: "在新发布的泡泡动态中@了你",
PostID: post.ID, PostID: post.ID,
}) })
} }

@ -111,7 +111,7 @@ CREATE TABLE `p_message` (
`sender_user_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '发送方用户ID', `sender_user_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '发送方用户ID',
`receiver_user_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '接收方用户ID', `receiver_user_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '接收方用户ID',
`type` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '通知类型1动态2评论3回复4私信99系统通知', `type` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '通知类型1动态2评论3回复4私信99系统通知',
`breif` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '摘要说明', `brief` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '摘要说明',
`content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '详细内容', `content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '详细内容',
`post_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '动态ID', `post_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '动态ID',
`comment_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '评论ID', `comment_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '评论ID',

@ -46,11 +46,11 @@
<template #description> <template #description>
<n-alert <n-alert
:show-icon="false" :show-icon="false"
class="breif-wrap" class="brief-wrap"
:type="message.is_read > 0 ? 'default' : 'success'" :type="message.is_read > 0 ? 'default' : 'success'"
> >
<div class="breif-content"> <div class="brief-content">
{{ message.breif }} {{ message.brief }}
<span <span
v-if="message.type !== 4" v-if="message.type !== 4"
@click.stop="viewDetail(message)" @click.stop="viewDetail(message)"
@ -146,9 +146,9 @@ const handleReadMessage = (message: Item.MessageProps) => {
} }
} }
.breif-wrap { .brief-wrap {
margin-top: 10px; margin-top: 10px;
.breif-content { .brief-content {
display: flex; display: flex;
width: 100%; width: 100%;
} }

@ -192,7 +192,7 @@ declare module Item {
/** 类型1为动态2为评论3为回复4为私信99为系统通知 */ /** 类型1为动态2为评论3为回复4为私信99为系统通知 */
type: 1 | 2 | 3 | 4 | 99, type: 1 | 2 | 3 | 4 | 99,
/** 摘要说明 */ /** 摘要说明 */
breif: string, brief: string,
/** 详细内容 */ /** 详细内容 */
content: string, content: string,
/** 是否已读0为未读1为已读 */ /** 是否已读0为未读1为已读 */

Loading…
Cancel
Save