♻️ 调整命名

2025-12-06 08:32:51 +08:00 · 2025-12-01 00:55:51 +08:00
parent 323b951c10
commit 6b90dde0ab
6 changed files with 48 additions and 52 deletions
--- a/src/components/app/t-sidebar.vue
+++ b/src/components/app/t-sidebar.vue
@@ -269,9 +269,8 @@ import showLoading from "@comp/func/loading.js";
 import showSnackbar from "@comp/func/snackbar.js";
 import ToGameLogin from "@comp/pageConfig/tco-gameLogin.vue";
 import VpOverlayFollow from "@comp/viewPost/vp-overlay-follow.vue";
-import BBSApi from "@req/bbsReq.js";
+import bbsReq from "@req/bbsReq.js";
 import passportReq from "@req/passportReq.js";
-import PassportApi from "@req/passportReq.js";
 import takumiReq from "@req/takumiReq.js";
 import TSUserAccount from "@Sqlm/userAccount.js";
 import useAppStore from "@store/app.js";
@@ -335,7 +334,7 @@ async function openClient(func: string): Promise<void> {

 async function tryGetTokens(ck: TGApp.App.Account.Cookie): Promise<void> {
  await showLoading.update("正在获取 LToken");
-  const ltokenRes = await PassportApi.lToken.get(ck);
+  const ltokenRes = await passportReq.lToken.get(ck);
  if (typeof ltokenRes !== "string") {
    await showLoading.end();
    showSnackbar.error(`[${ltokenRes.retcode}]${ltokenRes.message}`);
@@ -346,7 +345,7 @@ async function tryGetTokens(ck: TGApp.App.Account.Cookie): Promise<void> {
  showSnackbar.success("获取LToken成功");
  ck.ltoken = ltokenRes;
  await showLoading.update("正在获取 CookieToken");
-  const cookieTokenRes = await PassportApi.cookieToken(ck);
+  const cookieTokenRes = await passportReq.cookieToken(ck);
  if (typeof cookieTokenRes !== "string") {
    await showLoading.end();
    showSnackbar.error(`[${cookieTokenRes.retcode}]${cookieTokenRes.message}`);
@@ -359,7 +358,7 @@ async function tryGetTokens(ck: TGApp.App.Account.Cookie): Promise<void> {
  showSnackbar.success("获取CookieToken成功");
  ck.cookie_token = cookieTokenRes;
  await showLoading.update("正在获取用户信息");
-  const briefRes = await BBSApi.userInfo(ck);
+  const briefRes = await bbsReq.userInfo(ck);
  if ("retcode" in briefRes) {
    await showLoading.end();
    showSnackbar.error(`[${briefRes.retcode}]${briefRes.message}`);
@@ -570,7 +569,7 @@ async function addByCookie(): Promise<void> {
    ltoken: "",
  };
  await showLoading.update("正在获取 LToken");
-  const ltokenRes = await PassportApi.lToken.get(ck);
+  const ltokenRes = await passportReq.lToken.get(ck);
  if (typeof ltokenRes !== "string") {
    await showLoading.end();
    showSnackbar.error(`[${ltokenRes.retcode}]${ltokenRes.message}`);
@@ -580,7 +579,7 @@ async function addByCookie(): Promise<void> {
  }
  ck.ltoken = ltokenRes;
  await showLoading.update("正在获取 CookieToken");
-  const cookieTokenRes = await PassportApi.cookieToken(ck);
+  const cookieTokenRes = await passportReq.cookieToken(ck);
  if (typeof cookieTokenRes !== "string") {
    await showLoading.end();
    showSnackbar.error(`[${cookieTokenRes.retcode}]${cookieTokenRes.message}`);
@@ -592,7 +591,7 @@ async function addByCookie(): Promise<void> {
  }
  ck.cookie_token = cookieTokenRes;
  await showLoading.update("正在获取用户信息");
-  const briefRes = await BBSApi.userInfo(ck);
+  const briefRes = await bbsReq.userInfo(ck);
  if ("retcode" in briefRes) {
    await showLoading.end();
    showSnackbar.error(`[${briefRes.retcode}]${briefRes.message}`);
--- a/src/components/pageConfig/tc-gameBadge.vue
+++ b/src/components/pageConfig/tc-gameBadge.vue
@@ -17,7 +17,7 @@
 </template>
 <script lang="ts" setup>
 import showSnackbar from "@comp/func/snackbar.js";
-import PassportApi from "@req/passportReq.js";
+import passportReq from "@req/passportReq.js";
 import useAppStore from "@store/app.js";
 import useUserStore from "@store/user.js";
 import { path } from "@tauri-apps/api";
@@ -47,7 +47,7 @@ async function tryPlayGame(): Promise<void> {
    showSnackbar.warn("未检测到原神本体应用！");
    return;
  }
-  const resp = await PassportApi.authTicket(account.value, cookie.value);
+  const resp = await passportReq.authTicket(account.value, cookie.value);
  if (typeof resp !== "string") {
    showSnackbar.error(`[${resp.retcode}] ${resp.message}`);
    await TGLogger.Error(
--- a/src/components/pageConfig/tc-userBadge.vue
+++ b/src/components/pageConfig/tc-userBadge.vue
@@ -125,8 +125,7 @@ import showGeetest from "@comp/func/geetest.js";
 import showLoading from "@comp/func/loading.js";
 import showSnackbar from "@comp/func/snackbar.js";
 import ToGameLogin from "@comp/pageConfig/tco-gameLogin.vue";
-import BBSApi from "@req/bbsReq.js";
-import PassportApi from "@req/passportReq.js";
+import bbsReq from "@req/bbsReq.js";
 import passportReq from "@req/passportReq.js";
 import takumiReq from "@req/takumiReq.js";
 import TSUserAccount from "@Sqlm/userAccount.js";
@@ -155,7 +154,7 @@ const userInfo = computed<TGApp.App.Account.BriefInfo>(() => {

 async function tryGetTokens(ck: TGApp.App.Account.Cookie): Promise<void> {
  await showLoading.update("正在获取 LToken");
-  const ltokenRes = await PassportApi.lToken.get(ck);
+  const ltokenRes = await passportReq.lToken.get(ck);
  if (typeof ltokenRes !== "string") {
    await showLoading.end();
    showSnackbar.error(`[${ltokenRes.retcode}]${ltokenRes.message}`);
@@ -165,7 +164,7 @@ async function tryGetTokens(ck: TGApp.App.Account.Cookie): Promise<void> {
  showSnackbar.success("获取LToken成功");
  ck.ltoken = ltokenRes;
  await showLoading.update("正在获取 CookieToken");
-  const cookieTokenRes = await PassportApi.cookieToken(ck);
+  const cookieTokenRes = await passportReq.cookieToken(ck);
  if (typeof cookieTokenRes !== "string") {
    await showLoading.end();
    showSnackbar.error(`[${cookieTokenRes.retcode}]${cookieTokenRes.message}`);
@@ -177,7 +176,7 @@ async function tryGetTokens(ck: TGApp.App.Account.Cookie): Promise<void> {
  showSnackbar.success("获取CookieToken成功");
  ck.cookie_token = cookieTokenRes;
  await showLoading.update("正在获取用户信息");
-  const briefRes = await BBSApi.userInfo(ck);
+  const briefRes = await bbsReq.userInfo(ck);
  if ("retcode" in briefRes) {
    await showLoading.end();
    showSnackbar.error(`[${briefRes.retcode}]${briefRes.message}`);
@@ -270,7 +269,7 @@ async function refreshUser(uid: string) {
  }
  let ck = account.cookie;
  await showLoading.start("正在刷新用户信息", "正在验证 LToken");
-  const verifyLTokenRes = await PassportApi.lToken.verify(ck);
+  const verifyLTokenRes = await passportReq.lToken.verify(ck);
  if (typeof verifyLTokenRes === "string") {
    await showLoading.update("验证 LToken 成功");
    showSnackbar.success("验证 LToken 成功");
@@ -282,7 +281,7 @@ async function refreshUser(uid: string) {
    await TGLogger.Warn(
      `[tc-userBadge][refreshUser] ${verifyLTokenRes.retcode}: ${verifyLTokenRes.message}`,
    );
-    const ltokenRes = await PassportApi.lToken.get(ck);
+    const ltokenRes = await passportReq.lToken.get(ck);
    if (typeof ltokenRes === "string") {
      await showLoading.update("获取 LToken 成功");
      ck.ltoken = ltokenRes;
@@ -297,7 +296,7 @@ async function refreshUser(uid: string) {
    }
  }
  await showLoading.update("正在获取 CookieToken");
-  const cookieTokenRes = await PassportApi.cookieToken(ck);
+  const cookieTokenRes = await passportReq.cookieToken(ck);
  if (typeof cookieTokenRes === "string") {
    await showLoading.update("获取 CookieToken 成功");
    ck.cookie_token = cookieTokenRes;
@@ -312,7 +311,7 @@ async function refreshUser(uid: string) {
  }
  account.cookie = ck;
  await showLoading.update("正在获取用户信息");
-  const infoRes = await BBSApi.userInfo(ck);
+  const infoRes = await bbsReq.userInfo(ck);
  if ("retcode" in infoRes) {
    await showLoading.update("获取用户信息失败");
    showSnackbar.error(`[${infoRes.retcode}]${infoRes.message}`);
@@ -490,7 +489,7 @@ async function addByCookie(): Promise<void> {
    ltoken: "",
  };
  await showLoading.update("正在获取 LToken");
-  const ltokenRes = await PassportApi.lToken.get(ck);
+  const ltokenRes = await passportReq.lToken.get(ck);
  if (typeof ltokenRes !== "string") {
    await showLoading.end();
    showSnackbar.error(`[${ltokenRes.retcode}]${ltokenRes.message}`);
@@ -499,7 +498,7 @@ async function addByCookie(): Promise<void> {
  }
  ck.ltoken = ltokenRes;
  await showLoading.update("正在获取 CookieToken");
-  const cookieTokenRes = await PassportApi.cookieToken(ck);
+  const cookieTokenRes = await passportReq.cookieToken(ck);
  if (typeof cookieTokenRes !== "string") {
    await showLoading.end();
    showSnackbar.error(`[${cookieTokenRes.retcode}]${cookieTokenRes.message}`);
@@ -510,7 +509,7 @@ async function addByCookie(): Promise<void> {
  }
  ck.cookie_token = cookieTokenRes;
  await showLoading.update("正在获取用户信息");
-  const briefRes = await BBSApi.userInfo(ck);
+  const briefRes = await bbsReq.userInfo(ck);
  if ("retcode" in briefRes) {
    await showLoading.end();
    showSnackbar.error(`[${briefRes.retcode}]${briefRes.message}`);
--- a/src/request/bbsReq.ts
+++ b/src/request/bbsReq.ts
@@ -1,17 +1,16 @@
 /**
- * @file request/bbsReq.ts
- * @description BBS 请求模块
+ * BBS 请求模块
 * @since Beta v0.7.3
 */

 import { getRequestHeader } from "@utils/getRequestHeader.js";
 import TGHttp from "@utils/TGHttp.js";

-// MysBBSBaseUrl => mbBu
+/* MysBBSBaseUrl => mbBu */
 const mbBu: Readonly<string> = "https://bbs-api.miyoushe.com/";

 /**
- * @description 获取表情包列表
+ * 获取表情包列表
 * @since Beta v0.7.3
 * @return {Promise<Record<string,string>|TGApp.BBS.Response.Base>}
 */
@@ -30,7 +29,7 @@ async function getEmoticonSet(): Promise<Record<string, string> | TGApp.BBS.Resp
 }

 /**
- * @description 根据 cookie 获取用户信息
+ * 根据 cookie 获取用户信息
 * @since Beta v0.5.0
 * @param {TGApp.App.Account.Cookie} cookie - 账户 cookie
 * @returns {Promise<TGApp.BBS.Response.Base | TGApp.BBS.User.Info>}
@@ -50,7 +49,7 @@ async function getUserFullInfo(
 }

 /**
- * @description 根据gid和id获取用户信息
+ * 根据gid和id获取用户信息
 * @since Beta v0.7.2
 * @param {string} gid - gid
 * @param {string} userId - 用户 id
@@ -71,7 +70,7 @@ async function getOtherUserInfo(
 }

 /**
- * @description 获取合集信息
+ * 获取合集信息
 * @since Beta v0.7.3
 * @todo salt计算异常
 * @param {string} cid - 合集 id
@@ -95,11 +94,11 @@ async function getCollectionDetail(
  return resp.data;
 }

-const BBSApi = {
+const bbsReq = {
  collection: getCollectionDetail,
  emojis: getEmoticonSet,
  userInfo: getUserFullInfo,
  otherUserInfo: getOtherUserInfo,
 };

-export default BBSApi;
+export default bbsReq;
--- a/src/request/passportReq.ts
+++ b/src/request/passportReq.ts
@@ -1,6 +1,5 @@
 /**
- * @file request/passportReq.ts
- * @description Passport 相关请求
+ * Passport 相关请求
 * @since Beta v0.7.2
 */
 import { getRequestHeader } from "@utils/getRequestHeader.js";
@@ -9,13 +8,13 @@ import TGHttp from "@utils/TGHttp.js";
 import { getDeviceInfo } from "@utils/toolFunc.js";
 import { JSEncrypt } from "jsencrypt";

-// PassportApiBaseUrl => pAbu
+/* PassportApiBaseUrl => pAbu */
 const pAbu: Readonly<string> = "https://passport-api.mihoyo.com/";
-// PassportV4ApiBaseUrl => p4Abu
+/* PassportV4ApiBaseUrl => p4Abu */
 const p4Abu: Readonly<string> = "https://passport-api-v4.mihoyo.com/";
-// HoyoLauncherVersion
+/* HoyoLauncherVersion => hlv */
 const hlv: Readonly<string> = "1.3.3.182";
-// 加密密钥
+/* 加密密钥 */
 const PUB_KEY_STR: Readonly<string> = `-----BEGIN PUBLIC KEY-----
 MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDvekdPMHN3AYhm/vktJT+YJr7cI5DcsNKqdsx5DZX0gDuWFuIjzdwButrIYPNmRJ1G8ybDIF7oDW2eEpm5sMbL9zs
 9ExXCdvqrn51qELbqj0XxtMTIpaCHFSI50PfPpTFV9Xt/hmyVwokoOXFlAEgCn+Q
@@ -25,7 +24,7 @@ const encrypt = new JSEncrypt();
 encrypt.setPublicKey(PUB_KEY_STR);

 /**
- * @description rsa 加密
+ * rsa 加密
 * @since Beta v0.5.1
 * @param {string} data - 待加密数据
 * @returns {string} 加密后数据
@@ -37,7 +36,7 @@ function rsaEncrypt(data: string): string {
 }

 /**
- * @description 获取登录ticket
+ * 获取登录ticket
 * @since Beta v0.6.0
 * @param {TGApp.Sqlite.Account.Game} account - 账户
 * @param {TGApp.App.Account.Cookie} cookie - cookie
@@ -67,7 +66,7 @@ async function createAuthTicketByGameBiz(
 }

 /**
- * @description 获取短信验证码
+ * 获取短信验证码
 * @since Beta v0.7.2
 * @param {string} phone - 手机号
 * @param {string} [aigis] - 验证数据
@@ -109,7 +108,7 @@ async function createLoginCaptcha(
 }

 /**
- * @description 创建登录二维码
+ * 创建登录二维码
 * @since Beta v0.6.8
 * @returns {Promise<TGApp.BBS.Response.Base|TGApp.BBS.GameLogin.GetLoginQrData>}
 */
@@ -133,7 +132,7 @@ async function createQrLogin(): Promise<
 }

 /**
- * @description 根据 stoken 获取 cookie_token
+ * 根据 stoken 获取 cookie_token
 * @since Beta v0.6.3
 * @param {TGApp.App.Account.Cookie} cookie Cookie
 * @returns {Promise<string|TGApp.BBS.Response.Base>}
@@ -153,7 +152,7 @@ async function getCookieAccountInfoBySToken(
 }

 /**
- * @description 根据 stoken_v2 获取 ltoken
+ * 根据 stoken_v2 获取 ltoken
 * @since Beta v0.5.0
 * @param {TGApp.App.Account.Cookie} cookie Cookie
 * @returns {Promise<string|TGApp.BBS.Response.Base>}
@@ -173,7 +172,7 @@ async function getLTokenBySToken(
 }

 /**
- * @description 通过短信验证码登录
+ * 通过短信验证码登录
 * @since Beta v0.5.1
 * @param {string} phone - 手机号
 * @param {string} captcha - 验证码
@@ -213,7 +212,7 @@ async function loginByMobileCaptcha(
 }

 /**
- * @description 获取登录状态
+ * 获取登录状态
 * @since Beta v0.6.8
 * @param {string} ticket - 二维码 ticket
 * @returns {Promise<TGApp.BBS.Response.Base|TGApp.BBS.GameLogin.GetLoginStatusData>}
@@ -239,7 +238,7 @@ async function queryLoginStatus(
 }

 /**
- * @description 验证 ltoken 有效性，返回 mid
+ * 验证 ltoken 有效性，返回 mid
 * @since Beta v0.6.5
 * @param {TGApp.App.Account.Cookie} cookie - 账户 cookie
 * @returns {Promise<string | TGApp.BBS.Response.Base>}
@@ -280,7 +279,7 @@ async function verifyLToken(
  return resp.data.user_info.mid;
 }

-const PassportApi = {
+const passportReq = {
  authTicket: createAuthTicketByGameBiz,
  cookieToken: getCookieAccountInfoBySToken,
  lToken: { get: getLTokenBySToken, verify: verifyLToken },
@@ -288,4 +287,4 @@ const PassportApi = {
  captcha: { create: createLoginCaptcha, login: loginByMobileCaptcha },
 };

-export default PassportApi;
+export default passportReq;
--- a/src/utils/TGClient.ts
+++ b/src/utils/TGClient.ts
@@ -4,9 +4,9 @@
 */

 import showSnackbar from "@comp/func/snackbar.js";
-import BBSApi from "@req/bbsReq.js";
+import bbsReq from "@req/bbsReq.js";
 import OtherApi from "@req/otherReq.js";
-import PassportApi from "@req/passportReq.js";
+import passportReq from "@req/passportReq.js";
 import takumiReq from "@req/takumiReq.js";
 import TGSqlite from "@Sql/index.js";
 import useAppStore from "@store/app.js";
@@ -567,7 +567,7 @@ class Client {
    const user = useUserStore();
    if (!user.cookie) return;
    if (arg.payload.forceRefresh) {
-      const res = await PassportApi.cookieToken(user.cookie);
+      const res = await passportReq.cookieToken(user.cookie);
      if (typeof res !== "string") return;
      user.cookie.cookie_token = res;
      await TGSqlite.saveAppData("cookie", JSON.stringify(user.cookie));
@@ -681,7 +681,7 @@ class Client {
  async getUserInfo(arg: TGApp.Plugins.JSBridge.NullArg): Promise<void> {
    const user = useUserStore();
    if (!user.cookie) return;
-    const userInfo = await BBSApi.userInfo(user.cookie);
+    const userInfo = await bbsReq.userInfo(user.cookie);
    if ("retcode" in userInfo) {
      console.error(`[${arg.callback}] ${userInfo.message}`);
      return;