Add S3 configuration and presigned URL logic for file upload and download

2025-10-24 22:32:36 +08:00
parent 289812aac3
commit ec80aa92fa
8 changed files with 225 additions and 11 deletions
--- a/app/etc/blog.yaml
+++ b/app/etc/blog.yaml
@@ -1,3 +1,14 @@
 Name: Blog
 Host: 0.0.0.0
 Port: 8888
+
+Database:
+  DSN: "${DATABASE_DSN}" # postgres: host=localhost port=5432 user=postgres password=your_password dbname=steam_union sslmode=disable
+
+S3:
+  Region: us-east-1
+  Bucket: your-bucket-name
+  AccessKeyID: your-access-key-id
+  SecretAccessKey: your-secret-access-key
+  Endpoint: # Optional: for custom S3-compatible endpoints (e.g., MinIO)
+  PresignedURLExpiration: 3600 # Expiration time in seconds (default 1 hour)
--- a/app/internal/config/config.go
+++ b/app/internal/config/config.go
@@ -4,4 +4,19 @@ import "github.com/zeromicro/go-zero/rest"

 type Config struct {
 	rest.RestConf
+	Database DatabaseConfig
+	S3       S3Config
+}
+
+type DatabaseConfig struct {
+	DSN string
+}
+
+type S3Config struct {
+	Region                 string
+	Bucket                 string
+	AccessKeyID            string
+	SecretAccessKey        string
+	Endpoint               string `json:",optional"`     // Optional: for S3-compatible services
+	PresignedURLExpiration int64  `json:",default=3600"` // Default 1 hour
 }
--- a/app/internal/logic/downloadpresignedurllogic.go
+++ b/app/internal/logic/downloadpresignedurllogic.go
@@ -2,10 +2,12 @@ package logic

 import (
 	"context"
+	"time"

 	"git.cialloo.com/CiallooWeb/Blog/app/internal/svc"
 	"git.cialloo.com/CiallooWeb/Blog/app/internal/types"

+	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/zeromicro/go-zero/core/logx"
 )

@@ -25,7 +27,29 @@ func NewDownloadPresignedURLLogic(ctx context.Context, svcCtx *svc.ServiceContex
 }

 func (l *DownloadPresignedURLLogic) DownloadPresignedURL(req *types.DownloadPresignedURLReq) (resp *types.DownloadPresignedURLResp, err error) {
-	// todo: add your logic here and delete this line
+	// Calculate expiration time
+	expiration := time.Duration(l.svcCtx.Config.S3.PresignedURLExpiration) * time.Second
+	expireAt := time.Now().Add(expiration).Unix()

-	return
+	// Create presigned client
+	presignClient := s3.NewPresignClient(l.svcCtx.S3Client)
+
+	// Generate presigned GET URL
+	getObjectInput := &s3.GetObjectInput{
+		Bucket: &l.svcCtx.Config.S3.Bucket,
+		Key:    &req.File_key,
+	}
+
+	presignedReq, err := presignClient.PresignGetObject(l.ctx, getObjectInput, func(opts *s3.PresignOptions) {
+		opts.Expires = expiration
+	})
+	if err != nil {
+		l.Errorf("Failed to generate presigned URL: %v", err)
+		return nil, err
+	}
+
+	return &types.DownloadPresignedURLResp{
+		Url:       presignedReq.URL,
+		Expire_at: expireAt,
+	}, nil
 }
--- a/app/internal/logic/pinglogic.go
+++ b/app/internal/logic/pinglogic.go
@@ -25,7 +25,7 @@ func NewPingLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PingLogic {
 }

 func (l *PingLogic) Ping(req *types.PingReq) (resp *types.PingResp, err error) {
-	// todo: add your logic here and delete this line
-
-	return
+	return &types.PingResp{
+		Ok: true,
+	}, nil
 }
--- a/app/internal/logic/uploadpresignedurllogic.go
+++ b/app/internal/logic/uploadpresignedurllogic.go
@@ -2,10 +2,15 @@ package logic

 import (
 	"context"
+	"fmt"
+	"path/filepath"
+	"time"

 	"git.cialloo.com/CiallooWeb/Blog/app/internal/svc"
 	"git.cialloo.com/CiallooWeb/Blog/app/internal/types"

+	"github.com/aws/aws-sdk-go-v2/service/s3"
+	"github.com/google/uuid"
 	"github.com/zeromicro/go-zero/core/logx"
 )

