Z991239-6255 #comment feat: cardReadAdapter实体和gpio实体日志精简修改

Signed-Off-By: commit-hook

Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -125,7 +125,7 @@ unsigned int CCardReadAdapterFSM::s2_on_event(FSMEvent* pEvt)
 			//RVC.Stand2S, RVC.CardStore
 			//	ContactlessCard:
 			//		--RVC.Stand2S
-			//	CardIssuer:
+			//	CardIssuerStand or CardIssuerStore:
 			//		--no matter what MachineType is,just call it 
 			pEvt->SetHandled();
 			CardReadEvent* cre = dynamic_cast<CardReadEvent*>(pEvt);
@@ -139,7 +139,7 @@ unsigned int CCardReadAdapterFSM::s2_on_event(FSMEvent* pEvt)
 				{
 					bContactlessCard = true;
 					GetEntityBase()->GetFunction()->PostThreadPoolTask(cTask);
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("ReadTask to ContactlessCard");
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("ReadTask to ContactlessCard");
 				}
 			}
 			//oilyang@20200426 暂时未发现这行代码的用处，可能简版？后来废弃。暂时保留，后续考虑去掉
@@ -151,7 +151,6 @@ unsigned int CCardReadAdapterFSM::s2_on_event(FSMEvent* pEvt)
 				{
 					bCardIssuer = true;
 					GetEntityBase()->GetFunction()->PostThreadPoolTask(iTask);
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("ReadTask to CardIssuer");
 				}
 				if (bCardIssuer || bContactlessCard)
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("ReadTask, bCardIssuer,bContactlessCard:%d,%d", bCardIssuer, bContactlessCard);
@@ -454,23 +453,30 @@ unsigned int CCardReadAdapterFSM::s3_on_event(FSMEvent* pEvt)
 				ret = 0;
 			}
 		}
-		if (pEvt->param1 == 7)//CardIssuer Timeout,need to cancel ContactlessCard insert
+		if (pEvt->param1 == 7)//CardIssuerStand or CardIssuerStore Timeout,need to cancel ContactlessCard insert
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardIssuer Timeout,need to cancel ContactlessCard insert");
+			if (!IsCardIssuerStore()) {
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardIssuerStand Timeout,need to cancel ContactlessCard insert");
+			}
+			else {
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardIssuerStore Timeout,need to cancel ContactlessCard insert");
+			}
 			if (IsContactlessCardSessionOK())
 				(*m_pContactless)(EntityResource::getLink().upgradeLink())->CancelInsert();
 			crfe->ctx->Answer(Error_TimeOut);
 			ret = 0;
 			break;
 		}
-		else if (pEvt->param1 == 8)//ContactlessCard Timeout,need to cancel CardIssuer insert
+		else if (pEvt->param1 == 8)//ContactlessCard Timeout,need to cancel CardIssuerStand or CardIssuerStore insert
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ContactlessCard Timeout,need to cancel CardIssuer insert");
+			
 			if (IsCardIssuerSessionOK()) {
 				if (!IsCardIssuerStore()) {
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ContactlessCard Timeout,need to cancel CardIssuerStand insert");
 					(*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->CancelInsert();
 				}
 				else {
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ContactlessCard Timeout,need to cancel CardIssuerStore insert");
 					(*m_pCardIssuerStore)(EntityResource::getLink().upgradeLink())->CancelInsert();
 				}
 			}
@@ -481,7 +487,7 @@ unsigned int CCardReadAdapterFSM::s3_on_event(FSMEvent* pEvt)
 		}
 		else if (pEvt->param1 == 9)//ContactlessCard Timeout,need to cancel ContactlessCard insert
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ContactlessCard Timeout,need to cancel CardIssuer insert");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("need to cancel ContactlessCard insert");
 			if (IsContactlessCardSessionOK())
 				(*m_pContactless)(EntityResource::getLink().upgradeLink())->CancelInsert();
 			crfe->ctx->Answer(Error_TimeOut);
