[incubator-dubbo-ops] branch develop updated: separate group and service

[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 76fbae9  separate group and service
76fbae9 is described below

commit 76fbae970d289bd71879596c059b9ea171b4ead6
Author: nzomkxia <z82507...@gmail.com>
AuthorDate: Thu Nov 1 15:07:08 2018 +0800

    separate group and service
---
 .../apache/dubbo/admin/controller/ServiceController.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git 
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
 
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
index e274ad8..c5f0f9c 100644
--- 
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
+++ 
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
@@ -53,7 +53,11 @@ public class ServiceController {
             Map<String, String> map = 
StringUtils.parseQueryString(provider.getParameters());
             String app = provider.getApplication();
             String service = provider.getService();
-            String group = map.get(Constants.GROUP_KEY);
+            String group = null;
+            if (service.contains("/")) {
+                group = service.split("/")[0];
+                service = service.split("/")[1];
+            }
             String version = map.get(Constants.VERSION_KEY);
             String url = app + service + group + version;
             if (serviceUrl.contains(url)) {
@@ -105,8 +109,14 @@ public class ServiceController {
     private ServiceDTO createService(Provider provider, Map<String, String> 
map) {
         ServiceDTO serviceDTO = new ServiceDTO();
         serviceDTO.setAppName(provider.getApplication());
-        serviceDTO.setService(provider.getService());
-        serviceDTO.setGroup(map.get(Constants.GROUP_KEY));
+        String service = provider.getService();
+        String group = null;
+        if (service.contains("/")) {
+            group = service.split("/")[0];
+            service = service.split("/")[1];
+        }
+        serviceDTO.setService(service);
+        serviceDTO.setGroup(group);
         serviceDTO.setVersion(map.get(Constants.VERSION_KEY));
         return serviceDTO;
     }