From f723a8441b22f2a8b1f3e9a489eee5cd1f595990 Mon Sep 17 00:00:00 2001
From: chakcy <947105045@qq.com>
Date: Fri, 14 Aug 2026 16:27:31 +0800
Subject: [PATCH] =?UTF-8?q?modify:=20mqtt=20uri=20=E6=94=AF=E6=8C=81=20AIB?=
 =?UTF-8?q?OX=5FMQTT=5FURI=20=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E5=85=9C?=
 =?UTF-8?q?=E5=BA=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 aibox_sophon_adapter/mqtt_clients.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/aibox_sophon_adapter/mqtt_clients.py b/aibox_sophon_adapter/mqtt_clients.py
index 81622d2..576af71 100644
--- a/aibox_sophon_adapter/mqtt_clients.py
+++ b/aibox_sophon_adapter/mqtt_clients.py
@@ -13,6 +13,7 @@ AI Box Sophon Adapter — MQTT 客户端能力组件
   "Worker ... 无回复，尝试重试"。
 """
 import logging
+import os
 from typing import Any
 
 logger = logging.getLogger(__name__)
@@ -135,7 +136,8 @@ async def start_mqtt_forward(cfg: dict) -> Any:
 
     from chongming_mqtt.mqtt_forward import MQTTForwardClient
 
-    uri = cfg.get("uri", "")
+    # uri 含凭据，优先配置；留空时从环境变量 AIBOX_MQTT_URI 兜底（避免凭据入库）
+    uri = cfg.get("uri") or os.environ.get("AIBOX_MQTT_URI", "")
     topic = cfg.get("topic", "/board_ping")
     logger.warning(
         "[MQTTForward] 配置已加载: enabled=%s, uri=%s, topic=%s", enabled, uri, topic
@@ -162,7 +164,8 @@ async def start_mqtt_subscribe(cfg: dict) -> Any:
 
     from chongming_mqtt.mqtt_subscribe import MQTTSubscribeClient
 
-    uri = cfg.get("uri", "")
+    # uri 含凭据，优先配置；留空时从环境变量 AIBOX_MQTT_URI 兜底（避免凭据入库）
+    uri = cfg.get("uri") or os.environ.get("AIBOX_MQTT_URI", "")
     topics = cfg.get("topics", []) or []
     logger.warning(
         "[MQTTSubscribe] 配置已加载: enabled=%s, uri=%s, topics=%s",