From 42072f71ae78788239c8d7b4ab4da258e1dc1e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wuyi=E6=97=A0=E7=96=91?= <444835641@qq.com> Date: Sun, 12 Mar 2023 12:31:18 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E5=8F=96=E6=B6=88=E8=99=9A?= =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84SSL=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GenshinUID/genshinuid_config/config_default.py | 10 ++-------- GenshinUID/genshinuid_config/gs_config.py | 4 ++-- GenshinUID/genshinuid_config/models.py | 4 ++-- GenshinUID/gsuid_utils/api/akashadata/request.py | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/GenshinUID/genshinuid_config/config_default.py b/GenshinUID/genshinuid_config/config_default.py index 73662630..555c0d31 100644 --- a/GenshinUID/genshinuid_config/config_default.py +++ b/GenshinUID/genshinuid_config/config_default.py @@ -1,12 +1,6 @@ from typing import Dict -from .models import ( - GSC, - GsStrConfig, - GsBoolConfig, - GsDictConfig, - GsListIntConfig, -) +from .models import GSC, GsStrConfig, GsBoolConfig, GsDictConfig, GsListConfig CONIFG_DEFAULT: Dict[str, GSC] = { 'proxy': GsStrConfig('设置代理', '设置国际服的代理地址', ''), @@ -21,7 +15,7 @@ CONIFG_DEFAULT: Dict[str, GSC] = { '原神公告推送群组', {}, ), - 'Ann_Ids': GsListIntConfig( + 'Ann_Ids': GsListConfig( '推送公告ID', '原神公告推送ID列表', [], diff --git a/GenshinUID/genshinuid_config/gs_config.py b/GenshinUID/genshinuid_config/gs_config.py index 5ba23f81..7b8f2501 100644 --- a/GenshinUID/genshinuid_config/gs_config.py +++ b/GenshinUID/genshinuid_config/gs_config.py @@ -9,7 +9,7 @@ from .models import ( GsStrConfig, GsBoolConfig, GsDictConfig, - GsListIntConfig, + GsListConfig, GsListStrConfig, ) @@ -69,7 +69,7 @@ class StringConfig: ... @overload - def get_config(self, key: LIST_INT_CONFIG) -> GsListIntConfig: + def get_config(self, key: LIST_INT_CONFIG) -> GsListConfig: ... @overload diff --git a/GenshinUID/genshinuid_config/models.py b/GenshinUID/genshinuid_config/models.py index 06a4d1af..3ccee659 100644 --- a/GenshinUID/genshinuid_config/models.py +++ b/GenshinUID/genshinuid_config/models.py @@ -24,10 +24,10 @@ class GsListStrConfig(GsConfig, tag=True): data: List[str] -class GsListIntConfig(GsConfig, tag=True): +class GsListConfig(GsConfig, tag=True): data: List[int] GSC = Union[ - GsDictConfig, GsBoolConfig, GsListIntConfig, GsListStrConfig, GsStrConfig + GsDictConfig, GsBoolConfig, GsListConfig, GsListStrConfig, GsStrConfig ] diff --git a/GenshinUID/gsuid_utils/api/akashadata/request.py b/GenshinUID/gsuid_utils/api/akashadata/request.py index 40cb8f5c..a1cdf4d8 100644 --- a/GenshinUID/gsuid_utils/api/akashadata/request.py +++ b/GenshinUID/gsuid_utils/api/akashadata/request.py @@ -22,7 +22,7 @@ async def get_akasha_abyss_info() -> AkashaAbyssData: AkashaAbyssData: 虚空数据库 API 深渊出场数据响应数据 ''' # noqa: E501 async with AsyncClient( - headers={'User-Agent': f'gsuid-utils/{__version__}'}, + headers={'User-Agent': f'gsuid-utils/{__version__}'}, verify=False ) as client: req = await client.get(url=AKASHA_ABYSS_URL) raw = req.text.lstrip('var static_abyss_total =')