From f203716f3152a777c303031b74ee0368d7466434 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 26 十一月 2024 15:29:06 +0800
Subject: [PATCH] update 优化 代码生成导入下拉框默认值处理
---
src/api/login.ts | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/src/api/login.ts b/src/api/login.ts
index 655d6c9..35e6a4e 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,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'
@@ -54,7 +68,7 @@
*/
export function getCodeImg(): AxiosPromise<VerifyCodeResult> {
return request({
- url: '/code',
+ url: '/auth/code',
headers: {
isToken: false
},
@@ -62,23 +76,20 @@
timeout: 20000
});
}
+
/**
* 绗笁鏂圭櫥褰�
- * @param source 绗笁鏂圭櫥褰曠被鍨�
- * */
-export function socialLogin(source: string, tenantId: string, code: any, state: any): AxiosPromise<any> {
- const data = {
- socialCode: code,
- socialState: state,
- source,
- tenantId,
- clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e',
+ */
+export function callback(data: LoginData): AxiosPromise<any> {
+ const LoginData = {
+ ...data,
+ clientId: clientId,
grantType: 'social'
};
return request({
- url: '/auth/social-login',
+ url: '/auth/social/callback',
method: 'post',
- data: data
+ data: LoginData
});
}
@@ -91,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