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 dca298e remove method format
dca298e is described below
commit dca298e30da194e0d17535be2c820f8fbefc9e2d
Author: nzomkxia <z82507...@gmail.com>
AuthorDate: Thu Dec 20 14:07:34 2018 +0800
remove method format
---
.../apache/dubbo/admin/service/impl/OverrideServiceImpl.java | 11 ++---------
.../src/components/governance/LoadBalance.vue | 2 +-
dubbo-admin-frontend/src/components/governance/Overrides.vue | 6 +++---
3 files changed, 6 insertions(+), 13 deletions(-)
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 519696c..785feaa 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
@@ -510,13 +510,6 @@ public class OverrideServiceImpl extends AbstractService
implements OverrideServ
return prefix + Constants.PATH_SEPARATOR + key +
Constants.PATH_SEPARATOR + Constants.CONFIGURATOR;
}
- private String formatMethodName(String method) {
- if (method.equals("0")) {
- return "*";
- }
- return method;
- }
-
private void unregisterWeight(WeightDTO weightDTO) {
List<String> addresses = weightDTO.getAddresses();
if (addresses != null) {
@@ -549,7 +542,7 @@ public class OverrideServiceImpl extends AbstractService
implements OverrideServ
private void unregisterBalancing(BalancingDTO balancingDTO) {
LoadBalance loadBalance = new LoadBalance();
loadBalance.setService(balancingDTO.getService());
- loadBalance.setMethod(formatMethodName(balancingDTO.getMethodName()));
+ loadBalance.setMethod(balancingDTO.getMethodName());
loadBalance.setStrategy(balancingDTO.getStrategy());
registry.unregister(OverrideUtils.loadBalanceToOverride(loadBalance).toUrl());
}
@@ -557,7 +550,7 @@ public class OverrideServiceImpl extends AbstractService
implements OverrideServ
private void registerBalancing(BalancingDTO balancingDTO) {
LoadBalance loadBalance = new LoadBalance();
loadBalance.setService(balancingDTO.getService());
- loadBalance.setMethod(formatMethodName(balancingDTO.getMethodName()));
+ loadBalance.setMethod(balancingDTO.getMethodName());
loadBalance.setStrategy(balancingDTO.getStrategy());
registry.register(OverrideUtils.loadBalanceToOverride(loadBalance).toUrl());
}
diff --git a/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
b/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
index 76f9425..72ad6b0 100644
--- a/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
+++ b/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
@@ -188,7 +188,7 @@
loadBalances: [
],
template:
- 'methodName: sayHello # 0 for all methods\n' +
+ 'methodName: sayHello # * for all methods\n' +
'strategy: # leastactive, random, roundrobin',
ruleText: '',
readonly: false,
diff --git a/dubbo-admin-frontend/src/components/governance/Overrides.vue
b/dubbo-admin-frontend/src/components/governance/Overrides.vue
index 32a1855..81ba4cc 100644
--- a/dubbo-admin-frontend/src/components/governance/Overrides.vue
+++ b/dubbo-admin-frontend/src/components/governance/Overrides.vue
@@ -371,9 +371,9 @@
},
removeEmpty: function (obj) {
Object.keys(obj).forEach(key => {
- if (obj[key] && typeof obj[key] === 'object')
this.removeEmpty(obj[key]);
- else if (obj[key] == null) delete obj[key];
- });
+ if (obj[key] && typeof obj[key] === 'object')
this.removeEmpty(obj[key])
+ else if (obj[key] == null) delete obj[key]
+ })
},
deleteItem: function (warnStatus) {
let id = warnStatus.id
