feat(etrade_card_client):修改右下角时间控件

修改时间控件，在服务器获取不到当前时间时，获取当前系统时间。

feat(etrade_card_client):修改右下角时间控件
修改时间控件，在服务器获取不到当前时间时，获取当前系统时间。
liuye
1 parent 4235f957
Showing 9 changed files with 27 additions and 170 deletions
etrade_card_client/Config/application_config.json
etrade_card_client/Config/url_cfg.json
etrade_card_client/ETradeClient/browser/async_js_callback_handler.cpp
etrade_card_client/ETradeClient/hardware/DLCardManager.h
etrade_card_client/ETradeClient/hardware/dili_card_device.cpp
etrade_card_client/ETradeClient/hardware/dili_card_device.h
etrade_card_client/ETradeClient/hardware/hardware_cmd.cpp
etrade_card_client/ETradeClient/utility/DLBmpManager.cpp
etrade_card_client/ETradeClient/utility/ETTimeManage.cpp
@@ -9,7 +9,7 @@
 	"client_cert_subject": "*.diligrp.com",
 	"client_cert_filename": "",
 	"client_cert_password": "",
-	"security_level": 0,
+	"security_level": 2,
 	"encrypt_type": 1,
 	"id_reader": 1
 }
 \ No newline at end of file
@@ -9,5 +9,5 @@
 	"user_msg_count_path":"/message/countUserMessage.do", 
 	"user_msg_path":"/message/userMessageInit.page",
 	"modify_pwd_path":"/employee/client/initModifyPassword.page",
-	"server_time_path":"/system/getSystemTime.do"
+	"server_time_path":"/system/getSystemTime.d"
 }
 \ No newline at end of file
@@ -112,7 +112,7 @@ namespace HW
 				HardwareCmd::Reply reply = m_hw_cmd_map.at(hw_req.cmd + hw_req.file_id).Execute(hw_req.data);
 				std::string answer = "";
-				if (boost::iequals(OK, reply.error_code) || boost::iequals("309", reply.error_code)) // Succeed.
+				if (boost::iequals(OK, reply.error_code)) // Succeed.
 					answer = hw_req.cmd + "_ack";
 				else
 					answer = hw_req.cmd + "_failed";
-
-//  作者：刘野
-//  卡片硬件操作库导出接口。
-//  包含dll导出接口和so库导出接口
-
 #ifndef DL_CARD_MANAGER_H
 #define DL_CARD_MANAGER_H
 #define DL_DLL_API extern "C" __declspec(dllexport) 
