From 195af63ae984ba0766b56d31d309b0da0381b19b Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 28 六月 2023 01:48:20 +0800
Subject: [PATCH] 优化商户
---
springboot/src/main/java/com/java110/boot/aop/PageProcessAspect.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 ba12a2c..88552e9 100644
--- a/springboot/src/main/java/com/java110/boot/aop/PageProcessAspect.java
+++ b/springboot/src/main/java/com/java110/boot/aop/PageProcessAspect.java
@@ -132,7 +132,9 @@
String headerName = (String) reqHeaderEnum.nextElement();
headers.put(headerName.toLowerCase(), request.getHeader(headerName));
}
- pd = PageData.newInstance().builder(userId, userName, this.getToken(request), reqData, componentCode, componentMethod, url, sessionId, appId, headers);
+ //pd = PageData.newInstance().builder(userId, userName, this.getToken(request), reqData, componentCode, componentMethod, url, sessionId, appId, headers);
+ headers.put("_java110_token",this.getToken(request));
+ pd = PageData.newInstance().builder(userId, userName, "", reqData, componentCode, componentMethod, url, sessionId, appId, headers);
pd.setMethod(request.getMethod().equals("GET") ? HttpMethod.GET : HttpMethod.POST);
logger.debug("鍒囬潰 鑾峰彇鍒扮殑pd=" + JSONObject.toJSONString(pd));
@@ -217,17 +219,22 @@
*/
private void writeCookieInfo(IPageData pd, ServletRequestAttributes attributes) throws IOException {
// 杩欓噷鐩墠鍙啓鍒扮粍浠剁骇鍒紝濡傛灉闇�瑕� 鍐欐垚鏂规硶绾у埆 && "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();
+ //todo 鏈寘鍚玹oken 涓嶅仛澶勭悊
+ if (StringUtil.isNullOrNone(pd.getToken())) {
+ return;
}
+ HttpServletResponse response = attributes.getResponse();
+
+ //璁瞭oken鍐欏叆鍒癱ookies 涓�
+ 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