Merge branch 'compile_upgrade_base230' of http://gitee.itc.cmbchina.cn/QD_RemoteBankArea/LR04.02_RVCTerminalPlus into compile_upgrade_base230

DevAdapter/DeviceSimulator.h

@@ -225,29 +225,28 @@ private:
 //¶ÁÈ¡±¾µØIP¹¦Äܺ¯Êý
 std::string GetLocalIP()
 {
-	return "123";
 #ifdef RVC_OS_WIN
-	//hostent* ent = gethostbyname(NULL);
-	//if (ent && ent->h_addr_list[0] != NULL)
-	//{
-	//	int i = 0;
-	//	for (; ent->h_addr_list[i] != NULL; ++i)
-	//	{
-	//		struct in_addr* in = (struct in_addr*)ent->h_addr_list[i];
-	//		if (in->S_un.S_un_b.s_b1 == 99 || in->S_un.S_un_b.s_b1 == 10)
-	//			break;
-	//	}
+	hostent* ent = gethostbyname(NULL);
+	if (ent && ent->h_addr_list[0] != NULL)
+	{
+		int i = 0;
+		for (; ent->h_addr_list[i] != NULL; ++i)
+		{
+			struct in_addr* in = (struct in_addr*)ent->h_addr_list[i];
+			if (in->S_un.S_un_b.s_b1 == 99 || in->S_un.S_un_b.s_b1 == 10)
+				break;
+		}
 
-	//	if (ent->h_addr_list[i] == NULL)
-	//		i = 0;
+		if (ent->h_addr_list[i] == NULL)
+			i = 0;
 
-	//	auto in = (struct in_addr*)ent->h_addr_list[i];
-	//	char xIP[64] = {};
-	//	sprintf(xIP, "%d.%d.%d.%d", in->S_un.S_un_b.s_b1, in->S_un.S_un_b.s_b2, in->S_un.S_un_b.s_b3, in->S_un.S_un_b.s_b4);
-	//	//LOG4VTM(INFO, ("ip:%s", xIP));
+		auto in = (struct in_addr*)ent->h_addr_list[i];
+		char xIP[64] = {};
+		sprintf(xIP, "%d.%d.%d.%d", in->S_un.S_un_b.s_b1, in->S_un.S_un_b.s_b2, in->S_un.S_un_b.s_b3, in->S_un.S_un_b.s_b4);
+		//LOG4VTM(INFO, ("ip:%s", xIP));
 
-	//	return std::string(xIP);
-	//}
+		return std::string(xIP);
+	}
 #else
 	std::string re = "";
 	int sfd, intr;

DevAdapter/simulator/FingerPrint.1.1/CMakeLists.txt

@@ -37,6 +37,9 @@ target_link_directories(${MODULE_FULL_NAME} PRIVATE
 
 #需要链接的库
 set(${MODULE_PREFIX}_LIBS RestfulFunc ${CONAN_PKG_LIBS_JSONCPP} RVCComm ${VENDOR_LOG_LIB_NAME})
+if(MSVC)
+	list(APPEND ${MODULE_PREFIX}_LIBS Ws2_32 IPHLPAPI)
+endif(MSVC)
 target_link_libraries(
 	${MODULE_FULL_NAME} ${${MODULE_PREFIX}_LIBS} 
 )

DevAdapter/simulator/FingerPrint.7.1/CMakeLists.txt

@@ -36,6 +36,9 @@ target_link_directories(${MODULE_FULL_NAME} PRIVATE
 
 #需要链接的库
 set(${MODULE_PREFIX}_LIBS RestfulFunc ${CONAN_PKG_LIBS_JSONCPP} RVCComm ${VENDOR_LOG_LIB_NAME})
+if(MSVC)
+	list(APPEND ${MODULE_PREFIX}_LIBS Ws2_32 IPHLPAPI)
+endif(MSVC)
 target_link_libraries(
 	${MODULE_FULL_NAME} ${${MODULE_PREFIX}_LIBS} 
 )

DevAdapter/simulator/cardissuer.1.1/CMakeLists.txt

@@ -33,6 +33,9 @@ target_link_directories(${MODULE_FULL_NAME} PRIVATE
 
 #ÐèÒªÁ´½ÓµÄ¿â
 set(${MODULE_PREFIX}_LIBS RestfulFunc ${CONAN_PKG_LIBS_JSONCPP} RVCComm ${VENDOR_LOG_LIB_NAME})
+if(MSVC)
+	list(APPEND ${MODULE_PREFIX}_LIBS Ws2_32 IPHLPAPI)
+endif(MSVC)
 target_link_libraries(
 	${MODULE_FULL_NAME} ${${MODULE_PREFIX}_LIBS} 
 )

DevAdapter/simulator/cardswiper.1.1/CMakeLists.txt

@@ -36,6 +36,9 @@ target_link_directories(${MODULE_FULL_NAME} PRIVATE
 
 #需要链接的库
 set(${MODULE_PREFIX}_LIBS RestfulFunc ${CONAN_PKG_LIBS_JSONCPP} RVCComm ${VENDOR_LOG_LIB_NAME})
+if(MSVC)
+	list(APPEND ${MODULE_PREFIX}_LIBS Ws2_32 IPHLPAPI)
+endif(MSVC)
 target_link_libraries(
 	${MODULE_FULL_NAME} ${${MODULE_PREFIX}_LIBS} 
 )

DevAdapter/simulator/contactlesscard.1.1/CMakeLists.txt

@@ -32,6 +32,9 @@ target_link_directories(${MODULE_FULL_NAME} PRIVATE
 
 #ÐèÒªÁ´½ÓµÄ¿â
 set(${MODULE_PREFIX}_LIBS RestfulFunc ${CONAN_PKG_LIBS_JSONCPP} RVCComm ${VENDOR_LOG_LIB_NAME})
+if(MSVC)
+	list(APPEND ${MODULE_PREFIX}_LIBS Ws2_32 IPHLPAPI)
+endif(MSVC)
 target_link_libraries(
 	${MODULE_FULL_NAME} ${${MODULE_PREFIX}_LIBS} 
 )

DevAdapter/simulator/devctrl.1.1/CMakeLists.txt

@@ -32,6 +32,9 @@ target_link_directories(${MODULE_FULL_NAME} PRIVATE
 
 #ÐèÒªÁ´½ÓµÄ¿â
 set(${MODULE_PREFIX}_LIBS RestfulFunc ${CONAN_PKG_LIBS_JSONCPP} RVCComm ${VENDOR_LOG_LIB_NAME})
+if(MSVC)
+	list(APPEND ${MODULE_PREFIX}_LIBS Ws2_32 IPHLPAPI)
+endif(MSVC)
 target_link_libraries(
 	${MODULE_FULL_NAME} ${${MODULE_PREFIX}_LIBS} 
 )

DevAdapter/simulator/gpio.1.1/CMakeLists.txt

@@ -32,6 +32,9 @@ target_link_directories(${MODULE_FULL_NAME} PRIVATE
 
 #ÐèÒªÁ´½ÓµÄ¿â
 set(${MODULE_PREFIX}_LIBS RestfulFunc ${CONAN_PKG_LIBS_JSONCPP} RVCComm ${VENDOR_LOG_LIB_NAME})
+if(MSVC)
+	list(APPEND ${MODULE_PREFIX}_LIBS Ws2_32 IPHLPAPI)
+endif(MSVC)
 target_link_libraries(
 	${MODULE_FULL_NAME} ${${MODULE_PREFIX}_LIBS} 
 )

DevAdapter/simulator/gpio.1.2/CMakeLists.txt

@@ -32,6 +32,9 @@ target_link_directories(${MODULE_FULL_NAME} PRIVATE
 
 #ÐèÒªÁ´½ÓµÄ¿â
 set(${MODULE_PREFIX}_LIBS RestfulFunc ${CONAN_PKG_LIBS_JSONCPP} RVCComm ${VENDOR_LOG_LIB_NAME})
+if(MSVC)
+	list(APPEND ${MODULE_PREFIX}_LIBS Ws2_32 IPHLPAPI)
+endif(MSVC)
 target_link_libraries(
 	${MODULE_FULL_NAME} ${${MODULE_PREFIX}_LIBS} 
 )

DevAdapter/simulator/hspscanner.1.1/CMakeLists.txt

@@ -31,6 +31,9 @@ target_link_directories(${MODULE_FULL_NAME} PRIVATE
 
 #ÐèÒªÁ´½ÓµÄ¿â
 set(${MODULE_PREFIX}_LIBS RestfulFunc ${CONAN_PKG_LIBS_JSONCPP} RVCComm ${VENDOR_LOG_LIB_NAME})
+if(MSVC)
+	list(APPEND ${MODULE_PREFIX}_LIBS Ws2_32 IPHLPAPI)
+endif(MSVC)
 target_link_libraries(
 	${MODULE_FULL_NAME} ${${MODULE_PREFIX}_LIBS} 
 )

DevAdapter/simulator/idcer.1.1/CMakeLists.txt

@@ -30,8 +30,13 @@ target_link_directories(${MODULE_FULL_NAME} PRIVATE
 	${CONAN_RVCFRAMEWORK_ROOT}/lib
 )
 
+message(STATUS "root: ${CONAN_RVCFRAMEWORK_ROOT}")
+
 #ÐèÒªÁ´½ÓµÄ¿â
 set(${MODULE_PREFIX}_LIBS RestfulFunc ${CONAN_PKG_LIBS_JSONCPP} RVCComm ${VENDOR_LOG_LIB_NAME})
+if(MSVC)
+	list(APPEND ${MODULE_PREFIX}_LIBS Ws2_32 IPHLPAPI)
+endif(MSVC)
 target_link_libraries(
 	${MODULE_FULL_NAME} ${${MODULE_PREFIX}_LIBS} 
 )

DevAdapter/simulator/idcer.1.1/idcer.cmbsz.cpp

@@ -605,6 +605,18 @@ DEVICEBASE_API ErrorCodeEnum CreateDevComponent(DeviceBaseClass*& pBaseObj)
     pBaseObj = new IDCerClassImpl();
     if (pBaseObj == NULL)
         return Error_Resource;
+
+    cmb::log_init_config config;
+    config.dev_name = "vendor_IDCertificate";
+#ifdef RVC_OS_WIN
+    config.log_dir = ("D:\\rvc\\dbg\\");
+#else
+    config.log_dir = ("/opt/rvc/dbg/");
+#endif 
+    std::string str;
+    cmb::log4vendor::init(config, str);
+    printf("init after: %s\n", str.c_str());
+
     return Error_Succeed;
 }
 DEVICEBASE_API ErrorCodeEnum ReleaseDevComponent(DeviceBaseClass*& pBaseObj)

DevAdapter/simulator/pinpad.1.1/CMakeLists.txt

@@ -36,6 +36,9 @@ target_link_directories(${MODULE_FULL_NAME} PRIVATE
 
 #需要链接的库
 set(${MODULE_PREFIX}_LIBS RestfulFunc ${CONAN_PKG_LIBS_JSONCPP} RVCComm ${VENDOR_LOG_LIB_NAME})
+if(MSVC)
+	list(APPEND ${MODULE_PREFIX}_LIBS Ws2_32 IPHLPAPI)
+endif(MSVC)
 target_link_libraries(
 	${MODULE_FULL_NAME} ${${MODULE_PREFIX}_LIBS} 
 )