fix dynamic config issue
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java
index 95a3326..b54bc67 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java
@@ -65,13 +65,13 @@
}
@RequestMapping(method = RequestMethod.GET)
- public List<OverrideDTO> searchOverride(@RequestParam(required = false) String service,
+ public List<OverrideDTO> searchOverride(@RequestParam(required = false) String serviceName,
@RequestParam(required = false) String application,
@PathVariable String env) {
Override override = null;
List<OverrideDTO> result = new ArrayList<>();
- if (StringUtils.isNotEmpty(service)) {
- override = overrideService.findOverride(service);
+ if (StringUtils.isNotEmpty(serviceName)) {
+ override = overrideService.findOverride(serviceName);
} else if(StringUtils.isNotEmpty(application)){
override = overrideService.findOverride(application);
}
@@ -118,7 +118,7 @@
return null;
}
Override override = new Override();
- if (overrideDTO.getApplication() != null) {
+ if (StringUtils.isNotEmpty(overrideDTO.getApplication())) {
override.setScope("application");
override.setKey(overrideDTO.getApplication());
} else {
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/data/config/impl/ZookeeperConfiguration.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/data/config/impl/ZookeeperConfiguration.java
index 5916ee1..e293dbb 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/data/config/impl/ZookeeperConfiguration.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/data/config/impl/ZookeeperConfiguration.java
@@ -65,8 +65,9 @@
@Override
public boolean deleteConfig(String key) {
+ String path = getNodePath(key);
try {
- zkClient.delete().forPath(key);
+ zkClient.delete().forPath(path);
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/OverrideConfig.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/OverrideConfig.java
index 7998daa..caa3b32 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/OverrideConfig.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/OverrideConfig.java
@@ -18,12 +18,12 @@
this.side = side;
}
- public String[] getAddress() {
+ public String[] getAddresses() {
return addresses;
}
- public void setAddress(String[] address) {
- this.addresses = address;
+ public void setAddresses(String[] addresses) {
+ this.addresses = addresses;
}
public String[] getProviderAddresses() {
diff --git a/dubbo-admin-frontend/src/api/menu.js b/dubbo-admin-frontend/src/api/menu.js
index 6ea0773..05f1660 100644
--- a/dubbo-admin-frontend/src/api/menu.js
+++ b/dubbo-admin-frontend/src/api/menu.js
@@ -23,7 +23,7 @@
group: 'governance',
items: [
{ title: 'Routing Rule', path: '/governance/routingRule' },
- { title: 'Tag Rule', path: '/governance/tagRule', badge: 'new'},
+ {title: 'Tag Rule', path: '/governance/tagRule', badge: 'new'},
{ title: 'Dynamic Config', path: '/governance/config' },
{ title: 'Access Control', path: '/governance/access' },
{ title: 'Weight Adjust', path: '/governance/weight' },
diff --git a/dubbo-admin-frontend/src/components/governance/Overrides.vue b/dubbo-admin-frontend/src/components/governance/Overrides.vue
index 648cdce..dfa92d0 100644
--- a/dubbo-admin-frontend/src/components/governance/Overrides.vue
+++ b/dubbo-admin-frontend/src/components/governance/Overrides.vue
@@ -401,7 +401,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
}
diff --git a/dubbo-admin-frontend/src/components/governance/TagRule.vue b/dubbo-admin-frontend/src/components/governance/TagRule.vue
index 9e08eee..90412db 100644
--- a/dubbo-admin-frontend/src/components/governance/TagRule.vue
+++ b/dubbo-admin-frontend/src/components/governance/TagRule.vue
@@ -175,7 +175,7 @@
.then(response => {
this.tagRoutingRules = response.data
if (rewrite) {
- this.$router.push({path: 'routingRule', query: {application: filter}})
+ this.$router.push({path: 'tagRule', query: {application: filter}})
}
})
},
@@ -328,7 +328,6 @@
this.ruleText = this.template
let query = this.$route.query
let filter = null
- let vm = this
Object.keys(query).forEach(function (key) {
if (key === 'application') {
filter = query[key]
