y595705120 3 tahun lalu
induk
melakukan
967fe77178
3 mengubah file dengan 11 tambahan dan 4 penghapusan
  1. 2 2
      src/permission.js
  2. 7 0
      src/utils/auth.js
  3. 2 2
      vue.config.js

+ 2 - 2
src/permission.js

@@ -3,7 +3,7 @@ import store from './store'
 import { Message } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
-import { getToken } from '@/utils/auth' // get token from cookie
+import { getToken, getUserId } from '@/utils/auth' // get token from cookie
 import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
@@ -25,7 +25,7 @@ router.beforeEach(async(to, from, next) => {
     // NProgress.done() // hack: https://github.com/PanJiaChen/vue-element-admin/pull/2939
     return
   }
-  const hasToken = getToken()
+  const hasToken = getToken() && getUserId()
   //
   if( hasToken ){
      next()

+ 7 - 0
src/utils/auth.js

@@ -2,6 +2,13 @@ import { authDB } from '@/db'
 
 const TokenKey = 'token'
 
+const UserKey = 'userId'
+
+export function getUserId() {
+  return authDB.get(UserKey)
+}
+
+
 export function getToken() {
   return authDB.get(TokenKey)
 }

+ 2 - 2
vue.config.js

@@ -1,8 +1,8 @@
 'use strict'
 const path = require('path')
 const defaultSettings = require('./src/settings.js')
-// const HOST = "http://smoa.ndjsxh.cn:8888"
-const HOST = "http://localhost:8000"
+const HOST = "http://smoa.ndjsxh.cn:8888"
+// const HOST = "http://localhost:8000"
 function resolve(dir) {
   return path.join(__dirname, dir)
 }