refactor(model-gateway): 重构代码结构并优化数据库查询

service/gateway/gateway_http_service.go

@@ -6,9 +6,11 @@ import (
 	"fmt"
 	"prompts-core/common/util"
 	"prompts-core/model/entity"
+	"strings"
 
 	"gitea.com/red-future/common/beans"
 	commonHttp "gitea.com/red-future/common/http"
+	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 )
@@ -77,16 +79,28 @@ type AsynchModel struct {
 
 // GetModelConfig 获取模型配置
 func GetModelConfig(ctx context.Context, req *AsynchModel) (model *AsynchModel, err error) {
-	fmt.Println("req参数", req)
-	fullURL := fmt.Sprintf("model-gateway/model/getModel?creator=%s&modelName=%s&isChatModel=%d",
-		req.Creator, req.ModelName, req.IsChatModel)
+	fullURL := "model-gateway/model/getModel"
+	// 拼接 query 参数
+	var params []string
+	if req.Creator != "" {
+		params = append(params, fmt.Sprintf("creator=%s", req.Creator))
+	}
+	if req.ModelName != "" {
+		params = append(params, fmt.Sprintf("modelName=%s", req.ModelName))
+	}
+	if req.IsChatModel != 0 {
+		params = append(params, fmt.Sprintf("isChatModel=%d", req.IsChatModel))
+	}
+	if len(params) > 0 {
+		fullURL += "?" + strings.Join(params, "&")
+	}
 	headers := util.ForwardHeaders(ctx)
 	var resp GetModelConfigResp
 	if err = commonHttp.Get(ctx, fullURL, headers, &resp, nil); err != nil {
 		return nil, fmt.Errorf("获取模型配置失败: %w", err)
 	}
 	if resp.Model == nil {
-		return nil, fmt.Errorf("模型不存在: creator=%s modelName=%s isChatModel=%d", req.Creator, req.ModelName, req.IsChatModel)
+		return nil, fmt.Errorf("模型不存在")
 	}
 	return resp.Model, nil
 }
@@ -134,15 +148,11 @@ func GetSkillUser(ctx context.Context, name string) (*SkillUserVO, error) {
 
 // SendCallbackReq 发送回调的请求体
 type SendCallbackReq struct {
-	TaskId     string            `json:"taskId"`
-	Status     string            `json:"status"`
-	Messages   *MultiRoundResult `json:"messages,omitempty"`
-	EpicycleId int64             `json:"epicycleId"`
-	ErrorMsg   string            `json:"errorMsg,omitempty"`
-}
-type MultiRoundResult struct {
-	TotalRounds int              `json:"total_rounds"` // 总轮数
-	Rounds      []map[string]any `json:"rounds"`       // 每轮详情（动态类型）
+	TaskId     string         `json:"taskId"`
+	Status     string         `json:"status"`
+	Messages   map[string]any `json:"messages,omitempty"`
+	EpicycleId int64          `json:"epicycleId"`
+	ErrorMsg   string         `json:"errorMsg,omitempty"`
 }
 
 // SendCallback 向业务方发送回调
@@ -151,61 +161,21 @@ func SendCallback(ctx context.Context, composeTask *entity.ComposeTask) error {
 	if composeTask.CallbackUrl == "" {
 		return fmt.Errorf("回调地址为空，taskId=%s", composeTask.TaskId)
 	}
-
 	// 2. 构造请求体
 	req := SendCallbackReq{
 		TaskId:   composeTask.TaskId,
 		Status:   composeTask.Status,
-		Messages: parseMessagesToResult(composeTask.Messages), // 需要将 JSON 字符串转为结构体
+		Messages: composeTask.Messages,
 		ErrorMsg: composeTask.ErrorMessage,
 	}
 	// 3. 发送 POST 请求
 	headers := util.ForwardHeaders(ctx)
 	var resp struct{}
 	g.Log().Infof(ctx, "[回调业务] 开始发送 taskId=%s 回调地址=%s 消息=%v",
-		composeTask.TaskId, composeTask.CallbackUrl, req.Messages)
+		composeTask.TaskId, composeTask.CallbackUrl, gjson.New(req.Messages).String())
 	if err := commonHttp.Post(ctx, composeTask.CallbackUrl, headers, &resp, req); err != nil {
 		return fmt.Errorf("[回调业务] 发送失败 taskId=%s url=%s err=%w", composeTask.TaskId, composeTask.CallbackUrl, err)
 	}
-	g.Log().Infof(ctx, "[回调业务] 发送成功 taskId=%s 回调地址=%s", composeTask.TaskId, composeTask.CallbackUrl)
+	g.Log().Infof(ctx, "[回调业务] 发送成功 taskId=%s 回调地址=%s ", composeTask.TaskId, composeTask.CallbackUrl)
 	return nil
 }
-
-// parseMessagesToResult 将 any 类型的 Messages 转为 *MultiRoundResult
-func parseMessagesToResult(messages any) *MultiRoundResult {
-	if messages == nil {
-		return nil
-	}
-
-	var result MultiRoundResult
-
-	switch v := messages.(type) {
-	case *MultiRoundResult:
-		return v
-	case MultiRoundResult:
-		return &v
-	case string:
-		if err := json.Unmarshal([]byte(v), &result); err != nil {
-			return nil
-		}
-	case []byte:
-		if err := json.Unmarshal(v, &result); err != nil {
-			return nil
-		}
-	case map[string]any:
-		// 通过 JSON 序列化再反序列化
-		data, _ := json.Marshal(v)
-		if err := json.Unmarshal(data, &result); err != nil {
-			return nil
-		}
-	default:
-		data, err := json.Marshal(v)
-		if err != nil {
-			return nil
-		}
-		if err = json.Unmarshal(data, &result); err != nil {
-			return nil
-		}
-	}
-	return &result
-}