diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index bffc5b3c7..87c1f3b5d 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -73,7 +73,7 @@ 1.11.0-2021.0.6-SNAPSHOT - 1.11.6 + 1.12.0-SNAPSHOT 31.0.1-jre 1.2.11 4.5.1 diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/AbstractPolarisReporterAdapter.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/AbstractPolarisReporterAdapter.java index 4c3b842c1..fad78250c 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/AbstractPolarisReporterAdapter.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/AbstractPolarisReporterAdapter.java @@ -119,7 +119,6 @@ public abstract class AbstractPolarisReporterAdapter { resultRequest.setMethod(uri.getPath()); resultRequest.setRetCode(statusCode == null ? -1 : statusCode); resultRequest.setDelay(delay); - resultRequest.setProtocol(getProtocol(uri)); resultRequest.setCallerService(new ServiceKey(MetadataContext.LOCAL_NAMESPACE, MetadataContext.LOCAL_SERVICE)); resultRequest.setCallerIp(this.context.getConfig().getGlobal().getAPI().getBindIP()); resultRequest.setHost(StringUtils.isBlank(calleeHost) ? uri.getHost() : calleeHost); @@ -157,8 +156,7 @@ public abstract class AbstractPolarisReporterAdapter { calleeServiceKey, StringUtils.isBlank(calleeHost) ? uri.getHost() : calleeHost, calleePort == null ? getPort(uri) : calleePort, - callerServiceKey, - getProtocol(uri) + callerServiceKey ); return new ResourceStat(resource, statusCode == null ? -1 : statusCode, delay, getDefaultRetStatus(statusCode, exception)); } @@ -257,14 +255,6 @@ public abstract class AbstractPolarisReporterAdapter { return retStatus; } - private String getProtocol(URI uri) { - String scheme = uri.getScheme(); - if (StringUtils.isBlank(scheme)) { - scheme = "http"; - } - return scheme; - } - private int getPort(URI uri) { // -1 means access directly by url, and use http default port number 80 return uri.getPort() == -1 ? 80 : uri.getPort();