diff --git a/src/api/login.js b/src/api/login.js index 1d565f5..6c0e3fa 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/components/jero/JImageUpload.vue b/src/components/jero/JImageUpload.vue index 58f5a84..5a46fd1 100644 --- a/src/components/jero/JImageUpload.vue +++ b/src/components/jero/JImageUpload.vue @@ -34,6 +34,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types' import { getFileAccessHttpUrl } from '@/api/manage' import {getFileInfo} from '@api/api' + import {isExternalTerminal} from '../../utils/util' // eslint-disable-next-line const Base64 = require('js-base64').Base64 @@ -120,7 +121,10 @@ }, created(){ const token = Vue.ls.get(ACCESS_TOKEN) - this.headers = {'X-Access-Token':token} + this.headers = { + 'X-Access-Token': token, + 'externalTerminalShow': isExternalTerminal ? 'external' : 'inside' + } }, methods:{ async initFileList(paths){ diff --git a/src/components/jero/JUpload.vue b/src/components/jero/JUpload.vue index 38dd62f..fdcab45 100644 --- a/src/components/jero/JUpload.vue +++ b/src/components/jero/JUpload.vue @@ -54,6 +54,7 @@ import Vue from 'vue' import {ACCESS_TOKEN} from '@/store/mutation-types' import {getFileAccessHttpUrl, downloadFile} from '@/api/manage' import {getFileInfo} from '@/api/api' +import {isExternalTerminal} from '../../utils/util' // eslint-disable-next-line no-undef // const Base64 = require('js-base64').Base64 @@ -186,7 +187,10 @@ export default { created() { const token = Vue.ls.get(ACCESS_TOKEN) //---------------------------- begin 图片左右换位置 ------------------------------------- - this.headers = {'X-Access-Token': token} + this.headers = { + 'X-Access-Token': token, + 'externalTerminalShow': isExternalTerminal ? 'external' : 'inside' + } this.containerId = 'container-ty-' + new Date().getTime() //---------------------------- end 图片左右换位置 ------------------------------------- }, diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js index e002911..4126af3 100644 --- a/src/mixins/JeroListMixin.js +++ b/src/mixins/JeroListMixin.js @@ -9,6 +9,7 @@ import Vue from 'vue' import {ACCESS_TOKEN, TENANT_ID} from '@/store/mutation-types' import store from '@/store' import {Modal} from 'ant-design-vue' +import {isExternalTerminal} from '../utils/util' const defaultSorter = { column: 'createTime', @@ -69,7 +70,10 @@ export const JeroListMixin = { 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' + } let tenantid = Vue.ls.get(TENANT_ID) if (tenantid) { head['tenant_id'] = tenantid diff --git a/src/screenRequest/request.js b/src/screenRequest/request.js index 7046d69..f649408 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/utils/request.js b/src/utils/request.js index b48354f..9cd8c59 100644 --- a/src/utils/request.js +++ b/src/utils/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 './util' /** * 【指定 axios的 baseURL】 @@ -95,6 +96,8 @@ const err = (error) => { // request interceptor service.interceptors.request.use(config => { + // 请求头里面放是否是外网展示的标识 + config.headers['externalTerminalShow'] = isExternalTerminal ? 'external' : 'inside' const token = Vue.ls.get(ACCESS_TOKEN) if (token) { config.headers[ 'X-Access-Token' ] = token // 让每个请求携带自定义 token 请根据实际情况自行修改 diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue index 64a9d3c..42c9ca6 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 () { diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue index 114d547..f7881c3 100644 --- a/src/views/system/modules/UserModal.vue +++ b/src/views/system/modules/UserModal.vue @@ -202,6 +202,7 @@ import {passwordReg} from '@/utils/validate' import {checkPhone, checkEmail, checkUserName} from '@/utils/validateOnly' import {getRSAPublicKey} from '@/api/login.js' import {encrypt} from '@/utils/util' +import {isExternalTerminal} from '../../../utils/util' export default { @@ -316,7 +317,10 @@ export default { }, created() { const token = Vue.ls.get(ACCESS_TOKEN) - this.headers = {'X-Access-Token': token} + this.headers = { + 'X-Access-Token': token, + 'externalTerminalShow': isExternalTerminal ? 'external' : 'inside' + } // this.initTenantList() },