diff --git a/config.yml b/config.yml index eb9a702..55d5ed6 100644 --- a/config.yml +++ b/config.yml @@ -28,10 +28,10 @@ database: timeMaintainDisabled: false # (可选)是否完全关闭时间更新特性,为true时CreatedAt/UpdatedAt/DeletedAt都将失效 model_gateway: - type: "pgsql" - host: "116.204.74.41" - port: "15432" + host: "localhost" + port: "5432" user: "postgres" - pass: "Bjang09@686^*^" + pass: "123456" name: "model-gateway" prefix: "" role: "master" @@ -59,6 +59,9 @@ consul: jaeger: addr: 192.168.3.30:4318 +# 文件上传服务地址,与oss模块minio中的endpoint一致 +filePrefix: "http://116.204.74.41:9000" + task: waitTimeoutSeconds: 600 # /composeMessages 同步等待最终结果的最长时间(秒) diff --git a/service/gateway/gateway_http_service.go b/service/gateway/gateway_http_service.go index 29d2c2b..52b14d9 100644 --- a/service/gateway/gateway_http_service.go +++ b/service/gateway/gateway_http_service.go @@ -239,8 +239,9 @@ func DownloadFile(ossURL string) ([]byte, error) { } 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, fileUrl) + resp, err := g.Client().Get(ctx, newS) if err != nil { return nil, fmt.Errorf("下载OSS文件失败: %w", err) } @@ -254,7 +255,7 @@ func GetFileBytesFromURL(ctx context.Context, fileUrl string) ([]byte, error) { // 读取全部内容 allBytes, err := io.ReadAll(resp.Body) if err != nil { - return nil, gerror.Wrapf(err, "failed to read response body, url: %s", fileUrl) + return nil, gerror.Wrapf(err, "failed to read response body, url: %s", newS) } return allBytes, nil