fix: 获取linux信息

src/main/java/org/wfc/common/license/license/LinuxServerInfos.java

@@ -1,8 +1,7 @@
 package org.wfc.common.license.license;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.InetAddress;
 import java.util.List;
@@ -13,6 +12,9 @@ import java.util.stream.Collectors;
  */
 public class LinuxServerInfos extends AbstractServerInfos {
 
+    private final String[] CPU_SHELL = {"/bin/bash", "-c", "dmidecode -t processor | grep 'ID' | awk -F ':' '{print $2}' | head -n 1"};
+    private final String[] MAIN_BOARD_SHELL = {"/bin/bash", "-c", "dmidecode | grep 'Serial Number' | awk -F ':' '{print $2}' | head -n 1"};
+
     @Override
     protected List<String> getIpAddress() throws Exception {
         List<String> result = null;
@@ -44,43 +46,49 @@ public class LinuxServerInfos extends AbstractServerInfos {
 
     @Override
     protected String getCPUSerial() throws Exception {
-        //序列号
+        String result = "";
-        String serialNumber = "";
+        String CPU_ID_CMD = "dmidecode";
-
+        BufferedReader bufferedReader = null;
-        //使用dmidecode命令获取CPU序列号
+        Process p = null;
-        String[] shell = {"/bin/bash", "-c", "sudo dmidecode -t processor | grep 'ID' | awk -F ':' '{print $2}' | head -n 1"};
+        try {
-        Process process = Runtime.getRuntime().exec(shell);
+            p = Runtime.getRuntime().exec(new String[]{"sh", "-c", CPU_ID_CMD});// 管道
-        process.getOutputStream().close();
+            bufferedReader = new BufferedReader(new InputStreamReader(p.getInputStream()));
-
+            String line = null;
-        BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+            int index = -1;
-
+            while ((line = bufferedReader.readLine()) != null) {
-        String line = reader.readLine().trim();
+                // 寻找标示字符串[hwaddr]
-        if (StringUtils.isNotBlank(line)) {
+                index = line.toLowerCase().indexOf("uuid");
-            serialNumber = line;
+                if (index >= 0) {// 找到了
+                    // 取出mac地址并去除2边空格
+                    result = line.substring(index + "uuid".length() + 1).trim();
+                    break;
+                }
+            }
+        } catch (IOException e) {
+            System.out.println("获取cpu硬件信息失败 " + e);
         }
-
+        return result.trim();
-        reader.close();
+//      return GxServerSerialHelper.getLinuxSerial(CPU_SHELL);
-        return serialNumber;
     }
 
     @Override
     protected String getMainBoardSerial() throws Exception {
-        //序列号
+        String result = "";
-        String serialNumber = "";
+        String maniBord_cmd = "dmidecode | grep 'Serial Number' | awk '{print $3}' | tail -1";
-
+        Process p;
-        //使用dmidecode命令获取主板序列号
+        try {
-        String[] shell = {"/bin/bash", "-c", "sudo dmidecode | grep 'Serial Number' | awk -F ':' '{print $2}' | head -n 1"};
+            p = Runtime.getRuntime().exec(new String[]{"sh", "-c", maniBord_cmd});// 管道
-        Process process = Runtime.getRuntime().exec(shell);
+            BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
-        process.getOutputStream().close();
+            String line;
-
+            while ((line = br.readLine()) != null) {
-        BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+                result += line;
-
+                break;
-        String line = reader.readLine().trim();
+            }
-        if (StringUtils.isNotBlank(line)) {
+            br.close();
-            serialNumber = line;
+        } catch (IOException e) {
+            System.out.println("获取主板信息错误" + e);
         }
-
+        return result;
-        reader.close();
+//      return GxServerSerialHelper.getLinuxSerial(MAIN_BOARD_SHELL);
-        return serialNumber;
     }
 }