Merge branch 'dev' into test

src/main/java/com/epmet/jmreport/config/JimuReportTokenService.java

@@ -7,6 +7,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -37,6 +40,7 @@ public class JimuReportTokenService implements JmReportTokenServiceI {
         //return TokenUtils.getTokenByRequest(request);
 
         // 有2种调用来源：token:是从jmreport前端发的请求，authorization:从epmet-cloud发的请求,所以需要取2个
+        //System.out.println(request.getHeader("Transaction-Serial"));
         String authorizationToken = request.getHeader("token");
         if (StringUtils.isBlank(authorizationToken)) {
             authorizationToken = request.getHeader("authorization");
@@ -99,9 +103,13 @@ public class JimuReportTokenService implements JmReportTokenServiceI {
      */
     @Override
     public HttpHeaders customApiHeader() {
+        // 获取事务号
+        ServletRequestAttributes ra = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        String tranSerial = ra.getRequest().getHeader("Transaction-Serial");
+
         HttpHeaders header = new HttpHeaders();
         header.add("Authorization", getToken());
-        //header.add("Authorization", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJhcHAiOiJnb3YiLCJjbGllbnQiOiJ3ZWIiLCJleHAiOjE2NjAxODExNzcsInVzZXJJZCI6IjczYWU2MjgwZTQ2YTY2NTNhNTYwNWQ1MWQ1NDYyNzI1IiwiaWF0IjoxNjU5NTc2Mzc3fQ.XX5dAzKoUrNcSgfEEBIO7EjZdd5ooP7nK2lYgphy1J5RrgR_DOilxUmASOJ99y93uAJluW66J6YyqaLtJ7vEmQ");
+        header.add("Transaction-Serial", tranSerial);
         return header;
     }
 }