瀏覽代碼

use localstorage, change to my egg api

EthnaYeh 7 年之前
父節點
當前提交
54e5e507fd
共有 7 個文件被更改,包括 21 次插入17 次删除
  1. 2 1
      config/dev.env.js
  2. 3 3
      src/api/login.js
  3. 1 1
      src/store/getters.js
  4. 4 4
      src/store/modules/user.js
  5. 8 5
      src/utils/auth.js
  6. 1 1
      src/utils/fetch.js
  7. 2 2
      src/views/dashboard/index.vue

+ 2 - 1
config/dev.env.js

@@ -3,5 +3,6 @@ var prodEnv = require('./prod.env')
3 3
 
4 4
 module.exports = merge(prodEnv, {
5 5
   NODE_ENV: '"development"',
6
-  BASE_API: '"https://easy-mock.com/mock/5950a2419adc231f356a6636/vue-admin"',
6
+  BASE_API: '"http://localhost:7001/api/v1/admin"'
7
+  // BASE_API: '"https://easy-mock.com/mock/5950a2419adc231f356a6636/vue-admin"'  
7 8
 })

+ 3 - 3
src/api/login.js

@@ -2,7 +2,7 @@ import fetch from '@/utils/fetch'
2 2
 
3 3
 export function login(username, password) {
4 4
   return fetch({
5
-    url: '/user/login',
5
+    url: '/users/signin',
6 6
     method: 'post',
7 7
     data: {
8 8
       username,
@@ -13,7 +13,7 @@ export function login(username, password) {
13 13
 
14 14
 export function getInfo(token) {
15 15
   return fetch({
16
-    url: '/user/info',
16
+    url: '/users/info',
17 17
     method: 'get',
18 18
     params: { token }
19 19
   })
@@ -21,7 +21,7 @@ export function getInfo(token) {
21 21
 
22 22
 export function logout() {
23 23
   return fetch({
24
-    url: '/user/logout',
24
+    url: '/users/logout',
25 25
     method: 'post'
26 26
   })
27 27
 }

+ 1 - 1
src/store/getters.js

@@ -2,7 +2,7 @@ const getters = {
2 2
   sidebar: state => state.app.sidebar,
3 3
   token: state => state.user.token,
4 4
   avatar: state => state.user.avatar,
5
-  name: state => state.user.name,
5
+  username: state => state.user.username,
6 6
   roles: state => state.user.roles
7 7
 }
8 8
 export default getters

+ 4 - 4
src/store/modules/user.js

@@ -4,7 +4,7 @@ import { getToken, setToken, removeToken } from '@/utils/auth'
4 4
 const user = {
5 5
   state: {
6 6
     token: getToken(),
7
-    name: '',
7
+    username: '',
8 8
     avatar: '',
9 9
     roles: []
10 10
   },
@@ -13,8 +13,8 @@ const user = {
13 13
     SET_TOKEN: (state, token) => {
14 14
       state.token = token
15 15
     },
16
-    SET_NAME: (state, name) => {
17
-      state.name = name
16
+    SET_USERNAME: (state, username) => {
17
+      state.username = username
18 18
     },
19 19
     SET_AVATAR: (state, avatar) => {
20 20
       state.avatar = avatar
@@ -46,7 +46,7 @@ const user = {
46 46
         getInfo(state.token).then(response => {
47 47
           const data = response.data
48 48
           commit('SET_ROLES', data.role)
49
-          commit('SET_NAME', data.name)
49
+          commit('SET_USERNAME', data.username)
50 50
           commit('SET_AVATAR', data.avatar)
51 51
           resolve(response)
52 52
         }).catch(error => {

+ 8 - 5
src/utils/auth.js

@@ -1,15 +1,18 @@
1
-import Cookies from 'js-cookie'
1
+// import Cookies from 'js-cookie'
2 2
 
3
-const TokenKey = 'Admin-Token'
3
+// const TokenKey = 'Admin-Token'
4 4
 
5 5
 export function getToken() {
6
-  return Cookies.get(TokenKey)
6
+  // return Cookies.get(TokenKey)
7
+  return localStorage.getItem('Authorization')
7 8
 }
8 9
 
9 10
 export function setToken(token) {
10
-  return Cookies.set(TokenKey, token)
11
+  // return Cookies.set(TokenKey, token)
12
+  return localStorage.setItem('Authorization', token)
11 13
 }
12 14
 
13 15
 export function removeToken() {
14
-  return Cookies.remove(TokenKey)
16
+  // return Cookies.remove(TokenKey)
17
+  return localStorage.removeItem('Authorization')
15 18
 }

+ 1 - 1
src/utils/fetch.js

@@ -12,7 +12,7 @@ const service = axios.create({
12 12
 // request拦截器
13 13
 service.interceptors.request.use(config => {
14 14
   if (store.getters.token) {
15
-    config.headers['X-Token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
15
+    config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
16 16
   }
17 17
   return config
18 18
 }, error => {

+ 2 - 2
src/views/dashboard/index.vue

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <div class="dashboard-container">
3
-    <div class='dashboard-text'>name:{{name}}</div>
3
+    <div class='dashboard-text'>username:{{username}}</div>
4 4
     <div class='dashboard-text'>role:<span v-for='role in roles' :key='role'>{{role}}</span></div>
5 5
   </div>
6 6
 </template>
@@ -11,7 +11,7 @@ export default {
11 11
   name: 'dashboard',
12 12
   computed: {
13 13
     ...mapGetters([
14
-      'name',
14
+      'username',
15 15
       'roles'
16 16
     ])
17 17
   }