李志伟 3 years ago
parent
commit
7c00274169
3 changed files with 2 additions and 18 deletions
  1. 1
    4
      src/store/modules/user.js
  2. 0
    12
      src/utils/auth.js
  3. 1
    2
      src/utils/request.js

+ 1
- 4
src/store/modules/user.js View File

1
 import { login } from '@/api/user'
1
 import { login } from '@/api/user'
2
-import { getToken, setToken, removeToken, setUserId, removeUserId } from '@/utils/auth'
2
+import { getToken, setToken, removeToken } from '@/utils/auth'
3
 import { resetRouter } from '@/router'
3
 import { resetRouter } from '@/router'
4
 import md5 from 'js-md5'
4
 import md5 from 'js-md5'
5
 
5
 
31
         const { data } = response
31
         const { data } = response
32
         commit('SET_TOKEN', data.token)
32
         commit('SET_TOKEN', data.token)
33
         setToken(data.token)
33
         setToken(data.token)
34
-        setUserId(data.user.userId)
35
         resolve()
34
         resolve()
36
       }).catch(error => {
35
       }).catch(error => {
37
         reject(error)
36
         reject(error)
43
   logout({ commit, state }) {
42
   logout({ commit, state }) {
44
     return new Promise((resolve, reject) => {
43
     return new Promise((resolve, reject) => {
45
       removeToken() // must remove  token  first
44
       removeToken() // must remove  token  first
46
-      removeUserId()
47
       resetRouter()
45
       resetRouter()
48
       commit('RESET_STATE')
46
       commit('RESET_STATE')
49
       resolve()
47
       resolve()
54
   resetToken({ commit }) {
52
   resetToken({ commit }) {
55
     return new Promise(resolve => {
53
     return new Promise(resolve => {
56
       removeToken() // must remove  token  first
54
       removeToken() // must remove  token  first
57
-      removeUserId()
58
       commit('RESET_STATE')
55
       commit('RESET_STATE')
59
       resolve()
56
       resolve()
60
     })
57
     })

+ 0
- 12
src/utils/auth.js View File

11
 export function removeToken() {
11
 export function removeToken() {
12
   return localStorage.removeItem(TokenKey)
12
   return localStorage.removeItem(TokenKey)
13
 }
13
 }
14
-
15
-const UserIdKey = 'user'
16
-
17
-export function setUserId(userId) {
18
-  return localStorage.setItem(UserIdKey, userId)
19
-}
20
-export function getUserId() {
21
-  return localStorage.getItem(UserIdKey)
22
-}
23
-export function removeUserId() {
24
-  return localStorage.removeItem(UserIdKey)
25
-}

+ 1
- 2
src/utils/request.js View File

1
 import axios from 'axios'
1
 import axios from 'axios'
2
 import { Message } from 'element-ui'
2
 import { Message } from 'element-ui'
3
 import store from '@/store'
3
 import store from '@/store'
4
-import { getToken, getUserId } from '@/utils/auth'
4
+import { getToken } from '@/utils/auth'
5
 import { downloadBlob } from './download'
5
 import { downloadBlob } from './download'
6
 
6
 
7
 // create an axios instance
7
 // create an axios instance
21
       // ['X-Token'] is a custom headers key
21
       // ['X-Token'] is a custom headers key
22
       // please modify it according to the actual situation
22
       // please modify it according to the actual situation
23
       config.headers['X-Authorization-JWT'] = getToken()
23
       config.headers['X-Authorization-JWT'] = getToken()
24
-      config.headers['x-userid'] = getUserId()
25
     }
24
     }
26
     return config
25
     return config
27
   },
26
   },