From 0f54604435521d08c803e0ef30b363c97f230724 Mon Sep 17 00:00:00 2001 From: "Michelle.Chung" <1242874891@qq.com> Date: Fri, 16 Jun 2023 20:32:46 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=80=82=E9=85=8D=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=87=8D=E6=9E=84=E7=9A=84=E4=BF=AE=E6=94=B9(=E4=BF=AE?= =?UTF-8?q?=E6=94=B9token=E5=91=BD=E5=90=8D,=20=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=A0=E5=8F=82)=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.ts | 4 +++- src/api/types.ts | 4 +++- src/store/modules/user.ts | 4 ++-- src/utils/auth.ts | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/api/login.ts b/src/api/login.ts index b95a0c0..4eaa594 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -13,7 +13,9 @@ export function login(data: LoginData): AxiosPromise { username: data.username.trim(), password: data.password, code: data.code, - uuid: data.uuid + uuid: data.uuid, + clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e', + grantType: 'password' }; return request({ url: '/auth/login', diff --git a/src/api/types.ts b/src/api/types.ts index 68fb427..8ca204f 100644 --- a/src/api/types.ts +++ b/src/api/types.ts @@ -21,13 +21,15 @@ export interface LoginData { rememberMe?: boolean; code?: string; uuid?: string; + clientId: string; + grantType: string; } /** * 登录响应 */ export interface LoginResult { - token: string; + access_token: string; } /** diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 6f30437..2593d1a 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -23,8 +23,8 @@ export const useUserStore = defineStore('user', () => { const [err, res] = await to(loginApi(userInfo)); if (res) { const data = res.data; - setToken(data.token); - token.value = data.token; + setToken(data.access_token); + token.value = data.access_token; return Promise.resolve(); } return Promise.reject(err); diff --git a/src/utils/auth.ts b/src/utils/auth.ts index 4020003..db50ac9 100644 --- a/src/utils/auth.ts +++ b/src/utils/auth.ts @@ -4,6 +4,6 @@ const tokenStorage = useStorage(TokenKey, null); export const getToken = () => tokenStorage.value; -export const setToken = (token: string) => (tokenStorage.value = token); +export const setToken = (access_token: string) => (tokenStorage.value = access_token); export const removeToken = () => (tokenStorage.value = null);