From 7b6078a178b2bc72d2e0f182919ce0267d4ca5fc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 28 六月 2023 14:28:45 +0800
Subject: [PATCH] !15 适配登录重构的修改 Merge pull request !15 from MichelleChung/ts
---
src/api/login.ts | 110 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 64 insertions(+), 46 deletions(-)
diff --git a/src/api/login.ts b/src/api/login.ts
index b20e1a8..9903f5b 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -8,74 +8,92 @@
* @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
- };
- return request({
- url: '/auth/login',
- headers: {
- isToken: false
- },
- method: 'post',
- data: params
- });
+ const params = {
+ tenantId: data.tenantId,
+ username: data.username.trim(),
+ password: data.password,
+ code: data.code,
+ uuid: data.uuid,
+ clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e',
+ grantType: 'password'
+ };
+ return request({
+ url: '/auth/login',
+ headers: {
+ isToken: false
+ },
+ method: 'post',
+ data: params
+ });
}
// 娉ㄥ唽鏂规硶
export function register(data: any) {
- return request({
- url: '/auth/register',
- headers: {
- isToken: false
- },
- method: 'post',
- data: data
- });
+ return request({
+ url: '/auth/register',
+ headers: {
+ isToken: false
+ },
+ method: 'post',
+ data: data
+ });
}
/**
* 娉ㄩ攢
*/
export function logout() {
- return request({
- url: '/auth/logout',
- method: 'post'
- });
+ return request({
+ url: '/auth/logout',
+ method: 'post'
+ });
}
/**
* 鑾峰彇楠岃瘉鐮�
*/
export function getCodeImg(): AxiosPromise<VerifyCodeResult> {
- return request({
- url: '/code',
- headers: {
- isToken: false
- },
- method: 'get',
- timeout: 20000
- });
+ return request({
+ url: '/code',
+ headers: {
+ isToken: false
+ },
+ method: 'get',
+ timeout: 20000
+ });
+}
+/**
+ * 绗笁鏂圭櫥褰�
+ * @param source 绗笁鏂圭櫥褰曠被鍨�
+ * */
+export function socialLogin(source: string, code: any, state: any): AxiosPromise<any> {
+ const data = {
+ code,
+ state,
+ source
+ };
+ return request({
+ url: '/auth/social-login',
+ method: 'get',
+ params: data
+ });
}
// 鑾峰彇鐢ㄦ埛璇︾粏淇℃伅
export function getInfo(): AxiosPromise<UserInfo> {
- return request({
- url: '/system/user/getInfo',
- method: 'get'
- });
+ return request({
+ url: '/system/user/getInfo',
+ method: 'get'
+ });
}
// 鑾峰彇绉熸埛鍒楄〃
export function getTenantList(): AxiosPromise<TenantInfo> {
- return request({
- url: '/auth/tenant/list',
- headers: {
- isToken: false
- },
- method: 'get'
- });
+ return request({
+ url: '/auth/tenant/list',
+ headers: {
+ isToken: false
+ },
+ method: 'get'
+ });
}
--
Gitblit v1.9.3