fix: 在全局的请求添加appCode

sf-ui/src/utils/request.js

@@ -1,15 +1,16 @@
 import axios from 'axios'
-import { Notification, MessageBox, Message, Loading } from 'element-ui'
+import { Loading, Message, MessageBox, Notification } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { tansParams, blobValidate } from "@/utils/ruoyi";
+import { blobValidate, tansParams } from '@/utils/ruoyi'
 import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
+import Cookies from 'js-cookie'
 
-let downloadLoadingInstance;
+let downloadLoadingInstance
 // 是否显示重新登录
-export let isRelogin = { show: false };
+export let isRelogin = { show: false }
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
@@ -26,15 +27,16 @@ service.interceptors.request.use(config => {
   const isToken = (config.headers || {}).isToken === false
   // 是否需要防止数据重复提交
   const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
+  config.headers['appCode'] = Cookies.get('Admin-Application-Id')
   if (getToken() && !isToken) {
     config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
-    let url = config.url + '?' + tansParams(config.params);
+    let url = config.url + '?' + tansParams(config.params)
-    url = url.slice(0, -1);
+    url = url.slice(0, -1)
-    config.params = {};
+    config.params = {}
-    config.url = url;
+    config.url = url
   }
   if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
     const requestObj = {
@@ -46,12 +48,12 @@ service.interceptors.request.use(config => {
     if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
       cache.session.setJSON('sessionObj', requestObj)
     } else {
-      const s_url = sessionObj.url;                  // 请求地址
+      const s_url = sessionObj.url                  // 请求地址
-      const s_data = sessionObj.data;                // 请求数据
+      const s_data = sessionObj.data                // 请求数据
-      const s_time = sessionObj.time;                // 请求时间
+      const s_time = sessionObj.time                // 请求时间
-      const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
+      const interval = 1000                         // 间隔时间(ms)，小于此时间视为重复提交
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
-        const message = '数据正在处理，请勿重复提交';
+        const message = '数据正在处理，请勿重复提交'
         console.warn(`[${s_url}]: ` + message)
         return Promise.reject(new Error(message))
       } else {
@@ -61,32 +63,36 @@ service.interceptors.request.use(config => {
   }
   return config
 }, error => {
-    console.log(error)
+  console.log(error)
-    Promise.reject(error)
+  Promise.reject(error)
 })
 
 // 响应拦截器
 service.interceptors.response.use(res => {
     // 未设置状态码则默认成功状态
-    const code = res.data.code || 200;
+    const code = res.data.code || 200
     // 获取错误信息
     const msg = errorCode[code] || res.data.msg || errorCode['default']
     // 二进制数据则直接返回
-    if (res.request.responseType ===  'blob' || res.request.responseType ===  'arraybuffer') {
+    if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
       return res.data
     }
     if (code === 401) {
       if (!isRelogin.show) {
-        isRelogin.show = true;
+        isRelogin.show = true
-        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
+        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-          isRelogin.show = false;
+          confirmButtonText: '重新登录',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          isRelogin.show = false
           store.dispatch('LogOut').then(() => {
-            location.href = '/index';
+            location.href = '/index'
           })
-      }).catch(() => {
+        }).catch(() => {
-        isRelogin.show = false;
+          isRelogin.show = false
-      });
+        })
-    }
+      }
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
     } else if (code === 500) {
       Message({ message: msg, type: 'error' })
@@ -103,13 +109,13 @@ service.interceptors.response.use(res => {
   },
   error => {
     console.log('err' + error)
-    let { message } = error;
+    let { message } = error
-    if (message == "Network Error") {
+    if (message == 'Network Error') {
-      message = "后端接口连接异常";
+      message = '后端接口连接异常'
-    } else if (message.includes("timeout")) {
+    } else if (message.includes('timeout')) {
-      message = "系统接口请求超时";
+      message = '系统接口请求超时'
-    } else if (message.includes("Request failed with status code")) {
+    } else if (message.includes('Request failed with status code')) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
+      message = '系统接口' + message.substr(message.length - 3) + '异常'
     }
     Message({ message: message, type: 'error', duration: 5 * 1000 })
     return Promise.reject(error)
@@ -118,28 +124,34 @@ service.interceptors.response.use(res => {
 
 // 通用下载方法
 export function download(url, params, filename, config) {
-  downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
+  downloadLoadingInstance = Loading.service({
+    text: '正在下载数据，请稍候',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  })
   return service.post(url, params, {
-    transformRequest: [(params) => { return tansParams(params) }],
+    transformRequest: [(params) => {
+      return tansParams(params)
+    }],
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     responseType: 'blob',
     ...config
-  }).then(async (data) => {
+  }).then(async(data) => {
-    const isBlob = blobValidate(data);
+    const isBlob = blobValidate(data)
     if (isBlob) {
       const blob = new Blob([data])
       saveAs(blob, filename)
     } else {
-      const resText = await data.text();
+      const resText = await data.text()
-      const rspObj = JSON.parse(resText);
+      const rspObj = JSON.parse(resText)
       const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
-      Message.error(errMsg);
+      Message.error(errMsg)
     }
-    downloadLoadingInstance.close();
+    downloadLoadingInstance.close()
   }).catch((r) => {
     console.error(r)
     Message.error('下载文件出现错误，请联系管理员！')
-    downloadLoadingInstance.close();
+    downloadLoadingInstance.close()
   })
 }
 

sf-ui/src/views/FDS/publishList/components/addPack.vue

@@ -85,7 +85,6 @@ export default {
     /** 查询参数列表 */
     getList() {
       this.loading = true
-      console.log(this.systemType)
       listINFO(
         {
           ...this.queryParams,