Merge remote-tracking branch 'origin/feature-migration-20230628' into feature-migration-20230628

src/main/java/cn/quantgroup/xyqb/event/UserTagLoginEventListener.java

@@ -40,6 +40,7 @@ public class UserTagLoginEventListener implements ApplicationListener<UserLoginE
      */
     @Override
     public void onApplicationEvent(UserLoginEvent userLoginEvent) {
+        log.info("UserTagLoginEventListener接收监听事件：{}",JSONObject.toJSONString(userLoginEvent));
         if (userLoginEvent.getUserTag() != null) {
             UserTag userTag = userLoginEvent.getUserTag();
             UserTag preTag = userTagRepository.findByUserIdAndTenantIdAndRegisteredFrom(userTag.getUserId(), userTag.getTenantId(), userTag.getRegisteredFrom());

src/main/java/cn/quantgroup/xyqb/filter/RequestFilter.java

@@ -48,12 +48,14 @@ public class RequestFilter implements Filter {
 
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        HttpServletRequest requestOrinal = (HttpServletRequest) servletRequest;
         HttpServletResponse response = (HttpServletResponse) servletResponse;
-        printReqLog(request);
+
+        CustomHeaderRequestWrapper requestWrapper = new CustomHeaderRequestWrapper(requestOrinal);
+        printReqLog(requestWrapper);
 
         // 带状态接口
-        if (isMatch(request)) {
+        if (isMatch(requestWrapper)) {
             // 需获取session信息
             SessionStruct sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis();
             if (Objects.isNull(sessionStruct)) {
@@ -73,7 +75,7 @@ public class RequestFilter implements Filter {
                 }
             }
         }
-        filterChain.doFilter(request, response);
+        filterChain.doFilter(requestWrapper, response);
     }
 
     /**
@@ -105,7 +107,7 @@ public class RequestFilter implements Filter {
 
     }
 
-    private void printReqLog(HttpServletRequest request) {
+    private void printReqLog(CustomHeaderRequestWrapper request) {
         try {
             Map<String, String> headerMap = processHeader(request);
             String url = request.getRequestURL().toString();