From dfdcee9b95a49291ea6243c2b4a71ea379ea0a0f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 05 一月 2024 22:51:03 +0800
Subject: [PATCH] !79 update 富文本组件，修复两个组件上传图片位置错乱问题 Merge pull request !79 from 抓蛙师/N/A
---
src/api/login.ts | 116 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 70 insertions(+), 46 deletions(-)
diff --git a/src/api/login.ts b/src/api/login.ts
index b20e1a8..100a5e9 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -3,79 +3,103 @@
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
- };
- return request({
- url: '/auth/login',
- headers: {
- isToken: false
- },
- method: 'post',
- data: params
- });
+ const params = {
+ ...data,
+ clientId: data.clientId || clientId,
+ grantType: data.grantType || 'password'
+ };
+ return request({
+ url: '/auth/login',
+ headers: {
+ isToken: false,
+ isEncrypt: true
+ },
+ method: 'post',
+ data: params
+ });
}
// 娉ㄥ唽鏂规硶
export function register(data: any) {
- return request({
- url: '/auth/register',
- headers: {
- isToken: false
- },
- method: 'post',
- data: data
- });
+ const params = {
+ ...data,
+ clientId: clientId,
+ grantType: 'password'
+ };
+ return request({
+ url: '/auth/register',
+ headers: {
+ isToken: false,
+ isEncrypt: true
+ },
+ method: 'post',
+ data: params
+ });
}
/**
* 娉ㄩ攢
*/
export function logout() {
- return request({
- url: '/auth/logout',
- method: 'post'
- });
+ return request({
+ url: '/auth/logout',
+ method: 'post'
+ });
}
/**
* 鑾峰彇楠岃瘉鐮�
*/
export function getCodeImg(): AxiosPromise<VerifyCodeResult> {
- return request({
- url: '/code',
- headers: {
- isToken: false
- },
- method: 'get',
- timeout: 20000
- });
+ return request({
+ 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
+ });
}
// 鑾峰彇鐢ㄦ埛璇︾粏淇℃伅
export function getInfo(): AxiosPromise<UserInfo> {
- return request({
- url: '/system/user/getInfo',
- method: 'get'
- });
+ return request({
+ url: '/system/user/getInfo',
+ method: 'get'
+ });
}
// 鑾峰彇绉熸埛鍒楄〃
export function getTenantList(): AxiosPromise<TenantInfo> {
- return request({
- url: '/auth/tenant/list',
- headers: {
- isToken: false
- },
- method: 'get'
- });
+ return request({
+ url: '/auth/tenant/list',
+ headers: {
+ isToken: false
+ },
+ method: 'get'
+ });
}
--
Gitblit v1.9.3