common版本升级

chore: 升级 common 依赖至 v0.0.25
Merge remote-tracking branch 'origin/dev未优化' into dev未优化
2026-06-23 18:32:00 +08:00 · 2026-06-23 16:56:28 +08:00 · 2026-06-23 14:56:04 +08:00 · 2026-06-23 14:55:51 +08:00 · 2026-06-22 11:31:46 +08:00 · 2026-06-22 11:31:30 +08:00
34 changed files with 1503 additions and 1629 deletions
--- a/24
+++ b/24
@@ -0,0 +1,24 @@
+# 阶段1: 构建
+FROM golang:alpine AS builder
+
+RUN apk add --no-cache git ca-certificates tzdata
+
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+ENV GO111MODULE=on
+ENV GOPROXY=https://goproxy.cn,direct
+ENV CGO_ENABLED=0
+ENV GOTOOLCHAIN=auto
+WORKDIR /build
+
+COPY . .
+
+RUN go mod download && go mod tidy
+
+RUN go build -ldflags="-s -w" -o main ./main.go
+
+
+EXPOSE 3009
+
+CMD ["./main"]
--- a/common/util/config.go
+++ b/common/util/config.go
@@ -2,20 +2,14 @@ package util

 import (
 	"context"
-	"strings"

 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
 )

-// GetServerPort 从配置获取服务端口
-func GetServerPort(ctx context.Context) string {
-	address := g.Cfg().MustGet(ctx, "server.address", ":8080").String()
-	// address 格式如 ":3009"，去掉冒号
-	if strings.HasPrefix(address, ":") {
-		return address[1:]
-	}
-	return "8080"
+// GetServerName 获取服务名称
+func GetServerName(ctx context.Context) string {
+	return g.Cfg().MustGet(ctx, "server.name", "").String()
 }

 // GetModelPrompt 获取请求模型的提示词
@@ -28,3 +22,13 @@ func GetModelPrompt(ctx context.Context, modelType int) string {
 func GetBuildPrompt(ctx context.Context) string {
 	return g.Cfg().MustGet(ctx, "nodePrompts", "").String()
 }
+
+// GetMaxRounds 获取最大轮数配置
+func GetMaxRounds(ctx context.Context) int {
+	return g.Cfg().MustGet(ctx, "session.maxRounds", 10).Int()
+}
+
+// GetExpireMinutes 获取过期时间配置
+func GetExpireMinutes(ctx context.Context) int {
+	return g.Cfg().MustGet(ctx, "session.expireMinutes", 30).Int()
+}
--- a/common/util/headers.go
+++ b/common/util/headers.go
@@ -3,7 +3,7 @@ package util
 import (
 	"context"

-	"gitea.com/red-future/common/utils"
+	"gitea.redpowerfuture.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/frame/g"
 )

--- a/common/util/json.go
+++ b/common/util/json.go
@@ -1,151 +0,0 @@
-package util
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/gogf/gf/v2/container/gvar"
-	"github.com/gogf/gf/v2/encoding/gjson"
-	"github.com/gogf/gf/v2/util/gconv"
-)
-
-// ParseOutput 解析模型输出为 JSON 格式
-func ParseOutput(text string) (map[string]any, error) {
-	j, err := gjson.LoadJson([]byte(text))
-	if err != nil {
-		return nil, fmt.Errorf("解析模型输出失败: %w", err)
-	}
-
-	return j.Map(), nil
-}
-
-// ConvertToMessages 将原始数据转换为消息列表
-func ConvertToMessages(raw any) []map[string]any {
-	if raw == nil {
-		return nil
-	}
-
-	j, err := gjson.LoadJson(gconv.Bytes(raw))
-	if err != nil {
-		return nil
-	}
-
-	if j.Contains("messages") {
-		return gconv.Maps(j.Get("messages").Array())
-	}
-
-	return []map[string]any{j.Map()}
-}
-
-// FormToJSON 将表单数据转换为 JSON 字符串
-func FormToJSON(form map[string]any) string {
-	if form == nil {
-		return "{}"
-	}
-
-	b, _ := json.Marshal(form)
-	return string(b)
-}
-
-// UserFormToJSON 将用户表单数据转换为 JSON 字符串
-func UserFormToJSON(form []map[string]any) string {
-	if form == nil {
-		return "{}"
-	}
-
-	b, _ := json.Marshal(form)
-	return string(b)
-}
-
-// MustMarshal 将对象序列化为 JSON 字符串，失败时返回空对象
-func MustMarshal(v any) string {
-	b, err := json.Marshal(v)
-	if err != nil {
-		return "{}"
-	}
-
-	return string(b)
-}
-
-// JSONPretty 将任意类型转为格式化的 JSON 字符串
-func JSONPretty(v any) string {
-	if gv, ok := v.(*gvar.Var); ok {
-		v = gconv.Map(gv.String())
-	}
-
-	var tmp map[string]any
-	if err := gconv.Struct(v, &tmp); err != nil {
-		return gconv.String(v)
-	}
-
-	b, _ := json.MarshalIndent(tmp, "", "  ")
-	return string(b)
-}
-
-// GvarToMap 将 *gvar.Var 类型转换为 map[string]any
-func GvarToMap(v *gvar.Var) map[string]any {
-	if v == nil || v.IsNil() {
-		return nil
-	}
-
-	result := make(map[string]any)
-
-	// 方法1：尝试获取 map 值
-	if m := v.Map(); len(m) > 0 {
-		return m
-	}
-
-	// 方法2：尝试解析 JSON 字符串
-	str := v.String()
-	if str != "" && str != "<nil>" {
-		json.Unmarshal([]byte(str), &result)
-		if len(result) > 0 {
-			return result
-		}
-	}
-
-	// 方法3：尝试获取 interface 再转换
-	if val := v.Val(); val != nil {
-		switch val.(type) {
-		case map[string]any:
-			return val.(map[string]any)
-		default:
-			data, _ := json.Marshal(val)
-			json.Unmarshal(data, &result)
-		}
-	}
-
-	return result
-}
-
-// ParseJSONFieldFromGvar 专门处理 *gvar.Var 类型的 JSON 字段解析
-func ParseJSONFieldFromGvar(source any, target any) {
-	if source == nil {
-		return
-	}
-
-	switch v := source.(type) {
-	case *gvar.Var:
-		if v.IsNil() {
-			return
-		}
-
-		// 尝试获取 map
-		if m := v.Map(); len(m) > 0 {
-			data, _ := json.Marshal(m)
-			json.Unmarshal(data, target)
-			return
-		}
-
-		// 尝试解析 JSON 字符串
-		str := v.String()
-		if str != "" && str != "<nil>" {
-			json.Unmarshal([]byte(str), target)
-		}
-
-	default:
-		// 其他类型走原来的逻辑
-		data, _ := json.Marshal(source)
-		json.Unmarshal(data, target)
-	}
-}
--- a/common/util/mapping.go
+++ b/common/util/mapping.go
@@ -0,0 +1,196 @@
+package util
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+// ======================== 请求映射 ========================
+
+// ReverseMap 将 payload 按 mapping 路径映射为嵌套结构
+func ReverseMap(mapping map[string]any, payload map[string]any) map[string]any {
+	jsonObj := gjson.New("{}")
+	for path, defaultValue := range mapping {
+		val := gjson.New(payload).Get(path)
+		if !val.IsNil() {
+			_ = jsonObj.Set(path, val.Val())
+		} else if defaultValue != nil {
+			_ = jsonObj.Set(path, defaultValue)
+		}
+	}
+	return jsonObj.Map()
+}
+
+// ======================== 用户文本提取 ========================
+
+// ExtractUserText 从 messages 中提取所有 user 文本
+func ExtractUserText(messages map[string]any) map[string]any {
+	msgJson := gjson.New(messages)
+
+	msgs := msgJson.Get("rounds.0.messages")
+	if msgs.IsNil() {
+		msgs = msgJson.Get("messages")
+	}
+
+	var texts []string
+	for _, m := range msgs.Array() {
+		msg := gjson.New(m)
+		if msg.Get("role").String() != "user" {
+			continue
+		}
+		content := msg.Get("content").Val()
+		switch c := content.(type) {
+		case string:
+			texts = append(texts, c)
+		case []any:
+			for _, item := range c {
+				if m, ok := item.(map[string]any); ok {
+					if t := gconv.String(m["text"]); t != "" {
+						texts = append(texts, t)
+					}
+				}
+			}
+		}
+	}
+
+	return map[string]any{
+		"role":    "user",
+		"content": strings.Join(texts, "\n"),
+	}
+}
+
+// ======================== 附件合并 ========================
+
+// MergeConsult 将 consult 附件合并到每个 round 的 content 数组中
+func MergeConsult(req map[string]any, messages map[string]any, extendMapping map[string]any) map[string]any {
+	if len(req) == 0 || len(messages) == 0 || len(extendMapping) == 0 {
+		return messages
+	}
+
+	consult := gconv.Interfaces(req["consult"])
+	if len(consult) == 0 {
+		return messages
+	}
+
+	targetPath := gconv.String(extendMapping["target_content_path"])
+	templates := gconv.Map(extendMapping["attachment_templates"])
+	if targetPath == "" || len(templates) == 0 {
+		return messages
+	}
+
+	msgJson := gjson.New(messages)
+
+	rounds := msgJson.Get("rounds").Array()
+	for i := range rounds {
+		roundPath := fmt.Sprintf("rounds.%d.%s", i, targetPath)
+		for _, item := range consult {
+			itemJson := gjson.New(item)
+			itemType := itemJson.Get("type").String()
+			tmpl := gconv.Map(templates[itemType])
+			if itemType == "" || len(tmpl) == 0 {
+				continue
+			}
+
+			attachment := buildAttachment(tmpl, itemJson.Get("url").String())
+			if attachment == nil {
+				continue
+			}
+
+			idx := len(msgJson.Get(roundPath).Array())
+			_ = msgJson.Set(fmt.Sprintf("%s.%d", roundPath, idx), attachment)
+		}
+	}
+
+	return msgJson.Map()
+}
+
+// buildAttachment 根据模板和 url 生成附件对象
+func buildAttachment(tmpl map[string]any, url string) map[string]any {
+	typ := gconv.String(tmpl["type"])
+	if typ == "" || url == "" {
+		return nil
+	}
+
+	body := gconv.Map(tmpl["body"])
+	fillEmptyInPlace(body, url)
+
+	return map[string]any{
+		"type": typ,
+		typ:    body,
+	}
+}
+
+// fillEmptyInPlace 递归填充空字符串
+func fillEmptyInPlace(m map[string]any, value string) {
+	for k, v := range m {
+		switch vv := v.(type) {
+		case string:
+			if vv == "" {
+				m[k] = value
+			}
+		case map[string]any:
+			fillEmptyInPlace(vv, value)
+		}
+	}
+}
+
+// ======================== 系统提示词合并 ========================
+
+// MergeSystemPrompt 将系统提示词和技能内容拼接到 system role 的 content 中
+func MergeSystemPrompt(messages map[string]any, prompt, skills, userPrompt string, requestMapping map[string]any) map[string]any {
+	var parts []string
+	if prompt != "" {
+		parts = append(parts, prompt)
+	}
+	if userPrompt != "" {
+		parts = append(parts, userPrompt)
+	}
+	if skills != "" {
+		parts = append(parts, skills)
+	}
+	if len(parts) == 0 {
+		return messages
+	}
+
+	systemContent := strings.Join(parts, "\n")
+	systemPath := getSystemPromptPath(requestMapping)
+	if systemPath == "" {
+		return messages
+	}
+
+	msgJson := gjson.New(messages)
+
+	// 如果有 rounds，加前缀
+	if msgJson.Get("rounds.0").Val() != nil {
+		systemPath = "rounds.0." + systemPath
+	}
+
+	existing := msgJson.Get(systemPath).String()
+	if existing != "" {
+		systemContent = existing + "\n" + systemContent
+	}
+	_ = msgJson.Set(systemPath, systemContent)
+
+	return msgJson.Map()
+}
+
+// getSystemPromptPath 从 RequestMapping 中提取 system content 的路径
+func getSystemPromptPath(requestMapping map[string]any) string {
+	for key, val := range requestMapping {
+		if !strings.Contains(key, ".role") {
+			continue
+		}
+		if gconv.String(val) != "system" {
+			continue
+		}
+		prefix := strings.TrimSuffix(key, ".role")
+		contentKey := prefix + ".content"
+		if _, ok := requestMapping[contentKey]; ok {
+			return contentKey
+		}
+	}
+	return ""
+}
--- a/common/util/network.go
+++ b/common/util/network.go
@@ -1,130 +0,0 @@
-package util
-
-import (
-	"context"
-	"net"
-	"strings"
-
-	"github.com/gogf/gf/v2/frame/g"
-)
-
-// GetLocalIP 获取本机有效的局域网 IPv4 地址
-func GetLocalIP() string {
-	addrs, err := net.InterfaceAddrs()
-	if err != nil {
-		return "127.0.0.1"
-	}
-
-	var validIPs []string
-
-	for _, addr := range addrs {
-		ipnet, ok := addr.(*net.IPNet)
-		if !ok {
-			continue
-		}
-
-		ip := ipnet.IP
-
-		if isIPValid(ip) {
-			validIPs = append(validIPs, ip.String())
-		}
-	}
-
-	// 优先返回非 169.254.x.x 的 IP
-	for _, ip := range validIPs {
-		if !strings.HasPrefix(ip, "169.254.") {
-			return ip
-		}
-	}
-
-	// 其次返回 169.254.x.x（最后的选择）
-	if len(validIPs) > 0 {
-		return validIPs[0]
-	}
-
-	return "127.0.0.1"
-}
-
-// isIPValid 判断 IP 是否有效
-func isIPValid(ip net.IP) bool {
-	// 不是 loopback (127.0.0.1)
-	if ip.IsLoopback() {
-		return false
-	}
-
-	// 是 IPv4
-	if ip.To4() == nil {
-		return false
-	}
-
-	// 不是链路本地地址 (169.254.0.0/16)
-	if ip[0] == 169 && ip[1] == 254 {
-		return false
-	}
-
-	// 不是组播地址
-	if ip.IsMulticast() {
-		return false
-	}
-
-	// 不是未指定地址 (0.0.0.0)
-	if ip.IsUnspecified() {
-		return false
-	}
-
-	return true
-}
-
-// GetLocalAddress 获取局域网地址（IP:端口）
-func GetLocalAddress(ctx context.Context) string {
-	ip := GetLocalIP()
-	port := GetServerPort(ctx)
-
-	if port == "80" || port == "443" {
-		return ip
-	}
-	return ip + ":" + port
-}
-
-// GetSchemaFromRequest 从当前请求中获取协议（http/https）
-func GetSchemaFromRequest(ctx context.Context) string {
-	r := g.RequestFromCtx(ctx)
-	if r == nil {
-		return "http"
-	}
-
-	// 1. 代理场景：X-Forwarded-Proto
-	if proto := r.Header.Get("X-Forwarded-Proto"); proto != "" {
-		return proto
-	}
-
-	// 2. 代理场景：X-Forwarded-Scheme
-	if proto := r.Header.Get("X-Forwarded-Scheme"); proto != "" {
-		return proto
-	}
-
-	// 3. TLS 连接（直接 HTTPS）
-	if r.TLS != nil {
-		return "https"
-	}
-
-	// 4. 默认 HTTP（这行很重要！）
-	return "http" // ← 确保有这行
-}
-
-// GetLocalBaseURL 获取局域网基础 URL（动态协议 + IP + 端口）
-func GetLocalBaseURL(ctx context.Context) string {
-	schema := GetSchemaFromRequest(ctx)
-	addr := GetLocalAddress(ctx)
-	return schema + "://" + addr
-}
-
-// GetCallbackURL 获取回调地址（完整 URL）
-func GetCallbackURL(ctx context.Context, path string) string {
-	baseURL := GetLocalBaseURL(ctx)
-	// 确保 path 以 / 开头
-	if !strings.HasPrefix(path, "/") {
-		path = "/" + path
-	}
-	return baseURL + path
-}
--- a/config.yml
+++ b/config.yml
@@ -7,7 +7,7 @@ server:
 database:
  default:
    - type: "pgsql"
-      host: "116.204.74.41"
+      host: "192.168.0.83"
      port: "15432"
      user: "postgres"
      pass: "Bjang09@686^*^"
@@ -28,7 +28,7 @@ database:
      timeMaintainDisabled: false # (可选)是否完全关闭时间更新特性，为true时CreatedAt/UpdatedAt/DeletedAt都将失效
  model_gateway:
    - type: "pgsql"
-      host: "116.204.74.41"
+      host: "192.168.0.83"
      port: "15432"
      user: "postgres"
      pass: "Bjang09@686^*^"
@@ -39,8 +39,8 @@ database:
      dryRun: false
      charset: "utf8"
      timezone: "Asia/Shanghai"
-      maxIdle: 5
-      maxOpen: 20
+      maxIdle: 15
+      maxOpen: 60
      maxLifetime: "30s"
      maxIdleConnTime: "30s"
      createdAt: "created_at"
@@ -50,14 +50,17 @@ database:

 redis:
  default:
-    address: 192.168.3.30:6379
+    address: 192.168.0.83:6379
    db: 0

 consul:
-  address: 192.168.3.30:8500
+  address: 192.168.0.83:8500

 jaeger:
-  addr: 192.168.3.30:4318
+  addr: 192.168.0.83:4318
+
+# 文件上传服务地址，与oss模块minio中的endpoint一致
+filePrefix: "http://192.168.0.83:9000"

 task:
  waitTimeoutSeconds: 600            # /composeMessages 同步等待最终结果的最长时间（秒）
@@ -112,41 +115,3 @@ nodePrompts: |
    %s
    上下文内容：
    %s
-
-#你是专业的JSON结构生成专家，必须严格遵守以下全部规则。
-#      【强制规则】
-#      必须根据【输出结构】里面返回的JSON结构进行生成，不得任何更改，最终内容与输出结构返回一致；
-#      完整阅读所有文本、规则、表单内容，禁止跳读、漏读；
-#      完整读取UserForm所有字段，不得忽略任何字段；
-#      如果有skill相关内容必须完整的将内容拼接到system角色描述中；
-#      理解全部语义后再输出，禁止断章取义；
-#      UserForm所有字段内容必须完整拼接赋值到user角色描述中，不得有任何遗漏。
-#      【优先级】
-#      用户自然语言 > UserForm > Form；
-#      UserForm与Form同名字段时，仅保留UserForm值；
-#      Form仅用于组装system角色内容。
-#      【表单处理】
-#      Form：系统提示词、默认参数、基础配置 → 专属填充system角色；
-#      UserForm：用户业务输入、文案、配图数量、比例、prompt等 → 全部解析后拼接进user角色content；
-#      自动提取UserForm中每条文案的配图数量，总图片数 = 各文案配图数累加求和，用户没有相关数量必须默认1；
-#      图片尺寸为空时自动填充size=1024*1024。
-#      【结构铁律】
-#      严格沿用固定输出结构，不增删字段或修改层级；
-#      messages元素必须按结构返回；
-#      禁止将role对象转为字符串、禁止嵌套错乱；
-#      输出纯净JSON：无多余转义符、无换行符、无额外字符；
-#      所有括号、引号必须成对闭合，保证JSON合法。
-#      【参数赋值】
-#      model固定沿用传入值；
-#      返回结构里面的参数，需要根据语意进行赋值，缺失补默认值；
-#      history历史信息必须结合UserForm里的内容对用户描述部分进行补充；
-#      从UserForm提取信息整合进user描述，确保数量、尺寸、文案语义无遗漏。
-#      【输出要求】
-#      仅输出单行纯净JSON，无任何解释、备注、Markdown或多余符号；
-#      完整合UserForm全部字段语义到user描述；
-#      生成后自检JSON语法、结构、数量；错误则自动重新生成。
-#      【输出结构】
-#      %s
-#      【完整输入信息】
-#      %s
-#      直接输出最终JSON：
--- a/consts/public/public.go
+++ b/consts/public/public.go
@@ -9,4 +9,9 @@ const (
 const (
 	BuildTypePrompt = 1 //提示词构建
 	BuildTypeNode   = 2 //节点构建
+	BuildTypeStruct = 3 //结构构建
+)
+
+const (
+	ModelTypeInference = 100 // 推理模型
 )
--- a/controller/prompt_compose_controller.go
+++ b/controller/prompt_compose_controller.go
@@ -3,7 +3,6 @@ package controller
 import (
 	"context"
 	"prompts-core/model/dto"
-
 	promptService "prompts-core/service/prompt"
 )

--- a/controller/prompt_session_controller.go
+++ b/controller/prompt_session_controller.go
@@ -1,18 +1,36 @@
+// ============================================
+// controller/session.go
+// ============================================
+
 package controller

 import (
 	"context"
-	"prompts-core/model/dto"

-	promptService "prompts-core/service/prompt"
+	"prompts-core/model/dto"
+	sessionService "prompts-core/service/session"
 )

 type session struct{}

-// Session 提示词会话控制器
 var Session = new(session)

 // SessionCallback 会话回调
 func (c *session) SessionCallback(ctx context.Context, req *dto.SessionCallbackReq) (res *dto.SessionCallbackRes, err error) {
-	return promptService.SessionCallback(ctx, req)
+	return sessionService.Callback(ctx, req)
+}
+
+// GetHistoryList 获取历史列表（前端列表）
+func (c *session) GetHistoryList(ctx context.Context, req *dto.GetHistoryListReq) (res *dto.GetHistoryListRes, err error) {
+	return sessionService.GetHistoryList(ctx, req)
+}
+
+// DeleteMessages 批量删除消息
+func (c *session) DeleteMessages(ctx context.Context, req *dto.DeleteMessagesReq) (res *dto.DeleteMessagesRes, err error) {
+	return sessionService.DeleteMessages(ctx, req)
+}
+
+// DeleteSession 删除整个会话
+func (c *session) DeleteSession(ctx context.Context, req *dto.DeleteSessionReq) (res *dto.DeleteSessionRes, err error) {
+	return sessionService.DeleteSession(ctx, req)
 }
--- a/dao/compose_session_dao.go
+++ b/dao/compose_session_dao.go
@@ -5,8 +5,7 @@ import (
 	"prompts-core/consts/public"
 	"prompts-core/model/entity"

-	"gitea.com/red-future/common/db/gfdb"
-	"github.com/gogf/gf/v2/util/gconv"
+	"gitea.redpowerfuture.com/red-future/common/db/gfdb"
 )

 var ComposeSession = &composeSessionDao{}
@@ -15,13 +14,8 @@ type composeSessionDao struct{}

 // Insert 插入
 func (d *composeSessionDao) Insert(ctx context.Context, req *entity.ComposeSession) (id int64, err error) {
-	var m = new(entity.ComposeSession)
-	err = gconv.Struct(req, &m)
-	if err != nil {
-		return
-	}
 	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameComposeSession).
-		Insert(m)
+		Insert(req)
 	if err != nil {
 		return
 	}
@@ -69,6 +63,7 @@ func (d *composeSessionDao) Get(ctx context.Context, req *entity.ComposeSession,
 	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameComposeSession).
 		OmitEmpty().
 		Where(entity.ComposeSessionCol.Id, req.Id).
+		Where(entity.ComposeSessionCol.Creator, req.Creator).
 		Where(entity.ComposeSessionCol.SessionId, req.SessionId).
 		Fields(fields).One()
 	if err != nil {
@@ -86,6 +81,7 @@ func (d *composeSessionDao) Delete(ctx context.Context, req *entity.ComposeSessi
 	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameComposeSession).
 		OmitEmpty().
 		Where(entity.ComposeSessionCol.Id, req.Id).
+		Where(entity.ComposeSessionCol.Creator, req.Creator).
 		Where(entity.ComposeSessionCol.SessionId, req.SessionId).
 		Delete()
 	if err != nil {
@@ -93,3 +89,36 @@ func (d *composeSessionDao) Delete(ctx context.Context, req *entity.ComposeSessi
 	}
 	return r.RowsAffected()
 }
+
+// ListByIds 根据 ID 列表批量查询
+func (d *composeSessionDao) ListByIds(ctx context.Context, ids []int64, creator, sessionId string) (list []*entity.ComposeSession, err error) {
+	if len(ids) == 0 {
+		return nil, nil
+	}
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameComposeSession).
+		WhereIn(entity.ComposeSessionCol.Id, ids).
+		Where(entity.ComposeSessionCol.Creator, creator).
+		Where(entity.ComposeSessionCol.SessionId, sessionId).
+		All()
+	if err != nil {
+		return nil, err
+	}
+	err = r.Structs(&list)
+	return
+}
+
+// DeleteByIds 批量删除编排会话
+func (d *composeSessionDao) DeleteByIds(ctx context.Context, ids []int64, creator, sessionId string) (int64, error) {
+	if len(ids) == 0 {
+		return 0, nil
+	}
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameComposeSession).
+		WhereIn(entity.ComposeSessionCol.Id, ids).
+		Where(entity.ComposeSessionCol.Creator, creator).
+		Where(entity.ComposeSessionCol.SessionId, sessionId).
+		Delete()
+	if err != nil {
+		return 0, err
+	}
+	return r.RowsAffected()
+}
--- a/dao/compose_task_dao.go
+++ b/dao/compose_task_dao.go
@@ -5,7 +5,7 @@ import (
 	"prompts-core/consts/public"
 	"prompts-core/model/entity"

-	"gitea.com/red-future/common/db/gfdb"
+	"gitea.redpowerfuture.com/red-future/common/db/gfdb"
 	"github.com/gogf/gf/v2/util/gconv"
 )

--- a/dao/model_dao.go
+++ b/dao/model_dao.go
@@ -1,28 +0,0 @@
-package dao
-
-import (
-	"context"
-	"prompts-core/consts/public"
-	"prompts-core/model/entity"
-
-	"gitea.com/red-future/common/db/gfdb"
-)
-
-var Model = &modelDao{}
-
-type modelDao struct{}
-
-// Get 获取模型
-func (d *modelDao) Get(ctx context.Context, req *entity.AsynchModel, fields ...string) (m *entity.AsynchModel, err error) {
-	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameModel).
-		OmitEmpty().
-		Where(entity.AsynchModelCol.Creator, req.Creator).
-		Where(entity.AsynchModelCol.IsChatModel, req.IsChatModel).
-		Where(entity.AsynchModelCol.ModelName, req.ModelName).
-		Fields(fields).One()
-	if err != nil {
-		return
-	}
-	err = r.Struct(&m)
-	return
-}
--- a/dao/provider_protocol_dao.go
+++ b/dao/provider_protocol_dao.go
@@ -2,10 +2,11 @@ package dao

 import (
 	"context"
+	"fmt"
 	"prompts-core/consts/public"
 	"prompts-core/model/entity"

-	"gitea.com/red-future/common/db/gfdb"
+	"gitea.redpowerfuture.com/red-future/common/db/gfdb"
 	"github.com/gogf/gf/v2/util/gconv"
 )

