From c324a1707cfa531f2f6daea7b3395019eeb89cbe Mon Sep 17 00:00:00 2001 From: lijun <2021141461138@stu.scu.edu.cn> Date: Tue, 21 May 2024 11:10:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=86=E9=A2=91=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=9A=84=E8=A7=86=E9=A2=91id=E6=9C=AA=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/db.go | 2 +- dao/video.go | 4 ++-- handler/user.go | 4 ++-- handler/video.go | 4 +++- service/videoService.go | 4 ++-- worker/redis.go | 4 ++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dao/db.go b/dao/db.go index 58e97a0..f16d155 100644 --- a/dao/db.go +++ b/dao/db.go @@ -8,7 +8,7 @@ import ( var DB *gorm.DB func Init() { - dsn := "video_t:SDssrzALGiidPcjE@tcp(127.0.0.1:3306)/video_t?charset=utf8mb4&parseTime=True&loc=Local" + dsn := "root:lj123456@tcp(127.0.0.1:3306)/video_t?charset=utf8mb4&parseTime=True&loc=Local" db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{}) if err != nil { diff --git a/dao/video.go b/dao/video.go index 4b8937a..6936bf5 100644 --- a/dao/video.go +++ b/dao/video.go @@ -19,8 +19,8 @@ type Video struct { FileSize int `gorm:"column:file_size"` } -func CreateVideo(videoPath, videoName string, authID, human, isDelete int, createTime, endTime string, fileSize int) uint { - video := Video{VideoPath: videoPath, VideoName: videoName, AuthId: authID, Human: human, IsDelete: isDelete, CreateTime: createTime, EndTime: endTime, FileSize: fileSize} +func CreateVideo(videoPath, videoName string, cameraID, authID, human, isDelete int, createTime, endTime string, fileSize int) uint { + video := Video{VideoPath: videoPath, VideoName: videoName, CameraID: cameraID, AuthId: authID, Human: human, IsDelete: isDelete, CreateTime: createTime, EndTime: endTime, FileSize: fileSize} res := DB.Debug().Create(&video) if res.Error != nil { return 0 diff --git a/handler/user.go b/handler/user.go index c8075d1..daa5e61 100644 --- a/handler/user.go +++ b/handler/user.go @@ -62,7 +62,7 @@ func registerHandler(c *gin.Context) { token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{ "username": req_data.User, "id": id, - "exp": time.Now().Add(time.Hour * 100).Unix(), // 令牌过期时间, 1分钟后过期 + "exp": time.Now().Add(time.Hour * 10).Unix(), // 令牌过期时间, 1分钟后过期 }) tokenString, err = token.SignedString(signingKey) if err != nil { @@ -72,7 +72,7 @@ func registerHandler(c *gin.Context) { c.JSON(400, gin.H{"error": err.Error()}) } fmt.Println(req_data) - worker.SetRedisWithExpire(req_data.User, tokenString, 600) // 设置过期时间为10分钟 + worker.SetRedisWithExpire(tokenString, tokenString, time.Hour*10) // 设置过期时间为10分钟 // 返回令牌 c.JSON(200, gin.H{"token": tokenString, "username": req_data.User}) } diff --git a/handler/video.go b/handler/video.go index 032b45d..9fed3bd 100644 --- a/handler/video.go +++ b/handler/video.go @@ -1,6 +1,7 @@ package handler import ( + "fmt" "github.com/gin-gonic/gin" "net/http" "os" @@ -91,7 +92,8 @@ func CreateVideo(c *gin.Context) { var video_req videoReq user_id, _ := c.Get("id") if err := c.ShouldBindJSON(&video_req); err == nil { - id := service.CreateVideo(video_req.VideoPath, video_req.VideoName, int(user_id.(float64)), video_req.Human, video_req.IsDelete, video_req.CreateTime, video_req.EndTime, video_req.FileSize) + fmt.Println(video_req) + id := service.CreateVideo(video_req.VideoPath, video_req.VideoName, video_req.CameraID, int(user_id.(float64)), video_req.Human, video_req.IsDelete, video_req.CreateTime, video_req.EndTime, video_req.FileSize) if id == 0 { c.JSON(http.StatusBadRequest, gin.H{"error": "create video failed", "code": 1, "message": "failed"}) return diff --git a/service/videoService.go b/service/videoService.go index 37d98d0..803d14a 100644 --- a/service/videoService.go +++ b/service/videoService.go @@ -26,8 +26,8 @@ func DelayVideo(id, auth_id, day int) { dao.DelayVideo(id, auth_id, day) } -func CreateVideo(videoPath, videoName string, authID, human, isDelete int, createTime, endTime string, fileSize int) uint { - return dao.CreateVideo(videoPath, videoName, authID, human, isDelete, createTime, endTime, fileSize) +func CreateVideo(videoPath, videoName string, cameraID, authID, human, isDelete int, createTime, endTime string, fileSize int) uint { + return dao.CreateVideo(videoPath, videoName, cameraID, authID, human, isDelete, createTime, endTime, fileSize) } func DeleteVideo(id, user int) int { diff --git a/worker/redis.go b/worker/redis.go index 4f0c6b8..9dce23a 100644 --- a/worker/redis.go +++ b/worker/redis.go @@ -17,8 +17,8 @@ func InitRedis() { // 连接redis redisClient = redis.NewClient(&redis.Options{ Addr: "127.0.0.1:6379", // Redis 服务器地址 - Password: "lj502138", // 如果 Redis 设置了密码 - DB: 2, // 使用的数据库编号 + Password: "", // 如果 Redis 设置了密码 + DB: 0, // 使用的数据库编号 }) // 验证 Redis 客户端是否可以正常工作