Commit 39248e01 authored by 刘洪铨's avatar 刘洪铨 👽

js修改

parent 75e8394b
...@@ -28,7 +28,7 @@ export function refreshToken(params) { ...@@ -28,7 +28,7 @@ export function refreshToken(params) {
// 获取用户详细信息 // 获取用户详细信息
export function getInfo() { export function getInfo() {
return request({ return request({
url: '/system/user/getInfo', url: '/auth/getInfo',
method: 'get' method: 'get'
}) })
} }
......
...@@ -24,9 +24,9 @@ router.beforeEach((to, from, next) => { ...@@ -24,9 +24,9 @@ router.beforeEach((to, from, next) => {
store.dispatch('GetInfo').then(res => { store.dispatch('GetInfo').then(res => {
// 判断用户是否有权限 有角色 // 判断用户是否有权限 有角色
if (res.data.roles && res.data.roles.length > 0 && res.data.permissions && res.data.permissions.length > 0) { if (res.roles && res.roles.length > 0 && res.permissions && res.permissions.length > 0) {
// 拉取user_info // 拉取user_info
const roles = res.data.roles const roles = res.roles
store.dispatch('GenerateRoutes', { roles }).then((routers) => { store.dispatch('GenerateRoutes', { roles }).then((routers) => {
// 判断用户是否有路由 // 判断用户是否有路由
if (routers.accessedRoutes && routers.accessedRoutes.length > 0 && routers.getRouters && routers.getRouters.length > 0) { if (routers.accessedRoutes && routers.accessedRoutes.length > 0 && routers.getRouters && routers.getRouters.length > 0) {
......
...@@ -19,8 +19,8 @@ const permission = { ...@@ -19,8 +19,8 @@ const permission = {
GenerateRoutes({ commit }) { GenerateRoutes({ commit }) {
return new Promise(resolve => { return new Promise(resolve => {
// 向后端请求路由数据 // 向后端请求路由数据
getInfo().then(res => { getRouters().then(res => {
const accessedRoutes = filterAsyncRouter(res.data.menus) const accessedRoutes = filterAsyncRouter(res.data)
console.log(accessedRoutes) console.log(accessedRoutes)
if (accessedRoutes[0]) { if (accessedRoutes[0]) {
const firstChild = getFirstChild(accessedRoutes[0]) const firstChild = getFirstChild(accessedRoutes[0])
...@@ -28,7 +28,7 @@ const permission = { ...@@ -28,7 +28,7 @@ const permission = {
accessedRoutes.push({ path: '/', redirect: firstChild, hidden: true }) accessedRoutes.push({ path: '/', redirect: firstChild, hidden: true })
commit('SET_ROUTES', accessedRoutes) commit('SET_ROUTES', accessedRoutes)
} }
const routers = { accessedRoutes: accessedRoutes, getRouters: res.data.menus } const routers = { accessedRoutes: accessedRoutes, getRouters: res.data }
resolve(routers) resolve(routers)
}) })
}) })
......
import { login, logout, getInfo } from '@/api/login' import { login, logout, getInfo } from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth' import { getToken, setToken, removeToken } from '@/utils/auth'
import Layout from '@/layout'
import { loadView } from '@/store/modules/permission'
const user = { const user = {
state: { state: {
...@@ -57,11 +55,11 @@ const user = { ...@@ -57,11 +55,11 @@ const user = {
GetInfo({ commit, state }) { GetInfo({ commit, state }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getInfo(state.token).then(res => { getInfo(state.token).then(res => {
const user = res.data.user const user = res.user
const avatar = user.avatar === null ? require('@/assets/image/profile.jpg') : user.avatar const avatar = user.avatar === null ? require('@/assets/image/profile.jpg') : user.avatar
if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组 if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.data.roles) commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.data.permissions) commit('SET_PERMISSIONS', res.permissions)
} else { } else {
commit('SET_ROLES', ['ROLE_DEFAULT']) commit('SET_ROLES', ['ROLE_DEFAULT'])
} }
......
...@@ -81,7 +81,7 @@ module.exports = { ...@@ -81,7 +81,7 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.1.17:10010/internal`, // target: `http://192.168.1.17:10010/internal`,
// target: `http://10.5.87.231:10010/internal`, // target: `http://10.5.87.231:10010/internal`,
target: `http://127.0.0.1:8082/`, target: `http://127.0.0.1:8088/`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + process.env.VUE_APP_BASE_API]: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment