优化登录逻辑。

This commit is contained in:
2026-08-12 10:57:37 +08:00
parent a1d57d6b44
commit 043bf8773b
5 changed files with 52 additions and 44 deletions
+19 -22
View File
@@ -10,24 +10,32 @@ import (
"github.com/golang-jwt/jwt/v5"
)
// tokenFromContext 统一从 Cookie 或 Authorization 头提取 JWT token
// 优先读 Cookie(服务端渲染 + 同域 AJAX 自动携带),回退到 Authorization 头
func tokenFromContext(c *gin.Context) string {
if tokenString, err := c.Cookie("token"); err == nil && tokenString != "" {
return tokenString
}
authHeader := c.GetHeader("Authorization")
if authHeader != "" {
parts := strings.SplitN(authHeader, " ", 2)
if len(parts) == 2 && parts[0] == "Bearer" {
return parts[1]
}
}
return ""
}
// JWT 认证中间件
func JWTAuth() gin.HandlerFunc {
return func(c *gin.Context) {
authHeader := c.GetHeader("Authorization")
if authHeader == "" {
tokenString := tokenFromContext(c)
if tokenString == "" {
c.JSON(http.StatusUnauthorized, gin.H{"error": "缺少认证令牌"})
c.Abort()
return
}
parts := strings.SplitN(authHeader, " ", 2)
if len(parts) != 2 || parts[0] != "Bearer" {
c.JSON(http.StatusUnauthorized, gin.H{"error": "认证格式错误"})
c.Abort()
return
}
tokenString := parts[1]
claims := &handlers.Claims{}
token, err := jwt.ParseWithClaims(tokenString, claims, func(token *jwt.Token) (interface{}, error) {
@@ -61,20 +69,9 @@ func AdminRequired() gin.HandlerFunc {
}
// OptionalAuth 可选认证中间件(用于某些既支持游客又支持登录用户的接口/页面)
// 优先读 Authorization 头,其次回退到 Cookie(服务端渲染的前台页面依赖 Cookie)
func OptionalAuth() gin.HandlerFunc {
return func(c *gin.Context) {
tokenString := ""
authHeader := c.GetHeader("Authorization")
if authHeader != "" {
parts := strings.SplitN(authHeader, " ", 2)
if len(parts) == 2 && parts[0] == "Bearer" {
tokenString = parts[1]
}
}
if tokenString == "" {
tokenString, _ = c.Cookie("token")
}
tokenString := tokenFromContext(c)
if tokenString == "" {
c.Next()
return