Merge branch 'develop'

Author: zouhuajian

redis-manager-dashboard/pom.xml

@@ -59,10 +59,6 @@
             <artifactId>spring-boot-starter-log4j2</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/config/SystemConfig.java

@@ -181,10 +181,10 @@ public boolean getHumpbackEnabled() {
     }
 
     public String getCurrentHost() {
-        String ipAddress = LinuxInfoUtil.getIpAddress();
-        if (Strings.isNullOrEmpty(ipAddress)) {
-            ipAddress = currentHost;
+        String host = currentHost;
+        if (!Strings.isNullOrEmpty(host)) {
+            return currentHost;
         }
-        return ipAddress;
+        return LinuxInfoUtil.getIp();
     }
 }

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/controller/SystemConfigController.java

@@ -46,13 +46,6 @@ public Result getHumpbackEnabled() {
         return Result.successResult(systemConfig.getHumpbackEnabled());
     }
 
-    @Deprecated
-    @RequestMapping(value = "/getServerAddress", method = RequestMethod.GET)
-    @ResponseBody
-    public Result getServerAddress() throws SocketException {
-        return Result.successResult(LinuxInfoUtil.getIpAddress() + SignUtil.COLON + systemConfig.getServerPort());
-    }
-
     @RequestMapping(value = "/getAuthorization", method = RequestMethod.GET)
     @ResponseBody
     public Result getAuthorization() {

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/controller/oauth/AuthService.java

@@ -73,7 +73,7 @@ public boolean signOut() {
         String urlTemplate = "%s/api/%s?callback=%s";
         String authorizationServer = systemConfig.getAuthorizationServer();
         String siteKey = systemConfig.getSiteKey();
-        String serverAddress = LinuxInfoUtil.getIpAddress() + SignUtil.COLON + systemConfig.getServerPort();
+        String serverAddress = LinuxInfoUtil.getIp() + SignUtil.COLON + systemConfig.getServerPort();
         try {
             HttpClientUtil.get(String.format(urlTemplate, authorizationServer, siteKey, serverAddress));
         } catch (IOException e) {

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/plugin/install/InstallationTemplate.java

@@ -610,7 +610,7 @@ private String updateRedisPassword(String redisPassword, Cluster cluster) {
     private String generateConnectionNodes(Cluster cluster) {
         List<RedisNode> masterNodeList = redisService.getRedisMasterNodeList(cluster);
         // 随机选前3个节点
-        StringBuffer nodes = new StringBuffer();
+        StringBuilder nodes = new StringBuilder();
         int size = masterNodeList.size();
         RedisNode redisNode1 = masterNodeList.get(0);
         nodes.append(redisNode1.getHost()).append(COLON).append(redisNode1.getPort());

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/plugin/install/entity/InstallationLogContainer.java

@@ -11,6 +11,8 @@
 import java.util.concurrent.TimeUnit;
 
 /**
+ * TODO: 并发问题
+ *
  * @author Jay.H.Zou
  * @date 4/5/2020
  */

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/plugin/install/service/AbstractNodeOperation.java

@@ -107,7 +107,7 @@ public boolean checkPorts(InstallationParam installationParam) {
             String ip = redisNode.getHost();
             int port = redisNode.getPort();
             // 如果端口能通，则认为该端口被占用
-            if (NetworkUtil.telnet(ip, port)) {
+            if (!NetworkUtil.checkFreePort(ip, port)) {
                 InstallationLogContainer.appendLog(clusterName, "The port has been used, host: " + ip + ", port: " + port);
                 return false;
             }

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/util/LinuxInfoUtil.java

@@ -3,9 +3,12 @@
 import ch.ethz.ssh2.Connection;
 import com.google.common.base.Strings;
 import com.newegg.ec.redis.entity.Machine;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.net.NetworkInterface;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -19,35 +22,39 @@
  */
 public class LinuxInfoUtil {
 
+    private static final Logger logger = LoggerFactory.getLogger(LinuxInfoUtil.class);
+
     public static final String MEMORY_FREE = "memory_free";
 
     public static final String VERSION = "version";
 
     private LinuxInfoUtil() {
     }
 
-    public static String getIpAddress() {
-        /*Enumeration<NetworkInterface> allNetInterfaces = NetworkInterface.getNetworkInterfaces();
-        InetAddress ip;
-        while (allNetInterfaces.hasMoreElements()) {
-            NetworkInterface netInterface = allNetInterfaces.nextElement();
-            if (netInterface.isLoopback() || netInterface.isVirtual() || !netInterface.isUp()) {
-                continue;
-            } else {
-                Enumeration<InetAddress> addresses = netInterface.getInetAddresses();
-                while (addresses.hasMoreElements()) {
-                    ip = addresses.nextElement();
-                    if (ip instanceof Inet4Address) {
-                        return ip.getHostAddress();
+    public static String getIp() {
+        String ip = "";
+        try {
+            for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements(); ) {
+                NetworkInterface intf = en.nextElement();
+                String name = intf.getName();
+                if (!name.contains("docker") && !name.contains("lo")) {
+                    for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements(); ) {
+                        //获得IP
+                        InetAddress inetAddress = enumIpAddr.nextElement();
+                        if (!inetAddress.isLoopbackAddress()) {
+                            String ipAddress = inetAddress.getHostAddress().toString();
+                            if (!ipAddress.contains("::")
+                                    && !ipAddress.contains("0:0:")
+                                    && !ipAddress.contains("fe80")
+                                    && !"127.0.0.1".equals(ip)) {
+                                ip = ipAddress;
+                            }
+                        }
                     }
                 }
             }
-        }*/
-        String ip = "";
-        try {
-            ip = InetAddress.getLocalHost().getHostAddress();
-        } catch (UnknownHostException e) {
-            // TODO Auto-generated catch block
+        } catch (Exception e) {
+            logger.error("get current ip failed.", e);
             ip = null;
         }
         return ip;

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/util/NetworkUtil.java

@@ -22,27 +22,35 @@ public class NetworkUtil {
     private NetworkUtil() {
     }
 
-    /**
-     * 监测端口是否在使用
-     *
-     * @param ip
-     * @param port
-     * @return
-     */
-    public static final boolean telnet(String ip, int port) {
+    public static boolean checkFreePort(String ip, int port) {
+        try {
+            return !connect(ip, port);
+        } catch (Exception e) {
+            logger.info(ip + ":" + port + " is free.");
+            return true;
+        }
+    }
+
+    public static boolean telnet(String ip, int port) {
+        try {
+            return connect(ip, port);
+        } catch (Exception e) {
+            logger.warn(ip + ":" + port + " can't access.");
+            return false;
+        }
+    }
+
+    private static boolean connect(String ip, int port) throws IOException {
         Socket socket = new Socket();
         try {
             socket.connect(new InetSocketAddress(ip, port), TIMEOUT);
             return socket.isConnected();
-        } catch (Exception e) {
-            logger.warn(ip + ":" + port + " can't access.");
         } finally {
             try {
                 socket.close();
             } catch (IOException ignore) {
             }
         }
-        return false;
     }
 
 }

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/util/SSH2Util.java

@@ -128,7 +128,7 @@ public static String unzipToTargetPath(Machine machine, String filePath, String
      * @throws Exception
      */
     public static String mkdir(Machine machine, String path, boolean sudo) throws Exception {
-        StringBuffer command = new StringBuffer();
+        StringBuilder command = new StringBuilder();
         if (sudo) {
             command.append("sudo ");
         }