feat: 禁用证书检测

Author: huangjunsen0406

src/core/ota.py

@@ -1,6 +1,7 @@
 import asyncio
 import json
 import socket
+import ssl
 
 import aiohttp
 
@@ -132,9 +133,17 @@ async def get_ota_config(self):
         payload = self.build_payload()
 
         try:
+            # 禁用SSL证书验证以支持自签名证书
+            ssl_context = ssl.create_default_context()
+            ssl_context.check_hostname = False
+            ssl_context.verify_mode = ssl.CERT_NONE
+
             # 使用aiohttp异步发送请求
             timeout = aiohttp.ClientTimeout(total=10)
-            async with aiohttp.ClientSession(timeout=timeout) as session:
+            connector = aiohttp.TCPConnector(ssl=ssl_context)
+            async with aiohttp.ClientSession(
+                timeout=timeout, connector=connector
+            ) as session:
                 async with session.post(
                     self.ota_version_url, headers=headers, json=payload
                 ) as response:

src/utils/common_utils.py

@@ -324,9 +324,3 @@ def handle_verification_code(text: str) -> None:
         return
 
     copy_to_clipboard(code)
-
-    from src.utils.config_manager import ConfigManager
-
-    config = ConfigManager.get_instance()
-    ota_url = config.get_config("SYSTEM_OPTIONS.NETWORK.AUTHORIZATION_URL", "")
-    open_url(ota_url)

src/views/activation/activation_window.py

@@ -428,19 +428,26 @@ def _on_data_ready(self, data):
 
     def _on_retry_clicked(self):
         """
-        重新激活按钮点击.
+        跳转激活按钮点击 - 打开激活网页.
         """
-        self.logger.info("用户请求重新激活")
+        self.logger.info("用户点击跳转激活")
 
-        # 检查是否已经关闭
-        if self.is_shutdown_requested():
-            return
-
-        # 重置状态
-        self.activation_model.reset_activation_code()
-
-        # 重新开始初始化
-        self.create_task(self._start_initialization(), "retry_initialization")
+        # 从配置中获取激活URL并打开
+        try:
+            from src.utils.common_utils import open_url
+            from src.utils.config_manager import ConfigManager
+
+            config = ConfigManager.get_instance()
+            ota_url = config.get_config("SYSTEM_OPTIONS.NETWORK.AUTHORIZATION_URL", "")
+            if ota_url:
+                open_url(ota_url)
+                self.update_status("已打开激活页面，请在浏览器中输入验证码")
+            else:
+                self.logger.error("未配置激活URL")
+                self.update_status("错误: 未配置激活URL")
+        except Exception as e:
+            self.logger.error(f"打开激活页面失败: {e}")
+            self.update_status(f"打开激活页面失败: {e}")
 
     def _on_copy_code_clicked(self):
         """

src/views/settings/components/system_options/system_options_widget.py

@@ -231,6 +231,15 @@ def get_config_data(self) -> dict:
         config_data = {}
 
         try:
+            # 客户端ID和设备ID
+            client_id = self._get_text_value("client_id_edit")
+            if client_id:
+                config_data["SYSTEM_OPTIONS.CLIENT_ID"] = client_id
+
+            device_id = self._get_text_value("device_id_edit")
+            if device_id:
+                config_data["SYSTEM_OPTIONS.DEVICE_ID"] = device_id
+
             # 系统选项 - 网络配置
             ota_url = self._get_text_value("ota_url_edit")
             if ota_url:

src/views/settings/settings_window.ui

@@ -61,10 +61,7 @@
            <item row="0" column="1">
             <widget class="QLineEdit" name="client_id_edit">
              <property name="readOnly">
-              <bool>true</bool>
-             </property>
-             <property name="styleSheet">
-              <string>background-color: #f5f5f5;</string>
+              <bool>false</bool>
              </property>
             </widget>
            </item>
@@ -81,10 +78,7 @@
            <item row="1" column="1">
             <widget class="QLineEdit" name="device_id_edit">
              <property name="readOnly">
-              <bool>true</bool>
-             </property>
-             <property name="styleSheet">
-              <string>background-color: #f5f5f5;</string>
+              <bool>false</bool>
              </property>
             </widget>
            </item>