@@ -312,7 +312,6 @@ bool CInfoReport_APIMachine::InfoReport_APIMachine_Hardware(XCHAR* ptszSWInfo, i
312312 SYSTEMAPI_DISK_INFOMATION st_DiskInfo = {};
313313 SYSTEMAPI_CPU_INFOMATION st_CPUInfo = {};
314314 SYSTEMAPI_MEMORY_INFOMATION st_MemoryInfo = {};
315- SYSTEMAPI_SERIAL_INFOMATION st_SDKSerial = {};
316315
317316 if (!SystemApi_HardWare_GetDiskNumber (&pptszRootName, &nDiskNumber))
318317 {
@@ -349,12 +348,6 @@ bool CInfoReport_APIMachine::InfoReport_APIMachine_Hardware(XCHAR* ptszSWInfo, i
349348 InfoReport_dwErrorCode = SystemApi_GetLastError ();
350349 return false ;
351350 }
352- if (!SystemApi_HardWare_GetSerial (&st_SDKSerial))
353- {
354- InfoReport_IsErrorOccur = true ;
355- InfoReport_dwErrorCode = SystemApi_GetLastError ();
356- return false ;
357- }
358351
359352 Json::Value st_JsonRoot;
360353 Json::Value st_JsonDisk;
@@ -375,11 +368,6 @@ bool CInfoReport_APIMachine::InfoReport_APIMachine_Hardware(XCHAR* ptszSWInfo, i
375368 st_JsonMemory[" MemoryFree" ] = (Json::UInt64)st_MemoryInfo.dwMemory_Free ;
376369 st_JsonMemory[" MemoryTotal" ] = (Json::UInt64)st_MemoryInfo.dwMemory_Total ;
377370
378- st_JsonSerial[" DiskSerial" ] = st_SDKSerial.tszDiskSerial ;
379- st_JsonSerial[" CpuSerial" ] = st_SDKSerial.tszCPUSerial ;
380- st_JsonSerial[" BoardSerial" ] = st_SDKSerial.tszBoardSerial ;
381- st_JsonSerial[" SystemSerial" ] = st_SDKSerial.tszSystemSerial ;
382-
383371 int nListCount = 0 ;
384372 XSOCKET_CARDINFO** ppSt_ListIFInfo;
385373 XSocket_Api_GetCardInfo (&ppSt_ListIFInfo, &nListCount);
@@ -398,7 +386,6 @@ bool CInfoReport_APIMachine::InfoReport_APIMachine_Hardware(XCHAR* ptszSWInfo, i
398386 st_JsonRoot[" Disk" ] = st_JsonDisk;
399387 st_JsonRoot[" Cpu" ] = st_JsonCpu;
400388 st_JsonRoot[" Memory" ] = st_JsonMemory;
401- st_JsonRoot[" Serial" ] = st_JsonSerial;
402389 st_JsonRoot[" NetCard" ] = st_JsonNetCard;
403390
404391 if (NULL != pInt_Len)
@@ -443,8 +430,6 @@ bool CInfoReport_APIMachine::InfoReport_APIMachine_Software(XCHAR* ptszSWInfo, i
443430 XCHAR tszOSVersion[256 ] = {};
444431 XCHAR tszOSInfo[256 ] = {};
445432 XCHAR tszUPTime[256 ] = {};
446- XCHAR tszUserName[256 ] = {};
447- XCHAR tszComputerName[256 ] = {};
448433 XENGINE_LIBTIME st_LibTimer = {};
449434
450435 if (!SystemApi_System_GetSystemVer (tszOSInfo, tszOSVersion, tszOSBuild, &nOSProcessor))
@@ -465,13 +450,10 @@ bool CInfoReport_APIMachine::InfoReport_APIMachine_Software(XCHAR* ptszSWInfo, i
465450 InfoReport_dwErrorCode = SystemApi_GetLastError ();
466451 return false ;
467452 }
468- SystemApi_System_GetSysName (tszUserName, tszComputerName);
469-
470453 sprintf (tszUPTime, " %04d-%02d-%02d %02d:%02d:%02d" , st_LibTimer.wYear , st_LibTimer.wMonth , st_LibTimer.wDay , st_LibTimer.wHour , st_LibTimer.wMinute , st_LibTimer.wSecond );
471454
472455 Json::Value st_JsonRoot;
473456 Json::Value st_JsonOSObject;
474- Json::Value st_JsonSystem;
475457
476458 st_JsonOSObject[" OSUPTime" ] = tszUPTime;
477459 st_JsonOSObject[" OSVersion" ] = tszOSInfo;
@@ -480,11 +462,7 @@ bool CInfoReport_APIMachine::InfoReport_APIMachine_Software(XCHAR* ptszSWInfo, i
480462 st_JsonOSObject[" OSArch" ] = (Json::Value::Int)nOSProcessor;
481463 st_JsonOSObject[" OSProcessCount" ] = nProcessCount;
482464
483- st_JsonSystem[" tszUserName" ] = tszUserName;
484- st_JsonSystem[" tszComputerName" ] = tszComputerName;
485-
486465 st_JsonRoot[" OSInfo" ] = st_JsonOSObject;
487- st_JsonRoot[" SystemInfo" ] = st_JsonSystem;
488466
489467 if (NULL != pInt_Len)
490468 {
0 commit comments