Merge branch 'refs/heads/feature-im-gitea'

This commit is contained in:
junleea 2024-08-08 17:11:28 +08:00
commit 2009d3403a
1 changed files with 9 additions and 4 deletions

View File

@ -368,8 +368,13 @@ func ServerSsendMsgV2(c *gin.Context) {
msg := msgs[0]
//发送消息
msg_str, _ := json.Marshal(msg)
_, err := c.Writer.Write([]byte("data: " + string(msg_str) + "\n\n"))
if err != nil {
var msg_ proto.Message
msg_.Type = "msg"
msg_.Msg = string(msg_str)
msg_str2, _ := json.Marshal(msg_)
err2 := ws.WriteMessage(websocket.TextMessage, msg_str2)
if err2 != nil {
worker.SetRedisWithExpire("user_"+strconv.Itoa(user_id)+"_status_v2", "0", time.Second*3600)
clientsMux.Lock()
delete(clients, ws)
@ -384,8 +389,8 @@ func ServerSsendMsgV2(c *gin.Context) {
msg.From_user_id = -1
//发送心跳包
res3, _ := json.Marshal(msg)
_, err := c.Writer.Write([]byte("data: " + string(res3) + "\n\n"))
if err != nil {
err2 := ws.WriteMessage(websocket.TextMessage, res3)
if err2 != nil {
worker.SetRedisWithExpire("user_"+strconv.Itoa(user_id)+"_status_v2", "0", time.Second*3600)
clientsMux.Lock()
delete(clients, ws)