#IQRV #comment delete补充，精简函数

Module/mod_accessauth/AccessAuthConn.h

@@ -226,6 +226,7 @@ struct CheckMD5Req
 };
 #pragma pack()
 
+//TODO: CrossPlaform  [Gifur@2025630]
 #ifdef RVC_OS_LINUX
 class CAccessAuthFSM;
 class CAccessAuthGetTokenReq;

Module/mod_accessauth/AccessAuthFSM.cpp

@@ -27,10 +27,10 @@ using namespace PinPad;
 #include <WinCrypt.h>
 #include <Strsafe.h>
 #include "DeviceBaseClass.h"
-#pragma comment(lib, "IPHLPAPI.lib")
 #define ALLOW_MULTI_NETWORKD_CARDS
 #endif // RVC_OS_WIN
 
+//TODO: CrossPlaform  [Gifur@2025630]
 int HexBuf2StrBuf(PBYTE hexBuf, char** strBuf, DWORD len)
 {
 	char* tmpStr = *strBuf;
@@ -870,17 +870,13 @@ DWORD CAccessAuthFSM::GetEncTerminalInfoWithKey(CBlob& encInfo, BYTE* key)
 	strResult = generateJsonStr(termInfo);
 
 	char* pBuf = new char[2048];
-	int len = 0;
-#ifdef RVC_OS_WIN
 	string tmpStr = strResult.second;
+#ifdef RVC_OS_WIN
+	//GBK转UTF8
 	SP::Module::Util::ConvertGBKToUtf8(tmpStr);
-	strcpy(pBuf, tmpStr.c_str()); //GBK转UTF8
-	len = tmpStr.size();
-#else
-	strcpy(pBuf, strResult.second.c_str());
-	len = strResult.second.size();
 #endif // RVC_OS_WIN
-
+	strcpy(pBuf, tmpStr.c_str());
+	int len = tmpStr.size();
 	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("HardWareInfo: %s", pBuf);
 	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("HardWareInfo size: %d", len);
 
@@ -893,8 +889,10 @@ DWORD CAccessAuthFSM::GetEncTerminalInfoWithKey(CBlob& encInfo, BYTE* key)
 		doWarnMsg(ERR_ACCESSAUTH_ENCRYPT_KEY,
 			GetOutPutStr("%s%08X", "CryptEncrypt", rc).c_str());
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)(GetOutPutStr("%s%08X", "CryptEncrypt", rc).c_str());
+		delete[] pBuf;
 		return ERR_ACCESSAUTH_ENCRYPT_KEY;
 	}
+	delete[] pBuf;
 	return Error_Succeed;
 }
 

Module/mod_accessauth/CMakeLists.txt

@@ -48,7 +48,7 @@ target_link_directories(${MODULE_NAME} PRIVATE
 # 添加实体需要依赖的其他共享库（包括系统库）
 set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_ALL_LIBS})#${CONAN_PKG_LIBS_BOOST} RVCCrypt NewRVCCrypt
 if(msvc)
-	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} crypt32)
+	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} crypt32 IPHLPAPI)
 endif(msvc)
 
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} libpublicFun)