Merge branch 'dev未优化' into dev优化中

# Conflicts:
#	common/util/mapping.go
#	config.yml
#	model/entity/model_gateway_model.go
#	model/entity/model_gateway_task.go
#	service/gateway/gateway_http_service.go
#	service/task/task_service.go
#	service/task/worker.go

model/entity/model_gateway_model.go

@@ -30,7 +30,7 @@ type modelGatewayModelCol struct {
 	StreamConfig     string
 	FirstFrame       string
 	LastFrame        string
-	MaxTokens        string
+	BillingConfig    string
 }
 
 var ModelGatewayModelCol = modelGatewayModelCol{
@@ -61,36 +61,38 @@ var ModelGatewayModelCol = modelGatewayModelCol{
 	StreamConfig:     "stream_config",
 	FirstFrame:       "first_frame",
 	LastFrame:        "last_frame",
+	BillingConfig:    "billing_config",
 }
 
 type ModelGatewayModel struct {
 	beans.SQLBaseDO  `orm:",inline"`
-	ModelName        string         `orm:"model_name" json:"modelName"`
-	ModelType        int            `orm:"model_type" json:"modelType"`
-	BaseURL          string         `orm:"base_url" json:"baseUrl"`
-	HttpMethod       string         `orm:"http_method" json:"httpMethod"`
-	HeadMsg          map[string]any `orm:"head_msg" json:"headMsg"`
-	Form             []Form         `orm:"form_json" json:"form"`
-	RequestMapping   map[string]any `orm:"request_mapping" json:"requestMapping"`
-	ResponseMapping  map[string]any `orm:"response_mapping" json:"responseMapping"`
-	RequiredFields   []string       `orm:"required_fields" json:"requiredFields"`
-	IsPrivate        *int           `orm:"is_private" json:"isPrivate"`
-	IsChatModel      *int           `orm:"is_chat_model" json:"isChatModel"`
-	CallMode         *int           `orm:"call_mode" json:"callMode"`
-	ApiKey           string         `orm:"api_key" json:"apiKey"`
-	Enabled          *int           `orm:"enabled" json:"enabled"`
-	MaxConcurrency   int            `orm:"max_concurrency" json:"maxConcurrency"`
-	TimeoutSeconds   int            `orm:"timeout_seconds" json:"timeoutSeconds"`
-	RetryTimes       int            `orm:"retry_times" json:"retryTimes"`
-	AutoCleanSeconds int            `orm:"auto_clean_seconds" json:"autoCleanSeconds"`
-	IsOwner          *int           `orm:"is_owner" json:"isOwner"`
-	OperatorName     string         `orm:"operator_name" json:"operatorName"`
-	TokenConfig      map[string]any `orm:"token_config" json:"tokenConfig"`
-	ExtendMapping    map[string]any `orm:"extend_mapping" json:"extendMapping"`
-	QueryConfig      map[string]any `orm:"query_config" json:"queryConfig"`
-	StreamConfig     map[string]any `orm:"stream_config" json:"streamConfig"`
-	FirstFrame       string         `orm:"first_frame" json:"firstFrame"`
-	LastFrame        string         `orm:"last_frame" json:"lastFrame"`
+	ModelName        string           `orm:"model_name" json:"modelName"`
+	ModelType        int              `orm:"model_type" json:"modelType"`
+	BaseURL          string           `orm:"base_url" json:"baseUrl"`
+	HttpMethod       string           `orm:"http_method" json:"httpMethod"`
+	HeadMsg          map[string]any   `orm:"head_msg" json:"headMsg"`
+	Form             []Form  		  `orm:"form_json" json:"form"`
+	RequestMapping   map[string]any   `orm:"request_mapping" json:"requestMapping"`
+	ResponseMapping  map[string]any   `orm:"response_mapping" json:"responseMapping"`
+	RequiredFields   []string         `orm:"required_fields" json:"requiredFields"`
+	IsPrivate        *int             `orm:"is_private" json:"isPrivate"`
+	IsChatModel      *int             `orm:"is_chat_model" json:"isChatModel"`
+	CallMode         *int             `orm:"call_mode" json:"callMode"`
+	ApiKey           string           `orm:"api_key" json:"apiKey"`
+	Enabled          *int             `orm:"enabled" json:"enabled"`
+	MaxConcurrency   int              `orm:"max_concurrency" json:"maxConcurrency"`
+	TimeoutSeconds   int              `orm:"timeout_seconds" json:"timeoutSeconds"`
+	RetryTimes       int              `orm:"retry_times" json:"retryTimes"`
+	AutoCleanSeconds int              `orm:"auto_clean_seconds" json:"autoCleanSeconds"`
+	IsOwner          *int             `orm:"is_owner" json:"isOwner"`
+	OperatorName     string           `orm:"operator_name" json:"operatorName"`
+	TokenConfig      map[string]any   `orm:"token_config" json:"tokenConfig"`
+	ExtendMapping    map[string]any   `orm:"extend_mapping" json:"extendMapping"`
+	QueryConfig      map[string]any   `orm:"query_config" json:"queryConfig"`
+	StreamConfig     map[string]any   `orm:"stream_config" json:"streamConfig"`
+	FirstFrame       string           `orm:"first_frame" json:"firstFrame"`
+	LastFrame        string           `orm:"last_frame" json:"lastFrame"`
+	BillingConfig    map[string]any   `orm:"billing_config" json:"billingConfig"`
 }
 
 type Form struct {
@@ -122,6 +124,7 @@ type FieldConstraint struct {
 	Accept   string `json:"accept"`   // 允许格式（逗号分隔）
 }
 
+
 const (
 	ResponseBody = "content"      //返回主体（必填）
 	TotalTokens  = "total_tokens" //总token数