vue2-client 1.4.11 → 1.4.13

package/src/utils/request.js

@@ -1,18 +1,16 @@
 import axios from 'axios'
 import Cookie from 'js-cookie'
-import Vue from 'vue'
-import { ACCESS_TOKEN, V4_ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
+import { ACCESS_TOKEN, SYSTEM_VERSION, V4_ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import notification from 'ant-design-vue/es/notification'
+import errorCode from '@vue2-client/utils/errorCode'
+import qs from 'qs'
+import { logout } from '@vue2-client/services/user'
 
-let compatible
-
-// 跨域认证信息 header 名
-const xsrfHeaderName = 'Authorization'
+// 是否显示重新登录
+let isReloginShow
 
 axios.defaults.timeout = 5000
 axios.defaults.withCredentials = true
-axios.defaults.xsrfHeaderName = xsrfHeaderName
-axios.defaults.xsrfCookieName = xsrfHeaderName
 
 // 认证类型
 const AUTH_TYPE = {
@@ -25,7 +23,9 @@ const AUTH_TYPE = {
 // http method
 const METHOD = {
   GET: 'get',
-  POST: 'post'
+  POST: 'post',
+  PUT: 'put',
+  DELETE: 'delete'
 }
 
 /**
@@ -42,6 +42,10 @@ async function request (url, method, params, config) {
       return axios.get(url, { params, ...config })
     case METHOD.POST:
       return axios.post(url, params, config)
+    case METHOD.PUT:
+      return axios.put(url, params, config)
+    case METHOD.DELETE:
+      return axios.delete(url, config)
     default:
       return axios.get(url, { params, ...config })
   }
@@ -55,9 +59,7 @@ async function request (url, method, params, config) {
 function setAuthorization (auth, authType = AUTH_TYPE.BEARER) {
   switch (authType) {
     case AUTH_TYPE.BEARER:
-      if (auth.token) {
-        Cookie.set(xsrfHeaderName, 'Bearer ' + auth.token, { expires: auth.expireAt })
-      }
+      Cookie.set(V4_ACCESS_TOKEN, 'Bearer ' + auth.token, { expires: auth.expireAt })
       break
     case AUTH_TYPE.BASIC:
     case AUTH_TYPE.AUTH1:
@@ -67,6 +69,21 @@ function setAuthorization (auth, authType = AUTH_TYPE.BEARER) {
   }
 }
 
+/**
+ * 设置系统版本
+ * @param value 系统版本
+ */
+export function setSystemVersion (value) {
+  Cookie.set(SYSTEM_VERSION, value)
+}
+
+/**
+ * 获取系统版本
+ */
+export function getSystemVersion () {
+  return Cookie.get(SYSTEM_VERSION)
+}
+
 /**
  * 移出认证信息
  * @param authType {AUTH_TYPE} 认证类型
@@ -74,7 +91,7 @@ function setAuthorization (auth, authType = AUTH_TYPE.BEARER) {
 function removeAuthorization (authType = AUTH_TYPE.BEARER) {
   switch (authType) {
     case AUTH_TYPE.BEARER:
-      Cookie.remove(xsrfHeaderName)
+      Cookie.remove(V4_ACCESS_TOKEN)
       break
     case AUTH_TYPE.BASIC:
     case AUTH_TYPE.AUTH1:
@@ -92,7 +109,7 @@ function removeAuthorization (authType = AUTH_TYPE.BEARER) {
 function checkAuthorization (authType = AUTH_TYPE.BEARER) {
   switch (authType) {
     case AUTH_TYPE.BEARER:
-      if (Cookie.get(xsrfHeaderName)) {
+      if (Cookie.get(V4_ACCESS_TOKEN)) {
         return true
       }
       break
@@ -117,38 +134,97 @@ function loadInterceptors () {
     // 如果 token 存在
     // 让每个请求携带自定义 token 请根据实际情况自行修改
     if (token) {
-      // 如果是首次使用系统LocalStorage需要初始化，在登陆之后重新获取一次compatible
-      if (compatible === null) {
-        compatible = localStorage.getItem('compatible')
-      }
-      // 判断是否为V4环境
-      if (compatible === 'V4') {
-        // V4 环境则添加 V4请求头
-        config.headers[V4_ACCESS_TOKEN] = token
-      } else {
-        config.headers[ACCESS_TOKEN] = token
+      if (config.url !== '/auth/login') {
+        // 判断是否为V4环境
+        const compatible = getSystemVersion()
+        if (compatible === 'V4') {
+          // V4 环境则添加 V4请求头
+          config.headers[V4_ACCESS_TOKEN] = token
+        } else {
+          config.headers[ACCESS_TOKEN] = token
+        }
       }
     }
     if (!config.headers['Content-Type']) {
       config.headers['Content-Type'] = 'application/json;charset=UTF-8'
     }
+    // 处理params参数
+    if (config.params) {
+      const url = config.url + '?' + qs.stringify(config.params, { indices: false })
+      config.params = {}
+      config.url = url
+    }
     return config
   }, errorHandler)
   // 加载响应拦截器
-  axios.interceptors.response.use((response) => {
+  axios.interceptors.response.use((res) => {
     // 判断是否为V4环境，不为compatible赋初始值
     // 其有可能是undefined未定义，或第一次使用本系统LocalStorage在初始化，获得的值为null
-    if (compatible === null || compatible === undefined) {
-      compatible = localStorage.getItem('compatible')
-    }
+    const compatible = getSystemVersion()
     if (compatible === 'V4') {
-      if (response.data.data) {
-        return response.data.data
+      // 请求rul
+      const requestUrl = res.config.url
+      if (res.data.data) {
+        res.data = res.data.data
+      }
+      // 未设置状态码则默认成功状态
+      const code = res.data.code || 200
+      // 获取错误信息
+      const msg = errorCode[code] || res.data.msg || errorCode['default']
+      // 二进制数据则直接返回
+      if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
+        return res.data
+      }
+      if (code === 401) {
+        if (!isReloginShow) {
+          isReloginShow = true
+          notification.open({
+            message: '系统提示',
+            description: '登录状态已过期，请重新登录',
+            btn: h => {
+              return h(
+                'a-button',
+                {
+                  props: {
+                    type: 'primary',
+                    size: 'small'
+                  },
+                  on: {
+                    click: () => {
+                      logout().then(() => {
+                        isReloginShow = false
+                        location.href = '/login'
+                      })
+                    }
+                  }
+                },
+                '确认'
+              )
+            },
+            duration: 0,
+            onClose: () => {
+              isReloginShow = false
+            }
+          })
+        }
+      } else if (code === 500) {
+        if (requestUrl !== '/login') {
+          notification.error({
+            message: '失败',
+            description: msg
+          })
+        }
+      } else if (code !== 200) {
+        notification.error({
+          message: '失败',
+          description: msg
+        })
       } else {
-        return response.data
+        return res.data
       }
+      return Promise.reject(msg)
     } else {
-      return response.data
+      return res.data
     }
   }, errorHandler)
 }
@@ -170,7 +246,7 @@ const errorHandler = (error) => {
         description: data
       })
       if (token) {
-        Vue.$store.dispatch('Logout').then(() => {
+        logout().then(() => {
           setTimeout(() => {
             window.location.reload()
           }, 1500)