From d28e2f35c8e22af8c61fba7dead7a48ec9c17be1 Mon Sep 17 00:00:00 2001 From: huangzhenpc Date: Tue, 11 Feb 2025 12:48:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=B9=E9=80=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=EF=BC=8C=E4=BD=BF=E7=94=A8API=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=94=AF=E6=8C=81IMAP?= =?UTF-8?q?=E5=92=8C=E4=B8=B4=E6=97=B6=E9=82=AE=E7=AE=B1=EF=BC=8C=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=9C=AC=E5=9C=B0env=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- account_manager.py | 64 ++++++++++++++-- accounts.json | 36 +++++++++ config.py | 182 +++++++++++++++++++++++---------------------- 3 files changed, 188 insertions(+), 94 deletions(-) diff --git a/account_manager.py b/account_manager.py index 9bb118b..4463154 100644 --- a/account_manager.py +++ b/account_manager.py @@ -10,7 +10,8 @@ from logger import logging class AccountManager: def __init__(self, api_base_url: str = None): self.config = Config() - self.api_base_url = api_base_url or os.getenv("API_BASE_URL", "http://api.example.com") + self.api_base_url = api_base_url or "https://cursorapi.nosqli.com/admin" + self.api_token = os.getenv("API_TOKEN", "") self.accounts_file = "accounts.json" self._ensure_accounts_file() @@ -62,31 +63,82 @@ class AccountManager: """ try: # 构建API请求 - endpoint = f"{self.api_base_url}/api/accounts" + endpoint = f"{self.api_base_url}/api.account/add" headers = { "Content-Type": "application/json", - "Authorization": f"Bearer {os.getenv('API_TOKEN', '')}" + "Authorization": f"Bearer {self.api_token}" + } + + # 准备请求数据 + data = { + "email": account_info["email"], + "password": account_info["password"], + "first_name": account_info["first_name"], + "last_name": account_info["last_name"], + "access_token": account_info["access_token"], + "refresh_token": account_info["refresh_token"], + "machine_id": account_info.get("machine_id", ""), + "user_agent": account_info.get("user_agent", ""), + "registration_time": datetime.fromisoformat(account_info["registration_time"]).strftime("%Y-%m-%d %H:%M:%S") } # 发送POST请求 response = requests.post( endpoint, - json=account_info, + json=data, headers=headers, timeout=10 ) - if response.status_code == 200: + response_data = response.json() + if response_data["code"] == 0: logging.info(f"账号信息已同步到服务器: {account_info['email']}") return True + elif response_data["code"] == 400: + logging.warning(f"账号已存在: {account_info['email']}") + return False else: - logging.error(f"同步到服务器失败: {response.status_code} - {response.text}") + logging.error(f"同步到服务器失败: {response_data['msg']}") return False except Exception as e: logging.error(f"同步账号信息到服务器失败: {str(e)}") return False + def get_unused_account(self) -> Optional[Dict]: + """ + 从服务器获取一个未使用的账号 + + Returns: + Optional[Dict]: 账号信息或None + """ + try: + endpoint = f"{self.api_base_url}/api.account/getUnused" + headers = { + "Authorization": f"Bearer {self.api_token}" + } + + response = requests.get( + endpoint, + headers=headers, + timeout=10 + ) + + response_data = response.json() + if response_data["code"] == 0: + logging.info("成功获取未使用账号") + return response_data["data"] + elif response_data["code"] == 404: + logging.warning("没有可用的未使用账号") + return None + else: + logging.error(f"获取未使用账号失败: {response_data['msg']}") + return None + + except Exception as e: + logging.error(f"获取未使用账号失败: {str(e)}") + return None + def process_account(self, account_info: Dict) -> bool: """ 处理账号信息：保存到本地并同步到服务器 diff --git a/accounts.json b/accounts.json index 3519150..17bb7ce 100644 --- a/accounts.json +++ b/accounts.json @@ -35,6 +35,42 @@ "user_agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36", "registration_time": "2025-02-11T11:45:42.926280", "created_at": "2025-02-11T11:45:42.926280" + }, + { + "email": "gylwuojf248611@586vip.cn", + "password": "lnq@&$xTg4Eg", + "first_name": "Kxnhvz", + "last_name": "Xsadgx", + "access_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJhdXRoMHx1c2VyXzAxSktTTVJKSlRRWTVRRUtNSkNSNzRBMk1WIiwidGltZSI6IjE3MzkyNDg2NzkiLCJyYW5kb21uZXNzIjoiZjZmMDI2NTItYzY0NC00Yjc5IiwiZXhwIjo0MzMxMjQ4Njc5LCJpc3MiOiJodHRwczovL2F1dGhlbnRpY2F0aW9uLmN1cnNvci5zaCIsInNjb3BlIjoib3BlbmlkIHByb2ZpbGUgZW1haWwgb2ZmbGluZV9hY2Nlc3MiLCJhdWQiOiJodHRwczovL2N1cnNvci5jb20ifQ.Ep8SRWA9m-77_nBQ_-YXilnjhLjHa8F8J29n4F_Schw", + "refresh_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJhdXRoMHx1c2VyXzAxSktTTVJKSlRRWTVRRUtNSkNSNzRBMk1WIiwidGltZSI6IjE3MzkyNDg2NzkiLCJyYW5kb21uZXNzIjoiZjZmMDI2NTItYzY0NC00Yjc5IiwiZXhwIjo0MzMxMjQ4Njc5LCJpc3MiOiJodHRwczovL2F1dGhlbnRpY2F0aW9uLmN1cnNvci5zaCIsInNjb3BlIjoib3BlbmlkIHByb2ZpbGUgZW1haWwgb2ZmbGluZV9hY2Nlc3MiLCJhdWQiOiJodHRwczovL2N1cnNvci5jb20ifQ.Ep8SRWA9m-77_nBQ_-YXilnjhLjHa8F8J29n4F_Schw", + "machine_id": "", + "user_agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36", + "registration_time": "2025-02-11T12:39:12.282219", + "created_at": "2025-02-11T12:39:12.282219" + }, + { + "email": "qdvhkwct248782@nosqli.com", + "password": "lnq@&$xTg4Eg", + "first_name": "Ohzixk", + "last_name": "Cjitnt", + "access_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJhdXRoMHx1c2VyXzAxSktTTVhURkNNUVoyQ01IUVpWQjRUUlNYIiwidGltZSI6IjE3MzkyNDg4NDkiLCJyYW5kb21uZXNzIjoiYzNkNzZjZjYtNTVkZi00MWEyIiwiZXhwIjo0MzMxMjQ4ODQ5LCJpc3MiOiJodHRwczovL2F1dGhlbnRpY2F0aW9uLmN1cnNvci5zaCIsInNjb3BlIjoib3BlbmlkIHByb2ZpbGUgZW1haWwgb2ZmbGluZV9hY2Nlc3MiLCJhdWQiOiJodHRwczovL2N1cnNvci5jb20ifQ.QYPd44FvcSc3ahPBQcYMd3NBrUWu1eHTltMtUFbtl60", + "refresh_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJhdXRoMHx1c2VyXzAxSktTTVhURkNNUVoyQ01IUVpWQjRUUlNYIiwidGltZSI6IjE3MzkyNDg4NDkiLCJyYW5kb21uZXNzIjoiYzNkNzZjZjYtNTVkZi00MWEyIiwiZXhwIjo0MzMxMjQ4ODQ5LCJpc3MiOiJodHRwczovL2F1dGhlbnRpY2F0aW9uLmN1cnNvci5zaCIsInNjb3BlIjoib3BlbmlkIHByb2ZpbGUgZW1haWwgb2ZmbGluZV9hY2Nlc3MiLCJhdWQiOiJodHRwczovL2N1cnNvci5jb20ifQ.QYPd44FvcSc3ahPBQcYMd3NBrUWu1eHTltMtUFbtl60", + "machine_id": "", + "user_agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36", + "registration_time": "2025-02-11T12:41:18.939352", + "created_at": "2025-02-11T12:41:18.939352" + }, + { + "email": "zqudrvoq248903@586vip.cn", + "password": "lnq@&$xTg4Eg", + "first_name": "Yxmjeh", + "last_name": "Hwzwxa", + "access_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJhdXRoMHx1c2VyXzAxSktTTjFOVFo2SkU4VjVNM0VaUzE0REpFIiwidGltZSI6IjE3MzkyNDg5NzIiLCJyYW5kb21uZXNzIjoiZjZmODFhMWQtMWEyNi00ZTNlIiwiZXhwIjo0MzMxMjQ4OTcyLCJpc3MiOiJodHRwczovL2F1dGhlbnRpY2F0aW9uLmN1cnNvci5zaCIsInNjb3BlIjoib3BlbmlkIHByb2ZpbGUgZW1haWwgb2ZmbGluZV9hY2Nlc3MiLCJhdWQiOiJodHRwczovL2N1cnNvci5jb20ifQ.p4mfK5BWFPmbNYc2Fswxa_55UEqPsKaDZLC6LUgyAkI", + "refresh_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJhdXRoMHx1c2VyXzAxSktTTjFOVFo2SkU4VjVNM0VaUzE0REpFIiwidGltZSI6IjE3MzkyNDg5NzIiLCJyYW5kb21uZXNzIjoiZjZmODFhMWQtMWEyNi00ZTNlIiwiZXhwIjo0MzMxMjQ4OTcyLCJpc3MiOiJodHRwczovL2F1dGhlbnRpY2F0aW9uLmN1cnNvci5zaCIsInNjb3BlIjoib3BlbmlkIHByb2ZpbGUgZW1haWwgb2ZmbGluZV9hY2Nlc3MiLCJhdWQiOiJodHRwczovL2N1cnNvci5jb20ifQ.p4mfK5BWFPmbNYc2Fswxa_55UEqPsKaDZLC6LUgyAkI", + "machine_id": "", + "user_agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36", + "registration_time": "2025-02-11T12:43:36.366349", + "created_at": "2025-02-11T12:43:36.367348" } ] } \ No newline at end of file diff --git a/config.py b/config.py index 69944ac..e0ff744 100644 --- a/config.py +++ b/config.py @@ -1,58 +1,84 @@ -from dotenv import load_dotenv import os import sys +import requests from logger import logging class Config: def __init__(self): - # 获取应用程序的根目录路径 - if getattr(sys, "frozen", False): - # 如果是打包后的可执行文件 - application_path = os.path.dirname(sys.executable) - else: - # 如果是开发环境 - application_path = os.path.dirname(os.path.abspath(__file__)) + self.api_base_url = "https://cursorapi.nosqli.com/admin" + self.load_config() - # 指定 .env 文件的路径 - dotenv_path = os.path.join(application_path, ".env") - - if not os.path.exists(dotenv_path): - raise FileNotFoundError(f"文件 {dotenv_path} 不存在") - - # 加载 .env 文件 - load_dotenv(dotenv_path) - - self.imap = False - self.temp_mail = os.getenv("TEMP_MAIL", "").strip().split("@")[0] - self.temp_mail_epin = os.getenv("TEMP_MAIL_EPIN", "").strip() - self.temp_mail_ext = os.getenv("TEMP_MAIL_EXT", "").strip() - self.domain = os.getenv("DOMAIN", "").strip() - - # 如果临时邮箱为null则加载IMAP - if self.temp_mail == "null": - self.imap = True - self.imap_server = os.getenv("IMAP_SERVER", "").strip() - self.imap_port = os.getenv("IMAP_PORT", "").strip() - self.imap_user = os.getenv("IMAP_USER", "").strip() - self.imap_pass = os.getenv("IMAP_PASS", "").strip() - self.imap_dir = os.getenv("IMAP_DIR", "inbox").strip() - - self.check_config() + def load_config(self): + """从API加载配置""" + try: + endpoint = f"{self.api_base_url}/api.mail/getRandom" + headers = { + "Content-Type": "application/json" + } + + response = requests.get( + endpoint, + headers=headers, + timeout=10 + ) + + response_data = response.json() + if response_data["code"] == 0: + logging.info(f"成功获取配置: {response_data['data']['name']}") + env_config = response_data["data"]["env"] + + # 设置配置项 + self.domain = env_config.get("DOMAIN", "").strip() + self.temp_mail = env_config.get("TEMP_MAIL", "").strip() + self.temp_mail_ext = env_config.get("TEMP_MAIL_EXT", "").strip() + self.temp_mail_epin = env_config.get("TEMP_MAIL_EPIN", "").strip() + self.browser_user_agent = env_config.get("BROWSER_USER_AGENT", "").strip() + self.mail_server = env_config.get("MAIL_SERVER", "").strip() + + # IMAP相关配置 + self.imap = env_config.get("TEMP_MAIL", "") == "null" + if self.imap: + self.imap_server = env_config.get("IMAP_SERVER", "").strip() + self.imap_port = env_config.get("IMAP_PORT", "").strip() + self.imap_user = env_config.get("IMAP_USER", "").strip() + self.imap_pass = env_config.get("IMAP_PASS", "").strip() + self.imap_dir = env_config.get("IMAP_DIR", "inbox").strip() + else: + self.imap_server = "" + self.imap_port = "" + self.imap_user = "" + self.imap_pass = "" + self.imap_dir = "inbox" + + self.check_config() + else: + raise ValueError(f"获取配置失败: {response_data['msg']}") + + except Exception as e: + logging.error(f"加载配置失败: {str(e)}") + raise def get_temp_mail(self): - return self.temp_mail - def get_temp_mail_epin(self): - - return self.temp_mail_epin - def get_temp_mail_ext(self): - return self.temp_mail_ext + def get_temp_mail_epin(self): + return self.temp_mail_epin + + def get_domain(self): + return self.domain + + def get_mail_server(self): + return self.mail_server + + def get_browser_user_agent(self): + return self.browser_user_agent + def get_imap(self): + """获取IMAP配置""" if not self.imap: return False return { @@ -63,84 +89,64 @@ class Config: "imap_dir": self.imap_dir, } - def get_domain(self): - return self.domain - def check_config(self): - """检查配置项是否有效 - - 检查规则： - 1. 如果使用 tempmail.plus，需要配置 TEMP_MAIL 和 DOMAIN - 2. 如果使用 IMAP，需要配置 IMAP_SERVER、IMAP_PORT、IMAP_USER、IMAP_PASS - 3. IMAP_DIR 是可选的 - """ + """检查配置项是否有效""" # 基础配置检查 required_configs = { "domain": "域名", + "browser_user_agent": "浏览器UA", + "mail_server": "邮件服务器" } - # 检查基础配置 for key, name in required_configs.items(): if not self.check_is_valid(getattr(self, key)): - raise ValueError(f"{name}未配置，请在 .env 文件中设置 {key.upper()}") + raise ValueError(f"{name}配置无效") # 检查邮箱配置 - if self.temp_mail != "null": + if not self.imap: # tempmail.plus 模式 - if not self.check_is_valid(self.temp_mail): - raise ValueError("临时邮箱未配置，请在 .env 文件中设置 TEMP_MAIL") + if not self.check_is_valid(self.temp_mail) or not self.check_is_valid(self.temp_mail_ext): + raise ValueError("临时邮箱配置无效") else: # IMAP 模式 imap_configs = { "imap_server": "IMAP服务器", "imap_port": "IMAP端口", "imap_user": "IMAP用户名", - "imap_pass": "IMAP密码", + "imap_pass": "IMAP密码" } - for key, name in imap_configs.items(): - value = getattr(self, key) - if value == "null" or not self.check_is_valid(value): - raise ValueError( - f"{name}未配置，请在 .env 文件中设置 {key.upper()}" - ) - - # IMAP_DIR 是可选的，如果设置了就检查其有效性 - if self.imap_dir != "null" and not self.check_is_valid(self.imap_dir): - raise ValueError( - "IMAP收件箱目录配置无效，请在 .env 文件中正确设置 IMAP_DIR" - ) + if not self.check_is_valid(getattr(self, key)): + raise ValueError(f"{name}配置无效") def check_is_valid(self, value): - """检查配置项是否有效 - - Args: - value: 配置项的值 - - Returns: - bool: 配置项是否有效 - """ + """检查配置项是否有效""" return isinstance(value, str) and len(str(value).strip()) > 0 def print_config(self): + """打印当前配置""" + logging.info("\n=== 当前配置 ===") + logging.info(f"域名: {self.domain}") if self.imap: - logging.info(f"\033[32mIMAP服务器: {self.imap_server}\033[0m") - logging.info(f"\033[32mIMAP端口: {self.imap_port}\033[0m") - logging.info(f"\033[32mIMAP用户名: {self.imap_user}\033[0m") - logging.info(f"\033[32mIMAP密码: {'*' * len(self.imap_pass)}\033[0m") - logging.info(f"\033[32mIMAP收件箱目录: {self.imap_dir}\033[0m") - if self.temp_mail != "null": - logging.info( - f"\033[32m临时邮箱: {self.temp_mail}{self.temp_mail_ext}\033[0m" - ) - logging.info(f"\033[32m域名: {self.domain}\033[0m") + logging.info("=== IMAP配置 ===") + logging.info(f"IMAP服务器: {self.imap_server}") + logging.info(f"IMAP端口: {self.imap_port}") + logging.info(f"IMAP用户名: {self.imap_user}") + logging.info(f"IMAP密码: {'*' * len(self.imap_pass)}") + logging.info(f"IMAP目录: {self.imap_dir}") + else: + logging.info(f"临时邮箱: {self.temp_mail}{self.temp_mail_ext}") + if self.temp_mail_epin: + logging.info(f"邮箱PIN码: {self.temp_mail_epin}") + logging.info(f"邮件服务器: {self.mail_server}") + logging.info(f"浏览器UA: {self.browser_user_agent}") # 使用示例 if __name__ == "__main__": try: config = Config() - print("环境变量加载成功！") + print("配置加载成功！") config.print_config() - except ValueError as e: - print(f"错误: {e}") + except Exception as e: + print(f"错误: {str(e)}")