优化结构

internal/server/middleware/auth.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"kra/internal/biz/system"
+	httpx "kra/pkg/httpx"
 	"net/http"
 	"strconv"
 	"strings"
@@ -43,11 +44,11 @@ func AuthenticateWebSocket(c *gin.Context, auth TokenAuthenticator) bool {
 func authenticate(c *gin.Context, auth TokenAuthenticator, allowQueryToken bool) bool {
 	token := RequestToken(c, allowQueryToken)
 	if token == "" {
-		NoAuth(c, "未登录或非法访问，请登录")
+		httpx.NoAuth(c, "未登录或非法访问，请登录")
 		return false
 	}
 	if auth == nil {
-		NoAuth(c, "认证服务不可用")
+		httpx.NoAuth(c, "认证服务不可用")
 		return false
 	}
 	// Followers of a singleflight flight must not inherit the leader's request
@@ -61,20 +62,20 @@ func authenticate(c *gin.Context, auth TokenAuthenticator, allowQueryToken bool)
 		return auth.AuthenticateToken(ctx, token)
 	})
 	if err != nil {
-		SetTokenCookie(c, "", -1)
-		NoAuth(c, tokenErrorMessage(err))
+		httpx.SetTokenCookie(c, "", -1)
+		httpx.NoAuth(c, tokenErrorMessage(err))
 		return false
 	}
 	authentication, ok := value.(*system.TokenAuthentication)
 	if !ok || authentication == nil || authentication.Claims == nil {
-		SetTokenCookie(c, "", -1)
-		NoAuth(c, "无法处理此token")
+		httpx.SetTokenCookie(c, "", -1)
+		httpx.NoAuth(c, "无法处理此token")
 		return false
 	}
 	if authentication.Refreshed != nil {
 		c.Header("new-token", authentication.Refreshed.Value)
 		c.Header("new-expires-at", strconv.FormatInt(authentication.Refreshed.ExpiresAt.Unix(), 10))
-		SetTokenCookie(c, authentication.Refreshed.Value, int(authentication.Refreshed.TTL.Seconds()))
+		httpx.SetTokenCookie(c, authentication.Refreshed.Value, int(authentication.Refreshed.TTL.Seconds()))
 	}
 	c.Set(claimsKey, authentication.Claims)
 	return true
@@ -140,6 +141,6 @@ func MustChangePassword() gin.HandlerFunc {
 			c.Next()
 			return
 		}
-		c.AbortWithStatusJSON(http.StatusConflict, Response{Code: CodePasswordChangeRequired, Data: gin.H{"needChangePassword": true}, Msg: "密码已过期，请先修改密码"})
+		c.AbortWithStatusJSON(http.StatusConflict, httpx.Response{Code: httpx.CodePasswordChangeRequired, Data: gin.H{"needChangePassword": true}, Msg: "密码已过期，请先修改密码"})
 	}
 }