diff --git a/gsuid_core/plugins/core_command/user_login/__init__.py b/gsuid_core/plugins/core_command/user_login/__init__.py index b9e4d8a..48944ee 100644 --- a/gsuid_core/plugins/core_command/user_login/__init__.py +++ b/gsuid_core/plugins/core_command/user_login/__init__.py @@ -49,26 +49,35 @@ 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): - # ev.text = device $ model_name $ oaid $ device_info - # ev.text = diting $ 220812C $ 1f1971472fd $ OnePlus/PHK110/OP5913L1:13/ - data = ev.text.split('$') + # ev.text = device + model_name + device_type + board + oaid + device_info + # ev.text = diting + 220812C + OP11 + taro + 1f12fd + One/PHK110/OP11:13/ + data = ev.text.split('+') uid = await get_uid(bot, ev, GsBind) - if len(data) != 4 or uid is None: + if len(data) != 6 or uid is None: return await bot.send( - '登陆格式错误...\n请按照device $ model_name $ oaid $ device_info的方式输入' + '登陆格式错误...\n请按照device + model_name + ' + 'device_type + board + oaid + device_info的方式输入' ) device_id = mys_api.get_device_id() seed_id, seed_time = mys_api.get_seed() - device, model_name, oaid, device_info = ( + device, model_name, device_type, board, oaid, device_info = ( data[0].strip(), data[1].strip(), data[2].strip(), data[3].strip(), + data[4].strip(), + data[5].strip(), ) fp = await mys_api.generate_fp( - device_id, model_name, device, oaid, device_info, seed_id, seed_time - ) - await GsUser.update_data_by_uid_without_bot_id( - uid, fp=fp, device_id=device_id + device_id, + model_name, + device, + device_type, + board, + oaid, + device_info, + seed_id, + seed_time, ) + await GsUser.update_data_by_xx({'uid': uid}, fp=fp, device_id=device_id) await bot.send('设备绑定成功!') diff --git a/gsuid_core/utils/api/mys/request.py b/gsuid_core/utils/api/mys/request.py index c6ac034..a5eedb5 100644 --- a/gsuid_core/utils/api/mys/request.py +++ b/gsuid_core/utils/api/mys/request.py @@ -164,6 +164,8 @@ class BaseMysApi: device_id, 'PHK110', 'PHK110', + 'OP5913L1', + 'taro', '1f1971b188c472f0', 'OnePlus/PHK110/OP5913L1:13/' 'SKQ1.221119.001/T.1328291_b9_41:user/release-keys', @@ -176,12 +178,14 @@ class BaseMysApi: device_id: str, model_name: str, device: str, + device_type: str, + board: str, oaid: str, device_info: str, seed_id: str, seed_time: str, ) -> str: - ext_fields = f'''{{"cpuType":"arm64-v8a","romCapacity":"512","productName":"{device}","romRemain":"422","manufacturer":"XiaoMi","appMemory":"512","hostname":"dg02-pool03-kvm87","screenSize":"1240x2662","osVersion":"13","aaid":"{self.generate_ID()}","vendor":"中国联通","accelerometer":"1.4883357x7.1712894x6.2847486","buildTags":"release-keys","model":"{model_name}","brand":"XiaoMi","oaid":"{oaid}","hardware":"qcom","deviceType":"{model_name}","devId":"REL","serialNumber":"unknown","buildTime":"1687848011000","buildUser":"root","ramCapacity":"469679","magnetometer":"20.081251x-27.487501x2.1937501","display":"{model_name}_13.1.0.181(CN01)","ramRemain":"215344","deviceInfo":"{device_info}","gyroscope":"0.030226856x0.014647375x0.010652636","vaid":"{self.generate_ID()}","buildType":"user","sdkVersion":"33","board":"{device}"}}''' # noqa + ext_fields = f'''{{"cpuType":"arm64-v8a","romCapacity":"512","productName":"{device}","romRemain":"422","manufacturer":"XiaoMi","appMemory":"512","hostname":"dg02-pool03-kvm87","screenSize":"1240x2662","osVersion":"13","aaid":"{self.generate_ID()}","vendor":"中国联通","accelerometer":"1.4883357x7.1712894x6.2847486","buildTags":"release-keys","model":"{model_name}","brand":"XiaoMi","oaid":"{oaid}","hardware":"qcom","deviceType":"{device_type}","devId":"REL","serialNumber":"unknown","buildTime":"1687848011000","buildUser":"root","ramCapacity":"469679","magnetometer":"20.081251x-27.487501x2.1937501","display":"{model_name}_13.1.0.181(CN01)","ramRemain":"215344","deviceInfo":"{device_info}","gyroscope":"0.030226856x0.014647375x0.010652636","vaid":"{self.generate_ID()}","buildType":"user","sdkVersion":"33","board":"{board}"}}''' # noqa body = { 'device_id': self.generate_seed(16),