|
@@ -3,15 +3,19 @@ import { ElMessage } from 'element-plus'
|
|
|
import NProgress from 'nprogress'
|
|
|
import 'nprogress/nprogress.css'
|
|
|
import { getToken } from '@/utils/auth'
|
|
|
-import { isHttp } from '@/utils/validate'
|
|
|
+import { isHttp, isPathMatch } from '@/utils/validate'
|
|
|
import { isRelogin } from '@/utils/request'
|
|
|
import useUserStore from '@/store/modules/user'
|
|
|
import useSettingsStore from '@/store/modules/settings'
|
|
|
import usePermissionStore from '@/store/modules/permission'
|
|
|
|
|
|
-NProgress.configure({ showSpinner: false });
|
|
|
+NProgress.configure({ showSpinner: false })
|
|
|
|
|
|
-const whiteList = ['/login', '/register'];
|
|
|
+const whiteList = ['/login', '/register']
|
|
|
+
|
|
|
+const isWhiteList = (path) => {
|
|
|
+ return whiteList.some(pattern => isPathMatch(pattern, path))
|
|
|
+}
|
|
|
|
|
|
router.beforeEach((to, from, next) => {
|
|
|
NProgress.start()
|
|
@@ -21,7 +25,7 @@ router.beforeEach((to, from, next) => {
|
|
|
if (to.path === '/login') {
|
|
|
next({ path: '/' })
|
|
|
NProgress.done()
|
|
|
- } else if (whiteList.indexOf(to.path) !== -1) {
|
|
|
+ } else if (isWhiteList(to.path)) {
|
|
|
next()
|
|
|
} else {
|
|
|
if (useUserStore().roles.length === 0) {
|
|
@@ -50,7 +54,7 @@ router.beforeEach((to, from, next) => {
|
|
|
}
|
|
|
} else {
|
|
|
// 没有token
|
|
|
- if (whiteList.indexOf(to.path) !== -1) {
|
|
|
+ if (isWhiteList(to.path)) {
|
|
|
// 在免登录白名单,直接进入
|
|
|
next()
|
|
|
} else {
|