Z991239-6316 #comment feat: 规范日志

Signed-Off-By: commit-hook

Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp

@@ -1743,7 +1743,7 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
 			}
 			else
 			{
-				SetErrorAndLog(eErrDev, MEC_DEVAPI_CARDISSUER_GetSlotSum, "DevAdapter::GetSlotSum", __FUNCTION__, false, l_endTime - l_beginTime, "", "OpenDevice::GetSlotSum err");
+				SetErrorAndLog(eErrDev, MEC_DEVAPI_CARDISSUER_GetSlotSum, "DevAdapter::GetSlotSum", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 			}
 
 			errMsg = CSimpleStringA::Format("max slot num:%d", m_maxSlot);
@@ -2370,7 +2370,7 @@ int CCardIssuerFSM::CaptureCard(SpReqAnsContext<CardIssuerStoreService_Capture_R
 
 
 		if (eErr != Error_Succeed) {
-			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "CaptureCard::SetCardInType fail");
+			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 		}
 		else {
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetCardInType").setCostTime(l_endTime - l_beginTime)("CaptureCard::SetCardInType");
@@ -2453,7 +2453,7 @@ int CCardIssuerFSM::WaitFetchingCard()
 
 
 				if (eErr != Error_Succeed) {
-					SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "WaitFetchingCard::SetCardInType(CI_CARD_IN_TYPE_FORBIDDEN) fail");
+					SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 				}
 				else {
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetCardInType").setCostTime(l_endTime - l_beginTime)("WaitFetchingCard::SetCardInType");
@@ -2523,7 +2523,7 @@ int CCardIssuerFSM::InternalAcceptCard()
 				}
 				if (Error_Succeed != eErr) {
 					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("InternalAcceptCard::SetCardInType(CI_CARD_IN_TYPE_ALL) fail");
-					SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "InternalAcceptCard::SetCardInType(CI_CARD_IN_TYPE_ALL) fail");
+					SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 				}
 				else {
 					bHasSetCardInType = true;
@@ -2549,7 +2549,7 @@ Err:
 	if (Error_Succeed != eErr)
 	{
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("InternalAcceptCard::SetCardInType(CI_CARD_IN_TYPE_FORBIDDEN) fail");
-		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "InternalAcceptCard::SetCardInType(CI_CARD_IN_TYPE_FORBIDDEN) fail");
+		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 
 	}
 	else {
@@ -2576,7 +2576,7 @@ Err:
 
 					if (eErr != Error_Succeed) {
 						DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("InternalAcceptCard::SetCardInType(CI_CARD_IN_TYPE_FORBIDDEN) fail");
-						SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "InternalAcceptCard::SetCardInType(CI_CARD_IN_TYPE_FORBIDDEN) fail");
+						SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 					}
 					else {
 						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetCardInType").setCostTime(l_endTime - l_beginTime)("InternalAcceptCard::SetCardInType CI_MEDIA_PRESENT CI_CARD_IN_TYPE_FORBIDDEN");
@@ -2767,7 +2767,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStoreService_Read
 				magTracks.track[1].eStatus, magTracks.track[2].eStatus, magTracks.track[1].dwSize, magTracks.track[2].dwSize);
 		}
 		else {
-			SetErrorAndLog(eMagReadErr, MEC_DEVAPI_CARDISSUER_MagRead, "DevAdapter::MagRead", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadCard_Contact::MagRead fail");
+			SetErrorAndLog(eMagReadErr, MEC_DEVAPI_CARDISSUER_MagRead, "DevAdapter::MagRead", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 		}
 
 		//oilyang@20230204 copy mag data for RF
@@ -3030,7 +3030,7 @@ int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStoreService_Read_Req,
 	if (eErr != Error_Succeed)
 	{
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ReadCard_RF::MoveCard(CI_MOVECARD_RF_POSITION) fail");
-		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadCard_RF::MoveCard err");
+		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 	}
 	else {
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime)("ReadCard_RF::MoveCard");
@@ -4389,7 +4389,7 @@ int CCardIssuerFSM::WriteCard(SpReqAnsContext<CardIssuerStoreService_WriteTrack_
 	if (eErr != Error_Succeed)
 	{
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("WriteCard::MagWrite fail");
-		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MagWrite, "DevAdapter::MagWrite", __FUNCTION__, false, l_endTime - l_beginTime, "", "WriteCard::MagWrite fail");
+		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MagWrite, "DevAdapter::MagWrite", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 		ret = 1;
 	}
 	else {
@@ -4653,7 +4653,7 @@ ErrorCodeEnum CCardIssuerFSM::MachineMoveCardBackNotHold()
 	//2016-11-10 14:30:54 joseph
 	if (eMoveNotHold != Error_Succeed)
 	{
-		SetErrorAndLog(eMoveNotHold, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "MachineMoveCardBackNotHold::MoveCard fail");
+		SetErrorAndLog(eMoveNotHold, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 		return eMoveNotHold;
 	}
 	else {
@@ -6179,7 +6179,7 @@ int CCardIssuerFSM::AddCardToStoreStepFirst(SpReqAnsContext<CardIssuerStoreServi
 		}
 		else
 		{
-			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "AddCardToStoreStepFirst::MoveCard fail");
+			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 		}
 			
 		if (!bTrans)//兼容未做卡库api返回故障码细化改造的卡库厂商
@@ -6327,7 +6327,7 @@ int CCardIssuerFSM::FindFirstEmptySlot()
 
 	if (eErr != Error_Succeed)
 	{
-		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_QuerySlotsStatus, "DevAdapter::QuerySlotsStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "FindFirstEmptySlot::QuerySlotsStatus fail");
+		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_QuerySlotsStatus, "DevAdapter::QuerySlotsStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 		return -1;
 	}
 	else {
@@ -7110,7 +7110,7 @@ void CCardIssuerFSM::QueryCIStatus(SpReqAnsContext<CardIssuerStoreService_QueryC
 	l_endTime = GetTickCountRVC();
 
 	if (errCode != Error_Succeed) {
-		DWORD dwTmpUserErrCode = SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "QueryCiStatus::GetDevStatus fail");
+		DWORD dwTmpUserErrCode = SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 		ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 	}
 	else
@@ -7235,10 +7235,10 @@ int CCardIssuerFSM::EjectJS(SpReqAnsContext<CardIssuerStoreService_EjectJS_Req,
 	if (eErr != Error_Succeed) {
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("EjectJS::MoveCard(CI_MOVECARD_FRONT_GATE) err");
 		if (IsInBusiness() && ctx != NULL ) {
-			dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FRONT_GATE, "DevAdapter::MoveCard", __FUNCTION__, true, l_endTime - l_beginTime, "QLR040222042", "EjectJS::MoveCard(CI_MOVECARD_FRONT_GATE) err");
+			dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FRONT_GATE, "DevAdapter::MoveCard", __FUNCTION__, true, l_endTime - l_beginTime, "QLR040222042", "");
 		}
 		else {
-			dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FRONT_GATE, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222042", "EjectJS::MoveCard(CI_MOVECARD_FRONT_GATE) err");
+			dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FRONT_GATE, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222042", "");
 		}
 
 		if (ctx != NULL) {
@@ -7274,7 +7274,7 @@ int CCardIssuerFSM::EjectJS(SpReqAnsContext<CardIssuerStoreService_EjectJS_Req,
 
 					if (eErr != Error_Succeed) {
 						DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("EjectJS::SetCardInType(CI_CARD_IN_TYPE_FORBIDDEN) err");
-						SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222042", "EjectJS::SetCardInType(CI_CARD_IN_TYPE_FORBIDDEN) err");
+						SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222042", "");
 					}
 					else {
 						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetCardInType").setCostTime(l_endTime - l_beginTime)("EjectJS::SetCardInType");
@@ -7326,7 +7326,7 @@ int CCardIssuerFSM::EjectJS(SpReqAnsContext<CardIssuerStoreService_EjectJS_Req,
 
 			if (eErrSet != Error_Succeed) {
 				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("EjectJS::SetCardInType err");
-				SetErrorAndLog(eErrSet, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222042", "EjectJS::SetCardInType err");
+				SetErrorAndLog(eErrSet, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222042", "");
 			}
 			else {
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetCardInType").setCostTime(l_endTime - l_beginTime)("EjectJS::SetCardInType");
@@ -7341,7 +7341,7 @@ int CCardIssuerFSM::EjectJS(SpReqAnsContext<CardIssuerStoreService_EjectJS_Req,
 		else {
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("EjectJS::MoveCard(CI_MOVECARD_BACK_NOT_HOLD) err");
 
-			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222042", "EjectJS::MoveCard(CI_MOVECARD_BACK_NOT_HOLD) err");
+			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222042", "");
 
 			//超时吞卡失败
 			LogWarn(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_Forget_Fetch_Card_Capture_Fail, "forget fetch card ,capture fail");
@@ -7385,7 +7385,7 @@ int CCardIssuerFSM::CaptureJS(SpReqAnsContext<CardIssuerStoreService_CaptureJS_R
 
 			if (eErrSet != Error_Succeed) {
 				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CaptureJS::SetCardInType err");
-				SetErrorAndLog(eErrSet, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222043", "CaptureJS::SetCardInType err");
+				SetErrorAndLog(eErrSet, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222043", "");
 			}
 			else {
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetCardInType").setCostTime(l_endTime - l_beginTime)("CaptureJS::SetCardInType");
@@ -7423,7 +7423,7 @@ int CCardIssuerFSM::CaptureJS(SpReqAnsContext<CardIssuerStoreService_CaptureJS_R
 
 		if (eErrSet != Error_Succeed) {
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CaptureJS::SetCardInType err");
-			SetErrorAndLog(eErrSet, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222043", "CaptureJS::SetCardInType err");
+			SetErrorAndLog(eErrSet, MEC_DEVAPI_CARDISSUER_SetCardInType, "DevAdapter::SetCardInType", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222043", "");
 		}
 		else {
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetCardInType").setCostTime(l_endTime - l_beginTime)("CaptureJS::SetCardInType");
@@ -7432,10 +7432,10 @@ int CCardIssuerFSM::CaptureJS(SpReqAnsContext<CardIssuerStoreService_CaptureJS_R
 	else {
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CaptureJS::MoveCard(CI_MOVECARD_BACK_NOT_HOLD) err");
 		if (ctx != NULL && IsInBusiness()) {
-			dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, true, l_endTime - l_beginTime, "QLR040222043", "CaptureJS::MoveCard(CI_MOVECARD_BACK_NOT_HOLD) err");
+			dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, true, l_endTime - l_beginTime, "QLR040222043", "");
 		}
 		else {
-			dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222043", "CaptureJS::MoveCard(CI_MOVECARD_BACK_NOT_HOLD) err");
+			dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222043", "");
 		}
 		ret = 1;
 	}
@@ -7478,7 +7478,7 @@ int CCardIssuerFSM::ReadBatchCardInfoInRangeJS(SpReqAnsContext<CardIssuerStoreSe
 	if (eErr != Error_Succeed)
 	{
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ReadBatchCardInfoInRangeJS::QuerySlotsStatus err");
-		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_QuerySlotsStatus, "DevAdapter::QuerySlotsStatus", __FUNCTION__, false, l_endTime - l_beginTime, "QLR0402220100", "ReadBatchCardInfoInRangeJS::QuerySlotsStatus err");
+		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_QuerySlotsStatus, "DevAdapter::QuerySlotsStatus", __FUNCTION__, false, l_endTime - l_beginTime, "QLR0402220100", "");
 		ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_KakuQuerySlot_Failed);
 		return 0;
 	}
@@ -7614,7 +7614,7 @@ int CCardIssuerFSM::GetCardInStoreJS(SpReqAnsContext<CardIssuerStoreService_GetC
 	else
 	{
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("GetCardInStoreJS::QuerySlotsStatus err");
-		DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_QuerySlotsStatus, "DevAdapter::QuerySlotsStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "GetCardInStoreJS::QuerySlotsStatus err");
+		DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_QuerySlotsStatus, "DevAdapter::QuerySlotsStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 		ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 	}
 	return 0;
@@ -7735,7 +7735,7 @@ int CCardIssuerFSM::AddAndReadCardFromBoxJS(SpReqAnsContext<CardIssuerStoreServi
 		else {
 			//读卡失败
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("AddAndReadCardFromBoxJS::ReadAccount err");
-			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReadAccount, "DevAdapter::ReadAccount", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222062", "AddAndReadCardFromBoxJS::ReadAccount err");
+			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReadAccount, "DevAdapter::ReadAccount", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222062", "");
 			ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_CaptureCard_AddCard_ReadFailed);
 			return 0;//跳到S4
 		}
@@ -7751,7 +7751,7 @@ int CCardIssuerFSM::AddAndReadCardFromBoxJS(SpReqAnsContext<CardIssuerStoreServi
 			dwTmpUserErrCode = CardIssuerStore_UserErrorCode_Dev_HopperHasNoCard;
 			LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_Dev_HopperHasNoCard, "AddAndReadCardFromBoxJS::MoveCard, Hopper has no card");
 		}else{
-			dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222062", "AddAndReadCardFromBoxJS::MoveCard err");
+			dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222062", "");
 		}
 
 		ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
@@ -7794,7 +7794,7 @@ int CCardIssuerFSM::AddCardFromBoxJS(SpReqAnsContext<CardIssuerStoreService_AddC
 			LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_Dev_HopperHasNoCard, "AddCardFromBoxJS::MoveCard, Hopper has no card");
 		}
 		else {
-			dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222053", "AddCardFromBoxJS::MoveCard err");
+			dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222053", "");
 		}
 		ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 		return 1;//跳到S2
@@ -7871,7 +7871,7 @@ int CCardIssuerFSM::MoveAndReadCardFromSlotJS(SpReqAnsContext<CardIssuerStoreSer
 		}
 		else {
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("MoveAndReadCardFromSlotJS::ReadAccount err");
-			DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReadAccount, "DevAdapter::ReadAccount", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222063", "MoveAndReadCardFromSlotJS::ReadAccount err");
+			DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReadAccount, "DevAdapter::ReadAccount", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222063", "");
 			ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 			return 0;//跳到S4
 		}
@@ -7879,7 +7879,7 @@ int CCardIssuerFSM::MoveAndReadCardFromSlotJS(SpReqAnsContext<CardIssuerStoreSer
 	else
 	{
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("MoveAndReadCardFromSlotJS::MoveCardFromSlot err");
-		DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardFromSlot, "DevAdapter::MoveCardFromSlot", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222063", "MoveAndReadCardFromSlotJS::MoveCardFromSlot err");
+		DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardFromSlot, "DevAdapter::MoveCardFromSlot", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222063", "");
 		ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 		return 1;//跳到S2
 	}	
@@ -7969,7 +7969,7 @@ int CCardIssuerFSM::MoveBacktoSlotJS(SpReqAnsContext<CardIssuerStoreService_Move
 	else {
 		//移动失败
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("MoveBacktoSlotJS::MoveCardToSlot fail (slot:%d)", slot);
-		DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, "DevAdapter::MoveCardToSlot", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222064", "MoveBacktoSlotJS::MoveCardToSlot fail");
+		DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, "DevAdapter::MoveCardToSlot", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222064", "");
 		ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 		return 0;//跳到S4
 	}
@@ -8004,7 +8004,7 @@ bool CCardIssuerFSM::OperateNewCardStore(int slot, CSimpleStringA& addCardNo, CS
 		}
 		else {
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("OperateNewCardStore::ReadAccount fail");
-			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReadAccount, "DevAdapter::ReadAccount", __FUNCTION__, false, l_endTime - l_beginTime, "QLR0402220100", "OperateNewCardStore::ReadAccount fail");
+			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReadAccount, "DevAdapter::ReadAccount", __FUNCTION__, false, l_endTime - l_beginTime, "QLR0402220100", "");
 		}
 
 		//LogWarn(Severity_Low, Error_Unexpect, CardIssuerStore_UserErrorCode_ReadAccount_Cost_Time, CSimpleStringA::Format("{\"cost\":%d}", l_endTime - l_beginTime));
@@ -8700,7 +8700,7 @@ int CCardIssuerFSM::ReadJS(SpReqAnsContext<CardIssuerStoreService_ReadJS_Req, Ca
 	else
 	{
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ReadJS::GetDevStatus err");
-		DWORD dwTmpUserErrCode = SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadJS::GetDevStatus err");
+		DWORD dwTmpUserErrCode = SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 		ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 		return 0;
 	}
@@ -8921,7 +8921,7 @@ int CCardIssuerFSM::ReadMag(SpReqAnsContext<CardIssuerStoreService_ReadJS_Req, C
 		}
 		else {
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ReadMag::MagRead fail");
-			SetErrorAndLog(eMagReadErr, MEC_DEVAPI_CARDISSUER_MagRead, "DevAdapter::MagRead", __FUNCTION__, false, l_endTime - l_beginTime, "", "ReadMag::MagRead fail");
+			SetErrorAndLog(eMagReadErr, MEC_DEVAPI_CARDISSUER_MagRead, "DevAdapter::MagRead", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 			bReadMag = false;//读卡失败
 			ctx->Ans.magStatus = 0;//失败
 			ctx->Ans.track1 = "";
@@ -9131,7 +9131,7 @@ int CCardIssuerFSM::CheckCardType(CSimpleStringA cardNo, bool bReadMag, int& ICt
 
 				if (eErr != Error_Succeed) {
 					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CheckCardType::DeactivateICCard err");
-					SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_DeactivateICCard, "DevAdapter::DeactivateICCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "CheckCardType::DeactivateICCard err");
+					SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_DeactivateICCard, "DevAdapter::DeactivateICCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 				} else {
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DeactivateICCard").setCostTime(l_endTime - l_beginTime)("CheckCardType::DeactivateICCard");
 				}
@@ -9142,7 +9142,7 @@ int CCardIssuerFSM::CheckCardType(CSimpleStringA cardNo, bool bReadMag, int& ICt
 
 				if (eErr != Error_Succeed) {
 					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CheckCardType::ReleaseIC err");
-					SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReleaseIC, "DevAdapter::ReleaseIC", __FUNCTION__, false, l_endTime - l_beginTime, "", "CheckCardType::ReleaseIC err");
+					SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReleaseIC, "DevAdapter::ReleaseIC", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 				} else {
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::ReleaseIC").setCostTime(l_endTime - l_beginTime)("CheckCardType::ReleaseIC");
 				}
@@ -9170,7 +9170,7 @@ int CCardIssuerFSM::CheckCardType(CSimpleStringA cardNo, bool bReadMag, int& ICt
 					if (eErr != Error_Succeed)
 					{
 						DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CheckCardType::MoveCard err");
-						SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "CheckCardType::MoveCard err");
+						SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCard, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 					}
 					else {
 						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime)("CheckCardType::MoveCard, (CI_MOVECARD_RF_POSITION)");