Upload app.py

app.py

@@ -1,4 +1,4 @@
-# ⚙️ 后端逻辑/核心服务端.py
+# ⚙️ 后端逻辑/核心服务端.py (Hugging Face Spaces app.py)
 from fastapi import FastAPI, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 from pydantic import BaseModel
@@ -6,7 +6,7 @@ from typing import Optional
 import time
 import uuid
 
-# 导入刚刚写好的数据库操作模块
+# 导入数据库操作模块
 import 数据库连接 as db
 
 app = FastAPI(title="ComfyUI Ranking Community API")
@@ -27,7 +27,11 @@ def read_root():
 
 # --- 数据模型 ---
 class UserRegister(BaseModel):
-    name: str
+    account: str   # 唯一账号 (新增为主键)
+    password: str  # 密码 (新增)
+    email: str     # 邮箱 (新增)
+    phone: str     # 手机号 (新增)
+    name: str      # 显示名称 (昵称)
     gender: str
     avatarDataUrl: Optional[str] = None
     age: Optional[int] = None
@@ -35,26 +39,38 @@ class UserRegister(BaseModel):
     region: Optional[str] = None
     intro: Optional[str] = None
 
+class UserLogin(BaseModel):
+    account: str   # 改为使用 account 登录
+    password: str
+
 class InteractionToggle(BaseModel):
     item_id: str
-    user_id: str # 使用 name 作为唯一标识 (简化版)
+    user_id: str # 使用 account 作为唯一标识
     action_type: str # "like", "favorite"
     is_active: bool
 
 class CommentCreate(BaseModel):
     item_id: str
-    author: str
+    author: str # 存储用户的 account 或 name，建议后续前端统一使用 account 作为关联
     content: str
     reply_to_user: Optional[str] = None
-    parent_id: Optional[str] = None # 如果是回复，记录父评论ID
+    parent_id: Optional[str] = None 
 
 # --- 1. 用户系统 ---
 @app.post("/api/users/register")
 async def register_user(user: UserRegister):
     users_db = db.load_data("users.json", default_data={})
     
-    if user.name in users_db:
-        raise HTTPException(status_code=400, detail="该用户名已被注册")
+    # 核心修改：通过 account 查重，而不是 name
+    if user.account in users_db:
+        raise HTTPException(status_code=400, detail="该账号已被注册，请尝试其他账号名")
+    
+    # 额外防重校验：邮箱和手机号不能被多个账号绑定
+    for existing_user in users_db.values():
+        if existing_user.get("email") == user.email:
+            raise HTTPException(status_code=400, detail="该邮箱已被绑定")
+        if existing_user.get("phone") == user.phone:
+            raise HTTPException(status_code=400, detail="该手机号已被绑定")
     
     # 构建用户档案，初始化各项统计为 0
     new_user = user.dict()
@@ -63,34 +79,57 @@ async def register_user(user: UserRegister):
         "privacy": {"follows": False, "likes": False, "favorites": False, "downloads": False}
     })
     
-    users_db[user.name] = new_user
+    users_db[user.account] = new_user # 使用 account 作为字典的 Key
     db.save_data("users.json", users_db)
     
-    return {"status": "success", "message": "注册成功", "data": new_user}
+    # 返回时为了安全，剔除密码字段
+    safe_user_data = {k: v for k, v in new_user.items() if k != "password"}
+    return {"status": "success", "message": "注册成功", "data": safe_user_data}
 
-@app.get("/api/users/{username}")
-async def get_user_profile(username: str):
+@app.post("/api/users/login")
+async def login_user(user: UserLogin):
     users_db = db.load_data("users.json", default_data={})
-    if username not in users_db:
+    
+    if user.account not in users_db:
+        raise HTTPException(status_code=404, detail="账号不存在，请检查或先注册")
+        
+    user_data = users_db[user.account]
+    
+    if user_data.get("password") != user.password:
+        raise HTTPException(status_code=401, detail="密码错误")
+        
+    return {
+        "status": "success", 
+        "token": f"mock_token_{user.account}", # 模拟生成 token
+        "account": user.account,
+        "name": user_data["name"], 
+        "avatar": user_data.get("avatarDataUrl", "https://via.placeholder.com/150")
+    }
+
+@app.get("/api/users/{account}")
+async def get_user_profile(account: str):
+    users_db = db.load_data("users.json", default_data={})
+    if account not in users_db:
         raise HTTPException(status_code=404, detail="用户不存在")
