diff --git a/src/core/api/TGApi.ts b/src/core/api/TGApi.ts index 74fadc30..998a6497 100644 --- a/src/core/api/TGApi.ts +++ b/src/core/api/TGApi.ts @@ -33,7 +33,7 @@ const TGApi = { getCharacter: TakumiRecordGenshinCharacterApi, // 获取角色信息 }, bySToken: { - getGameRoles: TakumiSTokenBingdingRolesApi, // 获取绑定角色 + getAccounts: TakumiSTokenBingdingRolesApi, // 获取绑定角色 }, getUserCard: TakumiRecordCardApi, // 获取用户卡片 getUserBase: TakumiRecordGenshinIndexApi, // 获取用户基本信息 diff --git a/src/core/request/TGRequest.ts b/src/core/request/TGRequest.ts index d497b989..400f21b5 100644 --- a/src/core/request/TGRequest.ts +++ b/src/core/request/TGRequest.ts @@ -6,8 +6,14 @@ */ import { getAnnoList, getAnnoContent } from "./getAnno"; -import { getTokensByLoginTicket, getLtokenByStoken, getCookieTokenByStoken, vetifyStoken } from "./getTokens"; -import { getGameCard, getGameAccountsbyCookie, getAccountsbyStoken, getGameRoleList } from "./getGameData"; +import { + getTokensByLoginTicket, getLtokenBySToken, + getCookieTokenBySToken, vetifySToken, +} from "./getTokens"; +import { + getGameCardByCookie, getGameAccountsbyCookie, + getAccountsbySToken, getGameRoleList, +} from "./getGameData"; const TGRequest = { Anno: { @@ -15,18 +21,20 @@ const TGRequest = { getContent: getAnnoContent, }, User: { - getTokens: getTokensByLoginTicket, - getLToken: getLtokenByStoken, + byLoginTicket: { + getLTokens: getTokensByLoginTicket, + }, byCookie: { getAccounts: getGameAccountsbyCookie, + getGameCard: getGameCardByCookie, getCharacter: getGameRoleList, }, - byStoken: { - getAccounts: getAccountsbyStoken, - getCookieToken: getCookieTokenByStoken, + bySToken: { + vertify: vetifySToken, + getLToken: getLtokenBySToken, + getAccounts: getAccountsbySToken, + getCookieToken: getCookieTokenBySToken, }, - vetifyStoken, - getGameCard, }, }; diff --git a/src/core/request/getGameData.ts b/src/core/request/getGameData.ts index 491169f4..4bb385d3 100644 --- a/src/core/request/getGameData.ts +++ b/src/core/request/getGameData.ts @@ -18,7 +18,7 @@ import TGConstant from "../constant/TGConstant"; * @param {BTMuli.User.Base.Cookie} cookie 用户的 Cookie * @returns {Promise} 用户基本信息 */ -export async function getGameCard (cookie: BTMuli.User.Base.Cookie): Promise { +export async function getGameCardByCookie (cookie: BTMuli.User.Base.Cookie): Promise { const url = `${TGApi.GameData.getUserCard}?uid=${cookie.login_uid}`; const query = `uid=${cookie.login_uid}`; const ck = TGUtils.Tools.cookieToString(cookie); @@ -45,8 +45,8 @@ export async function getGameCard (cookie: BTMuli.User.Base.Cookie): Promise} 用户绑定角色 */ -export async function getGameRolesbyStoken (cookie: string, stoken: string): Promise { - const url = TGApi.GameData.bySToken.getGameRoles; +export async function getAccountsbySToken (cookie: string, stoken: string): Promise { + const url = TGApi.GameData.bySToken.getAccounts; console.log("url:", url); // eslint-disable-next-line camelcase const data = { stoken, game_biz: TGConstant.UTILS.GAME_BIZ }; diff --git a/src/core/request/getTokens.ts b/src/core/request/getTokens.ts index b3401be6..92370375 100644 --- a/src/core/request/getTokens.ts +++ b/src/core/request/getTokens.ts @@ -40,7 +40,7 @@ export async function getTokensByLoginTicket (cookie: BTMuli.User.Base.Cookie): * @param {string} stoken stoken * @returns {Promise} */ -export async function getLtokenByStoken (cookie: BTMuli.User.Base.Cookie, stoken: string): Promise { +export async function getLtokenBySToken (cookie: BTMuli.User.Base.Cookie, stoken: string): Promise { const url = `${TGApi.GameTokens.getLToken}`; const ck = TGUtils.Tools.cookieToString(cookie); const query = `stoken=${stoken}`; @@ -62,7 +62,7 @@ export async function getLtokenByStoken (cookie: BTMuli.User.Base.Cookie, stoken * @param {string} stoken stoken * @returns {Promise} */ -export async function getCookieTokenByStoken (cookie: BTMuli.User.Base.Cookie, stoken: string): Promise { +export async function getCookieTokenBySToken (cookie: BTMuli.User.Base.Cookie, stoken: string): Promise { const url = `${TGApi.GameTokens.getCookieToken}?stoken=${stoken}`; console.log(url); const ck = TGUtils.Tools.cookieToString(cookie); @@ -85,7 +85,7 @@ export async function getCookieTokenByStoken (cookie: BTMuli.User.Base.Cookie, s * @param {string} stoken stoken * @returns {Promise} */ -export async function vetifyStoken (cookie: BTMuli.User.Base.Cookie, stoken: string): Promise { +export async function vetifySToken (cookie: BTMuli.User.Base.Cookie, stoken: string): Promise { const url = `${TGApi.GameTokens.vetifyStoken}`; const ck = TGUtils.Tools.cookieToString(cookie); const query = `stoken=${stoken}`; diff --git a/src/pages/User.vue b/src/pages/User.vue index ceb5ec22..3d044218 100644 --- a/src/pages/User.vue +++ b/src/pages/User.vue @@ -56,7 +56,7 @@ onMounted(async () => { // 根据获取到的 cookie.login_ticket 获取 stoken 和 ltoken async function getTokens () { - const tokenRes = await TGRequest.User.getTokens(cookie.value); + const tokenRes = await TGRequest.User.byLoginTicket.getLTokens(cookie.value); console.log(tokenRes); if (Array.isArray(tokenRes)) tokens.value = tokenRes; else { @@ -90,7 +90,7 @@ async function vertifyStoken () { value: string; }>)[0].value as string; console.log("stoken", stoken); - const vertifyRes = await TGRequest.User.vetifyStoken(cookie.value, stoken); + const vertifyRes = await TGRequest.User.bySToken.vertify(cookie.value, stoken); console.log(vertifyRes); } @@ -101,7 +101,7 @@ async function getLToken () { value: string; }>)[0].value as string; console.log("stoken", stoken); - const tokenRes = await TGRequest.User.getLToken(cookie.value, stoken); + const tokenRes = await TGRequest.User.bySToken.getLToken(cookie.value, stoken); console.log(tokenRes); } @@ -112,13 +112,13 @@ async function getCookieToken () { value: string; }>)[0].value as string; console.log("stoken", stoken); - const cookieRes = await TGRequest.User.byStoken.getCookieToken(cookie.value, stoken); + const cookieRes = await TGRequest.User.bySToken.getCookieToken(cookie.value, stoken); console.log(cookieRes); } // 获取游戏数据 async function getUserGameCard () { - const gameCard = await TGRequest.User.getGameCard(cookie.value); + const gameCard = await TGRequest.User.byCookie.getGameCard(cookie.value); console.log(gameCard); } @@ -129,7 +129,7 @@ async function getBindRole () { key: string; value: string; }>)[0].value as string; - const bindRole = await TGRequest.User.byStoken.getAccounts(ck, stoken); + const bindRole = await TGRequest.User.bySToken.getAccounts(ck, stoken); console.log(bindRole); }