From 537ee260fd372d48e2dd550e4bc2b22a168421da Mon Sep 17 00:00:00 2001
From: root <root@minecraft-server>
Date: Wed, 8 Apr 2026 23:05:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AE=80=E5=8C=96=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91=EF=BC=8C=E6=97=A0=E8=AE=BA?=
 =?UTF-8?q?=E5=A6=82=E4=BD=95=E9=83=BD=E4=BB=8E=E5=AE=B9=E5=99=A8=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/install_neo4j_ubuntu.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/install_neo4j_ubuntu.sh b/scripts/install_neo4j_ubuntu.sh
index fb7ed10..4af4d8d 100755
--- a/scripts/install_neo4j_ubuntu.sh
+++ b/scripts/install_neo4j_ubuntu.sh
@@ -79,7 +79,7 @@ else
         elif [ -n "$STOPPED" ]; then
             echo "  找到已停止的 Neo4j 容器: $STOPPED"
             docker start "$STOPPED" 2>/dev/null || true
-            sleep 3
+            sleep 5
             EXISTING="$STOPPED"
         else
             # 没有已有容器，创建新的
@@ -89,7 +89,7 @@ else
                 -e NEO4J_AUTH=neo4j/${NEO4J_PASS} \
                 -e NEO4J_PLUGINS='["apoc"]' \
                 neo4j:5 || true
-            sleep 15
+            sleep 20
             echo "  Neo4j Docker 容器已启动"
             echo "  密码: $NEO4J_PASS"
             NEO4J_PASSWORD="$NEO4J_PASS"
@@ -97,11 +97,12 @@ else
             EXISTING="openclaw-neo4j"
         fi
         
-        # 获取密码
-        if [ -z "$NEO4J_PASSWORD" ]; then
+        # 无论如何都从容器获取密码
+        if [ -n "$EXISTING" ]; then
             NEO4J_AUTH=$(docker inspect "$EXISTING" --format '{{.Config.Env}}' 2>/dev/null | tr ' ' '\n' | grep NEO4J_AUTH | cut -d'=' -f2)
             if [ -n "$NEO4J_AUTH" ]; then
                 NEO4J_PASSWORD=$(echo "$NEO4J_AUTH" | cut -d'/' -f2)
+                echo "  获取到密码: $NEO4J_PASSWORD"
             fi
         fi
     else