修复导出子列表对象只能在最后的问题

RuoYi

2024-12-02 8faea601919e885068dc955aab73fd6794d6aa27

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java

@@ -3,9 +3,10 @@
import java.util.Map;

import javax.servlet.http.HttpServletRequest;

import org.springframework.stereotype.Component;

import com.ruoyi.common.core.constant.CacheConstants;

import com.ruoyi.common.core.constant.SecurityConstants;

import com.ruoyi.common.core.utils.ServletUtils;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.core.utils.ip.IpUtils;

import feign.RequestInterceptor;

import feign.RequestTemplate;



@@ -25,16 +26,29 @@
        {

            Map<String, String> headers = ServletUtils.getHeaders(httpServletRequest);

            // 传递用户信息请求头，防止丢失

            String userId = headers.get(CacheConstants.DETAILS_USER_ID);

            String userId = headers.get(SecurityConstants.DETAILS_USER_ID);

            if (StringUtils.isNotEmpty(userId))

            {

                requestTemplate.header(CacheConstants.DETAILS_USER_ID, userId);

                requestTemplate.header(SecurityConstants.DETAILS_USER_ID, userId);

            }

            String userName = headers.get(CacheConstants.DETAILS_USERNAME);

            String userKey = headers.get(SecurityConstants.USER_KEY);

            if (StringUtils.isNotEmpty(userKey))

            {

                requestTemplate.header(SecurityConstants.USER_KEY, userKey);

            }

            String userName = headers.get(SecurityConstants.DETAILS_USERNAME);

            if (StringUtils.isNotEmpty(userName))

            {

                requestTemplate.header(CacheConstants.DETAILS_USERNAME, userName);

                requestTemplate.header(SecurityConstants.DETAILS_USERNAME, userName);

            }

            String authentication = headers.get(SecurityConstants.AUTHORIZATION_HEADER);

            if (StringUtils.isNotEmpty(authentication))

            {

                requestTemplate.header(SecurityConstants.AUTHORIZATION_HEADER, authentication);

            }



            // 配置客户端IP

            requestTemplate.header("X-Forwarded-For", IpUtils.getIpAddr());

        }

    }

}