@@ -502,7 +508,12 @@ unsigned int CCardReadAdapterFSM::s3_on_event(FSMEvent* pEvt)
 		}
 		else if (m_busCtx.eCardFromWhich == Card_In_CardIssuer)
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("as card in CardIssuer,to cancel others");
+			if (!IsCardIssuerStore()) {
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("as card in CardIssuerStand,to cancel others");
+			}
+			else {
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("as card in CardIssuerStore,to cancel others");
+			}
 			if (IsContactlessCardSessionOK())
 				(*m_pContactless)(EntityResource::getLink().upgradeLink())->CancelInsert();
 		}
@@ -690,35 +701,35 @@ int CCardReadAdapterFSM::CardIssuerRead(SpReqAnsContext<CardReadAdapterService_R
 			{
 				if (qciAns.position == 2)//有卡
 				{
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardIssuer has card");
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardIssuerStand has card");
 					bHasCard = true;
-					//oilyang@20220817 为什么要给默认值？CardIssuer->Read失败，没有必要PreOnline
+					//oilyang@20220817 为什么要给默认值？Read失败，没有必要PreOnline
 					//bNeedPreOnline = true;//不知道卡片类型，默认
 					m_busCtx.eCardFromWhich = Card_In_CardIssuer;
 					if (IsContactlessCardSessionOK())
 						(*m_pContactless)(EntityResource::getLink().upgradeLink())->CancelInsert();
 				}
-				else if (qciAns.position == 1) //CardIssuer GetDevStatus 调用异常
+				else if (qciAns.position == 1) //GetDevStatus 调用异常
 				{
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuer GetDevStatus failed");
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuerStand GetDevStatus failed");
 					return 1;
 				}
 				else
 				{
 					if (m_bCancelAccept)
 					{
-						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("before call CardIssuer->Insert, have received cancel event");
+						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("before call CardIssuerStand->Insert, have received cancel event");
 						return 3;
 					}
 					CardIssuerStandService_Insert_Req req;
 					CardIssuerStandService_Insert_Ans ans;
 					req.aid = ctx->Req.aid;
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("to call cardissuer insert..");
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("to call cardissuerStand insert..");
 					m_busCtx.eCardProcStage = Card_ProcStage_WaitForCard;
 					eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->Insert(req, ans, 59000, dwUsrErrCode, csRetStr);
 					if (eErr == Error_Succeed)
 					{
-						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Card insert into CardIssuer.");
+						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Card insert into CardIssuerStand.");
 						bHasCard = true;
 						m_busCtx.eCardFromWhich = Card_In_CardIssuer;
 						m_busCtx.eCardProcStage = Card_ProcStage_Read;
@@ -726,7 +737,7 @@ int CCardReadAdapterFSM::CardIssuerRead(SpReqAnsContext<CardReadAdapterService_R
 							(*m_pContactless)(EntityResource::getLink().upgradeLink())->CancelInsert();
 					}
 					else {
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("CardIssuer Insert return:%d", eErr);
+						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("CardIssuerStand Insert return:%d", eErr);
 						//oilyang@20200827 if time out, we must told front caller 
 						//AND set returned value of 0 to change FSM state
 						if (eErr == Error_TimeOut)
@@ -779,7 +790,7 @@ int CCardReadAdapterFSM::CardIssuerRead(SpReqAnsContext<CardReadAdapterService_R
 				}
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("CardIssuer QueryCardInfo failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("CardIssuerStand QueryCardInfo failed return:%d", eErr);
 				return 1;//oilyang@20190709
 			}
 			if (bHasCard && bNeedPreOnline)
@@ -804,12 +815,12 @@ int CCardReadAdapterFSM::CardIssuerRead(SpReqAnsContext<CardReadAdapterService_R
 						if (eErr == Error_Succeed)
 							ctx->Ans.ICCardNo = ssfAns.reserved2[0];
 						else
-							DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("CardIssuer SetSomeFlag failed return:%d", eErr);
+							DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("CardIssuerStand SetSomeFlag failed return:%d", eErr);
 					}
 				}
 				else
 				{
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("CardIssuer PreOnline failed return:%d", eErr);
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("CardIssuerStand PreOnline failed return:%d", eErr);
 					ctx->Ans.result = "";
 					ctx->Ans.status = -1;
 				}
@@ -845,13 +856,13 @@ int CCardReadAdapterFSM::CardIssuerRead(SpReqAnsContext<CardReadAdapterService_R
 				{
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardIssuerStore has card");
 					bHasCard = true;
-					//oilyang@20220817 为什么要给默认值？CardIssuer->Read失败，没有必要PreOnline
+					//oilyang@20220817 为什么要给默认值？Read失败，没有必要PreOnline
 					//bNeedPreOnline = true;//不知道卡片类型，默认
 					m_busCtx.eCardFromWhich = Card_In_CardIssuer;
 					if (IsContactlessCardSessionOK())
 						(*m_pContactless)(EntityResource::getLink().upgradeLink())->CancelInsert();
 				}
-				else if (qciAns.position == 1) //CardIssuer GetDevStatus 调用异常
+				else if (qciAns.position == 1) //GetDevStatus 调用异常
 				{
 					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuerStore GetDevStatus failed");
 					return 1;
@@ -1162,11 +1173,11 @@ int CCardReadAdapterFSM::IssueCard(SpReqAnsContext<CardReadAdapterService_Issue_
 				}
 				else
 					m_busCtx.eCardFromWhich = Card_In_CardIssuer;
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("req.hopper:%d Deem that CardIssuer has card after issuing succ. Set busCtx:findCard:%d,cardPos:%d"
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("req.hopper:%d Deem that CardIssuerStand has card after issuing succ. Set busCtx:findCard:%d,cardPos:%d"
 					, req.hopper, ans.reserved1[0], ans.reserved1[1]);
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuer IssueCard failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuerStand IssueCard failed return:%d", eErr);
 			}
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("oiltest IssueEx retStr:%s", csRetStr.GetData());
 			ctx->Answer(eErr, dwUsrErrCode, csRetStr);
@@ -1229,7 +1240,7 @@ void CCardReadAdapterFSM::CancelRead()
 	if (IsCardIssuerSessionOK())
 	{
 		if (!IsCardIssuerStore()) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("CardIssuer read canceled by front user.");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("CardIssuerStand read canceled by front user.");
 			(*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->CancelInsert();
 		}
 		else {
@@ -1351,7 +1362,7 @@ int CCardReadAdapterFSM::PreOnline(SpReqAnsContext<CardReadAdapterService_PreOnl
 				ctx->Ans.result = ans.result;
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("PreOnline, CardIssuer PreOnline failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("PreOnline, CardIssuerStand PreOnline failed return:%d", eErr);
 			}
 			ctx->Answer(eErr, dwUsrErrCode, csRetStr);
 		}
@@ -1417,7 +1428,7 @@ int CCardReadAdapterFSM::PostOnline(SpReqAnsContext<CardReadAdapterService_PostO
 				ctx->Ans.result = ans.result;
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("PostOnline, CardIssuer PostOnline failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("PostOnline, CardIssuerStand PostOnline failed return:%d", eErr);
 			}
 			ctx->Answer(eErr, dwUsrErrCode, csRetStr);
 		}
@@ -1473,10 +1484,10 @@ int CCardReadAdapterFSM::EjectCard(SpReqAnsContext<CardReadAdapterService_Eject_
 			{
 				m_busCtx.eCardFromWhich = Card_In_No_Where;
 				m_busCtx.eCardProcStage = Card_ProcStage_Eject;
-				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CardIssuer EjectCard suc.");
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("CardIssuerStand EjectCard suc.");
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("EjectCard, CardIssuer EjectCard failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("EjectCard, CardIssuerStand EjectCard failed return:%d", eErr);
 			}
 			ctx->Answer(eErr, dwUsrErrCode, csRetStr);
 		}
@@ -1535,12 +1546,12 @@ int CCardReadAdapterFSM::CaptureCard(SpReqAnsContext<CardReadAdapterService_Capt
 			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->Capture(req, ans, 15000, dwUsrErrCode, csRetStr);
 			if (eErr == Error_Succeed)
 			{
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardIssuer Capture card suc.");
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardIssuerStand Capture card suc.");
 				m_busCtx.eCardFromWhich = Card_In_No_Where;
 				m_busCtx.eCardProcStage = Card_ProcStage_Capture;
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CaptureCard, CardIssuer Capture failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CaptureCard, CardIssuerStand Capture failed return:%d", eErr);
 			}
 			ctx->Answer(eErr, dwUsrErrCode, csRetStr);
 		}
@@ -1593,7 +1604,7 @@ int CCardReadAdapterFSM::QueryCardInfo(SpReqAnsContext<CardReadAdapterService_Qu
 				}
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QueryCardInfo, CardIssuer QueryCardInfo failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QueryCardInfo, CardIssuerStand QueryCardInfo failed return:%d", eErr);
 			}
 		}
 		else {
@@ -1657,7 +1668,7 @@ void CCardReadAdapterFSM::CheckAndReconnectSession()
 	while (1)
 	{
 		//the first time to connect or need to reconnect
-		//CardIssuer 分为卡机和卡库
+		//分为卡机和卡库
 		if (!IsCardIssuerStore()) {
 			if ((m_pCardIssuer == NULL || (m_pCardIssuer != NULL && m_pCardIssuer->QuerySessionClosed())))
 			{
@@ -1673,7 +1684,7 @@ void CCardReadAdapterFSM::CheckAndReconnectSession()
 					if (eErr != Error_Succeed)
 					{
 						if (cardIssuerCount % 120 == 0)//about 10 minutes can't connect to entity
-							DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("connect to entity CardIssuer failed.%d", eErr);
+							DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("connect to entity CardIssuerStand failed.%d", eErr);
 						cardIssuerCount++;
 						m_pCardIssuer->SafeDelete();
 						m_pCardIssuer = NULL;
@@ -1681,7 +1692,7 @@ void CCardReadAdapterFSM::CheckAndReconnectSession()
 					else
 					{
 						cardIssuerCount = 0;
-						DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Connect to entity CardIssuer suc.");
+						DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Connect to entity CardIssuerStand suc.");
 					}
 				}
 			}
@@ -1819,7 +1830,7 @@ int CCardReadAdapterFSM::SetSomeFlag(SpReqAnsContext<CardReadAdapterService_SetS
 				ctx->Answer(Error_Succeed);
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardIssuer SetSomeFlag failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardIssuerStand SetSomeFlag failed return:%d", eErr);
 				ctx->Answer(Error_Unexpect);
 			}
 		}
@@ -1847,7 +1858,7 @@ int CCardReadAdapterFSM::SetSomeFlag(SpReqAnsContext<CardReadAdapterService_SetS
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("SetSomeFlag can only apply to CardIssuer.Or CardIssuer connected failed.");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("SetSomeFlag is err, session is not ok");
 		ctx->Answer(Error_Unexpect);
 	}
 	return 0;
@@ -1885,7 +1896,7 @@ int CCardReadAdapterFSM::GetDevInfo(SpReqAnsContext<CardReadAdapterService_GetDe
 				ciState = 0;
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetDevInfo, CardIssuer GetDevInfo failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetDevInfo, CardIssuerStand GetDevInfo failed return:%d", eErr);
 			}
 		}
 		else {
@@ -1958,8 +1969,14 @@ int CCardReadAdapterFSM::GetDevInfo(SpReqAnsContext<CardReadAdapterService_GetDe
 		ctx->Ans.model[index] = csCIModel;
 		ctx->Ans.version[index] = csCIVersion;
 		ctx->Ans.state[index] = ciState;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("CardIssuer, type:%s, model:%s, version:%s, state:%d", 
+		if (!IsCardIssuerStore()) {
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("CardIssuerStand, type:%s, model:%s, version:%s, state:%d",
 				csCIType.GetData(), csCIModel.GetData(), csCIVersion.GetData(), ciState);
+		}
+		else {
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("CardIssuerStore, type:%s, model:%s, version:%s, state:%d",
+				csCIType.GetData(), csCIModel.GetData(), csCIVersion.GetData(), ciState);
+		}
 		index++;
 	}
 	if (bCC)
@@ -2009,7 +2026,7 @@ int CCardReadAdapterFSM::GetMaterialCount(SpReqAnsContext<CardReadAdapterService
 				ctx->Answer(Error_Succeed);
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetMaterialCount, CardIssuer GetMaterialCountEx failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetMaterialCount, CardIssuerStand GetMaterialCountEx failed return:%d", eErr);
 				ctx->Answer(Error_Unexpect, dwUsrErrCode);
 			}
 		}
@@ -2047,7 +2064,7 @@ int CCardReadAdapterFSM::GetMaterialCount(SpReqAnsContext<CardReadAdapterService
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetMaterialCountEx can only apply to CardIssuer.Or CardIssuer connected failed.");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetMaterialCountEx is err, session is not ok");
 		ctx->Answer(Error_Unexpect);
 	}
 	return 0;
@@ -2084,7 +2101,7 @@ int CCardReadAdapterFSM::SetMaterialCount(SpReqAnsContext<CardReadAdapterService
 				ctx->Answer(Error_Succeed);
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("SetMaterialCount, CardIssuer SetMaterialCountEx failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("SetMaterialCount, CardIssuerStand SetMaterialCountEx failed return:%d", eErr);
 				ctx->Answer(Error_Unexpect, dwUsrErrCode);
 			}
 		}
@@ -2122,7 +2139,7 @@ int CCardReadAdapterFSM::SetMaterialCount(SpReqAnsContext<CardReadAdapterService
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("SetMaterialCountEx can only apply to CardIssuer.Or CardIssuer connected failed.");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("SetMaterialCountEx is err, session is not ok");
 		ctx->Answer(Error_Unexpect);
 	}
 	return 0;
@@ -2144,7 +2161,7 @@ int CCardReadAdapterFSM::GetSCIInfo(SpReqAnsContext<CardReadAdapterService_GetSC
 				ctx->Ans.reserved2.Copy(ans.reserved2);
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetSCIInfo, CardIssuer GetSCIInfo failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetSCIInfo, CardIssuerStand GetSCIInfo failed return:%d", eErr);
 			}
 			ctx->Answer(eErr);
 		}
@@ -2169,7 +2186,7 @@ int CCardReadAdapterFSM::GetSCIInfo(SpReqAnsContext<CardReadAdapterService_GetSC
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Entity CardIssuer is not ok.");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetSCIInfo is err, session is not ok");
 		ctx->Answer(Error_Unexpect);
 	}
 	return 0;
@@ -2192,7 +2209,7 @@ int CCardReadAdapterFSM::OpenSafeLock(SpReqAnsContext<CardReadAdapterService_Ope
 				ctx->Ans.reserved2.Copy(ans.reserved2);
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("OpenSafeLock, CardIssuer OpenSafeLock failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("OpenSafeLock, CardIssuerStand OpenSafeLock failed return:%d", eErr);
 			}
 			ctx->Answer(eErr);
 		}
@@ -2217,7 +2234,7 @@ int CCardReadAdapterFSM::OpenSafeLock(SpReqAnsContext<CardReadAdapterService_Ope
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Entity CardIssuer is not ok.");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("OpenSafeLock is err, session is not ok");
 		ctx->Answer(Error_Unexpect);
 	}
 	return 0;
@@ -2281,7 +2298,7 @@ int CCardReadAdapterFSM::SAMICCommand(SpReqAnsContext<CardReadAdapterService_SAM
 				ctx->Ans.reserved2.Copy(ans.reserved2);
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("SAMICCommand, CardIssuer SAMICCommand failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("SAMICCommand, CardIssuerStand SAMICCommand failed return:%d", eErr);
 
 			}
 			ctx->Answer(eErr);
@@ -2341,7 +2358,7 @@ int CCardReadAdapterFSM::QueryPrinterStatus(SpReqAnsContext<CardReadAdapterServi
 				ctx->Ans.reserved2.Copy(ans.reserved2);
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QueryPrinterStatus, CardIssuer QueryPrinterStatus failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QueryPrinterStatus, CardIssuerStand QueryPrinterStatus failed return:%d", eErr);
 			}
 			ctx->Answer(eErr);
 			return 0;
@@ -2371,7 +2388,7 @@ int CCardReadAdapterFSM::QueryPrinterStatus(SpReqAnsContext<CardReadAdapterServi
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuer session is not ok.");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QueryPrinterStatus is err, session is not ok");
 		ctx->Answer(Error_Param);
 		return 1;
 	}
@@ -2400,7 +2417,7 @@ int CCardReadAdapterFSM::Print(SpReqAnsContext<CardReadAdapterService_Print_Req,
 				ctx->Ans.reserved2.Copy(ans.reserved2);
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Print, CardIssuer Print failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Print, CardIssuerStand Print failed return:%d", eErr);
 			}
 			ctx->Answer(eErr);
 			return 0;
@@ -2433,7 +2450,7 @@ int CCardReadAdapterFSM::Print(SpReqAnsContext<CardReadAdapterService_Print_Req,
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuer session is not ok.");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Print is err, session is not ok");
 		ctx->Answer(Error_Param);
 		return 1;
 	}
@@ -2471,7 +2488,7 @@ int CCardReadAdapterFSM::QuerySCIList(SpReqAnsContext<CardReadAdapterService_Que
 				ctx->Ans.reserved2.Copy(ans.reserved2);
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QuerySCIList, CardIssuer QuerySCIList failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QuerySCIList, CardIssuerStand QuerySCIList failed return:%d", eErr);
 			}
 			ctx->Answer(eErr, dwUsrErrCode);
 			return 0;
@@ -2511,7 +2528,7 @@ int CCardReadAdapterFSM::QuerySCIList(SpReqAnsContext<CardReadAdapterService_Que
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuer session is not ok.");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QuerySCIList is err, session is not ok");
 		ctx->Answer(Error_Param);
 		return 1;
 	}
@@ -2537,7 +2554,7 @@ int CCardReadAdapterFSM::BindSCI(SpReqAnsContext<CardReadAdapterService_BindSCI_
 				ctx->Ans.reserved2.Copy(ans.reserved2);
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("BindSCI, CardIssuer BindSCI failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("BindSCI, CardIssuerStand BindSCI failed return:%d", eErr);
 			}
 			ctx->Answer(eErr, dwUsrErrCode);
 			return 0;
@@ -2566,7 +2583,7 @@ int CCardReadAdapterFSM::BindSCI(SpReqAnsContext<CardReadAdapterService_BindSCI_
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuer session is not ok.");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("BindSCI is err, session is not ok");
 		ctx->Answer(Error_Param);
 		return 1;
 	}
@@ -2712,7 +2729,7 @@ int CCardReadAdapterFSM::QueryCardInfoOnStore(SpReqAnsContext<CardReadAdapterSer
 				ctx->Answer(Error_Succeed);
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QueryCardInfoOnStore, CardIssuer QueryCardInfoOnStore failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QueryCardInfoOnStore, CardIssuerStand QueryCardInfoOnStore failed return:%d", eErr);
 				ctx->Answer(eErr, dwUserErrorCode);
 			}
 		}
@@ -2746,7 +2763,7 @@ int CCardReadAdapterFSM::QueryCardInfoOnStore(SpReqAnsContext<CardReadAdapterSer
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Entity CardIssuer is not ok.");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QueryCardInfoOnStore is err, session is not ok");
 		ctx->Answer(Error_DevNotAvailable, CardReadAdapter_UserErrorCode_PreOnline_CardIssuer_Not_Ok);
 	}
 	return 0;
@@ -2780,7 +2797,7 @@ int CCardReadAdapterFSM::GetAddCardInfo(SpReqAnsContext<CardReadAdapterService_G
 				ctx->Answer(Error_Succeed);
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetAddCardInfo, CardIssuer GetAddCardInfo failed return:%d,%x", eErr, dwUserErrorCode);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetAddCardInfo, CardIssuerStand GetAddCardInfo failed return:%d,%x", eErr, dwUserErrorCode);
 				ctx->Answer(eErr, dwUserErrorCode);
 			}
 		}
@@ -2815,7 +2832,7 @@ int CCardReadAdapterFSM::GetAddCardInfo(SpReqAnsContext<CardReadAdapterService_G
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Entity CardIssuer is not ok.");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetAddCardInfo is err, session is not ok");
 		ctx->Answer(Error_DevNotAvailable, CardReadAdapter_UserErrorCode_PreOnline_CardIssuer_Not_Ok);
 	}
 	return 0;
