pkg/common/ws/chatRoom.go

@@ -190,7 +190,7 @@ func (o *ChatRoom) Register(c *Client) (sessionId string) {
 // sessionId： 会话id
 // msgType： 消息类型
 // message: 消息内容
-func (o *ChatRoom) SendSessionMessage(sender *accountFiee.ChatUserData, sessionId string, msgType WsType, message any) (userIdInSession []int64, err error) {
+func (o *ChatRoom) SendSessionMessage(chatUser *accountFiee.ChatUserData, sessionId string, msgType WsType, message any) (userIdInSession []int64, err error) {
 	fmt.Println("ChatRoom.SendSessionMessage ------------------1")
 	//o.clientsRwLocker.Lock()
 	//defer o.clientsRwLocker.Unlock()
@@ -212,13 +212,13 @@ func (o *ChatRoom) SendSessionMessage(sender *accountFiee.ChatUserData, sessionI
 			_, exist := o.clients[client.UserId][client.ClientId]
 			if exist {
 				usableClients = append(usableClients, o.Session[sessionId][i])
-				go o.pushEvent(EventChatMessage, EventProgressBefore, sender, o.Session[sessionId][i], message)
+				go o.pushEvent(EventChatMessage, EventProgressBefore, chatUser, o.Session[sessionId][i], message)
 			}
 		}
 		fmt.Printf("client:%+v\n", client)
-		if client != nil && (client.UserId != sender.ID || sender.Role == 3) {
+		if client != nil && (client.UserId != chatUser.ID || chatUser.Role == 3) {
 			client.Send <- msgBytes
-			go o.pushEvent(EventChatMessage, EventProgressAfter, sender, o.Session[sessionId][i], message)
+			go o.pushEvent(EventChatMessage, EventProgressAfter, chatUser, o.Session[sessionId][i], message)
 			userIdInSession = append(userIdInSession, client.UserId)
 		}
 		//client.Send <- msgBytes

pkg/service/asChat/dto/dto.go

@@ -55,17 +55,15 @@ type MessageListType struct {
 	ID        int64   `json:"ID"`
 	CreatedAt string  `json:"createdAt"`
 	UserId    int64   `json:"userId"`
-	Role      int32   `json:"role,omitempty"`
 	Name      string  `json:"name"`
 	Message   Message `json:"message"`
 }
 
-func (m *MessageListType) BuildMessage(data *accountFiee.ChatRecordData, role int32) {
+func (m *MessageListType) BuildMessage(data *accountFiee.ChatRecordData) {
 	m.ID = data.ID
 	m.CreatedAt = data.CreatedAt
 	m.UserId = data.UserId
 	m.Name = data.Name
-	m.Role = role
 	switch data.MsgType {
 	default:
 		m.Message.MsgType = data.MsgType

pkg/service/asChat/handler.go

@@ -322,7 +322,7 @@ func (cr ChatHandler) MessageList(c *gin.Context) {
 			}
 			returnDataIdList = append(returnDataIdList, message.ID)
 			var msg = &dto.MessageListType{}
-			msg.BuildMessage(message, 0)
+			msg.BuildMessage(message)
 			resp = append(resp, msg)
 		}
 	} else {
@@ -354,7 +354,7 @@ func (cr ChatHandler) MessageList(c *gin.Context) {
 			total++
 			returnDataIdList = append(returnDataIdList, message.ID)
 			var msg = &dto.MessageListType{}
-			msg.BuildMessage(message, 0)
+			msg.BuildMessage(message)
 			resp = append(resp, msg)
 		}
 	}

pkg/service/asChat/logic/chat.go

@@ -75,7 +75,7 @@ func NewMessage(ctx context.Context, cache *chatCache.ChatCache, chatUser *accou
 	fmt.Println("NewMessage 6")
 	//发送websocket消息提醒通知
 	var notice = dto.MessageListType{}
-	notice.BuildMessage(resp.Data, chatUser.Role)
+	notice.BuildMessage(resp.Data)
 	fmt.Printf("ws消息提醒:%+v\n", notice)
 	_, err = consts.ChatRoom.SendSessionMessage(chatUser, request.SessionId, ws.NewChatMsgType, notice)
 	if err != nil {