Merge branch 'fix/cluster' into 'develop'

修复集群切换

See merge request o2oa/o2oa!748

o2server/x_console/src/main/java/com/x/server/console/action/ShowCluster.java

@@ -1,7 +1,9 @@
 package com.x.server.console.action;
 
 import java.util.Date;
+import java.util.Map.Entry;
 
+import com.x.base.core.project.config.CenterServer;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
@@ -16,7 +18,12 @@ public class ShowCluster {
 
 	public boolean execute() throws Exception {
 		StringBuilder sb = new StringBuilder();
-		sb.append("show cluster:").append(StringUtils.LF);
+		sb.append("cluster center server:").append(StringUtils.LF);
+		int i = 1;
+		for (Entry<String, CenterServer> entry : Config.nodes().centerServers().orderedEntry()) {
+			sb.append(String.format("%d: %s, port:%d, sslEnable:%s.", i++, entry.getKey(), entry.getValue().getPort(),
+					entry.getValue().getSslEnable() + "")).append(StringUtils.LF);
+		}
 		sb.append("center pirmary node:" + Config.resource_node_centersPirmaryNode()).append(StringUtils.LF);
 		sb.append("center pirmary port:" + Config.resource_node_centersPirmaryPort()).append(StringUtils.LF);
 		sb.append("center pirmary sslEnable:" + Config.resource_node_centersPirmarySslEnable()).append(StringUtils.LF);

o2server/x_console/src/main/java/com/x/server/console/node/VoteCenterEvent.java

@@ -45,6 +45,8 @@ public class VoteCenterEvent implements Event {
 				}
 
 			} catch (Exception e) {
+				logger.print("failed to connect pirmary center:{} port:{} sslEnable:{}.", entry.getKey(),
+						entry.getValue().getPort(), entry.getValue().getSslEnable());
 			}
 		}