[incubator-dubbo-ops] branch develop updated: add configuration address

[min]

This is an automated email from the ASF dual-hosted git repository.

min pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git


The following commit(s) were added to refs/heads/develop by this push:
     new a9fb2dc  add configuration address
a9fb2dc is described below

commit a9fb2dc1c0de972b3a156ed74e8c29bbe63c9e46
Author: nzomkxia <z82507...@gmail.com>
AuthorDate: Wed Jan 16 11:39:27 2019 +0800

    add configuration address
---
 .../apache/dubbo/admin/config/ConfigCenter.java    | 22 +++++++++++++++++-----
 .../src/main/resources/application.properties      |  7 ++++++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git 
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
 
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
index 1c6b4bd..d875b85 100644
--- 
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
+++ 
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
@@ -43,18 +43,25 @@ import java.util.Arrays;
 public class ConfigCenter {
 
 
+
+    //centers in dubbo 2.7
     @Value("${admin.config-center:}")
     private String configCenter;
-    @Value("${admin.config-center.username:}")
-    private String username;
-    @Value("${admin.config-center.password:}")
-    private String password;
 
     @Value("${admin.registry.address:}")
     private String registryAddress;
+
+    @Value("${admin.metadata.address:}")
+    private String metadataAddress;
+
     @Value("${admin.registry.group:}")
     private String group;
 
+    @Value("${admin.config-center.username:}")
+    private String username;
+    @Value("${admin.config-center.password:}")
+
+    private String password;
     private static String globalConfigPath = "config/dubbo/dubbo.properties";
 
     private static final Logger logger = 
LoggerFactory.getLogger(ConfigCenter.class);
@@ -85,7 +92,7 @@ public class ConfigCenter {
                         String registryAddress = s.split("=")[1].trim();
                         registryUrl = formUrl(registryAddress, group, 
username, password);
                     } else if (s.startsWith(Constants.METADATA_ADDRESS)) {
-                        String metadataAddress = s.split("=")[1].trim();
+                        metadataAddress = s.split("=")[1].trim();
                         metadataUrl = formUrl(s.split("=")[1].trim(), group, 
username, password);
                     }
                 });
@@ -131,6 +138,11 @@ public class ConfigCenter {
     @DependsOn("governanceConfiguration")
     MetaDataCollector getMetadataCollector() {
         MetaDataCollector metaDataCollector = new NoOpMetadataCollector();
+        if (metadataUrl == null) {
+            if (StringUtils.isNotEmpty(metadataAddress)) {
+                metadataUrl = formUrl(metadataAddress.split("=")[1].trim(), 
group, username, password);
+            }
+        }
         if (metadataUrl != null) {
             metaDataCollector = 
ExtensionLoader.getExtensionLoader(MetaDataCollector.class).getExtension(metadataUrl.getProtocol());
             metaDataCollector.setUrl(metadataUrl);
diff --git a/dubbo-admin-backend/src/main/resources/application.properties 
b/dubbo-admin-backend/src/main/resources/application.properties
index c3b0ed5..514345f 100644
--- a/dubbo-admin-backend/src/main/resources/application.properties
+++ b/dubbo-admin-backend/src/main/resources/application.properties
@@ -15,9 +15,14 @@
 # limitations under the License.
 #
 
+# centers in dubbo2.7
+admin.registry.address=zookeeper://127.0.0.1:2181
 admin.config-center=zookeeper://127.0.0.1:2181
+admin.metadata.address=zookeeper://127.0.0.1:2181
+
+
+
 admin.registry.group=dubbo
-admin.registry.address=zookeeper://127.0.0.1:2181
 admin.apollo.token=e16e5cd903fd0c97a116c873b448544b9d086de9
 admin.apollo.appId=test
 admin.apollo.env=dev