From b95a49c7d74e5c7f45cd7c65f45502edf7f203dd Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 07 二月 2025 13:08:34 +0800 Subject: [PATCH] reset 回滚有问题的修改 --- src/api/login.ts | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/api/login.ts b/src/api/login.ts index d4ceb49..35e6a4e 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -2,7 +2,9 @@ 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'; + +// pc绔浐瀹氬鎴风鎺堟潈id +const clientId = import.meta.env.VITE_APP_CLIENT_ID; /** * @param data {LoginData} @@ -11,13 +13,15 @@ export function login(data: LoginData): AxiosPromise<LoginResult> { const params = { ...data, - clientId: data.clientId || 'e5cd7e4891bf95d1d19206ce24a7b32e', + 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 @@ -26,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 }); } @@ -40,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' @@ -51,7 +68,7 @@ */ export function getCodeImg(): AxiosPromise<VerifyCodeResult> { return request({ - url: '/code', + url: '/auth/code', headers: { isToken: false }, @@ -59,14 +76,14 @@ timeout: 20000 }); } + /** * 绗笁鏂圭櫥褰� - * @param source 绗笁鏂圭櫥褰曠被鍨� - * */ + */ export function callback(data: LoginData): AxiosPromise<any> { const LoginData = { ...data, - clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e', + clientId: clientId, grantType: 'social' }; return request({ @@ -85,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