Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
sts网站
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyang
sts网站
Commits
1810f304
Commit
1810f304
authored
Dec 04, 2024
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
白名单支持对通配符路径匹配
parent
6efceac4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
6 deletions
+23
-6
permission.js
ruoyi-ui/src/permission.js
+8
-3
validate.js
ruoyi-ui/src/utils/validate.js
+15
-3
No files found.
ruoyi-ui/src/permission.js
View file @
1810f304
...
@@ -4,11 +4,16 @@ import { Message } from 'element-ui'
...
@@ -4,11 +4,16 @@ import { Message } from 'element-ui'
import
NProgress
from
'nprogress'
import
NProgress
from
'nprogress'
import
'nprogress/nprogress.css'
import
'nprogress/nprogress.css'
import
{
getToken
}
from
'@/utils/auth'
import
{
getToken
}
from
'@/utils/auth'
import
{
isPathMatch
}
from
'@/utils/validate'
import
{
isRelogin
}
from
'@/utils/request'
import
{
isRelogin
}
from
'@/utils/request'
NProgress
.
configure
({
showSpinner
:
false
})
NProgress
.
configure
({
showSpinner
:
false
})
const
whiteList
=
[
'/login'
,
'/register'
]
const
whiteList
=
[
'/login'
,
'/register'
,
'/register*'
,
'/register/*'
]
const
isWhiteList
=
(
path
)
=>
{
return
whiteList
.
some
(
pattern
=>
isPathMatch
(
pattern
,
path
))
}
router
.
beforeEach
((
to
,
from
,
next
)
=>
{
router
.
beforeEach
((
to
,
from
,
next
)
=>
{
NProgress
.
start
()
NProgress
.
start
()
...
@@ -18,7 +23,7 @@ router.beforeEach((to, from, next) => {
...
@@ -18,7 +23,7 @@ router.beforeEach((to, from, next) => {
if
(
to
.
path
===
'/login'
)
{
if
(
to
.
path
===
'/login'
)
{
next
({
path
:
'/'
})
next
({
path
:
'/'
})
NProgress
.
done
()
NProgress
.
done
()
}
else
if
(
whiteList
.
indexOf
(
to
.
path
)
!==
-
1
)
{
}
else
if
(
isWhiteList
(
to
.
path
)
)
{
next
()
next
()
}
else
{
}
else
{
if
(
store
.
getters
.
roles
.
length
===
0
)
{
if
(
store
.
getters
.
roles
.
length
===
0
)
{
...
@@ -43,7 +48,7 @@ router.beforeEach((to, from, next) => {
...
@@ -43,7 +48,7 @@ router.beforeEach((to, from, next) => {
}
}
}
else
{
}
else
{
// 没有token
// 没有token
if
(
whiteList
.
indexOf
(
to
.
path
)
!==
-
1
)
{
if
(
isWhiteList
(
to
.
path
)
)
{
// 在免登录白名单,直接进入
// 在免登录白名单,直接进入
next
()
next
()
}
else
{
}
else
{
...
...
ruoyi-ui/src/utils/validate.js
View file @
1810f304
/**
* 路径匹配器
* @param {string} pattern
* @param {string} path
* @returns {Boolean}
*/
export
function
isPathMatch
(
pattern
,
path
)
{
const
regexPattern
=
pattern
.
replace
(
/
\/
/g
,
'
\\
/'
).
replace
(
/
\*\*
/g
,
'.*'
).
replace
(
/
\*
/g
,
'[^
\\
/]*'
)
const
regex
=
new
RegExp
(
`^
${
regexPattern
}
$`
)
return
regex
.
test
(
path
)
}
/**
/**
* 判断value字符串是否为空
* 判断value字符串是否为空
* @param {string} value
* @param {string} value
...
@@ -5,9 +17,9 @@
...
@@ -5,9 +17,9 @@
*/
*/
export
function
isEmpty
(
value
)
{
export
function
isEmpty
(
value
)
{
if
(
value
==
null
||
value
==
""
||
value
==
undefined
||
value
==
"undefined"
)
{
if
(
value
==
null
||
value
==
""
||
value
==
undefined
||
value
==
"undefined"
)
{
return
true
;
return
true
}
}
return
false
;
return
false
}
}
/**
/**
...
@@ -87,7 +99,7 @@ export function validEmail(email) {
...
@@ -87,7 +99,7 @@ export function validEmail(email) {
* @returns {Boolean}
* @returns {Boolean}
*/
*/
export
function
isString
(
str
)
{
export
function
isString
(
str
)
{
return
typeof
str
===
'string'
||
str
instanceof
String
;
return
typeof
str
===
'string'
||
str
instanceof
String
}
}
/**
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment