diff --git a/handler/user.go b/handler/user.go index d8ea2c2..fd015cb 100644 --- a/handler/user.go +++ b/handler/user.go @@ -18,7 +18,7 @@ func SetUpUserGroup(router *gin.Engine) { userGroup := router.Group("/user") userGroup.POST("/register", registerHandler) userGroup.POST("/login", loginHandler) - userGroup.POST("/uuid", ScanUUID) + userGroup.POST("/uuid", GetScanUUID) userGroup.POST("/gqr", GetQRStatus) userGroup.POST("/sqr", SetQRStatus) userGroup.POST("/confirm", ConfirmQRLogin) @@ -38,7 +38,7 @@ type QRReq struct { IP string `json:"ip" form:"ip"` } -func ScanUUID(c *gin.Context) { +func GetScanUUID(c *gin.Context) { var ReqData QRReq if err := c.ShouldBind(&ReqData); err != nil { c.JSON(200, gin.H{"code": 9, "message": err, "data": "2"}) @@ -56,7 +56,7 @@ func ScanUUID(c *gin.Context) { func SetQRStatus(c *gin.Context) { var qrsetReq QRReq - if err := c.ShouldBind(&qrsetReq); err == nil || qrsetReq.UUID != "" { + if err := c.ShouldBind(&qrsetReq); err == nil && qrsetReq.UUID != "" { if worker.IsContainKey(qrsetReq.UUID) == false { c.JSON(200, gin.H{"code": 18, "message": "uuid not found in server", "data": "0"}) return @@ -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 { + if err := c.ShouldBind(&qrsetReq); err == nil && qrsetReq.UUID == "" { //user_id, _ := c.Get("id") user_name, _ := c.Get("username") if user_name != "" {