Merge pull request #395 from lowzj/consul-api

polish ConsulEcwidClient
weibocom · Mar 22, 2017 · dc3532a · dc3532a
2 parents 9f5dcf0 + 3e7e181
commit dc3532a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/motan-registry-consul/pom.xml b/motan-registry-consul/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>com.ecwid.consul</groupId>
             <artifactId>consul-api</artifactId>
-            <version>1.1.4</version>
+            <version>1.2.1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/...ry-consul/src/main/java/com/weibo/api/motan/registry/consul/client/ConsulEcwidClient.java b/...ry-consul/src/main/java/com/weibo/api/motan/registry/consul/client/ConsulEcwidClient.java
@@ -12,7 +12,6 @@
 import com.weibo.api.motan.registry.consul.ConsulService;
 import com.weibo.api.motan.registry.consul.ConsulUtils;
 import com.weibo.api.motan.util.LoggerUtil;
-import org.apache.commons.codec.binary.Base64;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -54,13 +53,13 @@ public ConsulResponse<List<ConsulService>> lookupHealthService(
 		if (orgResponse != null && orgResponse.getValue() != null
 				&& !orgResponse.getValue().isEmpty()) {
 			List<HealthService> HealthServices = orgResponse.getValue();
-			List<ConsulService> ConsulServcies = new ArrayList<ConsulService>(
+			List<ConsulService> ConsulServices = new ArrayList<ConsulService>(
 					HealthServices.size());
 
 			for (HealthService orgService : HealthServices) {
 				try {
 					ConsulService newService = convertToConsulService(orgService);
-					ConsulServcies.add(newService);
+					ConsulServices.add(newService);
 				} catch (Exception e) {
 					String servcieid = "null";
 					if (orgService.getService() != null) {
@@ -71,9 +70,9 @@ public ConsulResponse<List<ConsulService>> lookupHealthService(
 									+ servcieid, e);
 				}
 			}
-			if (!ConsulServcies.isEmpty()) {
+			if (!ConsulServices.isEmpty()) {
 				newResponse = new ConsulResponse<List<ConsulService>>();
-				newResponse.setValue(ConsulServcies);
+				newResponse.setValue(ConsulServices);
 				newResponse.setConsulIndex(orgResponse.getConsulIndex());
 				newResponse.setConsulLastContact(orgResponse
 						.getConsulLastContact());
@@ -93,7 +92,7 @@ public String lookupCommand(String group) {
         if (value == null) {
             LoggerUtil.info("no command in group: " + group);
         } else if (value.getValue() != null) {
-            command = new String(Base64.decodeBase64(value.getValue()));
+            command = value.getDecodedValue();
         }
         return command;
     }