vue2-client 1.2.112 → 1.2.115

package/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.2.113 - 1.2.115 -2022-09-02 @江超**
+- 功能修改：
+- 修改请求后只有当返回的token有值时才设置store
+
+**1.2.112 -2022-09-02 @江超**
+- 功能修改：
+- 依赖更新
+- 物联网设备监控组件拆分到IotDeviceView项目
+
 **1.2.111 -2022-09-01 @江超**
 - 修复获取字典数据时错误的v4版本判断
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.2.112",
+  "version": "1.2.115",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/pages/login/Login.vue

@@ -1,274 +1,273 @@
-<template>
-  <common-layout>
-    <div class="top">
-      <div class="header">
-        <img alt="logo" class="logo" src="@vue2-client/assets/img/logo.png" />
-        <span class="title">{{ systemName }}</span>
-      </div>
-      <div class="desc">{{ systemDesc }}</div>
-    </div>
-    <div class="login">
-      <a-form @submit="onSubmit" :form="form">
-        <a-tabs size="large" :tabBarStyle="{textAlign: 'center'}" style="padding: 0 2px;">
-          <a-tab-pane tab="账户密码登录" key="1">
-            <a-alert
-              type="error"
-              :closable="true"
-              v-show="error"
-              :message="error"
-              showIcon
-              style="margin-bottom: 24px;" />
-            <a-form-item>
-              <a-input
-                autocomplete="autocomplete"
-                size="large"
-                placeholder="admin"
-                v-decorator="['name', {rules: [{ required: true, message: '请输入账户名', whitespace: true}]}]"
-              >
-                <a-icon slot="prefix" type="user" />
-              </a-input>
-            </a-form-item>
-            <a-form-item>
-              <a-input
-                size="large"
-                placeholder="888888"
-                autocomplete="autocomplete"
-                type="password"
-                v-decorator="['password', {rules: [{ required: true, message: '请输入密码', whitespace: true}]}]"
-              >
-                <a-icon slot="prefix" type="lock" />
-              </a-input>
-            </a-form-item>
-          </a-tab-pane>
-        </a-tabs>
-        <div>
-          <a-checkbox :checked="true" >自动登录</a-checkbox>
-        </div>
-        <a-form-item>
-          <a-button :loading="logging" style="width: 100%;margin-top: 24px" size="large" htmlType="submit" type="primary">登录</a-button>
-        </a-form-item>
-      </a-form>
-    </div>
-  </common-layout>
-</template>
-
-<script>
-import CommonLayout from '@vue2-client/layouts/CommonLayout'
-import { getRoutesConfig, login, V4Login } from '@vue2-client/services/user'
-import { setAuthorization } from '@vue2-client/utils/request'
-import { loadRoutes, funcToRouter } from '@vue2-client/utils/routerUtil'
-import { mapMutations, mapState } from 'vuex'
-import JSEncrypt from 'jsencrypt'
-import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
-import { positions } from '@vue2-client/mock/common'
-import { timeFix } from '@vue2-client/utils/util'
-import { loginStart } from '@vue2-client/base-client/plugins/compatible/LoginServiceOA'
-
-export default {
-  name: 'Login',
-  components: { CommonLayout },
-  data () {
-    return {
-      logging: false,
-      error: '',
-      form: this.$form.createForm(this)
-    }
-  },
-  computed: {
-    ...mapState('setting', ['systemName', 'systemDesc', 'homePage', 'ticketPage', 'compatible'])
-  },
-  methods: {
-    ...mapMutations('account', ['setUser', 'setPermissions', 'setRoles']),
-    onSubmit (e) {
-      e.preventDefault()
-      this.form.validateFields((err) => {
-        if (!err) {
-          this.logging = true
-          const name = this.form.getFieldValue('name')
-          const password = this.form.getFieldValue('password')
-          switch (this.compatible) {
-            case 'V3': {
-              login(name, password).then(this.afterLogin)
-              break
-            }
-            case 'OA' : {
-              loginStart(name, password).then(this.afterLoginOA).finally(() => { this.logging = false })
-              break
-            }
-            case 'V4' : {
-              V4Login(name, password).then(this.afterLoginV4)
-              break
-            }
-          }
-        }
-      })
-    },
-    afterLoginOA (result) {
-      // 默认第一个是旧OA地址
-      result.functions[0].navigate = result.functions[0].link
-      result.functions[0].link = null
-      this.afterGeneral(result)
-      this.setACCESSTOKEN(result.password)
-      this.$router.push(this.homePage).catch(() => {})
-    },
-    afterLoginV4 (res) {
-      const name = this.form.getFieldValue('name')
-      const password = this.form.getFieldValue('password')
-      this.logging = false
-      const loginRes = res
-      // 如果这是用户首次打开本系统，localStorage无法初始化，改用code判断
-      let pass = false
-      let V4Token = {}
-      // 判断是否是第一次使用本系统
-      if (res.code) {
-        if (res.code === 200) {
-          pass = true
-          // 如果返回值有code，证明是第一次使用系统，localStorage判断compatible失效
-          // token需要从.data中获取
-          V4Token = { token: res.data.access_token, expire: res.data.expires_in }
-        }
-      } else {
-        V4Token = { token: res.access_token, expire: res.expires_in }
-      }
-      this.setV4AccessToken(V4Token)
-      // 向本地缓存中临时存储compatible
-      if (loginRes.access_token || pass) {
-        const encrypt = new JSEncrypt()
-        encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
-        const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
-        // 获取路由配置
-        getRoutesConfig(data).then(result => {
-          this.$login.login(result).then(() => {
-            this.afterGeneral(result)
-            if (result.deps === '用户工单登记') {
-              this.$router.push(this.ticketPage).catch(() => {})
-            } else {
-              this.$router.push(this.homePage).catch(() => {})
-            }
-          })
-        })
-      } else {
-        this.error = loginRes.msg
-      }
-    },
-    afterLogin (res) {
-      const name = this.form.getFieldValue('name')
-      const password = this.form.getFieldValue('password')
-      this.logging = false
-      const loginRes = res.states
-      if (loginRes === '登录成功') {
-        const encrypt = new JSEncrypt()
-        encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
-        const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
-        // 获取路由配置
-        getRoutesConfig(data).then(result => {
-          this.$login.login(result).then(() => {
-            // V3任何情况首位加入资源管理
-            const resourceManageMain = {
-              name: '资源管理',
-              icon: 'api',
-              position: 1,
-              link: 'resourceManageMain'
-            }
-            result.functions.unshift(resourceManageMain)
-            this.afterGeneral(result)
-            this.setACCESSTOKEN(data)
-            if (result.deps === '用户工单登记') {
-              this.$router.push(this.ticketPage).catch(() => {})
-            } else {
-              this.$router.push(this.homePage).catch(() => {})
-            }
-          })
-        })
-      } else {
-        this.error = loginRes
-      }
-    },
-    afterGeneral (result) {
-      const user = Object.assign({
-        username: result.ename,
-        name: result.name,
-        avatar: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
-        address: '西安市',
-        position: positions[0]
-      }, result)
-      this.setUser(user)
-      this.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
-      this.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
-      loadRoutes(funcToRouter(user.functions))
-      this.$message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3)
-    },
-    setACCESSTOKEN (data) {
-      localStorage.setItem(ACCESS_TOKEN, data)
-      let timestamp = new Date().getTime()// 当前的时间戳
-      timestamp = timestamp + 12 * 60 * 60 * 1000
-      // 格式化时间获取年月日, 登陆过期时间
-      const dateAfter = new Date(timestamp)
-      setAuthorization({ token: data, expireAt: dateAfter })
-    },
-    setV4AccessToken (data) {
-      localStorage.setItem('ACCESS_TOKEN', data.token)
-      localStorage.setItem('ACCESS_TOKEN_EXPIRES', data.expire)
-      setAuthorization({ token: data.token, expire: data.expire })
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.common-layout{
-  .top {
-    text-align: center;
-    .header {
-      height: 44px;
-      line-height: 44px;
-      a {
-        text-decoration: none;
-      }
-      .logo {
-        height: 44px;
-        vertical-align: top;
-        margin-right: 16px;
-      }
-      .title {
-        font-size: 33px;
-        color: @title-color;
-        font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
-        font-weight: 600;
-        position: relative;
-        top: 2px;
-      }
-    }
-    .desc {
-      font-size: 14px;
-      color: @text-color-second;
-      margin-top: 12px;
-      margin-bottom: 40px;
-    }
-  }
-  .login{
-    width: 368px;
-    margin: 0 auto;
-    @media screen and (max-width: 576px) {
-      width: 95%;
-    }
-    @media screen and (max-width: 320px) {
-      .captcha-button{
-        font-size: 14px;
-      }
-    }
-    .icon {
-      font-size: 24px;
-      color: @text-color-second;
-      margin-left: 16px;
-      vertical-align: middle;
-      cursor: pointer;
-      transition: color 0.3s;
-
-      &:hover {
-        color: @primary-color;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <common-layout>
+    <div class="top">
+      <div class="header">
+        <img alt="logo" class="logo" src="@vue2-client/assets/img/logo.png" />
+        <span class="title">{{ systemName }}</span>
+      </div>
+      <div class="desc">{{ systemDesc }}</div>
+    </div>
+    <div class="login">
+      <a-form :form="form" @submit="onSubmit">
+        <a-tabs :tabBarStyle="{textAlign: 'center'}" size="large" style="padding: 0 2px;">
+          <a-tab-pane key="1" tab="账户密码登录">
+            <a-alert
+              v-show="error"
+              :closable="true"
+              :message="error"
+              showIcon
+              style="margin-bottom: 24px;"
+              type="error" />
+            <a-form-item>
+              <a-input
+                v-decorator="['name', {rules: [{ required: true, message: '请输入账户名', whitespace: true}]}]"
+                autocomplete="autocomplete"
+                placeholder="admin"
+                size="large"
+              >
+                <a-icon slot="prefix" type="user" />
+              </a-input>
+            </a-form-item>
+            <a-form-item>
+              <a-input
+                v-decorator="['password', {rules: [{ required: true, message: '请输入密码', whitespace: true}]}]"
+                autocomplete="autocomplete"
+                placeholder="888888"
+                size="large"
+                type="password"
+              >
+                <a-icon slot="prefix" type="lock" />
+              </a-input>
+            </a-form-item>
+          </a-tab-pane>
+        </a-tabs>
+        <div>
+          <a-checkbox :checked="true" >自动登录</a-checkbox>
+        </div>
+        <a-form-item>
+          <a-button :loading="logging" htmlType="submit" size="large" style="width: 100%;margin-top: 24px" type="primary">登录</a-button>
+        </a-form-item>
+      </a-form>
+    </div>
+  </common-layout>
+</template>
+
+<script>
+import CommonLayout from '@vue2-client/layouts/CommonLayout'
+import { getRoutesConfig, login, V4Login } from '@vue2-client/services/user'
+import { setAuthorization } from '@vue2-client/utils/request'
+import { loadRoutes, funcToRouter } from '@vue2-client/utils/routerUtil'
+import { mapMutations, mapState } from 'vuex'
+import JSEncrypt from 'jsencrypt'
+import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
+import { positions } from '@vue2-client/mock/common'
+import { timeFix } from '@vue2-client/utils/util'
+import { loginStart } from '@vue2-client/base-client/plugins/compatible/LoginServiceOA'
+
+export default {
+  name: 'Login',
+  components: { CommonLayout },
+  data () {
+    return {
+      logging: false,
+      error: '',
+      form: this.$form.createForm(this)
+    }
+  },
+  computed: {
+    ...mapState('setting', ['systemName', 'systemDesc', 'homePage', 'ticketPage', 'compatible'])
+  },
+  methods: {
+    ...mapMutations('account', ['setUser', 'setPermissions', 'setRoles']),
+    onSubmit (e) {
+      e.preventDefault()
+      this.form.validateFields((err) => {
+        if (!err) {
+          this.logging = true
+          const name = this.form.getFieldValue('name')
+          const password = this.form.getFieldValue('password')
+          switch (this.compatible) {
+            case 'V3': {
+              login(name, password).then(this.afterLogin)
+              break
+            }
+            case 'OA' : {
+              loginStart(name, password).then(this.afterLoginOA).finally(() => { this.logging = false })
+              break
+            }
+            case 'V4' : {
+              V4Login(name, password).then(this.afterLoginV4)
+              break
+            }
+          }
+        }
+      })
+    },
+    afterLoginOA (result) {
+      // 默认第一个是旧OA地址
+      result.functions[0].navigate = result.functions[0].link
+      result.functions[0].link = null
+      this.afterGeneral(result)
+      this.setAccessToken(result.password)
+      this.$router.push(this.homePage).catch(() => {})
+    },
+    afterLoginV4 (res) {
+      const name = this.form.getFieldValue('name')
+      const password = this.form.getFieldValue('password')
+      this.logging = false
+      const loginRes = res
+      // 如果这是用户首次打开本系统，localStorage无法初始化，改用code判断
+      let pass = false
+      let V4Token = {}
+      // 判断是否是第一次使用本系统
+      if (res.code) {
+        if (res.code === 200) {
+          pass = true
+          // 如果返回值有code，证明是第一次使用系统，localStorage判断compatible失效
+          // token需要从.data中获取
+          V4Token = { token: res.data.access_token, expire: res.data.expires_in }
+        }
+      } else {
+        V4Token = { token: res.access_token, expire: res.expires_in }
+      }
+      this.setV4AccessToken(V4Token)
+      // 向本地缓存中临时存储compatible
+      if (loginRes.access_token || pass) {
+        const encrypt = new JSEncrypt()
+        encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
+        const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
+        // 获取路由配置
+        getRoutesConfig(data).then(result => {
+          this.$login.login(result).then(() => {
+            this.afterGeneral(result)
+            if (result.deps === '用户工单登记') {
+              this.$router.push(this.ticketPage).catch(() => {})
+            } else {
+              this.$router.push(this.homePage).catch(() => {})
+            }
+          })
+        })
+      } else {
+        this.error = loginRes.msg
+      }
+    },
+    afterLogin (res) {
+      const name = this.form.getFieldValue('name')
+      const password = this.form.getFieldValue('password')
+      this.logging = false
+      const loginRes = res.states
+      if (loginRes === '登录成功') {
+        const encrypt = new JSEncrypt()
+        encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
+        const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
+        // 获取路由配置
+        getRoutesConfig(data).then(result => {
+          this.$login.login(result).then(() => {
+            // V3任何情况首位加入资源管理
+            const resourceManageMain = {
+              name: '资源管理',
+              icon: 'api',
+              position: 1,
+              link: 'resourceManageMain'
+            }
+            result.functions.unshift(resourceManageMain)
+            this.afterGeneral(result)
+            this.setAccessToken(data)
+            if (result.deps === '用户工单登记') {
+              this.$router.push(this.ticketPage).catch(() => {})
+            } else {
+              this.$router.push(this.homePage).catch(() => {})
+            }
+          })
+        })
+      } else {
+        this.error = loginRes
+      }
+    },
+    afterGeneral (result) {
+      const user = Object.assign({
+        username: result.ename,
+        name: result.name,
+        avatar: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
+        address: '西安市',
+        position: positions[0]
+      }, result)
+      this.setUser(user)
+      this.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
+      this.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
+      loadRoutes(funcToRouter(user.functions))
+      this.$message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3)
+    },
+    setAccessToken (data) {
+      localStorage.setItem(ACCESS_TOKEN, data)
+      let timestamp = new Date().getTime()// 当前的时间戳
+      timestamp = timestamp + 12 * 60 * 60 * 1000
+      // 格式化时间获取年月日, 登陆过期时间
+      const dateAfter = new Date(timestamp)
+      setAuthorization({ token: data, expireAt: dateAfter })
+    },
+    setV4AccessToken (data) {
+      localStorage.setItem(ACCESS_TOKEN, data.token)
+      setAuthorization({ token: data.token, expire: data.expire })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.common-layout{
+  .top {
+    text-align: center;
+    .header {
+      height: 44px;
+      line-height: 44px;
+      a {
+        text-decoration: none;
+      }
+      .logo {
+        height: 44px;
+        vertical-align: top;
+        margin-right: 16px;
+      }
+      .title {
+        font-size: 33px;
+        color: @title-color;
+        font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
+        font-weight: 600;
+        position: relative;
+        top: 2px;
+      }
+    }
+    .desc {
+      font-size: 14px;
+      color: @text-color-second;
+      margin-top: 12px;
+      margin-bottom: 40px;
+    }
+  }
+  .login{
+    width: 368px;
+    margin: 0 auto;
+    @media screen and (max-width: 576px) {
+      width: 95%;
+    }
+    @media screen and (max-width: 320px) {
+      .captcha-button{
+        font-size: 14px;
+      }
+    }
+    .icon {
+      font-size: 24px;
+      color: @text-color-second;
+      margin-left: 16px;
+      vertical-align: middle;
+      cursor: pointer;
+      transition: color 0.3s;
+
+      &:hover {
+        color: @primary-color;
+      }
+    }
+  }
+}
+</style>

package/src/store/mutation-types.js

@@ -1 +1,2 @@
-export const ACCESS_TOKEN = 'Access-Token'
+export const ACCESS_TOKEN = 'Access-Token'
+export const V4_ACCESS_TOKEN = 'Authorization'

package/src/utils/request.js

@@ -1,270 +1,225 @@
-import axios from 'axios'
-import Cookie from 'js-cookie'
-import Vue from 'vue'
-import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
-import notification from 'ant-design-vue/es/notification'
-
-let compatible
-
-// 跨域认证信息 header 名
-const xsrfHeaderName = 'Authorization'
-// V4系统请求头名
-const v4TokenName = 'ACCESS_TOKEN'
-const v4TokenExpire = 'ACCESS_TOKEN_EXPIRES'
-
-axios.defaults.timeout = 5000
-axios.defaults.withCredentials = true
-axios.defaults.xsrfHeaderName = xsrfHeaderName
-axios.defaults.xsrfCookieName = xsrfHeaderName
-
-// 认证类型
-const AUTH_TYPE = {
-  BEARER: 'Bearer',
-  BASIC: 'basic',
-  AUTH1: 'auth1',
-  AUTH2: 'auth2'
-}
-
-// http method
-const METHOD = {
-  GET: 'get',
-  POST: 'post'
-}
-
-/**
- * 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)
-    default:
-      return axios.get(url, { params, ...config })
-  }
-}
-
-/**
- * 设置V4认证信息
- * @param auth {Object}
- * @param authType {AUTH_TYPE} 认证类型，默认：{AUTH_TYPE.BEARER}
- */
-function setAuthorizationV4 (auth, authType = AUTH_TYPE.BEARER) {
-  switch (authType) {
-    case AUTH_TYPE.BEARER:
-      if (auth.token) {
-        Cookie.set(v4TokenName, 'Bearer ' + auth.token)
-        Cookie.set(v4TokenExpire, 'Bearer ' + auth.expire)
-      }
-      break
-    case AUTH_TYPE.BASIC:
-    case AUTH_TYPE.AUTH1:
-    case AUTH_TYPE.AUTH2:
-    default:
-      break
-  }
-}
-
-/**
- * 移出V4认证信息
- * @param authType {AUTH_TYPE} 认证类型
- */
-function removeAuthorizationV4 (authType = AUTH_TYPE.BEARER) {
-  switch (authType) {
-    case AUTH_TYPE.BEARER:
-      Cookie.remove(v4TokenName)
-      Cookie.remove(v4TokenExpire)
-      break
-    case AUTH_TYPE.BASIC:
-    case AUTH_TYPE.AUTH1:
-    case AUTH_TYPE.AUTH2:
-    default:
-      break
-  }
-}
-
-/**
- * 设置认证信息
- * @param auth {Object}
- * @param authType {AUTH_TYPE} 认证类型，默认：{AUTH_TYPE.BEARER}
- */
-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 })
-      }
-      break
-    case AUTH_TYPE.BASIC:
-    case AUTH_TYPE.AUTH1:
-    case AUTH_TYPE.AUTH2:
-    default:
-      break
-  }
-}
-
-/**
- * 移出认证信息
- * @param authType {AUTH_TYPE} 认证类型
- */
-function removeAuthorization (authType = AUTH_TYPE.BEARER) {
-  switch (authType) {
-    case AUTH_TYPE.BEARER:
-      Cookie.remove(xsrfHeaderName)
-      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(xsrfHeaderName)) {
-        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) {
-      // 如果是首次使用系统LocalStorage需要初始化，在登陆之后重新获取一次compatible
-      if (compatible === null) {
-        compatible = localStorage.getItem('compatible')
-      }
-      // 判断是否为V4环境
-      if (compatible === 'V4') {
-        // V4 环境则添加 V4请求头
-        config.headers['ACCESS_TOKEN'] = localStorage.getItem('ACCESS_TOKEN')
-        config.headers['ACCESS_TOKEN_EXPIRES'] = localStorage.getItem('ACCESS_TOKEN_EXPIRES')
-      } else {
-        config.headers['Access-Token'] = token
-      }
-    }
-    if (!config.headers['Content-Type']) {
-      config.headers['Content-Type'] = 'application/json;charset=UTF-8'
-    }
-    return config
-  }, errorHandler)
-  // 加载响应拦截器
-  axios.interceptors.response.use((response) => {
-    // 判断是否为V4环境，不为compatible赋初始值
-    // 其有可能是undefined未定义，或第一次使用本系统LocalStorage在初始化，获得的值为null
-    if (compatible === null || compatible === undefined) {
-      compatible = localStorage.getItem('compatible')
-    }
-    if (compatible === 'V4') {
-      if (response.data.data) {
-        return response.data.data
-      } else {
-        return response.data
-      }
-    } else {
-      return response.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.code === 403) {
-      notification.error({
-        message: '禁止访问',
-        description: data
-      })
-    } else if ((error.response.status === 401 || data.code === 401) && !(data.result && data.result.isLogin)) {
-      notification.error({
-        message: '鉴权失败',
-        description: data
-      })
-      if (token) {
-        Vue.$store.dispatch('Logout').then(() => {
-          setTimeout(() => {
-            window.location.reload()
-          }, 1500)
-        })
-      }
-    } else if (error.response.status === 500 || data.code === 500) {
-      notification.error({
-        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,
-  setAuthorizationV4,
-  removeAuthorizationV4
-}
+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 notification from 'ant-design-vue/es/notification'
+
+let compatible
+
+// 跨域认证信息 header 名
+const xsrfHeaderName = 'Authorization'
+
+axios.defaults.timeout = 5000
+axios.defaults.withCredentials = true
+axios.defaults.xsrfHeaderName = xsrfHeaderName
+axios.defaults.xsrfCookieName = xsrfHeaderName
+
+// 认证类型
+const AUTH_TYPE = {
+  BEARER: 'Bearer',
+  BASIC: 'basic',
+  AUTH1: 'auth1',
+  AUTH2: 'auth2'
+}
+
+// http method
+const METHOD = {
+  GET: 'get',
+  POST: 'post'
+}
+
+/**
+ * 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)
+    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:
+      if (auth.token) {
+        Cookie.set(xsrfHeaderName, 'Bearer ' + auth.token, { expires: auth.expireAt })
+      }
+      break
+    case AUTH_TYPE.BASIC:
+    case AUTH_TYPE.AUTH1:
+    case AUTH_TYPE.AUTH2:
+    default:
+      break
+  }
+}
+
+/**
+ * 移出认证信息
+ * @param authType {AUTH_TYPE} 认证类型
+ */
+function removeAuthorization (authType = AUTH_TYPE.BEARER) {
+  switch (authType) {
+    case AUTH_TYPE.BEARER:
+      Cookie.remove(xsrfHeaderName)
+      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(xsrfHeaderName)) {
+        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) {
+      // 如果是首次使用系统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.headers['Content-Type']) {
+      config.headers['Content-Type'] = 'application/json;charset=UTF-8'
+    }
+    return config
+  }, errorHandler)
+  // 加载响应拦截器
+  axios.interceptors.response.use((response) => {
+    // 判断是否为V4环境，不为compatible赋初始值
+    // 其有可能是undefined未定义，或第一次使用本系统LocalStorage在初始化，获得的值为null
+    if (compatible === null || compatible === undefined) {
+      compatible = localStorage.getItem('compatible')
+    }
+    if (compatible === 'V4') {
+      if (response.data.data) {
+        return response.data.data
+      } else {
+        return response.data
+      }
+    } else {
+      return response.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.code === 403) {
+      notification.error({
+        message: '禁止访问',
+        description: data
+      })
+    } else if ((error.response.status === 401 || data.code === 401) && !(data.result && data.result.isLogin)) {
+      notification.error({
+        message: '鉴权失败',
+        description: data
+      })
+      if (token) {
+        Vue.$store.dispatch('Logout').then(() => {
+          setTimeout(() => {
+            window.location.reload()
+          }, 1500)
+        })
+      }
+    } else if (error.response.status === 500 || data.code === 500) {
+      notification.error({
+        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
+}