fix:fix feign report -1 port bug.

1.11.9-Hoxton.SR12
Haotian Zhang 2 years ago
parent 51504c2a44
commit 264b654837

@ -89,7 +89,7 @@
<properties> <properties>
<!-- Project revision --> <!-- Project revision -->
<revision>1.11.8-Hoxton.SR12</revision> <revision>1.11.9-Hoxton.SR12</revision>
<!-- Spring Framework --> <!-- Spring Framework -->
<spring.framework.version>5.2.22.RELEASE</spring.framework.version> <spring.framework.version>5.2.22.RELEASE</spring.framework.version>

@ -47,7 +47,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
@ExtendWith(SpringExtension.class) @ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = DEFINED_PORT, @SpringBootTest(webEnvironment = DEFINED_PORT,
classes = EncodeTransferMedataFeignInterceptorTest.TestApplication.class, classes = EncodeTransferMedataFeignInterceptorTest.TestApplication.class,
properties = {"server.port=8081", properties = {"server.port=18081",
"spring.config.location = classpath:application-test.yml", "spring.config.location = classpath:application-test.yml",
"spring.main.web-application-type = servlet", "spring.main.web-application-type = servlet",
"spring.cloud.gateway.enabled = false"}) "spring.cloud.gateway.enabled = false"})
@ -77,7 +77,7 @@ public class EncodeTransferMedataFeignInterceptorTest {
return MetadataContextHolder.get().getContext(MetadataContext.FRAGMENT_TRANSITIVE, "b"); return MetadataContextHolder.get().getContext(MetadataContext.FRAGMENT_TRANSITIVE, "b");
} }
@FeignClient(name = "test-feign", url = "http://localhost:8081") @FeignClient(name = "test-feign", url = "http://localhost:18081")
public interface TestFeign { public interface TestFeign {
@RequestMapping("/test") @RequestMapping("/test")

@ -70,7 +70,7 @@
</developers> </developers>
<properties> <properties>
<revision>1.11.8-Hoxton.SR12</revision> <revision>1.11.9-Hoxton.SR12</revision>
<!-- Dependencies --> <!-- Dependencies -->
<polaris.version>1.12.11</polaris.version> <polaris.version>1.12.11</polaris.version>

@ -89,6 +89,8 @@ public class EnhancedFeignClient implements Client {
DefaultServiceInstance serviceInstance = new DefaultServiceInstance(request.requestTemplate().feignTarget() DefaultServiceInstance serviceInstance = new DefaultServiceInstance(request.requestTemplate().feignTarget()
.name(), url.getHost(), url.getPort(), url.getScheme().equals("https")); .name(), url.getHost(), url.getPort(), url.getScheme().equals("https"));
// -1 means access directly by url, and use http default port number 80
serviceInstance.setPort(serviceInstance.getPort() == -1 ? 80 : serviceInstance.getPort());
enhancedPluginContext.setServiceInstance(serviceInstance); enhancedPluginContext.setServiceInstance(serviceInstance);
// Run post enhanced plugins. // Run post enhanced plugins.

Loading…
Cancel
Save