From 669da79f9e99ee0025f5280285591b10a4f0f002 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 09 五月 2023 15:00:37 +0800
Subject: [PATCH] optimize
---
springboot/src/main/java/com/java110/boot/aop/PageProcessAspect.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/aop/PageProcessAspect.java b/springboot/src/main/java/com/java110/boot/aop/PageProcessAspect.java
index eb16fb9..ba12a2c 100644
--- a/springboot/src/main/java/com/java110/boot/aop/PageProcessAspect.java
+++ b/springboot/src/main/java/com/java110/boot/aop/PageProcessAspect.java
@@ -192,18 +192,17 @@
*/
private String getToken(HttpServletRequest request) throws FilterException {
String token = "";
- if (request.getCookies() == null || request.getCookies().length == 0) {
- return token;
- }
- for (Cookie cookie : request.getCookies()) {
- if (CommonConstant.COOKIE_AUTH_TOKEN.equals(cookie.getName())) {
- token = cookie.getValue();
+ if (request.getCookies() != null && request.getCookies().length > 0) {
+ for (Cookie cookie : request.getCookies()) {
+ if (CommonConstant.COOKIE_AUTH_TOKEN.equals(cookie.getName())) {
+ token = cookie.getValue();
+ }
}
}
String authorization = request.getHeader("Authorization");
- if(StringUtil.isEmpty(token) && !StringUtil.isEmpty(authorization)){
- token = token.substring("Bearer ".length());
+ if (StringUtil.isEmpty(token) && !StringUtil.isEmpty(authorization)) {
+ token = authorization.substring("Bearer ".length());
}
return token;
}
@@ -217,13 +216,16 @@
* @throws IOException
*/
private void writeCookieInfo(IPageData pd, ServletRequestAttributes attributes) throws IOException {
- // 杩欓噷鐩墠鍙啓鍒扮粍浠剁骇鍒紝濡傛灉闇�瑕� 鍐欐垚鏂规硶绾у埆
- if (!StringUtil.isNullOrNone(pd.getToken()) && "login".equals(pd.getComponentCode())) {
+ // 杩欓噷鐩墠鍙啓鍒扮粍浠剁骇鍒紝濡傛灉闇�瑕� 鍐欐垚鏂规硶绾у埆 && "login".equals(pd.getComponentCode())
+ if (!StringUtil.isNullOrNone(pd.getToken()) ) {
HttpServletResponse response = attributes.getResponse();
Cookie cookie = new Cookie(CommonConstant.COOKIE_AUTH_TOKEN, pd.getToken());
cookie.setHttpOnly(true);
cookie.setPath("/");
+
response.addCookie(cookie);
+ //response.addHeader("Set-Cookie","SameSite=None");
+
response.flushBuffer();
}
--
Gitblit v1.8.0