Update Dockerfile

Dockerfile

@@ -65,69 +65,137 @@ if __name__ == "__main__":\n\
     if len(sys.argv) > 1 and sys.argv[1] == "backup": backup()\n\
     else: restore()' > /usr/local/bin/sync.py
 
-# 6. 最终启动脚本 (增加进程清理与锁文件强制删除)
+# 6. 最终启动脚本 (优化配置合并策略：严格深度合并 + 数组按ID智能合并)
 RUN echo "#!/bin/bash\n\
 mkdir -p /root/.openclaw\n\
 ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime\n\
 \n\
-# 1. 尝试从云端恢复配置\n\
-python3 /usr/local/bin/sync.py restore\n\
+echo \"--- [System] 📦 1. 尝试从云端恢复配置... ---\"\n\
+python3 /usr/local/bin/sync.py restore || true\n\
 find /root/.openclaw -name \"*.lock\" -delete\n\
 chmod 700 /root/.openclaw\n\
 \n\
-# 2. 判断配置文件是否存在，如果不存在（首次运行或恢复失败）才使用环境变量生成\n\
-if [ ! -f /root/.openclaw/openclaw.json ]; then\n\
-    echo \"--- [System] 📝 未检测到配置文件，正在使用环境变量初始化... ---\"\n\
-    CLEAN_BASE=\$(echo \"\$OPENAI_API_BASE\" | sed \"s|/chat/completions||g\" | sed \"s|/v1/|/v1|g\")\n\
-    cat > /root/.openclaw/openclaw.json <<EOF\n\
-{\n\
-  \"models\": { \"providers\": { \"siliconflow\": { \"baseUrl\": \"\$CLEAN_BASE\", \"apiKey\": \"\$OPENAI_API_KEY\", \"api\": \"openai-completions\", \"authHeader\": true, \"models\": [{ \"id\": \"\$MODEL\", \"name\": \"DeepSeek\", \"contextWindow\": 128000 }] } } },\n\
-  \"agents\": { \"defaults\": { \"model\": { \"primary\": \"siliconflow/\$MODEL\" } } },\n\
-  \"gateway\": {\n\
-    \"mode\": \"local\", \"port\": 7860, \"bind\": \"custom\", \"customBindHost\": \"0.0.0.0\",\n\
-    \"trustedProxies\": [\"10.0.0.0/8\"],\n\
-    \"auth\": { \"mode\": \"token\", \"token\": \"\$OPENCLAW_GATEWAY_PASSWORD\" },\n\
-    \"controlUi\": { \"enabled\": true, \"allowInsecureAuth\": true, \"dangerouslyDisableDeviceAuth\": true, \"dangerouslyAllowHostHeaderOriginFallback\": true },\n\
-    \"tools\": { \"deny\": [\"gateway\"] }\n\
-  }\n\
+echo \"--- [System] 📝 2. 开始合并默认配置与已恢复的配置... ---\"\n\
+export CLEAN_BASE=\$(echo \"\$OPENAI_API_BASE\" | sed \"s|/chat/completions||g\" | sed \"s|/v1/|/v1|g\")\n\
+\n\
+# 使用 Python 深度合并 JSON (包含数组按ID合并逻辑)\n\
+python3 -c \"\n\
+import json, os\n\
+\n\
+def deep_update(d, u):\n\
+    for k, v in u.items():\n\
+        if isinstance(v, dict) and k in d and isinstance(d[k], dict):\n\
+            deep_update(d[k], v)\n\
+        elif isinstance(v, list) and k in d and isinstance(d[k], list):\n\
+            # 处理数组合并逻辑\n\
+            d_dict = {}\n\
+            non_id_d = []\n\
+            # 解析原配置(恢复的)数组\n\
+            for item in d[k]:\n\
+                if isinstance(item, dict) and 'id' in item:\n\
+                    d_dict[item['id']] = item\n\
+                else:\n\
+                    non_id_d.append(item)\n\
+            \n\
+            non_id_u = []\n\
+            # 解析新配置(环境变量)数组并进行合并\n\
+            for item in v:\n\
+                if isinstance(item, dict) and 'id' in item:\n\
+                    if item['id'] in d_dict:\n\
+                        # id相同，对内部字段继续深度合并（以新配置为准覆盖）\n\
+                        d_dict[item['id']] = deep_update(d_dict[item['id']], item)\n\
+                    else:\n\
+                        d_dict[item['id']] = item\n\
+                else:\n\
+                    # 对于普通元素（如字符串IP），去重合并\n\
+                    if item not in non_id_d:\n\
+                        non_id_u.append(item)\n\
+            \n\
+            # 组合合并后的数组\n\
+            d[k] = list(d_dict.values()) + non_id_d + non_id_u\n\
+        else:\n\
+            d[k] = v\n\
+    return d\n\
+\n\
+config_path = '/root/.openclaw/openclaw.json'\n\
+current_config = {}\n\
+\n\
+if os.path.exists(config_path):\n\
+    try:\n\
+        with open(config_path, 'r', encoding='utf-8') as f:\n\
+            current_config = json.load(f)\n\
+    except Exception:\n\
+        pass\n\
+\n\
+clean_base = os.environ.get('CLEAN_BASE', '')\n\
+api_key = os.environ.get('OPENAI_API_KEY', '')\n\
+model = os.environ.get('MODEL', '')\n\
+gateway_pw = os.environ.get('OPENCLAW_GATEWAY_PASSWORD', '')\n\
+\n\
+default_config = {\n\
+    'models': {\n\
+        'providers': {\n\
+            'siliconflow': {\n\
+                'baseUrl': clean_base,\n\
+                'apiKey': api_key,\n\
+                'api': 'openai-completions',\n\
+                'authHeader': True,\n\
+                'models': [{'id': model, 'name': 'DeepSeek', 'contextWindow': 128000}]\n\
+            }\n\
+        }\n\
+    },\n\
+    'agents': {\n\
+        'defaults': {\n\
+            'model': {'primary': 'siliconflow/' + model}\n\
+        }\n\
+    },\n\
+    'gateway': {\n\
+        'mode': 'local', 'port': 7860, 'bind': 'custom', 'customBindHost': '0.0.0.0',\n\
+        'trustedProxies': ['10.0.0.0/8'],\n\
+        'auth': {'mode': 'token', 'token': gateway_pw},\n\
+        'controlUi': {\n\
+            'enabled': True,\n\
+            'allowInsecureAuth': True,\n\
+            'dangerouslyDisableDeviceAuth': True,\n\
+            'dangerouslyAllowHostHeaderOriginFallback': True\n\
+        },\n\
+        'tools': {'deny': ['gateway']}\n\
+    }\n\
 }\n\
-EOF\n\
-else\n\
-    echo \"--- [System] 📂 检测到已有配置文件，跳过初始化。 ---\"\n\
-fi\n\
 \n\
-# 3. 启动后台备份任务\n\
+merged_config = deep_update(current_config, default_config)\n\
+\n\
+with open(config_path, 'w', encoding='utf-8') as f:\n\
+    json.dump(merged_config, f, indent=2, ensure_ascii=False)\n\
+\"\n\
+echo \"--- [System] ✅ 配置合并完成。 ---\"\n\
+\n\
+# 启动后台备份任务\n\
 (while true; do sleep 1800; python3 /usr/local/bin/sync.py backup; done) &\n\
 \n\
 export NODE_ENV=production\n\
 export OPENCLAW_TRUST_PROXY=true\n\
 \n\
-# 4. 守护进程模式运行 openclaw\n\
+echo \"--- [System] 🚀 3. 正在启动 OpenClaw Gateway... ---\"\n\
 set +e\n\
 trap 'kill -TERM \$PID 2>/dev/null' TERM INT\n\
 \n\
 while true; do\n\
-    echo \"--- [System] 🚀 正在启动/重启 OpenClaw Gateway... ---\"\n\
-    \n\
-    # 每次启动前，确保没有任何旧进程和锁文件残留\n\
     find /root/.openclaw -name \"*.lock\" -delete\n\
     \n\
     openclaw gateway run --port 7860 &\n\
     PID=\$!\n\
     wait \$PID\n\
     \n\
-    echo \"--- [System] ⚠️ OpenClaw 主进程退出，正在进行清理与内部重启... ---\"\n\
-    \n\
-    # 关键修复：执行官方的停止命令，并强杀可能残留的 node 幽灵进程\n\
+    echo \"--- [System] ⚠️ OpenClaw 主进程退出，正在清理环境准备重启... ---\"\n\
     openclaw gateway stop || true\n\
     pkill -f openclaw || true\n\
     pkill -f node || true\n\
     \n\
-    # 强制进行一次备份\n\
     python3 /usr/local/bin/sync.py backup || true\n\
-    \n\
     sleep 3\n\
 done\n\
 " > /usr/local/bin/start-openclaw && chmod +x /usr/local/bin/start-openclaw
+
 EXPOSE 7860
 CMD ["/usr/local/bin/start-openclaw"]