Merge branch 'del-bearer' into test

# Conflicts:
#	dist/index.html
#	dist/static/css/chunk-1d113f47.71e93061.css
#	dist/static/css/chunk-5c8fee3e.62a5c943.css
#	dist/static/css/chunk-8defeec4.2da2e661.css
#	dist/static/js/app.ac275d5a.js
#	dist/static/js/chunk-5c8fee3e.270ae157.js

src/components/Editor/index.vue

@@ -109,7 +109,7 @@ export default {
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/system/upload/upImg", // 上传的图片服务器地址
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/system/upload/upFile", // 上传的附件服务器地址
       headers: {
-        Authorization: 'Bearer ' + getToken()
+        Authorization: getToken()
       }
     };
   },
@@ -189,7 +189,7 @@ export default {
     }
   }
 };
-</script> 
+</script>
 
 <style>
 .editor {
@@ -271,4 +271,4 @@ export default {
   content: "等宽字体";
 }
 
-</style>
\ No newline at end of file
+</style>

src/utils/request.js

@@ -37,7 +37,7 @@ service.interceptors.request.use(config => {
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   if (getToken() && !isToken) {
-    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
   //config.headers['Authorization'] = 'Bearer ' + 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbk5hbWUiOiIxNTcxMTEzOTg5NSIsInVpZCI6NTI4MjgsImNoYW5uZWxJZCI6MCwiZXhwIjoxNjE5ODMzMzk3LCJpc3MiOiJnaW4tYmxvZyJ9.rh-WXSaFqgqY611Tm5dhba532OYEZvm06vUmgZknoy4'
   return config

src/utils/zipdownload.js

@@ -13,7 +13,7 @@ export function downLoadZip(str, filename) {
     method: 'get',
     url: url,
     responseType: 'blob',
-    headers: { 'Authorization': 'Bearer ' + getToken() }
+    headers: { 'Authorization': getToken() }
   }).then(res => {
     if(filename){
       res.headers['content-disposition'] = 'attachment; filename='+filename;

src/views/system/auth/userList/index.vue

@@ -389,7 +389,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: { Authorization: getToken() },
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/system/user/importData"
       },