Merge remote-tracking branch 'origin/dev' into dev_import

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java

@@ -10,14 +10,9 @@ package com.epmet.commons.tools.feign;
 
 import feign.Logger;
 import feign.RequestInterceptor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.filter.RequestContextFilter;
-import org.springframework.web.servlet.DispatcherServlet;
-
-import javax.annotation.PostConstruct;
 
 
 /**
@@ -29,10 +24,6 @@ import javax.annotation.PostConstruct;
  */
 @Configuration
 public class FeignConfig {
-    @Autowired
-    RequestContextFilter requestContextFilter;
-    @Autowired
-    DispatcherServlet dispatcherServlet;
 
     @Bean
     @ConditionalOnMissingBean
@@ -46,10 +37,5 @@ public class FeignConfig {
         return Logger.Level.BASIC;//控制台会输出debug日志
     }
 
-    @PostConstruct
+
-    public void init() {
-        // 设置线程继承属性为true，便于子线程获取到父线程的request,两个都设置为了保险。
-        requestContextFilter.setThreadContextInheritable(true);
-        dispatcherServlet.setThreadContextInheritable(true);
-    }
 }