From a2f13185e18c274d80cadade406e2b47253b038a Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 09 十月 2023 11:57:22 +0800 Subject: [PATCH] fix 修复 HeaderSearch组件跳转query参数丢失问题 --- src/api/login.ts | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/api/login.ts b/src/api/login.ts index b95a0c0..7419fb3 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -3,22 +3,24 @@ import { LoginData, LoginResult, VerifyCodeResult, TenantInfo } from './types'; import { UserInfo } from '@/api/system/user/types'; +// pc绔浐瀹氬鎴风鎺堟潈id +const clientId = import.meta.env.VITE_APP_CLIENT_ID; + /** * @param data {LoginData} * @returns */ export function login(data: LoginData): AxiosPromise<LoginResult> { const params = { - tenantId: data.tenantId, - username: data.username.trim(), - password: data.password, - code: data.code, - uuid: data.uuid + ...data, + clientId: data.clientId || clientId, + grantType: data.grantType || 'password' }; return request({ url: '/auth/login', headers: { - isToken: false + isToken: false, + isEncrypt: true }, method: 'post', data: params @@ -30,7 +32,8 @@ return request({ url: '/auth/register', headers: { - isToken: false + isToken: false, + isEncrypt: true }, method: 'post', data: data @@ -52,7 +55,7 @@ */ export function getCodeImg(): AxiosPromise<VerifyCodeResult> { return request({ - url: '/code', + url: '/auth/code', headers: { isToken: false }, @@ -61,6 +64,22 @@ }); } +/** + * 绗笁鏂圭櫥褰� + */ +export function callback(data: LoginData): AxiosPromise<any> { + const LoginData = { + ...data, + clientId: clientId, + grantType: 'social' + }; + return request({ + url: '/auth/social/callback', + method: 'post', + data: LoginData + }); +} + // 鑾峰彇鐢ㄦ埛璇︾粏淇℃伅 export function getInfo(): AxiosPromise<UserInfo> { return request({ -- Gitblit v1.9.3