wanglei/EchoChat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Phase 2e-1 统一通知中心 + 我的 TabBar 聚合未读红点

Browse Source 
后端（notify 模块）
- 新增 notify 模块：DAO/Service/Pusher 接口/Controller/Router/CleanupTask
- 数据库 DDL：notify_notifications 表 + 3 索引（user+created/user+is_read/user+category）
- 11 种 type 枚举（好友/群聊 9 种 + meeting_* 2 种预留）+ 4 种 category
- 跨模块集成：contact 3 处 Pusher（friend_request/accepted/rejected）
- 跨模块集成：group 6 处 Pusher（invite/join_request/approved/rejected/kicked/role_changed）
- WS handler 断线补偿：连接建立即推送 notify.unread.total
- 5 REST API（4 用户 + 1 管理员广播）+ 2 WS 事件（notify.new / notify.unread.total）
- 30 天已读通知定时清理（未读永久保留）
- Provider/Wire 依赖注入（NotifyPusher、NotifyConnectHook、UserInfoResolver 接口）

前端
- 新增 notify 模块：API/Pinia Store（5 分类分页缓存 + 未读数 + WS 事件）/NotifyItem/通知中心主页
- profile 入口：铃铛 badge + 菜单项 badge + 数字显示
- App.vue/login 初始化 notifyStore WS 监听；logout 调用 notifyStore.reset() 清缓存
- 清理 contact.js/group.js 中散落 toast 与冗余 notify.friend.request/group.join.request 处理
- CustomTabBar 新增 hasDot() 聚合指示器：我的 Tab 显示纯红点（无数字），
  当前聚合 notifyStore.unreadTotal，未来可扩展「资料待完善/安全提醒/新版本」等

文档
- 新增 Phase 2e 整体路线图 docs/plans/2026-04-20-phase2e-design.md
- 新增 Phase 2e-1 专用设计 docs/plans/2026-04-20-phase2e-1-design.md（§6.4 TabBar 聚合红点）
- 新增 Phase 2e-1 实施计划 docs/plans/2026-04-20-phase2e-1-implementation.plan.md
- 新增 E2E 验证报告 test-report-phase2e-1-notification.md（含 Playwright MCP 2 个现场 Bug 修复记录）
- 更新 docs/progress/CURRENT_STATUS.md、docs/api/README.md、docs/api/frontend/notify.md
- 更新 .cursor/rules/project-context.mdc、docs/plans/2026-02-27-echochat-system-design.md

其他
- .gitignore 排除 .playwright-mcp/ MCP 临时快照

架构决策
- 单端 WS 连接：沿用现有 ws.Hub，多端已读同步推迟到 Phase 2f/二期
- 跨模块依赖：contact/group → notify 严格单向（接口注入模式）
- 降级策略：Pusher 先入库后推送；WS 失败不回滚入库；入库失败仅 Warn 不影响业务

Playwright MCP 回归（4 类场景全通）
- 实时推送（admin 广播 → 1s 内前端自动插入 + 角标 +1）
- Deep-link 跳转（好友申请通知 → contact/request 页）
- 批量清零（全部已读按钮）
- TabBar 聚合红点（有未读亮/全部已读灭）与 notifyStore.unreadTotal 三层同步

Made-with: Cursor
This commit is contained in:
bujinyuan
2026-04-21 10:21:01 +08:00
parent ccfceefdaf
commit f1853f125d
42 changed files with 4493 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
backend/go-service/app/contact/service/contact_service.go
View File