@@ -2891,7 +2908,7 @@ void CCardReadAdapterFSM::CancelReadForEntity(ModuleType eModule)
 	if (IsTheEntity(eModule, Module_CardIssuer) && IsCardIssuerSessionOK())
 	{
 		if (!IsCardIssuerStore()) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Set cancel read by ContactlessCard flag of CardIssuer.");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Set cancel read by ContactlessCard flag of CardIssuerStand.");
 			CardIssuerStandService_SetSomeFlag_Req req;
 			CardIssuerStandService_SetSomeFlag_Ans ans;
 			req.IssueBusiness = 3;
@@ -2899,7 +2916,7 @@ void CCardReadAdapterFSM::CancelReadForEntity(ModuleType eModule)
 			(*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->CancelInsert();
 		}
 		else {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Set cancel read by ContactlessCard flag of CardIssuer.");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Set cancel read by ContactlessCard flag of CardIssuerStore.");
 			CardIssuerStoreService_SetSomeFlag_Req req;
 			CardIssuerStoreService_SetSomeFlag_Ans ans;
 			req.IssueBusiness = 3;
@@ -2943,7 +2960,7 @@ int CCardReadAdapterFSM::PrintCardIm(SpReqAnsContext<CardReadAdapterService_Prin
 				ctx->Ans.reserved4.Copy(ans.reserved4);
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("PrintCardImmediately, CardIssuer PrintCardImmediately failed return:%d", eErr);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("PrintCardImmediately, CardIssuerStand PrintCardImmediately failed return:%d", eErr);
 			}
 			ctx->Answer(eErr);
 			return 0;
