u

code/allapp/allapp-go/utils/jwtx/jwt.go

@@ -13,16 +13,9 @@ type CustomClaims struct {
 	jwt.RegisteredClaims
 }
 
-type TokenResult struct {
-	Claims    *CustomClaims
-	IsValid   bool
-	IsExpired bool
-}
-
 type jwtManager struct {
-	secret        string
-	accessExpiry  time.Duration
-	refreshExpiry time.Duration
+	secret      string
+	tokenExpiry time.Duration
 }
 
 var (
@@ -30,76 +23,59 @@ var (
 	once    sync.Once
 )
 
-// InitJwt 初始化全局 JWT 配置，只能调用一次
+// InitJwt 初始化全局 JWT 配置
 func InitJwt() {
 	once.Do(func() {
 		manager = &jwtManager{
-			secret:        conf.GetConf().JWT.Secret,
-			accessExpiry:  conf.GetConf().JWT.AccessExpiry,
-			refreshExpiry: conf.GetConf().JWT.RefreshExpiry,
+			secret:      conf.GetConf().JWT.Secret,
+			tokenExpiry: conf.GetConf().JWT.AccessExpiry, // 直接当唯一 token
 		}
 	})
 }
 
-// CreateAccessToken 全局函数创建 Access Token
-func CreateAccessToken(userID int64) (string, error) {
-	return manager.createToken(userID, manager.accessExpiry)
+// CreateToken 创建 JWT
+func CreateToken(userID int64) (string, error) {
+	if manager == nil {
+		return "", jwt.ErrTokenInvalidClaims
+	}
+	return manager.createToken(userID)
 }
 
-// CreateRefreshToken 全局函数创建 Refresh Token
-func CreateRefreshToken(userID int64) (string, error) {
-	return manager.createToken(userID, manager.refreshExpiry)
-}
-
-// VerifyToken 全局函数验证 Token
-func VerifyToken(tokenString string) TokenResult {
-	result := TokenResult{IsValid: false, IsExpired: false}
-
+// VerifyToken 校验 JWT（合法 or 不合法）
+func VerifyToken(tokenString string) (*CustomClaims, bool) {
 	if tokenString == "" || manager == nil {
-		return result
+		return nil, false
 	}
 
 	token, err := jwt.ParseWithClaims(tokenString, &CustomClaims{}, func(token *jwt.Token) (interface{}, error) {
 		return []byte(manager.secret), nil
 	})
 
-	if token == nil {
-		return result
+	if err != nil || !token.Valid {
+		return nil, false
 	}
 
 	claims, ok := token.Claims.(*CustomClaims)
 	if !ok {
-		return result
+		return nil, false
 	}
 
-	if err != nil || !token.Valid {
-		return result
-	}
-
-	result.Claims = claims
-	result.IsValid = true
-	if claims.ExpiresAt != nil && time.Now().After(claims.ExpiresAt.Time) {
-		result.IsExpired = true
-	}
-	return result
+	return claims, true
 }
 
-// 内部方法，生成 Token
-func (j *jwtManager) createToken(userID int64, expiry time.Duration) (string, error) {
+func (j *jwtManager) createToken(userID int64) (string, error) {
+	now := time.Now()
+
 	claims := &CustomClaims{
 		UserID: userID,
 		RegisteredClaims: jwt.RegisteredClaims{
-			IssuedAt: jwt.NewNumericDate(time.Now()),
+			IssuedAt: jwt.NewNumericDate(now),
 		},
 	}
 
-	switch {
-	case expiry > 0:
-		claims.ExpiresAt = jwt.NewNumericDate(time.Now().Add(expiry))
-	case expiry == -1:
-		claims.ExpiresAt = nil // 永不过期
-	default:
-		claims.ExpiresAt = jwt.NewNumericDate(time.Now().Add(time.Hour))
+	// 只有大于 0 才设置过期时间
+	if j.tokenExpiry > 0 {
+		claims.ExpiresAt = jwt.NewNumericDate(now.Add(j.tokenExpiry))
 	}
 
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)