mys设备登录也支持直接传入fpdevice_id

This commit is contained in:
KimigaiiWuyi 2023-11-12 14:03:24 +08:00
parent ac081c5b4d
commit cdb6905f68

View File

@ -51,8 +51,25 @@ async def send_add_ck_msg(bot: Bot, ev: Event):
@sv_core_user_addck.on_prefix(('mys设备登录')) @sv_core_user_addck.on_prefix(('mys设备登录'))
async def send_add_device_msg(bot: Bot, ev: Event): async def send_add_device_msg(bot: Bot, ev: Event):
try:
data: Dict[str, str] = json.loads(ev.text.strip()) data: Dict[str, str] = json.loads(ev.text.strip())
except: # noqa:E722
return await bot.send('绑定格式错误...')
if 'fp' in data and ('device_id' in data or 'deviceId' in data):
fp = data['fp']
if 'device_id' in data:
device_id = data['device_id']
else:
device_id = data['deviceId']
if 'device_info' in data:
device_info = data['device_info']
elif 'deviceInfo' in data:
device_info = data['deviceInfo']
else:
device_info = 'Unknown/Unknown/Unknown'
else:
device_id = mys_api.get_device_id() device_id = mys_api.get_device_id()
seed_id, seed_time = mys_api.get_seed() seed_id, seed_time = mys_api.get_seed()
fp = await mys_api.generate_fp( fp = await mys_api.generate_fp(
@ -66,12 +83,13 @@ async def send_add_device_msg(bot: Bot, ev: Event):
seed_id, seed_id,
seed_time, seed_time,
) )
device_info = data['deviceFingerprint']
await GsUser.update_data( await GsUser.update_data(
ev.user_id, ev.user_id,
ev.bot_id, ev.bot_id,
fp=fp, fp=fp,
device_id=device_id, device_id=device_id,
device_info=data['deviceFingerprint'], device_info=device_info,
) )
user_list = await GsUser.select_data_list(ev.user_id, ev.bot_id) user_list = await GsUser.select_data_list(ev.user_id, ev.bot_id)
if user_list: if user_list: