feat: 1.1版本更新 - 优化UI界面和激活流程

build_mac_new.py

@@ -25,7 +25,7 @@ os.makedirs(logs_dir, exist_ok=True)
 # 打包参数
 params = [
     'gui/main_mac.py',  # 主程序入口
-    '--name=CursorPro',  # 应用名称
+    '--name=听泉助手',  # 应用名称
     '-w',  # 不显示控制台窗口
     '--clean',  # 清理临时文件
     '--noconfirm',  # 不确认覆盖

config.py

@@ -1,146 +1,95 @@
-from dotenv import load_dotenv
 import os
-import sys
+import json
-from logger import logging
+import logging
-
+from pathlib import Path
 
 class Config:
+    """配置类"""
+    
     def __init__(self):
-        # 获取应用程序的根目录路径
+        self.base_url = "https://cursorapi.nosqli.com"
-        if getattr(sys, "frozen", False):
+        self.api_endpoints = {
-            # 如果是打包后的可执行文件
+            "activate": f"{self.base_url}/admin/api.member/activate",
-            application_path = os.path.dirname(sys.executable)
+            "status": f"{self.base_url}/admin/api.member/status",
-        else:
+            "get_unused": f"{self.base_url}/admin/api.account/getUnused",
-            # 如果是开发环境
+            "heartbeat": f"{self.base_url}/admin/api.account/heartbeat"
-            application_path = os.path.dirname(os.path.abspath(__file__))
+        }
-
+        
-        # 指定 .env 文件的路径
+        # macOS配置目录
-        dotenv_path = os.path.join(application_path, ".env")
+        self.config_dir = Path(os.path.expanduser("~")) / ".cursor_pro"
-
+        self.config_file = self.config_dir / "config.json"
-        if not os.path.exists(dotenv_path):
+        self.member_file = self.config_dir / "member.json"
-            raise FileNotFoundError(f"文件 {dotenv_path} 不存在")
+        self.load_config()
-
+        
-        # 加载 .env 文件
+    def load_config(self):
-        load_dotenv(dotenv_path)
+        """加载配置"""
-
+        try:
-        self.imap = False
+            self.config_dir.mkdir(parents=True, exist_ok=True)
-        self.temp_mail = os.getenv("TEMP_MAIL", "").strip().split("@")[0]
+            
-        self.temp_mail_epin = os.getenv("TEMP_MAIL_EPIN", "").strip()
+            if not self.config_file.exists():
-        self.temp_mail_ext = os.getenv("TEMP_MAIL_EXT", "").strip()
+                self.save_default_config()
-        self.domain = os.getenv("DOMAIN", "").strip()
+                
-
+            with open(self.config_file, "r", encoding="utf-8") as f:
-        # 如果临时邮箱为null则加载IMAP
+                config = json.load(f)
-        if self.temp_mail == "null":
+                self.api_token = config.get("api_token", "")
-            self.imap = True
+                
-            self.imap_server = os.getenv("IMAP_SERVER", "").strip()
+        except Exception as e:
-            self.imap_port = os.getenv("IMAP_PORT", "").strip()
+            logging.error(f"加载配置失败: {str(e)}")
-            self.imap_user = os.getenv("IMAP_USER", "").strip()
+            self.api_token = ""
-            self.imap_pass = os.getenv("IMAP_PASS", "").strip()
+            
-            self.imap_dir = os.getenv("IMAP_DIR", "inbox").strip()
+    def save_member_info(self, info: dict):
-
+        """保存会员信息"""
-        self.check_config()
+        try:
-
+            with open(self.member_file, "w", encoding="utf-8") as f:
-    def get_temp_mail(self):
+                json.dump(info, f, indent=2, ensure_ascii=False)
-
+            logging.info("会员信息已保存")
-        return self.temp_mail
+        except Exception as e:
-
+            logging.error(f"保存会员信息失败: {str(e)}")
-    def get_temp_mail_epin(self):
+            
-
+    def load_member_info(self) -> dict:
-        return self.temp_mail_epin
+        """读取会员信息"""
-
+        try:
-    def get_temp_mail_ext(self):
+            if self.member_file.exists():
-
+                with open(self.member_file, "r", encoding="utf-8") as f:
-        return self.temp_mail_ext
+                    info = json.load(f)
-
+                    logging.info(f"已读取会员信息: 到期时间 {info.get('expire_time', '')}")
-    def get_imap(self):
+                    return info
-        if not self.imap:
+        except Exception as e:
-            return False
+            logging.error(f"读取会员信息失败: {str(e)}")
         return {
-            "imap_server": self.imap_server,
+            "expire_time": "",
-            "imap_port": self.imap_port,
+            "days": 0,
-            "imap_user": self.imap_user,
+            "new_days": 0
-            "imap_pass": self.imap_pass,
-            "imap_dir": self.imap_dir,
         }
-
+            
-    def get_domain(self):
+    def save_default_config(self):
-        return self.domain
+        """保存默认配置"""
-
+        config = {
-    def check_config(self):
+            "api_token": ""
-        """检查配置项是否有效
-
-        检查规则：
-        1. 如果使用 tempmail.plus，需要配置 TEMP_MAIL 和 DOMAIN
-        2. 如果使用 IMAP，需要配置 IMAP_SERVER、IMAP_PORT、IMAP_USER、IMAP_PASS
-        3. IMAP_DIR 是可选的
-        """
-        # 基础配置检查
-        required_configs = {
-            "domain": "域名",
         }
+        with open(self.config_file, "w", encoding="utf-8") as f:
+            json.dump(config, f, indent=2, ensure_ascii=False)
+            
+    def save_config(self, api_token: str):
+        """保存新的配置"""
+        config = {
+            "api_token": api_token
+        }
+        with open(self.config_file, "w", encoding="utf-8") as f:
+            json.dump(config, f, indent=2, ensure_ascii=False)
+        self.api_token = api_token
+        logging.info("配置已更新")
 
-        # 检查基础配置
+    def get_api_url(self, endpoint_name: str) -> str:
-        for key, name in required_configs.items():
+        """获取API端点URL
-            if not self.check_is_valid(getattr(self, key)):
+        
-                raise ValueError(f"{name}未配置，请在 .env 文件中设置 {key.upper()}")
-
-        # 检查邮箱配置
-        if self.temp_mail != "null":
-            # tempmail.plus 模式
-            if not self.check_is_valid(self.temp_mail):
-                raise ValueError("临时邮箱未配置，请在 .env 文件中设置 TEMP_MAIL")
-        else:
-            # IMAP 模式
-            imap_configs = {
-                "imap_server": "IMAP服务器",
-                "imap_port": "IMAP端口",
-                "imap_user": "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"
-                )
-
-    def check_is_valid(self, value):
-        """检查配置项是否有效
-
         Args:
-            value: 配置项的值
+            endpoint_name: 端点名称
-
+            
         Returns:
-            bool: 配置项是否有效
+            str: 完整的API URL
         """
-        return isinstance(value, str) and len(str(value).strip()) > 0
+        url = self.api_endpoints.get(endpoint_name, "")
-
+        if not url:
-    def print_config(self):
+            logging.error(f"未找到API端点: {endpoint_name}")
-        if self.imap:
+        return url 
-            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")
-
-
-# 使用示例
-if __name__ == "__main__":
-    try:
-        config = Config()
-        print("环境变量加载成功！")
-        config.print_config()
-    except ValueError as e:
-        print(f"错误: {e}")

gui/main_mac.py

@@ -114,7 +114,7 @@ class MainWindow(QMainWindow):
 
     def init_ui(self):
         # 设置窗口基本属性
-        self.setWindowTitle('Cursor Pro')
+        self.setWindowTitle('听泉助手')
         self.setMinimumSize(600, 500)
         
         # 设置macOS风格的样式
@@ -183,7 +183,7 @@ class MainWindow(QMainWindow):
         layout.setContentsMargins(20, 20, 20, 20)
 
         # 标题
-        title_label = QLabel("Cursor Pro")
+        title_label = QLabel("听泉助手")
         title_label.setProperty("title", "true")
         title_label.setAlignment(Qt.AlignCenter)
         layout.addWidget(title_label)
@@ -306,16 +306,51 @@ class MainWindow(QMainWindow):
             QMessageBox.critical(self, "错误", f"重置失败: {str(e)}")
 
     def activate_license(self):
-        license_key = self.activate_input.text().strip()
+        """激活许可证"""
-        if not license_key:
-            QMessageBox.warning(self, "提示", "请输入激活码")
-            return
-            
         try:
-            # 这里添加激活码验证逻辑
+            license_key = self.activate_input.text().strip()
-            QMessageBox.information(self, "成功", "激活成功")
+            if not license_key:
+                QMessageBox.warning(self, "提示", "请输入激活码")
+                return
+                
+            # 禁用激活按钮，防止重复点击
+            self.activate_input.setEnabled(False)
+            self.update_button.setEnabled(False)
+            
+            # 显示处理中的提示
+            QApplication.processEvents()
+            
+            # 调用激活接口
+            success, message, account_info = self.updater.check_activation_code(license_key)
+            
+            if success:
+                # 更新界面显示
+                self.member_info.clear()
+                self.member_info.append(f"会员状态: 已激活")
+                self.member_info.append(f"到期时间: {account_info['expire_time']}")
+                self.member_info.append(f"剩余天数: {account_info['days_left']}天")
+                
+                # 显示成功消息
+                QMessageBox.information(self, "激活成功", 
+                    f"设备已成功激活！\n"
+                    f"到期时间: {account_info['expire_time']}\n"
+                    f"剩余天数: {account_info['days_left']}天")
+                
+                # 清空激活码输入框
+                self.activate_input.clear()
+                
+                logging.info(f"设备激活成功，到期时间: {account_info['expire_time']}")
+            else:
+                QMessageBox.warning(self, "激活失败", message)
+                logging.error(f"激活失败: {message}")
+                
         except Exception as e:
-            QMessageBox.critical(self, "错误", f"激活失败: {str(e)}")
+            logging.error(f"激活过程中发生错误: {str(e)}")
+            QMessageBox.critical(self, "错误", f"激活过程发生错误: {str(e)}")
+        finally:
+            # 恢复按钮状态
+            self.activate_input.setEnabled(True)
+            self.update_button.setEnabled(True)
 
     def disable_cursor_update(self):
         try:
@@ -331,8 +366,8 @@ def main():
         logging.info("应用程序启动")
         
         app = QApplication(sys.argv)
-        app.setApplicationName("CursorPro")
+        app.setApplicationName("听泉助手")
-        app.setOrganizationName("Cursor")
+        app.setOrganizationName("听泉")
         app.setOrganizationDomain("cursor.pro")
         
         try:

gui/main_window.py

@@ -365,13 +365,44 @@ class MainWindow(QMainWindow):
                 QMessageBox.warning(self, "提示", "请输入激活码")
                 return
                 
-            # TODO: 实现激活逻辑
+            # 禁用激活按钮，防止重复点击
-            logging.info(f"正在处理激活请求，激活码: {activation_code}")
+            self.activate_input.setEnabled(False)
-            QMessageBox.information(self, "提示", "激活功能即将实现")
+            self.update_button.setEnabled(False)
             
+            # 显示处理中的提示
+            QApplication.processEvents()
+            
+            # 调用激活接口
+            success, message, account_info = self.updater.check_activation_code(activation_code)
+            
+            if success:
+                # 更新界面显示
+                self.member_info.clear()
+                self.member_info.append(f"会员状态: 已激活")
+                self.member_info.append(f"到期时间: {account_info['expire_time']}")
+                self.member_info.append(f"剩余天数: {account_info['days_left']}天")
+                
+                # 显示成功消息
+                QMessageBox.information(self, "激活成功", 
+                    f"设备已成功激活！\n"
+                    f"到期时间: {account_info['expire_time']}\n"
+                    f"剩余天数: {account_info['days_left']}天")
+                
+                # 清空激活码输入框
+                self.activate_input.clear()
+                
+                logging.info(f"设备激活成功，到期时间: {account_info['expire_time']}")
+            else:
+                QMessageBox.warning(self, "激活失败", message)
+                logging.error(f"激活失败: {message}")
+                
         except Exception as e:
             logging.error(f"激活过程中发生错误: {str(e)}")
-            QMessageBox.warning(self, "错误", f"激活失败: {str(e)}")
+            QMessageBox.critical(self, "错误", f"激活过程发生错误: {str(e)}")
+        finally:
+            # 恢复按钮状态
+            self.activate_input.setEnabled(True)
+            self.update_button.setEnabled(True)
 
     def disable_cursor_update(self):
         """禁用Cursor版本更新"""

patch_cursor_get_machine_id.py

@@ -40,42 +40,50 @@ def get_cursor_paths() -> Tuple[str, str]:
         OSError: 当找不到有效路径或系统不支持时抛出
     """
     system = platform.system()
+    logger.info(f"当前操作系统: {system}")
 
-    paths_map = {
+    if system == "Darwin":  # macOS
-        "Darwin": {
+        base_path = "/Applications/Cursor.app/Contents/Resources/app"
-            "base": "/Applications/Cursor.app/Contents/Resources/app",
+        pkg_path = os.path.join(base_path, "package.json")
-            "package": "package.json",
+        main_path = os.path.join(base_path, "out", "main.js")
-            "main": "out/main.js",
+        
-        },
+        if not os.path.exists(pkg_path) or not os.path.exists(main_path):
-        "Windows": {
+            raise OSError("在 macOS 系统上未找到 Cursor 安装路径")
-            "base": os.path.join(
+            
-                os.getenv("LOCALAPPDATA", ""), "Programs", "Cursor", "resources", "app"
+        return pkg_path, main_path
-            ),
+        
-            "package": "package.json",
+    elif system == "Windows":
-            "main": "out/main.js",
+        base_path = os.path.join(
-        },
+            os.getenv("LOCALAPPDATA", ""), 
-        "Linux": {
+            "Programs", 
-            "bases": ["/opt/Cursor/resources/app", "/usr/share/cursor/resources/app"],
+            "Cursor", 
-            "package": "package.json",
+            "resources", 
-            "main": "out/main.js",
+            "app"
-        },
+        )
-    }
+        pkg_path = os.path.join(base_path, "package.json")
-
+        main_path = os.path.join(base_path, "out", "main.js")
-    if system not in paths_map:
+        
-        raise OSError(f"不支持的操作系统: {system}")
+        if not os.path.exists(pkg_path) or not os.path.exists(main_path):
-
+            raise OSError("在 Windows 系统上未找到 Cursor 安装路径")
-    if system == "Linux":
+            
-        for base in paths_map["Linux"]["bases"]:
+        return pkg_path, main_path
-            pkg_path = os.path.join(base, paths_map["Linux"]["package"])
+        
-            if os.path.exists(pkg_path):
+    elif system == "Linux":
-                return (pkg_path, os.path.join(base, paths_map["Linux"]["main"]))
+        linux_paths = [
+            "/opt/Cursor/resources/app",
+            "/usr/share/cursor/resources/app"
+        ]
+        
+        for base_path in linux_paths:
+            pkg_path = os.path.join(base_path, "package.json")
+            main_path = os.path.join(base_path, "out", "main.js")
+            if os.path.exists(pkg_path) and os.path.exists(main_path):
+                return pkg_path, main_path
+                
         raise OSError("在 Linux 系统上未找到 Cursor 安装路径")
-
+        
-    base_path = paths_map[system]["base"]
+    else:
-    return (
+        raise OSError(f"不支持的操作系统: {system}")
-        os.path.join(base_path, paths_map[system]["package"]),
-        os.path.join(base_path, paths_map[system]["main"]),
-    )
 
 
 def check_system_requirements(pkg_path: str, main_path: str) -> bool:
@@ -298,5 +306,24 @@ def patch_cursor_get_machine_id(restore_mode=False) -> None:
         sys.exit(1)
 
 
+# 添加patch函数作为主函数的别名
+def patch(restore_mode=False) -> bool:
+    """
+    patch函数，作为patch_cursor_get_machine_id的别名
+    
+    Args:
+        restore_mode: 是否为恢复模式
+        
+    Returns:
+        bool: 修补是否成功
+    """
+    try:
+        patch_cursor_get_machine_id(restore_mode)
+        return True
+    except Exception as e:
+        logger.error(f"修补失败: {str(e)}")
+        return False
+
+
 if __name__ == "__main__":
     patch_cursor_get_machine_id()

update_cursor_token.py

@@ -15,12 +15,14 @@ from exit_cursor import ExitCursor
 import go_cursor_help
 from logo import print_logo
 from typing import Tuple, Dict, Optional
+import time
+import requests.adapters
 
 class CursorTokenUpdater:
     def __init__(self):
         self.auth_manager = CursorAuthManager()
         self._hardware_id = None  # 延迟初始化硬件ID
-        
+
     @property
     def hardware_id(self) -> str:
         """获取硬件ID（延迟初始化）"""
@@ -30,68 +32,68 @@ class CursorTokenUpdater:
 
     def _get_hardware_id(self) -> str:
         """获取硬件唯一标识
-        方案1: CPU ID + 主板序列号 + BIOS序列号
+        macOS: 使用系统序列号和硬件UUID
-        方案2: 系统盘序列号 + Windows安装时间
+        Windows: CPU ID + 主板序列号 + BIOS序列号
-        方案3: 计算机名(最后的备选方案)
+        其他: 计算机名(最后的备选方案)
         """
         try:
-            # 创建startupinfo对象来隐藏命令行窗口
+            system = platform.system()
-            startupinfo = None
+            
-            if sys.platform == "win32":
+            if system == "Darwin":  # macOS
+                try:
+                    # 获取系统序列号
+                    serial_number = subprocess.check_output(['system_profiler', 'SPHardwareDataType']).decode()
+                    serial = ""
+                    for line in serial_number.split('\n'):
+                        if 'Serial Number' in line:
+                            serial = line.split(':')[1].strip()
+                            break
+                            
+                    # 获取硬件UUID
+                    ioreg_output = subprocess.check_output(['ioreg', '-d2', '-c', 'IOPlatformExpertDevice']).decode()
+                    uuid = ""
+                    for line in ioreg_output.split('\n'):
+                        if 'IOPlatformUUID' in line:
+                            uuid = line.split('=')[1].strip().replace('"', '').replace(' ', '')
+                            break
+                            
+                    if serial and uuid:
+                        combined = f"{serial}:{uuid}"
+                        hardware_id = hashlib.md5(combined.encode()).hexdigest()
+                        logging.info("使用macOS硬件信息生成ID成功")
+                        return hardware_id
+                except Exception as e:
+                    logging.warning(f"获取macOS硬件信息失败: {str(e)}")
+                    
+            elif system == "Windows":
+                # 创建startupinfo对象来隐藏命令行窗口
                 startupinfo = subprocess.STARTUPINFO()
                 startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
                 startupinfo.wShowWindow = subprocess.SW_HIDE
 
-            # 方案1: 尝试获取硬件信息
+                try:
-            try:
+                    # 获取CPU ID
-                # 获取CPU ID
+                    cpu_info = subprocess.check_output('wmic cpu get ProcessorId', startupinfo=startupinfo).decode()
-                cpu_info = subprocess.check_output('wmic cpu get ProcessorId', startupinfo=startupinfo).decode()
+                    cpu_id = cpu_info.split('\n')[1].strip()
-                cpu_id = cpu_info.split('\n')[1].strip()
-                
-                # 获取主板序列号
-                board_info = subprocess.check_output('wmic baseboard get SerialNumber', startupinfo=startupinfo).decode()
-                board_id = board_info.split('\n')[1].strip()
-                
-                # 获取BIOS序列号
-                bios_info = subprocess.check_output('wmic bios get SerialNumber', startupinfo=startupinfo).decode()
-                bios_id = bios_info.split('\n')[1].strip()
-                
-                # 如果所有信息都获取成功且有效
-                if all([cpu_id, board_id, bios_id]) and not all(x in ['', '0', 'None', 'To be filled by O.E.M.'] for x in [cpu_id, board_id, bios_id]):
-                    combined = f"{cpu_id}:{board_id}:{bios_id}"
-                    hardware_id = hashlib.md5(combined.encode()).hexdigest()
-                    logging.info("使用硬件信息生成ID成功")
-                    return hardware_id
                     
-            except Exception as e:
+                    # 获取主板序列号
-                logging.warning(f"方案1失败: {str(e)}")
+                    board_info = subprocess.check_output('wmic baseboard get SerialNumber', startupinfo=startupinfo).decode()
-
+                    board_id = board_info.split('\n')[1].strip()
-            # 方案2: 系统盘序列号 + Windows安装时间
-            try:
-                backup_info = []
-                
-                # 获取系统盘序列号
-                volume_info = subprocess.check_output('wmic logicaldisk where "DeviceID=\'C:\'" get VolumeSerialNumber', startupinfo=startupinfo).decode()
-                volume_serial = volume_info.split('\n')[1].strip()
-                if volume_serial and volume_serial not in ['', '0']:
-                    backup_info.append(("volume", volume_serial))
-                
-                # 获取Windows安装时间
-                os_info = subprocess.check_output('wmic os get InstallDate', startupinfo=startupinfo).decode()
-                install_date = os_info.split('\n')[1].strip()
-                if install_date:
-                    backup_info.append(("install", install_date))
-
-                if backup_info:
-                    combined = "|".join(f"{k}:{v}" for k, v in sorted(backup_info))
-                    hardware_id = hashlib.md5(combined.encode()).hexdigest()
-                    logging.info("使用系统信息生成ID成功")
-                    return hardware_id
                     
-            except Exception as e:
+                    # 获取BIOS序列号
-                logging.warning(f"方案2失败: {str(e)}")
+                    bios_info = subprocess.check_output('wmic bios get SerialNumber', startupinfo=startupinfo).decode()
+                    bios_id = bios_info.split('\n')[1].strip()
+                    
+                    # 如果所有信息都获取成功且有效
+                    if all([cpu_id, board_id, bios_id]) and not all(x in ['', '0', 'None', 'To be filled by O.E.M.'] for x in [cpu_id, board_id, bios_id]):
+                        combined = f"{cpu_id}:{board_id}:{bios_id}"
+                        hardware_id = hashlib.md5(combined.encode()).hexdigest()
+                        logging.info("使用Windows硬件信息生成ID成功")
+                        return hardware_id
+                except Exception as e:
+                    logging.warning(f"获取Windows硬件信息失败: {str(e)}")
 
-            # 方案3: 使用计算机名(最后的备选方案)
+            # 最后的备选方案：使用计算机名
             computer_name = platform.node()
             if computer_name:
                 hardware_id = hashlib.md5(computer_name.encode()).hexdigest()
@@ -227,17 +229,23 @@ class CursorTokenUpdater:
         """
         try:
             logging.info("开始重置机器码...")
-            resetter = MachineIDResetter()
+            if greater_than_0_45:
-            result = resetter.reset(greater_than_0_45)
+                # 对于0.45以上版本，使用go_cursor_help
-            
+                go_cursor_help.go_cursor_help()
-            if result:
+                logging.info("已调用go_cursor_help重置机器码")
-                logging.info("机器码重置成功")
-                # 重置后更新硬件ID缓存
-                self._hardware_id = None
                 return True
             else:
-                logging.error("机器码重置失败")
+                # 对于0.45及以下版本，使用传统方式
-                return False
+                resetter = MachineIDResetter()
+                result = resetter.reset_machine_ids()
+                if result:
+                    logging.info("机器码重置成功")
+                    # 重置后更新硬件ID缓存
+                    self._hardware_id = None
+                    return True
+                else:
+                    logging.error("机器码重置失败")
+                    return False
                 
         except Exception as e:
             logging.error(f"重置机器码时发生错误: {str(e)}")
@@ -268,10 +276,8 @@ class CursorTokenUpdater:
         """
         try:
             logging.info("正在退出Cursor进程...")
-            exit_handler = ExitCursor()
+            result = ExitCursor()
-            exit_handler.exit()
+            return result
-            logging.info("Cursor进程已退出")
-            return True
         except Exception as e:
             logging.error(f"退出Cursor进程时发生错误: {str(e)}")
             return False
@@ -291,34 +297,175 @@ class CursorTokenUpdater:
         print_logo()
         logging.info("=== 开始完整更新流程 ===")
         
-        # 1. 退出Cursor进程
+        try:
-        if not self.exit_cursor():
+            # 1. 退出Cursor进程
-            return False
+            if not self.exit_cursor():
-            
+                logging.error("退出Cursor进程失败")
-        # 2. 修补机器码获取方法
-        if not self.patch_machine_id():
-            return False
-            
-        # 3. 重置机器码
-        if not self.reset_machine_id(greater_than_0_45=True):
-            return False
-            
-        # 4. 如果没有提供认证信息，从API获取
-        if not all([email, access_token]):
-            success, error_msg, account_info = self.get_unused_account()
-            if not success:
-                logging.error(f"无法获取账号信息: {error_msg}")
                 return False
-            email = account_info["email"]
+                
-            access_token = account_info["access_token"]
+            # 2. 修补机器码获取方法
-            refresh_token = account_info["refresh_token"]
+            if not self.patch_machine_id():
+                logging.error("修补机器码获取方法失败")
+                return False
+                
+            # 3. 重置机器码
+            # 对于0.45以上版本，使用go_cursor_help
+            try:
+                go_cursor_help.go_cursor_help()
+                logging.info("已调用go_cursor_help重置机器码")
+            except Exception as e:
+                logging.error(f"使用go_cursor_help重置机器码失败: {str(e)}")
+                # 如果go_cursor_help失败，尝试使用传统方式
+                if not self.reset_machine_id(greater_than_0_45=False):
+                    logging.error("重置机器码失败")
+                    return False
+                
+            # 4. 如果没有提供认证信息，从API获取
+            if not all([email, access_token]):
+                success, error_msg, account_info = self.get_unused_account()
+                if not success:
+                    logging.error(f"无法获取账号信息: {error_msg}")
+                    return False
+                email = account_info["email"]
+                access_token = account_info["access_token"]
+                refresh_token = account_info["refresh_token"]
+                
+            # 5. 更新认证信息
+            if not self.update_auth_info(email, access_token, refresh_token):
+                logging.error("更新认证信息失败")
+                return False
+                
+            logging.info("=== 所有操作已完成 ===")
+            return True
             
-        # 5. 更新认证信息
+        except Exception as e:
-        if not self.update_auth_info(email, access_token, refresh_token):
+            logging.error(f"更新流程发生错误: {str(e)}")
             return False
+
+    def _get_network_error_message(self, error: Exception) -> str:
+        """获取网络错误的友好提示信息"""
+        if isinstance(error, requests.exceptions.ConnectTimeout):
+            return "连接服务器超时，请检查网络连接"
+        elif isinstance(error, requests.exceptions.ConnectionError):
+            return "无法连接到服务器，请检查网络连接"
+        elif isinstance(error, requests.exceptions.ReadTimeout):
+            return "读取服务器响应超时，请重试"
+        else:
+            return str(error)
             
-        logging.info("=== 所有操作已完成 ===")
+    def get_device_info(self) -> dict:
-        return True
+        """获取设备信息"""
+        return {
+            "os": platform.system(),
+            "os_version": platform.version(),
+            "machine": platform.machine(),
+            "hostname": platform.node(),
+            "hardware_id": self.hardware_id
+        }
+
+    def check_activation_code(self, code: str) -> tuple:
+        """检查激活码
+        
+        Args:
+            code: 激活码
+            
+        Returns:
+            tuple: (成功标志, 消息, 账号信息)
+        """
+        max_retries = 3  # 最大重试次数
+        retry_delay = 1  # 重试间隔(秒)
+        
+        for attempt in range(max_retries):
+            try:
+                data = {
+                    "machine_id": self.hardware_id,
+                    "code": code
+                }
+                
+                # 禁用SSL警告
+                urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+                
+                # 设置请求参数
+                request_kwargs = {
+                    "json": data,
+                    "headers": {
+                        "Content-Type": "application/json",
+                        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
+                        "Accept": "*/*",
+                        "Connection": "keep-alive"
+                    },
+                    "timeout": 10,  # 增加超时时间
+                    "verify": False  # 禁用SSL验证
+                }
+                
+                # 创建session
+                session = requests.Session()
+                session.verify = False
+                
+                # 设置重试策略
+                retry_strategy = urllib3.Retry(
+                    total=3,  # 总重试次数
+                    backoff_factor=0.5,  # 重试间隔
+                    status_forcelist=[500, 502, 503, 504]  # 需要重试的HTTP状态码
+                )
+                adapter = requests.adapters.HTTPAdapter(max_retries=retry_strategy)
+                session.mount("http://", adapter)
+                session.mount("https://", adapter)
+                
+                try:
+                    # 尝试发送请求
+                    response = session.post(
+                        "https://cursorapi.nosqli.com/admin/api.member/activate",
+                        **request_kwargs
+                    )
+                    response.raise_for_status()  # 检查HTTP状态码
+                    
+                    result = response.json()
+                    # 激活成功
+                    if result["code"] == 200:
+                        api_data = result["data"]
+                        # 构造标准的返回数据结构
+                        account_info = {
+                            "status": "active",
+                            "expire_time": api_data.get("expire_time", ""),
+                            "total_days": api_data.get("total_days", 0),
+                            "days_left": api_data.get("days_left", 0),
+                            "device_info": self.get_device_info()
+                        }
+                        return True, result["msg"], account_info
+                    # 激活码无效或已被使用
+                    elif result["code"] == 400:
+                        logging.warning(f"激活码无效或已被使用: {result.get('msg', '未知错误')}")
+                        return False, result.get("msg", "激活码无效或已被使用"), None
+                    # 其他错误情况
+                    else:
+                        error_msg = result.get("msg", "未知错误")
+                        if attempt < max_retries - 1:  # 如果还有重试机会
+                            logging.warning(f"第{attempt + 1}次尝试失败: {error_msg}, 准备重试...")
+                            time.sleep(retry_delay)
+                            continue
+                        logging.error(f"激活失败: {error_msg}")
+                        return False, error_msg, None
+                        
+                except requests.exceptions.RequestException as e:
+                    if attempt < max_retries - 1:  # 如果还有重试机会
+                        logging.warning(f"第{attempt + 1}次网络请求失败: {str(e)}, 准备重试...")
+                        time.sleep(retry_delay)
+                        continue
+                    error_msg = self._get_network_error_message(e)
+                    logging.error(f"网络请求失败: {error_msg}")
+                    return False, f"网络连接失败: {error_msg}", None
+                    
+            except Exception as e:
+                if attempt < max_retries - 1:  # 如果还有重试机会
+                    logging.warning(f"第{attempt + 1}次请求发生错误: {str(e)}, 准备重试...")
+                    time.sleep(retry_delay)
+                    continue
+                logging.error(f"激活失败: {str(e)}")
+                return False, f"激活失败: {str(e)}", None
+                
+        # 如果所有重试都失败了
+        return False, "多次尝试后激活失败，请检查网络连接或稍后重试", None
 
 def main():
     updater = CursorTokenUpdater()