From 585277b724ec9243d713a2dde5b8c1e13b6c1d6f Mon Sep 17 00:00:00 2001 From: Pine Date: Mon, 24 Aug 2026 20:33:15 +0800 Subject: [PATCH] =?UTF-8?q?fix(park):=20/park/api/config=20=E8=A1=A5?= =?UTF-8?q?=E9=A1=B6=E5=B1=82=20mqtt=5Furl/username/password=20=E2=80=94?= =?UTF-8?q?=20=E5=85=BC=E5=AE=B9=E5=A4=A7=E5=B1=8F=20bootstrap=20=E5=8F=96?= =?UTF-8?q?=20MQTT/API=20=E5=BC=95=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 大屏 main.jsx 读 cfg.mqtt_url/mqtt_username/mqtt_password；此前仅返回嵌套 mqtt{}， 大屏回退到构建期旧地址。补顶层字段(取 server-core .env MQTT_WS_URL/凭据)。 --- app/park/routers.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/park/routers.py b/app/park/routers.py index 2d1cf94..948f7a5 100644 --- a/app/park/routers.py +++ b/app/park/routers.py @@ -393,7 +393,7 @@ async def update_settings(body: SettingsBody): @router.get("/api/config") async def runtime_config(request: Request): - """大屏启动引导：下发 MQTT/语音接入地址与 tick 间隔。""" + """大屏启动引导：下发 MQTT/API/语音地址（顶层 mqtt_url/mqtt_username/mqtt_password 字段，兼容大屏 bootstrap）。""" return { "mqtt": { "host": settings.MQTT_HOST, @@ -401,10 +401,13 @@ async def runtime_config(request: Request): "ws_url": settings.MQTT_WS_URL, "tick_interval": settings.MQTT_TICK_INTERVAL, }, + # 大屏 main.jsx bootstrap 读顶层字段；缺省时回退构建期烘焙地址 + "mqtt_url": settings.MQTT_WS_URL, + "mqtt_username": settings.MQTT_USERNAME or "", + "mqtt_password": settings.MQTT_PASSWORD or "", "voice_ws": settings.S2S_WS_URL if settings.S2S_ENABLED else "", - # 大屏前端 request() 以 `${api_base}/api/...`、`${api_base}/file/...` 拼接， - # 故 api_base 返回 `/park` 前缀（不含 /api），避免 /api 双写。 "media_base": f"{request.base_url}park/file", + # 大屏前端 request() 以 `${api_base}/api/...`、`${api_base}/file/...` 拼接，故 api_base 返回 `/park` 前缀 "api_base": f"{request.base_url}park", }