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 can't authenticate by username and password when use Nacos #9941

Merged
merged 1 commit into from Jun 14, 2022
Merged

Fix can't authenticate by username and password when use Nacos #9941

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions .../src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java
View file
Open in desktop
Expand Up @@ -52,7 +52,9 @@
import java.util.stream.Stream;

import static com.alibaba.nacos.api.PropertyKeyConst.ENCODE;
import static com.alibaba.nacos.api.PropertyKeyConst.PASSWORD;
import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR;
import static com.alibaba.nacos.api.PropertyKeyConst.USERNAME;
import static java.util.Collections.emptyMap;
import static org.apache.dubbo.common.constants.RemotingConstants.BACKUP_KEY;
import static org.apache.dubbo.common.utils.StringConstantFieldValuePredicate.of;
Expand Down Expand Up @@ -143,6 +145,12 @@ private void setServerAddr(URL url, Properties properties) {
private static void setProperties(URL url, Properties properties) {
// Get the parameters from constants
Map<String, String> parameters = url.getParameters(of(PropertyKeyConst.class));
if (StringUtils.isNotEmpty(url.getUsername())){
properties.put(USERNAME, url.getUsername());
}
if (StringUtils.isNotEmpty(url.getPassword())){
properties.put(PASSWORD, url.getPassword());
}
// Put all parameters
properties.putAll(parameters);
}
Expand Down
9 changes: 8 additions & 1 deletion ...try-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
View file
Open in desktop
Expand Up @@ -37,7 +37,9 @@
import java.util.Properties;

import static com.alibaba.nacos.api.PropertyKeyConst.NAMING_LOAD_CACHE_AT_START;
import static com.alibaba.nacos.api.PropertyKeyConst.PASSWORD;
import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR;
import static com.alibaba.nacos.api.PropertyKeyConst.USERNAME;
import static com.alibaba.nacos.api.common.Constants.DEFAULT_GROUP;
import static com.alibaba.nacos.client.naming.utils.UtilAndComs.NACOS_NAMING_LOG_NAME;
import static org.apache.dubbo.common.constants.RemotingConstants.BACKUP_KEY;
Expand Down Expand Up @@ -150,7 +152,12 @@ private static void setProperties(URL url, Properties properties) {
Map<String, String> parameters = url.getParameters(of(PropertyKeyConst.class));
// Put all parameters
properties.putAll(parameters);

if (StringUtils.isNotEmpty(url.getUsername())){
properties.put(USERNAME, url.getUsername());
}
if (StringUtils.isNotEmpty(url.getPassword())){
properties.put(PASSWORD, url.getPassword());
}
putPropertyIfAbsent(url, properties, NAMING_LOAD_CACHE_AT_START, "true");
}

Expand Down