优化、排除bug

notifications.py

@@ -3,29 +3,33 @@ import uuid
 import 数据库连接 as db
 
 def add_notification(target_account: str, notif_data: dict):
-    from_user = notif_data.get("from_user")
-    if target_account == from_user or not target_account: 
-        return # 不给自己发通知
-    
-    users_db = db.load_data("users.json", default_data={})
-    user_info = users_db.get(from_user, {})
-    
-    notif = {
-        "id": f"msg_{int(time.time())}_{uuid.uuid4().hex[:6]}",
-        "type": notif_data.get("type"), 
-        "from_user": from_user,
-        "from_name": user_info.get("name", from_user),
-        "from_avatar": user_info.get("avatarDataUrl", ""),
-        "target_item_id": notif_data.get("target_item_id", ""),
-        "target_item_title": notif_data.get("target_item_title", ""),
-        "content": notif_data.get("content", ""),
-        "is_read": False,
-        "created_at": int(time.time())
-    }
-    
-    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={})
+    try:
+        from_user = notif_data.get("from_user")
+        if target_account == from_user or not target_account: 
+            return # 不给自己发通知
+        
+        users_db = db.load_data("users.json", default_data={})
+        user_info = users_db.get(from_user, {})
+        
+        notif = {
+            "id": f"msg_{int(time.time())}_{uuid.uuid4().hex[:6]}",
+            "type": notif_data.get("type"), 
+            "from_user": from_user,
+            "from_name": user_info.get("name", from_user),
+            "from_avatar": user_info.get("avatarDataUrl", ""),
+            "target_item_id": notif_data.get("target_item_id", ""),
+            "target_item_title": notif_data.get("target_item_title", ""),
+            "content": notif_data.get("content", ""),
+            "is_read": False,
+            "created_at": int(time.time())
+        }
+        
+        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={})
+    except Exception as e:
+        print(f"⚠️ 通知发送失败 (target={target_account}): {e}")
+        # 不抛出异常，让主流程继续

router_items.py

