From 0c791a1efc539d06742ae14375d4d5ddfd1339f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 25 Jul 2023 15:59:35 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85=E5=85=A8=E5=B1=80=E7=BB=9F=E4=B8=80=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Editor/index.vue      |  4 ++--
 src/components/FileUpload/index.vue  |  4 ++--
 src/components/ImageUpload/index.vue |  6 +++---
 src/plugins/download.ts              | 13 +++----------
 src/utils/request.ts                 |  4 ++++
 src/views/system/user/index.vue      |  3 ++-
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index b5b1526..9c61f3b 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -29,8 +29,8 @@
 <script setup lang="ts">
 import { QuillEditor, Quill } from '@vueup/vue-quill';
 import '@vueup/vue-quill/dist/vue-quill.snow.css';
-import { getToken } from "@/utils/auth";
 import { propTypes } from '@/utils/propTypes';
+import { globalHeaders } from "@/utils/request";
 
 const props = defineProps({
   /* 编辑器的内容 */
@@ -50,7 +50,7 @@ const props = defineProps({
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const upload = reactive<UploadOption>({
-  headers: { Authorization: "Bearer " + getToken() },
+  headers: globalHeaders,
   url: import.meta.env.VITE_APP_BASE_API + '/resource/oss/upload'
 })
 const myQuillEditor = ref();
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 32e871f..260f43c 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -43,9 +43,9 @@
 </template>
 
 <script setup lang="ts">
-import { getToken } from "@/utils/auth";
 import { listByIds, delOss } from "@/api/system/oss";
 import { propTypes } from '@/utils/propTypes';
+import { globalHeaders } from "@/utils/request";
 
 const props = defineProps({
     modelValue: [String, Object, Array],
@@ -66,7 +66,7 @@ const uploadList = ref<any[]>([]);
 
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const uploadFileUrl = ref(baseUrl + "/resource/oss/upload"); // 上传文件服务器地址
-const headers = ref({ Authorization: "Bearer " + getToken() });
+const headers = ref(globalHeaders);
 
 const fileList = ref<any[]>([]);
 const showTip = computed(
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 01edc4f..0c1e640 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -40,11 +40,11 @@
 </template>
 
 <script setup lang="ts">
-import { getToken } from "@/utils/auth";
 import { listByIds, delOss } from "@/api/system/oss";
-import { ComponentInternalInstance, PropType } from "vue";
+import { ComponentInternalInstance } from "vue";
 import { OssVO } from "@/api/system/oss/types";
 import { propTypes } from '@/utils/propTypes';
+import {globalHeaders} from "@/utils/request";
 
 const props = defineProps({
     modelValue: [String, Object, Array],
@@ -70,7 +70,7 @@ const dialogVisible = ref(false);
 
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const uploadImgUrl = ref(baseUrl + "/resource/oss/upload"); // 上传的图片服务器地址
-const headers = ref({ Authorization: "Bearer " + getToken() });
+const headers = ref(globalHeaders);
 
 const fileList = ref<any[]>([]);
 const showTip = computed(
diff --git a/src/plugins/download.ts b/src/plugins/download.ts
index 7f6202b..b661457 100644
--- a/src/plugins/download.ts
+++ b/src/plugins/download.ts
@@ -1,9 +1,9 @@
 import axios from 'axios';
 import FileSaver from 'file-saver';
-import { getToken } from '@/utils/auth';
 import errorCode from '@/utils/errorCode';
 import { blobValidate } from '@/utils/ruoyi';
 import { LoadingInstance } from 'element-plus/es/components/loading/src/loading';
+import { globalHeaders } from "@/utils/request";
 
 const baseURL = import.meta.env.VITE_APP_BASE_API;
 let downloadLoadingInstance: LoadingInstance;
@@ -16,10 +16,7 @@ export default {
         method: 'get',
         url: url,
         responseType: 'blob',
-        headers: {
-          Authorization: 'Bearer ' + getToken(),
-          clientid: import.meta.env.VITE_APP_CLIENT_ID
-        }
+        headers: globalHeaders,
       });
       const isBlob = blobValidate(res.data);
       if (isBlob) {
@@ -43,11 +40,7 @@ export default {
         method: 'get',
         url: url,
         responseType: 'blob',
-        headers: {
-          Authorization: 'Bearer ' + getToken(),
-          datasource: localStorage.getItem('dataName'),
-          clientid: import.meta.env.VITE_APP_CLIENT_ID
-        }
+        headers: globalHeaders,
       });
       const isBlob = blobValidate(res.data);
       if (isBlob) {
diff --git a/src/utils/request.ts b/src/utils/request.ts
index d2130fe..5b8480b 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -14,6 +14,10 @@ import { encrypt } from '@/utils/jsencrypt';
 let downloadLoadingInstance: LoadingInstance;
 // 是否显示重新登录
 export const isRelogin = { show: false };
+export const globalHeaders = {
+  Authorization: "Bearer " + getToken(),
+  clientid: import.meta.env.VITE_APP_CLIENT_ID
+}
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
 axios.defaults.headers['clientid'] = import.meta.env.VITE_APP_CLIENT_ID;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f8aa2e8..3da644d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -305,6 +305,7 @@ import { DeptVO } from "@/api/system/dept/types";
 import { RoleVO } from "@/api/system/role/types";
 import { PostVO } from "@/api/system/post/types";
 import { to } from "await-to-js";
+import { globalHeaders } from "@/utils/request";
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -334,7 +335,7 @@ const upload = reactive<ImportOption>({
   // 是否更新已经存在的用户数据
   updateSupport: 0,
   // 设置上传的请求头部
-  headers: { Authorization: "Bearer " + getToken() },
+  headers: globalHeaders,
   // 上传的地址
   url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
 })