v1

internal/pkg/session/session.go

@@ -10,9 +10,8 @@ import (
 	"management/internal/erpserver/model/dto"
 	"management/internal/pkg/config"
 
-	"github.com/alexedwards/scs/postgresstore"
 	"github.com/alexedwards/scs/v2"
-	"gorm.io/gorm"
+	"github.com/redis/go-redis/v9"
 )
 
 var ErrNoSession = errors.New("session user not found")
@@ -20,8 +19,8 @@ var ErrNoSession = errors.New("session user not found")
 // Manager 抽象核心会话操作
 type Manager interface {
 	Load(next http.Handler) http.Handler
-	GetUser(ctx context.Context, key string) (*dto.AuthorizeUser, error)
-	PutUser(ctx context.Context, key string, user *dto.AuthorizeUser) error
+	GetUser(ctx context.Context, key string) (dto.AuthorizeUser, error)
+	PutUser(ctx context.Context, key string, user dto.AuthorizeUser) error
 	RenewToken(ctx context.Context) error
 	Destroy(ctx context.Context) error
 }
@@ -30,7 +29,7 @@ type SCSSession struct {
 	manager *scs.SessionManager
 }
 
-func NewSCSManager(db *gorm.DB, config *config.Config) (Manager, error) {
+func NewSCSManager(client *redis.Client, conf *config.Config) (Manager, error) {
 	sessionManager := scs.New()
 	sessionManager.Lifetime = 24 * time.Hour
 	sessionManager.IdleTimeout = 2 * time.Hour
@@ -38,21 +37,21 @@ func NewSCSManager(db *gorm.DB, config *config.Config) (Manager, error) {
 	sessionManager.Cookie.HttpOnly = true
 	sessionManager.Cookie.Persist = true
 	sessionManager.Cookie.SameSite = http.SameSiteStrictMode
-	sessionManager.Cookie.Secure = config.App.Prod
+	sessionManager.Cookie.Secure = conf.App.Prod
 
-	sqlDB, err := db.DB()
-	if err != nil {
-		return nil, err
-	}
+	//sqlDB, err := db.DB()
+	//if err != nil {
+	//	return nil, err
+	//}
 
 	// postgres
 	// github.com/alexedwards/scs/postgresstore
-	sessionManager.Store = postgresstore.New(sqlDB)
+	// sessionManager.Store = postgresstore.New(sqlDB)
 	// pgx
 	// github.com/alexedwards/scs/pgxstore
 	// sessionManager.Store = pgxstore.New(pool)
 	// redis
-	// sessionManager.Store = newRedisStore()
+	sessionManager.Store = NewRedisStore(client)
 	return &SCSSession{manager: sessionManager}, nil
 }
 
@@ -60,21 +59,21 @@ func (s *SCSSession) Load(next http.Handler) http.Handler {
 	return s.manager.LoadAndSave(next)
 }
 
-func (s *SCSSession) GetUser(ctx context.Context, key string) (*dto.AuthorizeUser, error) {
+func (s *SCSSession) GetUser(ctx context.Context, key string) (dto.AuthorizeUser, error) {
 	data, ok := s.manager.Get(ctx, key).([]byte)
 	if !ok || len(data) == 0 {
-		return nil, ErrNoSession
+		return dto.AuthorizeUser{}, ErrNoSession
 	}
 
 	var user dto.AuthorizeUser
 	if err := json.Unmarshal(data, &user); err != nil {
-		return nil, err
+		return dto.AuthorizeUser{}, err
 	}
-	return &user, nil
+	return user, nil
 }
 
-func (s *SCSSession) PutUser(ctx context.Context, key string, user *dto.AuthorizeUser) error {
-	data, err := json.Marshal(user)
+func (s *SCSSession) PutUser(ctx context.Context, key string, user dto.AuthorizeUser) error {
+	data, err := json.Marshal(&user)
 	if err != nil {
 		return err
 	}