From 9c494de4c1289eeb51b7179e700f8e2213075795 Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Thu, 13 Jun 2024 11:33:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=B7=E6=B1=82uuid?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=88=96=E4=B8=8D=E5=AD=98=E5=9C=A8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AEredis=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9uuid?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=87=BD=E6=95=B0=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handler/user.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 != "" {