Commit d4ce78b1f685e788bbfd997d92db3d9ab95cc6bc
1 parent
93bbdaab
ifeat<card_client>:修复扣点收费Bug #15019和华视身份证读卡器问题
Bug #15019：在不加密的情况下，开卡时写卡步骤读取一次卡片以判断读卡器上有无卡片。 华视读卡器在读取身份证照片时，路径配置错误，现已修改。
Showing
5 changed files
with
16 additions
and
16 deletions
etrade_card_client/Config/application_config.json
etrade_card_client/ETradeClient.rc
| ... | ... | @@ -245,8 +245,8 @@ END |
| 245 | 245 | // |
| 246 | 246 | |
| 247 | 247 | VS_VERSION_INFO VERSIONINFO |
| 248 | - FILEVERSION 1,0,0,3 | |
| 249 | - PRODUCTVERSION 1,0,0,3 | |
| 248 | + FILEVERSION 1,0,0,4 | |
| 249 | + PRODUCTVERSION 1,0,0,4 | |
| 250 | 250 | FILEFLAGSMASK 0x3fL |
| 251 | 251 | #ifdef _DEBUG |
| 252 | 252 | FILEFLAGS 0x1L |
| ... | ... | @@ -263,12 +263,12 @@ BEGIN |
| 263 | 263 | BEGIN |
| 264 | 264 | VALUE "CompanyName", "地利集团【DILI GROUP】" |
| 265 | 265 | VALUE "FileDescription", "电子交易结算柜员系统【ETradeClient】" |
| 266 | - VALUE "FileVersion", "1.0.0.3" | |
| 266 | + VALUE "FileVersion", "1.0.0.4" | |
| 267 | 267 | VALUE "InternalName", "ETradeClient.exe" |
| 268 | 268 | VALUE "LegalCopyright", "(C) 地利集团。 保留所有权利。" |
| 269 | 269 | VALUE "OriginalFilename", "ETradeClient.exe" |
| 270 | 270 | VALUE "ProductName", "电子交易结算柜员系统" |
| 271 | - VALUE "ProductVersion", "1.0.1.181015_Release" | |
| 271 | + VALUE "ProductVersion", "1.0.4.181025_Beta" | |
| 272 | 272 | END |
| 273 | 273 | END |
| 274 | 274 | BLOCK "VarFileInfo" | ... | ... |
etrade_card_client/ETradeClient/hardware/hardware_cmd.cpp
| ... | ... | @@ -1025,14 +1025,6 @@ ReadPINPadCmd::Reply WriteDILICardServiceInfoCmd::Execute(const std::string& inp |
| 1025 | 1025 | break; |
| 1026 | 1026 | } |
| 1027 | 1027 | |
| 1028 | - //安全等级都为0了，还写个毛的业务信息，直接返回！ | |
| 1029 | - if (slLevel == HardwareCmd::SL_0) | |
| 1030 | - { | |
| 1031 | - reply.error_code == StatusCode::OK; | |
| 1032 | - LOG_TRACE(L"读取卡片业务信息成功。"); | |
| 1033 | - return reply; | |
| 1034 | - } | |
| 1035 | - | |
| 1036 | 1028 | try |
| 1037 | 1029 | { |
| 1038 | 1030 | dili_card_device.FindCard(); |
| ... | ... | @@ -1052,7 +1044,15 @@ ReadPINPadCmd::Reply WriteDILICardServiceInfoCmd::Execute(const std::string& inp |
| 1052 | 1044 | reply.error_code = StatusCode::DILI_CARD_DEVICE_READ_BASIC_INFO_FAILED; |
| 1053 | 1045 | break; |
| 1054 | 1046 | } |
| 1055 | - //card_sn = stuCardBasicInfo.device_id; | |
| 1047 | + | |
| 1048 | + //安全等级都为0了，还写个毛的业务信息，直接返回！ | |
| 1049 | + if (slLevel == HardwareCmd::SL_0) | |
| 1050 | + { | |
| 1051 | + reply.error_code == StatusCode::OK; | |
| 1052 | + reply.data.put("", ""); | |
| 1053 | + LOG_TRACE(L"读取卡片业务信息成功。"); | |
| 1054 | + break; | |
| 1055 | + } | |
| 1056 | 1056 | |
| 1057 | 1057 | LOG_TRACE(L"计算SN。"); |
| 1058 | 1058 | std::string sSN; | ... | ... |
etrade_card_client/ETradeClient/hardware/id_card_reader.cpp
| ... | ... | @@ -137,12 +137,12 @@ void IDCardReader::GetPortraitPath(std::wstring& portrait_path) const |
| 137 | 137 | wchar_t exe_path[MAX_PATH]; |
| 138 | 138 | HMODULE h_module = GetModuleHandle(NULL); |
| 139 | 139 | if (NULL != h_module) |
| 140 | - GetModuleFileName(h_module, exe_path, sizeof(exe_path)); | |
| 140 | + GetCurrentDirectory(MAX_PATH, exe_path); | |
| 141 | 141 | else |
| 142 | 142 | throw std::exception("Calling windows API to get exe path failed."); |
| 143 | 143 | |
| 144 | 144 | // @TODO modify the path? |
| 145 | - std::wstring portrait_path_ = fs::wpath(exe_path).parent_path().wstring() + str_2_wstr("\\" + kPortraitName); | |
| 145 | + std::wstring portrait_path_ = fs::wpath(exe_path).wstring() + str_2_wstr("\\" + kPortraitName); | |
| 146 | 146 | if (!fs::exists(portrait_path_)) |
| 147 | 147 | throw std::exception("ID card portrait image does not exist."); |
| 148 | 148 | ... | ... |
etrade_card_client/out/Win32/卡务客户端.zip deleted
100644 → 0
No preview for this file type