Commit 1b21aa6f authored by wenmo's avatar wenmo

修复用户未登录时后台报错及鉴权问题

parent 619cfa49
...@@ -42,6 +42,10 @@ public class Result<T> implements Serializable { ...@@ -42,6 +42,10 @@ public class Result<T> implements Serializable {
return of(null, CodeEnum.ERROR.getCode(), msg); 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) { public static <T> Result<T> failed(T model, String msg) {
return of(model, CodeEnum.ERROR.getCode(), msg); return of(model, CodeEnum.ERROR.getCode(), msg);
} }
......
...@@ -18,7 +18,7 @@ public class SaTokenConfigure implements WebMvcConfigurer { ...@@ -18,7 +18,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
public void addInterceptors(InterceptorRegistry registry) { public void addInterceptors(InterceptorRegistry registry) {
// 注册Sa-Token的路由拦截器 // 注册Sa-Token的路由拦截器
registry.addInterceptor(new SaRouteInterceptor()) registry.addInterceptor(new SaRouteInterceptor())
.addPathPatterns("/api/*") .addPathPatterns("/api/**")
.excludePathPatterns("/api/login") .excludePathPatterns("/api/login")
.excludePathPatterns("/openapi/**"); .excludePathPatterns("/openapi/**");
} }
......
package com.dlink.exception; package com.dlink.exception;
import cn.dev33.satoken.exception.NotLoginException;
import com.dlink.common.result.Result; import com.dlink.common.result.Result;
import com.dlink.model.CodeEnum;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody; 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 * WebExceptionHandler
...@@ -24,6 +30,14 @@ public class WebExceptionHandler { ...@@ -24,6 +30,14 @@ public class WebExceptionHandler {
return Result.failed(e.getMessage()); 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 @ExceptionHandler
public Result unknownException(Exception e) { public Result unknownException(Exception e) {
logger.error("ERROR:",e); logger.error("ERROR:",e);
......
...@@ -8,7 +8,8 @@ package com.dlink.model; ...@@ -8,7 +8,8 @@ package com.dlink.model;
*/ */
public enum CodeEnum { public enum CodeEnum {
SUCCESS(0), SUCCESS(0),
ERROR(1); ERROR(1),
NOTLOGIN(401);
private Integer code; private Integer code;
CodeEnum(Integer code){ CodeEnum(Integer code){
......
...@@ -740,6 +740,9 @@ export default (): React.ReactNode => { ...@@ -740,6 +740,9 @@ export default (): React.ReactNode => {
<li> <li>
<Link>新增 作业上下线自动提交和停止任务</Link> <Link>新增 作业上下线自动提交和停止任务</Link>
</li> </li>
<li>
<Link>修复 用户未登录时后台报错及鉴权问题</Link>
</li>
</ul> </ul>
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment