优化消息提醒

notifications.py

@@ -23,7 +23,9 @@ def add_notification(target_account: str, notif_data: dict):
         "created_at": int(time.time())
     }
     
-    msgs_db = db.load_data("messages.json", default_data={})
-    if target_account not in msgs_db: msgs_db[target_account] = []
-    msgs_db[target_account].insert(0, notif)
-    db.save_data("messages.json", msgs_db)
+    def updater(data):
+        if target_account not in data:
+            data[target_account] = []
+        data[target_account].insert(0, notif)
+    
+    db.atomic_update("messages.json", updater, default_data={})

router_messages.py

@@ -202,65 +202,84 @@ async def get_chat_history(account: str, target_account: str):
 
 # ==========================================
 # 改造：获取通知列表 (加入系统公告懒加载注入)
+# 使用 atomic_update 避免并发覆盖问题
 # ==========================================
 @router.get("/api/messages/{account}")
 async def get_messages(account: str):
-    msgs_db = db.load_data("messages.json", default_data={})
-    user_msgs = msgs_db.get(account, [])
-    
-    # --- 核心改造区：瞬间比对并注入全局公告 ---
+    # 公告是只读的，在 atomic_update 外加载
     announcements_db = db.load_data("announcements.json", default_data=[])
-    user_msg_ids = {m.get("id") for m in user_msgs}
     
-    injected = False
-    for ann in announcements_db:
-        if ann.get("id") not in user_msg_ids:
-            new_sys_msg = dict(ann) 
-            new_sys_msg["is_read"] = False
-            new_sys_msg["receiver"] = account
-            user_msgs.append(new_sys_msg)
-            injected = True
-            
-    if injected:
-        # 重新按照时间倒序排列，让新公告置顶
-        user_msgs.sort(key=lambda x: x.get("created_at", 0), reverse=True)
-    # ----------------------------------------
+    result_container = [None]
     
-    now = int(time.time())
-    seven_days = 7 * 24 * 3600
-    valid = []
-    
-    # 如果注入了新公告，则判定为需要回写数据库保存
-    modified = injected 
-    
-    for m in user_msgs:
-        if not m.get("is_read") or (now - m.get("created_at", 0) < seven_days):
-            valid.append(m)
-        else:
-            modified = True
+    def updater(data):
+        user_msgs = data.get(account, [])
+        
+        # --- 核心改造区：瞬间比对并注入全局公告 ---
+        user_msg_ids = {m.get("id") for m in user_msgs}
+        
+        injected = False
+        for ann in announcements_db:
+            if ann.get("id") not in user_msg_ids:
+                new_sys_msg = dict(ann)
+                new_sys_msg["is_read"] = False
+                new_sys_msg["receiver"] = account
+                user_msgs.append(new_sys_msg)
+                injected = True
+        
+        if injected:
+            # 重新按照时间倒序排列，让新公告置顶
+            user_msgs.sort(key=lambda x: x.get("created_at", 0), reverse=True)
+        # ----------------------------------------
+        
+        now = int(time.time())
+        seven_days = 7 * 24 * 3600
+        valid = []
+        
+        # 如果注入了新公告，则判定为需要回写数据库保存
+        modified = injected
+        
+        for m in user_msgs:
+            if not m.get("is_read") or (now - m.get("created_at", 0) < seven_days):
+                valid.append(m)
+            else:
+                modified = True
             
-    if modified:
-        msgs_db[account] = valid
-        db.save_data("messages.json", msgs_db)
+            # 本次访问即为已读 - 将所有未读消息标记为已读
+            if not m.get("is_read"):
+                m["is_read"] = True
+                modified = True
         
-    return {
-        "status": "success", 
-        "data": valid, 
-        "unread_count": sum(1 for m in valid if not m.get("is_read"))
-    }
+        # 原地修改 data，atomic_update 会自动保存
+        data[account] = valid
+        
+        # 通过闭包返回结果
+        result_container[0] = {
+            "status": "success",
+            "data": valid,
+            "unread_count": 0  # 🔥 修复：用户已查看消息列表，未读数设为0
+        }
+    
+    db.atomic_update("messages.json", updater, default_data={})
+    
+    return result_container[0]
 
 @router.post("/api/messages/{account}/read")
 async def mark_messages_read(account: str):
-    msgs_db = db.load_data("messages.json", default_data={})
-    user_msgs = msgs_db.get(account, [])
-    modified = False
-    for m in user_msgs:
-        if not m.get("is_read"):
-            m["is_read"] = True
-            modified = True
-            
-    if modified:
-        msgs_db[account] = user_msgs
-        db.save_data("messages.json", msgs_db)
+    """
+    标记消息为已读（原子操作，并发安全）
+    """
+    def updater(data):
+        user_msgs = data.get(account, [])
+        modified = False
+        for m in user_msgs:
+            if not m.get("is_read"):
+                m["is_read"] = True
+                modified = True
         
+        # 原地修改 data，atomic_update 会自动保存
+        if modified:
+            data[account] = user_msgs
+    
+    db.atomic_update("messages.json", updater, default_data={})
+    
     return {"status": "success"}

router_tasks.py

@@ -15,7 +15,7 @@ from fastapi import APIRouter, HTTPException, Depends, Query
 from sqlalchemy.orm import Session
 from models import TaskCreate, TaskUpdate, TaskApply, TaskAssign, TaskSubmit, TaskAccept
 import 数据库连接 as db
-from 安全认证 import require_auth
+from 安全认证 import require_auth, is_admin
 from notifications import add_notification
 from database_sql import get_db
 from models_sql import Wallet, Transaction
@@ -846,8 +846,7 @@ async def accept_task(task_id: str, is_accepted: bool, feedback: str = None, cur
 # ==========================================
 # ⚖️ 申诉仲裁系统
 # ==========================================
-import os
-ADMIN_ACCOUNTS = [a.strip() for a in os.getenv("ADMIN_ACCOUNTS", "admin").split(",")]
+
 
 @router.post("/api/tasks/{task_id}/dispute")
 async def create_dispute(task_id: str, reason: str, evidence: list = None, current_user: str = Depends(require_auth)):
@@ -1000,7 +999,7 @@ async def get_admin_disputes(status: str = None, current_user: str = Depends(req
     管理员获取申诉列表
     - status: pending/responded/resolved
     """
-    if current_user not in ADMIN_ACCOUNTS:
+    if not is_admin(current_user):
         raise HTTPException(status_code=403, detail="需要管理员权限")
     
     disputes_db = db.load_data("disputes.json", default_data=[])
@@ -1038,7 +1037,7 @@ async def resolve_dispute(dispute_id: str, resolution: str, ratio: int = None, n
     - ratio: 分成比例(0-100)，表示申诉方获得的比例。仅split时有效
     - note: 裁决说明
     """
-    if current_user not in ADMIN_ACCOUNTS:
+    if not is_admin(current_user):
         raise HTTPException(status_code=403, detail="需要管理员权限")
     
     if resolution not in ["favor_initiator", "favor_respondent", "split"]: