From 1edcf19be5f339219210894c45a77d9d507b2586 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期三, 22 三月 2023 18:19:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- driver/guns-admin/src/main/java/com/supersavedriving/driver/core/intercept/RestApiInteceptor.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/intercept/RestApiInteceptor.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/intercept/RestApiInteceptor.java index 29198c4..cad2ec8 100644 --- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/intercept/RestApiInteceptor.java +++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/intercept/RestApiInteceptor.java @@ -5,6 +5,7 @@ import com.supersavedriving.driver.core.util.JwtTokenUtil; import com.supersavedriving.driver.core.base.tips.ErrorTip; import com.supersavedriving.driver.core.util.RenderUtil; +import com.supersavedriving.driver.modular.system.warpper.ResponseWarpper; import io.jsonwebtoken.JwtException; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; @@ -48,12 +49,14 @@ } } catch (JwtException e) { //有异常就是token解析失败 - RenderUtil.renderJson(response, new ErrorTip(BizExceptionEnum.TOKEN_ERROR.getCode(), BizExceptionEnum.TOKEN_ERROR.getMessage())); +// RenderUtil.renderJson(response, new ErrorTip(BizExceptionEnum.TOKEN_ERROR.getCode(), BizExceptionEnum.TOKEN_ERROR.getMessage())); + RenderUtil.renderJson(response, ResponseWarpper.tokenErr()); return false; } } else { //header没有带Bearer字段 - RenderUtil.renderJson(response, new ErrorTip(BizExceptionEnum.TOKEN_ERROR.getCode(), BizExceptionEnum.TOKEN_ERROR.getMessage())); +// RenderUtil.renderJson(response, new ErrorTip(BizExceptionEnum.TOKEN_ERROR.getCode(), BizExceptionEnum.TOKEN_ERROR.getMessage())); + RenderUtil.renderJson(response, ResponseWarpper.tokenErr()); return false; } return true; -- Gitblit v1.7.1