From cb6cbc4f4017cf6da654274a865d8b352cb30326 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 09 九月 2023 11:42:40 +0800
Subject: [PATCH] !40 优化字典标签支持数组和多标签 Merge pull request !40 from 抓蛙师/ts
---
src/api/login.ts | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/api/login.ts b/src/api/login.ts
index f261c60..7419fb3 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 = 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,
- 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
@@ -32,7 +32,8 @@
return request({
url: '/auth/register',
headers: {
- isToken: false
+ isToken: false,
+ isEncrypt: true
},
method: 'post',
data: data
@@ -54,7 +55,7 @@
*/
export function getCodeImg(): AxiosPromise<VerifyCodeResult> {
return request({
- url: '/code',
+ url: '/auth/code',
headers: {
isToken: false
},
@@ -62,19 +63,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