From ed7dd8ceb0df57462655f9ec68fcc4f5bd53fdf2 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 15 五月 2024 16:10:15 +0800
Subject: [PATCH] 优化代码

---
 springboot/src/main/java/com/java110/boot/aop/PageProcessAspect.java |   29 +++++++++++++++++++----------
 1 files changed, 19 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 a1950da..70b4ccf 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(CommonConstant.COOKIE_AUTH_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));
@@ -203,7 +205,6 @@
 
         if (StringUtil.isEmpty(token) && !StringUtil.isEmpty(authorization)) {
             token = authorization.substring("Bearer ".length());
-            System.out.printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>token="+token);
         }
         return token;
     }
@@ -217,15 +218,23 @@
      * @throws IOException
      */
     private void writeCookieInfo(IPageData pd, ServletRequestAttributes attributes) throws IOException {
-        // 杩欓噷鐩墠鍙啓鍒扮粍浠剁骇鍒紝濡傛灉闇�瑕� 鍐欐垚鏂规硶绾у埆
-        if (!StringUtil.isNullOrNone(pd.getToken()) && "login".equals(pd.getComponentCode())) {
-            HttpServletResponse response = attributes.getResponse();
-            Cookie cookie = new Cookie(CommonConstant.COOKIE_AUTH_TOKEN, pd.getToken());
-            cookie.setHttpOnly(true);
-            cookie.setPath("/");
-            response.addCookie(cookie);
-            response.flushBuffer();
+        // 杩欓噷鐩墠鍙啓鍒扮粍浠剁骇鍒紝濡傛灉闇�瑕� 鍐欐垚鏂规硶绾у埆 && "login".equals(pd.getComponentCode())
+        //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