From ada1b9bdad46cb6bdb71fa9e029371f5ded27026 Mon Sep 17 00:00:00 2001
From: kissnavel <xkn0722@gmail.com>
Date: Sun, 22 Sep 2024 19:31:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:'User-Agent'=E5=B0=9D=E8=AF=95=E5=86=99?=
 =?UTF-8?q?=E5=85=A5=E5=B7=B2=E7=BB=91=E5=AE=9A=E7=9A=84=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/authkey.js |  4 ++--
 lib/mysapi.js  | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/authkey.js b/lib/authkey.js
index f8f45e2..adc4b9b 100644
--- a/lib/authkey.js
+++ b/lib/authkey.js
@@ -1,7 +1,7 @@
 import fs from 'fs';
 import MysZZZApi from './mysapi.js';
 import YAML from 'yaml';
-import fetch from 'node-fetch';
+import request from '../utils/request.js';
 let User;
 try {
   User = (await import('../../xiaoyao-cvs-plugin/model/user.js')).default;
@@ -84,7 +84,7 @@ export const getAuthKey = async (e, _user, zzzUid, authAppid = 'csc') => {
   // 获取链接
   const { url, headers, body } = api.getUrl(type);
   // 发送请求
-  let res = await fetch(url, {
+  let res = await request(url, {
     method: 'POST',
     headers,
     body,
diff --git a/lib/mysapi.js b/lib/mysapi.js
index f04be7c..b5ca4e5 100644
--- a/lib/mysapi.js
+++ b/lib/mysapi.js
@@ -131,12 +131,18 @@ export default class MysZZZApi extends MysApi {
       headers['x-rpc-device_id'] = data.deviceId;
     }
     // 如果有绑定设备信息，写入绑定设备信息，否则写入默认设备信息
-    if (data?.deviceInfo && data?.modelName) {
+    if (data?.deviceInfo && data?.modelName && data?.osVersion) {
+      const osVersion = data.osVersion;
+      const modelName = data.modelName;
       const deviceBrand = data.deviceInfo?.split('/')[0];
+      const deviceDisplay = data.deviceInfo?.split('/')[3];
       try {
-        headers['x-rpc-device_name'] = `${deviceBrand} ${data.modelName}`;
-        headers['x-rpc-device_model'] = data.modelName;
+        headers['x-rpc-device_name'] = `${deviceBrand} ${modelName}`;
+        headers['x-rpc-device_model'] = modelName;
         headers['x-rpc-csm_source'] = 'myself';
+        // 国际服不需要绑定设备，故写入的'User-Agent'为国服
+        headers['User-Agent'] =
+          `Mozilla/5.0 (Linux; Android ${osVersion}; ${modelName} Build/${deviceDisplay}; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.179 Mobile Safari/537.36 miHoYoBBS/2.73.1`;
       } catch (error) {
         logger.error(`[ZZZ]设备信息解析失败：${error.message}`);
       }