@@ -2980,7 +2997,7 @@ int CCardReadAdapterFSM::PrintCardIm(SpReqAnsContext<CardReadAdapterService_Prin
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuer session is not ok.");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("PrintCardIm is err, session is not ok");
 		ctx->Answer(Error_Param);
 		return 1;
 	}
@@ -3017,7 +3034,7 @@ int CCardReadAdapterFSM::QueryCIStatus(SpReqAnsContext<CardReadAdapterService_Qu
 				}
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("CardIssuer QueryCIStatus failed return:%d", eErr));
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("CardIssuerStand QueryCIStatus failed return:%d", eErr));
 			}
 			ctx->Answer(eErr, dwUsrErrCode);
 			return 0;

Module/mod_CardReadAdapter/CardReadAdapterFSM.h

@@ -839,7 +839,7 @@ private:
 	SpReqAnsContext<CardReadAdapterService_Read_Req, CardReadAdapterService_Read_Ans>::Pointer m_readCtx;
 
 	//m_lastModule:0~7
-	//0:all; 1:CardIssuer; 2:ContactlessCard
+	//0:all; 1:CardIssuerStand or CardIssuerStore; 2:ContactlessCard
 	int m_lastModule,m_lastS2Event, m_lastS2EvtParam1;
 	SP::Module::Comm::What m_eMachineType;
 	WORD m_majorVerion,m_minorVerion;

