From c28f5a373e4feb16737a9b7261eb022bb203dba0 Mon Sep 17 00:00:00 2001 From: kissnavel Date: Mon, 2 Sep 2024 23:32:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=BB=98=E8=AE=A4=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=88=E5=8A=A1=E5=BF=85=E5=88=A0=E9=99=A4?= =?UTF-8?q?device=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD=E7=9A=84oai?= =?UTF-8?q?d=E6=95=B0=E5=80=BC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- defSet/device.yaml | 2 +- lib/mysapi.js | 4 ++-- lib/mysapi/tool.js | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 084f102..0d44e0c 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ git clone --depth=1 https://github.com/ZZZure/ZZZ-Plugin.git ./plugins/ZZZ-Plugi ## 绑定设备 -机器人会自带一个设备参数模拟真机进行请求，但是这个设备参数会被所有使用机器人的用户共同使用，因此，米游社**大概率**会认为此设备有问题，是非法请求，因此在遇到米游社抛出对应错误时，需要每个人绑定真实设备参数进行请求。 +机器人会自带一个设备参数模拟真机进行请求，但是这个设备参数会被所有使用机器人的用户共同使用，因此，米游社**大概率**会认为此设备有问题，是非法请求，因此在遇到米游社抛出对应错误时，需要每个人绑定真实设备参数进行请求（目前默认设备信息的oaid数值已改为随机数尝试避免，先前更新后使用默认设备信息的务必删除device配置文件中的oaid数值）。 如果需要绑定设备，请发送 `%绑定设备帮助` 进行查看如何绑定。第一种方法就是抓包，此种方法危害性较小，技术难度相对较高，但是IOS与Android设备通用。 diff --git a/defSet/device.yaml b/defSet/device.yaml index 411632a..c80a863 100644 --- a/defSet/device.yaml +++ b/defSet/device.yaml @@ -2,6 +2,6 @@ productName: J9110 productType: J9110 modelName: J9110 -oaid: 17a40451-9947-4430-a4fe-29f15e8497c1 +oaid: deviceInfo: Sony/J9110/J9110:11/55.2.A.4.332/055002A004033203408384484:user/release-keys board: msmnile \ No newline at end of file diff --git a/lib/mysapi.js b/lib/mysapi.js index 5d46255..7b25b93 100644 --- a/lib/mysapi.js +++ b/lib/mysapi.js @@ -222,9 +222,9 @@ export default class MysZZZApi extends MysApi { Referer: 'https://act.mihoyo.com/', }; const os = { - app_version: '2.55.0', + app_version: '2.57.1', User_Agent: - 'Mozilla/5.0 (Linux; Android 11; J9110 Build/55.2.A.4.332; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.179 Mobile Safari/537.36 miHoYoBBSOversea/2.55.0', + 'Mozilla/5.0 (Linux; Android 11; J9110 Build/55.2.A.4.332; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.179 Mobile Safari/537.36 miHoYoBBSOversea/2.57.1', client_type: '2', Origin: 'https://act.hoyolab.com', X_Requested_With: 'com.mihoyo.hoyolab', diff --git a/lib/mysapi/tool.js b/lib/mysapi/tool.js index a5be028..f43e78c 100644 --- a/lib/mysapi/tool.js +++ b/lib/mysapi/tool.js @@ -82,7 +82,7 @@ export default class ZZZApiTool { productName = deviceCfg.productName ? _.get(deviceCfg, 'productName') : _.get(defDeviceCfg, 'productName'), deviceType = deviceCfg.productType ? _.get(deviceCfg, 'productType') : _.get(defDeviceCfg, 'productType'), modelName = deviceCfg.modelName ? _.get(deviceCfg, 'modelName') : _.get(defDeviceCfg, 'modelName'), - oaid = deviceCfg.oaid ? _.get(deviceCfg, 'oaid') : _.get(defDeviceCfg, 'oaid'), + oaid = deviceCfg.oaid ? _.get(deviceCfg, 'oaid') : this.uuid, deviceInfo = deviceCfg.deviceInfo ? _.get(deviceCfg, 'deviceInfo') : _.get(defDeviceCfg, 'deviceInfo'), board = deviceCfg.board ? _.get(deviceCfg, 'board') : _.get(defDeviceCfg, 'board'), } = data; @@ -98,7 +98,7 @@ export default class ZZZApiTool { bbs_device_id: `${this.uuid}`, device_fp: '38d7faa51d2b6', device_id: '35315696b7071100', - ext_fields: `{"proxyStatus":1,"isRoot":1,"romCapacity":"512","deviceName":"Xperia 1","productName":"${productName}","romRemain":"456","hostname":"BuildHost","screenSize":"1096x2434","isTablet":0,"aaid":"${this.uuid}","model":"${modelName}","brand":"${deviceBrand}","hardware":"qcom","deviceType":"${deviceType}","devId":"REL","serialNumber":"unknown","sdCapacity":107433,"buildTime":"1633631032000","buildUser":"BuildUser","simState":1,"ramRemain":"96757","appUpdateTimeDiff":1722171241616,"deviceInfo":"${deviceInfo}","vaid":"${this.uuid}","buildType":"user","sdkVersion":"30","ui_mode":"UI_MODE_TYPE_NORMAL","isMockLocation":0,"cpuType":"arm64-v8a","isAirMode":0,"ringMode":2,"chargeStatus":1,"manufacturer":"${deviceBrand}","emulatorStatus":0,"appMemory":"512","osVersion":"11","vendor":"unknown","accelerometer":"-0.084346995x8.73799x4.6301117","sdRemain":96600,"buildTags":"release-keys","packageName":"com.mihoyo.hyperion","networkType":"WiFi","oaid":"${oaid}","debugStatus":1,"ramCapacity":"107433","magnetometer":"-13.9125x-17.8875x-5.4750004","display":"${modelName}","appInstallTimeDiff":1717065300325,"packageVersion":"2.20.2","gyroscope":"0.017714571x-4.5813544E-4x0.0015271181","batteryStatus":76,"hasKeyboard":0,"board":"${board}"}`, + ext_fields: `{"proxyStatus":1,"isRoot":1,"romCapacity":"512","deviceName":"${modelName}","productName":"${productName}","romRemain":"456","hostname":"BuildHost","screenSize":"1096x2434","isTablet":0,"aaid":"${this.uuid}","model":"${modelName}","brand":"${deviceBrand}","hardware":"qcom","deviceType":"${deviceType}","devId":"REL","serialNumber":"unknown","sdCapacity":107433,"buildTime":"1633631032000","buildUser":"BuildUser","simState":1,"ramRemain":"96757","appUpdateTimeDiff":1722171241616,"deviceInfo":"${deviceInfo}","vaid":"${this.uuid}","buildType":"user","sdkVersion":"30","ui_mode":"UI_MODE_TYPE_NORMAL","isMockLocation":0,"cpuType":"arm64-v8a","isAirMode":0,"ringMode":2,"chargeStatus":1,"manufacturer":"${deviceBrand}","emulatorStatus":0,"appMemory":"512","osVersion":"11","vendor":"unknown","accelerometer":"-0.084346995x8.73799x4.6301117","sdRemain":96600,"buildTags":"release-keys","packageName":"com.mihoyo.hyperion","networkType":"WiFi","oaid":"${oaid}","debugStatus":1,"ramCapacity":"107433","magnetometer":"-13.9125x-17.8875x-5.4750004","display":"${modelName}","appInstallTimeDiff":1717065300325,"packageVersion":"2.20.2","gyroscope":"0.017714571x-4.5813544E-4x0.0015271181","batteryStatus":76,"hasKeyboard":0,"board":"${board}"}`, platform: '2', seed_id: `${this.uuid}`, seed_time: new Date().getTime() + '', @@ -137,7 +137,7 @@ export default class ZZZApiTool { hoyolab_device_id: `${this.uuid}`, platform: '2', seed_time: new Date().getTime() + '', - ext_fields: `{"proxyStatus":1,"isRoot":1,"romCapacity":"512","deviceName":"Xperia 1","productName":"${productName}","romRemain":"483","hostname":"BuildHost","screenSize":"1096x2434","isTablet":0,"model":"${modelName}","brand":"${deviceBrand}","hardware":"qcom","deviceType":"${deviceType}","oaid":"${oaid}","devId":"REL","serialNumber":"unknown","sdCapacity":107433,"buildTime":"1633631032000","buildUser":"BuildUser","simState":1,"ramRemain":"98076","appUpdateTimeDiff":1716545162858,"deviceInfo":"${deviceInfo}","buildType":"user","sdkVersion":"30","ui_mode":"UI_MODE_TYPE_NORMAL","isMockLocation":0,"cpuType":"arm64-v8a","isAirMode":0,"ringMode":2,"app_set_id":"${this.uuid}","chargeStatus":1,"manufacturer":"${deviceBrand}","emulatorStatus":0,"appMemory":"512","adid":"${this.uuid}","osVersion":"11","vendor":"unknown","accelerometer":"-0.9233304x7.574181x6.472585","sdRemain":97931,"buildTags":"release-keys","packageName":"com.mihoyo.hoyolab","networkType":"WiFi","debugStatus":1,"ramCapacity":"107433","magnetometer":"-9.075001x-27.300001x-3.3000002","display":"${modelName}","appInstallTimeDiff":1716489549794,"packageVersion":"","gyroscope":"0.027029991x-0.04459185x0.032222193","batteryStatus":45,"hasKeyboard":0,"board":"${board}"}`, + ext_fields: `{"proxyStatus":1,"isRoot":1,"romCapacity":"512","deviceName":"${modelName}","productName":"${productName}","romRemain":"474","hostname":"BuildHost","screenSize":"1096x2434","isTablet":0,"model":"${modelName}","brand":"${deviceBrand}","hardware":"qcom","deviceType":"${deviceType}","devId":"REL","serialNumber":"unknown","sdCapacity":107433,"buildTime":"1633631032000","buildUser":"BuildUser","simState":1,"ramRemain":"96715","appUpdateTimeDiff":1722171191009,"deviceInfo":"${deviceInfo}","buildType":"user","sdkVersion":"30","ui_mode":"UI_MODE_TYPE_NORMAL","isMockLocation":0,"cpuType":"arm64-v8a","isAirMode":0,"ringMode":2,"app_set_id":"${this.uuid}","chargeStatus":1,"manufacturer":"${deviceBrand}","emulatorStatus":0,"appMemory":"512","adid":"${this.uuid}","osVersion":"11","vendor":"unknown","accelerometer":"-0.22372891x-1.5332011x9.802497","sdRemain":96571,"buildTags":"release-keys","packageName":"com.mihoyo.hoyolab","networkType":"WiFi","debugStatus":1,"ramCapacity":"107433","magnetometer":"3.73125x-10.668751x3.7687502","display":"${modelName}","appInstallTimeDiff":1716489549794,"packageVersion":"","gyroscope":"0.18386503x-0.006413896x-0.008857286","batteryStatus":77,"hasKeyboard":0,"board":"${board}"}`, app_name: 'bbs_oversea', device_fp: '38d7f2352506c', },