保存现有功能 增加域名和添加时间关联

services/self_hosted_email.py

@@ -1,4 +1,7 @@
 import json
+import re
+import time
+import asyncio
 from typing import Optional, Dict, Any
 
 from loguru import logger
@@ -15,16 +18,19 @@ class SelfHostedEmail:
         
         Args:
             fetch_manager: HTTP请求管理器
-            api_base_url: API基础URL，例如 "https://api.cursorpro.com.cn"
+            api_base_url: API基础URL，例如 "https://cursorapi3.nosqli.com/"
             api_key: API密钥（可选）
         """
         self.fetch_manager = fetch_manager
-        self.api_base_url = "https://api.cursorpro.com.cn"
+        self.api_base_url = "https://cursorapi3.nosqli.com/"
         self.api_key = "1234567890"
         
         # API端点
         self.get_email_endpoint = "/admin/api.email/getEmail"
         self.get_code_endpoint = "/admin/api.email/getVerificationCode"
+        
+        # 新的邮件获取接口
+        self.new_email_api = "https://rnemail.nosqli.com/latest_email"
     
     async def _make_api_request(self, endpoint: str, params: Dict[str, Any] = None) -> Dict[str, Any]:
         """向API发送请求
@@ -96,6 +102,13 @@ class SelfHostedEmail:
         Returns:
             验证码，失败时返回None
         """
+        # 首先尝试使用新接口获取
+        code = await self._get_code_from_email_api(email)
+        if code:
+            return code
+            
+        # 如果新接口失败，尝试旧接口
+        logger.debug("新接口获取验证码失败，尝试使用旧接口")
         try:
             result = await self._make_api_request(
                 self.get_code_endpoint,
@@ -117,3 +130,75 @@ class SelfHostedEmail:
         except Exception as e:
             logger.error(f"获取验证码失败: {str(e)}")
             return None
+            
+    async def _get_code_from_email_api(self, email: str, max_retries: int = 5, retry_delay: int = 3) -> Optional[str]:
+        """从新的邮件API获取验证码
+        
+        Args:
+            email: 邮箱地址
+            max_retries: 最大重试次数
+            retry_delay: 重试间隔(秒)
+            
+        Returns:
+            验证码，失败时返回None
+        """
+        url = f"{self.new_email_api}?recipient={email}"
+        logger.debug(f"使用新接口获取验证码: {url}")
+        
+        for attempt in range(max_retries):
+            try:
+                response = await self.fetch_manager.request("GET", url)
+                
+                if 'error' in response:
+                    logger.warning(f"获取邮件失败 (尝试 {attempt + 1}/{max_retries}): {response['error']}")
+                else:
+                    email_data = json.loads(response['body'].decode())
+                    logger.debug(f"获取到邮件数据: {str(email_data)[:200]}...")
+                    
+                    # 解析邮件内容，提取验证码
+                    if email_data and isinstance(email_data, dict):
+                        body = email_data.get('body', '')
+                        if 'code' in email_data:
+                            # 如果API直接返回code字段
+                            code = email_data.get('code')
+                            if code:
+                                logger.info(f"从邮件API直接获取到验证码: {code}")
+                                return code
+                        
+                        # 从邮件主体中提取验证码
+                        if body:
+                            # 正则表达式匹配6位数字验证码
+                            code_match = re.search(r'code["\s:]*["\s]*(\d{6})["\s]*', body, re.IGNORECASE)
+                            if code_match:
+                                code = code_match.group(1)
+                                logger.info(f"从邮件内容中提取到验证码: {code}")
+                                return code
+                                
+                            # 匹配"验证码"后的6位数字
+                            code_match = re.search(r'[\u4e00-\u9fa5]*验证码[\u4e00-\u9fa5]*[：:]*\s*(\d{6})\b', body)
+                            if code_match:
+                                code = code_match.group(1)
+                                logger.info(f"从邮件内容中提取到验证码: {code}")
+                                return code
+                            
+                            # 如果是Cursor邮件，尝试直接提取验证码格式
+                            if "Cursor" in body and "verify" in body:
+                                code_match = re.search(r'\b(\d{6})\b', body)
+                                if code_match:
+                                    code = code_match.group(1)
+                                    logger.info(f"从Cursor邮件中提取到验证码: {code}")
+                                    return code
+                    
+                    logger.warning(f"未能从邮件中提取到验证码 (尝试 {attempt + 1}/{max_retries})")
+                
+                # 如果没有找到验证码，等待一段时间后重试
+                if attempt < max_retries - 1:
+                    logger.debug(f"等待 {retry_delay} 秒后重试获取验证码...")
+                    await asyncio.sleep(retry_delay)
+            except Exception as e:
+                logger.error(f"获取验证码出错 (尝试 {attempt + 1}/{max_retries}): {str(e)}")
+                if attempt < max_retries - 1:
+                    await asyncio.sleep(retry_delay)
+        
+        logger.error(f"在 {max_retries} 次尝试后未能获取到验证码")
+        return None