fix(core): 信任系统证书，并添加网络代理地址配置项 #50

app/core/config.py

@@ -262,6 +262,7 @@ class GlobalConfig(LQConfig):
         self.update_ThreadNumb = RangeConfigItem(
             "Update", "ThreadNumb", 8, RangeValidator(1, 32)
         )
+        self.update_ProxyAddress = ConfigItem("Update", "ProxyAddress", "")
         self.update_ProxyUrlList = ConfigItem(
             "Update", "ProxyUrlList", [], UrlListValidator()
         )
@@ -706,7 +707,7 @@ class GeneralSubConfig(LQConfig):
 
 class AppConfig(GlobalConfig):
 
-    VERSION = "4.4.0.5"
+    VERSION = "4.4.0.6"
 
     stage_refreshed = Signal()
     PASSWORD_refreshed = Signal()
@@ -780,7 +781,6 @@ class AppConfig(GlobalConfig):
 
         self.init_logger()
         self.check_data()
-        self.get_stage()
         logger.info("程序初始化完成")
 
     def init_logger(self) -> None:
@@ -810,8 +810,8 @@ class AppConfig(GlobalConfig):
         logger.info("日志记录器初始化完成")
 
     def get_stage(self) -> None:
+        """从MAA服务器获取活动关卡信息"""
 
-        # 从MAA服务器获取活动关卡信息
         network = Network.add_task(
             mode="get",
             url="https://api.maa.plus/MaaAssistantArknights/api/gui/StageActivity.json",

app/core/network.py

@@ -30,6 +30,7 @@ from PySide6.QtCore import QObject, QThread, QEventLoop
 import re
 import time
 import requests
+import truststore
 from pathlib import Path
 
 
@@ -51,12 +52,21 @@ class NetworkThread(QThread):
         self.url = url
         self.path = path
 
+        from .config import Config
+
+        self.proxies = {
+            "http": Config.get(Config.update_ProxyAddress),
+            "https": Config.get(Config.update_ProxyAddress),
+        }
+
         self.status_code = None
         self.response_json = None
         self.error_message = None
 
         self.loop = QEventLoop()
 
+        truststore.inject_into_ssl()
+
     @logger.catch
     def run(self) -> None:
         """运行网络请求线程"""
@@ -73,7 +83,7 @@ class NetworkThread(QThread):
 
         for _ in range(self.max_retries):
             try:
-                response = requests.get(url, timeout=self.timeout)
+                response = requests.get(url, timeout=self.timeout, proxies=self.proxies)
                 self.status_code = response.status_code
                 self.response_json = response.json()
                 self.error_message = None
@@ -92,7 +102,7 @@ class NetworkThread(QThread):
         response = None
 
         try:
-            response = requests.get(url, timeout=10)
+            response = requests.get(url, timeout=10, proxies=self.proxies)
             if response.status_code == 200:
                 with open(path, "wb") as file:
                     file.write(response.content)