From 74c955924f1d63209ed054ad9688573d4624202d Mon Sep 17 00:00:00 2001 From: EightMonth Date: Thu, 23 May 2024 10:49:37 +0800 Subject: [PATCH] =?UTF-8?q?sas=E5=85=BC=E5=AE=B9shiro=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sys/model/userModel.ts | 2 +- src/api/sys/user.ts | 3 +-- src/store/modules/user.ts | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/api/sys/model/userModel.ts b/src/api/sys/model/userModel.ts index dab4e74..64f730b 100644 --- a/src/api/sys/model/userModel.ts +++ b/src/api/sys/model/userModel.ts @@ -23,7 +23,7 @@ export interface RoleInfo { */ export interface LoginResultModel { userId: string | number; - access_token: string; + token: string; role: RoleInfo; userInfo?: any } diff --git a/src/api/sys/user.ts b/src/api/sys/user.ts index 50f0b85..173869b 100644 --- a/src/api/sys/user.ts +++ b/src/api/sys/user.ts @@ -11,7 +11,7 @@ import { PageEnum } from '/@/enums/pageEnum'; const { createErrorModal } = useMessage(); enum Api { - Login = '/oauth2/token', + Login = '/sys/login', phoneLogin = '/oauth2/token', Logout = '/sys/logout', GetUserInfo = '/sys/user/getUserInfo', @@ -58,7 +58,6 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal') }, }, { - isTransformResponse: false, errorMessageMode: mode, } ); diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 218b506..d7adaf1 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -136,13 +136,13 @@ export const useUserStore = defineStore({ const { goHome = true, mode, ...loginParams } = params; loginParams.grant_type = 'password'; const data = await loginApi(loginParams, mode); - const { access_token, userInfo } = data; + const { token, userInfo } = data; // save token - this.setToken(access_token); + this.setToken(token); this.setTenant(userInfo.loginTenantId); return this.afterLoginAction(goHome, data); } catch (error) { - return Promise.reject(error.response.data); + return Promise.reject(error); } }, /**