3D生成服务已经完成

api/service/jimeng/client.go

@@ -3,8 +3,10 @@ package jimeng
 import (
 	"encoding/json"
 	"fmt"
+	"geekai/core/types"
 	"net/http"
 	"net/url"
+	"strings"
 
 	"github.com/volcengine/volc-sdk-golang/base"
 	"github.com/volcengine/volc-sdk-golang/service/visual"
@@ -13,14 +15,22 @@ import (
 // Client 即梦API客户端
 type Client struct {
 	visual *visual.Visual
+	config types.JimengConfig
 }
 
 // NewClient 创建即梦API客户端
-func NewClient(accessKey, secretKey string) *Client {
+func NewClient(sysConfig *types.SystemConfig) *Client {
+
+	client := &Client{}
+	client.UpdateConfig(sysConfig.Jimeng)
+	return client
+}
+
+func (c *Client) UpdateConfig(config types.JimengConfig) error {
 	// 使用官方SDK的visual实例
 	visualInstance := visual.NewInstance()
-	visualInstance.Client.SetAccessKey(accessKey)
-	visualInstance.Client.SetSecretKey(secretKey)
+	visualInstance.Client.SetAccessKey(config.AccessKey)
+	visualInstance.Client.SetSecretKey(config.SecretKey)
 
 	// 添加即梦AI专有的API配置
 	jimengApis := map[string]*base.ApiInfo{
@@ -55,9 +65,32 @@ func NewClient(accessKey, secretKey string) *Client {
 		visualInstance.Client.ApiInfoList[name] = info
 	}
 
-	return &Client{
-		visual: visualInstance,
+	c.config = config
+	c.visual = visualInstance
+
+	return c.testConnection()
+}
+
+// testConnection 测试即梦AI连接
+func (c *Client) testConnection() error {
+
+	// 使用一个简单的查询任务来测试连接
+	testReq := &QueryTaskRequest{
+		ReqKey: "test_connection",
+		TaskId: "test_task_id_12345",
 	}
+
+	_, err := c.QueryTask(testReq)
+	// 即使任务不存在，只要不是认证错误就说明连接正常
+	if err != nil {
+		// 检查是否是认证错误
+		if strings.Contains(err.Error(), "InvalidAccessKey") {
+			return fmt.Errorf("认证失败，请检查AccessKey和SecretKey是否正确")
+		}
+		// 其他错误（如任务不存在）说明连接正常
+		return nil
+	}
+	return nil
 }
 
 // SubmitTask 提交异步任务

api/service/jimeng/service.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"strconv"
-	"strings"
 	"time"
 
 	"gorm.io/gorm"
@@ -16,8 +15,6 @@ import (
 	"geekai/store/model"
 	"geekai/utils"
 
-	"geekai/core/types"
-
 	"github.com/go-redis/redis/v8"
 )
 
@@ -36,17 +33,8 @@ type Service struct {
 }
 
 // NewService 创建即梦服务
-func NewService(db *gorm.DB, redisCli *redis.Client, uploader *oss.UploaderManager) *Service {
+func NewService(db *gorm.DB, redisCli *redis.Client, uploader *oss.UploaderManager, client *Client) *Service {
 	taskQueue := store.NewRedisQueue("JimengTaskQueue", redisCli)
-	// 从数据库加载配置
-	var config model.Config
-	db.Where("name = ?", "Jimeng").First(&config)
-	var jimengConfig types.JimengConfig
-	if config.Id > 0 {
-		_ = utils.JsonDecode(config.Value, &jimengConfig)
-	}
-	client := NewClient(jimengConfig.AccessKey, jimengConfig.SecretKey)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	return &Service{
 		db:        db,
@@ -522,77 +510,3 @@ func (s *Service) GetJob(jobId uint) (*model.JimengJob, error) {
 	}
 	return &job, nil
 }
-
-// testConnection 测试即梦AI连接
-func (s *Service) testConnection(accessKey, secretKey string) error {
-	testClient := NewClient(accessKey, secretKey)
-
-	// 使用一个简单的查询任务来测试连接
-	testReq := &QueryTaskRequest{
-		ReqKey: "test_connection",
-		TaskId: "test_task_id_12345",
-	}
-
-	_, err := testClient.QueryTask(testReq)
-	// 即使任务不存在，只要不是认证错误就说明连接正常
-	if err != nil {
-		// 检查是否是认证错误
-		if strings.Contains(err.Error(), "InvalidAccessKey") {
-			return fmt.Errorf("认证失败，请检查AccessKey和SecretKey是否正确")
-		}
-		// 其他错误（如任务不存在）说明连接正常
-		return nil
-	}
-	return nil
-}
-
-// UpdateClientConfig 更新客户端配置
-func (s *Service) UpdateClientConfig(accessKey, secretKey string) error {
-	// 创建新的客户端
-	newClient := NewClient(accessKey, secretKey)
-
-	// 测试新客户端是否可用
-	err := s.testConnection(accessKey, secretKey)
-	if err != nil {
-		return err
-	}
-
-	// 更新客户端
-	s.client = newClient
-	return nil
-}
-
-var defaultPower = types.JimengPower{
-	TextToImage:  20,
-	ImageToImage: 20,
-	ImageEdit:    20,
-	ImageEffects: 20,
-	TextToVideo:  300,
-	ImageToVideo: 300,
-}
-
-// GetConfig 获取即梦AI配置
-func (s *Service) GetConfig() *types.JimengConfig {
-	var config model.Config
-	err := s.db.Where("name", "jimeng").First(&config).Error
-	if err != nil {
-		// 如果配置不存在，返回默认配置
-		return &types.JimengConfig{
-			AccessKey: "",
-			SecretKey: "",
-			Power:     defaultPower,
-		}
-	}
-
-	var jimengConfig types.JimengConfig
-	err = utils.JsonDecode(config.Value, &jimengConfig)
-	if err != nil {
-		return &types.JimengConfig{
-			AccessKey: "",
-			SecretKey: "",
-			Power:     defaultPower,
-		}
-	}
-
-	return &jimengConfig
-}