Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
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
zhaowei
dlink
Commits
1b21aa6f
Commit
1b21aa6f
authored
Mar 14, 2022
by
wenmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复用户未登录时后台报错及鉴权问题
parent
619cfa49
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
2 deletions
+24
-2
Result.java
...k-admin/src/main/java/com/dlink/common/result/Result.java
+4
-0
SaTokenConfigure.java
...n/src/main/java/com/dlink/configure/SaTokenConfigure.java
+1
-1
WebExceptionHandler.java
...rc/main/java/com/dlink/exception/WebExceptionHandler.java
+14
-0
CodeEnum.java
dlink-admin/src/main/java/com/dlink/model/CodeEnum.java
+2
-1
Welcome.tsx
dlink-web/src/pages/Welcome.tsx
+3
-0
No files found.
dlink-admin/src/main/java/com/dlink/common/result/Result.java
View file @
1b21aa6f
...
...
@@ -42,6 +42,10 @@ public class Result<T> implements Serializable {
return
of
(
null
,
CodeEnum
.
ERROR
.
getCode
(),
msg
);
}
public
static
<
T
>
Result
<
T
>
notLogin
(
String
msg
)
{
return
of
(
null
,
CodeEnum
.
NOTLOGIN
.
getCode
(),
msg
);
}
public
static
<
T
>
Result
<
T
>
failed
(
T
model
,
String
msg
)
{
return
of
(
model
,
CodeEnum
.
ERROR
.
getCode
(),
msg
);
}
...
...
dlink-admin/src/main/java/com/dlink/configure/SaTokenConfigure.java
View file @
1b21aa6f
...
...
@@ -18,7 +18,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
public
void
addInterceptors
(
InterceptorRegistry
registry
)
{
// 注册Sa-Token的路由拦截器
registry
.
addInterceptor
(
new
SaRouteInterceptor
())
.
addPathPatterns
(
"/api/*"
)
.
addPathPatterns
(
"/api/*
*
"
)
.
excludePathPatterns
(
"/api/login"
)
.
excludePathPatterns
(
"/openapi/**"
);
}
...
...
dlink-admin/src/main/java/com/dlink/exception/WebExceptionHandler.java
View file @
1b21aa6f
package
com
.
dlink
.
exception
;
import
cn.dev33.satoken.exception.NotLoginException
;
import
com.dlink.common.result.Result
;
import
com.dlink.model.CodeEnum
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.web.bind.annotation.ControllerAdvice
;
import
org.springframework.web.bind.annotation.ExceptionHandler
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.context.request.RequestContextHolder
;
import
org.springframework.web.context.request.ServletRequestAttributes
;
import
javax.servlet.http.HttpServletResponse
;
/**
* WebExceptionHandler
...
...
@@ -24,6 +30,14 @@ public class WebExceptionHandler {
return
Result
.
failed
(
e
.
getMessage
());
}
@ExceptionHandler
public
Result
notLoginException
(
NotLoginException
e
)
{
ServletRequestAttributes
servletRequestAttributes
=
(
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
();
HttpServletResponse
response
=
servletRequestAttributes
.
getResponse
();
response
.
setStatus
(
CodeEnum
.
NOTLOGIN
.
getCode
());
return
Result
.
notLogin
(
"该用户未登录!"
);
}
@ExceptionHandler
public
Result
unknownException
(
Exception
e
)
{
logger
.
error
(
"ERROR:"
,
e
);
...
...
dlink-admin/src/main/java/com/dlink/model/CodeEnum.java
View file @
1b21aa6f
...
...
@@ -8,7 +8,8 @@ package com.dlink.model;
*/
public
enum
CodeEnum
{
SUCCESS
(
0
),
ERROR
(
1
);
ERROR
(
1
),
NOTLOGIN
(
401
);
private
Integer
code
;
CodeEnum
(
Integer
code
){
...
...
dlink-web/src/pages/Welcome.tsx
View file @
1b21aa6f
...
...
@@ -740,6 +740,9 @@ export default (): React.ReactNode => {
<
li
>
<
Link
>
新增 作业上下线自动提交和停止任务
</
Link
>
</
li
>
<
li
>
<
Link
>
修复 用户未登录时后台报错及鉴权问题
</
Link
>
</
li
>
</
ul
>
</
Paragraph
>
</
Timeline
.
Item
>
...
...
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