[incubator-dubbo-admin] branch develop updated: Fix issue#385:change zk path of router config (#386)

[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-admin.git


The following commit(s) were added to refs/heads/develop by this push:
     new 44ad5ef  Fix issue#385:change zk path of router config (#386)
44ad5ef is described below

commit 44ad5ef2557aca8a8f95731f4fe05da11f194492
Author: zhaixiaoxiang <xxz...@126.com>
AuthorDate: Fri May 10 10:15:44 2019 +0800

    Fix issue#385:change zk path of router config (#386)
---
 .../main/java/org/apache/dubbo/admin/common/util/RouteUtils.java   | 2 +-
 .../java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java | 5 +++++
 dubbo-admin-ui/src/components/governance/RoutingRule.vue           | 7 ++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git 
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/RouteUtils.java
 
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/RouteUtils.java
index 81b505c..cc1840e 100644
--- 
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/RouteUtils.java
+++ 
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/RouteUtils.java
@@ -230,7 +230,7 @@ public class RouteUtils {
                 existRule.setKey(conditionRoute.getApplication());
                 existRule.setScope(Constants.APPLICATION);
             } else {
-                existRule.setKey(conditionRoute.getService());
+                existRule.setKey(conditionRoute.getService().replace("/", 
"*"));
                 existRule.setScope(Constants.SERVICE);
             }
         }
diff --git 
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
 
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
index 97719e9..f7280cf 100644
--- 
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
+++ 
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
@@ -255,6 +255,10 @@ public class RouteServiceImpl extends AbstractService 
implements RouteService {
         if (config != null) {
             RoutingRule routingRule = YamlParser.loadObject(config, 
RoutingRule.class);
             ConditionRouteDTO conditionRouteDTO = 
RouteUtils.createConditionRouteFromRule(routingRule);
+            String service = conditionRouteDTO.getService();
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(service)) {
+                conditionRouteDTO.setService(service.replace("*", "/"));
+            }
             return conditionRouteDTO;
         }
         return null;
@@ -323,6 +327,7 @@ public class RouteServiceImpl extends AbstractService 
implements RouteService {
     }
 
     private String getPath(String key, String type) {
+        key = key.replace("/", "*");
         if (type.equals(Constants.CONDITION_ROUTE)) {
             return prefix + Constants.PATH_SEPARATOR + key + 
Constants.PATH_SEPARATOR + "condition-router";
         } else {
diff --git a/dubbo-admin-ui/src/components/governance/RoutingRule.vue 
b/dubbo-admin-ui/src/components/governance/RoutingRule.vue
index 41f8193..27fca6e 100644
--- a/dubbo-admin-ui/src/components/governance/RoutingRule.vue
+++ b/dubbo-admin-ui/src/components/governance/RoutingRule.vue
@@ -397,6 +397,7 @@
         } else {
           itemId = item.application
         }
+        let oldItemId = itemId
         if (itemId.includes('/')) {
           itemId = itemId.replace('/', '*')
         }
@@ -418,17 +419,17 @@
               })
             break
           case 'block':
-            this.openWarn(' Are you sure to block Routing Rule', 'service: ' + 
itemId)
+            this.openWarn(' Are you sure to block Routing Rule', 'service: ' + 
oldItemId)
             this.warnStatus.operation = 'disable'
             this.warnStatus.id = itemId
             break
           case 'check_circle_outline':
-            this.openWarn(' Are you sure to enable Routing Rule', 'service: ' 
+ itemId)
+            this.openWarn(' Are you sure to enable Routing Rule', 'service: ' 
+ oldItemId)
             this.warnStatus.operation = 'enable'
             this.warnStatus.id = itemId
             break
           case 'delete':
-            this.openWarn(' Are you sure to Delete Routing Rule', 'service: ' 
+ itemId)
+            this.openWarn(' Are you sure to Delete Routing Rule', 'service: ' 
+ oldItemId)
             this.warnStatus.operation = 'delete'
             this.warnStatus.id = itemId
         }