+DL_DLL_API int __stdcall ConnectDLDevice();
+DL_DLL_API int __stdcall FindDLCard();
+DL_DLL_API int __stdcall AuthenticationDLKey(unsigned char* pKey);
+DL_DLL_API int __stdcall ReadDLCardData(unsigned char* pDirID, unsigned char cFileID, short u16Offset, int u32DateLen, unsigned char* pData, unsigned char* pKey = 0);
+DL_DLL_API int __stdcall WriteDLCardData(unsigned char* pDirID, unsigned char cFileID, unsigned char cOffset, unsigned short cDateLen, unsigned char* pData, unsigned char* pKey);
+DL_DLL_API int __stdcall InstallDLKey(unsigned char* pDirID, unsigned char cKeyID, unsigned char* pNewKey, int iKeyType, unsigned char* pMainKey);
+DL_DLL_API int __stdcall DisconnectDLDevice();
-
-/* 连接读卡器 */
-DL_DLL_API int __stdcall DLCConnectDevice();
-
-/* 关闭读卡器 */
-DL_DLL_API int __stdcall DLCDisconnectDevice();
-
-/* 寻卡 */
-DL_DLL_API int __stdcall DLCFindCard();
-
-/* 
- * 验证秘钥
- * 输入16字节秘钥key_。
- * 返回值返回结果
- * */
-DL_DLL_API int __stdcall DLCAuthenticationKey(const unsigned char* dir, const unsigned char key_id, const unsigned char* key);
-
-/* 
- * 读取数据 
- * 输入dir2字节目录标识、file_id1字节文件标识、read_offset2字节、
- * data_len2字节、read_key16字节读秘钥（没有置空）和read_data（长度依据读取长度而定）。
- * 输出结果填入read_data。
- * */
-DL_DLL_API int __stdcall DLCReadCardData(const unsigned char* dir, const unsigned char file_id, const unsigned int data_offset, const unsigned int data_len, const unsigned char* read_key, unsigned char* read_data);
-
-/*
-* 写入数据
-* 输入dir2字节目录标识、file_id2字节文件标识、read_offset2字节、
-* data_len2字节、read_key16字节读秘钥（没有置空）和read_data（长度依据读取长度而定）。
-* 输出结果填入read_data。
-* */
-DL_DLL_API int __stdcall DLCWriteCardData(const unsigned char* dir, const unsigned char file_id, const unsigned int data_offset, const unsigned int data_len, const unsigned char* write_key, const unsigned char* write_data);
-
-/*
- * 安装/更新秘钥
- * 输入dir2字节目录标识、key_id1字节文件标识、key_type32位秘钥类型、
- * main_key16字节主控秘钥（没有置空）、new_key16字节新秘钥。
- **/
-DL_DLL_API int __stdcall DLCInstallKey(const unsigned char* dir, const unsigned char key_id, const int key_type, const unsigned char* main_key, const unsigned char* new_key);
-
-/*
- * 建立文件
- * 输入parent_dir2字节父目录、parent_key2字节父目录主控秘钥、file_name2字节文件标识、
- * file_size2字节文件大小、safe_type4字节安全类型和file_type4字节文件类型
- **/
-DL_DLL_API int __stdcall DLCCreateFile(const unsigned char* parent_dir, const unsigned char* parent_key, const unsigned char* file_name, const unsigned char* file_size, const int file_type);
-
-
-DL_DLL_API int __stdcall DLCSelectFile(const unsigned char* dir);
-
-//SO库API
-// 
-/* 
- * 该函数用以获取8字节随机数
- * 输入5字节的无符号字符型数组指针，函数将更改数组内容，输出5字节指令。
- * 返回值返回错误码。
- */
-int __stdcall DLCSOGetRandom(unsigned char* get_randam_cmd);
-
-/* 
- * 该函数用于验证秘钥。
- * 输入key_id1字节秘钥标识、key16字节16进制秘钥值和random8字节16进制随机数，返回cmd13字节16进制指令。
- * 返回值返回结果。
- */
-int __stdcall DLCSOAuthenticationKey(const unsigned char key_id, const unsigned char* key, const unsigned char* random, unsigned char* cmd);
-
-/*
- * 该函数用于读取数据。
- * 输入data_offfset数据初始偏移，data_offfset最大为ffff，data_len数据长度，data_len最大为ff，返回16进制cmd指令，cmd数组长度 = data_len + 5。
- * 读出的数据将存在data_中。
- * 返回值返回错误码。
- */
-int __stdcall DLCSOReadData(const unsigned int data_offfset, const unsigned int data_len, unsigned char* cmd);
-
-/*
-* 该函数用于写入数据。
-* 输入write_key字节16进制读秘钥（没有置空）、random8字节16进制随机数(没有置空)、data_offfset2字节数据初始偏移、data_len2字节数据长度和data16进制数据，cmd数组长度 = data_len + 9。
-* 返回值返回错误码。
-*/
-int __stdcall DLCSOWriteData(const unsigned char* write_key, const unsigned char* random, const unsigned int data_offfset, const unsigned int data_len, const unsigned char* data, unsigned char* cmd);
-
-
-/*该函数用于选择目录
- *输入dir两字节16进制目录标识，返回cmd7字节16进制指令
- **/
-int __stdcall DLCSOSelectDir(const unsigned char* dir, unsigned char* cmd);
-
-#endif //end DL_CARD_MANAGER_H
-
+#endif
 \ No newline at end of file
