Merge pull request #2135 from theonefx/master

support ak/sk authentication when using serverAddr
alibaba · Jul 2, 2021 · d22f415 · d22f415
2 parents bfabf9e + c5949a5
commit d22f415
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...in/java/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java b/...in/java/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java
@@ -60,9 +60,14 @@ public NacosDataSource getObject() throws Exception {
  properties.setProperty(PropertyKeyConst.SERVER_ADDR, this.serverAddr);
  }
  else {
+ properties.setProperty(PropertyKeyConst.ENDPOINT, this.endpoint);
+ }
+
+ if (!StringUtils.isEmpty(this.accessKey)) {
  properties.setProperty(PropertyKeyConst.ACCESS_KEY, this.accessKey);
+ }
+ if (!StringUtils.isEmpty(this.secretKey)) {
  properties.setProperty(PropertyKeyConst.SECRET_KEY, this.secretKey);
- properties.setProperty(PropertyKeyConst.ENDPOINT, this.endpoint);
  }
  if (!StringUtils.isEmpty(this.namespace)) {
  properties.setProperty(PropertyKeyConst.NAMESPACE, this.namespace);