Merge branch 'hotfix/requireAuth' into develop
Former-commit-id: bf6fa5497d63beb19ddf19dc70b5a622470dfceb [formerly bf6fa5497d63beb19ddf19dc70b5a622470dfceb [formerly bf6fa5497d63beb19ddf19dc70b5a622470dfceb [formerly bf6fa5497d63beb19ddf19dc70b5a622470dfceb [formerly 767f24a44cbf4c52d6572a4fb0498372688efd1c [formerly 4ec154f1633d84d570d65da4dc973da075089fb5]]]]] Former-commit-id: d9b628aa1678e2ec10ab420fb76fb6ce181102cb Former-commit-id: 87e71a1ac8e4683e43fe914ab23bb82ac5e83a57 Former-commit-id: e31f2c8ea0b4085b93faac92a80c2ebe200faa0c [formerly b1d399ec58010f847ad7087107b2a7e92e8bbdb1] Former-commit-id: 8ba07021a8c1747a3d81f15c137b25877079b133 Former-commit-id: 951a4aee02ef60bdef59cf30dec8f48633f5c2e1 Former-commit-id: f865aa1eeade023c7f9e69d8aa30e35c2e22ae90 Former-commit-id: cab6ad9316cc583d9c09a6902278a7bb537b5f31 Former-commit-id: 2e41c18b173ea3f2034cf11bacc8de5a002864ed
This commit is contained in:
@@ -29,7 +29,7 @@ router.beforeEach((to, from, next) => {
|
|||||||
// 关闭搜索面板
|
// 关闭搜索面板
|
||||||
store.commit('d2admin/search/set', false)
|
store.commit('d2admin/search/set', false)
|
||||||
// 验证当前路由所有的匹配中是否需要有登录验证的
|
// 验证当前路由所有的匹配中是否需要有登录验证的
|
||||||
if (to.matched.some(r => r.meta.requiresAuth)) {
|
if (to.matched.some(r => r.meta.auth)) {
|
||||||
// 这里暂时将cookie里是否存有token作为验证是否登录的条件
|
// 这里暂时将cookie里是否存有token作为验证是否登录的条件
|
||||||
// 请根据自身业务需要修改
|
// 请根据自身业务需要修改
|
||||||
const token = util.cookies.get('token')
|
const token = util.cookies.get('token')
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import layoutHeaderAside from '@/layout/header-aside'
|
import layoutHeaderAside from '@/layout/header-aside'
|
||||||
|
|
||||||
const meta = { requiresAuth: true }
|
const meta = { auth: true }
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
path: '/demo/business',
|
path: '/demo/business',
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import layoutHeaderAside from '@/layout/header-aside'
|
import layoutHeaderAside from '@/layout/header-aside'
|
||||||
|
|
||||||
const meta = { requiresAuth: true }
|
const meta = { auth: true }
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
path: '/demo/charts',
|
path: '/demo/charts',
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import layoutHeaderAside from '@/layout/header-aside'
|
import layoutHeaderAside from '@/layout/header-aside'
|
||||||
|
|
||||||
const meta = { requiresAuth: true }
|
const meta = { auth: true }
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
path: '/demo/components',
|
path: '/demo/components',
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import layoutHeaderAside from '@/layout/header-aside'
|
import layoutHeaderAside from '@/layout/header-aside'
|
||||||
|
|
||||||
const meta = { requiresAuth: true }
|
const meta = { auth: true }
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
path: '/demo/d2-crud',
|
path: '/demo/d2-crud',
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import layoutHeaderAside from '@/layout/header-aside'
|
import layoutHeaderAside from '@/layout/header-aside'
|
||||||
|
|
||||||
const meta = { requiresAuth: true }
|
const meta = { auth: true }
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
path: '/demo/element',
|
path: '/demo/element',
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import layoutHeaderAside from '@/layout/header-aside'
|
import layoutHeaderAside from '@/layout/header-aside'
|
||||||
|
|
||||||
const meta = { requiresAuth: true }
|
const meta = { auth: true }
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
path: '/demo/frame',
|
path: '/demo/frame',
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import layoutHeaderAside from '@/layout/header-aside'
|
import layoutHeaderAside from '@/layout/header-aside'
|
||||||
|
|
||||||
const meta = { requiresAuth: true }
|
const meta = { auth: true }
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
path: '/demo/playground',
|
path: '/demo/playground',
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import layoutHeaderAside from '@/layout/header-aside'
|
import layoutHeaderAside from '@/layout/header-aside'
|
||||||
|
|
||||||
const meta = { requiresAuth: true }
|
const meta = { auth: true }
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
path: '/demo/plugins',
|
path: '/demo/plugins',
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import business from './modules/business'
|
|||||||
|
|
||||||
import layoutHeaderAside from '@/layout/header-aside'
|
import layoutHeaderAside from '@/layout/header-aside'
|
||||||
|
|
||||||
const meta = { requiresAuth: true }
|
const meta = { auth: true }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 在主框架内显示
|
* 在主框架内显示
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ export default {
|
|||||||
fullPath: '/index',
|
fullPath: '/index',
|
||||||
meta: {
|
meta: {
|
||||||
title: '首页',
|
title: '首页',
|
||||||
requiresAuth: false
|
auth: false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user