vue2-client 1.2.113 → 1.2.116

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.2.113 -2022-09-02 @江超**
+**1.2.113 - 1.2.116 -2022-09-02 @江超**
 - 功能修改：
 - 修改请求后只有当返回的token有值时才设置store
 

package/package.json

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

package/src/pages/login/Login.vue

@@ -199,21 +199,19 @@ export default {
       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 })
+      if (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) {
-      if (data.token && data.expire) {
-        localStorage.setItem('ACCESS_TOKEN', data.token)
-        localStorage.setItem('ACCESS_TOKEN_EXPIRES', data.expire)
+      if (data.token) {
+        localStorage.setItem(ACCESS_TOKEN, data.token)
         setAuthorization({ token: data.token, expire: data.expire })
-      } else {
-        localStorage.removeItem('ACCESS_TOKEN')
-        localStorage.removeItem('ACCESS_TOKEN_EXPIRES')
       }
     }
   }

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,16 +1,13 @@
 import axios from 'axios'
 import Cookie from 'js-cookie'
 import Vue from 'vue'
-import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
+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'
-// V4系统请求头名
-const ACCESS_TOKEN_KEY = 'ACCESS_TOKEN'
-const ACCESS_TOKEN_EXPIRES_KEY = 'ACCESS_TOKEN_EXPIRES'
 
 axios.defaults.timeout = 5000
 axios.defaults.withCredentials = true
@@ -50,45 +47,6 @@ async function request (url, method, 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(ACCESS_TOKEN_KEY, 'Bearer ' + auth.token)
-        Cookie.set(ACCESS_TOKEN_EXPIRES_KEY, '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(ACCESS_TOKEN_KEY)
-      Cookie.remove(ACCESS_TOKEN_EXPIRES_KEY)
-      break
-    case AUTH_TYPE.BASIC:
-    case AUTH_TYPE.AUTH1:
-    case AUTH_TYPE.AUTH2:
-    default:
-      break
-  }
-}
-
 /**
  * 设置认证信息
  * @param auth {Object}
@@ -155,7 +113,7 @@ function checkAuthorization (authType = AUTH_TYPE.BEARER) {
 function loadInterceptors () {
   // 加载请求拦截器
   axios.interceptors.request.use(config => {
-    const token = localStorage.getItem(ACCESS_TOKEN_KEY)
+    const token = localStorage.getItem(ACCESS_TOKEN)
     // 如果 token 存在
     // 让每个请求携带自定义 token 请根据实际情况自行修改
     if (token) {
@@ -166,10 +124,9 @@ function loadInterceptors () {
       // 判断是否为V4环境
       if (compatible === 'V4') {
         // V4 环境则添加 V4请求头
-        config.headers[ACCESS_TOKEN_KEY] = localStorage.getItem(ACCESS_TOKEN_KEY)
-        config.headers[ACCESS_TOKEN_EXPIRES_KEY] = localStorage.getItem(ACCESS_TOKEN_EXPIRES_KEY)
+        config.headers[V4_ACCESS_TOKEN] = token
       } else {
-        config.headers['Access-Token'] = token
+        config.headers[ACCESS_TOKEN] = token
       }
     }
     if (!config.headers['Content-Type']) {
@@ -264,7 +221,5 @@ export {
   removeAuthorization,
   checkAuthorization,
   loadInterceptors,
-  parseUrlParams,
-  setAuthorizationV4,
-  removeAuthorizationV4
+  parseUrlParams
 }