Update sync_data.sh

sync_data.sh

@@ -1,17 +1,19 @@
 #!/bin/bash
 # ==============================================================================
-# landppt 多源备份脚本 (完整逻辑版)
-# 修复: 竞态条件(数据覆盖问题) + WAL模式支持 + Curl重构
+# landppt 完整诊断版
+# 功能: 1. 完整备份/恢复(S3+WebDAV) 2. 修复WAL/启动顺序 3. 新增配置文件监控日志
 # ==============================================================================
 
 DATA_DIR="."
 DB_FILE="landppt.db"
+# 定义要监控和备份的配置文件
+CONFIG_FILES=".env"
+
 SYNC_INTERVAL="${SYNC_INTERVAL:-600}"
 BACKUP_KEEP="${BACKUP_KEEP:-24}"
 TIMEOUT_RESTORE="120"
 TIMEOUT_CMD="180"
 
-# S3 区域设置
 S3_REGION="${S3_REGION:-auto}"
 S3_2_REGION="${S3_2_REGION:-auto}"
 
@@ -27,12 +29,11 @@ run_with_timeout() {
     fi
 }
 
-# ----------------- 检查函数 -----------------
+# ----------------- 基础工具函数 (完整保留) -----------------
 has_webdav() { [[ -n "$WEBDAV_URL" && -n "$WEBDAV_USERNAME" && -n "$WEBDAV_PASSWORD" ]]; }
 has_s3()     { [[ -n "$S3_ENDPOINT_URL" && -n "$S3_BUCKET" && -n "$S3_ACCESS_KEY_ID" ]]; }
 has_s3_2()   { [[ -n "$S3_2_ENDPOINT_URL" && -n "$S3_2_BUCKET" && -n "$S3_2_ACCESS_KEY_ID" ]]; }
 
