diff --git a/handler/user.go b/handler/user.go index fd015cb..3dac02e 100644 --- a/handler/user.go +++ b/handler/user.go @@ -76,7 +76,7 @@ func SetQRStatus(c *gin.Context) { // 确认返回token数据 func ConfirmQRLogin(c *gin.Context) { var qrsetReq QRReq - if err := c.ShouldBind(&qrsetReq); err == nil && qrsetReq.UUID == "" { + if err := c.ShouldBind(&qrsetReq); err == nil && qrsetReq.UUID != "" { //user_id, _ := c.Get("id") user_name, _ := c.Get("username") if user_name != "" { diff --git a/service/videoService.go b/service/videoService.go index df65a91..7017158 100644 --- a/service/videoService.go +++ b/service/videoService.go @@ -31,7 +31,7 @@ func GetVideoList(auth_id int, start, end string) []dao.Video { fmt.Println(err2) return []dao.Video{} } - return dao.FindVideoListByTime(auth_id, s.Format("2006-01-02 15:04:05"), e.Format("2006-01-02 15:04:05")) + return dao.FindVideoListByTime(auth_id, start, end) } }