From 0885f2387089b646eb45f2ef3da5967f72d8d13f Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Wed, 23 Aug 2023 16:27:16 +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=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jero/JImageUpload.vue   | 6 +++++-
 src/components/jero/JUpload.vue        | 6 +++++-
 src/mixins/JeroListMixin.js            | 6 +++++-
 src/utils/request.js                   | 3 +++
 src/views/system/modules/UserModal.vue | 6 +++++-
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/components/jero/JImageUpload.vue b/src/components/jero/JImageUpload.vue
index 58f5a84..e824011 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..c2e8d76 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..bc7d57b 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/utils/request.js b/src/utils/request.js
index b48354f..8b2904e 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/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 114d547..7aaaa0b 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()
 
   },