-# ----------------- WebDAV 工具函数 -----------------
 get_webdav_url() {
     local file="$1"
     local base="${WEBDAV_URL%/}"
@@ -60,13 +61,11 @@ download_webdav_file() {
         -o "$dl_path" "$(get_webdav_url "$file")"
 }
 
-# ----------------- S3 工具函数 -----------------
 get_s3_latest_name() {
     local ENDPOINT="$1" BUCKET="$2" ACCESS="$3" SECRET="$4" REGION="$5"
     export AWS_ACCESS_KEY_ID="$ACCESS"
     export AWS_SECRET_ACCESS_KEY="$SECRET"
     export AWS_DEFAULT_REGION="$REGION"
-    
     run_with_timeout 30 aws --endpoint-url "$ENDPOINT" --region "$REGION" s3 ls "s3://$BUCKET/" 2>/dev/null \
         | awk '{print $4}' | grep 'landppt_backup_.*\.tar\.gz$' | sort | tail -n 1
 }
@@ -77,7 +76,6 @@ download_s3_file() {
     export AWS_ACCESS_KEY_ID="$ACCESS"
     export AWS_SECRET_ACCESS_KEY="$SECRET"
     export AWS_DEFAULT_REGION="$REGION"
-    
     rm -f "$DL_PATH"
     if run_with_timeout "$TIMEOUT_RESTORE" aws --endpoint-url "$ENDPOINT" --region "$REGION" s3 cp "s3://$BUCKET/$FILE" "$DL_PATH" --quiet; then
         [ -s "$DL_PATH" ] && return 0
@@ -85,23 +83,23 @@ download_s3_file() {
     return 1
 }
 
-# ----------------- 解压工具 (修复数据不全问题) -----------------
-extract_db() {
+# ----------------- 解压/打包逻辑 -----------------
+
+extract_data() {
     local tar_path="$1"
     mkdir -p "$DATA_DIR"
     
     # 尝试解压
     if tar -xzf "$tar_path" -C "$DATA_DIR" 2>/dev/null; then
-        # 检查解压结果 (包含 .db, .db-shm, .db-wal)
+        # 验证数据库
         if ls "$DATA_DIR"/landppt.db* 1> /dev/null 2>&1; then
             return 0
         fi
         
-        # 兼容旧逻辑：如果解压后在子目录或名字不对，尝试查找移动
+        # 兼容旧路径查找
         local found=$(find "$DATA_DIR" -name "landppt.db" -type f | head -n 1)
         if [ -n "$found" ] && [ "$found" != "$DATA_DIR/$DB_FILE" ]; then
             mv "$found" "$DATA_DIR/$DB_FILE"
-            # 尝试移动关联文件
             [ -f "${found}-shm" ] && mv "${found}-shm" "$DATA_DIR/${DB_FILE}-shm"
             [ -f "${found}-wal" ] && mv "${found}-wal" "$DATA_DIR/${DB_FILE}-wal"
             return 0
@@ -111,37 +109,30 @@ extract_db() {
 }
 
 # ==============================================================================
-# 阶段 1: 恢复流程 (前台运行，阻塞应用启动)
+# 阶段 1: 恢复流程 (阻塞应用启动)
 # ==============================================================================
 
-log ">>> 开始初始化检查 (同步模式)..."
+log ">>> 启动初始化检查..."
 
 if [ -f "$DATA_DIR/$DB_FILE" ] && [ -s "$DATA_DIR/$DB_FILE" ]; then
     log "本地数据库已存在，跳过恢复。"
 else
-    log "检查所有备份源..."
     CANDIDATES_FILE="/tmp/backup_candidates.txt"
     > "$CANDIDATES_FILE"
 
-    # 1. 检查 S3 (主)
     if has_s3; then
-        F_S3=$(get_s3_latest_name "$S3_ENDPOINT_URL" "$S3_BUCKET" "$S3_ACCESS_KEY_ID" "$S3_SECRET_ACCESS_KEY" "$S3_REGION")
-        [ -n "$F_S3" ] && echo "$F_S3 S3_MAIN" >> "$CANDIDATES_FILE" && log "发现 S3(主): $F_S3"
+        F=$(get_s3_latest_name "$S3_ENDPOINT_URL" "$S3_BUCKET" "$S3_ACCESS_KEY_ID" "$S3_SECRET_ACCESS_KEY" "$S3_REGION")
+        [ -n "$F" ] && echo "$F S3_MAIN" >> "$CANDIDATES_FILE" && log "发现 S3(主): $F"
     fi
-
-    # 2. 检查 S3 (备)
     if has_s3_2; then
-        F_S3_2=$(get_s3_latest_name "$S3_2_ENDPOINT_URL" "$S3_2_BUCKET" "$S3_2_ACCESS_KEY_ID" "$S3_2_SECRET_ACCESS_KEY" "$S3_2_REGION")
-        [ -n "$F_S3_2" ] && echo "$F_S3_2 S3_SEC" >> "$CANDIDATES_FILE" && log "发现 S3(备): $F_S3_2"
+        F=$(get_s3_latest_name "$S3_2_ENDPOINT_URL" "$S3_2_BUCKET" "$S3_2_ACCESS_KEY_ID" "$S3_2_SECRET_ACCESS_KEY" "$S3_2_REGION")
+        [ -n "$F" ] && echo "$F S3_SEC" >> "$CANDIDATES_FILE" && log "发现 S3(备): $F"
     fi
-
-    # 3. ���查 WebDAV
     if has_webdav; then
-        F_DAV=$(get_webdav_latest_name)
-        [ -n "$F_DAV" ] && echo "$F_DAV WEBDAV" >> "$CANDIDATES_FILE" && log "发现 WebDAV: $F_DAV"
+        F=$(get_webdav_latest_name)
+        [ -n "$F" ] && echo "$F WEBDAV" >> "$CANDIDATES_FILE" && log "发现 WebDAV: $F"
     fi
 
-    # 决策
     BEST_LINE=$(sort -r "$CANDIDATES_FILE" | head -n 1)
     
     if [ -n "$BEST_LINE" ]; then
@@ -149,25 +140,19 @@ else
         SOURCE_TYPE=$(echo "$BEST_LINE" | awk '{print $2}')
         DL_FILE="/tmp/restore.tar.gz"
         
-        log ">>> 使用最新备份: $TARGET_FILE (来源: $SOURCE_TYPE)"
+        log ">>> 正在恢复: $TARGET_FILE (来源: $SOURCE_TYPE)"
         SUCCESS=0
         
         case "$SOURCE_TYPE" in
-            "S3_MAIN")
-                download_s3_file "$S3_ENDPOINT_URL" "$S3_BUCKET" "$S3_ACCESS_KEY_ID" "$S3_SECRET_ACCESS_KEY" "$S3_REGION" "$TARGET_FILE" "$DL_FILE" && SUCCESS=1
-                ;;
-            "S3_SEC")
-                download_s3_file "$S3_2_ENDPOINT_URL" "$S3_2_BUCKET" "$S3_2_ACCESS_KEY_ID" "$S3_2_SECRET_ACCESS_KEY" "$S3_2_REGION" "$TARGET_FILE" "$DL_FILE" && SUCCESS=1
-                ;;
-            "WEBDAV")
-                download_webdav_file "$TARGET_FILE" "$DL_FILE" && SUCCESS=1
-                ;;
+            "S3_MAIN") download_s3_file "$S3_ENDPOINT_URL" "$S3_BUCKET" "$S3_ACCESS_KEY_ID" "$S3_SECRET_ACCESS_KEY" "$S3_REGION" "$TARGET_FILE" "$DL_FILE" && SUCCESS=1 ;;
+            "S3_SEC")  download_s3_file "$S3_2_ENDPOINT_URL" "$S3_2_BUCKET" "$S3_2_ACCESS_KEY_ID" "$S3_2_SECRET_ACCESS_KEY" "$S3_2_REGION" "$TARGET_FILE" "$DL_FILE" && SUCCESS=1 ;;
+            "WEBDAV")  download_webdav_file "$TARGET_FILE" "$DL_FILE" && SUCCESS=1 ;;
         esac
         
