Merge branch 'dev未优化' of https://gitea.redpowerfuture.com/red-future/prompts-core into dev未优化
This commit is contained in:
12
config.yml
12
config.yml
@@ -7,7 +7,7 @@ server:
|
|||||||
database:
|
database:
|
||||||
default:
|
default:
|
||||||
- type: "pgsql"
|
- type: "pgsql"
|
||||||
host: "116.204.74.41"
|
host: "192.168.0.83"
|
||||||
port: "15432"
|
port: "15432"
|
||||||
user: "postgres"
|
user: "postgres"
|
||||||
pass: "Bjang09@686^*^"
|
pass: "Bjang09@686^*^"
|
||||||
@@ -28,7 +28,7 @@ database:
|
|||||||
timeMaintainDisabled: false # (可选)是否完全关闭时间更新特性,为true时CreatedAt/UpdatedAt/DeletedAt都将失效
|
timeMaintainDisabled: false # (可选)是否完全关闭时间更新特性,为true时CreatedAt/UpdatedAt/DeletedAt都将失效
|
||||||
model_gateway:
|
model_gateway:
|
||||||
- type: "pgsql"
|
- type: "pgsql"
|
||||||
host: "116.204.74.41"
|
host: "192.168.0.83"
|
||||||
port: "15432"
|
port: "15432"
|
||||||
user: "postgres"
|
user: "postgres"
|
||||||
pass: "Bjang09@686^*^"
|
pass: "Bjang09@686^*^"
|
||||||
@@ -50,17 +50,17 @@ database:
|
|||||||
|
|
||||||
redis:
|
redis:
|
||||||
default:
|
default:
|
||||||
address: 116.204.74.41:6379
|
address: 192.168.0.83:6379
|
||||||
db: 0
|
db: 0
|
||||||
|
|
||||||
consul:
|
consul:
|
||||||
address: 116.204.74.41:8500
|
address: 192.168.0.83:8500
|
||||||
|
|
||||||
jaeger:
|
jaeger:
|
||||||
addr: 116.204.74.41:4318
|
addr: 192.168.0.83:4318
|
||||||
|
|
||||||
# 文件上传服务地址,与oss模块minio中的endpoint一致
|
# 文件上传服务地址,与oss模块minio中的endpoint一致
|
||||||
filePrefix: "http://116.204.74.41:9000"
|
filePrefix: "http://192.168.0.83:9000"
|
||||||
|
|
||||||
task:
|
task:
|
||||||
waitTimeoutSeconds: 600 # /composeMessages 同步等待最终结果的最长时间(秒)
|
waitTimeoutSeconds: 600 # /composeMessages 同步等待最终结果的最长时间(秒)
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package prompt
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"prompts-core/common/util"
|
"prompts-core/common/util"
|
||||||
@@ -14,7 +15,6 @@ import (
|
|||||||
|
|
||||||
"gitea.redpowerfuture.com/red-future/common/beans"
|
"gitea.redpowerfuture.com/red-future/common/beans"
|
||||||
"gitea.redpowerfuture.com/red-future/common/utils"
|
"gitea.redpowerfuture.com/red-future/common/utils"
|
||||||
"github.com/gogf/gf/v2/encoding/gjson"
|
|
||||||
"github.com/gogf/gf/v2/frame/g"
|
"github.com/gogf/gf/v2/frame/g"
|
||||||
"github.com/gogf/gf/v2/util/gconv"
|
"github.com/gogf/gf/v2/util/gconv"
|
||||||
)
|
)
|
||||||
@@ -154,7 +154,9 @@ func Callback(ctx context.Context, req *dto.CallbackReq) error {
|
|||||||
// 3) 解析 OSS 内容为消息
|
// 3) 解析 OSS 内容为消息
|
||||||
var messages map[string]any
|
var messages map[string]any
|
||||||
if len(ossContent) > 0 {
|
if len(ossContent) > 0 {
|
||||||
messages = gjson.New(ossContent).Map()
|
if err := json.Unmarshal(ossContent, &messages); err != nil {
|
||||||
|
g.Log().Warningf(ctx, "[回调处理] 解析OSS内容失败 taskId=%s err=%v", req.TaskId, err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 4) 处理失败
|
// 4) 处理失败
|
||||||
|
|||||||
Reference in New Issue
Block a user