@@ -6,10 +6,11 @@ import (
"errors"
"sort"
"github.com/echochat/backend/app/constants"
"github.com/echochat/backend/app/contact/dao"
"github.com/echochat/backend/app/dto"
notifyService "github.com/echochat/backend/app/notify/service"
"github.com/echochat/backend/pkg/logs"
"github.com/echochat/backend/pkg/ws"
"go.uber.org/zap"
"gorm.io/gorm"
)
@@ -30,26 +31,33 @@ type OnlineChecker interface {
BatchCheckOnline(ctx context.Context, userIDs []int64) map[int64]bool
}
// NotifyPusher 通知推送接口
// 由 notify.service.NotifyService 隐式实现；contact → notify 单向依赖
// 此处以接口形式注入，便于测试替换并明确调用契约
type NotifyPusher interface {
Push(ctx context.Context, payload *notifyService.PushPayload)
}
// ContactService 联系人业务服务
type ContactService struct {
friendshipDAO *dao.FriendshipDAO
friendGroupDAO *dao.FriendGroupDAO
pubsub *ws.PubSub
onlineChecker OnlineChecker
notifyPusher NotifyPusher
}
// NewContactService 创建 ContactService 实例
func NewContactService(
friendshipDAO *dao.FriendshipDAO,
friendGroupDAO *dao.FriendGroupDAO,
pubsub *ws.PubSub,
onlineChecker OnlineChecker,
notifyPusher NotifyPusher,
) *ContactService {
return &ContactService{
friendshipDAO: friendshipDAO,
friendGroupDAO: friendGroupDAO,
pubsub: pubsub,
onlineChecker: onlineChecker,
notifyPusher: notifyPusher,
}
}
@@ -99,12 +107,20 @@ func (s *ContactService) SendFriendRequest(ctx context.Context, userID, targetID
}
}
push := ws.NewPushMessage("notify.friend.request", map[string]interface{}{
"from_user_id": userID,
"message": message,
})
if pubErr := s.pubsub.PublishToUser(ctx, targetID, push); pubErr != nil {
logs.Warn(ctx, funcName, "推送好友申请通知失败", zap.Error(pubErr))
if s.notifyPusher != nil {
actorID := userID
targetUser := targetID
s.notifyPusher.Push(ctx, &notifyService.PushPayload{
UserID: targetID,
Type: constants.NotifyTypeFriendRequest,
Content: message,
ActorID: &actorID,
TargetType: constants.NotifyTargetUser,
TargetID: &targetUser,
Extra: map[string]interface{}{
"message": message,
},
})
}
return nil
@@ -132,11 +148,20 @@ func (s *ContactService) AcceptFriendRequest(ctx context.Context, requestID, use
return err
}
push := ws.NewPushMessage("contact.request.accepted", map[string]interface{}{
"user_id": userID,
})
if pubErr := s.pubsub.PublishToUser(ctx, req.UserID, push); pubErr != nil {
logs.Warn(ctx, funcName, "推送申请接受通知失败", zap.Error(pubErr))
if s.notifyPusher != nil {
actorID := userID
targetUser := userID
s.notifyPusher.Push(ctx, &notifyService.PushPayload{
UserID: req.UserID,
Type: constants.NotifyTypeFriendAccepted,
Content: "对方已接受你的好友申请",
ActorID: &actorID,
TargetType: constants.NotifyTargetUser,
TargetID: &targetUser,
Extra: map[string]interface{}{
"request_id": requestID,
},
})
}
return nil
@@ -148,11 +173,41 @@ func (s *ContactService) RejectFriendRequest(ctx context.Context, requestID, use
logs.Info(ctx, funcName, "拒绝好友申请",
zap.Int64("request_id", requestID), zap.Int64("user_id", userID))
err := s.friendshipDAO.RejectRequest(ctx, requestID, userID)
if errors.Is(err, gorm.ErrRecordNotFound) {
req, err := s.friendshipDAO.GetRequestByID(ctx, requestID)
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return ErrRequestNotFound
}
return err
}
if req.FriendID != userID {
return ErrRequestNotFound
}
return err
if err := s.friendshipDAO.RejectRequest(ctx, requestID, userID); err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return ErrRequestNotFound
}
return err
}
if s.notifyPusher != nil {
actorID := userID
targetUser := userID
s.notifyPusher.Push(ctx, &notifyService.PushPayload{
UserID: req.UserID,
Type: constants.NotifyTypeFriendRejected,
Content: "对方拒绝了你的好友申请",
ActorID: &actorID,
TargetType: constants.NotifyTargetUser,
TargetID: &targetUser,
Extra: map[string]interface{}{
"request_id": requestID,
},
})
}
return nil
}
// GetFriendList 获取好友列表（包含在线状态）