From ab6a423cf604b83f06b5768dbc162ece744a32d9 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期五, 20 八月 2021 00:34:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-front/src/main/java/com/java110/front/aop/PageProcessAspect.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/service-front/src/main/java/com/java110/front/aop/PageProcessAspect.java b/service-front/src/main/java/com/java110/front/aop/PageProcessAspect.java
old mode 100644
new mode 100755
index 02cf82e..5d0626d
--- a/service-front/src/main/java/com/java110/front/aop/PageProcessAspect.java
+++ b/service-front/src/main/java/com/java110/front/aop/PageProcessAspect.java
@@ -31,6 +31,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -91,7 +93,7 @@
                     if (params.get(key).length > 0) {
                         String value = "";
                         for (int paramIndex = 0; paramIndex < params.get(key).length; paramIndex++) {
-                            value = params.get(key)[paramIndex] + ",";
+                            value += (params.get(key)[paramIndex] + ",");
                         }
                         value = value.endsWith(",") ? value.substring(0, value.length() - 1) : value;
                         paramObj.put(key, value);
@@ -131,7 +133,13 @@
                 componentCode = urls[4];
             }
         }
-        pd = PageData.newInstance().builder(userId, userName, this.getToken(request), reqData, componentCode, componentMethod, url, sessionId, appId);
+        Map<String, Object> headers = new HashMap<>();
+        Enumeration reqHeaderEnum = request.getHeaderNames();
+        while (reqHeaderEnum.hasMoreElements()) {
+            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.setMethod(request.getMethod().equals("GET") ? HttpMethod.GET : HttpMethod.POST);
         request.setAttribute(CommonConstant.CONTEXT_PAGE_DATA, pd);
     }

--
Gitblit v1.8.0