From ed59a90d78c1ee50b328d3ea27e80b24d15120f9 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sun, 19 Nov 2023 09:45:13 +0800 Subject: [PATCH] fix update timeout --- app/helper/plugin.py | 4 ++-- app/helper/resource.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/helper/plugin.py b/app/helper/plugin.py index c518a82d..9f867ba5 100644 --- a/app/helper/plugin.py +++ b/app/helper/plugin.py @@ -50,7 +50,7 @@ class PluginHelper(metaclass=Singleton): 获取插件的文件列表 """ file_api = f"https://api.github.com/repos/{user}/{repo}/contents/plugins/{_p.lower()}" - r = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS, timeout=10).get_res(file_api) + r = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS, timeout=30).get_res(file_api) if not r or r.status_code != 200: return None, f"连接仓库失败:{r.status_code} - {r.reason}" ret = r.json() @@ -68,7 +68,7 @@ class PluginHelper(metaclass=Singleton): if item.get("download_url"): # 下载插件文件 res = RequestUtils(proxies=settings.PROXY, - headers=settings.GITHUB_HEADERS, timeout=30).get_res(item["download_url"]) + headers=settings.GITHUB_HEADERS, timeout=60).get_res(item["download_url"]) if not res: return False, f"文件 {item.get('name')} 下载失败!" elif res.status_code != 200: diff --git a/app/helper/resource.py b/app/helper/resource.py index 67f44e08..8006c05c 100644 --- a/app/helper/resource.py +++ b/app/helper/resource.py @@ -75,7 +75,7 @@ class ResourceHelper(metaclass=Singleton): if need_updates: # 下载文件信息列表 r = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS, - timeout=10).get_res(self._files_api) + timeout=30).get_res(self._files_api) if not r or r.status_code != 200: return None, f"连接仓库失败:{r.status_code} - {r.reason}" files_info = r.json() @@ -84,9 +84,9 @@ class ResourceHelper(metaclass=Singleton): if not save_path: continue if item.get("download_url"): - # 下载插件文件 + # 下载资源文件 res = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS, - timeout=60).get_res(item["download_url"]) + timeout=180).get_res(item["download_url"]) if not res: logger.error(f"文件 {item.get('name')} 下载失败!") elif res.status_code != 200: