Преглед изворни кода

#IQRV #comment: updateWK中连接pinpad失败时直接返回

陈纪林80310970 пре 10 месеци
родитељ
комит
943c36e79a
2 измењених фајлова са 4 додато и 2 уклоњено
  1. 2 0
      Module/mod_accessauth/AccessAuthFSM.cpp
  2. 2 2
      Module/mod_accessauth/mod_AccessAuth.cpp

+ 2 - 0
Module/mod_accessauth/AccessAuthFSM.cpp

@@ -283,6 +283,7 @@ struct UpdateWKTask : ITaskSp
 			else
 			{
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Get keyChek && keyIndex failed.");
+				return;
 			}
 
 			pPinPad->GetFunction()->CloseSession();
@@ -290,6 +291,7 @@ struct UpdateWKTask : ITaskSp
 		else
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("connect to pinpad failed.error code:%d", errRc);
+			return;
 		}
 
 		HttpClientResponseResult result;

+ 2 - 2
Module/mod_accessauth/mod_AccessAuth.cpp

@@ -65,7 +65,7 @@ struct InitializerInitMKTask : ITaskSp
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("terminalNo: %s", instanceReq.terminalNo.c_str());
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("terminalVersion: %s", instanceReq.terminalVersion.c_str());
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("user: %s", instanceReq.user.c_str());
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("instanceReq: %d", instanceReq.loginWay);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("loginWay: %d", instanceReq.loginWay);
 
 		CInitlizerMKAns instanceAns;
 
@@ -1013,7 +1013,7 @@ bool CAccessAuthEntity::SendInitMKReqACS(CInitlizerMKReq& initMKReq)
 	ErrorCodeEnum nRet = Error_Unexpect;
 
 	CBlob encInfo;
-	char* hexStr = "21009872C31CBC00D0C8F421D09CF707";
+	char* hexStr = "21009812312131213218F421D09CF123";
 	BYTE key[KEY_SIZE] = { 0 };
 	memcpy(key, ConvertHexStrToBytes(hexStr), KEY_SIZE);
 	//char key[KEY_SIZE] = { 0 };