From 4d85b05dc18f34fc938bf7d93b37e1dfbcfb0741 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Mon, 10 Jul 2023 01:18:07 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=AE=A4=E8=AF=81=E6=96=B9=E6=A1=88:?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8token=E8=BF=9B=E8=A1=8C=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cloud/bigscreen-design/src/axios.js         | 17 ++++++-----------
 cloud/bigscreen-design/src/option/config.js |  2 +-
 cloud/bigscreen-design/src/router.js        |  7 -------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/cloud/bigscreen-design/src/axios.js b/cloud/bigscreen-design/src/axios.js
index 5114a41..3b23708 100644
--- a/cloud/bigscreen-design/src/axios.js
+++ b/cloud/bigscreen-design/src/axios.js
@@ -1,21 +1,16 @@
 // import { Loading } from 'element-ui';
 import { checkUrl } from '@/utils/utils'
-import axios from 'axios';
+import axios from 'axios'
+import { parseUrlParams } from './router'
 window.$glob = {
   url: '',
-  params: {},
+  params: parseUrlParams(),
   query: {},
   header: {}
 };
-function getGlobParams () {
-  var query = window.location.search.substring(1);
-  query = query.split("&");
-  query.forEach(ele => {
-    var pair = ele.split("=");
-    window.$glob.params[pair[0]] = pair[1]
-  })
-}
-getGlobParams();
+// 认证方案:使用token进行请求
+window.$glob.params.token &&
+(window.$glob.header['Authorization'] = `Bearer ${window.$glob.params.token}`)
 axios.defaults.timeout = 10000;
 //返回其他状态吗
 axios.defaults.validateStatus = function (status) {
diff --git a/cloud/bigscreen-design/src/option/config.js b/cloud/bigscreen-design/src/option/config.js
index 7807faf..5406805 100644
--- a/cloud/bigscreen-design/src/option/config.js
+++ b/cloud/bigscreen-design/src/option/config.js
@@ -4,7 +4,7 @@ export const config = {
   width: 1920,
   height: 1080,
   query: "function(){\n    return window.$glob.params || {}\n}",
-  header: "function(){\n    return window.$glob.params || {}\n}",
+  header: "function(){\n    return window.$glob.header || {}\n}",
   screen: 'x',
   mark: {
     show: false,
diff --git a/cloud/bigscreen-design/src/router.js b/cloud/bigscreen-design/src/router.js
index 4679b4b..1184d8f 100644
--- a/cloud/bigscreen-design/src/router.js
+++ b/cloud/bigscreen-design/src/router.js
@@ -50,13 +50,6 @@ const vueRouter = createRouter({
   }]
 })
 
-vueRouter.beforeEach((to, from, next) => {
-  // 获取当前路由的查询参数
-  const queryParams = parseUrlParams()
-  queryParams.token && (window.$glob.header['Authorization'] = `Bearer ${queryParams.token}`)
-  next()
-})
-
 /** 解析路由hash模式下url参数 */
 const hashUrlParamsRegex = /(?:\?|&)([^=&]+)(?:=([^&]*))?/g
 export function parseUrlParams() {