diff --git a/model/mhyTopUpLogin.js b/model/mhyTopUpLogin.js index 1b31da00..ae30e537 100644 --- a/model/mhyTopUpLogin.js +++ b/model/mhyTopUpLogin.js @@ -58,10 +58,13 @@ export default class mysTopLogin { return false } let raw = JSON.parse(res?.data?.payload?.raw) - let UserData = await this.user.getData("getTokenByGameToken", raw,false) - let ck = await this.user.getData("getCookieAccountInfoByGameToken", raw,false) + let UserData = await this.user.getData("getTokenByGameToken", raw, false) + let ltokenData = await this.user.getData("exchange", { token: UserData.data?.token?.token, mid: UserData.data?.user_info?.mid }, false) + let cookies = `uid=${UserData.data?.user_info?.aid}&stoken=${UserData.data?.token?.token}` + if (UserData?.data?.user_info?.mid) cookies += `&mid=${UserData?.data?.user_info?.mid}` + let ck = await this.user.getData("bbsGetCookie", { cookies }, false) return { - cookie: `ltoken=${UserData.data?.token?.token};ltuid=${UserData.data?.user_info?.aid};cookie_token=${ck.data?.cookie_token}`, + cookie: `ltoken=${ltokenData.data?.token?.token};ltuid=${UserData.data?.user_info?.aid};cookie_token=${ck.data?.cookie_token}`, stoken: `stoken=${UserData.data?.token?.token};stuid=${UserData.data?.user_info?.aid};mid=${UserData?.data?.user_info.mid}` } } diff --git a/model/mys/mihoyoApi.js b/model/mys/mihoyoApi.js index 6d300491..bf485093 100644 --- a/model/mys/mihoyoApi.js +++ b/model/mys/mihoyoApi.js @@ -295,6 +295,18 @@ export default class miHoYoApi { }, types: 'pass' }, + exchange: { + url: `${mys.pass_api}/account/ma-cn-session/app/exchange`, + body: { + "src_token": { + "token": data.token, + "token_type": 1 + }, + "mid": data.mid, + "dst_token_type": 2 + }, + types: 'pass' + }, getCookieAccountInfoByGameToken: { url: `${mys.web_api}/auth/api/getCookieAccountInfoByGameToken`, query: `account_id=${data.uid}&game_token=${data.token}`