@@ -175,66 +175,84 @@ async def update_item(item_id: str, update_data: ItemUpdate, current_user: str =
     更新内容接口
     🔒 P0安全修复：使用 JWT Token 验证用户身份，而非前端传入的 author 参数
     🔄 P7后悔模式：价格修改延迟24小时生效
+    🔧 Bug修复：使用 atomic_update 避免并发竞态条件
     """
     if update_data.price is not None:
         update_data.price = int(update_data.price)
         if update_data.price < 0:
             raise HTTPException(status_code=400, detail="🚨 安全拦截：商品价格不能为负数")
-            
-    items_db = db.load_data("items.json", default_data=[])
-    for item in items_db:
-        if item["id"] == item_id:
-            # 🔒 P0安全修复：使用 JWT 解析出的真实用户账号进行校验
-            if item.get("author") != current_user: 
-                raise HTTPException(status_code=403, detail="无权修改他人发布的内容")
-            
-            price_change_info = None
-            
-            if update_data.title is not None: item["title"] = update_data.title
-            if update_data.shortDesc is not None: item["shortDesc"] = update_data.shortDesc
-            if update_data.fullDesc is not None: item["fullDesc"] = update_data.fullDesc
-            if update_data.link is not None: item["link"] = update_data.link
-            if update_data.coverUrl is not None: item["coverUrl"] = update_data.coverUrl
-            if update_data.imageUrls is not None: item["imageUrls"] = update_data.imageUrls  # 🖼️ 效果展示图列表
-            
-            # 🔄 P7后悔模式：价格修改延迟24小时生效
-            if update_data.price is not None:
-                current_price = item.get("price", 0)
-                new_price = update_data.price
+    
+    result_holder = {}
+    
+    def updater(items_db):
+        for item in items_db:
+            if item["id"] == item_id:
+                # 🔒 P0安全修复：使用 JWT 解析出的真实用户账号进行校验
+                if item.get("author") != current_user:
+                    result_holder["error"] = "forbidden"
+                    return False
                 
-                if current_price != new_price:
-                    # 设置待生效价格，24小时后生效
-                    import datetime
-                    effective_time = datetime.datetime.now() + datetime.timedelta(hours=24)
-                    item["pending_price"] = new_price
-                    item["pending_price_effective_at"] = effective_time.isoformat()
-                    price_change_info = {
-                        "current_price": current_price,
-                        "new_price": new_price,
-                        "effective_at": effective_time.isoformat()
-                    }
-                    # 不立即修改 price，等待24小时后生效
-                else:
-                    # 价格未变，清除待生效价格
-                    item["pending_price"] = None
-                    item["pending_price_effective_at"] = None
-            
-            if update_data.github_token is not None: item["github_token"] = update_data.github_token 
-            if update_data.netdisk_password is not None: item["netdisk_password"] = update_data.netdisk_password  # ☁️
-            if update_data.is_netdisk is not None: item["is_netdisk"] = update_data.is_netdisk  # ☁️
-            if update_data.is_original is not None: item["is_original"] = update_data.is_original  # 🎨
-            
-            db.save_data("items.json", items_db)
-            # 🗂️ 清除排序缓存
-            sort_cache.invalidate("items:")
-            
-            result = {"status": "success"}
-            if price_change_info:
-                result["price_change"] = price_change_info
-                result["message"] = f"价格将于24小时后从{current_price}调整为{new_price}积分"
-            return result
-            
-    raise HTTPException(status_code=404, detail="找不到该内容记录")
+                price_change_info = None
+                
+                if update_data.title is not None: item["title"] = update_data.title
+                if update_data.shortDesc is not None: item["shortDesc"] = update_data.shortDesc
+                if update_data.fullDesc is not None: item["fullDesc"] = update_data.fullDesc
+                if update_data.link is not None: item["link"] = update_data.link
+                if update_data.coverUrl is not None: item["coverUrl"] = update_data.coverUrl
+                if update_data.imageUrls is not None: item["imageUrls"] = update_data.imageUrls  # 🖼️ 效果展示图列表
+                
+                # 🔄 P7后悔模式：价格修改延迟24小时生效
+                if update_data.price is not None:
+                    current_price = item.get("price", 0)
+                    new_price = update_data.price
+                    
+                    if current_price != new_price:
+                        # 设置待生效价格，24小时后生效
+                        import datetime
+                        effective_time = datetime.datetime.now() + datetime.timedelta(hours=24)
+                        item["pending_price"] = new_price
+                        item["pending_price_effective_at"] = effective_time.isoformat()
+                        price_change_info = {
+                            "current_price": current_price,
+                            "new_price": new_price,
+                            "effective_at": effective_time.isoformat()
+                        }
+                        # 不立即修改 price，等待24小时后生效
+                    else:
+                        # 价格未变，清除待生效价格
+                        item["pending_price"] = None
+                        item["pending_price_effective_at"] = None
+                
+                if update_data.github_token is not None: item["github_token"] = update_data.github_token 
+                if update_data.netdisk_password is not None: item["netdisk_password"] = update_data.netdisk_password  # ☁️
+                if update_data.is_netdisk is not None: item["is_netdisk"] = update_data.is_netdisk  # ☁️
+                if update_data.is_original is not None: item["is_original"] = update_data.is_original  # 🎨
+                
+                result_holder["success"] = True
+                result_holder["price_change_info"] = price_change_info
+                result_holder["current_price"] = price_change_info.get("current_price") if price_change_info else None
+                result_holder["new_price"] = price_change_info.get("new_price") if price_change_info else None
+                return True
+        
+        result_holder["error"] = "not_found"
+        return False
+    
+    db.atomic_update("items.json", updater, default_data=[])
+    
+    if result_holder.get("error") == "forbidden":
+        raise HTTPException(status_code=403, detail="无权修改他人发布的内容")
+    if result_holder.get("error") == "not_found":
+        raise HTTPException(status_code=404, detail="找不到该内容记录")
+    
+    # 🗂️ 清除排序缓存
+    sort_cache.invalidate("items:")
+    
+    result = {"status": "success"}
+    if result_holder.get("price_change_info"):
+        price_change_info = result_holder["price_change_info"]
+        result["price_change"] = price_change_info
+        result["message"] = f"价格将于24小时后从{price_change_info['current_price']}调整为{price_change_info['new_price']}积分"
+    return result
 
 # ==========================================
 # 🚀 定时任务接口：检查 GitHub 仓库最新版本
@@ -316,34 +334,49 @@ async def get_item_version(item_id: str):
 async def delete_item(item_id: str, current_user: str = Depends(require_auth)):
     """
     删除内容（仅作者或管理员可操作）
+    🔧 Bug修复：使用 atomic_update 避免并发竞态条件
     """
-    items_db = db.load_data("items.json", default_data=[])
-    comments_db = db.load_data("comments.json", default_data={})
+    result_holder = {}
     
-    for i, item in enumerate(items_db):
-        if item["id"] == item_id:
-            # 🔒 权限检查：仅作者或管理员可删除
-            if not check_ownership(item, current_user, owner_field="author", allow_admin=True):
-                raise HTTPException(status_code=403, detail="无权删除他人发布的内容")
-            
-            # 1. 从 items.json 中删除该条目
-            items_db.pop(i)
-            db.save_data("items.json", items_db)
-            
-            # 2. 清理关联评论：从 comments.json 中删除该内容的所有评论
-            if item_id in comments_db:
-                del comments_db[item_id]
-                db.save_data("comments.json", comments_db)
-            
-            # 3. 清理缓存：使 items.json 和 comments.json 的缓存失效
-            invalidate_cache("items.json")
-            invalidate_cache("comments.json")
-            # 🗂️ 清除排序缓存
-            sort_cache.invalidate("items:")
-            
-            return {"status": "success", "message": "内容已删除"}
+    def items_updater(items_db):
+        for i, item in enumerate(items_db):
+            if item["id"] == item_id:
+                # 🔒 权限检查：仅作者或管理员可删除
+                if not check_ownership(item, current_user, owner_field="author", allow_admin=True):
+                    result_holder["error"] = "forbidden"
+                    return False
+                
+                # 1. 从 items.json 中删除该条目
+                items_db.pop(i)
+                result_holder["item_deleted"] = True
+                return True
+        
+        result_holder["error"] = "not_found"
+        return False
+    
+    db.atomic_update("items.json", items_updater, default_data=[])
+    
+    if result_holder.get("error") == "forbidden":
+        raise HTTPException(status_code=403, detail="无权删除他人发布的内容")
+    if result_holder.get("error") == "not_found":
+        raise HTTPException(status_code=404, detail="找不到该内容记录")
+    
+    # 2. 清理关联评论：从 comments.json 中删除该内容的所有评论
+    def comments_updater(comments_db):
+        if item_id in comments_db:
+            del comments_db[item_id]
+            return True
+        return False
+    
+    db.atomic_update("comments.json", comments_updater, default_data={})
+    
+    # 3. 清理缓存：使 items.json 和 comments.json 的缓存失效
+    invalidate_cache("items.json")
+    invalidate_cache("comments.json")
+    # 🗂️ 清除排序缓存
+    sort_cache.invalidate("items:")
     
-    raise HTTPException(status_code=404, detail="找不到该内容记录")
+    return {"status": "success", "message": "内容已删除"}
 
 
 @router.post("/api/items/{item_id}/view")