From c6d0c38232c1e188f7635c54024b1f3063204b0b Mon Sep 17 00:00:00 2001 From: LiuYuanchi Date: Mon, 28 Apr 2025 16:22:29 +0800 Subject: [PATCH] =?UTF-8?q?[tag]=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=8E=9F?= =?UTF-8?q?=E5=A7=8B=E6=A1=86=E6=9E=B6=E6=8E=A5=E5=8F=A3=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E6=8A=A5=E9=94=99=EF=BC=8C=E5=85=A8=E9=83=A8=E6=8D=A2?= =?UTF-8?q?=E7=94=A8=E8=87=AA=E6=9C=89=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/axios/src/index.ts | 38 +++++++++---------- src/store/modules/auth/index.ts | 21 +++++----- .../_builtin/login/modules/pwd-login.vue | 6 +-- src/views/orders/list/index.vue | 14 ++++--- 4 files changed, 42 insertions(+), 37 deletions(-) diff --git a/packages/axios/src/index.ts b/packages/axios/src/index.ts index 1eccd49..4ee31c4 100644 --- a/packages/axios/src/index.ts +++ b/packages/axios/src/index.ts @@ -51,37 +51,37 @@ function createCommonRequest( instance.interceptors.response.use( async response => { const responseType: ResponseType = (response.config?.responseType as ResponseType) || 'json'; - - response.data.errorMsg = "success"; + if (responseType !== 'json' || opts.isBackendSuccess(response)) { - console.log("true") return Promise.resolve(response); } - + const fail = await opts.onBackendFail(response, instance); if (fail) { return fail; } - // console.log('...Response Data:', response.data); - // const isSuccess = opts.isBackendSuccess(response); - // console.log('...Is Backend Success:', isSuccess); - + console.log('Response URL:', response.config.url); // 记录请求的 URL + console.log('Response Data:', response.data); // 记录响应数据以便调试 const backendErrorMessage = response.data?.message || 'the backend request error.'; - const backendError = new AxiosError( - backendErrorMessage, - BACKEND_ERROR_CODE, - response.config, - response.request, - response - ); - - await opts.onError(backendError); - - return Promise.reject(backendError); + + + console.log('Error detected for URL:', response.config.url); // 记录抛出错误的 URL + const backendError = new AxiosError( + backendErrorMessage, + BACKEND_ERROR_CODE, + response.config, + response.request, + response + ); + + await opts.onError(backendError); + return Promise.reject(backendError); }, async (error: AxiosError) => { + console.log('Request Error for URL:', error.config?.url); // 记录请求错误的 URL + console.error('Error Details:', error.message); // 记录错误详情 await opts.onError(error); return Promise.reject(error); diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts index 2b9ea29..6b61c24 100644 --- a/src/store/modules/auth/index.ts +++ b/src/store/modules/auth/index.ts @@ -10,6 +10,7 @@ import { $t } from '@/locales'; import { useRouteStore } from '../route'; import { useTabStore } from '../tab'; import { clearAuthStorage, getToken } from './shared'; +import { apiRequestGet,apiRequestPost } from '@/utils/api'; export const useAuthStore = defineStore(SetupStoreId.Auth, () => { const route = useRoute(); @@ -60,21 +61,24 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { * @param password Password * @param [redirect=true] Whether to redirect after login. Default is `true` */ - async function login(userName: string, password: string, redirect = true) { + async function login(username: string, password: string, redirect = true) { startLoading(); - const { response, error } = await fetchLogin(userName, password); + let data = {username, password} + let response= await apiRequestPost('/auth/login',data); let accessToken = response.data.token; let loginToken: Api.Auth.LoginToken = { token: accessToken, refreshToken: "" }; - let userId = response.data.employeeId - if (error?.status == 200) { - const pass = await loginByToken(loginToken,userId); + if (response.status) { + + localStg.set('token', loginToken.token); + localStg.set('refreshToken', loginToken.refreshToken); + const pass = await getUserInfo(); if (pass) { + token.value = loginToken.token; await redirectFromLogin(redirect); - window.$notification?.success({ message: $t('page.login.common.loginSuccess'), description: $t('page.login.common.welcomeBack', { userName: userInfo.userName }) @@ -97,7 +101,6 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { if (pass) { token.value = loginToken.token; - return true; } @@ -105,10 +108,10 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { } async function getUserInfo() { - const { response, error } = await fetchGetUserInfo(); + let response = await apiRequestGet('/employees/getUserInfo'); let data:any = response.data.data - if (error?.status == 200) { + if (response.data.success) { let info: Api.Auth.UserInfo = { userId: data.employeeId.toString(), userName: data.name, diff --git a/src/views/_builtin/login/modules/pwd-login.vue b/src/views/_builtin/login/modules/pwd-login.vue index 54ab090..b9abcd2 100644 --- a/src/views/_builtin/login/modules/pwd-login.vue +++ b/src/views/_builtin/login/modules/pwd-login.vue @@ -1,8 +1,8 @@