From 3e512617282dca63a0145fe82ce79eec8c06e80b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8A=93=E8=9B=99=E5=B8=88?= <770492966@qq.com>
Date: Thu, 14 Jul 2022 21:20:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E8=A3=85=E7=BB=9F=E4=B8=80=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/Editor/index.vue      | 6 ++----
 ruoyi-ui/src/components/FileUpload/index.vue  | 6 ++----
 ruoyi-ui/src/components/ImageUpload/index.vue | 6 ++----
 ruoyi-ui/src/plugins/download.js              | 6 +++---
 ruoyi-ui/src/utils/auth.js                    | 6 ++++++
 ruoyi-ui/src/utils/request.js                 | 3 ++-
 ruoyi-ui/src/views/demo/demo/index.vue        | 4 ++--
 ruoyi-ui/src/views/system/user/index.vue      | 4 ++--
 8 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index 1f2e15ec2..057e09b5a 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -22,7 +22,7 @@ import Quill from "quill";
 import "quill/dist/quill.core.css";
 import "quill/dist/quill.snow.css";
 import "quill/dist/quill.bubble.css";
-import { getToken } from "@/utils/auth";
+import { getHeader } from "@/utils/auth";
 
 export default {
   name: "Editor",
@@ -61,9 +61,7 @@ export default {
   data() {
     return {
       uploadUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 上传的图片服务器地址
-      headers: {
-        Authorization: "Bearer " + getToken()
-      },
+      headers: getHeader(),
       Quill: null,
       currentValue: "",
       options: {
diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/ruoyi-ui/src/components/FileUpload/index.vue
index e999f14f8..2650b1bc2 100644
--- a/ruoyi-ui/src/components/FileUpload/index.vue
+++ b/ruoyi-ui/src/components/FileUpload/index.vue
@@ -40,8 +40,8 @@
 </template>
 
 <script>
-import { getToken } from "@/utils/auth";
 import { listByIds, delOss } from "@/api/system/oss";
+import { getHeader } from "@/utils/auth";
 
 export default {
   name: "FileUpload",
@@ -75,9 +75,7 @@ export default {
       uploadList: [],
       baseUrl: process.env.VUE_APP_BASE_API,
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 上传的图片服务器地址
-      headers: {
-        Authorization: "Bearer " + getToken(),
-      },
+      headers: getHeader(),
       fileList: [],
     };
   },
diff --git a/ruoyi-ui/src/components/ImageUpload/index.vue b/ruoyi-ui/src/components/ImageUpload/index.vue
index 62199795d..6f00c8c26 100644
--- a/ruoyi-ui/src/components/ImageUpload/index.vue
+++ b/ruoyi-ui/src/components/ImageUpload/index.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import { getToken } from "@/utils/auth";
+import { getHeader } from "@/utils/auth";
 import { listByIds, delOss } from "@/api/system/oss";
 
 export default {
@@ -79,9 +79,7 @@ export default {
       hideUpload: false,
       baseUrl: process.env.VUE_APP_BASE_API,
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 上传的图片服务器地址
-      headers: {
-        Authorization: "Bearer " + getToken(),
-      },
+      headers: getHeader(),
       fileList: []
     };
   },
diff --git a/ruoyi-ui/src/plugins/download.js b/ruoyi-ui/src/plugins/download.js
index 85138bb17..b6b52dacd 100644
--- a/ruoyi-ui/src/plugins/download.js
+++ b/ruoyi-ui/src/plugins/download.js
@@ -1,7 +1,7 @@
 import axios from 'axios'
 import {Loading, Message} from 'element-ui'
 import { saveAs } from 'file-saver'
-import { getToken } from '@/utils/auth'
+import { getHeader } from "@/utils/auth";
 import errorCode from '@/utils/errorCode'
 import { blobValidate } from "@/utils/ruoyi";
 
@@ -16,7 +16,7 @@ export default {
       method: 'get',
       url: url,
       responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
+      headers: getHeader()
     }).then(async (res) => {
       const isLogin = await blobValidate(res.data);
       if (isLogin) {
@@ -39,7 +39,7 @@ export default {
       url: url,
       responseType: 'blob',
       headers: {
-        'Authorization': 'Bearer ' + getToken(),
+        ...getHeader(),
         'datasource': localStorage.getItem("dataName")
       }
     }).then(async (res) => {
diff --git a/ruoyi-ui/src/utils/auth.js b/ruoyi-ui/src/utils/auth.js
index 08a43d6e2..ab5f23b77 100644
--- a/ruoyi-ui/src/utils/auth.js
+++ b/ruoyi-ui/src/utils/auth.js
@@ -2,6 +2,12 @@ import Cookies from 'js-cookie'
 
 const TokenKey = 'Admin-Token'
 
+export function getHeader() {
+  return {
+    Authorization: "Bearer " + getToken()
+  }
+}
+
 export function getToken() {
   return Cookies.get(TokenKey)
 }
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index 3c3a65a39..2f4aec0e6 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -6,6 +6,7 @@ import errorCode from '@/utils/errorCode'
 import { tansParams, blobValidate } from "@/utils/ruoyi";
 import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
+import { getHeader } from "@/utils/auth";
 
 let downloadLoadingInstance;
 // 是否显示重新登录
@@ -29,7 +30,7 @@ service.interceptors.request.use(config => {
   // 是否需要防止数据重复提交
   const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
   if (getToken() && !isToken) {
-    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    config.headers={...config.headers,...getHeader()} // 让每个请求携带自定义token 请根据实际情况自行修改
   }
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
diff --git a/ruoyi-ui/src/views/demo/demo/index.vue b/ruoyi-ui/src/views/demo/demo/index.vue
index 65387c9a5..8136c4400 100644
--- a/ruoyi-ui/src/views/demo/demo/index.vue
+++ b/ruoyi-ui/src/views/demo/demo/index.vue
@@ -201,7 +201,7 @@
 
 <script>
 import { listDemo, pageDemo, getDemo, delDemo, addDemo, updateDemo } from "@/api/demo/demo";
-import {getToken} from "@/utils/auth";
+import { getHeader } from "@/utils/auth";
 
 export default {
   name: "Demo",
@@ -240,7 +240,7 @@ export default {
         // 是否禁用上传
         isUploading: false,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: getHeader(),
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/demo/demo/importData"
       },
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 7b79ac876..5acfc4148 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -343,7 +343,7 @@
 
 <script>
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
-import { getToken } from "@/utils/auth";
+import { getHeader } from "@/utils/auth";
 import { treeselect } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -401,7 +401,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: getHeader(),
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/system/user/importData"
       },