From b95a49c7d74e5c7f45cd7c65f45502edf7f203dd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 07 二月 2025 13:08:34 +0800
Subject: [PATCH] reset 回滚有问题的修改
---
src/permission.ts | 96 ++++++++++++++++++++++++++----------------------
1 files changed, 52 insertions(+), 44 deletions(-)
diff --git a/src/permission.ts b/src/permission.ts
index 3c76965..b05f8c3 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -3,59 +3,67 @@
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 });
-const whiteList = ['/login', '/register'];
+const whiteList = ['/login', '/register', '/social-callback', '/register*', '/register/*'];
+
+const isWhiteList = (path: string) => {
+ return whiteList.some(pattern => isPathMatch(pattern, path))
+}
router.beforeEach(async (to, from, next) => {
- NProgress.start();
- if (getToken()) {
- to.meta.title && useSettingsStore().setTitle(to.meta.title as string);
- /* has token*/
- if (to.path === '/login') {
- next({ path: '/' });
- NProgress.done();
- } else {
- if (useUserStore().roles.length === 0) {
- isRelogin.show = true;
- // 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅
- const [err] = await tos(useUserStore().getInfo());
- if (err) {
- await useUserStore().logout();
- ElMessage.error(err);
- next({ path: '/' });
- } else {
- isRelogin.show = false;
- const accessRoutes = await usePermissionStore().generateRoutes();
- // 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
- accessRoutes.forEach((route) => {
- if (!isHttp(route.path)) {
- router.addRoute(route); // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
- }
- });
- next({ ...to, replace: true }); // hack鏂规硶 纭繚addRoutes宸插畬鎴�
- }
- } else {
- next();
- }
- }
- } else {
- // 娌℃湁token
- if (whiteList.indexOf(to.path) !== -1) {
- // 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
- next();
- } else {
- next(`/login?redirect=${to.fullPath}`); // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
- NProgress.done();
- }
- }
+ NProgress.start();
+ if (getToken()) {
+ to.meta.title && useSettingsStore().setTitle(to.meta.title);
+ /* has token*/
+ if (to.path === '/login') {
+ next({ path: '/' });
+ NProgress.done();
+ } else if (isWhiteList(to.path)) {
+ next();
+ } else {
+ if (useUserStore().roles.length === 0) {
+ isRelogin.show = true;
+ // 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅
+ const [err] = await tos(useUserStore().getInfo());
+ if (err) {
+ await useUserStore().logout();
+ ElMessage.error(err);
+ next({ path: '/' });
+ } else {
+ isRelogin.show = false;
+ const accessRoutes = await usePermissionStore().generateRoutes();
+ // 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
+ accessRoutes.forEach((route) => {
+ if (!isHttp(route.path)) {
+ router.addRoute(route); // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
+ }
+ });
+ // @ts-expect-error hack鏂规硶 纭繚addRoutes宸插畬鎴�
+ next({ path: to.path, replace: true, params: to.params, query: to.query, hash: to.hash, name: to.name as string }); // hack鏂规硶 纭繚addRoutes宸插畬鎴�
+ }
+ } else {
+ next();
+ }
+ }
+ } else {
+ // 娌℃湁token
+ if (isWhiteList(to.path)) {
+ // 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
+ next();
+ } else {
+ const redirect = encodeURIComponent(to.fullPath || '/');
+ next(`/login?redirect=${redirect}`); // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
+ NProgress.done();
+ }
+ }
});
router.afterEach(() => {
- NProgress.done();
+ NProgress.done();
});
--
Gitblit v1.9.3