vue2-client 1.7.16 → 1.7.18

package/src/services/api/restTools.js

@@ -1,24 +1,24 @@
-import { METHOD, request } from '@vue2-client/utils/request'
-
-/**
- * GET请求
- * @param url 请求地址
- * @param parameter 路径参数
- * @returns {Promise<AxiosResponse<T>>}
- */
-function get (url, parameter) {
-  return request(url, METHOD.GET, parameter)
-}
-
-/**
- * POST请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function post (url, parameter, config = {}) {
-  return request(url, METHOD.POST, parameter, config)
-}
-
-export { get, post }
+import { METHOD, request } from '@vue2-client/utils/request'
+
+/**
+ * GET请求
+ * @param url 请求地址
+ * @param parameter 路径参数
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function get (url, parameter) {
+  return request(url, METHOD.GET, parameter)
+}
+
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function post (url, parameter, config = {}) {
+  return request(url, METHOD.POST, parameter, config)
+}
+
+export { get, post }

package/src/utils/request.js

@@ -1,311 +1,311 @@
-import axios from 'axios'
-import Cookie from 'js-cookie'
-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 isReloginShow
-
-axios.defaults.timeout = 20000
-axios.defaults.withCredentials = true
-
-// 认证类型
-const AUTH_TYPE = {
-  BEARER: 'Bearer',
-  BASIC: 'basic',
-  AUTH1: 'auth1',
-  AUTH2: 'auth2'
-}
-
-// http method
-const METHOD = {
-  GET: 'get',
-  POST: 'post',
-  PUT: 'put',
-  DELETE: 'delete'
-}
-
-/**
- * axios请求
- * @param url 请求地址
- * @param method {METHOD} http method
- * @param params 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-async function request (url, method, params, config) {
-  switch (method) {
-    case METHOD.GET:
-      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 })
-  }
-}
-
-/**
- * 设置认证信息
- * @param auth {Object}
- * @param authType {AUTH_TYPE} 认证类型，默认：{AUTH_TYPE.BEARER}
- */
-function setAuthorization (auth, authType = AUTH_TYPE.BEARER) {
-  switch (authType) {
-    case AUTH_TYPE.BEARER:
-      Cookie.set(V4_ACCESS_TOKEN, 'Bearer ' + auth.token, { expires: auth.expireAt })
-      break
-    case AUTH_TYPE.BASIC:
-    case AUTH_TYPE.AUTH1:
-    case AUTH_TYPE.AUTH2:
-    default:
-      break
-  }
-}
-
-/**
- * 设置系统版本
- * @param value 系统版本
- */
-export function setSystemVersion (value) {
-  Cookie.set(SYSTEM_VERSION, value)
-}
-
-/**
- * 获取系统版本
- */
-export function getSystemVersion () {
-  return Cookie.get(SYSTEM_VERSION)
-}
-
-/**
- * 移出认证信息
- * @param authType {AUTH_TYPE} 认证类型
- */
-function removeAuthorization (authType = AUTH_TYPE.BEARER) {
-  switch (authType) {
-    case AUTH_TYPE.BEARER:
-      Cookie.remove(V4_ACCESS_TOKEN)
-      break
-    case AUTH_TYPE.BASIC:
-    case AUTH_TYPE.AUTH1:
-    case AUTH_TYPE.AUTH2:
-    default:
-      break
-  }
-}
-
-/**
- * 检查认证信息
- * @param authType
- * @returns {boolean}
- */
-function checkAuthorization (authType = AUTH_TYPE.BEARER) {
-  switch (authType) {
-    case AUTH_TYPE.BEARER:
-      if (Cookie.get(V4_ACCESS_TOKEN)) {
-        return true
-      }
-      break
-    case AUTH_TYPE.BASIC:
-    case AUTH_TYPE.AUTH1:
-    case AUTH_TYPE.AUTH2:
-    default:
-      break
-  }
-  return false
-}
-
-/**
- * 加载 axios 拦截器
- * @param interceptors
- * @param options
- */
-function loadInterceptors () {
-  // 加载请求拦截器
-  axios.interceptors.request.use(config => {
-    const token = localStorage.getItem(ACCESS_TOKEN)
-    // 如果 token 存在
-    // 让每个请求携带自定义 token 请根据实际情况自行修改
-    if (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((res) => {
-    // 判断是否为V4环境，不为compatible赋初始值
-    // 其有可能是undefined未定义，或第一次使用本系统LocalStorage在初始化，获得的值为null
-    const compatible = getSystemVersion()
-    if (compatible === 'V4' || (res.data.code && res.data.hasOwnProperty('msg'))) {
-      // 请求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 === 601) {
-        notification.warn({
-          message: '警告',
-          description: msg
-        })
-      } else if (code !== 200) {
-        notification.error({
-          message: '失败',
-          description: msg
-        })
-      } else {
-        return res.data
-      }
-      return Promise.reject(msg)
-    } else {
-      return res.data
-    }
-  }, errorHandler)
-}
-
-// 异常拦截处理器
-const errorHandler = (error) => {
-  if (error.response) {
-    const data = error.response.data
-    // 从 localstorage 获取 token
-    const token = localStorage.getItem(ACCESS_TOKEN)
-    if (error.response.status === 403 || (data && data.code === 403)) {
-      notification.error({
-        message: '禁止访问',
-        description: data
-      })
-    } else if (error.response.status === 401 || (data && data.code === 401)) {
-      notification.error({
-        message: '鉴权失败',
-        description: data
-      })
-      if (token) {
-        logout().then(() => {
-          setTimeout(() => {
-            window.location.reload()
-          }, 1500)
-        })
-      }
-    } else if (error.response.status === 500 || (data && data.code === 500)) {
-      notification.error({
-        message: '系统异常',
-        description: data
-      })
-    } else if (error.response.status === 601 || (data && data.code === 601)) {
-      notification.warn({
-        message: '系统警告',
-        description: data
-      })
-    } else {
-      notification.error({
-        message: '网络异常',
-        description: data
-      })
-    }
-  }
-  return Promise.reject(error)
-}
-
-/**
- * 解析 url 中的参数
- * @param url
- * @returns {Object}
- */
-function parseUrlParams (url) {
-  const params = {}
-  if (!url || url === '' || typeof url !== 'string') {
-    return params
-  }
-  const paramsStr = url.split('?')[1]
-  if (!paramsStr) {
-    return params
-  }
-  const paramsArr = paramsStr.replace(/&|=/g, ' ').split(' ')
-  for (let i = 0; i < paramsArr.length / 2; i++) {
-    const value = paramsArr[i * 2 + 1]
-    params[paramsArr[i * 2]] = value === 'true' ? true : (value === 'false' ? false : value)
-  }
-  return params
-}
-
-export {
-  METHOD,
-  AUTH_TYPE,
-  request,
-  setAuthorization,
-  removeAuthorization,
-  checkAuthorization,
-  loadInterceptors,
-  parseUrlParams
-}
+import axios from 'axios'
+import Cookie from 'js-cookie'
+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 isReloginShow
+
+axios.defaults.timeout = 20000
+axios.defaults.withCredentials = true
+
+// 认证类型
+const AUTH_TYPE = {
+  BEARER: 'Bearer',
+  BASIC: 'basic',
+  AUTH1: 'auth1',
+  AUTH2: 'auth2'
+}
+
+// http method
+const METHOD = {
+  GET: 'get',
+  POST: 'post',
+  PUT: 'put',
+  DELETE: 'delete'
+}
+
+/**
+ * axios请求
+ * @param url 请求地址
+ * @param method {METHOD} http method
+ * @param params 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+async function request (url, method, params, config) {
+  switch (method) {
+    case METHOD.GET:
+      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 })
+  }
+}
+
+/**
+ * 设置认证信息
+ * @param auth {Object}
+ * @param authType {AUTH_TYPE} 认证类型，默认：{AUTH_TYPE.BEARER}
+ */
+function setAuthorization (auth, authType = AUTH_TYPE.BEARER) {
+  switch (authType) {
+    case AUTH_TYPE.BEARER:
+      Cookie.set(V4_ACCESS_TOKEN, 'Bearer ' + auth.token, { expires: auth.expireAt })
+      break
+    case AUTH_TYPE.BASIC:
+    case AUTH_TYPE.AUTH1:
+    case AUTH_TYPE.AUTH2:
+    default:
+      break
+  }
+}
+
+/**
+ * 设置系统版本
+ * @param value 系统版本
+ */
+export function setSystemVersion (value) {
+  Cookie.set(SYSTEM_VERSION, value)
+}
+
+/**
+ * 获取系统版本
+ */
+export function getSystemVersion () {
+  return Cookie.get(SYSTEM_VERSION)
+}
+
+/**
+ * 移出认证信息
+ * @param authType {AUTH_TYPE} 认证类型
+ */
+function removeAuthorization (authType = AUTH_TYPE.BEARER) {
+  switch (authType) {
+    case AUTH_TYPE.BEARER:
+      Cookie.remove(V4_ACCESS_TOKEN)
+      break
+    case AUTH_TYPE.BASIC:
+    case AUTH_TYPE.AUTH1:
+    case AUTH_TYPE.AUTH2:
+    default:
+      break
+  }
+}
+
+/**
+ * 检查认证信息
+ * @param authType
+ * @returns {boolean}
+ */
+function checkAuthorization (authType = AUTH_TYPE.BEARER) {
+  switch (authType) {
+    case AUTH_TYPE.BEARER:
+      if (Cookie.get(V4_ACCESS_TOKEN)) {
+        return true
+      }
+      break
+    case AUTH_TYPE.BASIC:
+    case AUTH_TYPE.AUTH1:
+    case AUTH_TYPE.AUTH2:
+    default:
+      break
+  }
+  return false
+}
+
+/**
+ * 加载 axios 拦截器
+ * @param interceptors
+ * @param options
+ */
+function loadInterceptors () {
+  // 加载请求拦截器
+  axios.interceptors.request.use(config => {
+    const token = localStorage.getItem(ACCESS_TOKEN)
+    // 如果 token 存在
+    // 让每个请求携带自定义 token 请根据实际情况自行修改
+    if (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((res) => {
+    // 判断是否为V4环境，不为compatible赋初始值
+    // 其有可能是undefined未定义，或第一次使用本系统LocalStorage在初始化，获得的值为null
+    const compatible = getSystemVersion()
+    if (compatible === 'V4' || (res.data.code && res.data.hasOwnProperty('msg'))) {
+      // 请求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 === 601) {
+        notification.warn({
+          message: '警告',
+          description: msg
+        })
+      } else if (code !== 200) {
+        notification.error({
+          message: '失败',
+          description: msg
+        })
+      } else {
+        return res.data
+      }
+      return Promise.reject(msg)
+    } else {
+      return res.data
+    }
+  }, errorHandler)
+}
+
+// 异常拦截处理器
+const errorHandler = (error) => {
+  if (error.response) {
+    const data = error.response.data
+    // 从 localstorage 获取 token
+    const token = localStorage.getItem(ACCESS_TOKEN)
+    if (error.response.status === 403 || (data && data.code === 403)) {
+      notification.error({
+        message: '禁止访问',
+        description: data
+      })
+    } else if (error.response.status === 401 || (data && data.code === 401)) {
+      notification.error({
+        message: '鉴权失败',
+        description: data
+      })
+      if (token) {
+        logout().then(() => {
+          setTimeout(() => {
+            window.location.reload()
+          }, 1500)
+        })
+      }
+    } else if (error.response.status === 500 || (data && data.code === 500)) {
+      notification.error({
+        message: '系统异常',
+        description: data
+      })
+    } else if (error.response.status === 601 || (data && data.code === 601)) {
+      notification.warn({
+        message: '系统警告',
+        description: data
+      })
+    } else {
+      notification.error({
+        message: '网络异常',
+        description: data
+      })
+    }
+  }
+  return Promise.reject(error)
+}
+
+/**
+ * 解析 url 中的参数
+ * @param url
+ * @returns {Object}
+ */
+function parseUrlParams (url) {
+  const params = {}
+  if (!url || url === '' || typeof url !== 'string') {
+    return params
+  }
+  const paramsStr = url.split('?')[1]
+  if (!paramsStr) {
+    return params
+  }
+  const paramsArr = paramsStr.replace(/&|=/g, ' ').split(' ')
+  for (let i = 0; i < paramsArr.length / 2; i++) {
+    const value = paramsArr[i * 2 + 1]
+    params[paramsArr[i * 2]] = value === 'true' ? true : (value === 'false' ? false : value)
+  }
+  return params
+}
+
+export {
+  METHOD,
+  AUTH_TYPE,
+  request,
+  setAuthorization,
+  removeAuthorization,
+  checkAuthorization,
+  loadInterceptors,
+  parseUrlParams
+}