Pre Merge pull request !202 from 抓蛙师/auto-7465549-dev-1657804818924

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: {
+      headers: getHeader(),
-        Authorization: "Bearer " + getToken()
-      },
       Quill: null,
       currentValue: "",
       options: {

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: {
+      headers: getHeader(),
-        Authorization: "Bearer " + getToken(),
-      },
       fileList: [],
     };
   },

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: {
+      headers: getHeader(),
-        Authorization: "Bearer " + getToken(),
-      },
       fileList: []
     };
   },

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) => {

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)
 }

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) {

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"
       },

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"
       },