fix #9910, metadata-report support a separate configuration username …

…and password (#9921)
apache · Jun 14, 2022 · 8d9e252 · 8d9e252
1 parent edd3d28
commit 8d9e252
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java
@@ -123,9 +123,13 @@ public URL toUrl() throws IllegalArgumentException {
         map.putAll(convert(map, null));
         // put the protocol of URL as the "metadata"
         map.put("metadata", url.getProtocol());
-        return new URL("metadata", url.getUsername(), url.getPassword(), url.getHost(),
-                url.getPort(), url.getPath(), map);
-
+        return new URL("metadata",
+            StringUtils.isBlank(url.getUsername()) ? this.getUsername() : url.getUsername(),
+            StringUtils.isBlank(url.getPassword()) ? this.getPassword() : url.getPassword(),
+            url.getHost(),
+            // address port is priority
+            this.getPort() == null ? url.getPort() : url.getPort(this.getPort()),
+            url.getPath(), map);
     }
 
     public String getProtocol() {