♻️ 感觉差不多了，剩下的就靠测试了 #92

2025-12-12 09:18:14 +08:00 · 2024-07-03 22:33:00 +08:00
parent 8a2c7d13c6
commit f4de7552e1
28 changed files with 249 additions and 399 deletions
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,7 +11,7 @@
 </template>

 <script lang="ts" setup>
-import { app, event, core, window as TauriWindow } from "@tauri-apps/api";
+import { app, event, core, webviewWindow } from "@tauri-apps/api";
 import { UnlistenFn, Event } from "@tauri-apps/api/event";
 import { mkdir } from "@tauri-apps/plugin-fs";
 import { storeToRefs } from "pinia";
@@ -42,7 +42,7 @@ let themeListener: UnlistenFn;
 let urlListener: UnlistenFn;

 onBeforeMount(async () => {
-  const win = TauriWindow.getCurrent();
+  const win = webviewWindow.getCurrent();
  isMain.value = win.label === "TeyvatGuide";
  if (isMain.value) {
    const title = "Teyvat Guide v" + (await app.getVersion()) + " Beta";
@@ -171,7 +171,7 @@ async function checkUserLoad(): Promise<void> {

 async function getDeepLink(): Promise<UnlistenFn> {
  return await event.listen("active_deep_link", async (e: Event<unknown>) => {
-    const windowGet = new TauriWindow.WebviewWindow("TeyvatGuide");
+    const windowGet = new webviewWindow.WebviewWindow("TeyvatGuide");
    if (await windowGet.isMinimized()) {
      await windowGet.unminimize();
    }
--- a/src/components/app/t-backTop.vue
+++ b/src/components/app/t-backTop.vue
@@ -6,8 +6,7 @@
  </transition>
 </template>
 <script lang="ts" setup>
-// vue
-import { ref, onMounted } from "vue";
+import { ref, onMounted, onUnmounted } from "vue";

 const scrollTop = ref(0); // 滚动条距离顶部的距离
 const canTop = ref(false); // 默认不显示
@@ -45,6 +44,11 @@ function handleScrollTop(): void {
 onMounted(() => {
  window.addEventListener("scroll", handleScroll);
 });
+
+// 销毁监听
+onUnmounted(() => {
+  window.removeEventListener("scroll", handleScroll);
+});
 </script>

 <style scoped>
--- a/src/components/app/t-sidebar.vue
+++ b/src/components/app/t-sidebar.vue
@@ -242,7 +242,7 @@
 </template>

 <script lang="ts" setup>
-import { event, window as TauriWindow } from "@tauri-apps/api";
+import { event, webviewWindow } from "@tauri-apps/api";
 import { UnlistenFn, Event } from "@tauri-apps/api/event";
 import { storeToRefs } from "pinia";
 import { computed, onMounted, onUnmounted, ref, watch } from "vue";
@@ -302,7 +302,7 @@ onMounted(async () => {
    const theme = e.payload;
    themeGet.value = theme === "default" ? "default" : "dark";
  });
-  if (TauriWindow.getCurrent().label === "TeyvatGuide") {
+  if (webviewWindow.getCurrent().label === "TeyvatGuide") {
    await mhyClient.run();
  }
  if (userStore.briefInfo.value && userStore.briefInfo.value.nickname) {
--- a/src/components/config/tc-userBadge.vue
+++ b/src/components/config/tc-userBadge.vue
@@ -10,21 +10,18 @@
    <template #actions>
      <v-spacer />
      <v-btn variant="outlined" @click="scan = true" icon="mdi-qrcode-scan" />
-      <v-btn v-if="false" variant="outlined" @click="toWebLogin" icon="mdi-web" />
      <v-btn variant="outlined" @click="confirmRefreshUser" icon="mdi-refresh" :loading="loading" />
    </template>
  </v-card>
 </template>
 <script lang="ts" setup>
-import { event, window as windowTauri } from "@tauri-apps/api";
-import type { UnlistenFn, Event } from "@tauri-apps/api/helpers/event";
+import type { UnlistenFn } from "@tauri-apps/api/event";
 import { storeToRefs } from "pinia";
 import { onMounted, onUnmounted, ref, watch } from "vue";

 import TGSqlite from "../../plugins/Sqlite/index.js";
 import { useAppStore } from "../../store/modules/app.js";
 import { useUserStore } from "../../store/modules/user.js";
-import TGClient from "../../utils/TGClient.js";
 import TGLogger from "../../utils/TGLogger.js";
 import { getDeviceFp } from "../../web/request/getDeviceFp.js";
 import TGRequest from "../../web/request/TGRequest.js";
@@ -64,177 +61,6 @@ watch(userStore.briefInfo, (v) => {
  }
 });

-async function toWebLogin(): Promise<void> {
-  const confirm = await showConfirm({
-    title: "请在子窗口中完成登录操作",
-    text: "请操作完成后点击子窗口的“用户登录”菜单",
-  });
-  if (!confirm) {
-    showSnackbar({
-      color: "cancel",
-      text: "已取消登录",
-    });
-    return;
-  }
-  await TGClient.open("config_sign_in", "https://user.mihoyo.com");
-  signListener = event.listen("config_user_sign", async (e: Event<unknown>) => {
-    if (typeof e.payload !== "string") {
-      showSnackbar({
-        color: "error",
-        text: "登录失败!",
-      });
-      return;
-    }
-    await getTokenWeb(e.payload);
-  });
-}
-
-async function getTokenWeb(cookie: string): Promise<void> {
-  await windowTauri.appWindow.setFocus();
-  emits("loadOuter", { show: true, title: "正在解析 cookie" });
-  const ck = cookie.split(";").reduce(
-    (prev, curr) => {
-      const [key, value] = curr.split("=");
-      prev[key.trim()] = value.trim();
-      return prev;
-    },
-    <Record<string, string>>{},
-  );
-  if (!("login_ticket" in ck) || !("login_uid" in ck)) {
-    emits("loadOuter", { show: false });
-    showSnackbar({
-      text: "未检测到 login_ticket, 请确认是否登录成功!",
-      color: "error",
-    });
-    try {
-      setTimeout(() => {
-        windowTauri.WebviewWindow.getByLabel("mhy_client")?.setFocus();
-      }, 2000);
-    } catch (e) {
-      await TGLogger.Error("[tc-userBadge][getTokenWeb] 无法获取子窗口");
-      await TGClient.open("config_sign_in", "https://user.mihoyo.com/");
-    }
-    return;
-  }
-  emits("loadOuter", { show: true, title: "正在获取 token" });
-  let cookieUser: TGApp.User.Account.Cookie = {
-    account_id: "",
-    ltuid: "",
-    stuid: "",
-    mid: "",
-    cookie_token: "",
-    stoken: "",
-    ltoken: "",
-  };
-  cookieUser.account_id = ck["login_uid"];
-  cookieUser.ltuid = ck["login_uid"];
-  cookieUser.stuid = ck["login_uid"];
-  const tokenRes = await TGRequest.User.byLoginTicket.getTokens(
-    ck["login_ticket"],
-    ck["login_uid"],
-  );
-  if ("retcode" in tokenRes) {
-    emits("loadOuter", { show: false });
-    showSnackbar({
-      text: "获取 token 失败!",
-      color: "error",
-    });
-    await TGLogger.Error("[tc-userBadge][getTokenWeb] 获取 token 失败");
-    await TGLogger.Error(`[tc-userBadge][getTokenWeb] ${tokenRes.retcode}: ${tokenRes.message}`);
-    return;
-  }
-  tokenRes.map((i) => {
-    if (i.name === "ltoken") return (cookieUser.ltoken = i.token);
-    if (i.name === "stoken") return (cookieUser.stoken = i.token);
-  });
-  if (cookieUser.ltoken === "" || cookieUser.stoken === "") {
-    emits("loadOuter", { show: false });
-    showSnackbar({
-      text: "获取 ltoken 或者 stoken 失败!",
-      color: "error",
-    });
-    await TGLogger.Error("[tc-userBadge][getTokenWeb] 获取 ltoken 或者 stoken 失败");
-    return;
-  }
-  const ltokenRes = await TGRequest.User.byLToken.verify(cookieUser.ltoken, cookieUser.ltuid);
-  if (typeof ltokenRes !== "string") {
-    showSnackbar({
-      text: "ltoken 验证失败!",
-      color: "error",
-    });
-  } else {
-    cookieUser.mid = ltokenRes;
-  }
-  if (!cookieUser.stoken.startsWith("v2")) {
-    const stokenRes = await TGRequest.User.bySToken.update(cookieUser.stoken, cookieUser.stuid);
-    if ("retcode" in stokenRes) {
-      showSnackbar({
-        text: "stoken 更新失败!",
-        color: "error",
-      });
-      await TGLogger.Error("[tc-userBadge][getTokenWeb] stoken 更新失败");
-      await TGLogger.Error(
-        `[tc-userBadge][getTokenWeb] ${stokenRes.retcode}: ${stokenRes.message}`,
-      );
-    } else {
-      cookieUser.stoken = stokenRes.token.token;
-      if (cookieUser.mid === "" && stokenRes.user_info.mid !== "")
-        cookieUser.mid = stokenRes.user_info.mid;
-    }
-  }
-  const cookieTokenRes = await TGRequest.User.bySToken.getCookieToken(
-    cookieUser.mid,
-    cookieUser.stoken,
-  );
-  if (typeof cookieTokenRes !== "string") {
-    showSnackbar({
-      text: "cookie_token 获取失败!",
-      color: "error",
-    });
-    await TGLogger.Error("[tc-userBadge][getTokenWeb] cookie_token 获取失败");
-    await TGLogger.Error(
-      `[tc-userBadge][getTokenWeb] ${cookieTokenRes.retcode}: ${cookieTokenRes.message}`,
-    );
-  } else {
-    cookieUser.cookie_token = cookieTokenRes;
-  }
-  userStore.cookie.value = cookieUser;
-  try {
-    await windowTauri.WebviewWindow.getByLabel("mhy_client")?.close();
-  } catch (e) {
-    await TGLogger.Error("[tc-userBadge][getTokenWeb] 无法获取子窗口");
-    showSnackbar({
-      text: "请手动关闭子窗口!",
-      color: "error",
-    });
-  }
-  signListener();
-  if (Object.values(cookieUser).some((i) => i === "")) {
-    showSnackbar({
-      text: "获取 cookie 失败!部分项为空!",
-      color: "error",
-    });
-    await TGLogger.Error("[tc-userBadge][getTokenWeb] 获取 cookie 失败");
-    return;
-  }
-  await TGSqlite.saveAppData("cookie", JSON.stringify(cookieUser));
-  const failCount = await refreshUserInfo();
-  if (failCount > 0) {
-    showSnackbar({
-      color: "error",
-      text: "获取用户信息失败！",
-    });
-  } else {
-    showSnackbar({
-      text: "登录成功!",
-      color: "success",
-    });
-    appStore.isLogin = true;
-  }
-  loading.value = false;
-  emits("loadOuter", { show: false });
-}
-
 async function refreshUser() {
  const ck = userStore.cookie.value;
  if (ck === undefined || JSON.stringify(ck) === "{}") {
--- a/src/components/gachaRecord/gro-echarts.vue
+++ b/src/components/gachaRecord/gro-echarts.vue
@@ -2,6 +2,7 @@
  <v-chart :option="getPoolData()" autoresize />
 </template>
 <script lang="ts" setup>
+// todo 解决引用问题
 import type { EChartsOption } from "echarts";
 import { PieChart } from "echarts/charts";
 import {
--- a/src/components/userRecord/tur-world-sub.vue
+++ b/src/components/userRecord/tur-world-sub.vue
@@ -40,7 +40,7 @@
 </template>
 <script lang="ts" setup>
 import { event } from "@tauri-apps/api";
-import { UnlistenFn } from "@tauri-apps/api/event";
+import { Event, UnlistenFn } from "@tauri-apps/api/event";
 import { onMounted, onUnmounted, ref } from "vue";

 import { saveImgLocal } from "../../utils/TGShare.js";
@@ -59,8 +59,8 @@ const iconDark = ref<string>();
 const offer = ref<string>();

 onMounted(async () => {
-  themeListener = event.listen("readTheme", (e) => {
-    const theme = <string>e.payload;
+  themeListener = event.listen("readTheme", (e: Event<string>) => {
+    const theme = e.payload;
    if (theme === "dark") {
      icon.value = iconLight.value;
    } else {
--- a/src/components/wiki/twc-weapon.vue
+++ b/src/components/wiki/twc-weapon.vue
@@ -119,7 +119,7 @@ async function toWiki(): Promise<void> {
    return;
  }
  const url = Mys.Api.Obc.replace("{contentId}", props.item.contentId.toString());
-  createTGWindow(
+  await createTGWindow(
    url,
    "Sub_window",
    `Content_${props.item.contentId} ${props.item.name}`,
--- a/src/pages/User/Gacha.vue
+++ b/src/pages/User/Gacha.vue
@@ -372,7 +372,7 @@ async function handleExportBtn(): Promise<void> {
        extensions: ["json"],
      },
    ],
-    defaultPath: `${await path.downloadDir()}${path.sep}UIGF${uidCur.value}.json`,
+    defaultPath: `${await path.downloadDir()}${path.sep()}UIGF${uidCur.value}.json`,
  });
  if (!file) {
    showSnackbar({
--- a/src/pages/common/Achievements.vue
+++ b/src/pages/common/Achievements.vue
@@ -404,7 +404,7 @@ async function exportJson(): Promise<void> {
        extensions: ["json"],
      },
    ],
-    defaultPath: `${await path.downloadDir()}${path.sep}${fileName}.json`,
+    defaultPath: `${await path.downloadDir()}${path.sep()}${fileName}.json`,
  });
  if (isSave === null) {
    showSnackbar({
--- a/src/plugins/Bili/request/getVideoUrl.ts
+++ b/src/plugins/Bili/request/getVideoUrl.ts
@@ -32,7 +32,7 @@ async function getVideoUrl(cid: number, bvid: string): Promise<TGApp.Plugins.Bil
  const resp = await TGHttp<TGApp.Plugins.Bili.Video.UrlResponse>(url, {
    method: "GET",
    query: params,
-    referrer: "https://www.bilibili.com/",
+    headers: { referer: "https://www.bilibili.com/" },
  });
  return resp.data;
 }
--- a/src/plugins/Hutao/request/uploadData.ts
+++ b/src/plugins/Hutao/request/uploadData.ts
@@ -20,6 +20,7 @@ async function uploadData(
  return await TGHttp<TGApp.Plugins.Hutao.Abyss.UploadResponse>(url, {
    method: "POST",
    body: JSON.stringify(data),
+    headers: { "Content-Type": "application/json" },
  });
 }

--- a/src/types/BBS/Response.d.ts
+++ b/src/types/BBS/Response.d.ts
@@ -41,33 +41,6 @@ declare namespace TGApp.BBS.Response {
    data: any;
  }

-  /**
-   * @description 获取 ltoken 跟 stoken 的响应数据返回
-   * @interface getTokensRes
-   * @since Alpha v0.1.5
-   * @property {string} name - token 名称
-   * @property {string} token - token 值
-   * @return getTokensRes
-   */
-  interface getTokensRes {
-    name: string;
-    token: string;
-  }
-
-  /**
-   * @description 获取 ltoken 跟 stoken 的响应数据
-   * @interface getTokens
-   * @since Alpha v0.1.5
-   * @extends BaseWithData
-   * @property {getTokensRes[]} data.list - token 列表
-   * @return getTokens
-   */
-  interface getTokens extends BaseWithData {
-    data: {
-      list: getTokensRes[];
-    };
-  }
-
  /**
   * @description 根据 stoken 获取 ltoken 的响应数据
   * @interface getLTokenBySToken
--- a/src/utils/TGClient.ts
+++ b/src/utils/TGClient.ts
@@ -4,10 +4,9 @@
 * @since Beta v0.5.0
 */

-import { event, core } from "@tauri-apps/api";
+import { event, core, webviewWindow } from "@tauri-apps/api";
 import type { Event } from "@tauri-apps/api/event";
 import type { UnlistenFn } from "@tauri-apps/api/event";
-import { Window } from "@tauri-apps/api/window";

 import showSnackbar from "../components/func/snackbar.js";
 import TGSqlite from "../plugins/Sqlite/index.js";
@@ -42,14 +41,6 @@ class TGClient {
   */
  private listener: UnlistenFn | undefined;

-  /**
-   * @private 窗口实例
-   * @since Beta v0.5.0
-   * @type {Window}
-   * @memberof TGClient
-   */
-  private window: Window | null;
-
  /**
   * @private 模拟路由
   * @since Beta v0.3.4
@@ -65,11 +56,6 @@ class TGClient {
   * @memberof TGClient
   */
  constructor() {
-    try {
-      this.window = Window.getByLabel("mhy_client");
-    } catch (error) {
-      this.window = null;
-    }
    this.route = [];
    this.listener = undefined;
  }
@@ -285,7 +271,7 @@ class TGClient {
    await TGLogger.Info(`[TGClient][handleCustomCallback] ${JSON.stringify(arg)}`);
    switch (arg.method) {
      case "teyvat_open":
-        createPost(<string>arg.payload);
+        await createPost(<string>arg.payload);
        break;
      case "teyvat_remove":
        await this.hideOverlay();
@@ -441,33 +427,6 @@ class TGClient {
    await core.invoke("execute_js", { label: "mhy_client", js: executeJS });
  }

-  /**
-   * @func loadSignIn
-   * @since Beta v0.5.0
-   * @desc 自动检测登录ck
-   * @returns {Promise<void>}
-   */
-  async loadSignIn(): Promise<void> {
-    const executeJS = `javascript:(async function() {
-      let isLogin = false;
-      while(!isLogin) {
-        var ck = document.cookie;
-        if(ck.includes("login_ticket")) {
-          const arg = {
-            method: 'teyvat_sign_in',
-            payload: ck,
-          }
-          await window.__TAURI__.event.emit('post_mhy_client',JSON.stringify(arg));
-          isLogin = true;
-        } else {
-          // 等待 500 ms
-          await new Promise((resolve) => setTimeout(resolve, 500));
-        }
-      }
-    })();`;
-    await core.invoke("execute_js", { label: "mhy_client", js: executeJS });
-  }
-
  /**
   * @func nullCallback
   * @since Beta v0.3.9
@@ -491,14 +450,12 @@ class TGClient {
    if (url === undefined) url = this.getUrl(func);
    this.route = [url];
    await TGLogger.Info(`[TGClient][open][${func}] ${url}`);
-    await core.invoke<InvokeArg>("create_mhy_client", { func, url });
-    this.window = Window.getByLabel("mhy_client");
-    await this.window?.show();
-    await this.window?.setFocus();
-    await this.loadJSBridge();
-    if (func === "config_sign_in") {
-      await this.loadSignIn();
+    const windowFind = webviewWindow.WebviewWindow.getByLabel("mhy_client");
+    if (windowFind !== null) {
+      await windowFind.destroy();
    }
+    await core.invoke<InvokeArg>("create_mhy_client", { func, url });
+    await this.loadJSBridge();
  }

  /* JSBridge 回调处理 */
@@ -512,7 +469,7 @@ class TGClient {
  async closePage(arg: TGApp.Plugins.JSBridge.NullArg): Promise<void> {
    this.route.pop();
    if (this.route.length === 0) {
-      await this.window?.close();
+      await webviewWindow.WebviewWindow.getByLabel("mhy_client")?.destroy();
      return;
    }
    const url = this.route[this.route.length - 1];
@@ -769,7 +726,7 @@ class TGClient {
    arg: TGApp.Plugins.JSBridge.Arg<TGApp.Plugins.JSBridge.OpenApplicationPayload>,
  ): Promise<void> {
    console.log(`[openApplication] ${JSON.stringify(arg.payload)}`);
-    const appWindow = Window.getByLabel("TeyvatGuide");
+    const appWindow = webviewWindow.WebviewWindow.getByLabel("TeyvatGuide");
    await appWindow?.setFocus();
    showSnackbar({
      text: `不支持的操作：OpenApplication(${JSON.stringify(arg.payload)})`,
@@ -780,7 +737,10 @@ class TGClient {
        resolve();
      }, 1500);
    });
-    await this.window?.setFocus();
+    const windowFind = webviewWindow.WebviewWindow.getByLabel("mhy_client");
+    if (windowFind !== null) {
+      await windowFind.setFocus();
+    }
  }

  /**
@@ -795,7 +755,7 @@ class TGClient {
  ): Promise<void> {
    const res = await parseLink(arg.payload.page, true);
    if (!res) {
-      const appWindow = Window.getByLabel("TeyvatGuide");
+      const appWindow = webviewWindow.WebviewWindow.getByLabel("TeyvatGuide");
      await appWindow?.setFocus();
      showSnackbar({
        text: `未知链接:${arg.payload.page}`,
@@ -807,7 +767,10 @@ class TGClient {
          resolve();
        }, 3000);
      });
-      await this.window?.setFocus();
+      const windowFind = webviewWindow.WebviewWindow.getByLabel("mhy_client");
+      if (windowFind !== null) {
+        await windowFind.setFocus();
+      }
      return;
    }
    if (typeof res !== "string") return;
@@ -820,7 +783,11 @@ class TGClient {
    await this.loadJSBridge();
    await this.hideSideBar();
    await this.hideOverlay();
-    await this.window?.setFocus();
+    const windowFind = webviewWindow.WebviewWindow.getByLabel("mhy_client");
+    if (windowFind !== null) {
+      await windowFind.show();
+      await windowFind.setFocus();
+    }
  }

  /**
@@ -910,18 +877,15 @@ class TGClient {
        var buffer = new Uint8Array(atob(img.split(",")[1]).split("").map(function(item) {
          return item.charCodeAt(0);
        }));
-        var _t = window.__TAURI__;
-        var savePath = await _t.path.downloadDir() + Date.now() + ".png";
-        var save = await _t.dialog.save({
+        var _path = window.__TAURI__.path;
+        var saveDefault = await _path.downloadDir() + _path.sep() + Date.now() + ".png";
+        var savePath = await window.__TAURI_PLUGIN_DIALOG__.save({
          title: "保存图片",
          filters: [{ name: "图片", extensions: ["png"] }],
-          defaultPath: savePath
+          defaultPath: saveDefault,
        });
-        if (save) {
-          await _t.fs.writeBinaryFile({
-            contents: buffer,
-            path: save
-          });
+        if (savePath !== null) {
+          await window.__TAURI_PLUGIN_FS__.writeFile(savePath, buffer);
          alert("保存成功");
        }
        mhyWebBridge("${arg.callback}", {});
--- a/src/utils/UIGF.ts
+++ b/src/utils/UIGF.ts
@@ -149,5 +149,5 @@ export async function backupUigfData(
  gachaList: TGApp.Sqlite.GachaRecords.SingleTable[],
 ): Promise<void> {
  if (!(await exists(dirPath))) await mkdir(dirPath, { recursive: true });
-  await exportUigfData(uid, gachaList, `${dirPath}${path.sep}UIGF_${uid}.json`);
+  await exportUigfData(uid, gachaList, `${dirPath}${path.sep()}UIGF_${uid}.json`);
 }
--- a/src/utils/dataBS.ts
+++ b/src/utils/dataBS.ts
@@ -27,18 +27,18 @@ export async function backUpUserData(dir: string): Promise<void> {
    await mkdir(dir, { recursive: true });
  }
  const dataAchi = await TSUserAchi.getUIAF();
-  await writeTextFile(`${dir}${path.sep}UIAF.json`, JSON.stringify(dataAchi));
+  await writeTextFile(`${dir}${path.sep()}UIAF.json`, JSON.stringify(dataAchi));
  // 备份 ck
  const dataCK = await TGSqlite.getCookie();
-  await writeTextFile(`${dir}${path.sep}cookie.json`, JSON.stringify(dataCK));
+  await writeTextFile(`${dir}${path.sep()}cookie.json`, JSON.stringify(dataCK));
  // 备份深渊数据
  const dataAbyss = await TGSqlite.getAbyss();
-  await writeTextFile(`${dir}${path.sep}abyss.json`, JSON.stringify(dataAbyss));
+  await writeTextFile(`${dir}${path.sep()}abyss.json`, JSON.stringify(dataAbyss));
  // 备份祈愿数据
  const uidList = await TSUserGacha.getUidList();
  for (const uid of uidList) {
    const dataGacha = await TSUserGacha.getGachaRecords(uid);
-    const savePath = `${dir}${path.sep}UIGF_${uid}.json`;
+    const savePath = `${dir}${path.sep()}UIGF_${uid}.json`;
    await exportUigfData(uid, dataGacha, savePath);
  }
 }
--- a/src/views/t-anno-json.vue
+++ b/src/views/t-anno-json.vue
@@ -9,7 +9,7 @@
  </div>
 </template>
 <script lang="ts" setup>
-import { appWindow } from "@tauri-apps/api/window";
+import { webviewWindow } from "@tauri-apps/api";
 import { ref, onMounted, reactive } from "vue";
 import JsonViewer from "vue-json-viewer";
 import { useRoute } from "vue-router";
@@ -33,7 +33,7 @@ let jsonList = reactive({});
 let jsonContent = reactive({});

 onMounted(async () => {
-  await appWindow.show();
+  await webviewWindow.getCurrent().show();
  // 检查数据
  if (!annoId) {
    loadingEmpty.value = true;
--- a/src/views/t-post-json.vue
+++ b/src/views/t-post-json.vue
@@ -9,7 +9,7 @@
  </div>
 </template>
 <script lang="ts" setup>
-import { appWindow } from "@tauri-apps/api/window";
+import { webviewWindow } from "@tauri-apps/api";
 import { onMounted, reactive, ref } from "vue";
 import JsonViewer from "vue-json-viewer";
 import { useRoute } from "vue-router";
@@ -30,7 +30,7 @@ let parseData = reactive<TGApp.Plugins.Mys.SctPost.Base[]>([]);
 const isEmpty = ref<boolean>(false);

 onMounted(async () => {
-  await appWindow.show();
+  await webviewWindow.getCurrent().show();
  if (!postId) {
    loadingEmpty.value = true;
    loadingTitle.value = "错误的 POST ID！";
--- a/src/views/t-post.vue
+++ b/src/views/t-post.vue
@@ -160,7 +160,7 @@ onMounted(async () => {
  const isDev = useAppStore().devMode ?? false;
  if (isDev) {
    await TGLogger.Info(`[t-post][${postId}][onMounted] 打开 JSON 窗口`);
-    createPostJson(postId);
+    await createPostJson(postId);
  }
  await nextTick(() => {
    shareTimeTimer.value = setInterval(() => {
@@ -253,10 +253,10 @@ function parseContent(content: string): string {
  return JSON.stringify(result);
 }

-function createPostJson(postId: number): void {
+async function createPostJson(postId: number): Promise<void> {
  const jsonPath = `/post_detail_json/${postId}`;
  const jsonTitle = `Post_${postId}_JSON`;
-  createTGWindow(jsonPath, "Dev_JSON", jsonTitle, 960, 720, false, false);
+  await createTGWindow(jsonPath, "Dev_JSON", jsonTitle, 960, 720, false, false);
 }

 async function toPost(): Promise<void> {
--- a/src/web/request/TGRequest.ts
+++ b/src/web/request/TGRequest.ts
@@ -1,7 +1,7 @@
 /**
 * @file web/request/TGRequest.ts
 * @description 应用用到的请求函数
- * @since Beta v0.4.5
+ * @since Beta v0.5.0
 */

 import { genAuthkey, genAuthkey2 } from "./genAuthkey.js";
@@ -19,7 +19,6 @@ import { getGameRoleListByLToken } from "./getRoleList.js";
 import { getStokenByGameToken, getTokenBySToken } from "./getStoken.js";
 import getSyncAvatarDetail from "./getSyncAvatarDetail.js";
 import getSyncAvatarListAll from "./getSyncAvatarListAll.js";
-import { getTokensByLoginTicket } from "./getTokens.js";
 import { getUserCollect } from "./getUserCollect.js";
 import { getUserInfoByCookie } from "./getUserInfo.js";
 import { verifyLToken } from "./verifyLToken.js";
@@ -38,9 +37,6 @@ const TGRequest = {
    getCollect: getUserCollect,
    getGachaLog,
    getRecord: getGameRecord,
-    byLoginTicket: {
-      getTokens: getTokensByLoginTicket,
-    },
    byCookie: {
      getAbyss,
      getAccounts: getGameAccountsByCookie,
--- a/src/web/request/getTokens.ts
+++ b/src/web/request/getTokens.ts
@@ -1,34 +0,0 @@
-/**
- * @file web/request/getTokens.ts
- * @description 获取游戏 Token
- * @since Beta v0.5.0
- */
-
-import TGHttp from "../../utils/TGHttp.js";
-import TGApi from "../api/TGApi.js";
-import TGUtils from "../utils/TGUtils.js";
-
-/**
- * @description 根据 login_ticket 获取游戏 Token，包括 sToken 和 lToken
- * @since Beta v0.5.0
- * @param {string} ticket 登录票证
- * @param {string} uid 登录用户 uid
- * @returns {Promise<TGApp.BBS.Response.getTokensRes[] | TGApp.BBS.Response.Base>}
- */
-export async function getTokensByLoginTicket(
-  ticket: string,
-  uid: string,
-): Promise<TGApp.BBS.Response.getTokensRes[] | TGApp.BBS.Response.Base> {
-  const cookie = { login_ticket: ticket, login_uid: uid };
-  const url = TGApi.GameTokens.getTokens;
-  const params = { login_ticket: ticket, token_types: "3", uid };
-  const header = TGUtils.User.getHeader(cookie, "GET", params, "common");
-  const resp = await TGHttp<TGApp.BBS.Response.getTokens | TGApp.BBS.Response.Base>(url, {
-    method: "GET",
-    headers: header,
-    query: params,
-  });
-  console.log(resp);
-  if (resp.retcode !== 0) return <TGApp.BBS.Response.Base>resp;
-  return resp.data.list;
-}