修复-10001

This commit is contained in:
RBAmeto 2023-10-18 20:48:51 +08:00 committed by GitHub
parent 551ad5856f
commit dbcb3651c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -265,22 +265,7 @@ class BaseMysApi:
for _ in range(2): for _ in range(2):
print(header) print(header)
if isinstance(params, Dict):
header['DS'] = get_ds_token(
'&'.join(
[
f'{k}={v}'
for k, v in sorted(
params.items(), key=lambda x: x[0]
)
]
)
)
if isinstance(data, Dict):
header['DS'] = get_ds_token(
'',
data,
)
async with client.request( async with client.request(
method, method,
url=url, url=url,
@ -315,9 +300,7 @@ class BaseMysApi:
header['x-rpc-device_fp'] = new_fp header['x-rpc-device_fp'] = new_fp
return retcode return retcode
else: else:
header['x-rpc-challenge_game'] = ( header['x-rpc-challenge_game'] = '6' if self.is_sr else '2'
'6' if self.is_sr else '2'
)
header['x-rpc-page'] = ( header['x-rpc-page'] = (
'3.1.3_#/rpg' if self.is_sr else '3.1.3_#/ys' '3.1.3_#/rpg' if self.is_sr else '3.1.3_#/ys'
) )
@ -327,6 +310,16 @@ class BaseMysApi:
return 114514 return 114514
else: else:
header['x-rpc-challenge'] = ch header['x-rpc-challenge'] = ch
if 'DS' in header:
if isinstance(params, Dict):
q = '&'.join(
[f'{k}={v}' for k, v in sorted(
params.items(), key=lambda x: x[0]
)]
)
else:
q = ''
header['DS'] = get_ds_token(q, data)
elif retcode != 0: elif retcode != 0:
return retcode return retcode
else: else: