From 08b0940a6e021c703b49eae3cd28496ff7cca3a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=88=92=E6=83=A0=E5=9B=BD?= Date: Fri, 25 May 2018 10:36:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96IP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/mindata/blockchain/common/CommonUtil.java | 2 +- .../com/mindata/blockchain/socket/client/ClientStarter.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/mindata/blockchain/common/CommonUtil.java b/src/main/java/com/mindata/blockchain/common/CommonUtil.java index d5c31c0..05fc68f 100644 --- a/src/main/java/com/mindata/blockchain/common/CommonUtil.java +++ b/src/main/java/com/mindata/blockchain/common/CommonUtil.java @@ -21,7 +21,7 @@ public class CommonUtil { public static String getLocalIp() { InetAddress inetAddress = getLocalHostLANAddress(); if (inetAddress != null) { - return inetAddress.getHostName(); + return inetAddress.getHostAddress(); } return null; } diff --git a/src/main/java/com/mindata/blockchain/socket/client/ClientStarter.java b/src/main/java/com/mindata/blockchain/socket/client/ClientStarter.java index b4cce29..ae48107 100644 --- a/src/main/java/com/mindata/blockchain/socket/client/ClientStarter.java +++ b/src/main/java/com/mindata/blockchain/socket/client/ClientStarter.java @@ -66,6 +66,7 @@ public class ClientStarter { @Scheduled(fixedRate = 300000) public void fetchOtherServer() { String localIp = CommonUtil.getLocalIp(); + logger.info("本机IP：{}",localIp); try { //如果连不上服务器，就不让启动 MemberData memberData = restTemplate.getForEntity(managerUrl + "member?name=" + name + "&appId=" + AppId @@ -208,7 +209,8 @@ public class ClientStarter { pbft = 1; } //如果要单节点测试，此处返回值改为0 - return pbft; + //return pbft; + return 0; } public int pbftAgreeCount() { -- Gitee From caf77e720cef49cff458400eeac62d894755e06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=88=92=E6=83=A0=E5=9B=BD?= Date: Fri, 25 May 2018 10:57:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mindata/blockchain/socket/client/ClientStarter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/mindata/blockchain/socket/client/ClientStarter.java b/src/main/java/com/mindata/blockchain/socket/client/ClientStarter.java index ae48107..c3006be 100644 --- a/src/main/java/com/mindata/blockchain/socket/client/ClientStarter.java +++ b/src/main/java/com/mindata/blockchain/socket/client/ClientStarter.java @@ -209,8 +209,7 @@ public class ClientStarter { pbft = 1; } //如果要单节点测试，此处返回值改为0 - //return pbft; - return 0; + return pbft; } public int pbftAgreeCount() { -- Gitee