From fd01b5a61f1a92db90c00e7bb1b4162a2b61bfa3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 04 十二月 2024 11:42:07 +0800
Subject: [PATCH] update 优化 白名单支持对通配符路径匹配

---
 src/permission.ts |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/permission.ts b/src/permission.ts
index 51a928a..86dd6c3 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -3,7 +3,7 @@
 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';
@@ -11,6 +11,10 @@
 
 NProgress.configure({ showSpinner: false });
 const whiteList = ['/login', '/register', '/social-callback'];
+
+const isWhiteList = (path: string) => {
+  return whiteList.some(pattern => isPathMatch(pattern, path))
+}
 
 router.beforeEach(async (to, from, next) => {
   NProgress.start();
@@ -20,7 +24,7 @@
     if (to.path === '/login') {
       next({ path: '/' });
       NProgress.done();
-    } else if (whiteList.indexOf(to.path as string) !== -1) {
+    } else if (isWhiteList(to.path)) {
       next();
     } else {
       if (useUserStore().roles.length === 0) {
@@ -49,7 +53,7 @@
     }
   } else {
     // 娌℃湁token
-    if (whiteList.indexOf(to.path as string) !== -1) {
+    if (isWhiteList(to.path)) {
       // 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
       next();
     } else {

--
Gitblit v1.9.3