Module/mod_CardReadAdapter/CardReadAdapter_UserErrorCode.h

@@ -12,8 +12,8 @@
 
 #define CardReadAdapter_UserErrorCode_PreOnline_Invoke						(CardReadAdapter_UserErrorCode_Start + 6)	//web端发起一笔跨机业务
 #define CardReadAdapter_UserErrorCode_PreOnline_Result						(CardReadAdapter_UserErrorCode_Start + 7)	//跨机返回结果
-#define CardReadAdapter_UserErrorCode_PreOnline_CardIssuer_Not_Ok			(CardReadAdapter_UserErrorCode_Start + 8)	//CardIssuer实体异常
-#define CardReadAdapter_UserErrorCode_CardIssuer_Is_Working					(CardReadAdapter_UserErrorCode_Start + 9)	//CardIssuer实体正忙
+#define CardReadAdapter_UserErrorCode_PreOnline_CardIssuer_Not_Ok			(CardReadAdapter_UserErrorCode_Start + 8)	//卡机实体异常
+#define CardReadAdapter_UserErrorCode_CardIssuer_Is_Working					(CardReadAdapter_UserErrorCode_Start + 9)	//卡机实体正忙
 #define CardReadAdapter_UserErrorCode_HBService_No_Return					(CardReadAdapter_UserErrorCode_Start + 10)	//心跳服务超时未返回
 #define CardReadAdapter_UserErrorCode_CardActive_Unexpect					(CardReadAdapter_UserErrorCode_Start + 11)	//跨机收到未处理的返回（某些返回可能在后期细化中提供处理）
 

