commit 79b55449cfba240a38af6af3b8453075e12fa331
author nzomkxia <z82507200@gmail.com> Tue Dec 18 11:23:31 2018 +0800
committer nzomkxia <z82507200@gmail.com> Tue Dec 18 11:23:31 2018 +0800
tree 59d2d4e20fb6c64146ef492783be4aabd5102589
parent 002c680ac6e9d45d13c55f7512b79ef35c64d13a

change load balance format

dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java

diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
index d9b3115..3c003e1 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
@@ -103,11 +103,14 @@
 
     public static OverrideConfig balanceDTOtoConfig(BalancingDTO balancingDTO) {
         OverrideConfig overrideConfig = new OverrideConfig();
-        overrideConfig.setType("balancing");
+        overrideConfig.setType(Constants.BALANCING);
         overrideConfig.setEnabled(true);
         Map<String, Object> parameters = new HashMap<>();
-        parameters.put("method", balancingDTO.getMethodName());
-        parameters.put("strategy", balancingDTO.getStrategy());
+        if (balancingDTO.getMethodName().equals("*")) {
+            parameters.put("loadbalance", balancingDTO.getStrategy());
+        } else {
+            parameters.put(balancingDTO.getMethodName() + ".loadbalance", balancingDTO.getStrategy());
+        }
         overrideConfig.setParameters(parameters);
         return overrideConfig;
     }
@@ -119,7 +122,7 @@
         } else {
             weightDTO.setService(key);
         }
-        weightDTO.setWeight((int)config.getParameters().get("weight"));
+        weightDTO.setWeight((int)config.getParameters().get(Constants.WEIGHT));
         weightDTO.setAddresses(config.getAddresses());
         return weightDTO;
     }
@@ -131,8 +134,17 @@
         } else {
             balancingDTO.setService(key);
         }
-        balancingDTO.setStrategy((String)config.getParameters().get("strategy"));
-        balancingDTO.setMethodName((String)config.getParameters().get("method"));
+        for (Map.Entry<String, Object> entry : config.getParameters().entrySet()) {
+            String k = entry.getKey();
+            String method;
+            if (k.contains(".")) {
+                method = k.split("\\.")[0];
+            } else {
+                method = "*";
+            }
+            balancingDTO.setMethodName(method);
+            balancingDTO.setStrategy((String)entry.getValue());
+        }
         return balancingDTO;
     }