From e521af0eaee067671aab2d2807ac9b5aa3d4cf30 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 25 十二月 2024 23:45:06 +0800
Subject: [PATCH] !169 fix 修复用户管理界面修改按钮权限字符串错误  Merge pull request !169 from QianRj/dev

---
 src/api/login.ts |   54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/src/api/login.ts b/src/api/login.ts
index b95a0c0..35e6a4e 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -3,22 +3,25 @@
 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
+    ...data,
+    clientId: data.clientId || clientId,
+    grantType: data.grantType || 'password'
   };
   return request({
     url: '/auth/login',
     headers: {
-      isToken: false
+      isToken: false,
+      isEncrypt: true,
+      repeatSubmit: false
     },
     method: 'post',
     data: params
@@ -27,13 +30,20 @@
 
 // 娉ㄥ唽鏂规硶
 export function register(data: any) {
+  const params = {
+    ...data,
+    clientId: clientId,
+    grantType: 'password'
+  };
   return request({
     url: '/auth/register',
     headers: {
-      isToken: false
+      isToken: false,
+      isEncrypt: true,
+      repeatSubmit: false
     },
     method: 'post',
-    data: data
+    data: params
   });
 }
 
@@ -41,6 +51,12 @@
  * 娉ㄩ攢
  */
 export function logout() {
+  if (import.meta.env.VITE_APP_SSE === 'true') {
+    request({
+      url: '/resource/sse/close',
+      method: 'get'
+    });
+  }
   return request({
     url: '/auth/logout',
     method: 'post'
@@ -52,12 +68,28 @@
  */
 export function getCodeImg(): AxiosPromise<VerifyCodeResult> {
   return request({
-    url: '/code',
+    url: '/auth/code',
     headers: {
       isToken: false
     },
     method: 'get',
     timeout: 20000
+  });
+}
+
+/**
+ * 绗笁鏂圭櫥褰�
+ */
+export function callback(data: LoginData): AxiosPromise<any> {
+  const LoginData = {
+    ...data,
+    clientId: clientId,
+    grantType: 'social'
+  };
+  return request({
+    url: '/auth/social/callback',
+    method: 'post',
+    data: LoginData
   });
 }
 
@@ -70,11 +102,11 @@
 }
 
 // 鑾峰彇绉熸埛鍒楄〃
-export function getTenantList(): AxiosPromise<TenantInfo> {
+export function getTenantList(isToken: boolean): AxiosPromise<TenantInfo> {
   return request({
     url: '/auth/tenant/list',
     headers: {
-      isToken: false
+      isToken: isToken
     },
     method: 'get'
   });

--
Gitblit v1.9.3