@@ -28,23 +29,57 @@ func (d *providerProtocolDao) Insert(ctx context.Context, req *entity.ProviderPr
 	return r.LastInsertId()
 }

-// Get 查询协议配置
-func (d *providerProtocolDao) Get(ctx context.Context, req *entity.ProviderProtocol, fields ...string) (res *entity.ProviderProtocol, err error) {
-	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameProviderProtocol).
-		NoTenantId(ctx).
-		OmitEmpty().
-		Where(entity.ProviderProtocolCol.Id, req.Id).
-		Where(entity.ProviderProtocolCol.ProviderName, req.ProviderName). //主要是根据运营商查询
-		Where(entity.ProviderProtocolCol.Status, 1).
-		Fields(fields).One()
+//// Get 查询协议配置
+//func (d *providerProtocolDao) Get(ctx context.Context, req *entity.ProviderProtocol, fields ...string) (res *entity.ProviderProtocol, err error) {
+//	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameProviderProtocol).
+//		NoTenantId(ctx).
+//		OmitEmpty().
+//		Where(entity.ProviderProtocolCol.Id, req.Id).
+//		Where(entity.ProviderProtocolCol.ProviderName, req.ProviderName). //主要是根据运营商查询
+//		Where(entity.ProviderProtocolCol.Status, 1).
+//		Fields(fields).One()
+//	if err != nil {
+//		return nil, err
+//	}
+//	if r.IsEmpty() {
+//		return nil, nil
+//	}
+//	err = r.Struct(&res)
+//	return
+//}
+
+// Get 获取协议配置
+func (d *providerProtocolDao) Get(ctx context.Context, req *entity.ProviderProtocol, fields ...string) (*entity.ProviderProtocol, error) {
+	sql := fmt.Sprintf(`SELECT * FROM %s WHERE deleted_at IS NULL AND status = 1`, public.TableNameProviderProtocol)
+	args := make([]any, 0)
+
+	if req.Id != 0 {
+		sql += ` AND id = ?`
+		args = append(args, req.Id)
+	}
+	if req.ProviderName != "" {
+		sql += ` AND provider_name = ?`
+		args = append(args, req.ProviderName)
+	}
+
+	sql += ` LIMIT 1`
+
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).GetAll(ctx, sql, args...)
 	if err != nil {
 		return nil, err
 	}
 	if r.IsEmpty() {
 		return nil, nil
 	}
-	err = r.Struct(&res)
-	return
+
+	var list []*entity.ProviderProtocol
+	if err = r.Structs(&list); err != nil {
+		return nil, err
+	}
+	if len(list) == 0 {
+		return nil, nil
+	}
+	return list[0], nil
 }

 // List 列表查询
--- a/go.mod
+++ b/go.mod
@@ -1,36 +1,34 @@
 module prompts-core

