ifeat<card_client>:修复扣点收费Bug #15019和华视身份证读卡器问题

Bug #15019：在不加密的情况下，开卡时写卡步骤读取一次卡片以判断读卡器上有无卡片。华视读卡器在读取身份证照片时，路径配置错误，现已修改。

ifeat<card_client>:修复扣点收费Bug #15019和华视身份证读卡器问题
Bug #15019：在不加密的情况下，开卡时写卡步骤读取一次卡片以判断读卡器上有无卡片。华视读卡器在读取身份证照片时，路径配置错误，现已修改。
liuye
1 parent 93bbdaab
Showing 5 changed files with 16 additions and 16 deletions
etrade_card_client/Config/application_config.json
etrade_card_client/ETradeClient.rc
etrade_card_client/ETradeClient/hardware/hardware_cmd.cpp
etrade_card_client/ETradeClient/hardware/id_card_reader.cpp
etrade_card_client/out/Win32/卡务客户端.zip
@@ -9,7 +9,7 @@
 	"client_cert_subject": "*.diligrp.com",
 	"client_cert_filename": "",
 	"client_cert_password": "",
-	"security_level": 1,
+	"security_level": 0,
 	"encrypt_type": 0,
 	"id_reader": 1
 }
 \ No newline at end of file
@@ -245,8 +245,8 @@ END
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,3
- PRODUCTVERSION 1,0,0,3
+ FILEVERSION 1,0,0,4
+ PRODUCTVERSION 1,0,0,4
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -263,12 +263,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "地利集团【DILI GROUP】"
             VALUE "FileDescription", "电子交易结算柜员系统【ETradeClient】"
-            VALUE "FileVersion", "1.0.0.3"
+            VALUE "FileVersion", "1.0.0.4"
             VALUE "InternalName", "ETradeClient.exe"
             VALUE "LegalCopyright", "(C) 地利集团。  保留所有权利。"
             VALUE "OriginalFilename", "ETradeClient.exe"
             VALUE "ProductName", "电子交易结算柜员系统"
-            VALUE "ProductVersion", "1.0.1.181015_Release"
+            VALUE "ProductVersion", "1.0.4.181025_Beta"
         END
     END
     BLOCK "VarFileInfo"
@@ -1025,14 +1025,6 @@ ReadPINPadCmd::Reply WriteDILICardServiceInfoCmd::Execute(const std::string&amp; inp
 			break;
 		}
-		//安全等级都为0了，还写个毛的业务信息，直接返回！
-		if (slLevel == HardwareCmd::SL_0)
-		{
-			reply.error_code == StatusCode::OK;
-			LOG_TRACE(L"读取卡片业务信息成功。");
-			return reply;
-		}
-
 		try
 		{
 			dili_card_device.FindCard();
@@ -1052,7 +1044,15 @@ ReadPINPadCmd::Reply WriteDILICardServiceInfoCmd::Execute(const std::string&amp; inp
 			reply.error_code = StatusCode::DILI_CARD_DEVICE_READ_BASIC_INFO_FAILED;
 			break;
 		}
-		//card_sn = stuCardBasicInfo.device_id;
+
+		//安全等级都为0了，还写个毛的业务信息，直接返回！
+		if (slLevel == HardwareCmd::SL_0)
+		{
+			reply.error_code == StatusCode::OK;
+			reply.data.put("", "");
+			LOG_TRACE(L"读取卡片业务信息成功。");
+			break;
+		}
 		LOG_TRACE(L"计算SN。");
 		std::string sSN;
@@ -137,12 +137,12 @@ void IDCardReader::GetPortraitPath(std::wstring&amp; portrait_path) const
 	wchar_t exe_path[MAX_PATH];
 	HMODULE h_module = GetModuleHandle(NULL);
 	if (NULL != h_module)
-		GetModuleFileName(h_module, exe_path, sizeof(exe_path));
+		GetCurrentDirectory(MAX_PATH, exe_path);
 	else
 		throw std::exception("Calling windows API to get exe path failed.");
 	// @TODO modify the path?
-	std::wstring portrait_path_ = fs::wpath(exe_path).parent_path().wstring() + str_2_wstr("\\" + kPortraitName);
+	std::wstring portrait_path_ = fs::wpath(exe_path).wstring() + str_2_wstr("\\" + kPortraitName);
 	if (!fs::exists(portrait_path_))
 		throw std::exception("ID card portrait image does not exist.");