From e021ac1e05cea7b150aa2a8e009f11aeac7c62b1 Mon Sep 17 00:00:00 2001
From: wangqiao <wangqiao@kailinjt.com>
Date: Tue, 26 Aug 2025 14:22:02 +0800
Subject: [PATCH] Update token handling and request logging

---
 composables/useDollarFetchRequest.ts | 8 ++++----
 composables/useFetchRequest.ts       | 3 +++
 pages/toolbox/index.vue              | 1 -
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/composables/useDollarFetchRequest.ts b/composables/useDollarFetchRequest.ts
index 5ab6a00..7a81ad4 100644
--- a/composables/useDollarFetchRequest.ts
+++ b/composables/useDollarFetchRequest.ts
@@ -1,5 +1,5 @@
 import { isArray } from "~/utils/utils";
-import refreshToken from "~/utils/RefreshToken";
+// import refreshToken from "~/utils/RefreshToken";
 
 type FetchType = typeof $fetch;
 export type FetchOptions = Parameters<FetchType>[1];
@@ -8,15 +8,15 @@ const useClientRequest = async <T = unknown>(
   url: string,
   opts?: FetchOptions
 ) => {
-  // const token = useCookie<string | undefined>("token");
+  const token = useCookie<string | undefined>("token");
   const runtimeConfig = useRuntimeConfig();
 
   const defaultOptions: FetchOptions = {
     baseURL: runtimeConfig.public.apiBase,
     onRequest({ options }) {
       options.headers = options.headers || 'application/json';
-      if (refreshToken.getToken().token) {
-        options.headers.set("Authorization", `Bearer ${refreshToken.getToken().token}`);
+      if (token.value) {
+        options.headers.set("Authorization", `Bearer ${token.value}`);
       }
     },
     onResponse({ response }) {
diff --git a/composables/useFetchRequest.ts b/composables/useFetchRequest.ts
index 852ca17..e1dd99c 100644
--- a/composables/useFetchRequest.ts
+++ b/composables/useFetchRequest.ts
@@ -39,6 +39,9 @@ const useServerRequest = async <T>(
         );
     },
   };
+  console.log(url + '-----' + 'defaultOptions----', defaultOptions);
+  console.log(url + '-----' + 'opts----', opts);
+
   // return useFetch<T>(url, { ...defaultOptions, ...opts } as any);
   // 明确转换返回类型
   const response = await useFetch<T>(url, { ...defaultOptions, ...opts } as any);
diff --git a/pages/toolbox/index.vue b/pages/toolbox/index.vue
index 46e2c48..ed7e1ae 100644
--- a/pages/toolbox/index.vue
+++ b/pages/toolbox/index.vue
@@ -115,7 +115,6 @@
   //   total: 0,
   // })
 
-
   const {data: pageRes, refresh: getPage } = await useAsyncData(`draw-page-list-${Date.now()}`, async () => {
     const res = await page(pageReq)
     return res.data