diff --git a/ldlz-web/.env.production b/ldlz-web/.env.production index 650f4df..f09a963 100644 --- a/ldlz-web/.env.production +++ b/ldlz-web/.env.production @@ -5,4 +5,4 @@ VUE_APP_TITLE = 领导履职管理系统 ENV = 'production' # 领导履职管理系统/生产环境 -VUE_APP_BASE_API = '/bnsapi' +VUE_APP_BASE_API = '/hncloud/ldlz' diff --git a/ldlz-web/src/layout/components/AppMain.vue b/ldlz-web/src/layout/components/AppMain.vue index a25c562..65a4b4a 100644 --- a/ldlz-web/src/layout/components/AppMain.vue +++ b/ldlz-web/src/layout/components/AppMain.vue @@ -10,20 +10,20 @@ diff --git a/ldlz-web/src/permission.js b/ldlz-web/src/permission.js index cfae4da..0a33fee 100644 --- a/ldlz-web/src/permission.js +++ b/ldlz-web/src/permission.js @@ -1,58 +1,85 @@ -import router from './router' -import store from './store' -import { Message } from 'element-ui' -import NProgress from 'nprogress' -import 'nprogress/nprogress.css' -import { getToken } from '@/utils/auth' -import { isRelogin } from '@/utils/request' +import router from "./router"; +import store from "./store"; +import { Message } from "element-ui"; +import NProgress from "nprogress"; +import "nprogress/nprogress.css"; +import { getToken, setToken } from "@/utils/auth"; +import { isRelogin } from "@/utils/request"; -NProgress.configure({ showSpinner: false }) - -const whiteList = ['/login', '/register','/ywgllogin'] +NProgress.configure({ showSpinner: false }); +const whiteList = ["/login", "/register", "/ywgllogin"]; router.beforeEach((to, from, next) => { - NProgress.start() + NProgress.start(); + + // 如果是嵌入模式,尝试从父窗口获取 token + if (window.self !== window.top) { + try { + // 只有同源才能访问 window.parent.sessionStorage + const parentToken = window.parent.sessionStorage.getItem("Admin-Token"); + if (parentToken && !getToken()) { + store.commit("SET_TOKEN", parentToken); + setToken(parentToken); + } + } catch (e) { + const parentToken = localStorage.getItem("Admin-Token"); + if (parentToken && !getToken()) { + store.commit("SET_TOKEN", parentToken); + setToken(parentToken); + } + } + } else { + const parentToken = localStorage.getItem("Admin-Token"); + if (parentToken && !getToken()) { + store.commit("SET_TOKEN", parentToken); + setToken(parentToken); + } + } + if (getToken()) { - to.meta.title && store.dispatch('settings/setTitle', to.meta.title) + to.meta.title && store.dispatch("settings/setTitle", to.meta.title); /* has token*/ - if (to.path === '/login') { - next({ path: '/' }) - NProgress.done() + if (to.path === "/login") { + next({ path: "/" }); + NProgress.done(); } else if (whiteList.indexOf(to.path) !== -1) { - next() + next(); } else { if (store.getters.roles.length === 0) { - isRelogin.show = true + isRelogin.show = true; // 判断当前用户是否已拉取完user_info信息 - store.dispatch('GetInfo').then(() => { - isRelogin.show = false - store.dispatch('GenerateRoutes').then(accessRoutes => { - // 根据roles权限生成可访问的路由表 - router.addRoutes(accessRoutes) // 动态添加可访问路由表 - next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 - }) - }).catch(err => { - store.dispatch('LogOut').then(() => { - Message.error(err) - next({ path: '/' }) - }) + store + .dispatch("GetInfo") + .then(() => { + isRelogin.show = false; + store.dispatch("GenerateRoutes").then((accessRoutes) => { + // 根据roles权限生成可访问的路由表 + router.addRoutes(accessRoutes); // 动态添加可访问路由表 + next({ ...to, replace: true }); // hack方法 确保addRoutes已完成 + }); }) + .catch((err) => { + store.dispatch("LogOut").then(() => { + Message.error(err); + next({ path: "/" }); + }); + }); } else { - next() + next(); } } } else { // 没有token if (whiteList.indexOf(to.path) !== -1) { // 在免登录白名单,直接进入 - next() + next(); } else { - next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页 - NProgress.done() + next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页 + NProgress.done(); } } -}) +}); router.afterEach(() => { - NProgress.done() -}) + NProgress.done(); +}); diff --git a/ldlz-web/src/views/index.vue b/ldlz-web/src/views/index.vue index 330cb88..3d389ce 100644 --- a/ldlz-web/src/views/index.vue +++ b/ldlz-web/src/views/index.vue @@ -1,39 +1,61 @@