From 6b677aba4b2e0eeba141c537959f82d43e493395 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Wed, 23 Aug 2023 18:02:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=A4=B4=E4=B8=AD=E5=A2=9E=E5=8A=A0=20externalTerminalShow=20?= =?UTF-8?q?=E5=8F=82=E6=95=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.js | 4 +++- src/screenRequest/request.js | 3 +++ .../meetManage/modules/UploadMeetFileModal.vue | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/api/login.js b/src/api/login.js index 1d565f5..0c74715 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -1,5 +1,6 @@ import api from './index' import { axios } from '@/utils/request' +import { isExternalTerminal } from '../utils/util' /** * login func @@ -52,7 +53,8 @@ export function logout(logoutToken) { method: 'post', headers: { 'Content-Type': 'application/json;charset=UTF-8', - 'X-Access-Token': logoutToken + 'X-Access-Token': logoutToken, + 'externalTerminalShow': isExternalTerminal ? 'external' : 'inside' } }) } diff --git a/src/screenRequest/request.js b/src/screenRequest/request.js index 7046d69..8c8e71b 100644 --- a/src/screenRequest/request.js +++ b/src/screenRequest/request.js @@ -3,6 +3,7 @@ import axios from 'axios' import store from '@/store' import { Modal, notification } from 'ant-design-vue' import { ACCESS_TOKEN, TENANT_ID } from '@/store/mutation-types' +import { isExternalTerminal } from '../utils/util' /** * 【指定 axios的 baseURL】 @@ -100,6 +101,8 @@ service.interceptors.request.use(config => { if (token) { config.headers['X-Access-Token'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改 } + // 请求头里面放是否是外网展示的标识 + config.headers['externalTerminalShow'] = isExternalTerminal ? 'external' : 'inside' } //update-begin-author:taoyan date:2020707 for:多租户 let tenantid = Vue.ls.get(TENANT_ID) diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue index 64a9d3c..7911538 100644 --- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue +++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue @@ -79,6 +79,7 @@ import { downloadFile } from '../../../../api/manage' import { ACCESS_TOKEN } from '../../../../store/mutation-types' import { Modal } from 'ant-design-vue' import store from '@/store' +import { isExternalTerminal } from '../../../../utils/util' const FILE_TYPE_ALL = 'all' const columns = [ @@ -144,7 +145,10 @@ export default { computed: { //token header tokenHeader() { - let head = {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)} + let head = { + 'X-Access-Token': Vue.ls.get(ACCESS_TOKEN), + 'externalTerminalShow': isExternalTerminal ? 'external' : 'inside' + } return head }, importExcelUrl: function () {