From 1465a27a6eba0677ddbd0d137669bbf6e3c6faf2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 29 七月 2024 12:29:25 +0800
Subject: [PATCH] fix 修复 登出后重新登录 sse推送报错问题

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

diff --git a/src/api/login.ts b/src/api/login.ts
index 4eaa594..c7c291e 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -3,24 +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,
-    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,
+      repeatSubmit: false
     },
     method: 'post',
     data: params
@@ -29,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
   });
 }
 
@@ -43,6 +51,10 @@
  * 娉ㄩ攢
  */
 export function logout() {
+  request({
+    url: '/resource/sse/close',
+    method: 'get'
+  });
   return request({
     url: '/auth/logout',
     method: 'post'
@@ -54,7 +66,7 @@
  */
 export function getCodeImg(): AxiosPromise<VerifyCodeResult> {
   return request({
-    url: '/code',
+    url: '/auth/code',
     headers: {
       isToken: false
     },
@@ -63,6 +75,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