fizzgate/fizz-gateway-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix local ip issue of NetworkUtils #440

Browse Source
This commit is contained in:
Francis Dong
2022-07-05 18:49:02 +08:00
committed by dxfeng10
parent 5d8f417dcb
commit 6622fe20e5
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fizz-common/src/main/java/we/util/NetworkUtils.java
View File

@@ -27,6 +27,7 @@ import java.net.SocketException;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Iterator;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
@@ -49,20 +50,27 @@ public class NetworkUtils {
private static final String SERVER_IP = "SERVER_IP"; private static final String SERVER_IP = "SERVER_IP";
private static final String LOCAL_IP = "127.0.0.1";
private NetworkUtils() { private NetworkUtils() {
} }
/** /**
* @return user settings, or the first one in ip address list. * @return user settings, or the first non local IP of IP address list.
*/ */
public static String getServerIp() { public static String getServerIp() {
if (serverIp == null) { if (serverIp == null) {
serverIp = getServerIps().iterator().next(); for (Iterator<String> iterator = getServerIps().iterator(); iterator.hasNext();) {
serverIp = iterator.next();
if (!LOCAL_IP.equals(serverIp)) {
break;
}
}
} }
return serverIp; return serverIp;
} }
public static Set<String> getServerIps() { public synchronized static Set<String> getServerIps() {
if (serverIps.isEmpty()) { if (serverIps.isEmpty()) {
try { try {
String ip = System.getProperty(SERVER_IP); String ip = System.getProperty(SERVER_IP);