feat(phase2c): 群聊与已读回执功能完整实现
Phase 2c 全部 14 个 Task 完成，包含： 后端（Go）： - MinIO 文件存储服务集成（Docker + Go SDK + 通用上传 API） - Group 模块完整实现（DAO + Service + Controller + Router + Wire） - 18 个群管理 REST API + 11 个 WS 群事件推送 - 群创建/解散/邀请/踢人/退出/转让群主/设管理员/禁言/全体禁言/群公告/群昵称/免打扰/搜索 - IM Service 扩展（群消息发送/撤回 + @提醒 + 管理员无时限撤回） - 已读回执后端（单聊会话级 last_read_msg_id + 群聊消息级 im_message_reads） - 管理端群组管理（列表/详情/解散） - 数据库迁移（3 张新表 + 2 张表字段扩展） 前端（uni-app）： - 群聊 Store + API 封装 + 11 个 WS 事件监听 - 已读回执 UI（单聊已读/未读标记 + 群聊 X人已读 + 已读详情页） - 7 个群聊页面（对话/创建/设置/成员/邀请/审批/搜索） - 会话列表改造（全部/单聊/群聊 Tab + @标记 + 免打扰标识） 管理端（Vue 3 + Element Plus）： - 群组列表页（搜索/分页/详情弹窗/解散群聊） - 侧边栏群组管理入口 文档同步：进度/架构/设计/API/规范文档全部更新 Made-with: Cursor
This commit is contained in:
bujinyuan
@@ -7,13 +7,17 @@ import (
|
||||
authController "github.com/echochat/backend/app/auth/controller"
|
||||
"github.com/echochat/backend/app/auth/service"
|
||||
contactController "github.com/echochat/backend/app/contact/controller"
|
||||
fileController "github.com/echochat/backend/app/file/controller"
|
||||
groupController "github.com/echochat/backend/app/group/controller"
|
||||
imController "github.com/echochat/backend/app/im/controller"
|
||||
imHandler "github.com/echochat/backend/app/im/handler"
|
||||
wsApp "github.com/echochat/backend/app/ws"
|
||||
"github.com/echochat/backend/config"
|
||||
"github.com/echochat/backend/pkg/db"
|
||||
"github.com/echochat/backend/pkg/storage"
|
||||
"github.com/echochat/backend/pkg/ws"
|
||||
"github.com/google/wire"
|
||||
"github.com/minio/minio-go/v7"
|
||||
"github.com/redis/go-redis/v9"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
@@ -23,12 +27,14 @@ type App struct {
|
||||
Config *config.Config
|
||||
DB *gorm.DB
|
||||
Redis *redis.Client
|
||||
MinioClient *minio.Client // MinIO 对象存储客户端
|
||||
AuthService *service.AuthService // Auth 认证服务
|
||||
AuthController *authController.AuthController // 前台认证控制器
|
||||
AdminAuthController *authController.AdminAuthController // 后台认证控制器
|
||||
UserManageController *adminController.UserManageController // 管理端用户管理控制器
|
||||
OnlineController *adminController.OnlineController // 管理端在线监控控制器
|
||||
ContactManageController *adminController.ContactManageController // 管理端好友关系管理控制器
|
||||
GroupManageController *adminController.GroupManageController // 管理端群组管理控制器
|
||||
WSHandler *wsApp.Handler // WebSocket 连接处理器
|
||||
Hub *ws.Hub // WebSocket Hub 连接管理
|
||||
PubSub *ws.PubSub // Redis Pub/Sub 消息路由
|
||||
@@ -37,6 +43,8 @@ type App struct {
|
||||
IMController *imController.IMController // IM 即时通讯控制器
|
||||
IMEventHandler *imHandler.EventHandler // IM WS 事件处理器
|
||||
OfflinePusher *imHandler.OfflinePusher // 离线消息推送器
|
||||
FileController *fileController.FileController // 文件上传控制器
|
||||
GroupController *groupController.GroupController // 群聊管理控制器
|
||||
}
|
||||
|
||||
// NewApp 创建应用实例
|
||||
@@ -44,12 +52,14 @@ func NewApp(
|
||||
cfg *config.Config,
|
||||
gormDB *gorm.DB,
|
||||
redisClient *redis.Client,
|
||||
minioClient *minio.Client,
|
||||
authService *service.AuthService,
|
||||
authCtrl *authController.AuthController,
|
||||
adminAuthCtrl *authController.AdminAuthController,
|
||||
userManageCtrl *adminController.UserManageController,
|
||||
onlineCtrl *adminController.OnlineController,
|
||||
contactManageCtrl *adminController.ContactManageController,
|
||||
groupManageCtrl *adminController.GroupManageController,
|
||||
wsHandler *wsApp.Handler,
|
||||
hub *ws.Hub,
|
||||
pubsub *ws.PubSub,
|
||||
@@ -58,6 +68,8 @@ func NewApp(
|
||||
imCtrl *imController.IMController,
|
||||
imEventHandler *imHandler.EventHandler,
|
||||
offlinePusher *imHandler.OfflinePusher,
|
||||
fileCtrl *fileController.FileController,
|
||||
groupCtrl *groupController.GroupController,
|
||||
) *App {
|
||||
// 注入离线消息推送器到 WS Handler
|
||||
wsHandler.SetOfflinePusher(offlinePusher)
|
||||
@@ -66,12 +78,14 @@ func NewApp(
|
||||
Config: cfg,
|
||||
DB: gormDB,
|
||||
Redis: redisClient,
|
||||
MinioClient: minioClient,
|
||||
AuthService: authService,
|
||||
AuthController: authCtrl,
|
||||
AdminAuthController: adminAuthCtrl,
|
||||
UserManageController: userManageCtrl,
|
||||
OnlineController: onlineCtrl,
|
||||
ContactManageController: contactManageCtrl,
|
||||
GroupManageController: groupManageCtrl,
|
||||
WSHandler: wsHandler,
|
||||
Hub: hub,
|
||||
PubSub: pubsub,
|
||||
@@ -80,6 +94,8 @@ func NewApp(
|
||||
IMController: imCtrl,
|
||||
IMEventHandler: imEventHandler,
|
||||
OfflinePusher: offlinePusher,
|
||||
FileController: fileCtrl,
|
||||
GroupController: groupCtrl,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,12 +114,19 @@ func provideJWTConfig(cfg *config.Config) *config.JWTConfig {
|
||||
return &cfg.JWT
|
||||
}
|
||||
|
||||
// provideMinioConfig 从全局 Config 中提取 MinioConfig
|
||||
func provideMinioConfig(cfg *config.Config) *config.MinioConfig {
|
||||
return &cfg.Minio
|
||||
}
|
||||
|
||||
// InfraSet 基础设施层 Provider Set
|
||||
var InfraSet = wire.NewSet(
|
||||
provideDBConfig,
|
||||
provideRedisConfig,
|
||||
provideJWTConfig,
|
||||
provideMinioConfig,
|
||||
db.NewPostgres,
|
||||
db.NewRedis,
|
||||
storage.NewMinioClient,
|
||||
NewApp,
|
||||
)
|
||||
|
||||
@@ -6,11 +6,16 @@ package provider
|
||||
import (
|
||||
"github.com/echochat/backend/app/admin"
|
||||
"github.com/echochat/backend/app/auth"
|
||||
"github.com/echochat/backend/app/contact"
|
||||
authService "github.com/echochat/backend/app/auth/service"
|
||||
"github.com/echochat/backend/app/contact"
|
||||
contactDAO "github.com/echochat/backend/app/contact/dao"
|
||||
contactService "github.com/echochat/backend/app/contact/service"
|
||||
fileApp "github.com/echochat/backend/app/file"
|
||||
groupApp "github.com/echochat/backend/app/group"
|
||||
groupDAO "github.com/echochat/backend/app/group/dao"
|
||||
groupService "github.com/echochat/backend/app/group/service"
|
||||
imApp "github.com/echochat/backend/app/im"
|
||||
imDAO "github.com/echochat/backend/app/im/dao"
|
||||
imService "github.com/echochat/backend/app/im/service"
|
||||
wsApp "github.com/echochat/backend/app/ws"
|
||||
"github.com/echochat/backend/config"
|
||||
@@ -26,11 +31,17 @@ func InitializeApp(cfg *config.Config) (*App, error) {
|
||||
wsApp.WSSet,
|
||||
contact.ContactSet,
|
||||
imApp.IMSet,
|
||||
fileApp.FileSet,
|
||||
groupApp.GroupSet,
|
||||
wire.Bind(new(wsApp.FriendIDsGetter), new(*contactDAO.FriendshipDAO)),
|
||||
wire.Bind(new(groupService.UserInfoProvider), new(*contactDAO.FriendshipDAO)),
|
||||
wire.Bind(new(imService.GroupInfoGetter), new(*groupDAO.GroupDAO)),
|
||||
wire.Bind(new(imService.MessageReadRecorder), new(*groupDAO.MessageReadDAO)),
|
||||
wire.Bind(new(wsApp.TokenValidator), new(*authService.AuthService)),
|
||||
wire.Bind(new(imService.FriendChecker), new(*contactDAO.FriendshipDAO)),
|
||||
wire.Bind(new(imService.UserInfoGetter), new(*contactDAO.FriendshipDAO)),
|
||||
wire.Bind(new(contactService.OnlineChecker), new(*wsApp.OnlineService)),
|
||||
wire.Bind(new(groupService.MessageWriter), new(*imDAO.MessageDAO)),
|
||||
)
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
@@ -16,10 +16,16 @@ import (
|
||||
controller3 "github.com/echochat/backend/app/contact/controller"
|
||||
dao3 "github.com/echochat/backend/app/contact/dao"
|
||||
service3 "github.com/echochat/backend/app/contact/service"
|
||||
controller4 "github.com/echochat/backend/app/file/controller"
|
||||
service4 "github.com/echochat/backend/app/file/service"
|
||||
controller5 "github.com/echochat/backend/app/group/controller"
|
||||
dao4 "github.com/echochat/backend/app/group/dao"
|
||||
service5 "github.com/echochat/backend/app/group/service"
|
||||
imApp "github.com/echochat/backend/app/im"
|
||||
"github.com/echochat/backend/app/ws"
|
||||
"github.com/echochat/backend/config"
|
||||
"github.com/echochat/backend/pkg/db"
|
||||
"github.com/echochat/backend/pkg/storage"
|
||||
)
|
||||
|
||||
// Injectors from wire.go:
|
||||
@@ -36,6 +42,11 @@ func InitializeApp(cfg *config.Config) (*App, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
minioConfig := provideMinioConfig(cfg)
|
||||
minioClient, err := storage.NewMinioClient(minioConfig)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
userDAO := dao.NewUserDAO(gormDB)
|
||||
roleDAO := dao.NewRoleDAO(gormDB)
|
||||
jwtConfig := provideJWTConfig(cfg)
|
||||
@@ -62,11 +73,26 @@ func InitializeApp(cfg *config.Config) (*App, error) {
|
||||
// IM 模块初始化
|
||||
conversationDAO := imApp.ProvideConversationDAO(gormDB)
|
||||
messageDAO := imApp.ProvideMessageDAO(gormDB)
|
||||
imService := imApp.ProvideIMService(conversationDAO, messageDAO, pubSub, client, friendshipDAO, friendshipDAO)
|
||||
groupDAO := dao4.NewGroupDAO(gormDB)
|
||||
messageReadDAO := dao4.NewMessageReadDAO(gormDB)
|
||||
imService := imApp.ProvideIMService(conversationDAO, messageDAO, pubSub, client, friendshipDAO, friendshipDAO, groupDAO, messageReadDAO)
|
||||
imEventHandler := imApp.ProvideIMEventHandler(imService, hub)
|
||||
offlinePusher := imApp.ProvideOfflinePusher(imService, conversationDAO, pubSub)
|
||||
imController := imApp.ProvideIMController(imService)
|
||||
|
||||
app := NewApp(cfg, gormDB, client, authService, authController, adminAuthController, userManageController, onlineController, contactManageController, handler, hub, pubSub, onlineService, contactController, imController, imEventHandler, offlinePusher)
|
||||
// File 模块初始化
|
||||
fileService := service4.NewFileService(minioClient, minioConfig)
|
||||
fileController := controller4.NewFileController(fileService)
|
||||
|
||||
// Group 模块初始化
|
||||
joinRequestDAO := dao4.NewJoinRequestDAO(gormDB)
|
||||
groupService := service5.NewGroupService(groupDAO, joinRequestDAO, friendshipDAO, pubSub, messageDAO)
|
||||
groupController := controller5.NewGroupController(groupService)
|
||||
|
||||
// Admin 群组管理初始化
|
||||
groupManageService := service2.NewGroupManageService(gormDB, groupDAO)
|
||||
groupManageController := controller2.NewGroupManageController(groupManageService)
|
||||
|
||||
app := NewApp(cfg, gormDB, client, minioClient, authService, authController, adminAuthController, userManageController, onlineController, contactManageController, groupManageController, handler, hub, pubSub, onlineService, contactController, imController, imEventHandler, offlinePusher, fileController, groupController)
|
||||
return app, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user