From c7cef19248eb9bb6a5420a48d1b26167ff7db858 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 27 六月 2024 17:58:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/api/user.js | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/api/user.js b/Source/plt-web/plt-web-ui/src/api/user.js
index b3d90d9..3e9891a 100644
--- a/Source/plt-web/plt-web-ui/src/api/user.js
+++ b/Source/plt-web/plt-web-ui/src/api/user.js
@@ -1,19 +1,17 @@
import request from '@/router/axios';
import website from "@/config/website";
-export const loginByUsername = (tenantId, deptId, roleId, username, password, type, key) => request({
+export const loginByUsername = (deptId, roleId, userId, password, type, key) => request({
url: '/api/framework/loginController/login',
method: 'post',
headers: {
- 'Tenant-Id': tenantId,
'Dept-Id': (website.switchMode ? deptId : ''),
'Role-Id': (website.switchMode ? roleId : ''),
'Captcha-Key': key,
},
params: {
- tenantId,
- username,
+ userId,
password,
grant_type: (website.captchaMode ? "captcha" : "password"),
scope: "all",
@@ -96,8 +94,8 @@
});
export const getUserInfo = () => request({
- url: '/api/blade-auth/oauth/user-info',
- method: 'get'
+ url: '/api/framework/loginController/getSessionInfo',
+ method: 'post'
});
export const sendLogs = (list) => request({
--
Gitblit v1.9.3