From a292db3a05a0f17b262e6f322184626e0503298e Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 08 十月 2022 16:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java | 39 +++++++++++++--------------------------
1 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
index 101050c..65a692f 100644
--- a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
+++ b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
@@ -52,21 +52,6 @@
if(StringUtils.isEmpty(token))
{
-// if(StringUtils.isEmpty(HCtoken))
-// {
-// String reponse = "{\"result\": 448, \"message\": \"token not is null \"}";
-// response.setStatus(200);
-// response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
-// ResponseFacade facade = (ResponseFacade) response;
-// facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length);
-// facade.getWriter().write(reponse);
-// return false;
-// }
-// else
-// {
-//
-// }
-
//花城e+ token
if (manager.checkHCToken(HCtoken)) {
//如果token验证成功，权限检查通过，将token对应的用户id存在request中，便于之后注入
@@ -86,18 +71,20 @@
}
}
-
- //如果验证token失败，并且方法或类注明了Authorization，返回401错误
- if (method.getAnnotation(Authorization.class) != null ||
- bean.getClass().getAnnotation(Authorization.class) != null)
+ if(!StringUtils.isEmpty(token))
{
- String reponse = "{\"result\": 449, \"message\": \"Overdue token\"}";
- response.setStatus(200);
- response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
- ResponseFacade facade = (ResponseFacade) response;
- facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length);
- facade.getWriter().write(reponse);
- return false;
+ //如果验证token失败，并且方法或类注明了Authorization，返回401错误
+ if (method.getAnnotation(Authorization.class) != null ||
+ bean.getClass().getAnnotation(Authorization.class) != null)
+ {
+ String reponse = "{\"result\": 449, \"message\": \"Overdue token\"}";
+ response.setStatus(200);
+ response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
+ ResponseFacade facade = (ResponseFacade) response;
+ facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length);
+ facade.getWriter().write(reponse);
+ return false;
+ }
}
return true;
}
--
Gitblit v1.7.1