From 2ebdb570455473dd0ea2b9e3a26bbb591d55e12a Mon Sep 17 00:00:00 2001 From: csspark Date: Wed, 9 Aug 2017 11:53:59 +0800 Subject: [PATCH 1/2] Update foot.jsp --- .../src/main/webapp/WEB-INF/jsp/manage/include/foot.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/manage/include/foot.jsp b/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/manage/include/foot.jsp index f586076c..3489a745 100644 --- a/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/manage/include/foot.jsp +++ b/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/manage/include/foot.jsp @@ -1,11 +1,11 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> \ No newline at end of file + From 3a361d7c0b701fe8e8bca60788997f183643788f Mon Sep 17 00:00:00 2001 From: csspark Date: Wed, 11 Apr 2018 09:43:22 +0800 Subject: [PATCH 2/2] Update ClusterNodeInformationParser.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 水平扩展报错数字类型问题 --- .../java/redis/clients/util/ClusterNodeInformationParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cachecloud-open-client/cachecloud-jedis/src/main/java/redis/clients/util/ClusterNodeInformationParser.java b/cachecloud-open-client/cachecloud-jedis/src/main/java/redis/clients/util/ClusterNodeInformationParser.java index 8352dc3c..d0280d7f 100644 --- a/cachecloud-open-client/cachecloud-jedis/src/main/java/redis/clients/util/ClusterNodeInformationParser.java +++ b/cachecloud-open-client/cachecloud-jedis/src/main/java/redis/clients/util/ClusterNodeInformationParser.java @@ -36,7 +36,7 @@ public HostAndPort getHostAndPortFromNodeLine(String[] nodeInfoPartArray, HostAn String[] arrayHostAndPort = stringHostAndPort.split(":"); return new HostAndPort(arrayHostAndPort[0].isEmpty() ? current.getHost() : arrayHostAndPort[0], - arrayHostAndPort[1].isEmpty() ? current.getPort() : Integer.valueOf(arrayHostAndPort[1])); + arrayHostAndPort[1].isEmpty() ? current.getPort() : Integer.valueOf(arrayHostAndPort[1]).split("@")[0])); } private void fillSlotInformation(String[] slotInfoPartArray, ClusterNodeInformation info) {