handler/tool.go

@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"VideoStream/dao"
 	"VideoStream/proto"
 	"VideoStream/service"
 	"VideoStream/worker"
@@ -68,7 +69,7 @@ func GetVideoStream(c *gin.Context) {
 	id, _ := c.Get("id")
 	id1 := id.(int)
 	//校验权限
-	device := service.GetDevice(req.ID, id1)
+	device := dao.FindDeviceByID(req.ID, id1)
 	if device.ID == 0 {
 		c.JSON(400, gin.H{"error": "device not exist"})
 		return

proto/conf.go

@@ -1,6 +1,7 @@
 package proto
 
 import (
+	"VideoStream/worker"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -79,9 +80,10 @@ func ReadConfig(path string) error {
 	if err2 != nil {
 		fmt.Println("ReadConfigToSetSystem Error encoding config,err :", err2)
 	}
+	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
 }

service/tool.go

@@ -3,7 +3,6 @@ package service
 import (
 	"VideoStream/dao"
 	"VideoStream/proto"
-	"VideoStream/worker"
 	"fmt"
 	"gocv.io/x/gocv"
 	"image"
@@ -147,7 +146,3 @@ func DoGetVideoStream() {
 func GetDevice(id, auth_id int) dao.Device {
 	return dao.FindDeviceByID(id, auth_id)
 }
-
-func SetConfigRedis(key, config string) {
-	worker.SetRedis(key, config)
-}