🐛 resolve interface validation issues

middleware/check_client.go

@@ -1,31 +0,0 @@
-package middleware
-
-import (
-	ginI18n "github.com/gin-contrib/i18n"
-	"github.com/gin-gonic/gin"
-	"schisandra-cloud-album/common/constant"
-	"schisandra-cloud-album/common/redis"
-	"schisandra-cloud-album/common/result"
-	"schisandra-cloud-album/utils"
-)
-
-// CheckClientMiddleware 检查客户端请求是否合法
-func CheckClientMiddleware() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		id := c.GetHeader("X-Request-Id")
-		if id == "" {
-			result.FailWithMessage(ginI18n.MustGetMessage(c, "AuthVerifyFailed"), c)
-			c.Abort()
-			return
-		}
-
-		ip := utils.GetClientIP(c)
-		clientId := redis.Get(constant.UserLoginClientRedisKey + ip).Val()
-		if clientId == "" || clientId != id {
-			result.FailWithMessage(ginI18n.MustGetMessage(c, "AuthVerifyFailed"), c)
-			c.Abort()
-			return
-		}
-		c.Next()
-	}
-}

middleware/cors.go

@@ -1,26 +0,0 @@
-package middleware
-
-import (
-	"github.com/gin-gonic/gin"
-	"net/http"
-)
-
-// Cors 自定义跨域中间件
-func Cors() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		method := c.Request.Method
-		origin := c.Request.Header.Get("Origin")
-		if origin != "" {
-			c.Header("Access-Control-Allow-Origin", "*")
-			c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE")
-			c.Header("Access-Control-Allow-Headers", "Content-Type,AccessToken,X-CSRF-Token, Authorization")
-			c.Header("Access-Control-Allow-Credentials", "true")
-			c.Set("content-type", "application/json")
-		}
-		//放行所有OPTIONS方法
-		if method == "OPTIONS" {
-			c.AbortWithStatus(http.StatusNoContent)
-		}
-		c.Next()
-	}
-}

middleware/jwt.go

@@ -24,8 +24,7 @@ func JWTAuthMiddleware() gin.HandlerFunc {
 		// 默认双Token放在请求头Authorization的Bearer中，并以空格隔开
 		authHeader := c.GetHeader(global.CONFIG.JWT.HeaderKey)
 		if authHeader == "" {
-
-			result.FailWithMessage(ginI18n.MustGetMessage(c, "AuthVerifyFailed"), c)
+			result.FailWithCodeAndMessage(403, ginI18n.MustGetMessage(c, "AuthVerifyExpired"), c)
 			c.Abort()
 			return
 		}
@@ -33,11 +32,11 @@ func JWTAuthMiddleware() gin.HandlerFunc {
 		accessToken := strings.TrimPrefix(authHeader, headerPrefix+" ")
 
 		if accessToken == "" {
-
-			result.FailWithMessage(ginI18n.MustGetMessage(c, "AuthVerifyFailed"), c)
+			result.FailWithCodeAndMessage(403, ginI18n.MustGetMessage(c, "AuthVerifyExpired"), c)
 			c.Abort()
 			return
 		}
+
 		parseToken, isUpd, err := utils.ParseAccessToken(accessToken)
 		if err != nil || !isUpd {
 			result.FailWithCodeAndMessage(401, ginI18n.MustGetMessage(c, "AuthVerifyExpired"), c)
@@ -45,15 +44,20 @@ func JWTAuthMiddleware() gin.HandlerFunc {
 			return
 		}
 		token := redis.Get(constant.UserLoginTokenRedisKey + *parseToken.UserID).Val()
+		if token == "" {
+			result.FailWithCodeAndMessage(403, ginI18n.MustGetMessage(c, "AuthVerifyExpired"), c)
+			c.Abort()
+			return
+		}
 		tokenResult := TokenData{}
 		err = json.Unmarshal([]byte(token), &tokenResult)
 		if err != nil {
-			result.FailWithMessage(ginI18n.MustGetMessage(c, "AuthVerifyExpired"), c)
+			result.FailWithCodeAndMessage(403, ginI18n.MustGetMessage(c, "AuthVerifyExpired"), c)
 			c.Abort()
 			return
 		}
 		if tokenResult.AccessToken != accessToken {
-			result.FailWithCodeAndMessage(403, ginI18n.MustGetMessage(c, "DuplicateLogin"), c)
+			result.FailWithCodeAndMessage(403, ginI18n.MustGetMessage(c, "AuthVerifyExpired"), c)
 			c.Abort()
 			return
 		}