From ac3ad638949e4d560ddf69320a5f9bb28ca5aaca Mon Sep 17 00:00:00 2001 From: ahaos <8406649+lhailgl@user.noreply.gitee.com> Date: 星期三, 19 七月 2023 22:48:30 +0800 Subject: [PATCH] !29 修改列表打开对话框和接口请求顺序 Merge pull request !29 from ahaos/tspr --- src/api/login.ts | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/api/login.ts b/src/api/login.ts index 4eaa594..2f75ecb 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -3,24 +3,24 @@ import { LoginData, LoginResult, VerifyCodeResult, TenantInfo } from './types'; import { UserInfo } from '@/api/system/user/types'; +// pc绔浐瀹氬鎴风鎺堟潈id +const clientId = 'e5cd7e4891bf95d1d19206ce24a7b32e'; + /** * @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, - clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e', - grantType: 'password' + ...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 @@ -63,6 +63,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