fix 连不上Github可能导致无法启动的问题

jxxghp · Feb 10, 2024 · e3faa38 · e3faa38
1 parent b75ec92
commit e3faa38
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/helper/plugin.py b/app/helper/plugin.py
@@ -35,7 +35,11 @@ def get_plugins(self, repo_url: str) -> Dict[str, dict]:
         res = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS,
                            timeout=10).get_res(f"{raw_url}package.json")
         if res:
-            return json.loads(res.text)
+            try:
+                return json.loads(res.text)
+            except json.JSONDecodeError:
+                logger.error(f"插件包数据解析失败：{res.text}")
+                return {}
         return {}
 
     @staticmethod

diff --git a/app/helper/resource.py b/app/helper/resource.py
@@ -34,7 +34,11 @@ def check(self):
         logger.info("开始检测资源包版本...")
         res = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS, timeout=10).get_res(self._repo)
         if res:
-            resource_info = json.loads(res.text)
+            try:
+                resource_info = json.loads(res.text)
+            except json.JSONDecodeError:
+                logger.error("资源包仓库数据解析失败！")
+                return
         else:
             logger.warn("无法连接资源包仓库！")
             return