From 43474c43950fa04e7d1054d17dd88da34109f86b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=AC=E5=8F=B8git?= <240241002@qq.com>
Date: Fri, 8 May 2026 10:28:25 +0800
Subject: [PATCH] =?UTF-8?q?```=20feat(app):=20=E6=B7=BB=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=87=8D=E8=AF=95=E6=9C=BA=E5=88=B6=E6=8F=90?=
 =?UTF-8?q?=E9=AB=98=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E7=A8=B3=E5=AE=9A?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 引入run_db_operation_with_retries函数处理临时性数据库错误
- 在定时任务中对订单查询操作添加重试逻辑
- 对数据库连接参数进行优化配置
- 增加适当的日志记录便于问题排查
```
---
 app.py    | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 config.py |  5 ++++-
 2 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/app.py b/app.py
index f0cd589..10bf0cb 100644
--- a/app.py
+++ b/app.py
@@ -7,6 +7,7 @@ from blueprints.admin import admin_bp
 from blueprints.payment import payment_bp
 from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.triggers.interval import IntervalTrigger
+from sqlalchemy.exc import InterfaceError, OperationalError
 import threading
 import time
 import logging
@@ -14,6 +15,33 @@ import logging
 # 导入模律（必需在 db.create_all() 之前导入）
 import models
 
+TRANSIENT_DB_ERRORS = (OperationalError, InterfaceError)
+DB_RETRY_FAILED = object()
+
+def run_db_operation_with_retries(operation, retries=3, delay=2, operation_name="数据库操作", failure_value=DB_RETRY_FAILED):
+    """Retry short-lived DB operations while PostgreSQL is restarting."""
+    last_error = None
+    for attempt in range(1, retries + 1):
+        try:
+            return operation()
+        except TRANSIENT_DB_ERRORS as e:
+            last_error = e
+            db.session.rollback()
+            db.engine.dispose()
+            if attempt < retries:
+                logging.warning(
+                    "%s失败，数据库可能正在重启，%s秒后重试(%s/%s): %s",
+                    operation_name,
+                    delay,
+                    attempt,
+                    retries,
+                    str(e),
+                )
+                time.sleep(delay)
+
+    logging.warning("%s失败，已跳过本轮: %s", operation_name, str(last_error))
+    return failure_value
+
 # 定时任务函数
 def sync_pending_orders(app):
     """定时任务: 检查并同步30分钟内的待支付订单"""
@@ -26,10 +54,15 @@ def sync_pending_orders(app):
         try:
             # 查询最还30分钟内的待支付订单
             thirty_min_ago = get_bj_now() - timedelta(minutes=30)
-            pending_orders = Order.query.filter(
-                Order.status == 'PENDING',
-                Order.created_at >= thirty_min_ago
-            ).all()
+            pending_orders = run_db_operation_with_retries(
+                lambda: Order.query.filter(
+                    Order.status == 'PENDING',
+                    Order.created_at >= thirty_min_ago
+                ).all(),
+                operation_name="定时任务查询待支付订单"
+            )
+            if pending_orders is DB_RETRY_FAILED:
+                return
             
             if not pending_orders:
                 return
@@ -69,6 +102,15 @@ def sync_pending_orders(app):
                             elif order_locked and order_locked.status == 'PAID':
                                 # 订单已经被处理，跳过
                                 logging.info(f"定时任务-订单 {order.out_trade_no} 已被处理，跳过")
+                except TRANSIENT_DB_ERRORS as e:
+                    db.session.rollback()
+                    db.engine.dispose()
+                    logging.warning(
+                        "定时任务处理订单 %s 时数据库暂时不可用，跳过本轮: %s",
+                        order.out_trade_no,
+                        str(e),
+                    )
+                    return
                 except Exception as e:
                     # Redis lock error or other errors
                     if "LockError" in str(e) or "BlockingIOError" in str(e):
@@ -80,6 +122,10 @@ def sync_pending_orders(app):
             if updated_count > 0:
                 logging.info(f"定时任务完成，帮助更新了{updated_count}个订单")
         
+        except TRANSIENT_DB_ERRORS as e:
+            db.session.rollback()
+            db.engine.dispose()
+            logging.warning(f"定时任务数据库暂时不可用，跳过本轮: {str(e)}")
         except Exception as e:
             logging.error(f"定时任务异常: {str(e)}", exc_info=True)
 
@@ -196,8 +242,16 @@ def create_app():
     # 自动创建数据库表
     with app.app_context():
         print("🔧 正在检查并创建数据库表...")
-        db.create_all()
-        print("✅ 数据库表已就绪")
+        create_all_result = run_db_operation_with_retries(
+            db.create_all,
+            retries=5,
+            delay=3,
+            operation_name="启动时创建数据库表"
+        )
+        if create_all_result is DB_RETRY_FAILED:
+            print("⚠️  数据库暂时不可用，跳过启动时建表检查")
+        else:
+            print("✅ 数据库表已就绪")
         
         # 创建并启动定时任务调度器
         try:
diff --git a/config.py b/config.py
index 06ea9b4..3c3eb4d 100644
--- a/config.py
+++ b/config.py
@@ -10,7 +10,10 @@ class Config:
     SQLALCHEMY_ENGINE_OPTIONS = {
         "pool_pre_ping": True,
         "pool_recycle": 1800,
-        "pool_timeout": 30
+        "pool_timeout": 30,
+        "connect_args": {
+            "connect_timeout": 5
+        }
     }
     
     # Redis 配置