@@ -113,7 +113,7 @@ namespace DILICard
 	{
 		bool bResult = true;
-		int iResult = DLCConnectDevice();
+		int iResult = ConnectDLDevice();
 		if (0 != iResult)
 		{
 			bResult = false;
@@ -124,7 +124,7 @@ namespace DILICard
 	}
 	void RWDevice::Disconnect() const
 	{
-		DLCDisconnectDevice();
+		DisconnectDLDevice();
 	}
 	void RWDevice::Beep(uint32_t time) const
 	{
@@ -134,7 +134,7 @@ namespace DILICard
 	{
 		bool bResult = true;
-		int iResult = DLCFindCard();
+		int iResult = FindDLCard();
 		if (0 != iResult)
 		{
 			bResult = false;
@@ -306,7 +306,7 @@ namespace DILICard
 		//将业务信息文件中的数据长度设置为0.
 		WriteCardFile(DF01_DIR, SERVICE_INFO_FILE_ID, 0/*offset*/, ACTIVATE_KEY_ID, key_F0015_DAMK1, DecToHex(0)); // Default length is 0.
-}
+	}
 	void RWDevice::ResetCard(const std::string& key_DCCK, const std::string& key_F0015_DACK) const
 	{
@@ -457,11 +457,11 @@ namespace DILICard
 		if (NULL != key_id)
 		{
 			memcpy(aucKey, key.c_str(), 32);
-			iResult = DLCReadCardData(aucDir, file_id, offset, length, aucKey, aucData);
+			iResult = ReadDLCardData(aucDir, file_id, offset, length, aucData, aucKey);
 		}
 		else
 		{
-			iResult = DLCReadCardData(aucDir, file_id, offset, length, NULL, aucData);
+			iResult = ReadDLCardData(aucDir, file_id, offset, length, aucData);
 		}
@@ -499,7 +499,7 @@ namespace DILICard
 			{
 				unsigned char aucDataBlock[DATA_MAX_LEN] = { 0 };
 				memcpy(aucDataBlock, data.substr(iStartIndex, DATA_MAX_LEN).c_str(), DATA_MAX_LEN);
-				iResult = DLCWriteCardData(aucDir, file_id, iOffset, DATA_MAX_LEN, aucDataBlock, aucKey);
+				iResult = WriteDLCardData(aucDir, file_id, iOffset, DATA_MAX_LEN, aucDataBlock, aucKey);
 				if (0 != iResult)
 				{
 					err_msg << "Write data to file failed, FILE: " << file_id << ", ErrorCode: " << iResult;
@@ -514,7 +514,7 @@ namespace DILICard
 			{
 				unsigned char aucData[DATA_MAX_LEN] = { 0 };
 				memcpy(aucData, data.substr(iStartIndex, iDataLength).c_str(), iDataLength);
-				iResult = DLCWriteCardData(aucDir, file_id, iOffset, iDataLength, aucData, aucKey);
+				iResult = WriteDLCardData(aucDir, file_id, iOffset, iDataLength, aucData, aucKey);
 				if (0 != iResult)
 				{
 					err_msg << "Write data to file failed, FILE: " << file_id << ", ErrorCode: " << iResult;
@@ -536,7 +536,7 @@ namespace DILICard
 		memcpy(aucDir, dir.c_str(), 4);
 		memcpy(aucMainKey, main_key.c_str(), 32);
 		memcpy(aucNewKey, install_key.c_str(), 32);
-		int iResult = DLCInstallKey(aucDir, key_id, emKeyType, aucNewKey, aucMainKey);
+		int iResult = InstallDLKey(aucDir, key_id, aucNewKey, emKeyType, aucMainKey);
 		if (0 != iResult)
 		{
 			err_msg << "Update key failed, key to be updated: " << install_key << ", ErrorCode: " << iResult;
@@ -544,33 +544,12 @@ namespace DILICard
 		}
 	}
-	void RWDevice::CreateCardFile(const std::string dir, const std::string dir_key, const std::string file_name, const std::string file_size, const int file_type) const
-	{
-		std::stringstream err_msg;
-		unsigned char aucDir[4] = { 0 }, aucKey[32] = { 0 }, aucFileName[4] = { 0 }, aucFileSize[4] = { 0 };
-		memcpy(aucDir, dir.c_str(), 4);
-		memcpy(aucKey, dir_key.c_str(), 32);
-		memcpy(aucFileName, file_name.c_str(), 4);
-		memcpy(aucFileSize, file_size.c_str(), 4);
-		int iResult = DLCCreateFile(aucDir, aucKey, aucFileName, aucFileSize, file_type);
-		if (0 != iResult)
-		{
-			err_msg << "Create file failed, ErrorCode: " << iResult;
-			throw std::exception(err_msg.str().c_str());
-		}
-	}
-
-	bool RWDevice::NeedCreateFile() const
-	{
-		return DLCSelectFile((const unsigned char*)"df20") == 0 ? false : true;
-	}
-
 	bool RWDevice::AuthenticationKey(const std::string sKey) const
 	{
 		bool bResult = true;
 		unsigned char aucKey[32] = { 0 };
 		memcpy(aucKey, sKey.c_str(), 32);
-		int iResult = DLCAuthenticationKey((const unsigned char*)"3f00", 0, aucKey);
+		int iResult = AuthenticationDLKey(aucKey);
 		if (iResult)
 		{
 			bResult = false;
@@ -69,15 +69,6 @@ namespace DILICard
 		std::string ReadCardServiceInfo(const std::string& key_F0015_DEAK) const;
 		void WriteCardServiceInfo(const std::string& key_F0015_DAMK1, const std::string& data) const;
 		bool AuthenticationKey(const std::string sKey) const;
-
-		//´´½¨ÍÑ»ú½»Ò×ËùÐèÎÄ¼þ add by liuye
-		void CreateCardFile(const std::string dir,
-			const std::string dir_key,
-			const std::string file_name,
-			const std::string file_size,
-			const int file_type) const; 
-
-		bool NeedCreateFile() const;
 		enum KeyType
 		{
@@ -43,8 +43,7 @@ namespace StatusCode
 	static const std::string DILI_CARD_DEVICE_READ_SERVICE_INFO_FAILED = "305"; // 读取卡片业务信息失败.
 	static const std::string DILI_CARD_DEVICE_WRITE_SERVICE_INFO_FAILED = "306"; // 写入卡片业务信息失败.
 	static const std::string DILI_CARD_DEVICE_WRITE_UNMATCHED_CARD = "307"; // 写卡卡片的序列号不匹配.
-	static const std::string DILI_CARD_DEVICE_NEED_UPDATE_CAN_NOT_USE = "308"; //卡片需要升级，请升级后继续使用。
-	static const std::string DILI_CARD_DEVICE_NEED_UPDATE_CAN_USE = "309"; //卡片需要升级。
+	static const std::string DILI_CARD_DEVICE_NEED_UPDATE = "308"; //卡片需要升级，请升级后继续使用。
 	static const std::string PWD_MACHINE_CONNECT_FAILED = "401"; // 连接加密机失败.
 	static const std::string PWD_MACHINE_GET_KEY_FAILED = "402"; // 从加密机读取密钥失败.
@@ -469,21 +468,6 @@ ReadPINPadCmd::Reply ActivateDILICardCmd::Execute(const std::string&amp; input)
 			break;
 		}
-		if (dili_card_device.NeedCreateFile())
-		{
-			try
-			{
-				std::string key = "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0";
-				dili_card_device.CreateCardFile("3f00", key, "df20", std::string(), 1);
-				dili_card_device.CreateCardFile("df20", key, "0025", "0324", 3);
-				dili_card_device.CreateCardFile("df20", key, "0026", "0709", 3);
-			}
-			catch (std::exception& ex)
-			{
-				LOG_FATAL(L"创建文件失败失败，错误信息： " + str_2_wstr(ex.what()));
-			}
-		}
-
 		LOG_TRACE(L"计算SN。");
 		card_sn = stuCardBasicInfo.chip_num + std::string("44494c49") + stuCardBasicInfo.chip_num;
@@ -650,7 +634,7 @@ ReadPINPadCmd::Reply ResetDILICardCmd::Execute(const std::string&amp; input)
 			reply.error_code = StatusCode::DILI_CARD_DEVICE_READ_BASIC_INFO_FAILED;
 			break;
 		}
-
+		
 		if (slLevel == HardwareCmd::SL_0)
 		{
 			card_basic_info = stuCardBasicInfo;
@@ -743,7 +727,7 @@ ReadPINPadCmd::Reply ResetDILICardCmd::Execute(const std::string&amp; input)
 			if (!dili_card_device.AuthenticationKey(key_DCCK))
 			{
 				LOG_FATAL(L"秘钥验证失败，卡片需要升级！");
-				reply.error_code = StatusCode::DILI_CARD_DEVICE_NEED_UPDATE_CAN_NOT_USE;
+				reply.error_code = StatusCode::DILI_CARD_DEVICE_NEED_UPDATE;
 				break;
 			}
 		}
@@ -870,24 +854,15 @@ ReadPINPadCmd::Reply ReadDILICardBasicInfoCmd::Execute(const std::string&amp; input)
 			if (!dili_card_device.AuthenticationKey(sDCCK))
 			{
 				LOG_FATAL(L"秘钥验证失败，卡片需要升级！");
-				reply.error_code = StatusCode::DILI_CARD_DEVICE_NEED_UPDATE_CAN_NOT_USE;
+				reply.error_code = StatusCode::DILI_CARD_DEVICE_NEED_UPDATE;
 				break;
 			}
 		}
-
-		if (dili_card_device.NeedCreateFile())
-		{
-			LOG_FATAL(L"卡片需要升级！");
-			reply.error_code = StatusCode::DILI_CARD_DEVICE_NEED_UPDATE_CAN_USE;
-			//启动卡片升级程序 add by liuye
-			ShellExecute(NULL, L"open", L".\\DLCardTool.exe", NULL, NULL, SW_SHOW);
-			//
-		}
-
+		
 	} while (0);
 	dili_card_device.Disconnect();
-	if (boost::iequals(reply.error_code, StatusCode::OK) || boost::iequals(reply.error_code, StatusCode::DILI_CARD_DEVICE_NEED_UPDATE_CAN_USE))
+	if (boost::iequals(reply.error_code, StatusCode::OK))
 		LOG_TRACE(L"读取卡片基本信息成功。");
 	reply.data.put("chipNo", card_basic_info.chip_num);
@@ -72,7 +72,6 @@ string CDLBmpManager::ReadBmp(const char* pBmpName)
 		fBmp.close();
 		string sBmp = Encode(pBuff, iSize);
-
 	} while (0);
 	return sBmp;
@@ -32,7 +32,6 @@ CString CETTimeManage::GetServerTime()
 	try
 	{
 		const uint32_t kHTTPOK = 200;
-
 		WinHttp win_http;
 		auto& url_cfg = URLConfig::Instance();
 		win_http.ConnectHost(url_cfg.Host(), url_cfg.Port(), url_cfg.IsHttps());