This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/metadata by this push:
new f94fef5 fix 2.6 route bug
f94fef5 is described below
commit f94fef5fd2b77e7520036c1b90f2a7e65f1f4cae
Author: nzomkxia <[email protected]>
AuthorDate: Fri Dec 7 18:56:56 2018 +0800
fix 2.6 route bug
---
.../java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java | 4 ++--
dubbo-admin-frontend/src/components/governance/RoutingRule.vue | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
index 5e6eb56..e012d81 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
@@ -97,7 +97,7 @@ public class RouteServiceImpl extends AbstractService
implements RouteService {
//for2.6
URL oldURL = convertRouteToOldRoute(conditionRoute).toUrl();
registry.unregister(oldURL);
- oldURL.addParameter("enabled", true);
+ oldURL = oldURL.addParameter("enabled", true);
registry.register(oldURL);
}
@@ -119,7 +119,7 @@ public class RouteServiceImpl extends AbstractService
implements RouteService {
//for 2.6
URL oldURL = convertRouteToOldRoute(conditionRoute).toUrl();
registry.unregister(oldURL);
- oldURL.addParameter("enabled", false);
+ oldURL = oldURL.addParameter("enabled", false);
registry.register(oldURL);
}
diff --git a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
index ca02d57..f4663cf 100644
--- a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
+++ b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
@@ -448,7 +448,7 @@
let filter = null
let vm = this
Object.keys(query).forEach(function (key) {
- if (key === 'service') {
+ if (key === 'serviceName') {
filter = query[key]
vm.selected = 0
}