[incubator-dubbo-ops] branch develop updated: search providers and consumers by serviceName #162 #98

[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 f122f1b  search providers and consumers by serviceName #162 #98
f122f1b is described below

commit f122f1b05639109c74ad0fc36e8ecaac4b1acd9f
Author: nzomkxia <z82507...@gmail.com>
AuthorDate: Wed Oct 24 23:09:56 2018 +0800

    search providers and consumers by serviceName #162 #98
---
 .../java/org/apache/dubbo/admin/controller/ServiceController.java | 8 ++++----
 dubbo-admin-frontend/src/components/ServiceDetail.vue             | 8 ++++----
 2 files changed, 8 insertions(+), 8 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 68c1ad0..708f1bb 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
@@ -81,11 +81,11 @@ public class ServiceController {
         return result;
     }
 
-    @RequestMapping("/{app}/{service}")
-    public ServiceDetailDTO serviceDetail(@PathVariable String app, 
@PathVariable String service) {
-        List<Provider> providers = providerService.findByAppandService(app, 
service);
+    @RequestMapping("/{service}")
+    public ServiceDetailDTO serviceDetail(@PathVariable String service) {
+        List<Provider> providers = providerService.findByService(service);
 
-        List<Consumer> consumers = consumerService.findByAppandService(app, 
service);
+        List<Consumer> consumers = consumerService.findByService(service);
 
         ServiceDetailDTO serviceDetailDTO = new ServiceDetailDTO();
         serviceDetailDTO.setConsumers(consumers);
diff --git a/dubbo-admin-frontend/src/components/ServiceDetail.vue 
b/dubbo-admin-frontend/src/components/ServiceDetail.vue
index caf3967..80bfaed 100644
--- a/dubbo-admin-frontend/src/components/ServiceDetail.vue
+++ b/dubbo-admin-frontend/src/components/ServiceDetail.vue
@@ -169,8 +169,8 @@
       basic: []
     }),
     methods: {
-      detail: function (app, service) {
-        AXIOS.get('/service/' + app + '/' + service)
+      detail: function (service) {
+        AXIOS.get('/service/' + service)
             .then(response => {
               this.providerDetails = response.data.providers
               this.consumerDetails = response.data.consumers
@@ -195,8 +195,8 @@
           service = query[key]
         }
       })
-      if (app !== '' && service !== '') {
-        this.detail(app, service)
+      if (service !== '') {
+        this.detail(service)
         let serviceItem = {}
         serviceItem.role = 'Service Name'
         serviceItem.value = service