-go 1.26.0
+go 1.26.1

 require (
-	gitea.com/red-future/common v0.0.19
-	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0
-	github.com/gogf/gf/contrib/nosql/redis/v2 v2.10.0
-	github.com/gogf/gf/v2 v2.10.0
+	gitea.redpowerfuture.com/red-future/common v0.0.26
+	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.2
+	github.com/gogf/gf/contrib/nosql/redis/v2 v2.10.2
+	github.com/gogf/gf/v2 v2.10.2
 )

 require (
-	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.0 // indirect
-)
-
-require (
-	github.com/BurntSushi/toml v1.5.0 // indirect
+	github.com/BurntSushi/toml v1.6.0 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/bwmarrin/snowflake v0.3.0 // indirect
 	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
+	github.com/clipperhouse/displaywidth v0.11.0 // indirect
+	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
 	github.com/dgraph-io/badger/v4 v4.2.0 // indirect
 	github.com/dgraph-io/ristretto v0.1.1 // indirect
-	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/emirpasic/gods/v2 v2.0.0-alpha // indirect
-	github.com/fatih/color v1.18.0 // indirect
-	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/fatih/color v1.19.0 // indirect
+	github.com/fsnotify/fsnotify v1.10.1 // indirect
 	github.com/go-ego/gse v1.0.2 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
+	github.com/goccy/go-json v0.10.6 // indirect
 	github.com/gogf/gf/contrib/registry/consul/v2 v2.9.5 // indirect
 	github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.9.5 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
@@ -39,57 +37,61 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v1.0.0 // indirect
-	github.com/google/flatbuffers v1.12.1 // indirect
+	github.com/google/btree v1.1.3 // indirect
+	github.com/google/flatbuffers v25.12.19+incompatible // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
-	github.com/hashicorp/consul/api v1.26.1 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
+	github.com/hashicorp/consul/api v1.33.5 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-hclog v1.5.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
+	github.com/hashicorp/go-version v1.9.0 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/hashicorp/serf v0.10.1 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
-	github.com/lib/pq v1.10.9 // indirect
+	github.com/klauspost/compress v1.18.6 // indirect
+	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
+	github.com/lib/pq v1.12.3 // indirect
 	github.com/magiconair/properties v1.8.10 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mattn/go-colorable v0.1.15 // indirect
+	github.com/mattn/go-isatty v0.0.22 // indirect
+	github.com/mattn/go-runewidth v0.0.24 // indirect
+	github.com/miekg/dns v1.1.72 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/olekukonko/errors v1.1.0 // indirect
-	github.com/olekukonko/ll v0.0.9 // indirect
-	github.com/olekukonko/tablewriter v1.1.0 // indirect
+	github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
+	github.com/olekukonko/errors v1.3.0 // indirect
+	github.com/olekukonko/ll v0.1.8 // indirect
+	github.com/olekukonko/tablewriter v1.1.4 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/r3labs/diff/v2 v2.15.1 // indirect
-	github.com/redis/go-redis/v9 v9.12.1 // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/tidwall/gjson v1.19.0
+	github.com/redis/go-redis/v9 v9.21.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/tiger1103/gfast-token v1.0.10 // indirect
 	github.com/vcaesar/cedar v0.30.0 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
-	go.mongodb.org/mongo-driver/v2 v2.4.0 // indirect
-	go.opencensus.io v0.23.0 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
+	go.mongodb.org/mongo-driver/v2 v2.6.0 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/otel v1.44.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
+	go.opentelemetry.io/otel/metric v1.44.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.44.0 // indirect
+	go.opentelemetry.io/otel/trace v1.44.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
-	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
-	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	golang.org/x/exp v0.0.0-20260611194520-c48552f49976 // indirect
+	golang.org/x/net v0.56.0 // indirect
+	golang.org/x/sys v0.46.0 // indirect
+	golang.org/x/text v0.38.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
-	google.golang.org/grpc v1.75.0 // indirect
-	google.golang.org/protobuf v1.36.8 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
+	google.golang.org/grpc v1.79.3 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-gitea.com/red-future/common v0.0.19 h1:9/WrfCFUCeFUYwuhBYF+JOQi5F5xuOy+gVnf2ZvHZu4=
-gitea.com/red-future/common v0.0.19/go.mod h1:6/nqIucVzmjOyqDTIq71feYBXXFNBy0rFwzaQ0/Ueoo=
+gitea.redpowerfuture.com/red-future/common v0.0.25 h1:TFKmcyByChLc3gBr1mgyWOBmT2acEpS8G2Asm9QmDdo=
+gitea.redpowerfuture.com/red-future/common v0.0.25/go.mod h1:50U1Xi+Ie56z09S5LQbZvaken0Mxv3OeS9LgR7U/ZRY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
-github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -36,6 +35,8 @@ github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp
 github.com/clbanning/mxj/v2 v2.7.0 h1:WA/La7UGCanFe5NpHF0Q3DNtnCsVoxbPKuyBNHWRyME=
 github.com/clbanning/mxj/v2 v2.7.0/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSEFgwIwO+UVM8=
+github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -47,8 +48,6 @@ github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWa
 github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
@@ -61,10 +60,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
-github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
-github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w=
+github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=
 github.com/go-ego/gse v1.0.2 h1:+27lYFPhQEhA9igtdOsJPRKYL/k3TwYsxBF5jr6KFv4=
 github.com/go-ego/gse v1.0.2/go.mod h1:Fy35G+q7VV7Et1zIKO8o/sW1kkugV3znXap/lF/11zc=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -77,16 +74,18 @@ github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ4
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0 h1:39+jbTenm7KBj4hO2C8ANAxVHpX/7OuRDs1VcGC9ylA=
-github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0/go.mod h1:B0s0fVzn0W220E8UTpSGzrrGKsop5KcB90twBeLCiz0=
-github.com/gogf/gf/contrib/nosql/redis/v2 v2.10.0 h1:N/F9CuDdUZLoM1nVRqrDE/33pDZuhVxpNY4wYdeIaBs=
-github.com/gogf/gf/contrib/nosql/redis/v2 v2.10.0/go.mod h1:x6uoJGfZOtirIRQls8xUlYzC6f7T/eULPUa9er368X0=
+github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=
+github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU=
+github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.2 h1:u8EpP24GkprogROnJ7htMov9Fc66pTP1eVYrWxiCYOs=
+github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.2/go.mod h1:GmvM3r8GVByVMi4RD2+MCs5+CfxVXPMeT8mVDkAaAXE=
+github.com/gogf/gf/contrib/nosql/redis/v2 v2.10.2 h1:iTQegT+lEg/wDKvj2mi3W1wrdrwFarjokf88EXVVgu4=
+github.com/gogf/gf/contrib/nosql/redis/v2 v2.10.2/go.mod h1:ZRw3GNz5cq4uYrW4TPSVyrYWaoqzujKdWro/AOcGBaE=
 github.com/gogf/gf/contrib/registry/consul/v2 v2.9.5 h1:eUqwJ/qNH8lJ6yssiqskazgp1ACQuNU6zXlLOZVuXTQ=
 github.com/gogf/gf/contrib/registry/consul/v2 v2.9.5/go.mod h1:sjQyMry9+0POYZCA6lHXBxO77WoNKkruJpRB4xKqk5k=
 github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.9.5 h1:tHUEZYB5GTqEYYVDYnlGobf1xISARKDE4KHVlgjwTec=
 github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.9.5/go.mod h1:cfzTn2HS9RDX8f5pUVkbGxUWcSosouqfNQ1G6cY0V88=
-github.com/gogf/gf/v2 v2.10.0 h1:rzDROlyqGMe/eM6dCalSR8dZOuMIdLhmxKSH1DGhbFs=
-github.com/gogf/gf/v2 v2.10.0/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
+github.com/gogf/gf/v2 v2.10.2 h1:46IO0Uc8e85/FqdftJFskfDejJLBL0JBnGS5qOftUu8=
+github.com/gogf/gf/v2 v2.10.2/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
@@ -114,10 +113,8 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6
 github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
 github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
-github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
-github.com/google/flatbuffers v1.12.1 h1:MVlul7pQNoDzWRLTw5imwYsl+usrS1TXG2H4jg6ImGw=
-github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
+github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
+github.com/google/flatbuffers v25.12.19+incompatible h1:haMV2JRRJCe1998HeW/p0X9UaMTK6SDo0ffLn2+DbLs=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -134,12 +131,9 @@ github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5T
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
 github.com/grokify/html-strip-tags-go v0.1.0 h1:03UrQLjAny8xci+R+qjCce/MYnpNXCtgzltlQbOBae4=
 github.com/grokify/html-strip-tags-go v0.1.0/go.mod h1:ZdzgfHEzAfz9X6Xe5eBLVblWIxXfYSQ40S/VKrAOGpc=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs=
-github.com/hashicorp/consul/api v1.26.1 h1:5oSXOO5fboPZeW5SN+TdGFP/BILDgBm19OrPZ/pICIM=
-github.com/hashicorp/consul/api v1.26.1/go.mod h1:B4sQTeaSO16NtynqrAdwOlahJ7IUDZM9cj2420xYL8A=
-github.com/hashicorp/consul/sdk v0.15.0 h1:2qK9nDrr4tiJKRoxPGhm6B7xJjLVIQqkjiab2M4aKjU=
-github.com/hashicorp/consul/sdk v0.15.0/go.mod h1:r/OmRRPbHOe0yxNahLw7G9x5WG17E1BIECMtCjcPSNo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
+github.com/hashicorp/consul/api v1.33.5 h1:Nn6q87zudRU1rLBTJEgaWxz9STCNadilLCD7B8OA5aI=
+github.com/hashicorp/consul/sdk v0.17.3 h1:oZMMxzQGSsiT+ToOH50y3Qcs0nc9Ud+7L5lRx+EmMU0=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -169,8 +163,7 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
-github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/go-version v1.9.0 h1:CeOIz6k+LoN3qX9Z0tyQrPtiB1DFYRPfCIBtaXPSCnA=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
 github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
@@ -185,8 +178,8 @@ github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/klauspost/compress v1.18.6 h1:2jupLlAwFm95+YDR+NwD2MEfFO9d4z4Prjl1XXDjuao=
+github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -196,8 +189,7 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
-github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.12.3 h1:tTWxr2YLKwIvK90ZXEw8GP7UFHtcbTtty8zsI+YjrfQ=
 github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE=
 github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -205,39 +197,31 @@ github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
-github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/mattn/go-colorable v0.1.15 h1:+u9SLTRGnXv73cEsnsmoZBom+dMU88B2M0aDcWy0/jY=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
-github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
+github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/ay2DU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
-github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs=
+github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI=
 github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
-github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
-github.com/olekukonko/ll v0.0.9 h1:Y+1YqDfVkqMWuEQMclsF9HUR5+a82+dxJuL1HHSRpxI=
-github.com/olekukonko/ll v0.0.9/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g=
-github.com/olekukonko/tablewriter v1.1.0 h1:N0LHrshF4T39KvI96fn6GT8HEjXRXYNDrDjKFDB7RIY=
-github.com/olekukonko/tablewriter v1.1.0/go.mod h1:5c+EBPeSqvXnLLgkm9isDdzR3wjfBkHR9Nhfp3NWrzo=
+github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 h1:zrbMGy9YXpIeTnGj4EljqMiZsIcE09mmF8XsD5AYOJc=
+github.com/olekukonko/errors v1.3.0 h1:teJvgLGUEqMzBUms+Dj3/3szNqCG/Jdw9iDbum8fR6U=
+github.com/olekukonko/ll v0.1.8 h1:ysHCJRGHYKzmBSdz9w5AySztx7lG8SQY+naTGYUbsz8=
+github.com/olekukonko/tablewriter v1.1.4 h1:ORUMI3dXbMnRlRggJX3+q7OzQFDdvgbN9nVWj1drm6I=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -264,13 +248,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/r3labs/diff/v2 v2.15.1 h1:EOrVqPUzi+njlumoqJwiS/TgGgmZo83619FNDB9xQUg=
 github.com/r3labs/diff/v2 v2.15.1/go.mod h1:I8noH9Fc2fjSaMxqF3G2lhDdC0b+JXCfyx85tWFM9kc=
-github.com/redis/go-redis/v9 v9.12.1 h1:k5iquqv27aBtnTm2tIkROUDp8JBXhXZIVu1InSgvovg=
-github.com/redis/go-redis/v9 v9.12.1/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
-github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/redis/go-redis/v9 v9.21.0 h1:FPBE4hhbAke+TLmcY3WkpbDffJEomdqPn3HYiqAtL9E=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
@@ -278,22 +257,15 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/tidwall/gjson v1.19.0 h1:xwxm7n691Uf3u5OFjzngavjGTh55KX5q/9w9xHW88JU=
-github.com/tidwall/gjson v1.19.0/go.mod h1:V37/opeE/JbLUOfH0QTXiNez2l0RUjYUhpT4szFQAfc=
-github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
-github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
-github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tiger1103/gfast-token v1.0.10 h1:fNiBE/Dq5iTHvTGlCx3DmXa2o4hr0NtumFpffZ39k6s=
 github.com/tiger1103/gfast-token v1.0.10/go.mod h1:a/21mxmj7zFeNvjhZSC0XpEAFHfb1aT2k6DXnufFU1s=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
@@ -305,28 +277,22 @@ github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaU
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.mongodb.org/mongo-driver/v2 v2.4.0 h1:Oq6BmUAAFTzMeh6AonuDlgZMuAuEiUxoAD1koK5MuFo=
-go.mongodb.org/mongo-driver/v2 v2.4.0/go.mod h1:jHeEDJHJq7tm6ZF45Issun9dbogjfnPySb1vXA7EeAI=
-go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
-go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
+github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs=
+go.mongodb.org/mongo-driver/v2 v2.6.0 h1:b9sJOYrkmt4l8bY43ZenFBcPlhYIjaOfYHLtbB/5qi8=
+go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
+go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
+go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 h1:GqRJVj7UmLjCVyVJ3ZFLdPRmhDUp2zFmQe3RHIOsw24=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0/go.mod h1:ri3aaHSmCTVYu2AWv44YMauwAQc0aqI9gHKIcSbI1pU=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 h1:aTL7F04bJHUlztTsNGJ2l+6he8c+y/b//eR0jjjemT4=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0/go.mod h1:kldtb7jDTeol0l3ewcmd8SDvx3EmIE7lyvqbasU3QC4=
-go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
-go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
-go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
-go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
-go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
-go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
-go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
-go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
+go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=
+go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=
+go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=
+go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=
 go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4=
 go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=
+go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -335,15 +301,13 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
+golang.org/x/exp v0.0.0-20260611194520-c48552f49976 h1:X8Hz2ImujgbmetVuW+w2YkyZChE3cBpZi2P158rTG9M=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
-golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
+golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -359,8 +323,7 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
+golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -369,8 +332,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -394,16 +356,13 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -413,8 +372,7 @@ golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
-golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
+golang.org/x/tools v0.46.0 h1:7jTurBkPZu4moS/Uy4OQT1M+QBlsj3wejyZwsT8Z7rk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -429,17 +387,14 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 h1:BIRfGDEjiHRrk0QKZe3Xv2ieMhtgRGeLcZQ0mIVn4EY=
-google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5/go.mod h1:j3QtIyytwqGr1JUDtYXwtMXWPKsEa5LtzIFN1Wn5WvE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 h1:eaY8u2EuxbRv7c3NiGK0/NedzVsCcV6hDuU5qPX5EGE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5/go.mod h1:M4/wBTSeyLxupu3W3tJtOgB14jILAS/XWPSSa3TAlJc=
+google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 h1:JLQynH/LBHfCTSbDWl+py8C+Rg/k1OVH3xfcaiANuF0=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 h1:mWPCjDEyshlQYzBpMNHaEof6UX1PmHcaUODUywQ0uac=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4=
-google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
+google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -449,8 +404,7 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
-google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
+google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
--- a/main.go
+++ b/main.go
@@ -7,9 +7,9 @@ import (
 	"prompts-core/controller"
 	"syscall"

-	"gitea.com/red-future/common/http"
-	"gitea.com/red-future/common/jaeger"
-	_ "gitea.com/red-future/common/swagger"
+	"gitea.redpowerfuture.com/red-future/common/http"
+	"gitea.redpowerfuture.com/red-future/common/jaeger"
+	_ "gitea.redpowerfuture.com/red-future/common/swagger"
 	_ "github.com/gogf/gf/contrib/drivers/pgsql/v2"
 	_ "github.com/gogf/gf/contrib/nosql/redis/v2"
 	"github.com/gogf/gf/v2/frame/g"
--- a/model/dto/prompt_compose_dto.go
+++ b/model/dto/prompt_compose_dto.go
@@ -6,39 +6,33 @@ type ComposeMessagesReq struct {
 	g.Meta      `path:"/composeMessages" method:"post" tags:"提示词处理" summary:"拼接提示词" dc:"按 modelTypeId 读取 prompts_model_prompt.prompt_info 与 response_json_schema；form 作为系统表单，userForm 作为用户表单，结合 userFiles 调用 model-gateway，并直接返回最终 messages"`
 	ModelName   string           `p:"modelName" json:"modelName" v:"required#modelName不能为空" dc:"实际请求的网关模型名称"`
 	BuildType   int              `p:"buildType" json:"buildType" v:"required#buildType不能为空" dc:"构建类型"` //判断节点
-	SessionId   string           `p:"sessionId" json:"sessionId" v:"required#sessionId不能为空" dc:"会话ID"`
+	NodeId      string           `p:"nodeId" json:"nodeId" dc:"节点ID"`
+	SessionId   string           `p:"sessionId" json:"sessionId"  dc:"会话ID"` //v:"required#sessionId不能为空"
 	Cause       string           `p:"cause" json:"cause" v:"required-if:IsBuilder,false#原因不能为空" dc:"原因"`
 	CallbackUrl string           `p:"callbackUrl" json:"callbackUrl" dc:"回调地址"`
-	Form        map[string]any   `p:"form" json:"form" dc:"系统表单：form 下所有字段都作为系统提示词来源"`
+	Form        []map[string]any `p:"form" json:"form" dc:"系统表单：form 下所有字段都作为系统提示词来源"`
 	UserForm    []map[string]any `p:"userForm" json:"userForm" dc:"用户表单：userForm 下所有字段都作为用户提示词来源；若与 form 含义接近则严格覆盖系统字段"`
+	Consult     []ConsultItem    `json:"consult" dc:"附件列表（图片/视频/音频）"`
 	SkillName   string           `p:"skillName" json:"skillName" dc:"技能名称"`
-	UserFiles   []string         `p:"userFiles" json:"userFiles" dc:"用户附件地址列表"`
+	UserPrompt  string           `p:"userPrompt" json:"userPrompt" dc:"用户提示词"`
 }

+// ConsultItem 单个附件
+type ConsultItem struct {
+	Type string `json:"type" dc:"附件类型：image/video/audio"`
+	Url  string `json:"url" dc:"附件地址"`
+}
 type ComposeMessagesRes struct {
 	TaskId string `json:"taskId" dc:"任务ID"`
 }

-/*
-	Messages   *MultiRoundResult `json:"messages,omitempty" dc:"最终消息数组"`
-	EpicycleId int64             `json:"epicycleId" dc:"轮次ID"`
-*/
-
-// MultiRoundResult 多轮返回结果
-type MultiRoundResult struct {
-	TotalRounds int              `json:"total_rounds"` // 总轮数
-	Rounds      []map[string]any `json:"rounds"`       // 每轮详情（动态类型）
-}
-
 type CallbackReq struct {
-	g.Meta     `path:"/callback" method:"post" tags:"提示词处理" summary:"model-gateway 回调" dc:"model-gateway 成功后 POST 回调：callbackUrl/{bizName}"`
-	TaskId     string `json:"task_id" v:"required#task_id不能为空" dc:"网关任务ID"`
-	State      int    `json:"state" dc:"网关任务状态"`
-	OssFile    string `json:"oss_file" dc:"结果文件地址"`
-	FileType   string `json:"file_type" dc:"结果文件类型"`
-	Text       string `json:"text" dc:"文本结果"`
-	ErrorMsg   string `json:"error_msg" dc:"错误信息"`
-	EpicycleId int64  `json:"epicycleId" dc:"轮次ID"`
+	g.Meta   `path:"/callback" method:"post" tags:"提示词处理" summary:"model-gateway 回调" dc:"model-gateway 成功后 POST 回调：callbackUrl/{bizName}"`
+	TaskId   string `json:"task_id" v:"required#task_id不能为空" dc:"网关任务ID"`
+	State    int    `json:"state" dc:"网关任务状态"`
+	OssFile  string `json:"oss_file" dc:"结果文件地址"`
+	FileType string `json:"file_type" dc:"结果文件类型"`
+	ErrorMsg string `json:"error_msg" dc:"错误信息"`
 }

 type CallbackRes struct {
@@ -50,11 +44,11 @@ type GetComposeTaskReq struct {
 }

 type GetComposeTaskRes struct {
-	TaskId       string `json:"taskId" dc:"任务ID"`
-	Status       string `json:"status" dc:"业务状态"`
-	GatewayState int    `json:"gatewayState" dc:"网关状态"`
-	ErrorMessage string `json:"errorMessage" dc:"错误信息"`
-	Messages     any    `json:"messages" dc:"最终消息数组"`
-	OssFile      string `json:"ossFile" dc:"结果文件地址"`
-	FileType     string `json:"fileType" dc:"结果文件类型"`
+	TaskId       string         `json:"taskId" dc:"任务ID"`
+	Status       string         `json:"status" dc:"业务状态"`
+	GatewayState int            `json:"gatewayState" dc:"网关状态"`
+	ErrorMessage string         `json:"errorMessage" dc:"错误信息"`
+	Messages     map[string]any `json:"messages" dc:"最终消息数组"`
+	OssFile      string         `json:"ossFile" dc:"结果文件地址"`
+	FileType     string         `json:"fileType" dc:"结果文件类型"`
 }
--- a/model/dto/prompt_session_dto.go
+++ b/model/dto/prompt_session_dto.go
@@ -2,11 +2,79 @@ package dto

 import "github.com/gogf/gf/v2/frame/g"

-type SessionCallbackReq struct {
-	g.Meta     `path:"/sessionCallback" method:"post" tags:"提示词处理"`
-	Text       string `json:"text" dc:"文本结果"`
-	EpicycleId int64  `json:"epicycleId" dc:"轮次ID"`
+// HistoryRound 一轮对话
+type HistoryRound struct {
+	Id        int64          `json:"id" dc:"记录ID"`
+	SessionId string         `json:"sessionId" dc:"会话ID"`
+	NodeId    string         `json:"nodeId" dc:"节点ID"`
+	User      map[string]any `json:"user" dc:"用户消息"`
+	Assistant map[string]any `json:"assistant" dc:"助手回复"`
+	CreatedAt string         `json:"createdAt" dc:"创建时间"`
+	UpdatedAt string         `json:"updatedAt" dc:"更新时间"`
 }

-type SessionCallbackRes struct {
+// SessionCallbackReq 会话回调请求
+type SessionCallbackReq struct {
+	g.Meta     `path:"/callback" method:"post" tags:"会话管理" summary:"会话回调"`
+	Messages   map[string]any `json:"messages" v:"required" dc:"消息数组"`
+	EpicycleId int64          `json:"epicycleId" v:"required" dc:"轮次ID"`
+}
+
+// SessionCallbackRes 会话回调响应
+type SessionCallbackRes struct {
+	Status    bool   `json:"status" dc:"状态"`
+	SessionId string `json:"sessionId" dc:"会话ID"`
+}
+
+// GetHistoryListReq 获取历史列表请求（前端）
+type GetHistoryListReq struct {
+	g.Meta `path:"/historyList" method:"get" tags:"会话管理" summary:"获取历史列表"`
+	Page   int `json:"page" d:"1" dc:"页码"`
+	Size   int `json:"size" d:"10" dc:"每页条数"`
+}
+
+// GetHistoryListRes 获取历史列表响应
+type GetHistoryListRes struct {
+	List  []HistoryRound `json:"list" dc:"历史列表"`
+	Total int            `json:"total" dc:"总数"`
+}
+
+// GetHistoryMessagesReq 获取历史消息请求（提示词拼接）
+type GetHistoryMessagesReq struct {
+	g.Meta    `path:"/historyMessages" method:"get" tags:"会话管理" summary:"获取历史消息"`
+	SessionId string `json:"sessionId" v:"required" dc:"会话ID"`
+	NodeId    string `json:"nodeId" dc:"节点ID"`
+}
+
+// GetHistoryMessagesRes 获取历史消息响应
+type GetHistoryMessagesRes struct {
+	Messages []FlatMessage `json:"messages"`
+}
+
+type FlatMessage struct {
+	Role    string `json:"role"`
+	Content string `json:"content"`
+}
+
+// DeleteMessagesReq 批量删除消息请求
+type DeleteMessagesReq struct {
+	g.Meta    `path:"/deleteMessages" method:"post" tags:"会话管理" summary:"批量删除消息"`
+	SessionId string  `json:"sessionId" v:"required" dc:"会话ID"`
+	MsgIds    []int64 `json:"msgIds" v:"required" dc:"消息ID列表"`
+}
+
+// DeleteMessagesRes 批量删除消息响应
+type DeleteMessagesRes struct {
+	Ok bool `json:"ok" dc:"是否成功"`
+}
+
+// DeleteSessionReq 删除整个会话请求
+type DeleteSessionReq struct {
+	g.Meta    `path:"/deleteSession" method:"post" tags:"会话管理" summary:"删除整个会话"`
+	SessionId string `json:"sessionId" v:"required" dc:"会话ID"`
+}
+
+// DeleteSessionRes 删除整个会话响应
+type DeleteSessionRes struct {
+	Ok bool `json:"ok" dc:"是否成功"`
 }
--- a/model/entity/asynch_model.go
+++ b/model/entity/asynch_model.go
@@ -1,94 +0,0 @@
-package entity
-
-import "gitea.com/red-future/common/beans"
-
-// AsynchModel 异步模型配置
-type AsynchModel 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              string `orm:"head_msg" json:"headMsg"`
-	Form                 any    `orm:"form_json" json:"form"`
-	RequestMapping       any    `orm:"request_mapping" json:"requestMapping"`
-	ResponseMapping      any    `orm:"response_mapping" json:"responseMapping"`
-	ResponseBody         any    `orm:"response_body" json:"responseBody"`
-	ResponseTokenField   string `orm:"response_token_field" json:"responseTokenField"`
-	Prompt               string `orm:"prompt" json:"prompt"`
-	IsPrivate            *int   `orm:"is_private" json:"isPrivate"`
-	IsChatModel          *int   `orm:"is_chat_model" json:"isChatModel"`
-	ApiKey               string `orm:"api_key" json:"apiKey"`
-	Enabled              *int   `orm:"enabled" json:"enabled"`
-	MaxConcurrency       int    `orm:"max_concurrency" json:"maxConcurrency"`
-	QueueLimit           int    `orm:"queue_limit" json:"queueLimit"`
-	TimeoutSeconds       int    `orm:"timeout_seconds" json:"timeoutSeconds"`
-	ExpectedSeconds      int    `orm:"expected_seconds" json:"expectedSeconds"`
-	RetryTimes           int    `orm:"retry_times" json:"retryTimes"`
-	RetryQueueMaxSeconds int    `orm:"retry_queue_max_seconds" json:"retryQueueMaxSeconds"`
-	AutoCleanSeconds     int    `orm:"auto_clean_seconds" json:"autoCleanSeconds"`
-	Remark               string `orm:"remark" json:"remark"`
-	IsOwner              *int   `json:"isOwner" orm:"is_owner"`
-	OperatorName         string `orm:"operator_name" json:"operatorName"`
-	TokenConfig          any    `orm:"token_config" json:"tokenConfig"`
-}
-
-type asynchModelCol struct {
-	beans.SQLBaseCol
-	ModelName          string
-	ModelType          string
-	BaseURL            string
-	HttpMethod         string
-	HeadMsg            string
-	FormJSON           string
-	RequestMapping     string
-	ResponseMapping    string
-	ResponseBody       string
-	ResponseTokenField string
-	Prompt             string
-	IsPrivate          string
-	IsChatModel        string
-	ApiKey             string
-	Enabled            string
-	MaxConcurrency     string
-	QueueLimit         string
-	TimeoutSeconds     string
-	ExpectedSeconds    string
-	RetryTimes         string
-	RetryQueueMaxSecs  string
-	AutoCleanSeconds   string
-	Remark             string
-	IsOwner            string
-	OperatorName       string
-	TokenConfig        string
-}
-
-var AsynchModelCol = asynchModelCol{
-	SQLBaseCol:         beans.DefSQLBaseCol,
-	ModelName:          "model_name",
-	ModelType:          "model_type",
-	BaseURL:            "base_url",
-	HttpMethod:         "http_method",
-	HeadMsg:            "head_msg",
-	FormJSON:           "form_json",
-	RequestMapping:     "request_mapping",
-	ResponseMapping:    "response_mapping",
-	ResponseBody:       "response_body",
-	ResponseTokenField: "response_token_field",
-	Prompt:             "prompt",
-	IsPrivate:          "is_private",
-	IsChatModel:        "is_chat_model",
-	ApiKey:             "api_key",
-	Enabled:            "enabled",
-	MaxConcurrency:     "max_concurrency",
-	QueueLimit:         "queue_limit",
-	TimeoutSeconds:     "timeout_seconds",
-	ExpectedSeconds:    "expected_seconds",
-	RetryTimes:         "retry_times",
-	RetryQueueMaxSecs:  "retry_queue_max_seconds",
-	AutoCleanSeconds:   "auto_clean_seconds",
-	Remark:             "remark",
-	IsOwner:            "is_owner",
-	OperatorName:       "operator_name",
-	TokenConfig:        "token_config",
-}
--- a/model/entity/prompts_compose_session.go
+++ b/model/entity/prompts_compose_session.go
@@ -1,18 +1,20 @@
 package entity

-import "gitea.com/red-future/common/beans"
+import "gitea.redpowerfuture.com/red-future/common/beans"

 type ComposeSession struct {
 	beans.SQLBaseDO `orm:",inline"`
-	SessionId       string `orm:"session_id" json:"sessionId"`
-	RequestContent  any    `orm:"request_content" json:"requestContent"`
-	ResponseContent any    `orm:"response_content" json:"responseContent"`
-	Remark          string `orm:"remark" json:"remark"`
+	SessionId       string         `orm:"session_id" json:"sessionId"`
+	NodeId          string         `orm:"node_id" json:"nodeId"`
+	RequestContent  map[string]any `orm:"request_content" json:"requestContent"`
+	ResponseContent map[string]any `orm:"response_content" json:"responseContent"`
+	Remark          string         `orm:"remark" json:"remark"`
 }

 type composeSessionCol struct {
 	beans.SQLBaseCol
 	SessionId       string
+	NodeId          string
 	RequestContent  string
 	ResponseContent string
 	Remark          string
@@ -21,6 +23,7 @@ type composeSessionCol struct {
 var ComposeSessionCol = composeSessionCol{
 	SQLBaseCol:      beans.DefSQLBaseCol,
 	SessionId:       "session_id",
+	NodeId:          "node_id",
 	RequestContent:  "request_content",
 	ResponseContent: "response_content",
 	Remark:          "remark",
--- a/model/entity/prompts_compose_task.go
+++ b/model/entity/prompts_compose_task.go
@@ -1,22 +1,21 @@
 package entity

-import "gitea.com/red-future/common/beans"
+import "gitea.redpowerfuture.com/red-future/common/beans"

 type ComposeTask struct {
 	beans.SQLBaseDO `orm:",inline"`
-	TaskId          string `orm:"task_id" json:"taskId"`
-	ModelName       string `orm:"model_name" json:"modelName"`
-	SkillName       string `orm:"skill_name" json:"skillName"`
-	BuildType       int    `orm:"build_type" json:"buildType"`
-	CallbackUrl     string `orm:"callback_url" json:"callbackUrl"`
-	GatewayState    int    `orm:"gateway_state" json:"gatewayState"`
-	RequestPayload  any    `orm:"request_payload" json:"requestPayload"`
-	ResultText      string `orm:"result_text" json:"resultText"`
-	Messages        any    `orm:"messages" json:"messages"`
-	Status          string `orm:"status" json:"status"`
-	ErrorMessage    string `orm:"error_message" json:"errorMessage"`
-	OssFile         string `orm:"oss_file" json:"ossFile"`
-	FileType        string `orm:"file_type" json:"fileType"`
+	TaskId          string         `orm:"task_id" json:"taskId"`
+	ModelName       string         `orm:"model_name" json:"modelName"`
+	SkillName       string         `orm:"skill_name" json:"skillName"`
+	BuildType       int            `orm:"build_type" json:"buildType"`
+	CallbackUrl     string         `orm:"callback_url" json:"callbackUrl"`
+	GatewayState    int            `orm:"gateway_state" json:"gatewayState"`
+	RequestPayload  map[string]any `orm:"request_payload" json:"requestPayload"`
+	ResultJson      map[string]any `orm:"result_json" json:"resultJson"`
+	Status          string         `orm:"status" json:"status"`
+	ErrorMessage    string         `orm:"error_message" json:"errorMessage"`
+	OssFile         string         `orm:"oss_file" json:"ossFile"`
+	FileType        string         `orm:"file_type" json:"fileType"`
 }

 type composeTaskCol struct {
@@ -28,8 +27,7 @@ type composeTaskCol struct {
 	CallbackUrl    string
 	GatewayState   string
 	RequestPayload string
-	ResultText     string
-	Messages       string
+	ResultJson     string
 	Status         string
 	ErrorMessage   string
 	OssFile        string
@@ -45,8 +43,7 @@ var ComposeTaskCol = composeTaskCol{
 	CallbackUrl:    "callback_url",
 	GatewayState:   "gateway_state",
 	RequestPayload: "request_payload",
-	ResultText:     "result_text",
-	Messages:       "messages",
+	ResultJson:     "result_json",
 	Status:         "status",
 	ErrorMessage:   "error_message",
 	OssFile:        "oss_file",
--- a/model/entity/prompts_provider_protocol.go
+++ b/model/entity/prompts_provider_protocol.go
@@ -1,21 +1,21 @@
 package entity

-import "gitea.com/red-future/common/beans"
+import "gitea.redpowerfuture.com/red-future/common/beans"

 // ProviderProtocol 模型协议映射配置
 type ProviderProtocol struct {
 	beans.SQLBaseDO `orm:",inherit"`
 	// 业务字段
-	ProviderName         string `orm:"provider_name" json:"providerName"`
-	TargetField          string `orm:"target_field" json:"targetField"`
-	MergeOrder           any    `orm:"merge_order" json:"mergeOrder"`
-	RoleMapping          any    `orm:"role_mapping" json:"roleMapping"`
-	ContentMapping       any    `orm:"content_mapping" json:"contentMapping"`
-	Capabilities         any    `orm:"capabilities" json:"capabilities"`
-	RequestTemplate      any    `orm:"request_template" json:"requestTemplate"`
-	SystemPromptTemplate string `orm:"system_prompt_template" json:"systemPromptTemplate"`
-	Status               int    `orm:"status" json:"status"`
-	Remark               string `orm:"remark" json:"remark"`
+	ProviderName         string         `orm:"provider_name" json:"providerName"`
+	TargetField          string         `orm:"target_field" json:"targetField"`
+	MergeOrder           []string       `orm:"merge_order" json:"mergeOrder"`
+	RoleMapping          map[string]any `orm:"role_mapping" json:"roleMapping"`
+	ContentMapping       map[string]any `orm:"content_mapping" json:"contentMapping"`
+	Capabilities         map[string]any `orm:"capabilities" json:"capabilities"`
+	RequestTemplate      map[string]any `orm:"request_template" json:"requestTemplate"`
+	SystemPromptTemplate string         `orm:"system_prompt_template" json:"systemPromptTemplate"`
+	Status               int            `orm:"status" json:"status"`
+	Remark               string         `orm:"remark" json:"remark"`
 }

 // providerProtocolCol 列名
--- a/service/gateway/gateway_http_service.go
+++ b/service/gateway/gateway_http_service.go
@@ -4,10 +4,14 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"prompts-core/common/util"
+	"io"
+	"net/http"
 	"prompts-core/model/entity"
+	"strings"

-	commonHttp "gitea.com/red-future/common/http"
+	"gitea.redpowerfuture.com/red-future/common/beans"
+	commonHttp "gitea.redpowerfuture.com/red-future/common/http"
+	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 )
@@ -25,7 +29,15 @@ type CreateTaskReq struct {
 // CreateGatewayTask 创建网关异步任务
 func CreateGatewayTask(ctx context.Context, payload map[string]any) (string, error) {
 	fullURL := "model-gateway/task/createTask"
-	headers := util.ForwardHeaders(ctx)
+	//headers := util.ForwardHeaders(ctx)
+	headers := make(map[string]string)
+	if r := g.RequestFromCtx(ctx); r != nil {
+		for k, v := range r.Request.Header {
+			if len(v) > 0 {
+				headers[k] = v[0]
+			}
+		}
+	}
 	var req CreateTaskReq
 	body, err := json.Marshal(payload)
 	if err != nil {
@@ -37,6 +49,80 @@ func CreateGatewayTask(ctx context.Context, payload map[string]any) (string, err
 	return req.TaskId, nil
 }

+type GetModelConfigResp struct {
+	Model *AsynchModel `json:"model"`
+}
+
+type AsynchModel 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               []map[string]any `orm:"form_json" json:"form"`
+	RequestMapping     map[string]any   `orm:"request_mapping" json:"requestMapping"`
+	ResponseMapping    map[string]any   `orm:"response_mapping" json:"responseMapping"`
+	ResponseBody       string           `orm:"response_body" json:"responseBody"`
+	ResponseTokenField string           `orm:"response_token_field" json:"responseTokenField"`
+	IsPrivate          *int             `orm:"is_private" json:"isPrivate"`
+	IsChatModel        int              `orm:"is_chat_model" json:"isChatModel"`
+	CallModel          int              `orm:"call_model" json:"callModel"`
+	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             `json:"isOwner" orm:"is_owner"`
+	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"`
+	CallbackUrl        string           `orm:"callback_url" json:"callbackUrl"`
+}
+
+// GetModelConfig 获取模型配置
+func GetModelConfig(ctx context.Context, req *AsynchModel) (model *AsynchModel, err error) {
+	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)
+
+	headers := make(map[string]string)
+	if r := g.RequestFromCtx(ctx); r != nil {
+		for k, v := range r.Request.Header {
+			if len(v) > 0 {
+				headers[k] = v[0]
+			}
+		}
+	}
+
+	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("模型不存在")
+	}
+	return resp.Model, nil
+}
+
 // GetTaskResultRes 任务结果响应
 type GetTaskResultRes struct {
 	OssFile string `json:"ossFile" dc:"结果文件OSS地址"`
@@ -46,7 +132,15 @@ type GetTaskResultRes struct {
 // QueryGatewayTaskState 查询网关任务状态
 func QueryGatewayTaskState(ctx context.Context, taskID string) (int, error) {
 	fullURL := fmt.Sprintf("model-gateway/task/getTaskResult?taskId=%s", taskID)
-	headers := util.ForwardHeaders(ctx)
+	//headers := util.ForwardHeaders(ctx)
+	headers := make(map[string]string)
+	if r := g.RequestFromCtx(ctx); r != nil {
+		for k, v := range r.Request.Header {
+			if len(v) > 0 {
+				headers[k] = v[0]
+			}
+		}
+	}
 	var req GetTaskResultRes
 	if err := commonHttp.Get(ctx, fullURL, headers, &req, nil); err != nil {
 		return 0, err
@@ -69,7 +163,15 @@ type SkillUserVO struct {
 // GetSkillUser 获取技能用户信息
 func GetSkillUser(ctx context.Context, name string) (*SkillUserVO, error) {
 	fullURL := fmt.Sprintf("ai-agent/skill/user/getUserOrTemplate?name=%s", name)
-	headers := util.ForwardHeaders(ctx)
+	//headers := util.ForwardHeaders(ctx)
+	headers := make(map[string]string)
+	if r := g.RequestFromCtx(ctx); r != nil {
+		for k, v := range r.Request.Header {
+			if len(v) > 0 {
+				headers[k] = v[0]
+			}
+		}
+	}
 	var resp SkillUserVO
 	var req struct{}
 	if err := commonHttp.Get(ctx, fullURL, headers, &resp, req); err != nil {
@@ -80,78 +182,81 @@ 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"`
+	EpicycleId int64          `json:"epicycleId"`
+	Messages   map[string]any `json:"messages,omitempty"`
+	ErrorMsg   string         `json:"errorMsg,omitempty"`
 }

 // SendCallback 向业务方发送回调
-func SendCallback(ctx context.Context, composeTask *entity.ComposeTask) error {
+func SendCallback(ctx context.Context, composeTask *entity.ComposeTask, epicycleId int64) error {
 	// 1. 检查回调地址
 	if composeTask.CallbackUrl == "" {
 		return fmt.Errorf("回调地址为空，taskId=%s", composeTask.TaskId)
 	}
-
 	// 2. 构造请求体
 	req := SendCallbackReq{
-		TaskId:   composeTask.TaskId,
-		Status:   composeTask.Status,
-		Messages: parseMessagesToResult(composeTask.Messages), // 需要将 JSON 字符串转为结构体
-		ErrorMsg: composeTask.ErrorMessage,
+		TaskId:     composeTask.TaskId,
+		Status:     composeTask.Status,
+		ErrorMsg:   composeTask.ErrorMessage,
+		Messages:   composeTask.ResultJson,
+		EpicycleId: epicycleId,
 	}
 	// 3. 发送 POST 请求
-	headers := util.ForwardHeaders(ctx)
+	//headers := util.ForwardHeaders(ctx)
+	headers := make(map[string]string)
+	if r := g.RequestFromCtx(ctx); r != nil {
+		for k, v := range r.Request.Header {
+			if len(v) > 0 {
+				headers[k] = v[0]
+			}
+		}
+	}
 	var resp struct{}
-	g.Log().Infof(ctx, "[回调业务] 开始发送 taskId=%s 回调地址=%s 消息=%v",
-		composeTask.TaskId, composeTask.CallbackUrl, req.Messages)
+	g.Log().Infof(ctx, "[回调业务] 开始发送 taskId=%s 回调地址=%s",
+		composeTask.TaskId, composeTask.CallbackUrl)
 	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
+// DownloadFile 从 OSS 下载文件内容
+func DownloadFile(ossURL string) ([]byte, error) {
+	resp, err := http.Get(ossURL)
+	if err != nil {
+		return nil, fmt.Errorf("下载OSS文件失败: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("下载OSS文件返回非200: %d", resp.StatusCode)
 	}

-	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
+	return io.ReadAll(resp.Body)
+}
+
+func GetFileBytesFromURL(ctx context.Context, fileUrl string) ([]byte, error) {
+	newS := strings.ReplaceAll(fileUrl, "http://cdn.redpowerfuture.com", g.Cfg().MustGet(ctx, "filePrefix").String())
+	// 使用 GoFrame 客户端（自带超时、追踪、日志等能力）
+	resp, err := g.Client().Get(ctx, newS)
+	if err != nil {
+		return nil, fmt.Errorf("下载OSS文件失败: %w", err)
+	}
+	defer resp.Close()
+
+	// 校验状态码
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("下载OSS文件返回非200: %d", resp.StatusCode)
+	}
+
+	// 读取全部内容
+	allBytes, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, gerror.Wrapf(err, "failed to read response body, url: %s", newS)
+	}
+
+	return allBytes, nil
 }
--- a/service/prompt/prompt_build_service.go
+++ b/service/prompt/prompt_build_service.go
@@ -2,9 +2,8 @@ package prompt

 import (
 	"context"
-	"errors"
 	"fmt"
-	"prompts-core/consts/public"
+	"prompts-core/service/gateway"
 	"strings"

 	"prompts-core/common/util"
@@ -12,181 +11,135 @@ import (
 	"prompts-core/model/dto"
 	"prompts-core/model/entity"

-	"github.com/gogf/gf/v2/util/gconv"
+	"gitea.redpowerfuture.com/red-future/common/utils"
+	"github.com/gogf/gf/v2/encoding/gjson"
 )

-// buildInferenceRequest 构建推理请求
-func buildInferenceRequest(ctx context.Context, req *dto.ComposeMessagesReq, chatModel *entity.AsynchModel, aiModel *entity.AsynchModel, history []map[string]any) (map[string]any, error) {
-	processedReq, totalBatches, err := ProcessUserFormBatches(ctx, req, aiModel)
-	if err != nil {
-		return nil, fmt.Errorf("处理用户表单分批失败: %w", err)
-	}
-
-	ir := NewPromptIR()
-
-	switch req.BuildType {
-	case public.BuildTypePrompt:
-		return buildPromptTypeRequest(ctx, processedReq, aiModel, chatModel, history, ir, totalBatches)
-	case public.BuildTypeNode:
-		return buildNodeTypeRequest(ctx, req, chatModel, ir)
-	default:
-		return nil, errors.New("不支持的构建类型")
-	}
-}
-
 // buildPromptTypeRequest 构建提示词类型请求（BuildType=1）
-func buildPromptTypeRequest(ctx context.Context, req *dto.ComposeMessagesReq, aiModel *entity.AsynchModel, chatModel *entity.AsynchModel, history []map[string]any, ir *PromptIR, totalBatches int) (map[string]any, error) {
-	systemPrompt := promptBuildWithRounds(ctx, req, aiModel, totalBatches)
+func buildPromptTypeRequest(ctx context.Context, req *dto.ComposeMessagesReq, aiModel *gateway.AsynchModel, chatModel *gateway.AsynchModel, ir *IR) (map[string]any, error) {
+	//1) 构建系统提示词
+	systemPrompt := promptBuildWithRounds(ctx, chatModel, aiModel)
 	ir.AddSystem(systemPrompt)
-
-	for _, msg := range history {
-		role := gconv.String(msg["role"])
-		if role != "user" && role != "assistant" {
-			continue
-		}
-		ir.AddHistory(role, gconv.String(msg["content"]))
-	}
-
-	userPrompt := buildUserPrompt(ctx, req, util.GetModelPrompt(ctx, aiModel.ModelType))
+	userPrompt := buildUserPrompt(ctx, req)
 	ir.AddUser(userPrompt)
+	//2) 检查整体内容是否超出窗口
 	if !checkOverallContent(ir, aiModel) {
 		availableWindow := util.GetAvailableWindow(aiModel.TokenConfig)
 		return nil, fmt.Errorf("整体内容超出模型窗口大小限制(可用窗口=%d tokens)，请精简后重试", availableWindow)
 	}
-	// 记录历史会话
-	_, _ = dao.ComposeSession.Insert(ctx, &entity.ComposeSession{
-		SessionId:      req.SessionId,
-		RequestContent: ir.User,
-	})
-	return compileToProviderRequest(ctx, ir, chatModel)
+	return compileToProviderRequest(ctx, ir, chatModel, req)
 }

 // buildNodeTypeRequest 构建节点类型请求（BuildType=2）
-func buildNodeTypeRequest(ctx context.Context, req *dto.ComposeMessagesReq, chatModel *entity.AsynchModel, ir *PromptIR) (map[string]any, error) {
+func buildNodeTypeRequest(ctx context.Context, req *dto.ComposeMessagesReq, chatModel *gateway.AsynchModel, ir *IR) (map[string]any, error) {
 	ir.AddUser(NodeBuild(ctx, req))
+	return compileToProviderRequest(ctx, ir, chatModel, req)
+}

-	return compileToProviderRequest(ctx, ir, chatModel)
+// buildStructTypeRequest 构建结构体类型请求（BuildType=3）
+func buildStructTypeRequest(ctx context.Context, req *dto.ComposeMessagesReq, chatModel *gateway.AsynchModel, ir *IR) (map[string]any, error) {
+	customPrompt := req.UserPrompt
+	ir.AddSystem(customPrompt)
+	ir.AddUser(buildUserPrompt(ctx, req))
+	return compileToProviderRequest(ctx, ir, chatModel, req, customPrompt)
 }

 // compileToProviderRequest 编译为 Provider 请求
-func compileToProviderRequest(ctx context.Context, ir *PromptIR, chatModel *entity.AsynchModel) (map[string]any, error) {
+func compileToProviderRequest(ctx context.Context, ir *IR, chatModel *gateway.AsynchModel, req *dto.ComposeMessagesReq, customPrompt ...string) (map[string]any, error) {
 	protocol, err := GetProtocolByProvider(ctx, chatModel.OperatorName)
 	if err != nil {
-		return nil, fmt.Errorf("获取协议配置失败: %w", err)
+		return nil, err
 	}
 	if protocol == nil {
-		return nil, errors.New("协议配置不存在")
+		return nil, fmt.Errorf("协议配置不存在或获取失败")
+	}
+	// 如果传了自定义提示词，替换掉协议模板
+	if len(customPrompt) > 0 && customPrompt[0] != "" {
+		protocol.SystemPromptTemplate = customPrompt[0] +
+			"【核心铁律】" +
+			"1.【技能内容skill相关】必须完整拼接到System提示词中，作为System提示词的组成部分，不得拆分到其他位置。"
 	}
 	providerReq, err := Compile(ir, protocol, chatModel)
 	if err != nil {
 		return nil, fmt.Errorf("编译请求失败: %w", err)
 	}
-
 	return map[string]any{
 		"modelName":      chatModel.ModelName,
-		"bizName":        "prompts-core",
-		"callbackUrl":    util.GetCallbackURL(ctx, "/prompt/callback"),
+		"bizName":        util.GetServerName(ctx),
+		"callbackUrl":    utils.GetCallbackURL(ctx, "/prompt/callback"),
 		"requestPayload": providerReq,
+		"buildType":      req.BuildType,
+		"buildModelName": req.ModelName,
 	}, nil
 }

-// promptBuildWithRounds 构建系统提示词（包含轮次信息）
-func promptBuildWithRounds(ctx context.Context, req *dto.ComposeMessagesReq, model *entity.AsynchModel, totalRounds int) string {
+// promptBuildWithRounds 构建提示词
+func promptBuildWithRounds(ctx context.Context, chatModel *gateway.AsynchModel, aiModel *gateway.AsynchModel) string {
 	providerProtocol, err := dao.ProviderProtocol.Get(ctx, &entity.ProviderProtocol{
-		ProviderName: model.OperatorName,
+		ProviderName: chatModel.OperatorName,
 		Status:       1,
 	})
 	if err != nil || providerProtocol == nil {
 		return ""
 	}

-	outputJSON := util.JSONPretty(model.RequestMapping)
-	maxWindowSize := util.GetMaxWindowSize(model.TokenConfig)
-	availableWindow := util.GetAvailableWindow(model.TokenConfig)
-
-	userFormContent := buildUserFormContent(req.UserForm)
-	formInfo := fmt.Sprintf(`
-【系统表单（系统提示词/参数）】
-%s
-【用户表单全文（必须完整阅读，全部作为用户提示词来源）】
-%s
-`, util.FormToJSON(req.Form), userFormContent)
-
-	inputInfo := fmt.Sprintf(`
-目标模型: %s
-%s
-技能名称: %s
-用户文件: %v
-`, req.ModelName, formInfo, req.SkillName, req.UserFiles)
+	outputJSON := gjson.New(util.ReverseMap(aiModel.RequestMapping, map[string]any{
+		"model": aiModel.ModelName,
+	})).MustToJsonString()

 	return fmt.Sprintf(providerProtocol.SystemPromptTemplate,
-		req.ModelName,   // %s 目标模型名称
-		maxWindowSize,   // %d 最大窗口
-		availableWindow, // %d 可用窗口
-		totalRounds,     // %d 数组长度（多轮输出要求）
-		totalRounds,     // %d 数组长度（结构铁律）
-		outputJSON,      // %s 输出结构
-		inputInfo,       // %s 完整输入信息
-		totalRounds,     // %d 数组长度（最后一行）
+		outputJSON, //%s【输出结构】
 	)
 }

-// buildUserFormContent 构建用户表单内容字符串
-func buildUserFormContent(userForm []map[string]any) string {
-	var builder strings.Builder
-	for _, item := range userForm {
-		builder.WriteString(fmt.Sprintf("%v\n", item))
-	}
-	return builder.String()
-}
-
 // checkOverallContent 检查整体内容是否超出窗口
-func checkOverallContent(ir *PromptIR, model *entity.AsynchModel) bool {
+func checkOverallContent(ir *IR, model *gateway.AsynchModel) bool {
 	fullContent := ir.String()
 	return util.CountToken(fullContent, model.TokenConfig)
 }

 // buildUserPrompt 构建用户提示词
-func buildUserPrompt(ctx context.Context, req *dto.ComposeMessagesReq, prompt string) string {
-	userFormForPayload := prepareUserFormPayload(req.UserForm)
-
-	payload := map[string]any{
-		"model":         req.ModelName,
-		"promptInfo":    prompt,
-		"form":          req.Form,
-		"userForm":      userFormForPayload,
-		"userFiles":     req.UserFiles,
-		"userFilesText": FetchFileTexts(ctx, req.UserFiles),
-		"skills":        SkillMdContent(ctx, req.SkillName),
+func buildUserPrompt(ctx context.Context, req *dto.ComposeMessagesReq) string {
+	var b strings.Builder
+	if formText := buildUserFormText(req.Form); formText != "" {
+		b.WriteString(fmt.Sprintf("系统参数：\n%s\n", formText))
 	}
-
-	return util.MustMarshal(payload)
+	if userFormText := buildUserFormText(req.UserForm); userFormText != "" {
+		b.WriteString(fmt.Sprintf("用户需求：\n%s\n", userFormText))
+	}
+	if fileTexts := ExtractFileTexts(ctx, req.Consult); fileTexts != "" {
+		b.WriteString(fmt.Sprintf("附件内容：\n%s\n", fileTexts))
+	}
+	return b.String()
 }

-// prepareUserFormPayload 准备用户表单载荷
-func prepareUserFormPayload(userForm []map[string]any) any {
-	if len(userForm) == 0 {
-		return nil
+func buildUserFormText(form []map[string]any) string {
+	if len(form) == 0 {
+		return ""
 	}
-
-	if _, ok := userForm[0]["batch_index"]; ok {
-		return userForm
-	}
-
-	return mergeUserFormTexts(userForm)
-}
-
-// mergeUserFormTexts 合并 UserForm 中的所有文本内容
-func mergeUserFormTexts(userForm []map[string]any) string {
 	var builder strings.Builder
-	for i, item := range userForm {
-		text := getItemText(item)
-		if i > 0 {
-			builder.WriteString("\n\n")
+	for _, item := range form {
+		for k, v := range item {
+			builder.WriteString(fmt.Sprintf("%s：\n", k))
+			switch val := v.(type) {
+			case []any:
+				for i, elem := range val {
+					builder.WriteString(fmt.Sprintf("  %d. ", i+1))
+					if m, ok := elem.(map[string]any); ok {
+						for mk, mv := range m {
+							builder.WriteString(fmt.Sprintf("%s：%v ", mk, mv))
+						}
+					} else {
+						builder.WriteString(fmt.Sprint(elem))
+					}
+					builder.WriteString("\n")
+				}
+			default:
+				builder.WriteString(fmt.Sprintf("  %v\n", v))
+			}
 		}
-		builder.WriteString(text)
 	}
-	return builder.String()
+	return strings.TrimSpace(builder.String())
 }

 // NodeBuild 节点构建
@@ -195,9 +148,8 @@ func NodeBuild(ctx context.Context, req *dto.ComposeMessagesReq) string {
 	if promptTpl == "" {
 		return ""
 	}
-
-	formStr := util.FormToJSON(req.Form)
-	userFormStr := util.UserFormToJSON(req.UserForm)
-
-	return fmt.Sprintf(promptTpl, formStr, userFormStr)
+	return fmt.Sprintf(promptTpl,
+		gjson.New(req.Form).MustToJsonString(),
+		gjson.New(req.UserForm).MustToJsonString(),
+	)
 }
--- a/service/prompt/prompt_compose_service.go
+++ b/service/prompt/prompt_compose_service.go
@@ -5,60 +5,63 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-
-	"gitea.com/red-future/common/beans"
-	"gitea.com/red-future/common/utils"
-	"github.com/gogf/gf/v2/frame/g"
-
 	"prompts-core/common/util"
 	"prompts-core/consts/public"
 	"prompts-core/dao"
 	"prompts-core/model/dto"
 	"prompts-core/model/entity"
 	"prompts-core/service/gateway"
+	"prompts-core/service/session"
+
+	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.redpowerfuture.com/red-future/common/utils"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/util/gconv"
 )

 // ComposeMessages 核心拼接提示词主流程
 func ComposeMessages(ctx context.Context, req *dto.ComposeMessagesReq) (*dto.ComposeMessagesRes, error) {
+	// 1) 获取模型信息
 	chatModel, aiModel, err := GetModelMessage(ctx, req)
 	if err != nil {
 		return nil, err
 	}
+	// 2) 校验用户表单
 	if err = validateUserForm(req, aiModel); err != nil {
 		return nil, err
 	}
-	switch req.BuildType {
-	case public.BuildTypePrompt:
-		return handlePromptBuild(ctx, req, chatModel, aiModel) // 提示词构建
-	case public.BuildTypeNode:
-		return handleNodeBuild(ctx, req, chatModel, aiModel) // 节点构建
-	default:
-		return nil, errors.New("BuildType 不支持")
-	}
+	return handleBuild(ctx, req, chatModel, aiModel)
 }

 // GetModelMessage 获取模型信息
-func GetModelMessage(ctx context.Context, req *dto.ComposeMessagesReq) (*entity.AsynchModel, *entity.AsynchModel, error) {
+func GetModelMessage(ctx context.Context, req *dto.ComposeMessagesReq) (*gateway.AsynchModel, *gateway.AsynchModel, error) {
 	userInfo, err := utils.GetUserInfo(ctx)
 	if err != nil {
 		return nil, nil, fmt.Errorf("获取用户信息失败: %w", err)
 	}
-
-	chatModel, err := getChatModel(ctx, userInfo.UserName)
-	if err != nil {
-		return nil, nil, err
+	chatModel, err := gateway.GetModelConfig(ctx, &gateway.AsynchModel{
+		SQLBaseDO: beans.SQLBaseDO{
+			Creator: userInfo.UserName,
+		},
+		IsChatModel: 1,
+	})
+	if err != nil || chatModel == nil {
+		return nil, nil, errors.New("当前没有对话模型，请添加")
 	}

-	aiModel, err := getAIModel(ctx, userInfo.UserName, req.ModelName)
-	if err != nil {
-		return nil, nil, err
+	aiModel, err := gateway.GetModelConfig(ctx, &gateway.AsynchModel{
+		SQLBaseDO: beans.SQLBaseDO{TenantId: userInfo.TenantId, Creator: userInfo.UserName},
+		ModelName: req.ModelName,
+	})
+	if err != nil || aiModel == nil {
+		return nil, nil, errors.New("需要构建的模型不存在")
 	}

 	return chatModel, aiModel, nil
 }

 // validateUserForm 校验用户表单
-func validateUserForm(req *dto.ComposeMessagesReq, model *entity.AsynchModel) error {
+func validateUserForm(req *dto.ComposeMessagesReq, model *gateway.AsynchModel) error {
 	if len(req.UserForm) == 0 {
 		return nil
 	}
@@ -72,274 +75,256 @@ func validateUserForm(req *dto.ComposeMessagesReq, model *entity.AsynchModel) er
 		return fmt.Errorf("UserForm 内容超出窗口大小: 超出 %d tokens，可用窗口 %d tokens，请精简后重试",
 			exceedTokens, availableWindow)
 	}
-
 	return nil
 }

-// handlePromptBuild 处理提示词构建（BuildType=1）
-func handlePromptBuild(ctx context.Context, req *dto.ComposeMessagesReq, chatModel, aiModel *entity.AsynchModel) (*dto.ComposeMessagesRes, error) {
-	// 获取历史会话
-	history, err := GetHistoryMessages(ctx, req.SessionId)
+// handleBuild 通用构建处理
+func handleBuild(ctx context.Context, req *dto.ComposeMessagesReq, chatModel, aiModel *gateway.AsynchModel) (*dto.ComposeMessagesRes, error) {
+	// 1) 处理表单分批
+	processedReq, _, err := ProcessUserFormBatches(ctx, req, aiModel)
 	if err != nil {
-		g.Log().Errorf(ctx, "获取历史会话失败: %v，将不使用历史会话", err)
-		history = nil
+		return nil, fmt.Errorf("处理用户表单分批失败: %w", err)
+	}
+
+	// 2) 构建推理请求
+	ir := NewPromptIR()
+	var taskReq map[string]any
+	switch req.BuildType {
+	case public.BuildTypePrompt:
+		taskReq, err = buildPromptTypeRequest(ctx, processedReq, aiModel, chatModel, ir)
+	case public.BuildTypeNode:
+		taskReq, err = buildNodeTypeRequest(ctx, req, chatModel, ir)
+	case public.BuildTypeStruct:
+		taskReq, err = buildStructTypeRequest(ctx, req, chatModel, ir)
+	default:
+		return nil, errors.New("不支持的构建类型")
 	}
-	// 调用推理模型
-	taskID, err := callInferenceModel(ctx, req, chatModel, aiModel, history)
 	if err != nil {
-		return nil, fmt.Errorf("调用推理模型失败: %w", err)
+		return nil, fmt.Errorf("构建推理请求失败: %w", err)
 	}
-	// 保存任务记录
-	if err = saveComposeTask(ctx, taskID, req); err != nil {
-		return nil, fmt.Errorf("保存任务记录失败: %w", err)
-	}
-	return &dto.ComposeMessagesRes{
-		TaskId: taskID,
-	}, nil
-}

-// handleNodeBuild 处理节点构建（BuildType=2）
-func handleNodeBuild(ctx context.Context, req *dto.ComposeMessagesReq, chatModel, aiModel *entity.AsynchModel) (*dto.ComposeMessagesRes, error) {
-	taskID, err := callInferenceModel(ctx, req, chatModel, aiModel, nil)
+	// 3) 调用网关创建任务
+	taskID, err := gateway.CreateGatewayTask(ctx, taskReq)
 	if err != nil {
-		return nil, fmt.Errorf("调用推理模型失败: %w", err)
+		return nil, fmt.Errorf("创建网关任务失败: %w", err)
+	}
+	if taskID == "" {
+		return nil, errors.New("网关未返回taskId")
 	}

-	if err := saveComposeTask(ctx, taskID, req); err != nil {
-		return nil, fmt.Errorf("保存任务记录失败: %w", err)
-	}
-
-	return &dto.ComposeMessagesRes{
-		TaskId: taskID,
-	}, nil
-}
-
-// saveComposeTask 保存组合任务记录
-func saveComposeTask(ctx context.Context, taskID string, req *dto.ComposeMessagesReq) error {
-	_, err := dao.ComposeTask.Insert(ctx, &entity.ComposeTask{
+	// 4) 保存任务记录
+	if _, err = dao.ComposeTask.Insert(ctx, &entity.ComposeTask{
 		TaskId:         taskID,
 		ModelName:      req.ModelName,
 		SkillName:      req.SkillName,
 		BuildType:      req.BuildType,
 		CallbackUrl:    req.CallbackUrl,
-		RequestPayload: util.MustMarshal(req),
+		RequestPayload: gconv.Map(req),
 		Status:         public.ComposeStatusPending,
-	})
-	return err
-}
-
-// getChatModel 获取聊天模型
-func getChatModel(ctx context.Context, userName string) (*entity.AsynchModel, error) {
-	chatModel, err := dao.Model.Get(ctx, &entity.AsynchModel{
-		SQLBaseDO:   beans.SQLBaseDO{Creator: userName},
-		IsChatModel: new(1),
-	})
-	if err != nil {
-		return nil, fmt.Errorf("查询聊天模型失败: %w", err)
-	}
-
-	if chatModel == nil {
-		return nil, errors.New("当前没有对话模型，请添加")
-	}
-
-	return chatModel, nil
-}
-
-// getAIModel 获取AI模型
-func getAIModel(ctx context.Context, userName, modelName string) (*entity.AsynchModel, error) {
-	aiModel, err := dao.Model.Get(ctx, &entity.AsynchModel{
-		SQLBaseDO: beans.SQLBaseDO{Creator: userName},
-		ModelName: modelName,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("查询AI模型失败: %w", err)
-	}
-
-	if aiModel == nil {
-		return nil, fmt.Errorf("需要构建的模型 %s 不存在", modelName)
-	}
-
-	return aiModel, nil
-}
-
-// callInferenceModel 调用推理模型
-func callInferenceModel(ctx context.Context, req *dto.ComposeMessagesReq, chatModel *entity.AsynchModel, idModel *entity.AsynchModel, history []map[string]any) (string, error) {
-	taskReq, err := buildInferenceRequest(ctx, req, chatModel, idModel, history)
-	if err != nil {
-		return "", fmt.Errorf("构建推理请求失败: %w", err)
-	}
-
-	taskID, err := gateway.CreateGatewayTask(ctx, taskReq)
-	if err != nil {
-		return "", fmt.Errorf("创建网关任务失败: %w", err)
-	}
-
-	if taskID == "" {
-		return "", errors.New("网关未返回taskId")
-	}
-
-	return taskID, nil
-}
-
-// createDefaultResult 创建默认结果
-func createDefaultResult(data map[string]any) *dto.MultiRoundResult {
-	if data == nil {
-		data = make(map[string]any)
-	}
-	return &dto.MultiRoundResult{
-		TotalRounds: 1,
-		Rounds:      []map[string]any{data},
+	}); err != nil {
+		return nil, err
 	}
+	return &dto.ComposeMessagesRes{TaskId: taskID}, nil
 }

 // Callback 回调处理
 func Callback(ctx context.Context, req *dto.CallbackReq) error {
-	g.Log().Infof(ctx, "[Callback][RECV] taskId=%s state=%d ossFile=%s fileType=%s textLen=%d",
-		req.TaskId, req.State, req.OssFile, req.FileType, len(req.Text))
-	composeTask, err := dao.ComposeTask.Get(ctx, &entity.ComposeTask{
-		TaskId: req.TaskId,
-	})
+	g.Log().Infof(ctx, "[开始回调处理] taskId=%s state=%d", req.TaskId, req.State)
+
+	// 1) 查询任务
+	composeTask, err := dao.ComposeTask.Get(ctx, &entity.ComposeTask{TaskId: req.TaskId})
 	if err != nil {
 		return fmt.Errorf("查询任务失败: %w", err)
 	}
+	// 新增空指针拦截
 	if composeTask == nil {
-		return fmt.Errorf("任务不存在: %s", req.TaskId)
+		g.Log().Infof(ctx, "[回调处理] composeTask 模型配置为空，无法查询模型配置 taskId=%s,req=%v", req.TaskId, req.State)
+		return fmt.Errorf("composeTask 任务对象为空，无法查询模型配置 taskId=%s,req=%v", req.TaskId, req.State)
 	}
-	//处理失败
-	if req.State == 3 {
-		_, err = dao.ComposeTask.Update(ctx, &entity.ComposeTask{
-			TaskId:       req.TaskId,
-			Status:       public.ComposeStatusFailed,
-			ErrorMessage: req.ErrorMsg,
-			GatewayState: req.State,
-			OssFile:      req.OssFile,
-			FileType:     req.FileType,
-			ResultText:   req.Text,
-		})
-		// 用更新后的值发送回调
-		if composeTask.CallbackUrl != "" {
-			failedTask := &entity.ComposeTask{
-				TaskId:       req.TaskId,
-				Status:       public.ComposeStatusFailed,
-				ErrorMessage: req.ErrorMsg,
-				CallbackUrl:  composeTask.CallbackUrl,
-				Messages:     composeTask.Messages,
-			}
-			gateway.SendCallback(ctx, failedTask)
-		}
-		return err
-	}
-	//处理成功
-	if req.State == 2 {
-		// 1. 根据 BuildType 解析结果
-		var messages any
-		switch composeTask.BuildType {
-		case public.BuildTypePrompt: // 提示词构建解析
-			messages = parsePromptResult(req.Text)
-		case public.BuildTypeNode: // 节点构建解析
-			messages = parseNodeResult(req.Text)
-		default:
-			messages = req.Text
-		}
-		// 2. 更新数据库
-		_, err = dao.ComposeTask.Update(ctx, &entity.ComposeTask{
-			TaskId:       req.TaskId,
-			Status:       public.ComposeStatusSuccess,
-			Messages:     messages,
-			GatewayState: req.State,
-			OssFile:      req.OssFile,
-			FileType:     req.FileType,
-			ResultText:   req.Text,
-		})
+	// 2) 读取 OSS 文件内容
+	var ossContent []byte
+	if req.OssFile != "" {
+		ossContent, err = gateway.GetFileBytesFromURL(ctx, req.OssFile)
 		if err != nil {
-			g.Log().Errorf(ctx, "[Callback] 更新成功状态失败 taskId=%s err=%v", req.TaskId, err)
-			return err
+			g.Log().Infof(ctx, "[回调处理] 读取OSS文件 taskId=%s,state=%v,ossFile=%v", req.TaskId, req.State, req.OssFile)
+			g.Log().Warningf(ctx, "[回调处理] 读取OSS失败 taskId=%s err=%v", req.TaskId, err)
 		}
-		// 4. 发送回调给业务方
-		if composeTask.CallbackUrl != "" {
-			successTask := &entity.ComposeTask{
-				TaskId:      req.TaskId,
-				Status:      public.ComposeStatusSuccess,
-				Messages:    messages,
-				CallbackUrl: composeTask.CallbackUrl,
-			}
-			gateway.SendCallback(ctx, successTask)
+	}
+
+	// 3) 解析 OSS 内容为消息
+	var messages map[string]any
+	if len(ossContent) > 0 {
+		if err := json.Unmarshal(ossContent, &messages); err != nil {
+			g.Log().Warningf(ctx, "[回调处理] 解析OSS内容失败 taskId=%s err=%v", req.TaskId, err)
 		}
 	}
+
+	// 4) 处理失败
+	if req.State == 3 {
+		return handleCallbackFailed(ctx, req, composeTask, messages)
+	}
+
+	// 5) 处理成功
+	if req.State == 2 {
+		return handleCallbackSuccess(ctx, req, composeTask, messages)
+	}
+
+	return nil
+}
+
+// handleCallbackFailed 处理回调失败
+func handleCallbackFailed(ctx context.Context, req *dto.CallbackReq, composeTask *entity.ComposeTask, messages map[string]any) error {
+	_, err := dao.ComposeTask.Update(ctx, &entity.ComposeTask{
+		TaskId:       req.TaskId,
+		Status:       public.ComposeStatusFailed,
+		ErrorMessage: req.ErrorMsg,
+		GatewayState: req.State,
+		OssFile:      req.OssFile,
+		FileType:     req.FileType,
+		ResultJson:   messages,
+	})
+	if composeTask.CallbackUrl != "" {
+		composeTask.Status = public.ComposeStatusFailed
+		composeTask.ErrorMessage = req.ErrorMsg
+		_ = gateway.SendCallback(ctx, composeTask, 0)
+	}
 	return err
 }

-// parsePromptResult 解析提示词构建结果
-func parsePromptResult(raw string) *dto.MultiRoundResult {
-	var wrapper map[string]any
-	if err := json.Unmarshal([]byte(raw), &wrapper); err != nil {
-		return createDefaultResult(map[string]any{"raw": raw})
+// handleCallbackSuccess 处理回调成功
+func handleCallbackSuccess(ctx context.Context, req *dto.CallbackReq, composeTask *entity.ComposeTask, messages map[string]any) error {
+	// 1) 获取模型配置
+	model, err := gateway.GetModelConfig(ctx, &gateway.AsynchModel{
+		SQLBaseDO: beans.SQLBaseDO{Creator: composeTask.Creator},
+		ModelName: composeTask.ModelName,
+	})
+	if err != nil {
+		return fmt.Errorf("查询模型失败: %w", err)
 	}

-	contentStr, ok := wrapper["content"].(string)
-	if !ok || contentStr == "" {
-		return createDefaultResult(wrapper)
+	// 2) 获取协议配置
+	protocol, _ := dao.ProviderProtocol.Get(ctx, &entity.ProviderProtocol{
+		ProviderName: model.OperatorName,
+		Status:       1,
+	})
+
+	// 3) 获取历史消息 + 保存当前轮
+	payload := composeTask.RequestPayload
+	sessionId := gconv.String(payload["sessionId"])
+	nodeId := gconv.String(payload["nodeId"])
+	var history []dto.FlatMessage
+	var epicycleId int64
+
+	if sessionId != "" && nodeId != "" && model.ModelType == public.ModelTypeInference {
+		// 3.1 获取历史
+		h, _ := session.GetHistoryMessages(ctx, &dto.GetHistoryMessagesReq{
+			SessionId: sessionId,
+			NodeId:    nodeId,
+		})
+		if h != nil {
+			history = h.Messages
+		}
+
+		// 3.2 保存当前轮（先存，下次查询就能拿到）
+		if userMsg := util.ExtractUserText(messages); userMsg != nil {
+			epicycleId, _ = dao.ComposeSession.Insert(ctx, &entity.ComposeSession{
+				NodeId:         nodeId,
+				SessionId:      sessionId,
+				RequestContent: userMsg,
+			})
+		}
+	}
+	// 4) 合并系统提示词
+	systemPrompt := util.GetModelPrompt(ctx, model.ModelType)
+	skillContent := SkillMdContent(ctx, composeTask.SkillName)
+	userPrompt := composeTask.RequestPayload["userPrompt"].(string)
+	messages = util.MergeSystemPrompt(messages, systemPrompt, skillContent, userPrompt, model.RequestMapping)
+
+	// 5) 合并附加结构
+	messages = util.MergeConsult(composeTask.RequestPayload, messages, model.ExtendMapping)
+	// 6) 注入历史
+	if len(history) > 0 {
+		messages = InjectHistory(messages, history, protocol)
 	}

-	// 先尝试解析为数组
-	if roundsArray := tryParseAsMapArray(contentStr); roundsArray != nil {
-		return &dto.MultiRoundResult{
-			TotalRounds: len(roundsArray),
-			Rounds:      roundsArray,
+	// 7) 更新数据库
+	_, err = dao.ComposeTask.Update(ctx, &entity.ComposeTask{
+		TaskId:       req.TaskId,
+		Status:       public.ComposeStatusSuccess,
+		GatewayState: req.State,
+		OssFile:      req.OssFile,
+		FileType:     req.FileType,
+		ResultJson:   messages,
+	})
+	if err != nil {
+		return err
+	}
+
+	// 8) 回调业务方
+	if composeTask.CallbackUrl != "" {
+		composeTask.Status = public.ComposeStatusSuccess
+		composeTask.ResultJson = messages
+		_ = gateway.SendCallback(ctx, composeTask, epicycleId)
+	}
+
+	return nil
+}
+
+// InjectHistory 插入历史会话
+func InjectHistory(roundsData map[string]any, history []dto.FlatMessage, protocol *entity.ProviderProtocol) map[string]any {
+	if protocol == nil || len(history) == 0 {
+		return roundsData
+	}
+	// 1) 提取第一轮的 messages
+	rounds := roundsData["rounds"].([]any)
+	firstRound := rounds[0].(map[string]any)
+	original := firstRound["messages"].([]any)
+
+	// 2) 按 merge_order 拼接
+	result := make([]any, 0, len(original)+len(history))
+
+	for _, part := range protocol.MergeOrder {
+		switch part {
+		case "system":
+			for _, m := range original {
+				msg := m.(map[string]any)
+				if gconv.String(msg["role"]) == "system" {
+					result = append(result, msg)
+				}
+			}
+		case "history":
+			if gconv.Bool(protocol.Capabilities["support_history"]) {
+				for _, msg := range history {
+					result = append(result, map[string]any{
+						"role":    msg.Role,
+						"content": msg.Content, // 纯字符串，不转换
+					})
+				}
+			}
+		case "user":
+			for _, m := range original {
+				msg := m.(map[string]any)
+				if gconv.String(msg["role"]) == "user" {
+					result = append(result, msg)
+				}
+			}
 		}
 	}

-	// 再尝试解析为单个对象
-	if singleRound := tryParseAsMap(contentStr); singleRound != nil {
-		return &dto.MultiRoundResult{
-			TotalRounds: 1,
-			Rounds:      []map[string]any{singleRound},
+	// 3) 角色映射
+	if len(protocol.RoleMapping) > 0 {
+		for _, m := range result {
+			msg := m.(map[string]any)
+			role := gconv.String(msg["role"])
+			if mapped, ok := protocol.RoleMapping[role]; ok {
+				msg["role"] = mapped
+			}
 		}
 	}

-	return createDefaultResult(map[string]any{"content": contentStr})
-}
-
-func tryParseAsMapArray(jsonStr string) []map[string]any {
-	var arr []map[string]any
-	if err := json.Unmarshal([]byte(jsonStr), &arr); err != nil {
-		return nil
-	}
-	if len(arr) == 0 {
-		return nil
-	}
-	return arr
-}
-
-func tryParseAsMap(jsonStr string) map[string]any {
-	var obj map[string]any
-	if err := json.Unmarshal([]byte(jsonStr), &obj); err != nil {
-		return nil
-	}
-	if len(obj) == 0 {
-		return nil
-	}
-	return obj
-}
-
-// parseNodeResult 解析节点构建结果
-func parseNodeResult(raw string) *dto.MultiRoundResult {
-	var result map[string]any
-	if err := json.Unmarshal([]byte(raw), &result); err != nil {
-		return createDefaultResult(map[string]any{"raw": raw})
-	}
-
-	if contentStr, ok := result["content"].(string); ok && contentStr != "" {
-		var inner map[string]any
-		if err := json.Unmarshal([]byte(contentStr), &inner); err == nil {
-			result = inner
-		}
-	}
-
-	return &dto.MultiRoundResult{
-		TotalRounds: 1,
-		Rounds:      []map[string]any{result},
-	}
+	// 4) 直接修改原对象
+	firstRound["messages"] = result
+	return roundsData
 }

 // GetComposeTask 查询任务结果
@@ -350,31 +335,10 @@ func GetComposeTask(ctx context.Context, taskID string) (*dto.GetComposeTaskRes,
 	if err != nil {
 		return nil, fmt.Errorf("查询任务失败: %w", err)
 	}
-	if record == nil {
-		return nil, fmt.Errorf("未找到任务(taskId=%s)", taskID)
-	}
-
-	messages := parseMessagesForResponse(record.Messages)
-
 	return &dto.GetComposeTaskRes{
 		TaskId:       record.TaskId,
 		Status:       record.Status,
 		ErrorMessage: record.ErrorMessage,
-		Messages:     messages,
+		Messages:     record.ResultJson,
 	}, nil
 }
-
-// parseMessagesForResponse 解析用于响应的消息
-func parseMessagesForResponse(messages any) any {
-	str, ok := messages.(string)
-	if !ok || str == "" {
-		return messages
-	}
-
-	var parsed any
-	if err := json.Unmarshal([]byte(str), &parsed); err == nil {
-		return parsed
-	}
-
-	return messages
-}
--- a/service/prompt/prompt_files_handle_service.go
+++ b/service/prompt/prompt_files_handle_service.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"prompts-core/model/dto"
 	"strings"
 	"time"

@@ -21,15 +22,25 @@ const (
 	bytesPerMB = 1024 * 1024
 )

-// FetchFileTexts 从 URL 列表获取文件内容，支持 zip 内文件
-func FetchFileTexts(ctx context.Context, urls []string) map[string]string {
-	result := make(map[string]string)
+// ExtractFileTexts 从 ConsultItem 列表中提取文件内容，返回拼接文本
+func ExtractFileTexts(ctx context.Context, consult []dto.ConsultItem) string {
+	urls := make([]string, 0, len(consult))
+	for _, item := range consult {
+		if item.Url != "" {
+			urls = append(urls, item.Url)
+		}
+	}
+	return FetchFileTextsAsString(ctx, urls)
+}

+// FetchFileTextsAsString 从 URL 列表获取文件内容，拼接为字符串
+func FetchFileTextsAsString(ctx context.Context, urls []string) string {
 	if len(urls) == 0 {
-		return result
+		return ""
 	}

 	client := createHTTPClient(ctx, "userFiles.httpTimeoutSec", 8)
+	var builder strings.Builder

 	for _, rawURL := range urls {
 		url := util.SanitizeURL(rawURL)
@@ -38,23 +49,19 @@ func FetchFileTexts(ctx context.Context, urls []string) map[string]string {
 		}

 		if util.IsZipExtension(url) {
-			mergeMap(result, fetchZipFileTexts(ctx, client, url))
+			for _, text := range fetchZipFileTexts(ctx, client, url) {
+				builder.WriteString(text)
+				builder.WriteString("\n")
+			}
 			continue
 		}

 		if text := fetchAndCleanFileContent(ctx, client, url); text != "" {
-			result[url] = text
+			builder.WriteString(fmt.Sprintf("【文件：%s】\n%s\n", url, text))
 		}
 	}

-	return result
-}
-
-// mergeMap 合并 map
-func mergeMap(dst, src map[string]string) {
-	for k, v := range src {
-		dst[k] = v
-	}
+	return builder.String()
 }

 // fetchAndCleanFileContent 获取并清理文件内容
@@ -182,10 +189,13 @@ func fetchFileContent(ctx context.Context, client *http.Client, url string) (str
 	return strings.TrimSpace(string(body)), nil
 }

-// SkillMdContent 根据 skillName 获取 zip 内所有 md 文件拼接内容
 func SkillMdContent(ctx context.Context, skillName string) string {
+	if skillName == "" {
+		return ""
+	}
 	skillResp, err := gateway.GetSkillUser(ctx, skillName)
 	if err != nil {
+		g.Log().Warningf(ctx, "[SkillMd] GetSkillUser 失败: %v", err)
 		return ""
 	}

@@ -196,11 +206,13 @@ func SkillMdContent(ctx context.Context, skillName string) string {

 	zipBytes, err := downloadFile(client, fullUrl, maxSize)
 	if err != nil {
+		g.Log().Warningf(ctx, "[SkillMd] 下载失败 url=%s err=%v", fullUrl, err)
 		return ""
 	}

 	mdContents, err := extractMdFiles(ctx, zipBytes)
 	if err != nil || len(mdContents) == 0 {
+		g.Log().Warningf(ctx, "[SkillMd] 提取md失败 count=%d err=%v", len(mdContents), err)
 		return ""
 	}

--- a/service/prompt/prompt_files_handle_service.markdown
+++ b/service/prompt/prompt_files_handle_service.markdown
@@ -1,75 +0,0 @@
-# Prompts-Core（提示词核心服务）
-
-> 智能提示词构建与管理系统，支持多模态 AI 模型的提示词组装、会话管理和协议适配。
-
---
-
-## 项目简介
-
-**Prompts-Core** 是一个基于 Go 语言开发的提示词核心服务，作为 AI 应用层与模型网关之间的桥梁，负责将业务需求转换为标准化的模型请求。
-
-### 核心价值
- **统一提示词管理**：集中化管理不同模型类型的提示词模板
- **智能会话维护**：基于 Redis + PostgreSQL 的双层会话存储
- **多协议适配**：支持 OpenAI、DeepSeek、Qwen、Gemini 等多种模型协议
- **文件处理能力**：自动提取文本文件和 ZIP 压缩包内容
- **技能系统集成**：支持从外部加载 Markdown 格式的技能描述
-
---
-
-## 核心功能
-
-### 1. 提示词构建引擎
-
-#### 多模态支持
-| 类型 | 说明 | 适用场景 |
-|------|------|----------|
-| Type 1 | 文字处理助手 | 文章撰写、文案优化、翻译等 |
-| Type 2 | 图片处理助手 | 图像生成、风格迁移等 |
-| Type 3 | 音频处理助手 | 语音合成、识别、降噪等 |
-| Type 4 | 向量化处理助手 | 语义检索、知识索引等 |
-| Type 5 | 全模态助手 | 跨模态转换、多模态融合等 |
-
-#### 构建模式
- **BuildType 1（提示词构建）**：完整流程，包含系统提示词、历史会话、用户输入的智能组装
- **BuildType 2（节点构建）**：工作流路由决策，根据上下文选择节点 ID
-
-#### 分批处理
-当用户表单内容超出模型窗口限制时，自动按 Token 大小分批处理。
-
-### 2. 会话管理系统
-
- **双层存储**：Redis 缓存（最近 N 轮）+ PostgreSQL 持久化
- **自动管理**：最大轮数控制（默认 10 轮）、自动过期（默认 30 分钟）
-
-### 3. 协议适配器
-
-通过配置动态支持多种模型协议：
- 角色映射：system/user/assistant → 目标协议角色
- 内容字段映射：content → parts.text 等
- 消息顺序控制：灵活配置拼接顺序
- 请求模板渲染：支持占位符替换
-
-### 4. 任务调度
-
- **异步流程**：创建网关任务 → 轮询等待 → 接收回调 → 返回结果
- **重试机制**：可配置最大重试次数（默认 3 次）
- **超时保护**：默认 300 秒超时
-
---
-
-## 技术架构
-
-### 技术栈
-
-| 组件 | 版本 | 用途 |
-|------|------|------|
-| Go | 1.26.0 | 编程语言 |
-| GoFrame | v2.10.0 | Web 框架 |
-| PostgreSQL | - | 关系型数据库 |
-| Redis | - | 缓存与会话存储 |
-| Consul | - | 服务注册与发现 |
-| Jaeger | - | 分布式链路追踪 |
-
-### 架构图
-
--- a/service/prompt/prompt_ir_service.go
+++ b/service/prompt/prompt_ir_service.go
@@ -2,17 +2,18 @@ package prompt

 import (
 	"context"
-	"encoding/json"
 	"fmt"
-	"prompts-core/common/util"
+	"prompts-core/service/gateway"
 	"strings"

 	"prompts-core/dao"
 	"prompts-core/model/entity"
+
+	"github.com/gogf/gf/v2/util/gconv"
 )

-// PromptIR 统一 Prompt 中间表示
-type PromptIR struct {
+// IR 统一 Prompt 中间表示
+type IR struct {
 	System  []Segment `json:"system"`
 	History []Segment `json:"history"`
 	User    []Segment `json:"user"`
@@ -33,6 +34,7 @@ type ProviderProtocol struct {
 	ContentMapping       ContentMapping    `json:"content_mapping"`
 	RequestTemplate      map[string]any    `json:"request_template"`
 	SystemPromptTemplate string            `json:"system_prompt_template"`
+	Capabilities         map[string]any    `json:"capabilities"`
 }

 // ContentMapping 内容字段映射
@@ -42,8 +44,8 @@ type ContentMapping struct {
 }

 // NewPromptIR 创建空 PromptIR
-func NewPromptIR() *PromptIR {
-	return &PromptIR{
+func NewPromptIR() *IR {
+	return &IR{
 		System:  make([]Segment, 0),
 		History: make([]Segment, 0),
 		User:    make([]Segment, 0),
@@ -51,7 +53,7 @@ func NewPromptIR() *PromptIR {
 }

 // String 返回 PromptIR 的完整内容字符串（用于 token 计算）
-func (ir *PromptIR) String() string {
+func (ir *IR) String() string {
 	var builder strings.Builder

 	for _, seg := range ir.System {
@@ -77,7 +79,7 @@ func (ir *PromptIR) String() string {
 }

 // GetTotalContent 获取所有内容的拼接字符串（更精确的 token 计算）
-func (ir *PromptIR) GetTotalContent() string {
+func (ir *IR) GetTotalContent() string {
 	var builder strings.Builder

 	for _, seg := range ir.System {
@@ -99,7 +101,7 @@ func (ir *PromptIR) GetTotalContent() string {
 }

 // AddSystem 添加系统提示
-func (ir *PromptIR) AddSystem(content string) *PromptIR {
+func (ir *IR) AddSystem(content string) *IR {
 	if content != "" {
 		ir.System = append(ir.System, Segment{Type: "text", Content: content})
 	}
@@ -107,7 +109,7 @@ func (ir *PromptIR) AddSystem(content string) *PromptIR {
 }

 // AddUser 添加用户消息
-func (ir *PromptIR) AddUser(content string) *PromptIR {
+func (ir *IR) AddUser(content string) *IR {
 	if content != "" {
 		ir.User = append(ir.User, Segment{Type: "text", Content: content})
 	}
@@ -115,7 +117,7 @@ func (ir *PromptIR) AddUser(content string) *PromptIR {
 }

 // AddHistory 添加历史消息
-func (ir *PromptIR) AddHistory(role, content string) *PromptIR {
+func (ir *IR) AddHistory(role, content string) *IR {
 	if content != "" {
 		ir.History = append(ir.History, Segment{Type: "text", Content: content, Role: role})
 	}
@@ -123,7 +125,7 @@ func (ir *PromptIR) AddHistory(role, content string) *PromptIR {
 }

 // ToMessages 转换为 OpenAI 兼容的 messages 格式（MVP 默认）
-func (ir *PromptIR) ToMessages() []map[string]any {
+func (ir *IR) ToMessages() []map[string]any {
 	var messages []map[string]any

 	for _, seg := range ir.System {
@@ -164,21 +166,22 @@ func GetProtocolByProvider(ctx context.Context, providerName string) (*ProviderP

 // parseProtocol 将 DB entity 转为编译用协议配置
 func parseProtocol(e *entity.ProviderProtocol) *ProviderProtocol {
-	p := &ProviderProtocol{
+	return &ProviderProtocol{
 		TargetField:          e.TargetField,
 		SystemPromptTemplate: e.SystemPromptTemplate,
+		MergeOrder:           e.MergeOrder,
+		RoleMapping:          gconv.MapStrStr(e.RoleMapping),
+		ContentMapping: ContentMapping{
+			Type:  gconv.String(e.ContentMapping["type"]),
+			Field: gconv.String(e.ContentMapping["field"]),
+		},
+		RequestTemplate: e.RequestTemplate,
+		Capabilities:    e.Capabilities,
 	}
-
-	// 使用通用解析方法处理各个字段
-	util.ParseJSONFieldFromGvar(e.MergeOrder, &p.MergeOrder)
-	util.ParseJSONFieldFromGvar(e.RoleMapping, &p.RoleMapping)
-	util.ParseJSONFieldFromGvar(e.ContentMapping, &p.ContentMapping)
-	util.ParseJSONFieldFromGvar(e.RequestTemplate, &p.RequestTemplate)
-	return p
 }

 // Compile 将 PromptIR 按协议配置编译为 Provider Request
-func Compile(ir *PromptIR, p *ProviderProtocol, chatModel *entity.AsynchModel) (map[string]any, error) {
+func Compile(ir *IR, p *ProviderProtocol, chatModel *gateway.AsynchModel) (map[string]any, error) {
 	if ir == nil || p == nil {
 		return nil, fmt.Errorf("ir and protocol are required")
 	}
@@ -190,35 +193,25 @@ func Compile(ir *PromptIR, p *ProviderProtocol, chatModel *entity.AsynchModel) (
 }

 // mergeByOrder 按协议配置顺序拼接消息
-func mergeByOrder(ir *PromptIR, order []string) []map[string]any {
-	var messages []map[string]any
-
-	for _, part := range order {
-		switch part {
-		case "system":
-			for _, seg := range ir.System {
-				messages = append(messages, map[string]any{
-					"role":    "system",
-					"content": seg.Content,
-				})
-			}
-		case "history":
-			for _, seg := range ir.History {
-				messages = append(messages, map[string]any{
-					"role":    seg.Role,
-					"content": seg.Content,
-				})
-			}
-		case "user":
-			for _, seg := range ir.User {
-				messages = append(messages, map[string]any{
-					"role":    "user",
-					"content": seg.Content,
-				})
-			}
-		}
+func mergeByOrder(ir *IR, order []string) []map[string]any {
+	roleMap := map[string][]Segment{
+		"system":  ir.System,
+		"history": ir.History,
+		"user":    ir.User,
 	}

+	var messages []map[string]any
+	for _, part := range order {
+		for _, seg := range roleMap[part] {
+			msg := map[string]any{"content": seg.Content}
+			if part == "history" {
+				msg["role"] = seg.Role
+			} else {
+				msg["role"] = part
+			}
+			messages = append(messages, msg)
+		}
+	}
 	return messages
 }

@@ -242,29 +235,29 @@ func mapRoles(messages []map[string]any, mapping map[string]string) []map[string
 	return messages
 }

-// mapContent 内容字段映射
 func mapContent(messages []map[string]any, cm ContentMapping) []map[string]any {
-	for _, msg := range messages {
-		content := msg["content"]
-		delete(msg, "content")
-
-		switch cm.Type {
-		case "parts":
-			msg["parts"] = []map[string]any{
-				{cm.Field: content},
-			}
-		default:
-			msg[cm.Field] = content
-		}
+	if cm.Field == "" || cm.Field == "content" {
+		return messages
 	}

+	for i, msg := range messages {
+		if content, ok := msg["content"]; ok {
+			delete(msg, "content")
+			switch cm.Type {
+			case "parts":
+				messages[i]["parts"] = []map[string]any{{cm.Field: content}}
+			default:
+				messages[i][cm.Field] = content
+			}
+		}
+	}
 	return messages
 }

 // buildRequest 按 target_field 和 request_template 构建请求体
-func buildRequest(messages []map[string]any, p *ProviderProtocol, chatModel *entity.AsynchModel) map[string]any {
+func buildRequest(messages []map[string]any, p *ProviderProtocol, chatModel *gateway.AsynchModel) map[string]any {
 	if len(p.RequestTemplate) > 0 {
-		return renderTemplate(p.RequestTemplate, messages, chatModel)
+		return renderTemplate(p, messages, chatModel)
 	}

 	return map[string]any{
@@ -272,20 +265,21 @@ func buildRequest(messages []map[string]any, p *ProviderProtocol, chatModel *ent
 	}
 }

-// renderTemplate 简单的 {{key}} 模板替换
-func renderTemplate(tmpl map[string]any, messages []map[string]any, chatModel *entity.AsynchModel) map[string]any {
-	b, _ := json.Marshal(tmpl)
-	str := string(b)
-
-	if chatModel != nil {
-		str = strings.ReplaceAll(str, `"{{model}}"`, `"`+chatModel.ModelName+`"`)
+// renderTemplate 模板渲染
+func renderTemplate(p *ProviderProtocol, messages []map[string]any, chatModel *gateway.AsynchModel) map[string]any {
+	result := make(map[string]any, len(p.RequestTemplate)+1)
+	for k, v := range p.RequestTemplate {
+		result[k] = v
 	}

-	msgBytes, _ := json.Marshal(messages)
-	str = strings.ReplaceAll(str, `"{{messages}}"`, string(msgBytes))
+	if chatModel != nil {
+		result["model"] = chatModel.ModelName
+	}
+	result["messages"] = messages

-	var result map[string]any
-	json.Unmarshal([]byte(str), &result)
+	if maxTokens := gconv.Int(p.Capabilities["max_tokens"]); maxTokens > 0 {
+		result["max_tokens"] = maxTokens
+	}

 	return result
 }
--- a/service/prompt/prompt_session_redis_service.go
+++ b/service/prompt/prompt_session_redis_service.go
@@ -1,145 +0,0 @@
-package prompt
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"github.com/gogf/gf/v2/frame/g"
-)
-
-const (
-	redisKeyPrefix = "chat:session:%s"
-)
-
-// saveToRedis 保存会话数据到Redis
-func saveToRedis(ctx context.Context, sessionId string, requestMessages []map[string]any, responseMessages []map[string]any) error {
-	key := formatRedisKey(sessionId)
-
-	maxRounds := g.Cfg().MustGet(ctx, "session.maxRounds", 10).Int()
-	expireSeconds := g.Cfg().MustGet(ctx, "session.expireTime", 1800).Int64()
-
-	data := map[string]any{
-		"sessionId":       sessionId,
-		"requestContent":  requestMessages,
-		"responseContent": responseMessages,
-		"timestamp":       time.Now().Unix(),
-	}
-
-	b, err := json.Marshal(data)
-	if err != nil {
-		return fmt.Errorf("序列化会话数据失败: %w", err)
-	}
-
-	if err := executeRedisCommands(ctx, key, string(b), maxRounds, expireSeconds); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// formatRedisKey 格式化Redis键
-func formatRedisKey(sessionId string) string {
-	return fmt.Sprintf(redisKeyPrefix, sessionId)
-}
-
-// executeRedisCommands 执行Redis命令
-func executeRedisCommands(ctx context.Context, key string, value string, maxRounds int, expireSeconds int64) error {
-	if _, err := g.Redis().Do(ctx, "LPUSH", key, value); err != nil {
-		return fmt.Errorf("写入Redis失败: %w", err)
-	}
-
-	if _, err := g.Redis().Do(ctx, "LTRIM", key, 0, maxRounds-1); err != nil {
-		return fmt.Errorf("裁剪Redis列表失败: %w", err)
-	}
-
-	if _, err := g.Redis().Do(ctx, "EXPIRE", key, expireSeconds); err != nil {
-		return fmt.Errorf("设置过期时间失败: %w", err)
-	}
-
-	return nil
-}
-
-// getFromRedis 从Redis获取会话历史
-func getFromRedis(ctx context.Context, sessionId string) ([]map[string]any, error) {
-	key := formatRedisKey(sessionId)
-
-	result, err := g.Redis().Do(ctx, "LRANGE", key, 0, -1)
-	if err != nil {
-		return nil, fmt.Errorf("从Redis获取数据失败: %w", err)
-	}
-
-	if result == nil || result.IsNil() {
-		return []map[string]any{}, nil
-	}
-
-	sessions := parseRedisSessions(ctx, result.Strings())
-
-	reverseSlice(sessions)
-
-	return sessions, nil
-}
-
-// parseRedisSessions 解析Redis会话数据
-func parseRedisSessions(ctx context.Context, values []string) []map[string]any {
-	var sessions []map[string]any
-
-	for _, str := range values {
-		var data map[string]any
-		if err := json.Unmarshal([]byte(str), &data); err != nil {
-			g.Log().Warningf(ctx, "[会话] 解析Redis数据失败 err=%v", err)
-			continue
-		}
-		sessions = append(sessions, data)
-	}
-
-	return sessions
-}
-
-// reverseSlice 反转切片
-func reverseSlice(s []map[string]any) {
-	for i, j := 0, len(s)-1; i < j; i, j = i+1, j-1 {
-		s[i], s[j] = s[j], s[i]
-	}
-}
-
-// GetSessionHistoryForInference 获取历史会话，返回扁平消息数组（给推理用）
-func GetSessionHistoryForInference(ctx context.Context, sessionId string) ([]map[string]any, error) {
-	historyData, err := getFromRedis(ctx, sessionId)
-	if err != nil {
-		return nil, fmt.Errorf("获取历史会话失败: %w", err)
-	}
-
-	if len(historyData) == 0 {
-		return []map[string]any{}, nil
-	}
-
-	return flattenHistoryMessages(historyData), nil
-}
-
-// flattenHistoryMessages 扁平化历史消息
-func flattenHistoryMessages(historyData []map[string]any) []map[string]any {
-	var messages []map[string]any
-
-	for _, round := range historyData {
-		appendMessagesFromField(round, "requestContent", &messages)
-		appendMessagesFromField(round, "responseContent", &messages)
-	}
-
-	return messages
-}
-
-// appendMessagesFromField 从指定字段追加消息
-func appendMessagesFromField(data map[string]any, field string, messages *[]map[string]any) {
-	msgs, ok := data[field].([]interface{})
-	if !ok {
-		return
-	}
-
-	for _, m := range msgs {
-		if msg, ok := m.(map[string]interface{}); ok {
-			*messages = append(*messages, msg)
-		}
-	}
-}
--- a/service/prompt/prompt_session_service.go
+++ b/service/prompt/prompt_session_service.go
@@ -1,165 +0,0 @@
-package prompt
-
-import (
-	"context"
-	"fmt"
-
-	"gitea.com/red-future/common/beans"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gconv"
-
-	"prompts-core/common/util"
-	"prompts-core/dao"
-	"prompts-core/model/dto"
-	"prompts-core/model/entity"
-)
-
-// SessionCallback 会话回调
-func SessionCallback(ctx context.Context, req *dto.SessionCallbackReq) (*dto.SessionCallbackRes, error) {
-	result, err := util.ParseOutput(req.Text)
-	if err != nil {
-		g.Log().Errorf(ctx, "[会话回调] 解析模型输出失败 epicycleId=%d err=%v", req.EpicycleId, err)
-		return nil, fmt.Errorf("解析模型输出失败: %w", err)
-	}
-
-	result["role"] = "assistant"
-	if err = updateSessionResponse(ctx, req.EpicycleId, result); err != nil {
-		return nil, err
-	}
-
-	session, err := getSessionById(ctx, req.EpicycleId)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := saveSessionToRedis(ctx, session); err != nil {
-		return nil, err
-	}
-
-	requestMessages := util.ConvertToMessages(session.RequestContent)
-	responseMessages := util.ConvertToMessages(session.ResponseContent)
-
-	g.Log().Infof(ctx, "[会话回调] 存储成功 sessionId=%s id=%d requestLen=%d responseLen=%d",
-		session.SessionId, session.Id, len(requestMessages), len(responseMessages))
-
-	return &dto.SessionCallbackRes{}, nil
-}
-
-// updateSessionResponse 更新会话响应
-func updateSessionResponse(ctx context.Context, epicycleId int64, response any) error {
-	_, err := dao.ComposeSession.Update(ctx, &entity.ComposeSession{
-		SQLBaseDO:       beans.SQLBaseDO{Id: epicycleId},
-		ResponseContent: response,
-	})
-	if err != nil {
-		g.Log().Errorf(ctx, "[会话回调] 更新数据库失败 epicycleId=%d err=%v", epicycleId, err)
-		return fmt.Errorf("更新数据库失败: %w", err)
-	}
-	return nil
-}
-
-// getSessionById 根据ID获取会话
-func getSessionById(ctx context.Context, epicycleId int64) (*entity.ComposeSession, error) {
-	session, err := dao.ComposeSession.Get(ctx, &entity.ComposeSession{
-		SQLBaseDO: beans.SQLBaseDO{Id: epicycleId},
-	})
-	if err != nil {
-		g.Log().Errorf(ctx, "[会话回调] 获取会话数据失败 epicycleId=%d err=%v", epicycleId, err)
-		return nil, fmt.Errorf("获取会话数据失败: %w", err)
-	}
-	return session, nil
-}
-
-// saveSessionToRedis 保存会话到Redis
-func saveSessionToRedis(ctx context.Context, session *entity.ComposeSession) error {
-	requestMessages := util.ConvertToMessages(session.RequestContent)
-	responseMessages := util.ConvertToMessages(session.ResponseContent)
-
-	if err := saveToRedis(ctx, session.SessionId, requestMessages, responseMessages); err != nil {
-		g.Log().Errorf(ctx, "[会话回调] Redis存储失败 sessionId=%s id=%d err=%v",
-			session.SessionId, session.Id, err)
-		return fmt.Errorf("Redis存储失败: %w", err)
-	}
-
-	return nil
-}
-
-// GetHistoryMessages 获取历史信息
-func GetHistoryMessages(ctx context.Context, sessionId string) ([]map[string]any, error) {
-	maxRounds := g.Cfg().MustGet(ctx, "session.maxRounds", 10).Int()
-
-	redisHistory, err := GetSessionHistoryForInference(ctx, sessionId)
-	if err == nil && len(redisHistory) > 0 {
-		return redisHistory, nil
-	}
-
-	return getHistoryFromDatabase(ctx, sessionId, maxRounds)
-}
-
-// getHistoryFromDatabase 从数据库获取历史记录
-func getHistoryFromDatabase(ctx context.Context, sessionId string, maxRounds int) ([]map[string]any, error) {
-	sessions, _, err := dao.ComposeSession.List(ctx, &entity.ComposeSession{
-		SessionId: sessionId,
-	}, 1, maxRounds)
-	if err != nil {
-		return nil, fmt.Errorf("DB获取历史失败: %w", err)
-	}
-
-	messages := extractMessagesFromSessions(sessions)
-
-	cacheSessionsToRedis(ctx, sessions)
-
-	return messages, nil
-}
-
-// extractMessagesFromSessions 从会话列表中提取消息
-func extractMessagesFromSessions(sessions []*entity.ComposeSession) []map[string]any {
-	var messages []map[string]any
-
-	for _, session := range sessions {
-		appendRequestMessages(session.RequestContent, &messages)
-		appendResponseMessages(session.ResponseContent, &messages)
-	}
-
-	return messages
-}
-
-// appendRequestMessages 追加请求消息
-func appendRequestMessages(requestContent any, messages *[]map[string]any) {
-	reqMsgs := util.ConvertToMessages(requestContent)
-	for _, m := range reqMsgs {
-		role := gconv.String(m["role"])
-		if role == "user" || role == "assistant" {
-			*messages = append(*messages, m)
-		}
-	}
-}
-
-// appendResponseMessages 追加响应消息
-func appendResponseMessages(responseContent any, messages *[]map[string]any) {
-	respMsgs := util.ConvertToMessages(responseContent)
-	for _, m := range respMsgs {
-		if m["role"] == nil {
-			m["role"] = "assistant"
-		}
-		*messages = append(*messages, m)
-	}
-}
-
-// cacheSessionsToRedis 将会话缓存到Redis
-func cacheSessionsToRedis(ctx context.Context, sessions []*entity.ComposeSession) {
-	for _, session := range sessions {
-		reqMsgs := util.ConvertToMessages(session.RequestContent)
-		respMsgs := util.ConvertToMessages(session.ResponseContent)
-
-		for i := range respMsgs {
-			if respMsgs[i]["role"] == nil {
-				respMsgs[i]["role"] = "assistant"
-			}
-		}
-
-		if len(reqMsgs) > 0 || len(respMsgs) > 0 {
-			_ = saveToRedis(ctx, session.SessionId, reqMsgs, respMsgs)
-		}
-	}
-}
--- a/service/prompt/prompt_user_form_batches.go
+++ b/service/prompt/prompt_user_form_batches.go
@@ -3,17 +3,17 @@ package prompt
 import (
 	"context"
 	"fmt"
+	"prompts-core/service/gateway"
 	"strings"

 	"github.com/gogf/gf/v2/frame/g"

 	"prompts-core/common/util"
 	"prompts-core/model/dto"
-	"prompts-core/model/entity"
 )

 // ProcessUserFormBatches 处理 UserForm 分批（按 token 大小拼接内容）
-func ProcessUserFormBatches(ctx context.Context, req *dto.ComposeMessagesReq, model *entity.AsynchModel) (*dto.ComposeMessagesReq, int, error) {
+func ProcessUserFormBatches(ctx context.Context, req *dto.ComposeMessagesReq, model *gateway.AsynchModel) (*dto.ComposeMessagesReq, int, error) {
 	if model.TokenConfig == nil || len(req.UserForm) == 0 {
 		return req, 1, nil
 	}
--- a/service/session/prompt_session_redis_service.go
+++ b/service/session/prompt_session_redis_service.go
@@ -0,0 +1,151 @@
+package session
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"prompts-core/common/util"
+	"prompts-core/model/dto"
+	"time"
+
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+const (
+	// RedisKeySessionHistory 会话历史缓存 key: session:history:{tenantId}:{sessionId}:{nodeId}
+	RedisKeySessionHistory = "session:history:%d:%s:%s"
+)
+
+// formatRedisKey 格式化 Redis key
+func formatRedisKey(tenantID uint64, sessionID, nodeID string) string {
+	return fmt.Sprintf(RedisKeySessionHistory, tenantID, sessionID, nodeID)
+}
+
+// ============================================
+// 写操作
+// ============================================
+
+// SaveToRedis 保存一轮对话到 Redis ZSET
+func SaveToRedis(ctx context.Context, tenantID uint64, sessionID, nodeID string, round *dto.HistoryRound) error {
+	key := formatRedisKey(tenantID, sessionID, nodeID)
+	maxRounds := util.GetMaxRounds(ctx)
+	expireSeconds := int64(util.GetExpireMinutes(ctx) * 60)
+
+	b, err := json.Marshal(round)
+	if err != nil {
+		return fmt.Errorf("序列化会话数据失败: %w", err)
+	}
+
+	score := float64(time.Now().UnixMilli())
+
+	if _, err = g.Redis().Do(ctx, "ZADD", key, score, string(b)); err != nil {
+		return fmt.Errorf("ZADD失败: %w", err)
+	}
+	if _, err = g.Redis().Do(ctx, "ZREMRANGEBYRANK", key, 0, -(maxRounds + 1)); err != nil {
+		return fmt.Errorf("裁剪失败: %w", err)
+	}
+	if _, err = g.Redis().Do(ctx, "EXPIRE", key, expireSeconds); err != nil {
+		return fmt.Errorf("设置过期失败: %w", err)
+	}
+
+	return nil
+}
+
+// DeleteSessionHistory 删除整个 session 下所有 node 的缓存
+func DeleteSessionHistory(ctx context.Context, tenantID uint64, sessionID string) error {
+	pattern := fmt.Sprintf(RedisKeySessionHistory, tenantID, sessionID, "*")
+	keys, err := g.Redis().Do(ctx, "KEYS", pattern)
+	if err != nil {
+		return err
+	}
+	for _, key := range keys.Strings() {
+		_, _ = g.Redis().Do(ctx, "DEL", key)
+	}
+	return nil
+}
+
+// DeleteRedisMessages 批量删除指定 node 下的消息
+func DeleteRedisMessages(ctx context.Context, tenantID uint64, sessionID, nodeID string, msgIDs []int64) error {
+	key := formatRedisKey(tenantID, sessionID, nodeID)
+	for _, msgID := range msgIDs {
+		cursor := "0"
+		for {
+			result, err := g.Redis().Do(ctx, "ZSCAN", key, cursor, "MATCH", fmt.Sprintf("*\"id\":%d*", msgID), "COUNT", 10)
+			if err != nil {
+				g.Log().Warningf(ctx, "[会话Redis] ZSCAN失败 msgID=%d err=%v", msgID, err)
+				break
+			}
+			parts := result.Strings()
+			if len(parts) < 2 {
+				break
+			}
+			cursor = parts[0]
+			for _, member := range parts[1:] {
+				_, _ = g.Redis().Do(ctx, "ZREM", key, member)
+			}
+			if cursor == "0" {
+				break
+			}
+		}
+	}
+	return nil
+}
+
+// ============================================
+// 读操作
+// ============================================
+
+// GetFromRedis 从 Redis ZSET 获取会话历史
+func GetFromRedis(ctx context.Context, tenantID uint64, sessionID, nodeID string) ([]dto.HistoryRound, error) {
+	key := formatRedisKey(tenantID, sessionID, nodeID)
+	maxRounds := util.GetMaxRounds(ctx)
+
+	result, err := g.Redis().Do(ctx, "ZREVRANGE", key, 0, maxRounds-1)
+	if err != nil {
+		return nil, fmt.Errorf("ZREVRANGE失败: %w", err)
+	}
+
+	if result == nil || result.IsNil() {
+		return []dto.HistoryRound{}, nil
+	}
+
+	return parseRounds(result.Strings()), nil
+}
+
+// ============================================
+// 解析
+// ============================================
+
+func parseRounds(members []string) []dto.HistoryRound {
+	rounds := make([]dto.HistoryRound, 0, len(members))
+	for _, member := range members {
+		var round dto.HistoryRound
+		if err := json.Unmarshal([]byte(member), &round); err != nil {
+			continue
+		}
+		if round.User != nil || round.Assistant != nil {
+			rounds = append(rounds, round)
+		}
+	}
+	return rounds
+}
+
+func flattenRounds(rounds []dto.HistoryRound) []dto.FlatMessage {
+	var messages []dto.FlatMessage
+	for i := len(rounds) - 1; i >= 0; i-- {
+		if rounds[i].User != nil && gconv.String(rounds[i].User["content"]) != "" {
+			messages = append(messages, dto.FlatMessage{
+				Role:    gconv.String(rounds[i].User["role"]),
+				Content: gconv.String(rounds[i].User["content"]),
+			})
+		}
+		if rounds[i].Assistant != nil && gconv.String(rounds[i].Assistant["content"]) != "" {
+			messages = append(messages, dto.FlatMessage{
+				Role:    gconv.String(rounds[i].Assistant["role"]),
+				Content: gconv.String(rounds[i].Assistant["content"]),
+			})
+		}
+	}
+	return messages
+}
--- a/service/session/prompt_session_service.go
+++ b/service/session/prompt_session_service.go
@@ -0,0 +1,191 @@
+package session
+
+import (
+	"context"
+	"fmt"
+
+	"gitea.redpowerfuture.com/red-future/common/beans"
+	"gitea.redpowerfuture.com/red-future/common/utils"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/util/gconv"
+
+	"prompts-core/common/util"
+	"prompts-core/dao"
+	"prompts-core/model/dto"
+	"prompts-core/model/entity"
+)
+
+// ============================================
+// 回调存储
+// ============================================
+
+// Callback 会话回调
+func Callback(ctx context.Context, req *dto.SessionCallbackReq) (*dto.SessionCallbackRes, error) {
+	req.Messages["role"] = "assistant"
+	// 1) 更新 DB
+	_, err := dao.ComposeSession.Update(ctx, &entity.ComposeSession{
+		SQLBaseDO:       beans.SQLBaseDO{Id: req.EpicycleId},
+		ResponseContent: req.Messages,
+	})
+	if err != nil {
+		g.Log().Errorf(ctx, "[会话回调] 更新数据库失败 epicycleId=%d err=%v", req.EpicycleId, err)
+		return nil, fmt.Errorf("更新数据库失败: %w", err)
+	}
+
+	// 2) 查询完整记录
+	session, err := dao.ComposeSession.Get(ctx, &entity.ComposeSession{
+		SQLBaseDO: beans.SQLBaseDO{Id: req.EpicycleId},
+	})
+	if err != nil || session == nil {
+		return nil, fmt.Errorf("会话不存在: epicycleId=%d", req.EpicycleId)
+	}
+
+	// 3) entity → HistoryRound → 写入 Redis
+	round := entityToHistoryRound(session)
+	round.Assistant = req.Messages
+	if err = SaveToRedis(ctx, session.TenantId, session.SessionId, session.NodeId, round); err != nil {
+		return nil, fmt.Errorf("redis存储失败: %w", err)
+	}
+
+	g.Log().Infof(ctx, "[会话回调] 存储成功 sessionId=%s id=%d", session.SessionId, session.Id)
+	return &dto.SessionCallbackRes{Status: true, SessionId: session.SessionId}, nil
+}
+
+// ============================================
+// 场景1：前端历史列表（按 creator）
+// ============================================
+
+// GetHistoryList 获取历史列表
+func GetHistoryList(ctx context.Context, req *dto.GetHistoryListReq) (*dto.GetHistoryListRes, error) {
+	user, err := utils.GetUserInfo(ctx)
+	if err != nil {
+		return nil, err
+	}
+	sessions, total, err := dao.ComposeSession.List(ctx, &entity.ComposeSession{
+		SQLBaseDO: beans.SQLBaseDO{Creator: user.UserName},
+	}, req.Page, req.Size)
+	if err != nil {
+		return nil, fmt.Errorf("DB获取历史列表失败: %w", err)
+	}
+	rounds := sessionsToHistoryRounds(sessions)
+	return &dto.GetHistoryListRes{List: rounds, Total: total}, nil
+}
+
+// ============================================
+// 场景2：提示词拼接（按 sessionId + nodeId）
+// ============================================
+
+// GetHistoryMessages 获取历史消息（Redis → DB → 异步回种）
+func GetHistoryMessages(ctx context.Context, req *dto.GetHistoryMessagesReq) (*dto.GetHistoryMessagesRes, error) {
+	user, err := utils.GetUserInfo(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	// 1) Redis
+	if rounds, err := GetFromRedis(ctx, user.TenantId, req.SessionId, req.NodeId); err == nil && len(rounds) > 0 {
+		g.Log().Debugf(ctx, "[历史消息] Redis命中 sessionId=%s count=%d", req.SessionId, len(rounds))
+		return &dto.GetHistoryMessagesRes{Messages: flattenRounds(rounds)}, nil
+	}
+
+	// 2) DB
+	maxRounds := util.GetMaxRounds(ctx)
+	sessions, _, err := dao.ComposeSession.List(ctx, &entity.ComposeSession{
+		SQLBaseDO: beans.SQLBaseDO{Creator: user.UserName},
+		SessionId: req.SessionId,
+		NodeId:    req.NodeId,
+	}, 1, maxRounds)
+	if err != nil {
+		return nil, fmt.Errorf("DB获取历史失败: %w", err)
+	}
+	if len(sessions) == 0 {
+		return &dto.GetHistoryMessagesRes{Messages: []dto.FlatMessage{}}, nil
+	}
+
+	// 3) 转换 + 异步回种
+	rounds := sessionsToHistoryRounds(sessions)
+	go asyncCacheToRedis(context.WithoutCancel(ctx), user.TenantId, req.SessionId, req.NodeId, rounds)
+
+	return &dto.GetHistoryMessagesRes{Messages: flattenRounds(rounds)}, nil
+}
+
+// ============================================
+// 删除
+// ============================================
+
+// DeleteMessages 删除消息
+func DeleteMessages(ctx context.Context, req *dto.DeleteMessagesReq) (*dto.DeleteMessagesRes, error) {
+	if len(req.MsgIds) == 0 {
+		return &dto.DeleteMessagesRes{Ok: false}, fmt.Errorf("msgIds不能为空")
+	}
+
+	user, _ := utils.GetUserInfo(ctx)
+
+	// 1) 批量查询
+	sessions, _ := dao.ComposeSession.ListByIds(ctx, req.MsgIds, user.UserName, req.SessionId)
+
+	// 2) 批量删 DB
+	_, _ = dao.ComposeSession.DeleteByIds(ctx, req.MsgIds, user.UserName, req.SessionId)
+
+	// 3) 按 nodeId 分组删 Redis
+	for _, s := range sessions {
+		_ = DeleteRedisMessages(ctx, user.TenantId, req.SessionId, s.NodeId, req.MsgIds)
+	}
+	return &dto.DeleteMessagesRes{Ok: true}, nil
+}
+
+// DeleteSession 删除整个会话
+func DeleteSession(ctx context.Context, req *dto.DeleteSessionReq) (*dto.DeleteSessionRes, error) {
+	// 1) 删 DB
+	if _, err := dao.ComposeSession.Delete(ctx, &entity.ComposeSession{
+		SessionId: req.SessionId,
+	}); err != nil {
+		return nil, fmt.Errorf("DB删除失败: %w", err)
+	}
+
+	user, err := utils.GetUserInfo(ctx)
+	if err != nil {
+		return nil, err
+	}
+	// 2) 删 Redis
+	if err := DeleteSessionHistory(ctx, user.TenantId, req.SessionId); err != nil {
+		g.Log().Warningf(ctx, "[删除会话] Redis删除失败 sessionId=%s err=%v", req.SessionId, err)
+	}
+
+	return &dto.DeleteSessionRes{Ok: true}, nil
+}
+
+// ============================================
+// 转换方法（entity ↔ dto，集中管理）
+// ============================================
+
+// entityToHistoryRound entity → HistoryRound
+func entityToHistoryRound(s *entity.ComposeSession) *dto.HistoryRound {
+	return &dto.HistoryRound{
+		Id:        s.Id,
+		SessionId: s.SessionId,
+		NodeId:    s.NodeId,
+		CreatedAt: gconv.String(s.CreatedAt),
+		UpdatedAt: gconv.String(s.UpdatedAt),
+		User:      s.RequestContent,
+		Assistant: s.ResponseContent,
+	}
+}
+
+// sessionsToHistoryRounds 批量转换
+func sessionsToHistoryRounds(sessions []*entity.ComposeSession) []dto.HistoryRound {
+	rounds := make([]dto.HistoryRound, 0, len(sessions))
+	for _, s := range sessions {
+		rounds = append(rounds, *entityToHistoryRound(s))
+	}
+	return rounds
+}
+
+// asyncCacheToRedis 异步缓存到 Redis
+func asyncCacheToRedis(ctx context.Context, tenantID uint64, sessionID, nodeID string, rounds []dto.HistoryRound) {
+	for i := range rounds {
+		if rounds[i].User != nil || rounds[i].Assistant != nil {
+			_ = SaveToRedis(ctx, tenantID, sessionID, nodeID, &rounds[i])
+		}
+	}
+}
Author	SHA1	Message	Date
张斌	26b5083d49	common版本升级	2026-06-23 18:32:00 +08:00
qhd	b479d90df4	chore: 升级 common 依赖至 v0.0.25	2026-06-23 16:56:28 +08:00
WangLiZhao	80bb2742d1	Merge remote-tracking branch 'origin/dev未优化' into dev未优化	2026-06-23 14:56:04 +08:00
WangLiZhao	2ec292aa45	feat(task): 添加构建模型名称字段支持动态校验 - 在ModelGatewayTask实体中新增BuildModelName字段 - 修改ParseAndValidate函数参数，支持传入requiredFields - 在异步工作器中实现构建模型的动态字段校验逻辑 - 添加prompt构建服务中传递构建模型名称的功能 - 实现构建模型不存在时的兜底机制	2026-06-23 14:55:51 +08:00
qhd	20c02304dc	Merge branch 'dev未优化' of https://gitea.redpowerfuture.com/red-future/prompts-core into dev未优化	2026-06-22 11:31:46 +08:00
qhd	2050d47f84	build: 升级 common 依赖至 v0.0.24	2026-06-22 11:31:30 +08:00
张斌	ca0ab09669	dockerfile	2026-06-22 11:00:03 +08:00
WangLiZhao	893cfaf361	Merge remote-tracking branch 'origin/dev未优化' into dev未优化	2026-06-22 10:32:12 +08:00
WangLiZhao	4ec3dc3ad0	fix(prompt): 修复OSS内容解析问题	2026-06-22 10:31:51 +08:00
qhd	4d0ff837e1	chore: 更新数据库及服务配置地址	2026-06-22 09:09:25 +08:00
WangLiZhao	973085ffc8	fix(prompt): 修复结构体类型请求中的自定义提示获取问题	2026-06-18 15:42:03 +08:00
WangLiZhao	d304d0ee4a	feat(prompt): 添加用户提示词功能支持	2026-06-18 15:34:53 +08:00
WangLiZhao	99514e9e84	refactor(config): 更新数据库配置和任务处理逻辑	2026-06-18 14:48:42 +08:00
WangLiZhao	d700651483	Merge remote-tracking branch 'origin/dev未优化' into dev未优化	2026-06-18 14:00:08 +08:00
WangLiZhao	d5b55b5bd6	refactor(files): 优化文件处理和任务服务逻辑	2026-06-18 13:59:59 +08:00
qhd	d30808cfe2	feat: 使用配置项替换文件URL中的CDN域名将硬编码的CDN域名替换为可配置的filePrefix，方便切换文件上传服务地址，并更新本地数据库连接配置。	2026-06-18 13:57:33 +08:00
WangLiZhao	7fa7a2e8ea	refactor(files): 优化文件处理和任务服务逻辑	2026-06-18 13:39:41 +08:00
qhd	dd79643170	fix: 替换请求头转发方式并修复空指针拦截移除 util.ForwardHeaders，改为从 GoFrame 请求上下文直接提取原始请求头；新增 GetFileBytesFromURL 方法替代 DownloadFile 下载 OSS 文件；增加 composeTask 空指针校验防止异常；调整数据库连接池参数。	2026-06-18 10:06:49 +08:00
WangLiZhao	eb28c2d1e0	refactor(model): 优化模型网关的数据解析和任务处理逻辑	2026-06-17 14:34:49 +08:00
WangLiZhao	0d52b631b9	refactor(task): 重构任务服务和数据结构	2026-06-12 15:29:06 +08:00
WangLiZhao	c22d578e1a	fix(task): 修复任务状态更新和超时处理问题	2026-06-11 11:27:15 +08:00
WangLiZhao	df26329836	feat(session): 重构会话服务支持节点维度的Redis缓存管理	2026-06-10 16:48:35 +08:00
张斌	40abf0f606	ci/cd调整	2026-06-10 16:32:42 +08:00
WangLiZhao	b69e7386e2	refactor(prompts-core): 重构代码结构和优化工具函数	2026-06-10 14:51:25 +08:00
WangLiZhao	1c1db7e30c	feat(prompt): 实现历史消息注入功能和协议配置优化 - 在 handleCallbackSuccess 函数中新增获取协议配置逻辑 - 实现历史消息获取并在 rounds 中注入历史消息 - 添加 InjectHistory 函数实现按协议顺序合并历史消息 - 在 GetPromptText 接口中集成历史消息注入测试 - 更新 ProviderProtocol 实体中的 MergeOrder 类型为 []string - 新增 Capabilities 字段支持最大 token 配置 - 修改 renderTemplate 函数接收协议对象参数 - 优化会话历史存储逻辑，提取用户消息内容进行记录 - 移除无用的注释代码 handleCallbackSuccess 处理回调成功	2026-06-10 10:16:58 +08:00
WangLiZhao	78114f99c7	feat(session): 重构会话管理和消息存储功能	2026-06-09 15:46:09 +08:00
WangLiZhao	9410199fbe	feat(session): 重构会话管理和Redis缓存机制	2026-06-09 14:00:01 +08:00
WangLiZhao	1f9a2b9b5f	Merge remote-tracking branch 'origin/dev' into dev	2026-06-08 18:02:27 +08:00
WangLiZhao	e1461cf0f0	feat: 重构异步模型字段并更新依赖	2026-06-08 18:01:54 +08:00
张斌	aa7804656f	ci/cd调整	2026-06-08 15:37:12 +08:00
张斌	5494a0c480	ci/cd调整	2026-06-08 13:44:54 +08:00
qhd	ee6677c1f8	fix: 修复响应体解析逻辑并统一结构包装	2026-06-05 11:48:27 +08:00
WangLiZhao	de70d33115	refactor(prompt): 重构提示词构建服务和回调处理	2026-06-05 11:00:05 +08:00
WangLiZhao	b2cad4cac2	refactor(model-gateway): 重构代码结构并优化数据库查询	2026-06-03 18:37:18 +08:00
WangLiZhao	05cf1b9828	refactor(model): 移除异步模型相关实体和数据访问对象	2026-06-03 13:31:15 +08:00
WangLiZhao	3fa2896fc3	refactor(util): 重构映射工具函数并优化异步任务轮询逻辑	2026-06-03 13:30:39 +08:00
WangLiZhao	c11a9ad5c8	chore(deps): 初始化项目依赖配置	2026-06-02 20:28:06 +08:00
WangLiZhao	0bbaddace0	refactor(asynch): 重构异步模型配置和队列管理	2026-06-02 20:26:46 +08:00
WangLiZhao	1bcf8f6e10	feat(model): 添加流式配置支持并优化响应处理	2026-05-30 22:08:46 +08:00
WangLiZhao	55eb436639	refactor(service): 重构服务模块结构并优化模型配置	2026-05-29 17:54:19 +08:00
WangLiZhao	d74559ae74	refactor(task): 重构异步任务处理流程	2026-05-27 09:36:26 +08:00
WangLiZhao	2548ffc7ac	feat: 新增模型扩展映射与查询配置字段	2026-05-23 18:08:09 +08:00