From 31da01bdd1e4fe8fb8eec41f401d73bcf6cc18b7 Mon Sep 17 00:00:00 2001
From: ahao <liuhaoai545@gmail.com>
Date: 星期六, 06 一月 2024 17:27:01 +0800
Subject: [PATCH] fix https://gitee.com/dromara/RuoYi-Vue-Plus/issues/I8TMAI
---
src/api/login.ts | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/src/api/login.ts b/src/api/login.ts
index b95a0c0..100a5e9 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -3,22 +3,24 @@
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
},
method: 'post',
data: params
@@ -27,13 +29,19 @@
// 娉ㄥ唽鏂规硶
export function register(data: any) {
+ const params = {
+ ...data,
+ clientId: clientId,
+ grantType: 'password'
+ };
return request({
url: '/auth/register',
headers: {
- isToken: false
+ isToken: false,
+ isEncrypt: true
},
method: 'post',
- data: data
+ data: params
});
}
@@ -52,7 +60,7 @@
*/
export function getCodeImg(): AxiosPromise<VerifyCodeResult> {
return request({
- url: '/code',
+ url: '/auth/code',
headers: {
isToken: false
},
@@ -61,6 +69,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