Upload router_users.py

router_users.py

@@ -263,14 +263,14 @@ async def update_user_profile(account: str, update_data: UserUpdate):
 
 
 # ==========================================
-# 🚀 万能重置密码接口：杜绝所有前端数据格式 422 报错
+# 🚀 究极重置密码接口：带智能纠错与透视报错
 # ==========================================
 @router.post("/api/users/reset_password")
 async def reset_password(request: Request):
     # 1. 万能解析器：兼容 JSON、双重字符串化、以及 FormData
     try:
         data = await request.json()
-        if isinstance(data, str):  # 核心：拦截前端可能造成的"双重字符串化"
+        if isinstance(data, str):
             data = json.loads(data)
     except:
         try:
@@ -282,12 +282,14 @@ async def reset_password(request: Request):
     if not isinstance(data, dict):
         raise HTTPException(status_code=400, detail=f"前端数据格式异常，收到的是: {type(data).__name__}")
         
-    # 2. 万能提取器：同时兼容前端的命名习惯误差
+    # 2. 万能提取器 + 强力空格清洗
     account = data.get("account")
     new_password = data.get("new_password") or data.get("password")
     verify_contact = data.get("verifyContact") or data.get("verify_contact") or data.get("email") or data.get("phone")
     verify_type = data.get("verifyType") or data.get("verify_type") or data.get("contact_type")
-    code = data.get("code")
+    
+    # 🚀 强力洗消：不管前端传什么脏数据，统统转字符串并去掉头尾空格
+    code = str(data.get("code", "")).strip() 
     
     if not all([account, new_password, verify_contact, verify_type, code]):
         raise HTTPException(status_code=400, detail="缺失必要参数 (账号/密码/验证码/联系方式)，请检查表单")
@@ -302,12 +304,30 @@ async def reset_password(request: Request):
     if verify_type == "phone" and user.get("phone") != verify_contact:
         raise HTTPException(status_code=400, detail="填写的手机号与该账号绑定的手机号不匹配")
 
+    # ==========================================
+    # 🚀 核心排雷：智能内存查找与透视报错
+    # ==========================================
     cache_key = f"{verify_contact}_reset"
     cached = VERIFY_CODES.get(cache_key)
+    
+    # 如果精准匹配找不到，就去内存池里进行“模糊搜索”（解决前端 action_type 传参误差）
+    if not cached:
+        fallback_keys = [k for k in VERIFY_CODES.keys() if verify_contact in k]
+        if fallback_keys:
+            cache_key = fallback_keys[0]
+            cached = VERIFY_CODES.get(cache_key)
+        else:
+            # 💥 透视眼：如果真找不到，直接把后端真实收到的邮箱弹出来给你看！
+            raise HTTPException(status_code=400, detail=f"验证码内存已丢失！请重新点击发送。当前识别提取的邮箱是: [{verify_contact}]")
+
     expire_time = cached.get("expires_at", cached.get("expires", 0)) if cached else 0
     
-    if not cached or cached["code"] != code or time.time() > expire_time:
-        raise HTTPException(status_code=400, detail="验证码不正确或已过期")
+    if time.time() > expire_time:
+        raise HTTPException(status_code=400, detail="验证码已过期，请重新获取")
+        
+    if cached["code"] != code:
+        # 💥 透视眼：如果输错了，直接把正确答案亮出来！
+        raise HTTPException(status_code=400, detail=f"验证码不匹配！你输入的是 [{code}]，系统记录的是 [{cached['code']}]")
 
     if len(new_password) < 6: raise HTTPException(status_code=400, detail="新密码必须大于等于6个字符")
     if not re.match(r'^[a-zA-Z0-9!@#$%^&*()_+\-=\[\]{};\':"\\|,.<>\/?]{6,}$', new_password): raise HTTPException(status_code=400, detail="新密码包含不支持的特殊字符")