From cc69786fd18c67f829acc75a2e5b58e3a9f02300 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 02 七月 2023 16:48:57 +0800
Subject: [PATCH] update 优化 !pr382 修复一些问题 完事流程逻辑

---
 src/api/login.ts |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/api/login.ts b/src/api/login.ts
index b95a0c0..e85ce3e 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -3,17 +3,18 @@
 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',
@@ -61,6 +62,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