From 3fb8f1c2516f8e56ec9406426ccb4764c6c50968 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期日, 02 七月 2023 15:32:58 +0800 Subject: [PATCH] 回退 'Pull Request !20 : 统一登录授权' --- src/api/login.ts | 25 +++++-------------------- 1 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/api/login.ts b/src/api/login.ts index d4ceb49..b95a0c0 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -2,7 +2,6 @@ import { AxiosPromise } from 'axios'; import { LoginData, LoginResult, VerifyCodeResult, TenantInfo } from './types'; import { UserInfo } from '@/api/system/user/types'; -import { da } from 'element-plus/es/locale'; /** * @param data {LoginData} @@ -10,9 +9,11 @@ */ export function login(data: LoginData): AxiosPromise<LoginResult> { const params = { - ...data, - clientId: data.clientId || 'e5cd7e4891bf95d1d19206ce24a7b32e', - grantType: data.grantType || 'password' + tenantId: data.tenantId, + username: data.username.trim(), + password: data.password, + code: data.code, + uuid: data.uuid }; return request({ url: '/auth/login', @@ -57,22 +58,6 @@ }, method: 'get', timeout: 20000 - }); -} -/** - * 绗笁鏂圭櫥褰� - * @param source 绗笁鏂圭櫥褰曠被鍨� - * */ -export function callback(data: LoginData): AxiosPromise<any> { - const LoginData = { - ...data, - clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e', - grantType: 'social' - }; - return request({ - url: '/auth/social/callback', - method: 'post', - data: LoginData }); } -- Gitblit v1.9.3