From e3faa388cf34446106f4efcbdb6166564055d75f Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sat, 10 Feb 2024 20:38:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=BF=9E=E4=B8=8D=E4=B8=8AGithub?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helper/plugin.py   | 6 +++++-
 app/helper/resource.py | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/helper/plugin.py b/app/helper/plugin.py
index 76aacb85..9135fa68 100644
--- a/app/helper/plugin.py
+++ b/app/helper/plugin.py
@@ -35,7 +35,11 @@ class PluginHelper(metaclass=Singleton):
         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
index 47aa6ac1..20e9213f 100644
--- a/app/helper/resource.py
+++ b/app/helper/resource.py
@@ -34,7 +34,11 @@ class ResourceHelper(metaclass=Singleton):
         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