Merge remote-tracking branch 'yvan/main'

# Conflicts:
#	server/go.mod
#	server/go.sum

server/config/volcengine.go

@@ -1,9 +1,6 @@
 package config
 
 type Volcengine struct {
-	AccessKey    string `mapstructure:"access-key" json:"access-key" yaml:"access-key"`          // 火山引擎访问密钥ID
-	SecretKey    string `mapstructure:"secret-key" json:"secret-key" yaml:"secret-key"`          // 火山引擎访问密钥Secret
-	Region       string `mapstructure:"region" json:"region" yaml:"region"`                      // 区域，如：cn-beijing
-	Endpoint     string `mapstructure:"endpoint" json:"endpoint" yaml:"endpoint"`                // 服务端点，如：https://ark.cn-beijing.volces.com
-	DefaultModel string `mapstructure:"default-model" json:"default-model" yaml:"default-model"` // 默认模型ID，如：ep-xxx
+	ApiKey string `mapstructure:"api-key" json:"api-key" yaml:"api-key"` // 火山引擎API密钥
+	Model  string `mapstructure:"model" json:"model" yaml:"model"`       // 模型ID，如：ep-xxx
 }