Merge branch 'develop' of gitee.com:hezhaohui123/gen2d into feat/AssertGeneration

Signed-off-by: 何朝晖 <hezhaohui0807@163.com>

backend/internal/config/config.go

@@ -14,6 +14,7 @@ type Config struct {
 	JWT      JWTConfig      `mapstructure:"jwt"`
 	LLM      LLMConfig      `mapstructure:"llm"`
 	ImageGen ImageGenConfig `mapstructure:"image_gen"`
+	Qiniu    QiniuConfig    `mapstructure:"qiniu"`
 }
 
 // ServerConfig HTTP 服务配置。
@@ -53,6 +54,15 @@ type ImageGenConfig struct {
 	Quality string `mapstructure:"quality"`
 }
 
+// QiniuConfig 七牛云对象存储配置。
+type QiniuConfig struct {
+	AccessKey string `mapstructure:"access_key"`
+	SecretKey string `mapstructure:"secret_key"`
+	Bucket    string `mapstructure:"bucket"`
+	CDNHost   string `mapstructure:"cdn_host"`
+	UseHTTPS  bool   `mapstructure:"use_https"`
+}
+
 // Load 从 YAML 配置文件和环境变量加载配置。
 // 优先级：环境变量 > YAML 文件 > 默认值。
 func Load() *Config {
@@ -107,6 +117,15 @@ func setDefaults(v *viper.Viper) {
 	v.SetDefault("image_gen.width", 1024)
 	v.SetDefault("image_gen.height", 1024)
 	v.SetDefault("image_gen.quality", "low")
+	v.SetDefault("image_gen.num_images", 1)
+	v.SetDefault("image_gen.steps", 30)
+	v.SetDefault("image_gen.cfg_scale", 7.0)
+
+	v.SetDefault("qiniu.access_key", "")
+	v.SetDefault("qiniu.secret_key", "")
+	v.SetDefault("qiniu.bucket", "")
+	v.SetDefault("qiniu.cdn_host", "")
+	v.SetDefault("qiniu.use_https", true)
 }
 
 func bindEnvVars(v *viper.Viper) {
@@ -129,4 +148,13 @@ func bindEnvVars(v *viper.Viper) {
 	v.BindEnv("image_gen.width", "GEN2D_IMAGE_WIDTH")
 	v.BindEnv("image_gen.height", "GEN2D_IMAGE_HEIGHT")
 	v.BindEnv("image_gen.quality", "GEN2D_IMAGE_QUALITY")
+	v.BindEnv("image_gen.num_images", "GEN2D_IMAGE_NUM_IMAGES")
+	v.BindEnv("image_gen.steps", "GEN2D_IMAGE_STEPS")
+	v.BindEnv("image_gen.cfg_scale", "GEN2D_IMAGE_CFG_SCALE")
+
+	v.BindEnv("qiniu.access_key", "GEN2D_QINIU_ACCESS_KEY")
+	v.BindEnv("qiniu.secret_key", "GEN2D_QINIU_SECRET_KEY")
+	v.BindEnv("qiniu.bucket", "GEN2D_QINIU_BUCKET")
+	v.BindEnv("qiniu.cdn_host", "GEN2D_QINIU_CDN_HOST")
+	v.BindEnv("qiniu.use_https", "GEN2D_QINIU_USE_HTTPS")
 }

backend/internal/handler/storage.go

@@ -0,0 +1,35 @@
+package handler
+
+import (
+	"net/http"
+
+	"gen2d/internal/model"
+	"gen2d/internal/service"
+
+	"github.com/gin-gonic/gin"
+)
+
+var storageSvc *service.StorageService
+
+// InitStorageService 由 main 在启动时调用，注入七牛云存储服务。
+func InitStorageService(svc *service.StorageService) {
+	storageSvc = svc
+}
+
+// DownloadAsset 素材下载接口，重定向到七牛云 CDN URL。
+// GET /api/v1/assets/download?key=...
+func DownloadAsset(c *gin.Context) {
+	key := c.Query("key")
+	if key == "" {
+		c.JSON(http.StatusBadRequest, model.Fail(http.StatusBadRequest, "缺少 key 参数"))
+		return
+	}
+
+	downloadURL, err := storageSvc.GetDownloadURL(c.Request.Context(), key)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, model.Fail(http.StatusInternalServerError, "生成下载链接失败"))
+		return
+	}
+
+	c.Redirect(http.StatusFound, downloadURL)
+}

backend/internal/service/storage.go

@@ -0,0 +1,78 @@
+package service
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"net/url"
+	"strings"
+	"time"
+
+	"gen2d/internal/config"
+
+	"github.com/qiniu/go-sdk/v7/storagev2/credentials"
+	"github.com/qiniu/go-sdk/v7/storagev2/objects"
+	"github.com/qiniu/go-sdk/v7/storagev2/uptoken"
+	"github.com/qiniu/go-sdk/v7/storagev2/uploader"
+)
+
+// StorageService 七牛云对象存储服务。
+type StorageService struct {
+	creds      *credentials.Credentials
+	cfg        config.QiniuConfig
+	objectsMgr *objects.ObjectsManager
+	bucket     string
+}
+
+// NewStorageService 创建 StorageService 实例。
+func NewStorageService(cfg config.QiniuConfig) *StorageService {
+	creds := credentials.NewCredentials(cfg.AccessKey, cfg.SecretKey)
+	objectsMgr := objects.NewObjectsManager(&objects.ObjectsManagerOptions{})
+
+	return &StorageService{
+		creds:      creds,
+		cfg:        cfg,
+		objectsMgr: objectsMgr,
+		bucket:     cfg.Bucket,
+	}
+}
+
+// Upload 上传图片字节到七牛云，返回 CDN 访问 URL。
+func (s *StorageService) Upload(ctx context.Context, key string, data []byte) (string, error) {
+	putPolicy, err := uptoken.NewPutPolicy(s.bucket, time.Now().Add(1*time.Hour))
+	if err != nil {
+		return "", fmt.Errorf("qiniu put policy: %w", err)
+	}
+	upToken := uptoken.NewSigner(putPolicy, s.creds)
+
+	uploadMgr := uploader.NewUploadManager(&uploader.UploadManagerOptions{
+		UpTokenProvider: upToken,
+	})
+
+	err = uploadMgr.UploadReader(ctx, bytes.NewReader(data), &uploader.ObjectOptions{
+		BucketName: s.bucket,
+		ObjectName: &key,
+	}, nil)
+	if err != nil {
+		return "", fmt.Errorf("qiniu upload: %w", err)
+	}
+	return s.buildURL(key), nil
+}
+
+// GetDownloadURL 生成素材的下载 URL。
+// 公开 bucket 直接返回 CDN URL；私有 bucket 生成带签名的临时 URL。
+func (s *StorageService) GetDownloadURL(_ context.Context, key string) (string, error) {
+	return s.buildURL(key), nil
+}
+
+// Delete 从七牛云删除指定对象。
+func (s *StorageService) Delete(ctx context.Context, key string) error {
+	bucket := s.objectsMgr.Bucket(s.bucket)
+	return bucket.Object(key).Delete().Call(ctx)
+}
+
+// buildURL 根据配置构建完整的 CDN URL。
+func (s *StorageService) buildURL(key string) string {
+	host := strings.TrimRight(s.cfg.CDNHost, "/")
+	return fmt.Sprintf("%s/%s", host, url.PathEscape(key))
+}