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

service/task/task_service.go

@@ -6,9 +6,6 @@ import (
 	"fmt"
 	"model-gateway/common/util"
 	"model-gateway/consts/public"
-	"model-gateway/service/gateway"
-	"model-gateway/service/prompt"
-	"sync"
 	"time"
 
 	"model-gateway/dao"
@@ -18,9 +15,7 @@ import (
 	"gitea.redpowerfuture.com/red-future/common/beans"
 	"gitea.redpowerfuture.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/grpool"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/google/uuid"
 )
@@ -245,14 +240,17 @@ func (s *taskService) Create(ctx context.Context, req *dto.CreateTaskReq) (res *
 
 	// 3) 构建任务实体
 	task := &entity.ModelGatewayTask{
-		ModelName:      model.ModelName,
-		TaskID:         taskID,
-		State:          public.TaskStatusRunning,
-		BizName:        req.BizName,
-		CallbackURL:    req.CallbackUrl,
-		RequestPayload: req.RequestPayload,
+		ModelName:   model.ModelName,
+		TaskID:      taskID,
+		State:       public.TaskStatusRunning,
+		BizName:     req.BizName,
+		CallbackURL: req.CallbackUrl,
+		RequestPayload: &entity.RequestPayload{
+			Body:    req.RequestPayload,
+			Headers: util.ParseHeadMsgHeaders(model.HeadMsg),
+		},
 		EpicycleId:     req.EpicycleId,
-		BuildType:      req.BuildType,
+		BuildModelName: req.BuildModelName,
 	}
 
 	// 4) 插入任务记录
@@ -285,8 +283,19 @@ func (s *taskService) Create(ctx context.Context, req *dto.CreateTaskReq) (res *
 		ResponsePayload: gdb.Map{"taskId": taskID},
 	})
 
-	// 6) 异步执行任务
-	go AsyncWorker.handleOne(util.AsyncCtx(ctx), task, model)
+	// 6) 模型计费
+	if len(model.BillingConfig) > 0 {
+		requestData := util.ExtractRequestBilling(ctx, model.BillingConfig, req.RequestPayload)
+		// 请求数据作为计费记录的基础字段，先存入数组
+		task.BillingData = append(task.BillingData, requestData)
+		_, _ = dao.ModelGatewayTask.Update(ctx, &entity.ModelGatewayTask{
+			SQLBaseDO:   beans.SQLBaseDO{Id: task.Id},
+			BillingData: task.BillingData,
+		})
+	}
+
+	// 7) 异步执行任务
+	go AsyncWorker.handleOne(util.AsyncCtx(ctx), task, model, req)
 
 	return &dto.CreateTaskRes{TaskID: taskID}, nil
 }
@@ -421,7 +430,7 @@ func (s *taskService) GetBatch(ctx context.Context, req *dto.GetTaskBatchReq) (r
 		if t == nil {
 			continue
 		}
-		if t.State != 2 {
+		if t.State != public.BuildTypeNode {
 			continue
 		}
 		_ = dao.ModelGatewayTask.MarkDownloadedByID(ctx, t.Id)
@@ -437,9 +446,10 @@ func (s *taskService) GetBatch(ctx context.Context, req *dto.GetTaskBatchReq) (r
 			continue
 		}
 		items = append(items, dto.GetTaskBatchItem{
-			TaskID:  t.TaskID,
-			State:   t.State,
-			OssFile: t.ResultFile.OssFile,
+			TaskID:     t.TaskID,
+			State:      t.State,
+			OssFile:    t.ResultFile.OssFile,
+			TextResult: t.TextResult,
 		})
 	}
 	return &dto.GetTaskBatchRes{List: items}, nil