diff --git a/app/api/endpoints/system.py b/app/api/endpoints/system.py index 36c48049..c5dedacb 100644 --- a/app/api/endpoints/system.py +++ b/app/api/endpoints/system.py @@ -163,12 +163,7 @@ def latest_version(_: schemas.TokenPayload = Depends(verify_token)): """ 查询Github所有Release版本 """ - headers = {} - if settings.GITHUB_TOKEN: - headers = { - "Authorization": f"Bearer {settings.GITHUB_TOKEN}" - } - version_res = RequestUtils(proxies=settings.PROXY, headers=headers).get_res( + version_res = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS).get_res( f"https://api.github.com/repos/jxxghp/MoviePilot/releases") if version_res: ver_json = version_res.json() diff --git a/app/chain/system.py b/app/chain/system.py index 512c7b88..e47c7be6 100644 --- a/app/chain/system.py +++ b/app/chain/system.py @@ -87,12 +87,7 @@ class SystemChain(ChainBase, metaclass=Singleton): """ 获取最新版本 """ - headers = {} - if settings.GITHUB_TOKEN: - headers = { - "Authorization": f"Bearer {settings.GITHUB_TOKEN}" - } - version_res = RequestUtils(proxies=settings.PROXY, headers=headers).get_res( + version_res = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS).get_res( "https://api.github.com/repos/jxxghp/MoviePilot/releases/latest") if version_res: ver_json = version_res.json() diff --git a/app/core/config.py b/app/core/config.py index d3d6dbff..f738248f 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -323,6 +323,17 @@ class Settings(BaseSettings): return Path(self.DOWNLOAD_ANIME_PATH) return self.SAVE_TV_PATH + @property + def GITHUB_HEADERS(self): + """ + Github请求头 + """ + if self.GITHUB_TOKEN: + return { + "Authorization": f"Bearer {self.GITHUB_TOKEN}" + } + return {} + def __init__(self, **kwargs): super().__init__(**kwargs) with self.CONFIG_PATH as p: diff --git a/app/helper/plugin.py b/app/helper/plugin.py index 595f399c..de60ddca 100644 --- a/app/helper/plugin.py +++ b/app/helper/plugin.py @@ -49,12 +49,7 @@ class PluginHelper(metaclass=Singleton): 获取插件的文件列表 """ file_api = f"https://api.github.com/repos/{user}/{repo}/contents/plugins/{_p.lower()}" - headers = {} - if settings.GITHUB_TOKEN: - headers = { - "Authorization": f"Bearer {settings.GITHUB_TOKEN}" - } - r = RequestUtils(proxies=settings.PROXY, headers=headers).get_res(file_api) + r = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS).get_res(file_api) if not r or r.status_code != 200: return None, f"连接仓库失败:{r.status_code} - {r.reason}" ret = r.json()