-        if [ $SUCCESS -eq 1 ] && extract_db "$DL_FILE"; then
-            log "✅ 恢复成功！数据已就绪。"
+        if [ $SUCCESS -eq 1 ] && extract_data "$DL_FILE"; then
+            log "✅ 恢复成功！"
         else
-            log "❌ 恢复失败: 下载或解压出错"
+            log "❌ 恢复失败"
         fi
         rm -f "$DL_FILE"
     else
@@ -176,61 +161,84 @@ else
     rm -f "$CANDIDATES_FILE"
 fi
 
-log ">>> 初始化结束，允许应用启动。"
+log ">>> 初始化结束，应用正在启动..."
 
 # ==============================================================================
-# 阶段 2: 后台备份循环
+# 阶段 2: 后台备份循环 (含诊断日志)
 # ==============================================================================
 (
-    # 延时 60s 启动备份循环，避免与应用启动争抢资源
     sleep 60
-    
     while true; do
+        
+        # --- 🔎 诊断部分开始 ---
+        log "--- 开始周期性检查 ---"
+        if [ -f "$DATA_DIR/.env" ]; then
+            if command -v stat >/dev/null; then
+                F_INFO=$(stat -c "%y (大小: %s)" "$DATA_DIR/.env")
+            else
+                F_INFO="存在"
+            fi
+            log "🔎 发现 .env 文件: $F_INFO"
+            
+            # 检查是否有内容变化 (仅检查 key 是否存在，不泄露 key)
+            if grep -q "API_KEY" "$DATA_DIR/.env"; then
+                log "🔎 .env 文件包含 API_KEY 配置项"
+            else
+                log "⚠️ .env 文件可能为空或未包含 API_KEY"
+            fi
+        else
+            log "⚠️ .env 文件不存在"
+        fi
+        # --- 🔎 诊断部分结束 ---
+
+        # 只要存在数据库文件，就执行备份
         if [ -f "$DATA_DIR/$DB_FILE" ]; then
             TS=$(date +%Y%m%d_%H%M%S)
             BACKUP_NAME="landppt_backup_${TS}.tar.gz"
             TMP_BAK="/tmp/$BACKUP_NAME"
             
-            # --- 打包 (支持 WAL 文件) ---
-            # 关键修复: 备份所有 landppt.db* 文件 (包括 -wal 和 -shm)
-            # 使用 cd 避免路径前缀问题
-            (cd "$DATA_DIR" && tar -czf "$TMP_BAK" landppt.db* 2>/dev/null)
+            # --- 打包 (包含 .env 如果存在) ---
+            (
+                cd "$DATA_DIR"
+                # 动态构建文件列表：数据库文件 + 存在的配置文件
+                FILES="landppt.db*"
+                for cf in $CONFIG_FILES; do
+                    [ -f "$cf" ] && FILES="$FILES $cf"
+                done
+                
+                # 执行打包，忽略 "file changed" 警告
+                tar -czf "$TMP_BAK" $FILES >/dev/null 2>&1 || [ $? -eq 1 ]
+            )
             
-            # --- 1. WebDAV 备份 + 清理 ---
+            # --- 1. WebDAV 备份 ---
             if has_webdav; then
                 UPLOAD_URL=$(get_webdav_url "$BACKUP_NAME")
                 if run_with_timeout "$TIMEOUT_CMD" curl -s -f --connect-timeout 15 \
                     -u "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" \
                     -T "$TMP_BAK" "$UPLOAD_URL" >/dev/null 2>&1; then
                     
-                    # WebDAV 清理逻辑
+                    # WebDAV 清理
                     LIST_URL=$(get_webdav_url "")
                     ALL_FILES=$(curl -s -X PROPFIND -H "Depth: 1" -u "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" --connect-timeout 15 "$LIST_URL" \
                         | grep -o 'landppt_backup_[0-9_]*\.tar\.gz' | sort -u | sort)
-                    
                     COUNT=$(echo "$ALL_FILES" | grep -c .)
                     if [ "$COUNT" -gt "$BACKUP_KEEP" ]; then
                         DEL_COUNT=$(($COUNT - $BACKUP_KEEP))
                         echo "$ALL_FILES" | head -n "$DEL_COUNT" | while read -r F; do
-                            if [ -n "$F" ]; then
-                                DEL_URL=$(get_webdav_url "$F")
-                                curl -s -X DELETE -u "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" "$DEL_URL" >/dev/null 2>&1
-                            fi
+                            [ -n "$F" ] && curl -s -X DELETE -u "$WEBDAV_USERNAME:$WEBDAV_PASSWORD" "$(get_webdav_url "$F")" >/dev/null 2>&1
                         done
                     fi
-                else
-                    log "WebDAV 上传失败"
                 fi
             fi
             
-            # --- 2. S3 (主) 备份 + 清理 ---
+            # --- 2. S3 (主) 备份 ---
             if has_s3; then
                 export AWS_ACCESS_KEY_ID="$S3_ACCESS_KEY_ID"
                 export AWS_SECRET_ACCESS_KEY="$S3_SECRET_ACCESS_KEY"
                 export AWS_DEFAULT_REGION="$S3_REGION"
                 
                 if run_with_timeout "$TIMEOUT_CMD" aws --endpoint-url "$S3_ENDPOINT_URL" --region "$S3_REGION" s3 cp "$TMP_BAK" "s3://$S3_BUCKET/$BACKUP_NAME" --quiet >/dev/null 2>&1; then
-                    # S3 清理逻辑
+                    # S3 清理
                     FILES=$(aws --endpoint-url "$S3_ENDPOINT_URL" --region "$S3_REGION" s3 ls "s3://$S3_BUCKET/" 2>/dev/null | awk '{print $4}' | grep 'landppt_backup_' | sort)
                     COUNT=$(echo "$FILES" | grep -c .)
                     if [ "$COUNT" -gt "$BACKUP_KEEP" ]; then
@@ -239,19 +247,16 @@ log ">>> 初始化结束，允许应用启动。"
                             [ -n "$F" ] && aws --endpoint-url "$S3_ENDPOINT_URL" --region "$S3_REGION" s3 rm "s3://$S3_BUCKET/$F" --quiet
                         done
                     fi
-                else
-                    log "S3(主) 上传失败"
                 fi
             fi
 
-            # --- 3. S3 (备) 备份 + 清理 (可选) ---
+            # --- 3. S3 (备) 备份 ---
             if has_s3_2; then
                 export AWS_ACCESS_KEY_ID="$S3_2_ACCESS_KEY_ID"
                 export AWS_SECRET_ACCESS_KEY="$S3_2_SECRET_ACCESS_KEY"
                 export AWS_DEFAULT_REGION="$S3_2_REGION"
-                
-                if run_with_timeout "$TIMEOUT_CMD" aws --endpoint-url "$S3_2_ENDPOINT_URL" --region "$S3_2_REGION" s3 cp "$TMP_BAK" "s3://$S3_2_BUCKET/$BACKUP_NAME" --quiet >/dev/null 2>&1; then
-                     # S3 清理逻辑
+                run_with_timeout "$TIMEOUT_CMD" aws --endpoint-url "$S3_2_ENDPOINT_URL" --region "$S3_2_REGION" s3 cp "$TMP_BAK" "s3://$S3_2_BUCKET/$BACKUP_NAME" --quiet >/dev/null 2>&1
+                   # S3 清理逻辑
                     FILES=$(aws --endpoint-url "$S3_2_ENDPOINT_URL" --region "$S3_2_REGION" s3 ls "s3://$S3_2_BUCKET/" 2>/dev/null | awk '{print $4}' | grep 'landppt_backup_' | sort)
                     COUNT=$(echo "$FILES" | grep -c .)
                     if [ "$COUNT" -gt "$BACKUP_KEEP" ]; then
@@ -266,12 +271,10 @@ log ">>> 初始化结束，允许应用启动。"
             fi
             
             rm -f "$TMP_BAK"
-            log "备份周期完成: $BACKUP_NAME"
+            log "备份完成: $BACKUP_NAME"
         fi
-        
         sleep "$SYNC_INTERVAL"
     done
 ) &
 
-# 退出脚本，允许 Docker 继续执行 CMD 启动应用
-exit 0
+exit 0```