From ea44d445b457014d3ba0a9f6d4f6bf26c1fa570c Mon Sep 17 00:00:00 2001 From: AetherNo2332 <130164460+AetherNo2332@users.noreply.github.com> Date: Mon, 21 Sep 2026 07:08:27 +0800 Subject: [PATCH] =?UTF-8?q?build(deploy):=20=E9=83=A8=E7=BD=B2=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=20-=20=E8=BD=AC=E5=8F=91=20CANVAS=5FPUBLIC=5FBASE=5FU?= =?UTF-8?q?RL=20(#564)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original-Commit: 1734438cd00963a607795b2a6640ab7827e487e0 build(deploy): 部署配置 - 转发 CANVAS_PUBLIC_BASE_URL 后端读 CANVAS_PUBLIC_BASE_URL（resource.go 用它拼本地存储的短时签名链接，取不到时的报错 也在提示管理员配置它），但 5 个 Compose 文件都没有把它传进容器：按报错操作的管理员把变量 写进 .env 之后没有任何效果，而报错文案仍在让他"去配置"。 5 个编排与 .env.example 一并补齐（默认空值，行为与现状一致），并说明内网部署还需把该主机 放进 CANVAS_ALLOWED_PRIVATE_UPSTREAM_HOSTS。无代码改动。 --- .env.example | 3 +++ docker-compose.deploy.yml | 1 + docker-compose.dev.yml | 2 ++ docker-compose.local.yml | 2 ++ docker-compose.server.yml | 1 + docker-compose.yml | 2 ++ 6 files changed, 11 insertions(+) diff --git a/.env.example b/.env.example index 493d29a9f..7c774204a 100644 --- a/.env.example +++ b/.env.example @@ -5,6 +5,9 @@ CANVAS_ALLOW_PRIVATE_UPSTREAMS=false # 多个主机使用英文逗号分隔，例如：gateway.internal,192.168.1.10 CANVAS_ALLOWED_PRIVATE_UPSTREAM_HOSTS= CANVAS_CORS_ORIGINS=http://localhost:3000 +# 服务器对模型上游可访问的地址：本地存储的短时签名链接（Agent 看图、生成任务参考图）由它拼出， +# 内网部署还要把该主机放进 CANVAS_ALLOWED_PRIVATE_UPSTREAM_HOSTS。留空则本地存储无法签出链接。 +CANVAS_PUBLIC_BASE_URL= # 启用服务商插件系统以支持特定服务的模型发现（如阿里云百炼的视频生成模型） # 设置为 true 启用插件机制，false 使用传统方式（默认：false） ENABLE_PROVIDER_PLUGINS=false diff --git a/docker-compose.deploy.yml b/docker-compose.deploy.yml index cfe4d3fe3..cc4327256 100644 --- a/docker-compose.deploy.yml +++ b/docker-compose.deploy.yml @@ -53,6 +53,7 @@ services: CANVAS_ALLOW_PRIVATE_UPSTREAMS: ${CANVAS_ALLOW_PRIVATE_UPSTREAMS:-false} CANVAS_ALLOWED_PRIVATE_UPSTREAM_HOSTS: ${CANVAS_ALLOWED_PRIVATE_UPSTREAM_HOSTS:-} CANVAS_CORS_ORIGINS: ${CANVAS_CORS_ORIGINS:-} + CANVAS_PUBLIC_BASE_URL: ${CANVAS_PUBLIC_BASE_URL:-} CANVAS_UPDATER_SOCKET: /run/open-ai-canvas-updater/updater.sock CANVAS_UPDATER_TOKEN: ${CANVAS_UPDATER_TOKEN:-} GIN_MODE: release diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index eddb70684..fcf16dc56 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -26,6 +26,8 @@ services: CANVAS_ALLOW_PRIVATE_UPSTREAMS: ${CANVAS_ALLOW_PRIVATE_UPSTREAMS:-false} CANVAS_ALLOWED_PRIVATE_UPSTREAM_HOSTS: ${CANVAS_ALLOWED_PRIVATE_UPSTREAM_HOSTS:-} CANVAS_CORS_ORIGINS: ${CANVAS_CORS_ORIGINS:-http://localhost:3000} + # 服务器访问地址：Agent 看图与生成参考图都靠它签发上游可取到的短时链接。 + CANVAS_PUBLIC_BASE_URL: ${CANVAS_PUBLIC_BASE_URL:-} GIN_MODE: debug volumes: - type: bind diff --git a/docker-compose.local.yml b/docker-compose.local.yml index e77cadb8e..7dd0a5504 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -19,6 +19,8 @@ services: CANVAS_ALLOW_PRIVATE_UPSTREAMS: ${CANVAS_ALLOW_PRIVATE_UPSTREAMS:-false} CANVAS_ALLOWED_PRIVATE_UPSTREAM_HOSTS: ${CANVAS_ALLOWED_PRIVATE_UPSTREAM_HOSTS:-} CANVAS_CORS_ORIGINS: ${CANVAS_CORS_ORIGINS:-http://localhost:3000} + # 服务器访问地址：Agent 看图与生成参考图都靠它签发上游可取到的短时链接。 + CANVAS_PUBLIC_BASE_URL: ${CANVAS_PUBLIC_BASE_URL:-} ENABLE_PROVIDER_PLUGINS: ${ENABLE_PROVIDER_PLUGINS:-false} GIN_MODE: release volumes: diff --git a/docker-compose.server.yml b/docker-compose.server.yml index 6ec284cf5..24ee0c1e9 100644 --- a/docker-compose.server.yml +++ b/docker-compose.server.yml @@ -67,6 +67,7 @@ services: CANVAS_ALLOW_PRIVATE_UPSTREAMS: ${CANVAS_ALLOW_PRIVATE_UPSTREAMS:-false} CANVAS_ALLOWED_PRIVATE_UPSTREAM_HOSTS: ${CANVAS_ALLOWED_PRIVATE_UPSTREAM_HOSTS:-} CANVAS_CORS_ORIGINS: ${CANVAS_CORS_ORIGINS:-*} + CANVAS_PUBLIC_BASE_URL: ${CANVAS_PUBLIC_BASE_URL:-} GIN_MODE: release volumes: - ${CANVAS_DATA_PATH:-./data}:/data diff --git a/docker-compose.yml b/docker-compose.yml index 7fd36c5f4..763cc847a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,6 +19,8 @@ services: CANVAS_ALLOW_PRIVATE_UPSTREAMS: ${CANVAS_ALLOW_PRIVATE_UPSTREAMS:-false} CANVAS_ALLOWED_PRIVATE_UPSTREAM_HOSTS: ${CANVAS_ALLOWED_PRIVATE_UPSTREAM_HOSTS:-} CANVAS_CORS_ORIGINS: ${CANVAS_CORS_ORIGINS:-http://localhost:3000} + # 服务器访问地址：Agent 看图与生成参考图都靠它签发上游可取到的短时链接。 + CANVAS_PUBLIC_BASE_URL: ${CANVAS_PUBLIC_BASE_URL:-} GIN_MODE: release volumes: - backend-data:/data