Upload router_users.py

router_users.py

@@ -6,6 +6,8 @@ import random
 import os
 import json
 import urllib.request
+import urllib.parse
+import base64
 import 数据库连接 as db
 from notifications import add_notification
 from models import UserRegister, UserLogin, UserUpdate, PasswordReset, FollowToggle, PrivacySettings, SendCodeRequest
@@ -40,14 +42,12 @@ def send_email_code(to_email: str, code: str, action: str):
     </div>
     """
 
-    # 组装要发送给 Make.com 的数据
     data = {
         "to": to_email,
         "subject": subject,
         "html": html_content
     }
 
-    # 发送普通的 HTTPS POST 请求，绝对不会被拦截
     req = urllib.request.Request(
         webhook_url, 
         data=json.dumps(data).encode('utf-8'), 
@@ -60,14 +60,76 @@ def send_email_code(to_email: str, code: str, action: str):
         print(f"❌ Webhook 触发失败: {e}")
 
 def send_sms_code(phone: str, code: str, action: str):
-    """短信发送接口挂载点"""
-    print(f"[模拟短信] 手机号: {phone}, 验证码: {code}")
-    pass
+    """支持 阿里云 与 Twilio 的双引擎短信发送路由"""
+    action_str = "注册账号" if action == "register" else "修改/找回密码"
+
+    # ==========================================
+    # 引擎 A：Twilio (无需装 SDK，走纯 HTTP 接口，适合海外或免审核测试)
+    # ==========================================
+    twilio_sid = os.environ.get("TWILIO_SID")
+    if twilio_sid:
+        token = os.environ.get("TWILIO_TOKEN")
+        from_phone = os.environ.get("TWILIO_FROM")
+        
+        body = f"【ComfyUI社区】您正在请求{action_str}，验证码是：{code}，10分钟内有效。"
+        url = f"https://api.twilio.com/2010-04-01/Accounts/{twilio_sid}/Messages.json"
+        auth = base64.b64encode(f"{twilio_sid}:{token}".encode('utf-8')).decode('utf-8')
+        data = urllib.parse.urlencode({'To': phone, 'From': from_phone, 'Body': body}).encode('utf-8')
+        
+        req = urllib.request.Request(url, data=data)
+        req.add_header("Authorization", f"Basic {auth}")
+        try:
+            with urllib.request.urlopen(req, timeout=10) as response:
+                print(f"✅ Twilio 短信已成功下发至 {phone}")
+        except Exception as e:
+            print(f"❌ Twilio 发送失败: {e}")
+        return
 
-# 【核心优化】：引入 BackgroundTasks
+    # ==========================================
+    # 引擎 B：阿里云 (国内首选，到达率最高)
+    # ==========================================
+    aliyun_ak = os.environ.get("ALIYUN_AK")
+    if aliyun_ak:
+        try:
+            from alibabacloud_dysmsapi20170525.client import Client as DysmsapiClient
+            from alibabacloud_tea_openapi import models as open_api_models
+            from alibabacloud_dysmsapi20170525 import models as dysmsapi_models
+        except ImportError:
+            print("❌ 缺少阿里云 SDK，请在 requirements.txt 中添加 alibabacloud_dysmsapi20170525")
+            return
+
+        sk = os.environ.get("ALIYUN_SK")
+        sign_name = os.environ.get("ALIYUN_SIGN_NAME") # 短信签名，例如 "阿里云"
+        tpl_code = os.environ.get("ALIYUN_TPL_REGISTER") if action == "register" else os.environ.get("ALIYUN_TPL_RESET")
+
+        config = open_api_models.Config(access_key_id=aliyun_ak, access_key_secret=sk)
+        config.endpoint = 'dysmsapi.aliyuncs.com'
+        client = DysmsapiClient(config)
+
+        send_req = dysmsapi_models.SendSmsRequest(
+            phone_numbers=phone,
+            sign_name=sign_name,
+            template_code=tpl_code,
+            template_param=json.dumps({"code": code}) 
+        )
+        try:
+            response = client.send_sms(send_req)
+            if response.body.code == "OK":
+                print(f"✅ 阿里云短信已成功下发至 {phone}")
+            else:
+                print(f"❌ 阿里云下发失败: {response.body.message}")
+        except Exception as e:
+            print(f"❌ 阿里云请求异常: {e}")
+        return
+
+    # 如果都没有配置，则降级为控制台打印模拟
+    print(f"⚠️ 未配置短信秘钥，模拟下发 -> 手机号: {phone}, 验证码: {code}")
+
+# ==========================================
+# 接口路由
+# ==========================================
 @router.post("/api/users/send-code")
 async def send_verify_code(req: SendCodeRequest, bg_tasks: BackgroundTasks):
-    # 【新增核心逻辑】：如果是找回密码，先去数据库里核对联系方式
     if req.action_type == "reset":
         if not req.account:
             raise HTTPException(status_code=400, detail="找回密码需先填写当前账号")
@@ -82,17 +144,14 @@ async def send_verify_code(req: SendCodeRequest, bg_tasks: BackgroundTasks):
         if req.contact_type == "phone" and user.get("phone") != req.contact:
             raise HTTPException(status_code=400, detail="填写的手机号与该账号绑定的手机号不一���")
 
-    # 原有的生成验证码和发送逻辑保持不变
     code = str(random.randint(100000, 999999))
     cache_key = f"{req.contact}_{req.action_type}"
     
-    # 存入缓存，设置 10 分钟过期
     VERIFY_CODES[cache_key] = {
         "code": code,
         "expires_at": int(time.time()) + 600
     }
     
-    # 放入后台队列执行，立刻给前端返回成功响应
     if req.contact_type == "email":
         bg_tasks.add_task(send_email_code, req.contact, code, req.action_type)
     elif req.contact_type == "phone":
@@ -102,17 +161,11 @@ async def send_verify_code(req: SendCodeRequest, bg_tasks: BackgroundTasks):
         
     return {"status": "success", "message": "验证码发送请求已提交"}
 
-
-# ==========================================
-# 原有业务接口
-# ==========================================
-
 @router.post("/api/users/register")
 async def register_user(user: UserRegister):
     users_db = db.load_data("users.json", default_data={})
     
-    # 校验注册验证码
-    cache_key = f"{user.email}_register"
+    cache_key = f"{user.email}_register" if user.email else f"{user.phone}_register"
     cached = VERIFY_CODES.get(cache_key)
     if not cached or cached["code"] != user.code or int(time.time()) > cached["expires_at"]:
         raise HTTPException(status_code=400, detail="验证码不正确或已过期")
@@ -124,10 +177,10 @@ async def register_user(user: UserRegister):
     if user.intro and len(user.intro) > 100: raise HTTPException(status_code=400, detail="个人介绍不能超过100个字符")
     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="该手机号已被绑定")
+        if user.email and existing_user.get("email") == user.email: raise HTTPException(status_code=400, detail="该邮箱已被绑定")
+        if user.phone and existing_user.get("phone") == user.phone: raise HTTPException(status_code=400, detail="该手机号已被绑定")
     
-    VERIFY_CODES.pop(cache_key, None) # 验证通过，销毁验证码
+    VERIFY_CODES.pop(cache_key, None) 
     
     new_user = user.dict()
     new_user.pop("code", None)