Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java

@@ -1,23 +1,23 @@
 package com.ym.mec.auth.api.client;
 
-import com.ym.mec.auth.api.entity.SysUser;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
 
+import com.ym.mec.auth.api.client.fallback.SysUserFeignServiceFallback;
 import com.ym.mec.auth.api.dto.SysUserInfo;
-import org.springframework.web.bind.annotation.RequestParam;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.common.config.FeignConfiguration;
 
-@FeignClient(name = "auth-server")
+@FeignClient(name = "auth-server", configuration = FeignConfiguration.class, fallback = SysUserFeignServiceFallback.class)
 public interface SysUserFeignService {
 
 	@GetMapping(value = "query/{username}")
-	public SysUserInfo getUser(@PathVariable("username") String username, @RequestHeader("from") String from);
+	public SysUserInfo getUser(@PathVariable("username") String username);
 
 	@GetMapping(value = "task/test")
 	public Object test();
 
 	@GetMapping(value = "queryUserInfo")
-	SysUser queryUserInfo(@RequestHeader("Authorization") String access_token);
+	SysUser queryUserInfo();
 }

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -0,0 +1,27 @@
+package com.ym.mec.auth.api.client.fallback;
+
+import org.springframework.stereotype.Component;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.dto.SysUserInfo;
+import com.ym.mec.auth.api.entity.SysUser;
+
+@Component
+public class SysUserFeignServiceFallback implements SysUserFeignService {
+
+	@Override
+	public SysUserInfo getUser(String username) {
+		return new SysUserInfo();
+	}
+
+	@Override
+	public Object test() {
+		return "服务正在拍";
+	}
+
+	@Override
+	public SysUser queryUserInfo() {
+		return new SysUser();
+	}
+
+}

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -60,7 +60,7 @@ public class SysUser {
 
 	private String nation;
 
-	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date birthdate;
 
 	private String email;

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

@@ -0,0 +1,32 @@
+package com.ym.mec.common.config;
+
+import java.util.Enumeration;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+@Configuration
+public class FeignConfiguration implements RequestInterceptor {
+
+	@Override
+	public void apply(RequestTemplate template) {
+		ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+		HttpServletRequest request = attributes.getRequest();
+		Enumeration<String> headerNames = request.getHeaderNames();
+		if (headerNames != null) {
+			while (headerNames.hasMoreElements()) {
+				String name = headerNames.nextElement();
+				String values = request.getHeader(name);
+				template.header(name, values);
+
+			}
+		}
+	}
+
+}

mec-gateway/mec-gateway-web/src/main/java/com/ym/mec/gateway/web/filter/AuthFilter.java

@@ -1,7 +1,5 @@
 package com.ym.mec.gateway.web.filter;
 
-import java.util.Enumeration;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.stereotype.Component;
@@ -18,13 +16,6 @@ public class AuthFilter extends ZuulFilter {
 		RequestContext requestContext = RequestContext.getCurrentContext();
 		HttpServletRequest request = requestContext.getRequest();
 
-		Enumeration<String> headerNames = request.getHeaderNames();
-		while (headerNames.hasMoreElements()) {
-			String key = headerNames.nextElement();
-			String value = request.getHeader(key);
-			// 将头信息传递下去
-			requestContext.addZuulRequestHeader(key, value);
-		}
 
 		return null;
 	}

mec-gateway/mec-gateway-web/src/main/resources/application.yml

@@ -51,6 +51,7 @@ zuul:
   ReadTimeout: 6000
   #连接超时
   ConnectTimeout: 1000
+  sensitiveHeaders: 
   
 hystrix: 
   command: 

mec-web/pom.xml

@@ -51,6 +51,11 @@
 			<groupId>com.ym</groupId>
 			<artifactId>common-core</artifactId>
 		</dependency>
+		
+		<dependency>
+			<groupId>com.ym</groupId>
+			<artifactId>mec-auth-api</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

mec-web/src/main/java/com/ym/mec/web/WebApplication.java

@@ -15,7 +15,7 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 
 @SpringBootApplication
 @EnableDiscoveryClient
-@EnableFeignClients
+@EnableFeignClients("com.ym.mec")
 @MapperScan("com.ym.mec.web.dal.dao")
 @ComponentScan(basePackages = "com.ym.mec")
 @Configuration