Module/mod_CardReadAdapter/mod_CardReadAdapter.h

@@ -177,7 +177,7 @@ public:
 		if (m_fsm.GetCurrState()->id == 3)
 		{
 			ctx->Answer(Error_DevNotAvailable, CardReadAdapter_UserErrorCode_CardIssuer_Is_Working);
-			LogWarn(Severity_Middle, Error_DevNotAvailable, CardReadAdapter_UserErrorCode_CardIssuer_Is_Working, "CardIssuer is working,duplicated call.");
+			LogWarn(Severity_Middle, Error_DevNotAvailable, CardReadAdapter_UserErrorCode_CardIssuer_Is_Working, "CardReadAdapter is working,duplicated call.");
 		}
 		else
 		{

Module/mod_gpio/GpioFSM.cpp

@@ -88,7 +88,7 @@ static const char* GetDriverPortString(int pin)
 	case 4: return "[Driver] PinPad Tip Light";
 	case 5: return "[Driver] Face Light";
 	case 6: return "[Driver] Maintain Light";
-	case 7: return "[Driver] CardIssuser Mouse Maintain Light";
+	case 7: return "[Driver] CardIssuerMouse Maintain Light";
 	case 8: return "[Driver] USB Tip Light";
 	case 9: return "[Driver] RF Tip Light";
 	case 10: return "";
@@ -102,7 +102,7 @@ static const char* GetDriverPortString(int pin)
 	case 18: return "[Receiver] Door Detecter";
 	case 19: return "[Receiver] Phone Detecter";
 	case 20: return "[Receiver] Body Detecter";
-	case 21: return "[Receiver] CardIssuer Mouse Detecter";
+	case 21: return "[Receiver] CardIssuerMouse Detecter";
 		//case 22: return "";
 		//case 23: return "";
 		//case 24: return "";