handler/im.go

@@ -178,30 +178,19 @@ func SRMessage(c *gin.Context) {
 	for {
 		if v := clients[ws]; v == true {
 			res2 := worker.PopRedisListLeft(res + "_" + strconv.Itoa(id1))
-			var res3 []byte
-			var msg proto.Message
 			if res2 != "" {
+				var msg proto.Message
 				msg.Type = "msg"
 				msg.Msg = res2
 				msg.From_user_id = id1
 				msg.Session = res
-				res3, _ = json.Marshal(msg)
-			} else {
-				//若无消息则发送心跳包
-				msg.Type = "check"
-				msg.Msg = "check"
-				msg.From_user_id = -1
-				msg.Session = res
-				res3, _ = json.Marshal(msg)
+				res3, _ := json.Marshal(msg)
+				err2 := ws.WriteMessage(websocket.TextMessage, res3)
+				if err2 != nil {
+					break
+				}
 			}
-			err2 := ws.WriteMessage(websocket.TextMessage, res3)
-			if err2 != nil {
-				clientsMux.Lock()
-				delete(clients, ws)
-				clientsMux.Unlock()
-				break
-			}
-			time.Sleep(time.Second * 1) // 每1秒查询一次
+			time.Sleep(time.Second * 1) // 每100毫秒查询一次
 		} else {
 			clientsMux.Lock()
 			delete(clients, ws)

service/videoService.go

@@ -3,7 +3,6 @@ package service
 import (
 	"fmt"
 	"strings"
-	"time"
 	"videoplayer/dao"
 	"videoplayer/proto"
 )
@@ -48,11 +47,7 @@ func GetVideoList(auth_id int, start, end, hour string) []dao.Video {
 			es1 := strings.Split(es[1], ":")
 			end = es[0] + " " + hour + ":" + es1[1] + ":" + es1[2]
 		}
-		_, err := time.Parse("2006-01-02 15:04:05", start)
-		_, err2 := time.Parse("2006-01-02 15:04:05", end)
-		if err != nil || err2 != nil {
-			return []dao.Video{}
-		}
+
 		return dao.FindVideoListByTime(auth_id, start, end)
 	}
 }