From 83c7e9e4f880128e5471c8ecfdc3f896f1144d92 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 18 六月 2024 16:50:30 +0800
Subject: [PATCH] 修改项目请求头token传参方式-取消登录页选择租户
---
Source/plt-web/plt-web-ui/src/router/axios.js | 2 +-
Source/plt-web/plt-web-ui/src/page/login/userlogin.vue | 22 +++++++++++-----------
Source/plt-web/plt-web-ui/src/store/modules/user.js | 2 +-
Source/plt-web/plt-web-ui/src/api/user.js | 4 +---
Source/plt-web/plt-web-ui/src/config/website.js | 2 +-
5 files changed, 15 insertions(+), 17 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 9bb5ea7..ba082a8 100644
--- a/Source/plt-web/plt-web-ui/src/api/user.js
+++ b/Source/plt-web/plt-web-ui/src/api/user.js
@@ -1,18 +1,16 @@
import request from '@/router/axios';
import website from "@/config/website";
-export const loginByUsername = (tenantId, deptId, roleId, userId, 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,
userId,
password,
grant_type: (website.captchaMode ? "captcha" : "password"),
diff --git a/Source/plt-web/plt-web-ui/src/config/website.js b/Source/plt-web/plt-web-ui/src/config/website.js
index 4547aa6..fd3874d 100644
--- a/Source/plt-web/plt-web-ui/src/config/website.js
+++ b/Source/plt-web/plt-web-ui/src/config/website.js
@@ -15,7 +15,7 @@
switchMode: false, // 鏄惁寮�鍚儴闂ㄥ垏鎹㈡ā寮�
lockPage: '/lock',
tokenTime: 3000,
- tokenHeader: 'Blade-Auth',
+ tokenHeader: 'Authorizationtoken',
//http鐨剆tatus榛樿鏀捐鍒楄〃
statusWhiteList: [],
//閰嶇疆棣栭〉涓嶅彲鍏抽棴
diff --git a/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue b/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
index 0e775ec..a3ff8b0 100644
--- a/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
+++ b/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
@@ -7,17 +7,17 @@
label-width="0"
>
- <el-form-item prop="selectInput">
- <el-select v-model="loginForm.value" placeholder="璇烽�夋嫨缁勭粐" style="width: 326px" @change="selectchange">
- <i slot="prefix" class="el-icon-s-operation"/>
- <el-option
- v-for="(item,index) in loginForm.region"
- :key="index"
- :label="item.TENANT_NAME"
- :value="item.TENANT_ID">
- </el-option>
- </el-select>
- </el-form-item>
+<!-- <el-form-item prop="selectInput">-->
+<!-- <el-select v-model="loginForm.value" placeholder="璇烽�夋嫨缁勭粐" style="width: 326px" @change="selectchange">-->
+<!-- <i slot="prefix" class="el-icon-s-operation"/>-->
+<!-- <el-option-->
+<!-- v-for="(item,index) in loginForm.region"-->
+<!-- :key="index"-->
+<!-- :label="item.TENANT_NAME"-->
+<!-- :value="item.TENANT_ID">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item prop="username">
<el-input size="small"
@keyup.enter.native="handleLogin"
diff --git a/Source/plt-web/plt-web-ui/src/router/axios.js b/Source/plt-web/plt-web-ui/src/router/axios.js
index 64b38fe..bfe6a01 100644
--- a/Source/plt-web/plt-web-ui/src/router/axios.js
+++ b/Source/plt-web/plt-web-ui/src/router/axios.js
@@ -41,7 +41,7 @@
const meta = (config.meta || {});
const isToken = meta.isToken === false;
if (getToken() && !isToken) {
- config.headers[website.tokenHeader] = 'bearer ' + getToken()
+ config.headers[website.tokenHeader] = getToken()
}
//headers涓厤缃畉ext璇锋眰
if (config.text === true) {
diff --git a/Source/plt-web/plt-web-ui/src/store/modules/user.js b/Source/plt-web/plt-web-ui/src/store/modules/user.js
index 2506220..c34bb5c 100644
--- a/Source/plt-web/plt-web-ui/src/store/modules/user.js
+++ b/Source/plt-web/plt-web-ui/src/store/modules/user.js
@@ -62,7 +62,7 @@
//鏍规嵁鐢ㄦ埛鍚嶇櫥褰�
LoginByUsername({commit}, userInfo) {
return new Promise((resolve, reject) => {
- loginByUsername(userInfo.tenantId, userInfo.deptId, userInfo.roleId, userInfo.username, userInfo.password, userInfo.type, userInfo.key,).then(res => {
+ loginByUsername(userInfo.deptId, userInfo.roleId, userInfo.username, userInfo.password, userInfo.type, userInfo.key,).then(res => {
const data = res.data;
if (data.code === 200) {
commit('SET_TOKEN', data.obj.tokenVO.accessToken);
--
Gitblit v1.9.3