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);