Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #9910, metadata-report support a separate configuration username and password #9921

Merged
merged 1 commit into from Jun 14, 2022
Merged

fix #9910, metadata-report support a separate configuration username and password #9921

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions dubbo-common/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java
View file
Open in desktop
Expand Up @@ -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() {
Expand Down