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

handler/im.go

@@ -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"))
+				var msg_ proto.Message
-				if err != nil {
+				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"))
+			err2 := ws.WriteMessage(websocket.TextMessage, res3)
-			if err != nil {
+			if err2 != nil {
 				worker.SetRedisWithExpire("user_"+strconv.Itoa(user_id)+"_status_v2", "0", time.Second*3600)
 				clientsMux.Lock()
 				delete(clients, ws)