feat(im):优化im体验，添加错误处理以及json消息解析

biz/container/container.go

@@ -2,6 +2,7 @@ package container
 
 import (
  "personal-page-be/biz/infra/config"
+ "personal-page-be/biz/internal/service/chat"
  "personal-page-be/biz/internal/service/file"
  "personal-page-be/biz/internal/service/global_service"
  "personal-page-be/biz/internal/service/message"
@@ -14,19 +15,22 @@ type Container struct {
  FileService file.IFileService
  GlobalService global_service.IGlobalService
  MessageService message.IMessageService
+ ChatService chat.IChatService
 }
 
 func NewContainer(config *config.Config, userService user.IUserService,
  fileService file.IFileService,
  globalService global_service.IGlobalService,
  messageService message.IMessageService,
+ chatService chat.IChatService,
 ) *Container {
  return &Container{
  Config: config,
  UserService: userService,
  FileService: fileService,
  GlobalService: globalService,
  MessageService: messageService,
+ ChatService: chatService,
  }
 
 }

biz/container/wire.go

@@ -5,9 +5,12 @@ package container
 
 import (
  "github.com/google/wire"
+ "personal-page-be/biz/infra/cache"
  "personal-page-be/biz/infra/config"
  "personal-page-be/biz/infra/database"
+ "personal-page-be/biz/infra/log"
  "personal-page-be/biz/internal/repo"
+ "personal-page-be/biz/internal/service/chat"
  "personal-page-be/biz/internal/service/file"
  "personal-page-be/biz/internal/service/global_service"
  "personal-page-be/biz/internal/service/message"
@@ -20,6 +23,8 @@ func GetContainer(path string) *Container {
  //infra
  config.InitConfig,
  database.NewDatabase,
+ cache.NewCache,
+ log.NewLogger,
 
  //repo
  repo.NewRepository,
@@ -29,6 +34,7 @@ func GetContainer(path string) *Container {
  file.NewFileService,
  global_service.NewGlobalService,
  message.NewMessageService,
+ chat.NewChatService,
 
  NewContainer,
  ))

biz/infra/cache/go-cache.go

@@ -0,0 +1,11 @@
+package cache
+
+import (
+ "github.com/patrickmn/go-cache"
+ "time"
+)
+
+func NewCache() *cache.Cache {
+ c := cache.New(1*time.Hour, 2*time.Hour)
+ return c
+}

biz/infra/log/log.go

@@ -1,10 +1,39 @@
 package log
 
 import (
+ "fmt"
  "github.com/sirupsen/logrus"
+ "os"
+ "path/filepath"
+ "runtime"
 )
 
+func getLogLevel() logrus.Level {
+ // 设置日志级别，可以根据需要修改
+ return logrus.DebugLevel
+}
+
+func getLogFormatter() logrus.Formatter {
+ // 定义日志输出格式
+ return &logrus.TextFormatter{
+ FullTimestamp: true,
+ TimestampFormat: "2006-01-02 15:04:05", //时间格式,
+ CallerPrettyfier: callerPrettyfier,
+ }
+}
+
+func callerPrettyfier(f *runtime.Frame) (string, string) {
+ // 格式化输出文件名和行号
+ filename := filepath.Base(f.File)
+ return fmt.Sprintf("%s:%d", filename, f.Line), ""
+}
+
 func NewLogger() *logrus.Logger {
- log := logrus.New()
- return log
+ // 初始化日志
+ logger := logrus.New()
+ logger.SetLevel(getLogLevel())
+ logger.SetOutput(os.Stdout)
+ logger.SetFormatter(getLogFormatter())
+
+ return logger
 }

biz/internal/domain/chat.go

@@ -0,0 +1,31 @@
+package domain
+
+import (
+ "github.com/hertz-contrib/websocket"
+ "golang.org/x/sync/semaphore"
+ "sync"
+ "time"
+)
+
+type ChatMessageEntity struct {
+ Type string `json:"type"`
+ Data string `json:"data"`
+ Time time.Time `json:"time"`
+ ErrorMsg string `json:"error_msg"`
+}
+
+type ChatEntity struct {
+ ChatID string
+ CreaterID string
+ JoinerID string
+ CreaterMessageLock sync.Mutex
+ JoinerMessageLock sync.Mutex
+ CreaterMessageWriteSem *semaphore.Weighted
+ CreaterMessageReadSem *semaphore.Weighted
+ JoinerMessageWriteSem *semaphore.Weighted
+ JoinerMessageReadSem *semaphore.Weighted
+ CreaterConn *websocket.Conn
+ JoinerConn *websocket.Conn
+ MessageSendByCreater []*ChatMessageEntity
+ MessageSendByJoiner []*ChatMessageEntity
+}

biz/internal/dto/chat.go

@@ -0,0 +1,11 @@
+package dto
+
+type SendMessageReq struct {
+ ClientID string `json:"client_id"`
+ Message string `json:"message"`
+ ChatID string `json:"chat_id"`
+}
+
+type JoinChatReq struct {
+ ChatID string `json:"chat_id"`
+}