From d160c3a61cc38359de4794b208884bba430f0a1c Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期一, 10 七月 2023 22:56:42 +0800
Subject: [PATCH] merge
---
src/api/login.ts | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/api/login.ts b/src/api/login.ts
index 9d6d1b7..2f75ecb 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 = '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
+ ...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
@@ -60,19 +62,20 @@
timeout: 20000
});
}
+
/**
* 绗笁鏂圭櫥褰�
- * @param source 绗笁鏂圭櫥褰曠被鍨�
- * */
-export function socialLogin(source: string, code: any, state: any): AxiosPromise<any> {
- const data = {
- code,
- state
+ */
+export function callback(data: LoginData): AxiosPromise<any> {
+ const LoginData = {
+ ...data,
+ clientId: clientId,
+ grantType: 'social'
};
return request({
- url: '/auth/social-login/' + source,
- method: 'get',
- params: data
+ url: '/auth/social/callback',
+ method: 'post',
+ data: LoginData
});
}
--
Gitblit v1.9.3