From 7198cdecdbf94fb0ffe45fb59c1c7a61d52715af Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 18 Oct 2024 14:15:55 +0800
Subject: [PATCH] 222

---
 api/middlewares/auth.go | 14 ++++++++++++--
 api/middlewares/jwt.go  | 10 ++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/api/middlewares/auth.go b/api/middlewares/auth.go
index e571729..6a2561a 100644
--- a/api/middlewares/auth.go
+++ b/api/middlewares/auth.go
@@ -2,8 +2,10 @@ package middlewares
 
 import (
 	"github.com/gin-gonic/gin"
+	"net/http"
 	"vote-admin-api/api/dao"
 	"vote-admin-api/api/responses"
+	"vote-admin-api/consts"
 )
 
 // Auth Auth认证
@@ -21,13 +23,21 @@ func Auth() gin.HandlerFunc {
 		userDao := dao.UserDao{}
 		user, err := userDao.GetUserById(userId)
 		if err != nil || user == nil {
-			responses.FailWithMessage("用户数据错误", c)
+			c.JSON(http.StatusUnauthorized, gin.H{
+				"message": "用户数据错误",
+				"code":    consts.UserStatusError,
+				"data":    "",
+			})
 			c.Abort()
 			return
 		}
 
 		if user.UserStatus == 2 {
-			responses.FailWithMessage("用户已禁用", c)
+			c.JSON(http.StatusUnauthorized, gin.H{
+				"message": "用户已禁用",
+				"code":    consts.UserStatusError,
+				"data":    "",
+			})
 			c.Abort()
 			return
 		}
diff --git a/api/middlewares/jwt.go b/api/middlewares/jwt.go
index 81c8621..e7e2669 100644
--- a/api/middlewares/jwt.go
+++ b/api/middlewares/jwt.go
@@ -26,6 +26,16 @@ func Jwt() gin.HandlerFunc {
 
 		// 去除Bearer
 		authorization = authorization[7:] // 截取字符
+		if authorization == "" {
+			c.JSON(http.StatusOK, gin.H{
+				"message": "token错误/过期",
+				"code":    consts.TokenError,
+				"data":    "",
+			})
+
+			c.Abort()
+			return
+		}
 
 		// 检测是否存在黑名单
 		res, _ := global.Redis.Get(c, "jwt_black_"+authorization).Result()