优化代码

service-api/src/main/java/com/java110/api/aop/PageProcessAspect.java

@@ -132,7 +132,9 @@ public class PageProcessAspect {
             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));
@@ -216,15 +218,23 @@ public class PageProcessAspect {
      * @throws IOException
      */
     private void writeCookieInfo(IPageData pd, ServletRequestAttributes attributes) throws IOException {
-        // 这里目前只写到组件级别，如果需要 写成方法级别
-        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.flushBuffer();
+        // 这里目前只写到组件级别，如果需要 写成方法级别 && "login".equals(pd.getComponentCode())
+        //todo 未包含token 不做处理
+        if (StringUtil.isNullOrNone(pd.getToken())) {
+            return;
         }
+        HttpServletResponse response = attributes.getResponse();
+
+        //讲token写入到cookies 中
+        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();
+
 
     }
 }