fix: 调整linux信息
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
package org.wfc.common.license.license;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
@@ -10,10 +12,11 @@ import java.util.stream.Collectors;
|
||||
/**
|
||||
* 用于获取客户Linux服务器的基本信息
|
||||
*/
|
||||
@Slf4j
|
||||
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"};
|
||||
private final String[] CPU_SHELL = {"/bin/bash", "-c", "sudo dmidecode -t processor | grep 'ID' | awk -F ':' '{print $2}' | head -n 1"};
|
||||
private final String[] MAIN_BOARD_SHELL = {"/bin/bash", "-c", "sudo dmidecode | grep 'Serial Number' | awk -F ':' '{print $2}' | head -n 1"};
|
||||
|
||||
@Override
|
||||
protected List<String> getIpAddress() throws Exception {
|
||||
@@ -47,7 +50,7 @@ public class LinuxServerInfos extends AbstractServerInfos {
|
||||
@Override
|
||||
protected String getCPUSerial() throws Exception {
|
||||
String result = "";
|
||||
String CPU_ID_CMD = "dmidecode";
|
||||
String CPU_ID_CMD = "sudo dmidecode";
|
||||
BufferedReader bufferedReader = null;
|
||||
Process p = null;
|
||||
try {
|
||||
@@ -65,7 +68,7 @@ public class LinuxServerInfos extends AbstractServerInfos {
|
||||
}
|
||||
}
|
||||
} catch (IOException e) {
|
||||
System.out.println("获取cpu硬件信息失败 " + e);
|
||||
log.error("获取cpu硬件信息失败", e);
|
||||
}
|
||||
return result.trim();
|
||||
// return GxServerSerialHelper.getLinuxSerial(CPU_SHELL);
|
||||
@@ -74,7 +77,7 @@ public class LinuxServerInfos extends AbstractServerInfos {
|
||||
@Override
|
||||
protected String getMainBoardSerial() throws Exception {
|
||||
String result = "";
|
||||
String maniBord_cmd = "dmidecode | grep 'Serial Number' | awk '{print $3}' | tail -1";
|
||||
String maniBord_cmd = "sudo dmidecode | grep 'Serial Number' | awk '{print $3}' | tail -1";
|
||||
Process p;
|
||||
try {
|
||||
p = Runtime.getRuntime().exec(new String[]{"sh", "-c", maniBord_cmd});// 管道
|
||||
@@ -86,7 +89,7 @@ public class LinuxServerInfos extends AbstractServerInfos {
|
||||
}
|
||||
br.close();
|
||||
} catch (IOException e) {
|
||||
System.out.println("获取主板信息错误" + e);
|
||||
log.error("获取主板信息错误", e);
|
||||
}
|
||||
return result;
|
||||
// return GxServerSerialHelper.getLinuxSerial(MAIN_BOARD_SHELL);
|
||||
|
||||
Reference in New Issue
Block a user