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 09f4793 back support 2.6
09f4793 is described below
commit 09f479395683dfb935a21d07fcb182186e7fda12
Author: nzomkxia <z82507...@gmail.com>
AuthorDate: Fri Dec 7 10:06:12 2018 +0800
back support 2.6
---
.../dubbo/admin/model/domain/OverrideConfig.java | 8 ++++----
.../admin/service/impl/OverrideServiceImpl.java | 8 ++++----
.../dubbo/admin/service/impl/RouteServiceImpl.java | 2 +-
.../src/components/governance/Overrides.vue | 22 ++++++++++++++++++----
.../src/components/governance/RoutingRule.vue | 21 ++++++++++++++++++---
5 files changed, 45 insertions(+), 16 deletions(-)
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 893c19b..4fa10e4 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
@@ -17,13 +17,13 @@
package org.apache.dubbo.admin.model.domain;
-import org.apache.dubbo.admin.common.util.Pair;
+import java.util.Map;
public class OverrideConfig {
private String side;
private String[] addresses;
private String[] providerAddresses;
- private Pair<String, Object>[] parameters;
+ private Map<String, Object> parameters;
private String[] applications;
private String[] services;
@@ -51,11 +51,11 @@ public class OverrideConfig {
this.providerAddresses = providerAddresses;
}
- public Pair<String, Object>[] getParameters() {
+ public Map<String, Object> getParameters() {
return parameters;
}
- public void setParameters(Pair<String, Object>[] parameters) {
+ public void setParameters(Map<String, Object> parameters) {
this.parameters = parameters;
}
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
index 0d4d4c5..fb3b420 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
@@ -18,7 +18,6 @@ package org.apache.dubbo.admin.service.impl;
import org.apache.commons.lang3.StringUtils;
import org.apache.dubbo.admin.common.util.Constants;
-import org.apache.dubbo.admin.common.util.Pair;
import org.apache.dubbo.admin.common.util.YamlParser;
import org.apache.dubbo.admin.model.domain.Override;
import org.apache.dubbo.admin.model.domain.OverrideConfig;
@@ -28,6 +27,7 @@ import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
@@ -177,12 +177,12 @@ public class OverrideServiceImpl extends AbstractService
implements OverrideServ
}
private void overrideDTOToParams(Override override, OverrideConfig config)
{
- Pair<String, Object>[] parameters = config.getParameters();
+ Map<String, Object> parameters = config.getParameters();
StringBuilder params = new StringBuilder();
if (parameters != null) {
- for (Pair<String, Object> param : parameters) {
- String value = param.getKey() + "=" + param.getValue();
+ for (Map.Entry<String, Object> entry : parameters.entrySet()) {
+ String value = entry.getKey() + "=" + entry.getValue();
params.append(value).append("&");
}
}
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 d3e89cb..5e6eb56 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
@@ -38,8 +38,8 @@ public class RouteServiceImpl extends AbstractService
implements RouteService {
@Override
public void createConditionRoute(ConditionRouteDTO conditionRoute) {
- String path =
getPath(conditionRoute.getKey(),Constants.CONDITION_ROUTE);
conditionRoute = convertRouteDTOtoStore(conditionRoute);
+ String path =
getPath(conditionRoute.getKey(),Constants.CONDITION_ROUTE);
//register2.7
dynamicConfiguration.setConfig(path,
YamlParser.dumpObject(conditionRoute));
diff --git a/dubbo-admin-frontend/src/components/governance/Overrides.vue
b/dubbo-admin-frontend/src/components/governance/Overrides.vue
index dfa92d0..64c7291 100644
--- a/dubbo-admin-frontend/src/components/governance/Overrides.vue
+++ b/dubbo-admin-frontend/src/components/governance/Overrides.vue
@@ -282,8 +282,15 @@
this.$axios.put('/rules/override/' + this.updateId, override)
.then(response => {
if (response.status === 200) {
- this.search(this.service, true)
- this.filter = this.service
+ if (this.service !== '') {
+ this.selected = 0
+ this.search(this.service, true)
+ this.filter = this.service
+ } else {
+ this.selected = 1
+ this.search(this.application, true)
+ this.filter = this.application
+ }
this.$notify.success('Update success')
this.closeDialog()
}
@@ -293,8 +300,15 @@
this.$axios.post('/rules/override', override)
.then(response => {
if (response.status === 201) {
- this.search(this.service, true)
- this.filter = this.service
+ if (this.service !== '') {
+ this.selected = 0
+ this.search(this.service, true)
+ this.filter = this.service
+ } else {
+ this.selected = 1
+ this.search(this.application, true)
+ this.filter = this.application
+ }
this.$notify.success('Create success')
this.closeDialog()
}
diff --git a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
index f6959b2..ca02d57 100644
--- a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
+++ b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
@@ -308,7 +308,15 @@
this.$axios.put('/rules/route/condition/' + rule.id, rule)
.then(response => {
if (response.status === 200) {
- this.search(this.service, true)
+ if (this.service !== '') {
+ this.selected = 0
+ this.search(this.service, true)
+ this.filter = this.service
+ } else {
+ this.selected = 1
+ this.search(this.application, true)
+ this.filter = this.application
+ }
this.closeDialog()
this.$notify.success('Update success')
}
@@ -318,8 +326,15 @@
this.$axios.post('/rules/route/condition/', rule)
.then(response => {
if (response.status === 201) {
- this.search(this.service, true)
- this.filter = this.service
+ if (this.service !== '') {
+ this.selected = 0
+ this.search(this.service, true)
+ this.filter = this.service
+ } else {
+ this.selected = 1
+ this.search(this.application, true)
+ this.filter = this.application
+ }
this.closeDialog()
this.$notify.success('Create success')
}
