diff --git a/frontend/src/api/login.ts b/frontend/src/api/login.ts index 10b7bf4a..ccd6284a 100644 --- a/frontend/src/api/login.ts +++ b/frontend/src/api/login.ts @@ -6,9 +6,6 @@ export const AuthApi = { }>('/login/access-token', credentials, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' - }, - requestOptions: { - rawResponse: true, } }), logout: () => request.post('/auth/logout') diff --git a/frontend/src/stores/user.ts b/frontend/src/stores/user.ts index 6652dae6..f4990698 100644 --- a/frontend/src/stores/user.ts +++ b/frontend/src/stores/user.ts @@ -9,8 +9,8 @@ export const useUserStore = defineStore('user', () => { const login = async (formData: { username: string; password: string }) => { username.value = formData.username - const res = await AuthApi.login(formData) - token.value = res.data.access_token + const res: any = await AuthApi.login(formData) + token.value = res.access_token wsCache.set('user.token', token.value) username.value = formData.username } diff --git a/frontend/src/utils/request.ts b/frontend/src/utils/request.ts index bd94be0e..4e20c920 100644 --- a/frontend/src/utils/request.ts +++ b/frontend/src/utils/request.ts @@ -94,6 +94,11 @@ class HttpService { /* if (response.data?.success !== true) { return Promise.reject(response.data) } */ + if (response.data?.code === 0) { + return response.data.data + } else if (response.data?.code) { + return Promise.reject(response.data) + } return response.data }, async (error: AxiosError) => {