[ISSUE alibaba#3379]Unable to use Nacos configuration information cor…

…rectly when configuring the nacos endpoint alibaba#3379
huhongjie2014 · Jul 12, 2023 · 0f44491 · 0f44491
1 parent 6e02b51
commit 0f44491
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/...in/java/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java b/...in/java/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java
@@ -58,11 +58,18 @@ public class NacosDataSourceFactoryBean implements FactoryBean<NacosDataSource>
  @Override
  public NacosDataSource getObject() throws Exception {
  Properties properties = new Properties();
- if (!StringUtils.isEmpty(this.serverAddr)) {
- properties.setProperty(PropertyKeyConst.SERVER_ADDR, this.serverAddr);
+ if (!StringUtils.isEmpty(this.endpoint)) {
+ int index = this.endpoint.indexOf(":");
+ if (index < 0) {
+ properties.setProperty(PropertyKeyConst.ENDPOINT, this.endpoint);
+ }
+ else {
+ properties.setProperty(PropertyKeyConst.ENDPOINT, this.endpoint.substring(0, index));
+ properties.setProperty(PropertyKeyConst.ENDPOINT_PORT, this.endpoint.substring(index + 1));
+ }
  }
  else {
- properties.setProperty(PropertyKeyConst.ENDPOINT, this.endpoint);
+ properties.setProperty(PropertyKeyConst.SERVER_ADDR, this.serverAddr);
  }
 
  if (!StringUtils.isEmpty(this.contextPath)) {