From 7c5a2122ef05ca8d22eeaeb84b5103045f99138c Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 21 Sep 2020 21:59:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95feign=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/commons/tools/feign/FeignConfig.java   | 8 ++++++++
 .../impl/DataStatisticalOpenFeignClientFallBack.java      | 4 ++--
 .../src/main/resources/logback-spring.xml                 | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java
index 0e99c52316..f7ae3265d0 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java
@@ -8,8 +8,10 @@
 
 package com.epmet.commons.tools.feign;
 
+import feign.Logger;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -18,6 +20,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Enumeration;
 
+
 /**
  * Feign调用，携带header
  *
@@ -47,4 +50,9 @@ public class FeignConfig implements RequestInterceptor {
         }
 
     }
+
+    @Bean
+    Logger.Level feignLoggerLevel() {
+        return Logger.Level.FULL;//控制台会输出debug日志
+    }
 }
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
index 1e01131a0f..cec2bb3195 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
@@ -193,7 +193,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      */
     @Override
     public Result factOriginExtractAll(ExtractFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "extractAll", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "factOriginExtractAll", formDTO);
     }
 
     /**
@@ -205,6 +205,6 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      */
     @Override
     public Result indexOriginExtractAll(ExtractIndexFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "extractAll", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "indexOriginExtractAll", formDTO);
     }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
index 99ae63af58..66681a1fe8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
@@ -143,6 +143,7 @@
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="DEBUG"/>
+        <logger name="com.epmet.feign" level="INFO"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>