Skip to content

Commit 7827456

Browse files
YunaiVgitee-org
authored andcommitted
!548 Redis 缓存替代本地缓存,降低学习成本
Merge pull request !548 from 芋道源码/master-redis
2 parents de0653b + 3f20bb9 commit 7827456

File tree

4 files changed

+22
-28
lines changed

4 files changed

+22
-28
lines changed

src/api/menu.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/api/system/permission.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import request from '@/utils/request'
33
// 查询角色拥有的菜单数组
44
export function listRoleMenus(roleId) {
55
return request({
6-
url: '/system/permission/list-role-resources?roleId=' + roleId,
6+
url: '/system/permission/list-role-menus?roleId=' + roleId,
77
method: 'get'
88
})
99
}

src/permission.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ router.beforeEach((to, from, next) => {
2525
// 获取字典数据 add by 芋艿
2626
store.dispatch('dict/loadDictDatas')
2727
// 判断当前用户是否已拉取完 user_info 信息
28-
store.dispatch('GetInfo').then(() => {
28+
store.dispatch('GetInfo').then(userInfo => {
2929
isRelogin.show = false
30-
store.dispatch('GenerateRoutes').then(accessRoutes => {
30+
// 触发 GenerateRoutes 事件时,将 menus 菜单树传递进去
31+
store.dispatch('GenerateRoutes', userInfo.menus).then(accessRoutes => {
3132
// 根据 roles 权限生成可访问的路由表
3233
router.addRoutes(accessRoutes) // 动态添加可访问路由表
3334
next({ ...to, replace: true }) // hack方法 确保addRoutes已完成

src/store/modules/permission.js

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {constantRoutes} from '@/router'
2-
import {getRouters} from '@/api/menu'
32
import Layout from '@/layout/index'
43
import ParentView from '@/components/ParentView';
54
import {toCamelCase} from "@/utils";
@@ -27,22 +26,25 @@ const permission = {
2726
},
2827
},
2928
actions: {
30-
// 生成路由
31-
GenerateRoutes({commit}) {
29+
/**
30+
* 生成路由
31+
*
32+
* @param commit commit 函数
33+
* @param menus 路由参数
34+
*/
35+
GenerateRoutes({commit}, menus) {
3236
return new Promise(resolve => {
33-
// 向后端请求路由数据(菜单)
34-
getRouters().then(res => {
35-
const sdata = JSON.parse(JSON.stringify(res.data)) // 【重要】用于菜单中的数据
36-
const rdata = JSON.parse(JSON.stringify(res.data)) // 用于最后添加到 Router 中的数据
37-
const sidebarRoutes = filterAsyncRouter(sdata)
38-
const rewriteRoutes = filterAsyncRouter(rdata, false, true)
39-
rewriteRoutes.push({path: '*', redirect: '/404', hidden: true})
40-
commit('SET_ROUTES', rewriteRoutes)
41-
commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))
42-
commit('SET_DEFAULT_ROUTES', sidebarRoutes)
43-
commit('SET_TOPBAR_ROUTES', sidebarRoutes)
44-
resolve(rewriteRoutes)
45-
})
37+
// 将 menus 菜单,转换为 route 路由数组
38+
const sdata = JSON.parse(JSON.stringify(menus)) // 【重要】用于菜单中的数据
39+
const rdata = JSON.parse(JSON.stringify(menus)) // 用于最后添加到 Router 中的数据
40+
const sidebarRoutes = filterAsyncRouter(sdata)
41+
const rewriteRoutes = filterAsyncRouter(rdata, false, true)
42+
rewriteRoutes.push({path: '*', redirect: '/404', hidden: true})
43+
commit('SET_ROUTES', rewriteRoutes)
44+
commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))
45+
commit('SET_DEFAULT_ROUTES', sidebarRoutes)
46+
commit('SET_TOPBAR_ROUTES', sidebarRoutes)
47+
resolve(rewriteRoutes)
4648
})
4749
}
4850
}

0 commit comments

Comments
 (0)