Update sync_data.sh

sync_data.sh

@@ -209,13 +209,14 @@ elif [ "$RESTORE_SOURCE" = "github" ] || [ "$RESTORE_SOURCE" = "auto" ]; then
             mkdir -p /tools
             cp -r "$GITHUB_DATA_DIR/tools"/* /tools/
             echo "GitHub: tools 目录恢复成功"
-            GITHUB_RESTORED=1
             GITHUB_TOOLS_RESTORED=1
         else
             echo "GitHub 仓库中没有 tools 目录或目录为空"
         fi
     else
         echo "跳过 tools 目录恢复（由 GITHUB_BACKUP_TOOLS=false 控制）"
+        # 当 GITHUB_BACKUP_TOOLS=false 时，强制从 WebDAV 恢复 tools
+        GITHUB_TOOLS_RESTORED=0
     fi
     
     # auto 模式的补充恢复逻辑
@@ -225,8 +226,12 @@ elif [ "$RESTORE_SOURCE" = "github" ] || [ "$RESTORE_SOURCE" = "auto" ]; then
             echo "GitHub 中没有找到任何配置，尝试从 WebDAV 恢复..."
             restore_from_webdav || echo "WebDAV 恢复失败，将在同步时重新备份"
         elif [ "$GITHUB_TOOLS_RESTORED" = "0" ]; then
-            # GitHub恢复了config但没有tools，从WebDAV补充恢复tools
-            echo "GitHub 中没有 tools 目录，尝试从 WebDAV 补充恢复..."
+            # GitHub恢复了config但没有tools，或者禁用了GitHub tools备份，从WebDAV恢复tools
+            if [ "$GITHUB_BACKUP_TOOLS" = "false" ]; then
+                echo "GitHub tools 备份已禁用，从 WebDAV 恢复 tools 目录..."
+            else
+                echo "GitHub 中没有 tools 目录，尝试从 WebDAV 补充恢复..."
+            fi
             restore_from_webdav || echo "WebDAV 恢复失败"
         fi
     elif [ "$GITHUB_RESTORED" = "1" ]; then
@@ -264,10 +269,68 @@ sync_data() {
             echo "检查配置文件变化（GitHub 仅备份 config 目录）..."
         fi
         
-        # 创建仓库中的目录
-        mkdir -p ./config
-        if [ "$GITHUB_BACKUP_TOOLS" = "true" ]; then
-            mkdir -p ./tools
+        # 先从GitHub拉取最新状态，实现双向同步
+        echo "从 GitHub 拉取最新状态..."
+        git fetch origin
+        
+        # 检查是否有远程更新
+        LOCAL_COMMIT=$(git rev-parse HEAD)
+        REMOTE_COMMIT=$(git rev-parse origin/$(git branch --show-current))
+        
+        if [ "$LOCAL_COMMIT" != "$REMOTE_COMMIT" ]; then
+            echo "检测到 GitHub 有更新，正在同步..."
+            
+            # 保存本地文件状态
+            TEMP_BACKUP_DIR="$WORK_DIR/local_backup"
+            rm -rf "$TEMP_BACKUP_DIR"
+            mkdir -p "$TEMP_BACKUP_DIR"
+            
+            # 备份本地的config和tools到临时目录
+            if [ -d "/mcp-proxy-server/config" ]; then
+                cp -r "/mcp-proxy-server/config" "$TEMP_BACKUP_DIR/" 2>/dev/null || true
+            fi
+            if [ -d "/tools" ] && [ "$GITHUB_BACKUP_TOOLS" = "true" ]; then
+                cp -r "/tools" "$TEMP_BACKUP_DIR/" 2>/dev/null || true
+            fi
+            
+            # 执行硬重置到远程状态
+            git reset --hard origin/$(git branch --show-current)
+            
+            # 从GitHub更新本地文件
+            if [ -d "./config" ] && [ "$(ls -A ./config 2>/dev/null)" ]; then
+                echo "从 GitHub 更新 config 目录..."
+                mkdir -p /mcp-proxy-server/config
+                cp -r ./config/* /mcp-proxy-server/config/
+            else
+                # 如果GitHub中没有config目录，清空本地config
+                echo "GitHub 中没有 config 目录，清空本地 config..."
+                rm -rf /mcp-proxy-server/config/*
+            fi
+            
+            # 根据GITHUB_BACKUP_TOOLS设置处理tools目录
+            if [ "$GITHUB_BACKUP_TOOLS" = "true" ]; then
+                if [ -d "./tools" ] && [ "$(ls -A ./tools 2>/dev/null)" ]; then
+                    echo "从 GitHub 更新 tools 目录..."
+                    mkdir -p /tools
+                    rm -rf /tools/*  # 清空现有tools
+                    cp -r ./tools/* /tools/
+                else
+                    # 如果GitHub中没有tools目录，清空本地tools
+                    echo "GitHub 中没有 tools 目录，清空本地 tools..."
+                    rm -rf /tools/*
+                fi
+            else
+                # 如果禁用了GitHub tools备份，从WebDAV恢复tools
+                echo "GitHub tools 备份已禁用，从 WebDAV 恢复 tools 目录..."
+                restore_from_webdav || echo "WebDAV 恢复失败"
+            fi
+            
+            echo "GitHub 同步完成"
+            
+            # 清理临时备份
+            rm -rf "$TEMP_BACKUP_DIR"
+        else
+            echo "GitHub 状态已是最新"
         fi
         
         # 同步 config 目录到 GitHub