diff --git a/handler/tool.go b/handler/tool.go index 0b2ab32..03e80f6 100644 --- a/handler/tool.go +++ b/handler/tool.go @@ -1,7 +1,6 @@ package handler import ( - "VideoStream/dao" "VideoStream/proto" "VideoStream/service" "VideoStream/worker" @@ -69,7 +68,7 @@ func GetVideoStream(c *gin.Context) { id, _ := c.Get("id") id1 := id.(int) //校验权限 - device := dao.FindDeviceByID(req.ID, id1) + device := service.GetDevice(req.ID, id1) if device.ID == 0 { c.JSON(400, gin.H{"error": "device not exist"}) return diff --git a/proto/conf.go b/proto/conf.go index eb92aeb..02abce4 100644 --- a/proto/conf.go +++ b/proto/conf.go @@ -82,8 +82,8 @@ func ReadConfig(path string) error { } worker.SetRedis("vp_stream_config", string(jsonData)) SigningKey = []byte(Config.TOKEN_SECRET) - //if Config.TOKEN_SECRET == "" { - // err = fmt.Errorf("token secret is empty: %s", string(jsonData)) - //} + if Config.TOKEN_SECRET == "" { + err = fmt.Errorf("token secret is empty: %s", string(jsonData)) + } return err }