From d32d7b69f19ad61afac9ca3d634117ae69979cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= Date: Fri, 7 Mar 2025 11:10:59 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/Womsxd/MihoyoBBSTools/issues/237 --- src/components/userScripts/tus-mission.vue | 42 ++++++++-------------- src/web/request/apiHubReq.ts | 18 ++++++---- 2 files changed, 26 insertions(+), 34 deletions(-) diff --git a/src/components/userScripts/tus-mission.vue b/src/components/userScripts/tus-mission.vue index 3a20e1af..f1b10edb 100644 --- a/src/components/userScripts/tus-mission.vue +++ b/src/components/userScripts/tus-mission.vue @@ -108,12 +108,7 @@ async function tryRefresh(): Promise { await TGLogger.ScriptSep("米游币任务", false); return; } - const ck = { - stoken: cookie.value.stoken, - stuid: cookie.value.stuid, - mid: cookie.value.mid, - }; - await refreshState(ck); + await refreshState(cookie.value); await TGLogger.ScriptSep("米游币任务", false); loadScript.value = false; loadState.value = false; @@ -134,19 +129,8 @@ async function tryAuto(): Promise { await TGLogger.ScriptSep("米游币任务", false); return; } - const ck = { - stoken: cookie.value.stoken, - stuid: cookie.value.stuid, - mid: cookie.value.mid, - }; - const ckPost = { ltoken: cookie.value.ltoken, ltuid: cookie.value.ltuid }; - await refreshState(ck); - const signFind = parseMissions.value.find((i) => i.key === "continuous_sign"); - if (signFind && !signFind.status) { - await autoSign(ck); - } else { - await TGLogger.Script("[米游币任务]未找到打卡任务或今日已打卡"); - } + await refreshState(cookie.value); + await autoSign(cookie.value); const postFilter = parseMissions.value.filter((i) => i.key !== "continuous_sign"); if (postFilter.every((i) => i.status)) { await TGLogger.Script("[米游币任务]所有任务已完成"); @@ -166,10 +150,12 @@ async function tryAuto(): Promise { if (viewFind) viewCnt = viewFind.process; await TGLogger.Script("[米游币任务]获取帖子列表"); const listResp = await painterReq.forum.recent(26, 2, 2, undefined, 20); + const ckShare = { stoken: cookie.value.stoken, stuid: cookie.value.stuid, mid: cookie.value.mid }; + const ckPost = { ltoken: cookie.value.ltoken, ltuid: cookie.value.ltuid }; for (const post of listResp.list) { if (!isShare) { await TGLogger.Script(`[米游币任务]正在分享帖子${post.post.post_id}`); - const shareResp = await apiHubReq.post.share(post.post.post_id, ck); + const shareResp = await apiHubReq.post.share(post.post.post_id, ckShare); if (shareResp.retcode === 0) { await TGLogger.Script("[米游币任务]分享成功"); isShare = true; @@ -220,17 +206,18 @@ async function tryAuto(): Promise { } } await TGLogger.Script("[米游币任务]任务执行完毕，即将刷新任务状态"); - await refreshState(ck); + await refreshState(cookie.value); await TGLogger.ScriptSep("米游币任务", false); loadScript.value = false; loadMission.value = false; } -async function refreshState(ck: Record): Promise { +async function refreshState(ck: TGApp.App.Account.Cookie): Promise { + const ckState = { cookie_token: ck.cookie_token, account_id: ck.account_id }; await TGLogger.Script("[米游币任务]刷新任务状态"); if (missionList.value.length === 0) { await TGLogger.Script("[米游币任务]未检测到任务列表，正在获取"); - const listResp = await apiHubReq.mission.list(ck); + const listResp = await apiHubReq.mission.list(ckState); if (listResp.retcode !== 0) { await TGLogger.Script( `[米游币任务]获取任务列表失败：${listResp.retcode} ${listResp.message}`, @@ -243,7 +230,7 @@ async function refreshState(ck: Record): Promise { await TGLogger.Script("[米游币任务]获取任务列表成功"); } await TGLogger.Script("[米游币任务]正在获取任务状态"); - const stateResp = await apiHubReq.mission.state(ck); + const stateResp = await apiHubReq.mission.state(ckState); if (stateResp.retcode !== 0) { await TGLogger.Script( `[米游币任务]获取任务状态失败：${stateResp.retcode} ${stateResp.message}`, @@ -260,7 +247,7 @@ async function refreshState(ck: Record): Promise { await TGLogger.Script("[米游币任务]任务数据合并完成"); } -async function autoSign(ck: Record, ch?: string): Promise { +async function autoSign(ck: TGApp.App.Account.Cookie, ch?: string): Promise { const signFind = parseMissions.value.find((i) => i.key === "continuous_sign"); if (!signFind) { await TGLogger.Script("[米游币任务]未找到打卡任务"); @@ -271,7 +258,8 @@ async function autoSign(ck: Record, ch?: string): Promise return; } await TGLogger.Script("[米游币任务]正在执行打卡"); - const resp = await apiHubReq.sign(ck, 2, ch); + const ckSign = { stoken: ck.stoken, stuid: ck.stuid, mid: ck.mid }; + const resp = await apiHubReq.sign(ckSign, 2, ch); if (resp.retcode !== 0) { if (resp.retcode !== 1034) { await TGLogger.Script(`[米游币任务]打卡失败：${resp.retcode} ${resp.message}`); @@ -279,7 +267,7 @@ async function autoSign(ck: Record, ch?: string): Promise return; } await TGLogger.Script(`[米游币任务]社区签到触发验证码，正在尝试验证`); - const challenge = await miscReq.challenge(ck); + const challenge = await miscReq.challenge(ckSign); if (challenge === false) { await TGLogger.Script(`[米游币任务]验证失败`); return; diff --git a/src/web/request/apiHubReq.ts b/src/web/request/apiHubReq.ts index 5d3245bc..4923713f 100644 --- a/src/web/request/apiHubReq.ts +++ b/src/web/request/apiHubReq.ts @@ -1,7 +1,7 @@ /** * @file web/request/apiHubReq.ts * @description apiHub下的请求 - * @since Beta v0.7.0 + * @since Beta v0.7.2 */ import TGHttp from "@/utils/TGHttp.js"; @@ -41,15 +41,17 @@ async function getGameList(): Promise> { /** * @description 获取用户米游币任务完成情况 - * @since Beta v0.7.0 + * @since Beta v0.7.2 * @param {Record} cookie 用户 Cookie * @return {Promise} */ async function getMissions(cookie: Record): Promise { - const header = getRequestHeader(cookie, "GET", {}); - return await TGHttp(`${Mahbu}api/getMissions`, { + const param = { point_sn: "myb" }; + const header = getRequestHeader(cookie, "GET", param); + return await TGHttp(`${Mahbu}wapi/getMissions`, { method: "GET", headers: header, + query: param, }); } @@ -79,7 +81,7 @@ async function getShareConf( /** * @description 获取任务完成情况 - * @since Beta v0.7.0 + * @since Beta v0.7.2 * @description **需要验证码登录的 Cookie** * @param {Record} cookie 用户 Cookie * @return {Promise} @@ -87,10 +89,12 @@ async function getShareConf( async function getUserMissionsState( cookie: Record, ): Promise { - const header = getRequestHeader(cookie, "GET", {}); - return await TGHttp(`${Mahbu}sapi/getUserMissionsState`, { + const param = { point_sn: "myb" }; + const header = getRequestHeader(cookie, "GET", param); + return await TGHttp(`${Mahbu}wapi/getUserMissionsState`, { method: "GET", headers: header, + query: param, }); }