重构项目结构，将 orm 和 rds 包迁移到 web/globals

web/services/session.go

@@ -6,8 +6,8 @@ import (
 	"errors"
 	"fmt"
 	"platform/pkg/env"
-	"platform/pkg/rds"
 	"platform/web/auth"
+	g "platform/web/globals"
 	"time"
 
 	"github.com/google/uuid"
@@ -45,7 +45,7 @@ type sessionService struct{}
 func (s *sessionService) Find(ctx context.Context, token string) (*auth.Context, error) {
 
 	// 读取认证数据
-	authJSON, err := rds.Client.Get(ctx, accessKey(token)).Result()
+	authJSON, err := g.Redis.Get(ctx, accessKey(token)).Result()
 	if err != nil {
 		if errors.Is(err, redis.Nil) {
 			return nil, ErrInvalidToken
@@ -89,7 +89,7 @@ func (s *sessionService) Create(ctx context.Context, authCtx auth.Context, remem
 	var accessExpire = time.Duration(env.SessionAccessExpire) * time.Second
 	var refreshExpire = time.Duration(env.SessionRefreshExpire) * time.Second
 
-	pipe := rds.Client.TxPipeline()
+	pipe := g.Redis.TxPipeline()
 	pipe.Set(ctx, accessKey(accessToken), authData, accessExpire)
 	if remember {
 		pipe.Set(ctx, refreshKey(refreshToken), refreshData, refreshExpire)
@@ -116,7 +116,7 @@ func (s *sessionService) Refresh(ctx context.Context, refreshToken string) (*Tok
 	var tokenDetails *TokenDetails
 
 	// 刷新令牌
-	err := rds.Client.Watch(ctx, func(tx *redis.Tx) error {
+	err := g.Redis.Watch(ctx, func(tx *redis.Tx) error {
 
 		// 先获取刷新令牌数据
 		refreshJson, err := tx.Get(ctx, rKey).Result()
@@ -185,7 +185,7 @@ func (s *sessionService) Refresh(ctx context.Context, refreshToken string) (*Tok
 
 // Remove 删除会话
 func (s *sessionService) Remove(ctx context.Context, accessToken, refreshToken string) error {
-	rds.Client.Del(ctx, accessKey(accessToken), refreshKey(refreshToken))
+	g.Redis.Del(ctx, accessKey(accessToken), refreshKey(refreshToken))
 	return nil
 }