@@ -25,7 +30,42 @@ func NewUploadPresignedURLLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 }

 func (l *UploadPresignedURLLogic) UploadPresignedURL(req *types.UploadPresignedURLReq) (resp *types.UploadPresignedURLResp, err error) {
-	// todo: add your logic here and delete this line
+	// Generate unique file key
+	ext := filepath.Ext(req.File_name)
+	fileKey := fmt.Sprintf("%s%s", uuid.New().String(), ext)

-	return
+	// Calculate expiration time
+	expiration := time.Duration(l.svcCtx.Config.S3.PresignedURLExpiration) * time.Second
+	expireAt := time.Now().Add(expiration)
+
+	// Create presigned client
+	presignClient := s3.NewPresignClient(l.svcCtx.S3Client)
+
+	// Generate presigned PUT URL
+	putObjectInput := &s3.PutObjectInput{
+		Bucket: &l.svcCtx.Config.S3.Bucket,
+		Key:    &fileKey,
+	}
+
+	presignedReq, err := presignClient.PresignPutObject(l.ctx, putObjectInput, func(opts *s3.PresignOptions) {
+		opts.Expires = expiration
+	})
+	if err != nil {
+		l.Errorf("Failed to generate presigned URL: %v", err)
+		return nil, err
+	}
+
+	// Insert record into tmpfiles table
+	query := `INSERT INTO tmpfiles (file_name, key, presigned_url, expiration) VALUES ($1, $2, $3, $4)`
+	_, err = l.svcCtx.DB.ExecContext(l.ctx, query, req.File_name, fileKey, presignedReq.URL, expireAt)
+	if err != nil {
+		l.Errorf("Failed to insert tmpfile record: %v", err)
+		return nil, err
+	}
+
+	return &types.UploadPresignedURLResp{
+		Url:       presignedReq.URL,
+		File_key:  fileKey,
+		Expire_at: expireAt.Unix(),
+	}, nil
 }
--- a/app/internal/svc/servicecontext.go
+++ b/app/internal/svc/servicecontext.go
@@ -1,15 +1,80 @@
 package svc

 import (
+	"context"
+	"database/sql"
+
 	"git.cialloo.com/CiallooWeb/Blog/app/internal/config"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	awsconfig "github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/credentials"
+	"github.com/aws/aws-sdk-go-v2/service/s3"
+	_ "github.com/lib/pq"
 )

 type ServiceContext struct {
 	Config   config.Config
+	S3Client *s3.Client
+	DB       *sql.DB
 }

 func NewServiceContext(c config.Config) *ServiceContext {
 	return &ServiceContext{
 		Config:   c,
+		S3Client: initS3Client(c.S3),
+		DB:       initDatabase(c.Database),
 	}
 }
+
+func initDatabase(dbConfig config.DatabaseConfig) *sql.DB {
+	db, err := sql.Open("postgres", dbConfig.DSN)
+	if err != nil {
+		panic(err)
+	}
+
+	// Verify connection
+	if err := db.Ping(); err != nil {
+		panic(err)
+	}
+
+	return db
+}
+
+func initS3Client(s3Config config.S3Config) *s3.Client {
+	var cfg aws.Config
+	var err error
+
+	if s3Config.Endpoint != "" {
+		// Custom endpoint (e.g., MinIO)
+		cfg, err = awsconfig.LoadDefaultConfig(context.Background(),
+			awsconfig.WithRegion(s3Config.Region),
+			awsconfig.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(
+				s3Config.AccessKeyID,
+				s3Config.SecretAccessKey,
+				"",
+			)),
+		)
+		if err != nil {
+			panic(err)
+		}
+		return s3.NewFromConfig(cfg, func(o *s3.Options) {
+			o.BaseEndpoint = aws.String(s3Config.Endpoint)
+			o.UsePathStyle = true
+		})
+	}
+
+	// Standard AWS S3
+	cfg, err = awsconfig.LoadDefaultConfig(context.Background(),
+		awsconfig.WithRegion(s3Config.Region),
+		awsconfig.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(
+			s3Config.AccessKeyID,
+			s3Config.SecretAccessKey,
+			"",
+		)),
+	)
+	if err != nil {
+		panic(err)
+	}
+
+	return s3.NewFromConfig(cfg)
+}
--- a/go.mod
+++ b/go.mod
@@ -2,9 +2,31 @@ module git.cialloo.com/CiallooWeb/Blog

 go 1.24.4

