优化更新: 1. 修复版本显示和检查逻辑 2. 优化打包目录结构为两位版本号(3.4.4 -> 3.4)

utils/version_manager.py

@@ -6,6 +6,7 @@ from typing import Optional, Dict, Any
 import json
 import logging
 from urllib.parse import quote, unquote
+from pathlib import Path
 
 class VersionManager:
     """版本管理器
@@ -20,15 +21,25 @@ class VersionManager:
     
     def __init__(self):
         self.base_url = "https://cursorapi.nosqli.com"
+        # 获取项目根目录路径
+        self.root_path = Path(__file__).parent.parent
         self.current_version = self._get_current_version()
         self.platform = "windows" if sys.platform.startswith("win") else "mac" if sys.platform.startswith("darwin") else "linux"
         
     def _get_current_version(self) -> str:
         """获取当前版本号"""
         try:
-            with open("version.txt", "r") as f:
-                return f.read().strip()
-        except FileNotFoundError:
+            version_file = self.root_path / "version.txt"
+            if not version_file.exists():
+                logging.error(f"版本文件不存在: {version_file}")
+                return "0.0.0"
+                
+            with open(version_file, "r", encoding="utf-8") as f:
+                version = f.read().strip()
+                logging.info(f"当前版本: {version}")
+                return version
+        except Exception as e:
+            logging.error(f"读取版本号失败: {str(e)}")
             return "0.0.0"
             
     def _handle_response(self, response: requests.Response) -> Dict[str, Any]:
@@ -82,8 +93,10 @@ class VersionManager:
         """检查是否有更新"""
         try:
             url = f"{self.base_url}/admin/api.version/check"
+            current_version = self.current_version.lstrip('v')  # 移除可能存在的v前缀
+            
             params = {
-                "version": self.current_version,
+                "version": current_version,
                 "platform": self.platform
             }
             logging.info(f"正在请求: {url}")
@@ -99,7 +112,19 @@ class VersionManager:
             logging.info(f"响应头: {dict(response.headers)}")
             logging.info(f"响应内容: {response.text}")
             
-            return self._handle_response(response)
+            result = self._handle_response(response)
+            
+            # 确保返回的数据包含版本信息
+            if result["code"] == 0 and result.get("data"):
+                data = result["data"]
+                if "version_info" in data:
+                    version_info = data["version_info"]
+                    # 确保版本号格式一致
+                    if "version_no" in version_info:
+                        version_info["version_no"] = version_info["version_no"].lstrip('v')
+                
+            return result
+            
         except requests.exceptions.Timeout:
             logging.error("检查更新超时")
             return {"code": -1, "msg": "请求超时，请检查网络连接", "data": None}
@@ -145,15 +170,28 @@ class VersionManager:
         Returns:
             tuple: (是否有更新, 是否强制更新, 版本信息)
         """
-        result = self.check_update()
-        if result["code"] == 0 and result["data"]:
-            data = result["data"]
-            return (
-                data["has_update"],
-                bool(data.get("is_force")),
-                data.get("version_info")
-            )
-        return False, False, None
+        try:
+            result = self.check_update()
+            if result["code"] == 0 and result["data"]:
+                data = result["data"]
+                version_info = data.get("version_info", {})
+                
+                # 比较版本号(移除v前缀)
+                current = self.current_version.lstrip('v')
+                latest = version_info.get("version_no", "0.0.0").lstrip('v')
+                
+                # 使用packaging.version进行版本比较
+                has_update = version.parse(latest) > version.parse(current)
+                
+                return (
+                    has_update,
+                    bool(data.get("is_force")),
+                    version_info
+                )
+            return False, False, None
+        except Exception as e:
+            logging.error(f"检查更新失败: {str(e)}")
+            return False, False, None
 
     def download_update(self, download_url: str, save_path: str) -> tuple[bool, str]:
         """下载更新文件