From 8d405b265285c368df2e9cf1c14acee7532e0ee7 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周四, 29 5月 2025 18:14:38 +0800
Subject: [PATCH] Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop
---
src/inspector/inspector.cpp | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/inspector/inspector.cpp b/src/inspector/inspector.cpp
index 640071d..03cbfac 100644
--- a/src/inspector/inspector.cpp
+++ b/src/inspector/inspector.cpp
@@ -5,13 +5,14 @@
#include <licensecc/licensecc.h>
#include <fstream>
#include <string.h>
+#include <iomanip>
#include "../library/base/string_utils.h"
#include "../library/ini/SimpleIni.h"
#include "../library/os/dmi_info.hpp"
#include "../library/os/cpu_info.hpp"
#include "../library/os/dmi_info.hpp"
#include "../library/os/network.hpp"
-
+//纭欢鐨勮澶囦俊鎭幏鍙�
using namespace std;
using namespace license::os;
@@ -92,9 +93,6 @@
std::cout << x.second << ": NA" << endl;
}
}
- cout << "Virtualiz. class :" << descByVirt.find(exec_env_info.virtualization)->second << endl;
- cout << "Virtualiz. detail:" << descByVirtDetail.find(exec_env_info.virtualization_detail)->second << endl;
- cout << "Cloud provider :" << descByCloudProvider.find(exec_env_info.cloud_provider)->second << endl;
std::vector<license::os::OsAdapterInfo> adapterInfos;
FUNCTION_RETURN ret = license::os::getAdapterInfos(adapterInfos);
@@ -105,10 +103,14 @@
<< static_cast<unsigned int>(osAdapter.ipv4_address[2]) << "-"
<< static_cast<unsigned int>(osAdapter.ipv4_address[1]) << "-"
<< static_cast<unsigned int>(osAdapter.ipv4_address[0]) << "]" << endl;
- cout << " mac address [";
- for (int i = 0; i < 8; i++) {
- // print mac
+ cout << " mac address [" << std::hex;
+ for (int i = 0; i < sizeof(osAdapter.mac_address); i++) {
+ if (i != 0) {
+ cout << ":";
+ }
+ cout << static_cast<unsigned int>(osAdapter.mac_address[i]);
}
+ cout << "]" << std::dec << endl;
}
} else {
cout << "problem in getting adapter informations:" << ret << endl;
@@ -122,7 +124,9 @@
license::os::DmiInfo dmi_info;
cout << "Bios vendor :" << dmi_info.bios_vendor() << endl;
cout << "Bios description :" << dmi_info.bios_description() << endl;
- cout << "System vendor :" << dmi_info.sys_vendor() << endl << endl;
+ cout << "System vendor :" << dmi_info.sys_vendor() << endl;
+ cout << "Cpu Vendor (dmi) :" << dmi_info.cpu_manufacturer() << endl;
+ cout << "Cpu Cores (dmi) :" << dmi_info.cpu_cores() << endl;
cout << "==================" << endl;
if (argc == 2) {
const string fname(argv[1]);
--
Gitblit v1.9.1