v3.3.9版本更新: 1.优化UI界面和按钮样式 2.改进使用说明文字,增加颜色标注 3.优化加载对话框样式 4.添加请求节流机制,防止重复提交 5.完善错误处理和提示信息 6.优化会员状态检查逻辑 7.改进禁用更新功能的实现
This commit is contained in:
@@ -50,9 +50,41 @@ class AccountSwitcher:
|
||||
self.package_json = self.app_path / "package.json"
|
||||
self.auth_manager = CursorAuthManager()
|
||||
self.config = Config()
|
||||
self.hardware_id = get_hardware_id()
|
||||
self.hardware_id = self.get_hardware_id() # 先获取硬件ID
|
||||
self.registry = CursorRegistry() # 添加注册表操作工具类
|
||||
|
||||
logging.info(f"初始化硬件ID: {self.hardware_id}")
|
||||
|
||||
def get_hardware_id(self) -> str:
|
||||
"""获取硬件唯一标识"""
|
||||
try:
|
||||
# 创建startupinfo对象来隐藏命令行窗口
|
||||
startupinfo = None
|
||||
if sys.platform == "win32":
|
||||
startupinfo = subprocess.STARTUPINFO()
|
||||
startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
|
||||
startupinfo.wShowWindow = subprocess.SW_HIDE
|
||||
|
||||
# 获取CPU信息
|
||||
cpu_info = subprocess.check_output('wmic cpu get ProcessorId', startupinfo=startupinfo).decode()
|
||||
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()
|
||||
|
||||
# 组合信息并生成哈希
|
||||
combined = f"{cpu_id}:{board_id}:{bios_id}"
|
||||
return hashlib.md5(combined.encode()).hexdigest()
|
||||
except Exception as e:
|
||||
logging.error(f"获取硬件ID失败: {str(e)}")
|
||||
# 如果获取失败,使用UUID作为备选方案
|
||||
return str(uuid.uuid4())
|
||||
|
||||
def get_cursor_version(self) -> str:
|
||||
"""获取Cursor版本号"""
|
||||
try:
|
||||
@@ -71,199 +103,103 @@ class AccountSwitcher:
|
||||
import platform
|
||||
import socket
|
||||
import requests
|
||||
import subprocess
|
||||
|
||||
# 获取操作系统信息
|
||||
os_info = f"{platform.system()} {platform.version()}"
|
||||
os_info = f"{platform.system()} {platform.release()}"
|
||||
|
||||
# 获取设备名称
|
||||
device_name = platform.node()
|
||||
|
||||
# 获取地理位置(可选)
|
||||
try:
|
||||
ip_info = requests.get('https://ipapi.co/json/', timeout=5).json()
|
||||
# 在Windows上使用wmic获取更详细的计算机名称
|
||||
if platform.system() == "Windows":
|
||||
startupinfo = subprocess.STARTUPINFO()
|
||||
startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
|
||||
computer_info = subprocess.check_output('wmic computersystem get model', startupinfo=startupinfo).decode()
|
||||
device_name = computer_info.split('\n')[1].strip()
|
||||
else:
|
||||
device_name = platform.node()
|
||||
except:
|
||||
device_name = platform.node()
|
||||
|
||||
# 获取IP地址
|
||||
try:
|
||||
ip_response = requests.get('https://api.ipify.org?format=json', timeout=5)
|
||||
ip_address = ip_response.json()['ip']
|
||||
except:
|
||||
ip_address = "未知"
|
||||
|
||||
# 获取地理位置
|
||||
try:
|
||||
ip_info = requests.get(f'https://ipapi.co/{ip_address}/json/', timeout=5).json()
|
||||
location = f"{ip_info.get('country_name', '')}-{ip_info.get('region', '')}-{ip_info.get('city', '')}"
|
||||
except:
|
||||
location = ""
|
||||
location = "未知"
|
||||
|
||||
return {
|
||||
"os": os_info,
|
||||
"device_name": device_name,
|
||||
"ip": ip_address,
|
||||
"location": location
|
||||
}
|
||||
except Exception as e:
|
||||
logging.error(f"获取设备信息失败: {str(e)}")
|
||||
return {
|
||||
"os": "Windows 10",
|
||||
"os": "Windows",
|
||||
"device_name": "未知设备",
|
||||
"location": ""
|
||||
"ip": "未知",
|
||||
"location": "未知"
|
||||
}
|
||||
|
||||
def check_activation_code(self, code: str) -> Tuple[bool, str, Optional[Dict]]:
|
||||
"""验证激活码
|
||||
def check_activation_code(self, code: str) -> tuple:
|
||||
"""检查激活码
|
||||
|
||||
Args:
|
||||
code: 激活码
|
||||
|
||||
Returns:
|
||||
Tuple[bool, str, Optional[Dict]]: (是否成功, 提示消息, 账号信息)
|
||||
tuple: (成功标志, 消息, 账号信息)
|
||||
"""
|
||||
try:
|
||||
# 获取当前状态和历史记录
|
||||
member_info = self.config.load_member_info()
|
||||
activation_history = member_info.get("activation_records", []) if member_info else []
|
||||
data = {
|
||||
"machine_id": self.hardware_id,
|
||||
"code": code
|
||||
}
|
||||
|
||||
# 分割多个激活码
|
||||
codes = [c.strip() for c in code.split(',')]
|
||||
success_codes = []
|
||||
failed_codes = []
|
||||
activation_results = []
|
||||
|
||||
# 获取设备信息
|
||||
device_info = self.get_device_info()
|
||||
|
||||
# 逐个验证激活码
|
||||
for single_code in codes:
|
||||
if not single_code:
|
||||
continue
|
||||
|
||||
# 验证激活码
|
||||
endpoint = "https://cursorapi.nosqli.com/admin/api.member/activate"
|
||||
data = {
|
||||
"code": single_code,
|
||||
"machine_id": self.hardware_id,
|
||||
"os": device_info["os"],
|
||||
"device_name": device_info["device_name"],
|
||||
"location": device_info["location"]
|
||||
response = requests.post(
|
||||
self.config.get_api_url("activate"),
|
||||
json=data,
|
||||
headers={"Content-Type": "application/json"},
|
||||
timeout=10
|
||||
)
|
||||
|
||||
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()
|
||||
}
|
||||
|
||||
headers = {
|
||||
"Content-Type": "application/json"
|
||||
}
|
||||
|
||||
try:
|
||||
response = requests.post(
|
||||
endpoint,
|
||||
json=data,
|
||||
headers=headers,
|
||||
timeout=10
|
||||
)
|
||||
|
||||
response_data = response.json()
|
||||
if response_data.get("code") == 200:
|
||||
result_data = response_data.get("data", {})
|
||||
logging.info(f"激活码 {single_code} 验证成功: {response_data.get('msg', '')}")
|
||||
activation_results.append(result_data)
|
||||
success_codes.append(single_code)
|
||||
elif response_data.get("code") == 400:
|
||||
error_msg = response_data.get("msg", "参数错误")
|
||||
if "已被使用" in error_msg or "已激活" in error_msg:
|
||||
logging.warning(f"激活码 {single_code} 已被使用")
|
||||
failed_codes.append(f"{single_code} (已被使用)")
|
||||
else:
|
||||
logging.error(f"激活码 {single_code} 验证失败: {error_msg}")
|
||||
failed_codes.append(f"{single_code} ({error_msg})")
|
||||
elif response_data.get("code") == 500:
|
||||
error_msg = response_data.get("msg", "系统错误")
|
||||
logging.error(f"激活码 {single_code} 验证失败: {error_msg}")
|
||||
failed_codes.append(f"{single_code} ({error_msg})")
|
||||
else:
|
||||
error_msg = response_data.get("msg", "未知错误")
|
||||
logging.error(f"激活码 {single_code} 验证失败: {error_msg}")
|
||||
failed_codes.append(f"{single_code} ({error_msg})")
|
||||
|
||||
except requests.RequestException as e:
|
||||
logging.error(f"激活码 {single_code} 请求失败: {str(e)}")
|
||||
failed_codes.append(f"{single_code} (网络请求失败)")
|
||||
except Exception as e:
|
||||
logging.error(f"激活码 {single_code} 处理失败: {str(e)}")
|
||||
failed_codes.append(f"{single_code} (处理失败)")
|
||||
|
||||
if not success_codes:
|
||||
failed_msg = "\n".join(failed_codes)
|
||||
return False, f"激活失败:\n{failed_msg}", None
|
||||
|
||||
try:
|
||||
# 使用最后一次激活的结果作为最终状态
|
||||
final_result = activation_results[-1]
|
||||
|
||||
# 合并历史记录
|
||||
new_activation_records = final_result.get("activation_records", [])
|
||||
if activation_history:
|
||||
# 保留旧的激活记录,避免重复
|
||||
existing_codes = {record.get("code") for record in activation_history}
|
||||
for record in new_activation_records:
|
||||
if record.get("code") not in existing_codes:
|
||||
activation_history.append(record)
|
||||
else:
|
||||
activation_history = new_activation_records
|
||||
|
||||
# 保存会员信息,包含完整的历史记录
|
||||
member_info = {
|
||||
"hardware_id": final_result.get("machine_id", self.hardware_id),
|
||||
"expire_time": final_result.get("expire_time", ""),
|
||||
"days_left": final_result.get("days_left", 0),
|
||||
"total_days": final_result.get("total_days", 0),
|
||||
"status": final_result.get("status", "inactive"),
|
||||
"device_info": final_result.get("device_info", device_info),
|
||||
"activation_time": final_result.get("activation_time", ""),
|
||||
"activation_records": activation_history # 使用合并后的历史记录
|
||||
}
|
||||
self.config.save_member_info(member_info)
|
||||
|
||||
# 生成结果消息
|
||||
message = f"激活成功\n"
|
||||
|
||||
# 显示每个成功激活码的信息
|
||||
for i, result in enumerate(activation_results, 1):
|
||||
message += f"\n第{i}个激活码:\n"
|
||||
message += f"- 新增天数: {result.get('added_days', 0)}天\n"
|
||||
activation_time = result.get('activation_time', '')
|
||||
if activation_time:
|
||||
try:
|
||||
from datetime import datetime
|
||||
dt = datetime.strptime(activation_time, "%Y-%m-%d %H:%M:%S")
|
||||
activation_time = dt.strftime("%Y-%m-%d %H:%M:%S")
|
||||
except:
|
||||
pass
|
||||
message += f"- 激活时间: {activation_time}\n"
|
||||
|
||||
message += f"\n最终状态:"
|
||||
message += f"\n- 总天数: {final_result.get('total_days', 0)}天"
|
||||
message += f"\n- 剩余天数: {final_result.get('days_left', 0)}天"
|
||||
|
||||
# 格式化到期时间显示
|
||||
expire_time = final_result.get('expire_time', '')
|
||||
if expire_time:
|
||||
try:
|
||||
dt = datetime.strptime(expire_time, "%Y-%m-%d %H:%M:%S")
|
||||
expire_time = dt.strftime("%Y-%m-%d %H:%M:%S")
|
||||
except:
|
||||
pass
|
||||
message += f"\n- 到期时间: {expire_time}"
|
||||
|
||||
# 显示完整的激活记录历史
|
||||
message += "\n\n历史激活记录:"
|
||||
for record in activation_history:
|
||||
activation_time = record.get('activation_time', '')
|
||||
if activation_time:
|
||||
try:
|
||||
dt = datetime.strptime(activation_time, "%Y-%m-%d %H:%M:%S")
|
||||
activation_time = dt.strftime("%Y-%m-%d %H:%M:%S")
|
||||
except:
|
||||
pass
|
||||
message += f"\n- 激活码: {record.get('code', '')}"
|
||||
message += f"\n 天数: {record.get('days', 0)}天"
|
||||
message += f"\n 时间: {activation_time}\n"
|
||||
|
||||
if failed_codes:
|
||||
message += f"\n\n以下激活码验证失败:\n" + "\n".join(failed_codes)
|
||||
|
||||
return True, message, member_info
|
||||
|
||||
except Exception as e:
|
||||
logging.error(f"处理激活结果时出错: {str(e)}")
|
||||
return False, f"处理激活结果时出错: {str(e)}", None
|
||||
|
||||
return True, result["msg"], account_info
|
||||
return False, result["msg"], {
|
||||
"status": "inactive",
|
||||
"expire_time": "",
|
||||
"total_days": 0,
|
||||
"days_left": 0,
|
||||
"device_info": self.get_device_info()
|
||||
}
|
||||
|
||||
except Exception as e:
|
||||
logging.error(f"验证激活码时出错: {str(e)}")
|
||||
return False, f"验证激活码时出错: {str(e)}", None
|
||||
return False, f"激活失败: {str(e)}", {
|
||||
"status": "inactive",
|
||||
"expire_time": "",
|
||||
"total_days": 0,
|
||||
"days_left": 0,
|
||||
"device_info": self.get_device_info()
|
||||
}
|
||||
|
||||
def reset_machine_id(self) -> bool:
|
||||
"""重置机器码"""
|
||||
@@ -356,93 +292,76 @@ class AccountSwitcher:
|
||||
logging.error(f"激活过程出错: {str(e)}")
|
||||
return False, f"激活失败: {str(e)}"
|
||||
|
||||
def get_member_status(self) -> Optional[Dict]:
|
||||
def get_member_status(self) -> dict:
|
||||
"""获取会员状态
|
||||
|
||||
Returns:
|
||||
Optional[Dict]: 会员状态信息
|
||||
dict: 会员状态信息,包含:
|
||||
- status: 状态(active/inactive/expired)
|
||||
- expire_time: 到期时间
|
||||
- total_days: 总天数
|
||||
- days_left: 剩余天数
|
||||
- device_info: 设备信息
|
||||
"""
|
||||
try:
|
||||
# 读取保存的会员信息
|
||||
member_info = self.config.load_member_info()
|
||||
|
||||
# 构造状态检查请求
|
||||
endpoint = "https://cursorapi.nosqli.com/admin/api.member/status"
|
||||
data = {
|
||||
"machine_id": self.hardware_id
|
||||
}
|
||||
headers = {
|
||||
"Content-Type": "application/json"
|
||||
|
||||
api_url = self.config.get_api_url("status")
|
||||
logging.info(f"正在检查会员状态...")
|
||||
logging.info(f"API URL: {api_url}")
|
||||
logging.info(f"请求数据: {data}")
|
||||
|
||||
response = requests.post(
|
||||
api_url,
|
||||
json=data,
|
||||
headers={"Content-Type": "application/json"},
|
||||
timeout=10
|
||||
)
|
||||
|
||||
result = response.json()
|
||||
logging.info(f"状态检查响应: {result}")
|
||||
|
||||
if result.get("code") in [1, 200]: # 兼容两种响应码
|
||||
api_data = result.get("data", {})
|
||||
# 构造标准的返回数据结构
|
||||
return {
|
||||
"status": api_data.get("status", "inactive"),
|
||||
"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() # 添加设备信息
|
||||
}
|
||||
else:
|
||||
error_msg = result.get("msg", "未知错误")
|
||||
logging.error(f"获取状态失败: {error_msg}")
|
||||
return {
|
||||
"status": "inactive",
|
||||
"expire_time": "",
|
||||
"total_days": 0,
|
||||
"days_left": 0,
|
||||
"device_info": self.get_device_info()
|
||||
}
|
||||
|
||||
except requests.exceptions.RequestException as e:
|
||||
logging.error(f"API请求失败: {str(e)}")
|
||||
return {
|
||||
"status": "inactive",
|
||||
"expire_time": "",
|
||||
"total_days": 0,
|
||||
"days_left": 0,
|
||||
"device_info": self.get_device_info()
|
||||
}
|
||||
|
||||
try:
|
||||
response = requests.post(endpoint, json=data, headers=headers, timeout=10)
|
||||
response_data = response.json()
|
||||
|
||||
if response_data.get("code") == 200:
|
||||
# 正常状态
|
||||
data = response_data.get("data", {})
|
||||
status = data.get("status", "inactive")
|
||||
|
||||
# 构造会员信息
|
||||
member_info = {
|
||||
"hardware_id": data.get("machine_id", self.hardware_id),
|
||||
"expire_time": data.get("expire_time", ""),
|
||||
"days_left": data.get("days_left", 0), # 使用days_left
|
||||
"total_days": data.get("total_days", 0), # 使用total_days
|
||||
"status": status,
|
||||
"activation_records": data.get("activation_records", []) # 保存激活记录
|
||||
}
|
||||
|
||||
# 打印调试信息
|
||||
logging.info(f"API返回数据: {data}")
|
||||
logging.info(f"处理后的会员信息: {member_info}")
|
||||
|
||||
self.config.save_member_info(member_info)
|
||||
return member_info
|
||||
|
||||
elif response_data.get("code") == 401:
|
||||
# 未激活或已过期
|
||||
logging.warning("会员未激活或已过期")
|
||||
return self._get_inactive_status()
|
||||
|
||||
elif response_data.get("code") == 400:
|
||||
# 参数错误
|
||||
error_msg = response_data.get("msg", "参数错误")
|
||||
logging.error(f"获取会员状态失败: {error_msg}")
|
||||
return self._get_inactive_status()
|
||||
|
||||
elif response_data.get("code") == 500:
|
||||
# 系统错误
|
||||
error_msg = response_data.get("msg", "系统错误")
|
||||
logging.error(f"获取会员状态失败: {error_msg}")
|
||||
return self._get_inactive_status()
|
||||
|
||||
else:
|
||||
# 其他未知错误
|
||||
error_msg = response_data.get("msg", "未知错误")
|
||||
logging.error(f"获取会员状态失败: {error_msg}")
|
||||
return self._get_inactive_status()
|
||||
|
||||
except requests.RequestException as e:
|
||||
logging.error(f"请求会员状态失败: {str(e)}")
|
||||
return self._get_inactive_status()
|
||||
|
||||
except Exception as e:
|
||||
logging.error(f"获取会员状态出错: {str(e)}")
|
||||
return self._get_inactive_status()
|
||||
|
||||
def _get_inactive_status(self) -> Dict:
|
||||
"""获取未激活状态的默认信息"""
|
||||
return {
|
||||
"hardware_id": self.hardware_id,
|
||||
"expire_time": "",
|
||||
"days": 0,
|
||||
"total_days": 0,
|
||||
"status": "inactive",
|
||||
"last_activation": {},
|
||||
"activation_records": []
|
||||
}
|
||||
logging.error(f"获取会员状态失败: {str(e)}")
|
||||
return {
|
||||
"status": "inactive",
|
||||
"expire_time": "",
|
||||
"total_days": 0,
|
||||
"days_left": 0,
|
||||
"device_info": self.get_device_info()
|
||||
}
|
||||
|
||||
def restart_cursor(self) -> bool:
|
||||
"""重启Cursor编辑器
|
||||
|
||||
Reference in New Issue
Block a user