From 4cf836055a02ed2dfd6fa4fd543366a7c2e06608 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 02 七月 2023 15:40:13 +0800
Subject: [PATCH] !23 统一登录，授权 Merge pull request !23 from 三个三/auth
---
src/api/login.ts | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/api/login.ts b/src/api/login.ts
index 9903f5b..d4ceb49 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -2,6 +2,7 @@
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}
@@ -9,13 +10,9 @@
*/
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 || 'e5cd7e4891bf95d1d19206ce24a7b32e',
+ grantType: data.grantType || 'password'
};
return request({
url: '/auth/login',
@@ -66,16 +63,16 @@
* 绗笁鏂圭櫥褰�
* @param source 绗笁鏂圭櫥褰曠被鍨�
* */
-export function socialLogin(source: string, code: any, state: any): AxiosPromise<any> {
- const data = {
- code,
- state,
- source
+export function callback(data: LoginData): AxiosPromise<any> {
+ const LoginData = {
+ ...data,
+ clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e',
+ grantType: 'social'
};
return request({
- url: '/auth/social-login',
- method: 'get',
- params: data
+ url: '/auth/social/callback',
+ method: 'post',
+ data: LoginData
});
}
--
Gitblit v1.9.3