From f7a9e3ec16ffe866f5577a1ab1b763af6f034d7f Mon Sep 17 00:00:00 2001
From: root <root@minecraft-server>
Date: Wed, 8 Apr 2026 23:06:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=20-=20=E4=BC=98=E5=85=88=E4=BB=8E=E5=AE=B9?=
 =?UTF-8?q?=E5=99=A8=E8=8E=B7=E5=8F=96=EF=BC=8C=E5=86=8D=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E6=9C=80=E5=90=8E=E4=BF=9D=E5=BA=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/install_neo4j_ubuntu.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/scripts/install_neo4j_ubuntu.sh b/scripts/install_neo4j_ubuntu.sh
index 4af4d8d..51c8bb2 100755
--- a/scripts/install_neo4j_ubuntu.sh
+++ b/scripts/install_neo4j_ubuntu.sh
@@ -176,20 +176,26 @@ pip install --upgrade pip
 pip install neo4j openai
 
 # 获取 Neo4j 密码
-NEO4J_PASSWORD="neo4j"
+NEO4J_PASSWORD=""
 RUNNING_CONTAINER=$(docker ps --filter "name=neo4j" --format "{{.Names}}" 2>/dev/null | head -1)
 if [ -n "$RUNNING_CONTAINER" ]; then
-    # 运行中的容器，检查是否已有 auth 文件
-    if docker exec "$RUNNING_CONTAINER" test -f /var/lib/neo4j/data/neo4j.auth 2>/dev/null; then
-        echo "  检测到运行中的 Neo4j 容器: $RUNNING_CONTAINER"
+    echo "  检测到运行中的 Neo4j 容器: $RUNNING_CONTAINER"
+    NEO4J_AUTH=$(docker inspect "$RUNNING_CONTAINER" --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)
     fi
 fi
 
-# 检查之前是否保存过密码
-if [ -f "$PROJECT_DIR/.neo4j_pass" ]; then
+# 如果还是没有获取到，检查保存的文件
+if [ -z "$NEO4J_PASSWORD" ] && [ -f "$PROJECT_DIR/.neo4j_pass" ]; then
     NEO4J_PASSWORD=$(cat "$PROJECT_DIR/.neo4j_pass")
 fi
 
+# 最后保底
+if [ -z "$NEO4J_PASSWORD" ]; then
+    NEO4J_PASSWORD="neo4j"
+fi
+
 # 创建环境变量文件
 cat > .env << EOF
 DEEPSEEK_API_KEY=your-api-key-here