Merge remote-tracking branch 'origin/zx_1115_courseware' into zx_1115_courseware

mec-common/common-core/src/main/java/com/ym/mec/common/config/RequestHeaderConfiguration.java

@@ -9,6 +9,9 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 
+import java.util.Collection;
+import java.util.Map;
+
 public class RequestHeaderConfiguration implements RequestInterceptor {
 
 	@Override
@@ -21,7 +24,9 @@ public class RequestHeaderConfiguration implements RequestInterceptor {
 		
 		String authorization = request.getHeader("Authorization");
 
-		if (StringUtils.isNotBlank(authorization)) {
+		// open-feign请求头已包含Authorization，不再添加
+		Map<String, Collection<String>> headers = template.headers();
+		if (StringUtils.isNotBlank(authorization) && !headers.containsKey("Authorization")) {
 			template.header("Authorization", authorization);
 		}