Fun/TeyvatGuide
1
0
Fork 0
mirror of https://github.com/BTMuli/TeyvatGuide.git synced 2026-05-31 07:05:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

♻️ 请求模块重构

Browse Source
This commit is contained in:
目棃
2024-11-19 09:34:18 +08:00
parent 9b1fa22cbe
commit c6f45f0a35
49 changed files with 660 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/User/Abyss.vue
View File

@@ -127,7 +127,7 @@ import TSUserCombat from "../../plugins/Sqlite/modules/userCombat.js";
import { useUserStore } from "../../store/modules/user.js";
import TGLogger from "../../utils/TGLogger.js";
import { generateShareImg } from "../../utils/TGShare.js";
import TGRequest from "../../web/request/TGRequest.js";
import TakumiRecordGenshinApi from "../../web/request/recordReq.js";
// store
const userStore = storeToRefs(useUserStore());
@@ -211,7 +211,7 @@ async function refreshAbyss(): Promise<void> {
}
await TGLogger.Info("[UserAbyss][getAbyssData] 更新深渊数据");
showLoading.start("正在获取上期深渊数据...", `UID: ${user.value.gameUid}`);
const resP = await TGRequest.User.byCookie.getAbyss(userStore.cookie.value, "2", user.value);
const resP = await TakumiRecordGenshinApi.spiralAbyss(userStore.cookie.value, user.value, "2");
if ("retcode" in resP) {
showLoading.end();
showSnackbar.error(`[${resP.retcode}]${resP.message}`);
@@ -223,7 +223,7 @@ async function refreshAbyss(): Promise<void> {
showLoading.update("正在保存上期深渊数据...", `UID: ${user.value.gameUid}`);
await TSUserAbyss.saveAbyss(user.value.gameUid, resP);
showLoading.update("正在获取本期深渊数据...", `UID: ${user.value.gameUid}`);
const res = await TGRequest.User.byCookie.getAbyss(userStore.cookie.value, "1", user.value);
const res = await TakumiRecordGenshinApi.spiralAbyss(userStore.cookie.value, user.value, "1");
if ("retcode" in res) {
showLoading.end();
showSnackbar.error(`[${res.retcode}]${res.message}`);

17
src/pages/User/Characters.vue
View File

@@ -110,11 +110,12 @@ import TuaDetailOverlay from "../../components/userAvatar/tua-detail-overlay.vue
import TwoSelectC, { SelectedCValue } from "../../components/wiki/two-select-c.vue";
import { AppCharacterData } from "../../data/index.js";
import TSUserAvatar from "../../plugins/Sqlite/modules/userAvatar.js";
import TSUserRecord from "../../plugins/Sqlite/modules/userRecord.js";
import { useUserStore } from "../../store/modules/user.js";
import TGLogger from "../../utils/TGLogger.js";
import { generateShareImg } from "../../utils/TGShare.js";
import { timestampToDate } from "../../utils/toolFunc.js";
import TGRequest from "../../web/request/TGRequest.js";
import TakumiRecordGenshinApi from "../../web/request/recordReq.js";
// store
const userStore = storeToRefs(useUserStore());
@@ -274,16 +275,20 @@ async function refresh(): Promise<void> {
loadData.value = false;
return;
}
showLoading.update("正在更新角色数据...", "正在获取角色列表");
const indexRes = await TGRequest.User.byCookie.getAvatarIndex(userStore.cookie.value, user.value);
if (indexRes.retcode !== 0) {
showLoading.update("正在更新角色数据...", "正在获取战绩数据");
const indexRes = await TakumiRecordGenshinApi.index(userStore.cookie.value, user.value);
if ("retcode" in indexRes) {
showSnackbar.error(`[${indexRes.retcode}] ${indexRes.message}`);
await TGLogger.Error(JSON.stringify(indexRes.message));
showLoading.end();
loadData.value = false;
return;
} else {
showLoading.update("正在更新角色数据...", "正在保存战绩数据");
await TSUserRecord.saveRecord(Number(user.value.gameUid), indexRes);
}
const listRes = await TGRequest.User.byCookie.getAvatarList(userStore.cookie.value, user.value);
showLoading.update("正在更新角色数据...", "正在获取角色列表");
const listRes = await TakumiRecordGenshinApi.character.list(userStore.cookie.value, user.value);
if (!Array.isArray(listRes)) {
showSnackbar.error(`[${listRes.retcode}] ${listRes.message}`);
await TGLogger.Error(`[Character][refreshRoles][${user.value.gameUid}] 获取角色列表失败`);
@@ -296,7 +301,7 @@ async function refresh(): Promise<void> {
}
const idList = listRes.map((i) => i.id.toString());
showLoading.update("正在更新角色数据...", `共${idList.length}个角色`);
const res = await TGRequest.User.byCookie.getAvatarDetail(
const res = await TakumiRecordGenshinApi.character.detail(
userStore.cookie.value,
user.value,
idList,

4
src/pages/User/Combat.vue
View File

@@ -107,7 +107,7 @@ import TSUserCombat from "../../plugins/Sqlite/modules/userCombat.js";
import { useUserStore } from "../../store/modules/user.js";
import TGLogger from "../../utils/TGLogger.js";
import { generateShareImg } from "../../utils/TGShare.js";
import TGRequest from "../../web/request/TGRequest.js";
import TakumiRecordGenshinApi from "../../web/request/recordReq.js";
// store
const userStore = storeToRefs(useUserStore());
@@ -183,7 +183,7 @@ async function refreshCombat(): Promise<void> {
}
await TGLogger.Info("[UserCombat][getCombatData] 更新剧诗数据");
showLoading.start("正在获取剧诗数据...", `UID: ${user.value.gameUid}`);
const res = await TGRequest.User.byCookie.getCombat(userStore.cookie.value, user.value);
const res = await TakumiRecordGenshinApi.roleCombat(userStore.cookie.value, user.value);
if (res === false) {
showLoading.end();
showSnackbar.warn("用户未解锁幻想真境剧诗");

7
src/pages/User/Gacha.vue
View File

@@ -72,7 +72,8 @@ import {
verifyUigfData,
exportUigf4Data,
} from "../../utils/UIGF.js";
import TGRequest from "../../web/request/TGRequest.js";
import Hk4eApi from "../../web/request/hk4eReq.js";
import TakumiApi from "../../web/request/takumiReq.js";
// store
const userStore = storeToRefs(useUserStore());
@@ -147,7 +148,7 @@ async function confirmRefresh(force: boolean): Promise<void> {
await TGLogger.Warn("[UserGacha][${account.gameUid}][confirmRefresh] 未检测到 cookie");
return;
}
const authkeyRes = await TGRequest.User.getAuthkey(userStore.cookie.value, account.value);
const authkeyRes = await TakumiApi.bind.authKey(userStore.cookie.value, account.value);
if (typeof authkeyRes === "string") {
authkey.value = authkeyRes;
await TGLogger.Info(`[UserGacha][${account.value.gameUid}][confirmRefresh] 成功获取 authkey`);
@@ -204,7 +205,7 @@ async function getGachaLogs(
await TGLogger.Info(
`[UserGacha][${uid}][getGachaLogs] 获取祈愿数据，pool：${pool}，endId：${endId}`,
);
const gachaRes = await TGRequest.User.getGachaLog(authkey.value, pool, endId);
const gachaRes = await Hk4eApi.gacha(authkey.value, pool, endId);
console.log(pool, endId, gachaRes);
if (Array.isArray(gachaRes)) {
await TGLogger.Info(

30
src/pages/User/Record.vue
View File

@@ -72,7 +72,7 @@ import TSUserRecord from "../../plugins/Sqlite/modules/userRecord.js";
import { useUserStore } from "../../store/modules/user.js";
import TGLogger from "../../utils/TGLogger.js";
import { generateShareImg } from "../../utils/TGShare.js";
import TGRequest from "../../web/request/TGRequest.js";
import TakumiRecordGenshinApi from "../../web/request/recordReq.js";
// store
const userStore = storeToRefs(useUserStore());
@@ -144,27 +144,25 @@ async function refreshRecord(): Promise<void> {
await TGLogger.Warn(`[UserRecord][refresh][${user.value.gameUid}] 未登录`);
return;
}
const cookie = {
account_id: userStore.cookie.value.account_id,
cookie_token: userStore.cookie.value.cookie_token,
};
const res = await TGRequest.User.getRecord(cookie, user.value);
if (!("retcode" in res)) {
await TGLogger.Info(`[UserRecord][refresh][${user.value.gameUid}] 获取战绩数据成功`);
await TGLogger.Info(`[UserRecord][refresh][${user.value.gameUid}]`, false);
await TGLogger.Info(JSON.stringify(res), false);
showLoading.update("正在保存战绩数据");
await TSUserRecord.saveRecord(Number(user.value.gameUid), res);
await loadUid();
await loadRecord();
if (recordData.value === undefined) await loadRecord();
} else {
const res = await TakumiRecordGenshinApi.index(userStore.cookie.value, user.value);
if ("retcode" in res) {
showLoading.end();
showSnackbar.error(`[${res.retcode}] ${res.message}`);
await TGLogger.Error(`[UserRecord][refresh][${user.value.gameUid}] 获取战绩数据失败`);
await TGLogger.Error(
`[UserRecord][refresh][${user.value.gameUid}] ${res.retcode} ${res.message}`,
);
return;
}
await TGLogger.Info(`[UserRecord][refresh][${user.value.gameUid}] 获取战绩数据成功`);
await TGLogger.Info(`[UserRecord][refresh][${user.value.gameUid}]`, false);
await TGLogger.Info(JSON.stringify(res), false);
showLoading.update("正在保存战绩数据");
await TSUserRecord.saveRecord(Number(user.value.gameUid), res);
showLoading.update("正在加载战绩数据");
await loadUid();
await loadRecord();
if (recordData.value === undefined) await loadRecord();
showLoading.end();
}