fix feign name bug

pull/917/head
seanyu 3 years ago
parent 7279fef1f2
commit c100c61af8

@ -74,7 +74,7 @@ public class PolarisFeignCircuitBreakerInvocationHandler implements InvocationHa
return toString();
}
String circuitName = circuitBreakerNameResolver.resolveCircuitBreakerName(feignClientName, target, method);
String circuitName = circuitBreakerNameResolver.resolveCircuitBreakerName(target.name(), target, method);
CircuitBreaker circuitBreaker = factory.create(circuitName);
Supplier<Object> supplier = asSupplier(method, args);
Function<Throwable, Object> fallbackFunction;

@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.GetMapping;
*
* @author sean yu
*/
@FeignClient(name = "polaris-circuitbreaker-callee-service", contextId = "use-polaris-fallback")
@FeignClient(name = "polaris-circuitbreaker-callee-service", contextId = "fallback-from-polaris")
public interface ProviderB {
/**

@ -3,7 +3,7 @@ package com.tencent.cloud.polaris.circuitbreaker.feign.example;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
@FeignClient(name = "polaris-circuitbreaker-callee-service", contextId = "use-code-fallback", fallback = ProviderBFallback.class)
@FeignClient(name = "polaris-circuitbreaker-callee-service", contextId = "fallback-from-code", fallback = ProviderBFallback.class)
public interface ProviderBWithFallback {
/**

@ -42,8 +42,8 @@ public class ServiceAController {
* Get info of Service B by Feign.
* @return info of Service B
*/
@GetMapping("/getBServiceInfo/fallbackFromLocalCode")
public String getBServiceInfoFallbackFromLocalCode() {
@GetMapping("/getBServiceInfo/fallbackFromCode")
public String getBServiceInfoFallbackFromCode() {
return providerBWithFallback.info();
}

@ -41,12 +41,12 @@ public class ServiceAController {
private RestTemplate defaultRestTemplate;
@Autowired
@Qualifier("fallbackRestTemplate")
private RestTemplate fallbackRestTemplate;
@Qualifier("restTemplateFallbackFromPolaris")
private RestTemplate restTemplateFallbackFromPolaris;
@Autowired
@Qualifier("fallbackClassRestTemplate")
private RestTemplate fallbackClassRestTemplate;
@Qualifier("restTemplateFallbackFromCode")
private RestTemplate restTemplateFallbackFromCode;
@Autowired
private CircuitBreakerFactory circuitBreakerFactory;
@ -61,14 +61,14 @@ public class ServiceAController {
);
}
@GetMapping("/getBServiceInfo/fallback")
@GetMapping("/getBServiceInfo/fallbackFromPolaris")
public ResponseEntity<String> getBServiceInfoFallback() {
return fallbackRestTemplate.getForEntity("/example/service/b/info", String.class);
return restTemplateFallbackFromPolaris.getForEntity("/example/service/b/info", String.class);
}
@GetMapping("/getBServiceInfo/fallbackClass")
@GetMapping("/getBServiceInfo/fallbackFromCode")
public ResponseEntity<String> getBServiceInfoFallbackClass() {
return fallbackClassRestTemplate.getForEntity("/example/service/b/info", String.class);
return restTemplateFallbackFromCode.getForEntity("/example/service/b/info", String.class);
}
}

@ -56,7 +56,7 @@ public class ServiceAResTemplate {
@Bean
@LoadBalanced
@PolarisCircuitBreakerRestTemplate
public RestTemplate fallbackRestTemplate() {
public RestTemplate restTemplateFallbackFromPolaris() {
DefaultUriBuilderFactory uriBuilderFactory = new DefaultUriBuilderFactory("http://polaris-circuitbreaker-callee-service");
RestTemplate restTemplate = new RestTemplate();
restTemplate.setUriTemplateHandler(uriBuilderFactory);
@ -66,7 +66,7 @@ public class ServiceAResTemplate {
@Bean
@LoadBalanced
@PolarisCircuitBreakerRestTemplate(fallbackClass = CustomPolarisCircuitBreakerFallback.class)
public RestTemplate fallbackClassRestTemplate() {
public RestTemplate restTemplateFallbackFromCode() {
DefaultUriBuilderFactory uriBuilderFactory = new DefaultUriBuilderFactory("http://polaris-circuitbreaker-callee-service");
RestTemplate restTemplate = new RestTemplate();
restTemplate.setUriTemplateHandler(uriBuilderFactory);

Loading…
Cancel
Save