PaiGramTeam/PaiGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PaiGram.git synced 2024-11-16 12:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix incorrect data return from DS function

Browse Source
This commit is contained in:
洛水居室 2022-11-14 15:47:44 +08:00
parent cbf23737cd
commit 2cbefbc193
No known key found for this signature in database
GPG Key ID: C9DE87DA724B88FC
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/apihelper/helpers.py
View File

@ -4,8 +4,7 @@ import random
import string import string
import time import time
import uuid import uuid
from typing import Mapping from typing import Mapping, Any, Optional
from urllib.parse import urlencode
RECOGNIZE_SERVER = { RECOGNIZE_SERVER = {
"1": "cn_gf01", "1": "cn_gf01",
@ -28,7 +27,7 @@ def hex_digest(text):
return _md5.hexdigest() return _md5.hexdigest()
def get_ds(ds_type: str = None, new_ds: bool = False, data: Mapping[str, str] = None, params: Mapping[str, str] = None): def get_ds(ds_type: str = None, new_ds: bool = False, data: Any = None, params: Optional[Mapping[str, Any]] = None):
"""DS 算法 """DS 算法
代码来自 https://github.com/y1ndan/genshinhelper 代码来自 https://github.com/y1ndan/genshinhelper
:param ds_type: 1:ios 2:android 4:pc web 5:mobile web :param ds_type: 1:ios 2:android 4:pc web 5:mobile web
@ -42,7 +41,7 @@ def get_ds(ds_type: str = None, new_ds: bool = False, data: Mapping[str, str] =
t = str(int(time.time())) t = str(int(time.time()))
r = str(random.randint(100001, 200000)) # nosec r = str(random.randint(100001, 200000)) # nosec
b = json.dumps(data) if data else '' b = json.dumps(data) if data else ''
q = urlencode(params) if params else '' q = "&".join(f"{k}={v}" for k, v in sorted(params.items())) if params else ''
c = hex_digest(f'salt={salt}&t={t}&r={r}&b={b}&q={q}') c = hex_digest(f'salt={salt}&t={t}&r={r}&b={b}&q={q}')
return f'{t},{r},{c}' return f'{t},{r},{c}'