diff --git a/internal/config/redis.go b/internal/config/redis.go index edbc6b6..f341042 100644 --- a/internal/config/redis.go +++ b/internal/config/redis.go @@ -1,10 +1,7 @@ package config import ( - "context" "fmt" - - "github.com/redis/go-redis/v9" ) // RedisConfig Redis 配置 @@ -62,19 +59,3 @@ type MiniredisConfig struct { Port int `mapstructure:"port"` } -// NewRedis 创建 Redis 客户端(真实 Redis) -func NewRedis(cfg *RedisConfig) (*redis.Client, error) { - client := redis.NewClient(&redis.Options{ - Addr: cfg.Redis.Addr(), - Password: cfg.Redis.Password, - DB: cfg.Redis.DB, - PoolSize: cfg.PoolSize, - }) - - ctx := context.Background() - if err := client.Ping(ctx).Err(); err != nil { - return nil, fmt.Errorf("failed to connect to redis: %w", err) - } - - return client, nil -} diff --git a/internal/config/storage.go b/internal/config/storage.go index dc6c63a..f993d09 100644 --- a/internal/config/storage.go +++ b/internal/config/storage.go @@ -1,14 +1,5 @@ package config -import ( - "context" - "fmt" - "time" - - "github.com/minio/minio-go/v7" - "github.com/minio/minio-go/v7/pkg/credentials" -) - // S3Config S3 存储配置 type S3Config struct { Endpoint string `mapstructure:"endpoint"` @@ -19,30 +10,3 @@ type S3Config struct { Region string `mapstructure:"region"` Domain string `mapstructure:"domain"` // 自定义域名,如 s3.carrot.skin } - -// NewS3 创建 S3 客户端 -func NewS3(cfg *S3Config) (*minio.Client, error) { - ctx, cancel := context.WithTimeout(context.Background(), time.Second*10) - defer cancel() - - client, err := minio.New(cfg.Endpoint, &minio.Options{ - Creds: credentials.NewStaticV4(cfg.AccessKey, cfg.SecretKey, ""), - Secure: cfg.UseSSL, - }) - if err != nil { - return nil, fmt.Errorf("failed to create S3 client: %w", err) - } - - exists, err := client.BucketExists(ctx, cfg.Bucket) - if err != nil { - // Access Denied 或网络不通时,跳过 bucket 检查,假定 bucket 已存在 - } else if !exists { - if err := client.MakeBucket(ctx, cfg.Bucket, minio.MakeBucketOptions{ - Region: cfg.Region, - }); err != nil { - return nil, fmt.Errorf("failed to create bucket: %w", err) - } - } - - return client, nil -}