-require github.com/zeromicro/go-zero v1.9.2
+require (
+	github.com/aws/aws-sdk-go-v2 v1.39.4
+	github.com/aws/aws-sdk-go-v2/config v1.31.15
+	github.com/aws/aws-sdk-go-v2/credentials v1.18.19
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.88.7
+	github.com/google/uuid v1.6.0
+	github.com/lib/pq v1.10.9
+	github.com/zeromicro/go-zero v1.9.2
+)

 require (
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.11 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.29.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.38.9 // indirect
+	github.com/aws/smithy-go v1.23.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -12,7 +34,6 @@ require (
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/grafana/pyroscope-go v1.2.7 // indirect
 	github.com/grafana/pyroscope-go/godeltaprof v0.1.9 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,39 @@
+github.com/aws/aws-sdk-go-v2 v1.39.4 h1:qTsQKcdQPHnfGYBBs+Btl8QwxJeoWcOcPcixK90mRhg=
+github.com/aws/aws-sdk-go-v2 v1.39.4/go.mod h1:yWSxrnioGUZ4WVv9TgMrNUeLV3PFESn/v+6T/Su8gnM=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 h1:t9yYsydLYNBk9cJ73rgPhPWqOh/52fcWDQB5b1JsKSY=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2/go.mod h1:IusfVNTmiSN3t4rhxWFaBAqn+mcNdwKtPcV16eYdgko=
+github.com/aws/aws-sdk-go-v2/config v1.31.15 h1:gE3M4xuNXfC/9bG4hyowGm/35uQTi7bUKeYs5e/6uvU=
+github.com/aws/aws-sdk-go-v2/config v1.31.15/go.mod h1:HvnvGJoE2I95KAIW8kkWVPJ4XhdrlvwJpV6pEzFQa8o=
+github.com/aws/aws-sdk-go-v2/credentials v1.18.19 h1:Jc1zzwkSY1QbkEcLujwqRTXOdvW8ppND3jRBb/VhBQc=
+github.com/aws/aws-sdk-go-v2/credentials v1.18.19/go.mod h1:DIfQ9fAk5H0pGtnqfqkbSIzky82qYnGvh06ASQXXg6A=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.11 h1:X7X4YKb+c0rkI6d4uJ5tEMxXgCZ+jZ/D6mvkno8c8Uw=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.11/go.mod h1:EqM6vPZQsZHYvC4Cai35UDg/f5NCEU+vp0WfbVqVcZc=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11 h1:7AANQZkF3ihM8fbdftpjhken0TP9sBzFbV/Ze/Y4HXA=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11/go.mod h1:NTF4QCGkm6fzVwncpkFQqoquQyOolcyXfbpC98urj+c=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11 h1:ShdtWUZT37LCAA4Mw2kJAJtzaszfSHFb5n25sdcv4YE=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11/go.mod h1:7bUb2sSr2MZ3M/N+VyETLTQtInemHXb/Fl3s8CLzm0Y=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11 h1:bKgSxk1TW//00PGQqYmrq83c+2myGidEclp+t9pPqVI=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11/go.mod h1:vrPYCQ6rFHL8jzQA8ppu3gWX18zxjLIDGTeqDxkBmSI=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 h1:xtuxji5CS0JknaXoACOunXOYOQzgfTvGAc9s2QdCJA4=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2/go.mod h1:zxwi0DIR0rcRcgdbl7E2MSOvxDyyXGBlScvBkARFaLQ=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2 h1:DGFpGybmutVsCuF6vSuLZ25Vh55E3VmsnJmFfjeBx4M=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2/go.mod h1:hm/wU1HDvXCFEDzOLorQnZZ/CVvPXvWEmHMSmqgQRuA=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11 h1:GpMf3z2KJa4RnJ0ew3Hac+hRFYLZ9DDjfgXjuW+pB54=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11/go.mod h1:6MZP3ZI4QQsgUCFTwMZA2V0sEriNQ8k2hmoHF3qjimQ=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11 h1:weapBOuuFIBEQ9OX/NVW3tFQCvSutyjZYk/ga5jDLPo=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11/go.mod h1:3C1gN4FmIVLwYSh8etngUS+f1viY6nLCDVtZmrFbDy0=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.88.7 h1:Wer3W0GuaedWT7dv/PiWNZGSQFSTcBY2rZpbiUp5xcA=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.88.7/go.mod h1:UHKgcRSx8PVtvsc1Poxb/Co3PD3wL7P+f49P0+cWtuY=
+github.com/aws/aws-sdk-go-v2/service/sso v1.29.8 h1:M5nimZmugcZUO9wG7iVtROxPhiqyZX6ejS1lxlDPbTU=
+github.com/aws/aws-sdk-go-v2/service/sso v1.29.8/go.mod h1:mbef/pgKhtKRwrigPPs7SSSKZgytzP8PQ6P6JAAdqyM=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.3 h1:S5GuJZpYxE0lKeMHKn+BRTz6PTFpgThyJ+5mYfux7BM=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.3/go.mod h1:X4OF+BTd7HIb3L+tc4UlWHVrpgwZZIVENU15pRDVTI0=
+github.com/aws/aws-sdk-go-v2/service/sts v1.38.9 h1:Ekml5vGg6sHSZLZJQJagefnVe6PmqC2oiRkBq4F7fU0=
+github.com/aws/aws-sdk-go-v2/service/sts v1.38.9/go.mod h1:/e15V+o1zFHWdH3u7lpI3rVBcxszktIKuHKCY2/py+k=
+github.com/aws/smithy-go v1.23.1 h1:sLvcH6dfAFwGkHLZ7dGiYF7aK6mg4CgKA/iDKjLDt9M=
+github.com/aws/smithy-go v1.23.1/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
@@ -36,6 +72,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=