-    return {"status": "success", "data": users_db[username]}
+    
+    user_data = users_db[account]
+    safe_user_data = {k: v for k, v in user_data.items() if k != "password"}
+    return {"status": "success", "data": safe_user_data}
 
 # --- 2. 排行榜核心数据流 ---
 @app.get("/api/items")
 async def get_items(type: str = "tool", sort: str = "time", limit: int = 20):
     items_db = db.load_data("items.json", default_data=[])
     
-    # 过滤类型
     filtered_items = [item for item in items_db if item.get("type") == type]
     
-    # 排序逻辑
     if sort == "likes":
         filtered_items.sort(key=lambda x: x.get("likes", 0), reverse=True)
     elif sort == "favorites":
         filtered_items.sort(key=lambda x: x.get("favorites", 0), reverse=True)
     elif sort == "downloads":
         filtered_items.sort(key=lambda x: x.get("uses", 0), reverse=True)
-    else: # time (默认)
+    else: 
         filtered_items.sort(key=lambda x: x.get("created_at", 0), reverse=True)
         
     return {"status": "success", "data": filtered_items[:limit]}
@@ -104,8 +143,7 @@ async def toggle_interaction(interaction: InteractionToggle):
     if not target_item:
         raise HTTPException(status_code=404, detail="目标工具/应用不存在")
 
-    # 确定要操作的列表字段，例如 "liked_by" 或 "favorited_by"
-    list_key = f"{interaction.action_type}d_by" # liked_by / favorited_by
+    list_key = f"{interaction.action_type}d_by" 
     count_key = "likes" if interaction.action_type == "like" else "favorites"
     
     if list_key not in target_item:
@@ -114,7 +152,6 @@ async def toggle_interaction(interaction: InteractionToggle):
 
     user_list = target_item[list_key]
     
-    # 执行 Toggle 逻辑
     if interaction.is_active:
         if interaction.user_id not in user_list:
             user_list.append(interaction.user_id)
@@ -128,15 +165,14 @@ async def toggle_interaction(interaction: InteractionToggle):
     
     return {
         "status": "success", 
-        "message": f"操作成功", 
+        "message": "操作成功", 
         "new_count": target_item[count_key]
     }
 
 # --- 4. 评论系统 ---
 @app.post("/api/comments")
 async def post_comment(comment: CommentCreate):
-    comments_db = db.load_data("comments.json", default_data={}) # 结构: {"item_id": [comment_list]}
-    
+    comments_db = db.load_data("comments.json", default_data={}) 
     item_comments = comments_db.get(comment.item_id, [])
     
     new_comment = {
@@ -149,7 +185,6 @@ async def post_comment(comment: CommentCreate):
         "created_at": int(time.time())
     }
 
-    # 如果传了 parent_id，说明是子回复，要把它塞进父评论的 replies 数组里
     if comment.parent_id:
         parent = next((c for c in item_comments if c["id"] == comment.parent_id), None)
         if parent:
@@ -157,7 +192,6 @@ async def post_comment(comment: CommentCreate):
         else:
             raise HTTPException(status_code=404, detail="找不到要回复的父级评论")
     else:
-        # 否则作为顶级评论插入
         item_comments.append(new_comment)
         
     comments_db[comment.item_id] = item_comments
@@ -170,16 +204,14 @@ async def soft_delete_comment(item_id: str, comment_id: str, author: str):
     comments_db = db.load_data("comments.json", default_data={})
     item_comments = comments_db.get(item_id, [])
     
-    # 递归查找要删除的评论
     def find_and_delete(comments_list):
         for c in comments_list:
             if c["id"] == comment_id:
                 if c["author"] != author:
                     raise HTTPException(status_code=403, detail="无权删除他人的评论")
                 c["isDeleted"] = True
-                c["content"] = "" # 清空敏感或不良内容
+                c["content"] = "" 
                 return True
-            # 检查子回复
             if "replies" in c and find_and_delete(c["replies"]):
                 return True
         return False