From cdb6905f683a2ba2b77911ea7385ea621e53fe3b Mon Sep 17 00:00:00 2001
From: KimigaiiWuyi <444835641@qq.com>
Date: Sun, 12 Nov 2023 14:03:24 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20`mys=E8=AE=BE=E5=A4=87=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95`=E4=B9=9F=E6=94=AF=E6=8C=81=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E4=BC=A0=E5=85=A5`fp`=E5=92=8C`device=5Fid`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core_command/user_login/__init__.py       | 48 +++++++++++++------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/gsuid_core/plugins/core_command/user_login/__init__.py b/gsuid_core/plugins/core_command/user_login/__init__.py
index 841173d..f1b95fa 100644
--- a/gsuid_core/plugins/core_command/user_login/__init__.py
+++ b/gsuid_core/plugins/core_command/user_login/__init__.py
@@ -51,27 +51,45 @@ async def send_add_ck_msg(bot: Bot, ev: Event):
 
 @sv_core_user_addck.on_prefix(('mys设备登录'))
 async def send_add_device_msg(bot: Bot, ev: Event):
-    data: Dict[str, str] = json.loads(ev.text.strip())
+    try:
+        data: Dict[str, str] = json.loads(ev.text.strip())
+    except:  # noqa:E722
+        return await bot.send('绑定格式错误...')
 
-    device_id = mys_api.get_device_id()
-    seed_id, seed_time = mys_api.get_seed()
-    fp = await mys_api.generate_fp(
-        device_id,
-        data['deviceModel'],
-        data['deviceProduct'],
-        data['deviceName'],
-        data['deviceBoard'],
-        data['oaid'],
-        data['deviceFingerprint'],
-        seed_id,
-        seed_time,
-    )
+    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()
+        seed_id, seed_time = mys_api.get_seed()
+        fp = await mys_api.generate_fp(
+            device_id,
+            data['deviceModel'],
+            data['deviceProduct'],
+            data['deviceName'],
+            data['deviceBoard'],
+            data['oaid'],
+            data['deviceFingerprint'],
+            seed_id,
+            seed_time,
+        )
+        device_info = data['deviceFingerprint']
     await GsUser.update_data(
         ev.user_id,
         ev.bot_id,
         fp=fp,
         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)
     if user_list: