diff --git a/src/main/java/com/epmet/jmreport/config/JimuReportTokenService.java b/src/main/java/com/epmet/jmreport/config/JimuReportTokenService.java index 1deee95..5eb9c78 100644 --- a/src/main/java/com/epmet/jmreport/config/JimuReportTokenService.java +++ b/src/main/java/com/epmet/jmreport/config/JimuReportTokenService.java @@ -1,6 +1,7 @@ package com.epmet.jmreport.config; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.jeecg.modules.jmreport.api.JmReportTokenServiceI; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -34,7 +35,12 @@ public class JimuReportTokenService implements JmReportTokenServiceI { public String getToken(HttpServletRequest request) { //System.out.println("---------call---------getToken-----------------------"); //return TokenUtils.getTokenByRequest(request); + + // 有2种调用来源:token:是从jmreport前端发的请求,authorization:从epmet-cloud发的请求,所以需要取2个 String authorizationToken = request.getHeader("token"); + if (StringUtils.isBlank(authorizationToken)) { + authorizationToken = request.getHeader("authorization"); + } return authorizationToken; }