From add1ce423a59479da1ed48164a226124071b13ce Mon Sep 17 00:00:00 2001 From: lepdou Date: Fri, 30 Sep 2022 17:46:19 +0800 Subject: [PATCH] fix feign report call result error when using feign direct call (#623) --- CHANGELOG.md | 3 ++- .../rpc/enhancement/feign/plugin/reporter/ReporterUtils.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2d4d71a..d7b2672c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,4 +4,5 @@ - [Optimize: remove discovery module useless code](https://github.com/Tencent/spring-cloud-tencent/pull/597) - [Fix issue 579:Report the labels in request when report the result of invocation by RestTemplate](https://github.com/Tencent/spring-cloud-tencent/pull/600) - [Optimize: optimize configuration conditional & optimize config data tips"](https://github.com/Tencent/spring-cloud-tencent/pull/605) -- [Optimize: Maybe remove Chinese characters](https://github.com/Tencent/spring-cloud-tencent/pull/609) \ No newline at end of file +- [Optimize: Maybe remove Chinese characters](https://github.com/Tencent/spring-cloud-tencent/pull/609) +- [Bugfix: fix feign report call result error when using feign direct call](https://github.com/Tencent/spring-cloud-tencent/pull/623) diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ReporterUtils.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ReporterUtils.java index fe1738fa..c87236f8 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ReporterUtils.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ReporterUtils.java @@ -75,7 +75,8 @@ public final class ReporterUtils { resultRequest.setCallerService(new ServiceKey(sourceNamespace, sourceService)); } resultRequest.setHost(uri.getHost()); - resultRequest.setPort(uri.getPort()); + // -1 means access directly by url, and use http default port number 80 + resultRequest.setPort(uri.getPort() == -1 ? 80 : uri.getPort()); return resultRequest; }