Merge branch 'ST2_0611_firewall' of http://gitee.itc.cmbchina.cn/QD_RemoteBankArea/LR04.02_RVCTerminalPlus into ST2_0611_firewall

Module/mod_CardIssuerStand/CardIssuerStand.xml

@@ -102,30 +102,6 @@
 		</twoway>
 		<oneway name="SetIssueFlag" overlap="true" method_id="12">			
 		</oneway>
-		<twoway name="ReadEx" overlap="true" method_id="13">
-			<req>
-				<param name="aid" type="string"/>
-				<param name="reserved1" type="string"/>
-				<param name="reserved2" type="string"/>
-			</req>
-			<res>
-				<param name="track1" type="string"/>
-				<param name="track2" type="string"/>
-				<param name="track3" type="string"/>
-				<param name="CDType" type="int"/>
-				<param name="ICType" type="int"/>
-				<param name="CMBType" type="int"/>
-				<param name="ICData" type="string"/>
-				<param name="status" type="int" />
-				<param name="t2Account" type="string" />
-				<param name="t2Region" type="string" />
-				<param name="t2CardSerial" type="string" />
-				<param name="t2CVC" type="string" />
-				<param name="t2ExpireDate" type="string" />
-				<param name="reserved1" type="string"/>
-				<param name="reserved2" type="string"/>
-			</res>
-		</twoway>
 		<twoway name="QueryCardInfo" overlap="true" method_id="14">
 			<req>
 			</req>
@@ -228,16 +204,6 @@
 				<param name="reserved2" type="array_string"/>					
 			</res>			
 		</twoway>
-		<twoway name="OpenSafeLock" overlap="true" method_id="21">
-			<req>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>			
-			</req>
-			<res>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>					
-			</res>			
-		</twoway>
 		<twoway name="SAMICCommand" overlap="true" method_id="22">
 			<req>
 				<param name="cmdType" type="int"/>
@@ -252,73 +218,7 @@
 				<param name="reserved1" type="array_int"/>
 				<param name="reserved2" type="array_string"/>					
 			</res>			
-		</twoway>
-		<twoway name="QueryPrinterStatus" overlap="true" method_id="23">
-			<req>
-				<param name="param1" type="array_int"/>
-				<param name="param2" type="array_string"/>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>			
-			</req>
-			<res>
-				<param name="ret1" type="array_int"/>
-				<param name="ret2" type="array_string"/>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>					
-			</res>			
-		</twoway>
-		<twoway name="Print" overlap="true" method_id="24">
-			<req>
-				<param name="data1" type="blob"/>
-				<param name="data2" type="blob"/>
-				<param name="data3" type="blob"/>
-				<param name="data4" type="blob"/>
-				<param name="data5" type="blob"/>
-				<param name="data6" type="blob"/>				
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>			
-			</req>
-			<res>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>					
-			</res>			
-		</twoway>
-		<twoway name="QuerySCIList" overlap="true" method_id="25">
-			<req>			
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>			
-			</req>
-			<res>
-				<param name="sciNo" type="array_string"/>
-        <param name="arrMateriel" type="array_string"/>
-        <param name="CardGroove" type="array_string"/>
-        <param name="CardBoxNo" type="array_string"/>
-        <param name="PsbCode" type="array_string"/>
-        <param name="PsbName" type="array_string"/>
-        <param name="CardInit" type="array_uint"/>
-        <param name="CardRemains" type="array_uint"/>
-        <param name="CardIssued" type="array_uint"/>
-        <param name="CardMixed" type="array_uint"/>
-        <param name="CardPercent" type="array_uint"/>
-        <param name="Maintainer" type="array_string"/>
-        <param name="MaintainTime" type="array_string"/>
-        <param name="UpdateTime" type="array_string"/>				
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>					
-			</res>			
-		</twoway>		
-		<twoway name="BindSCI" overlap="true" method_id="26">
-			<req>
-				<param name="type" type="int"/>
-				<param name="sciNo" type="string" />			
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>			
-			</req>
-			<res>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>					
-			</res>			
-		</twoway>
+		</twoway>	
 		<twoway name="PreOnlineOnStore" overlap="true" method_id="27">
 			<req>
 				<param name="account" type="string"/>

Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

@@ -2021,9 +2021,9 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStandService_Issue_Req,
 
 		LogWarn(Severity_Middle, Error_Unexpect, dwTmpErrCode, errMsg.GetData());
 		if (ctx != NULL)
-			ctx->Answer(TransECWithRepeat(Error_DevMedia), dwTmpErrCode);
+			ctx->Answer(Error_DevMedia, dwTmpErrCode);
 		else
-			ctxEx->Answer(TransECWithRepeat(Error_DevMedia), dwTmpErrCode);
+			ctxEx->Answer(Error_DevMedia, dwTmpErrCode);
 		return 2;
 	}
 	ErrorCodeEnum errCode;

Module/mod_CardIssuerStand/CardIssuerStand_client_g.h

@@ -555,55 +555,6 @@ public:
 		return ret;
 	}
 
-	ErrorCodeEnum ReadEx(CardIssuerStandService_ReadEx_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(CardIssuerStandService_Method_ReadEx, CardIssuerStandService_MethodSignature_ReadEx, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum ReadEx(CardIssuerStandService_ReadEx_Req &Req, CardIssuerStandService_ReadEx_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = ReadEx(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum ReadEx(CardIssuerStandService_ReadEx_Req &Req, CardIssuerStandService_ReadEx_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = ReadEx(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum ReadEx(CardIssuerStandService_ReadEx_Req &Req, CardIssuerStandService_ReadEx_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = ReadEx(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
 	ErrorCodeEnum QueryCardInfo(CardIssuerStandService_QueryCardInfo_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
@@ -947,55 +898,6 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum OpenSafeLock(CardIssuerStandService_OpenSafeLock_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(CardIssuerStandService_Method_OpenSafeLock, CardIssuerStandService_MethodSignature_OpenSafeLock, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum OpenSafeLock(CardIssuerStandService_OpenSafeLock_Req &Req, CardIssuerStandService_OpenSafeLock_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = OpenSafeLock(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum OpenSafeLock(CardIssuerStandService_OpenSafeLock_Req &Req, CardIssuerStandService_OpenSafeLock_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = OpenSafeLock(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum OpenSafeLock(CardIssuerStandService_OpenSafeLock_Req &Req, CardIssuerStandService_OpenSafeLock_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = OpenSafeLock(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
 	ErrorCodeEnum SAMICCommand(CardIssuerStandService_SAMICCommand_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
@@ -1045,202 +947,6 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum QueryPrinterStatus(CardIssuerStandService_QueryPrinterStatus_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(CardIssuerStandService_Method_QueryPrinterStatus, CardIssuerStandService_MethodSignature_QueryPrinterStatus, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum QueryPrinterStatus(CardIssuerStandService_QueryPrinterStatus_Req &Req, CardIssuerStandService_QueryPrinterStatus_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = QueryPrinterStatus(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum QueryPrinterStatus(CardIssuerStandService_QueryPrinterStatus_Req &Req, CardIssuerStandService_QueryPrinterStatus_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = QueryPrinterStatus(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum QueryPrinterStatus(CardIssuerStandService_QueryPrinterStatus_Req &Req, CardIssuerStandService_QueryPrinterStatus_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = QueryPrinterStatus(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum Print(CardIssuerStandService_Print_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(CardIssuerStandService_Method_Print, CardIssuerStandService_MethodSignature_Print, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum Print(CardIssuerStandService_Print_Req &Req, CardIssuerStandService_Print_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = Print(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum Print(CardIssuerStandService_Print_Req &Req, CardIssuerStandService_Print_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = Print(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum Print(CardIssuerStandService_Print_Req &Req, CardIssuerStandService_Print_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = Print(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum QuerySCIList(CardIssuerStandService_QuerySCIList_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(CardIssuerStandService_Method_QuerySCIList, CardIssuerStandService_MethodSignature_QuerySCIList, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum QuerySCIList(CardIssuerStandService_QuerySCIList_Req &Req, CardIssuerStandService_QuerySCIList_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = QuerySCIList(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum QuerySCIList(CardIssuerStandService_QuerySCIList_Req &Req, CardIssuerStandService_QuerySCIList_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = QuerySCIList(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum QuerySCIList(CardIssuerStandService_QuerySCIList_Req &Req, CardIssuerStandService_QuerySCIList_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = QuerySCIList(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum BindSCI(CardIssuerStandService_BindSCI_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(CardIssuerStandService_Method_BindSCI, CardIssuerStandService_MethodSignature_BindSCI, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum BindSCI(CardIssuerStandService_BindSCI_Req &Req, CardIssuerStandService_BindSCI_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = BindSCI(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum BindSCI(CardIssuerStandService_BindSCI_Req &Req, CardIssuerStandService_BindSCI_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = BindSCI(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum BindSCI(CardIssuerStandService_BindSCI_Req &Req, CardIssuerStandService_BindSCI_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = BindSCI(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
 	ErrorCodeEnum PreOnlineOnStore(CardIssuerStandService_PreOnlineOnStore_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();

Module/mod_CardIssuerStand/CardIssuerStand_def_g.h

@@ -25,7 +25,6 @@ namespace CardIssuerStand {
 #define CardIssuerStandService_Method_GetMaterialCount 10
 #define CardIssuerStandService_Method_SetMaterialCount 11
 #define CardIssuerStandService_Method_SetIssueFlag 12
-#define CardIssuerStandService_Method_ReadEx 13
 #define CardIssuerStandService_Method_QueryCardInfo 14
 #define CardIssuerStandService_Method_WriteTrack 15
 #define CardIssuerStandService_Method_GetMaterialCountEx 16
@@ -33,12 +32,7 @@ namespace CardIssuerStand {
 #define CardIssuerStandService_Method_SetSomeFlag 18
 #define CardIssuerStandService_Method_GetSCIInfo 19
 #define CardIssuerStandService_Method_IssueEx 20
-#define CardIssuerStandService_Method_OpenSafeLock 21
 #define CardIssuerStandService_Method_SAMICCommand 22
-#define CardIssuerStandService_Method_QueryPrinterStatus 23
-#define CardIssuerStandService_Method_Print 24
-#define CardIssuerStandService_Method_QuerySCIList 25
-#define CardIssuerStandService_Method_BindSCI 26
 #define CardIssuerStandService_Method_PreOnlineOnStore 27
 #define CardIssuerStandService_Method_NotifyPreonline 28
 #define CardIssuerStandService_Method_QueryCardInfoOnStore 29
@@ -68,7 +62,6 @@ namespace CardIssuerStand {
 #define CardIssuerStandService_MethodSignature_GetMaterialCount -605917749
 #define CardIssuerStandService_MethodSignature_SetMaterialCount 870103115
 #define CardIssuerStandService_MethodSignature_SetIssueFlag 187641303
-#define CardIssuerStandService_MethodSignature_ReadEx -842531343
 #define CardIssuerStandService_MethodSignature_QueryCardInfo 154962579
 #define CardIssuerStandService_MethodSignature_WriteTrack -1424799012
 #define CardIssuerStandService_MethodSignature_GetMaterialCountEx 1356148904
@@ -76,12 +69,7 @@ namespace CardIssuerStand {
 #define CardIssuerStandService_MethodSignature_SetSomeFlag -2033418025
 #define CardIssuerStandService_MethodSignature_GetSCIInfo 1097494981
 #define CardIssuerStandService_MethodSignature_IssueEx 1390328640
-#define CardIssuerStandService_MethodSignature_OpenSafeLock 177980614
 #define CardIssuerStandService_MethodSignature_SAMICCommand 406988293
-#define CardIssuerStandService_MethodSignature_QueryPrinterStatus -890728447
-#define CardIssuerStandService_MethodSignature_Print 2096006675
-#define CardIssuerStandService_MethodSignature_QuerySCIList -1772231453
-#define CardIssuerStandService_MethodSignature_BindSCI -1242011672
 #define CardIssuerStandService_MethodSignature_PreOnlineOnStore 158325869
 #define CardIssuerStandService_MethodSignature_NotifyPreonline -808637659
 #define CardIssuerStandService_MethodSignature_QueryCardInfoOnStore 1217447214
@@ -111,7 +99,6 @@ namespace CardIssuerStand {
 #define CardIssuerStandService_LogCode_GetMaterialCount "QLR040220310"
 #define CardIssuerStandService_LogCode_SetMaterialCount "QLR040220311"
 #define CardIssuerStandService_LogCode_SetIssueFlag "QLR040220312"
-#define CardIssuerStandService_LogCode_ReadEx "QLR040220313"
 #define CardIssuerStandService_LogCode_QueryCardInfo "QLR040220314"
 #define CardIssuerStandService_LogCode_WriteTrack "QLR040220315"
 #define CardIssuerStandService_LogCode_GetMaterialCountEx "QLR040220316"
@@ -119,12 +106,7 @@ namespace CardIssuerStand {
 #define CardIssuerStandService_LogCode_SetSomeFlag "QLR040220318"
 #define CardIssuerStandService_LogCode_GetSCIInfo "QLR040220319"
 #define CardIssuerStandService_LogCode_IssueEx "QLR040220320"
-#define CardIssuerStandService_LogCode_OpenSafeLock "QLR040220321"
 #define CardIssuerStandService_LogCode_SAMICCommand "QLR040220322"
-#define CardIssuerStandService_LogCode_QueryPrinterStatus "QLR040220323"
-#define CardIssuerStandService_LogCode_Print "QLR040220324"
-#define CardIssuerStandService_LogCode_QuerySCIList "QLR040220325"
-#define CardIssuerStandService_LogCode_BindSCI "QLR040220326"
 #define CardIssuerStandService_LogCode_PreOnlineOnStore "QLR040220327"
 #define CardIssuerStandService_LogCode_NotifyPreonline "QLR040220328"
 #define CardIssuerStandService_LogCode_QueryCardInfoOnStore "QLR040220329"
@@ -387,44 +369,6 @@ struct CardIssuerStandService_SetIssueFlag_Info
 
 };
 
-struct CardIssuerStandService_ReadEx_Req
-{
-	CSimpleStringA aid;
-	CSimpleStringA reserved1;
-	CSimpleStringA reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & aid & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStandService_ReadEx_Ans
-{
-	CSimpleStringA track1;
-	CSimpleStringA track2;
-	CSimpleStringA track3;
-	int CDType;
-	int ICType;
-	int CMBType;
-	CSimpleStringA ICData;
-	int status;
-	CSimpleStringA t2Account;
-	CSimpleStringA t2Region;
-	CSimpleStringA t2CardSerial;
-	CSimpleStringA t2CVC;
-	CSimpleStringA t2ExpireDate;
-	CSimpleStringA reserved1;
-	CSimpleStringA reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & track1 & track2 & track3 & CDType & ICType & CMBType & ICData & status & t2Account & t2Region & t2CardSerial & t2CVC & t2ExpireDate & reserved1 & reserved2;
-	}
-
-};
-
 struct CardIssuerStandService_QueryCardInfo_Req
 {
 
@@ -623,30 +567,6 @@ struct CardIssuerStandService_IssueEx_Ans
 
 };
 
-struct CardIssuerStandService_OpenSafeLock_Req
-{
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStandService_OpenSafeLock_Ans
-{
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & reserved1 & reserved2;
-	}
-
-};
-
 struct CardIssuerStandService_SAMICCommand_Req
 {
 	int cmdType;
@@ -676,128 +596,6 @@ struct CardIssuerStandService_SAMICCommand_Ans
 
 };
 
-struct CardIssuerStandService_QueryPrinterStatus_Req
-{
-	CAutoArray<int> param1;
-	CAutoArray<CSimpleStringA> param2;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & param1 & param2 & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStandService_QueryPrinterStatus_Ans
-{
-	CAutoArray<int> ret1;
-	CAutoArray<CSimpleStringA> ret2;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & ret1 & ret2 & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStandService_Print_Req
-{
-	CBlob data1;
-	CBlob data2;
-	CBlob data3;
-	CBlob data4;
-	CBlob data5;
-	CBlob data6;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & data1 & data2 & data3 & data4 & data5 & data6 & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStandService_Print_Ans
-{
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStandService_QuerySCIList_Req
-{
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStandService_QuerySCIList_Ans
-{
-	CAutoArray<CSimpleStringA> sciNo;
-	CAutoArray<CSimpleStringA> arrMateriel;
-	CAutoArray<CSimpleStringA> CardGroove;
-	CAutoArray<CSimpleStringA> CardBoxNo;
-	CAutoArray<CSimpleStringA> PsbCode;
-	CAutoArray<CSimpleStringA> PsbName;
-	CAutoArray<unsigned int> CardInit;
-	CAutoArray<unsigned int> CardRemains;
-	CAutoArray<unsigned int> CardIssued;
-	CAutoArray<unsigned int> CardMixed;
-	CAutoArray<unsigned int> CardPercent;
-	CAutoArray<CSimpleStringA> Maintainer;
-	CAutoArray<CSimpleStringA> MaintainTime;
-	CAutoArray<CSimpleStringA> UpdateTime;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & sciNo & arrMateriel & CardGroove & CardBoxNo & PsbCode & PsbName & CardInit & CardRemains & CardIssued & CardMixed & CardPercent & Maintainer & MaintainTime & UpdateTime & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStandService_BindSCI_Req
-{
-	int type;
-	CSimpleStringA sciNo;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & type & sciNo & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStandService_BindSCI_Ans
-{
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & reserved1 & reserved2;
-	}
-
-};
-
 struct CardIssuerStandService_PreOnlineOnStore_Req
 {
 	CSimpleStringA account;

Module/mod_CardIssuerStand/CardIssuerStand_server_g.h

@@ -121,13 +121,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStandService_Method_ReadEx:
-			if (dwSignature == CardIssuerStandService_MethodSignature_ReadEx) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStandService_Method_QueryCardInfo:
 			if (dwSignature == CardIssuerStandService_MethodSignature_QueryCardInfo) {
 				bOverlap = true;
@@ -177,13 +170,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStandService_Method_OpenSafeLock:
-			if (dwSignature == CardIssuerStandService_MethodSignature_OpenSafeLock) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStandService_Method_SAMICCommand:
 			if (dwSignature == CardIssuerStandService_MethodSignature_SAMICCommand) {
 				bOverlap = true;
@@ -191,34 +177,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStandService_Method_QueryPrinterStatus:
-			if (dwSignature == CardIssuerStandService_MethodSignature_QueryPrinterStatus) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CardIssuerStandService_Method_Print:
-			if (dwSignature == CardIssuerStandService_MethodSignature_Print) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CardIssuerStandService_Method_QuerySCIList:
-			if (dwSignature == CardIssuerStandService_MethodSignature_QuerySCIList) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CardIssuerStandService_Method_BindSCI:
-			if (dwSignature == CardIssuerStandService_MethodSignature_BindSCI) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStandService_Method_PreOnlineOnStore:
 			if (dwSignature == CardIssuerStandService_MethodSignature_PreOnlineOnStore) {
 				bOverlap = true;
@@ -400,11 +358,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStandService_Method_ReadEx:
-			if (dwSignature != CardIssuerStandService_MethodSignature_ReadEx) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStandService_Method_QueryCardInfo:
 			if (dwSignature != CardIssuerStandService_MethodSignature_QueryCardInfo) {
 				Error = Error_MethodSignatureFailed;
@@ -440,36 +393,11 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStandService_Method_OpenSafeLock:
-			if (dwSignature != CardIssuerStandService_MethodSignature_OpenSafeLock) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStandService_Method_SAMICCommand:
 			if (dwSignature != CardIssuerStandService_MethodSignature_SAMICCommand) {
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStandService_Method_QueryPrinterStatus:
-			if (dwSignature != CardIssuerStandService_MethodSignature_QueryPrinterStatus) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CardIssuerStandService_Method_Print:
-			if (dwSignature != CardIssuerStandService_MethodSignature_Print) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CardIssuerStandService_Method_QuerySCIList:
-			if (dwSignature != CardIssuerStandService_MethodSignature_QuerySCIList) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CardIssuerStandService_Method_BindSCI:
-			if (dwSignature != CardIssuerStandService_MethodSignature_BindSCI) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStandService_Method_PreOnlineOnStore:
 			if (dwSignature != CardIssuerStandService_MethodSignature_PreOnlineOnStore) {
 				Error = Error_MethodSignatureFailed;
@@ -617,11 +545,6 @@ public:
 	/// override by user
 	}
 
-	virtual void Handle_ReadEx(SpReqAnsContext<CardIssuerStandService_ReadEx_Req, CardIssuerStandService_ReadEx_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void Handle_QueryCardInfo(SpReqAnsContext<CardIssuerStandService_QueryCardInfo_Req, CardIssuerStandService_QueryCardInfo_Ans>::Pointer ctx)
 	{
 	/// override by user
@@ -657,36 +580,11 @@ public:
 	/// override by user
 	}
 
-	virtual void Handle_OpenSafeLock(SpReqAnsContext<CardIssuerStandService_OpenSafeLock_Req, CardIssuerStandService_OpenSafeLock_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void Handle_SAMICCommand(SpReqAnsContext<CardIssuerStandService_SAMICCommand_Req, CardIssuerStandService_SAMICCommand_Ans>::Pointer ctx)
 	{
 	/// override by user
 	}
 
-	virtual void Handle_QueryPrinterStatus(SpReqAnsContext<CardIssuerStandService_QueryPrinterStatus_Req, CardIssuerStandService_QueryPrinterStatus_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_Print(SpReqAnsContext<CardIssuerStandService_Print_Req, CardIssuerStandService_Print_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_QuerySCIList(SpReqAnsContext<CardIssuerStandService_QuerySCIList_Req, CardIssuerStandService_QuerySCIList_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_BindSCI(SpReqAnsContext<CardIssuerStandService_BindSCI_Req, CardIssuerStandService_BindSCI_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void Handle_PreOnlineOnStore(SpReqAnsContext<CardIssuerStandService_PreOnlineOnStore_Req, CardIssuerStandService_PreOnlineOnStore_Ans>::Pointer ctx)
 	{
 	/// override by user
@@ -908,16 +806,6 @@ public:
 						Handle_SetIssueFlag(ctx);
 					}
 					break;
-				case CardIssuerStandService_Method_ReadEx:
-					{
-						SpReqAnsContext<CardIssuerStandService_ReadEx_Req,CardIssuerStandService_ReadEx_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CardIssuerStandService_ReadEx_Req,CardIssuerStandService_ReadEx_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_ReadEx(ctx);
-					}
-					break;
 				case CardIssuerStandService_Method_QueryCardInfo:
 					{
 						SpReqAnsContext<CardIssuerStandService_QueryCardInfo_Req,CardIssuerStandService_QueryCardInfo_Ans>::Pointer ctx;
@@ -988,16 +876,6 @@ public:
 						Handle_IssueEx(ctx);
 					}
 					break;
-				case CardIssuerStandService_Method_OpenSafeLock:
-					{
-						SpReqAnsContext<CardIssuerStandService_OpenSafeLock_Req,CardIssuerStandService_OpenSafeLock_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CardIssuerStandService_OpenSafeLock_Req,CardIssuerStandService_OpenSafeLock_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_OpenSafeLock(ctx);
-					}
-					break;
 				case CardIssuerStandService_Method_SAMICCommand:
 					{
 						SpReqAnsContext<CardIssuerStandService_SAMICCommand_Req,CardIssuerStandService_SAMICCommand_Ans>::Pointer ctx;
@@ -1008,46 +886,6 @@ public:
 						Handle_SAMICCommand(ctx);
 					}
 					break;
-				case CardIssuerStandService_Method_QueryPrinterStatus:
-					{
-						SpReqAnsContext<CardIssuerStandService_QueryPrinterStatus_Req,CardIssuerStandService_QueryPrinterStatus_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CardIssuerStandService_QueryPrinterStatus_Req,CardIssuerStandService_QueryPrinterStatus_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_QueryPrinterStatus(ctx);
-					}
-					break;
-				case CardIssuerStandService_Method_Print:
-					{
-						SpReqAnsContext<CardIssuerStandService_Print_Req,CardIssuerStandService_Print_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CardIssuerStandService_Print_Req,CardIssuerStandService_Print_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_Print(ctx);
-					}
-					break;
-				case CardIssuerStandService_Method_QuerySCIList:
-					{
-						SpReqAnsContext<CardIssuerStandService_QuerySCIList_Req,CardIssuerStandService_QuerySCIList_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CardIssuerStandService_QuerySCIList_Req,CardIssuerStandService_QuerySCIList_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_QuerySCIList(ctx);
-					}
-					break;
-				case CardIssuerStandService_Method_BindSCI:
-					{
-						SpReqAnsContext<CardIssuerStandService_BindSCI_Req,CardIssuerStandService_BindSCI_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CardIssuerStandService_BindSCI_Req,CardIssuerStandService_BindSCI_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_BindSCI(ctx);
-					}
-					break;
 				case CardIssuerStandService_Method_PreOnlineOnStore:
 					{
 						SpReqAnsContext<CardIssuerStandService_PreOnlineOnStore_Req,CardIssuerStandService_PreOnlineOnStore_Ans>::Pointer ctx;

Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -2195,49 +2195,8 @@ int CCardReadAdapterFSM::GetSCIInfo(SpReqAnsContext<CardReadAdapterService_GetSC
 int CCardReadAdapterFSM::OpenSafeLock(SpReqAnsContext<CardReadAdapterService_OpenSafeLock_Req, CardReadAdapterService_OpenSafeLock_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
-	if (IsCardIssuerSessionOK())
-	{
-		if (!IsCardIssuerStore()) {
-			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerStandService_OpenSafeLock_Req req;
-			CardIssuerStandService_OpenSafeLock_Ans ans;
-			req.reserved1.Copy(ctx->Req.reserved1);
-			req.reserved2.Copy(ctx->Req.reserved2);
-			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->OpenSafeLock(req, ans, 15000);
-			if (eErr == Error_Succeed)
-			{
-				ctx->Ans.reserved1.Copy(ans.reserved1);
-				ctx->Ans.reserved2.Copy(ans.reserved2);
-			}
-			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("OpenSafeLock, CardIssuerStand OpenSafeLock failed return:%d", eErr);
-			}
-			ctx->Answer(eErr);
-		}
-		else {
-			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerStoreService_OpenSafeLock_Req req;
-			CardIssuerStoreService_OpenSafeLock_Ans ans;
-			req.reserved1.Copy(ctx->Req.reserved1);
-			req.reserved2.Copy(ctx->Req.reserved2);
-			eErr = (*m_pCardIssuerStore)(EntityResource::getLink().upgradeLink())->OpenSafeLock(req, ans, 15000);
-			if (eErr == Error_Succeed)
-			{
-				ctx->Ans.reserved1.Copy(ans.reserved1);
-				ctx->Ans.reserved2.Copy(ans.reserved2);
-			}
-			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("OpenSafeLock, CardIssuerStore OpenSafeLock failed return:%d", eErr);
-			}
-			ctx->Answer(eErr);
-		}
-
-	}
-	else
-	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("OpenSafeLock is err, session is not ok");
-		ctx->Answer(Error_Unexpect);
-	}
+	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("OpenSafeLock is not deal with");
+	ctx->Answer(Error_Unexpect);
 	return 0;
 }
 int CCardReadAdapterFSM::MagTransferInit(SpReqAnsContext<CardReadAdapterService_MagTransferInit_Req, CardReadAdapterService_MagTransferInit_Ans>::Pointer ctx)
@@ -2340,254 +2299,35 @@ int CCardReadAdapterFSM::SAMICCommand(SpReqAnsContext<CardReadAdapterService_SAM
 int CCardReadAdapterFSM::QueryPrinterStatus(SpReqAnsContext<CardReadAdapterService_QueryPrinterStatus_Req, CardReadAdapterService_QueryPrinterStatus_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
-	if (IsCardIssuerSessionOK())
-	{
-		if (!IsCardIssuerStore()) {
-			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerStandService_QueryPrinterStatus_Req req;
-			CardIssuerStandService_QueryPrinterStatus_Ans ans;
-			req.param1.Copy(ctx->Req.param1);
-			req.param2.Copy(ctx->Req.param2);
-			req.reserved1.Copy(ctx->Req.reserved1);
-			req.reserved2.Copy(ctx->Req.reserved2);
-			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->QueryPrinterStatus(req, ans, 20000);
-			if (eErr == Error_Succeed)
-			{
-				ctx->Ans.ret1.Copy(ans.ret1);
-				ctx->Ans.ret2.Copy(ans.ret2);
-				ctx->Ans.reserved1.Copy(ans.reserved1);
-				ctx->Ans.reserved2.Copy(ans.reserved2);
-			}
-			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QueryPrinterStatus, CardIssuerStand QueryPrinterStatus failed return:%d", eErr);
-			}
-			ctx->Answer(eErr);
-			return 0;
-		}
-		else {
-			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerStoreService_QueryPrinterStatus_Req req;
-			CardIssuerStoreService_QueryPrinterStatus_Ans ans;
-			req.param1.Copy(ctx->Req.param1);
-			req.param2.Copy(ctx->Req.param2);
-			req.reserved1.Copy(ctx->Req.reserved1);
-			req.reserved2.Copy(ctx->Req.reserved2);
-			eErr = (*m_pCardIssuerStore)(EntityResource::getLink().upgradeLink())->QueryPrinterStatus(req, ans, 20000);
-			if (eErr == Error_Succeed)
-			{
-				ctx->Ans.ret1.Copy(ans.ret1);
-				ctx->Ans.ret2.Copy(ans.ret2);
-				ctx->Ans.reserved1.Copy(ans.reserved1);
-				ctx->Ans.reserved2.Copy(ans.reserved2);
-			}
-			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QueryPrinterStatus, CardIssuerStore QueryPrinterStatus failed return:%d", eErr);
-			}
-			ctx->Answer(eErr);
-			return 0;
-		}
-	}
-	else
-	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QueryPrinterStatus is err, session is not ok");
-		ctx->Answer(Error_Param);
-		return 1;
-	}
+	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QueryPrinterStatus is not deal with");
+	ctx->Answer(Error_Unexpect);
+	return 0;
 }
 int CCardReadAdapterFSM::Print(SpReqAnsContext<CardReadAdapterService_Print_Req, CardReadAdapterService_Print_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
-	if (IsCardIssuerSessionOK())
-	{
-		if (!IsCardIssuerStore()) {
-			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerStandService_Print_Req req;
-			CardIssuerStandService_Print_Ans ans;
-			req.data1 = ctx->Req.data1;
-			req.data2 = ctx->Req.data2;
-			req.data3 = ctx->Req.data3;
-			req.data4 = ctx->Req.data4;
-			req.data5 = ctx->Req.data5;
-			req.data6 = ctx->Req.data6;
-			req.reserved1.Copy(ctx->Req.reserved1);
-			req.reserved2.Copy(ctx->Req.reserved2);
-			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->Print(req, ans, 50000);
-			if (eErr == Error_Succeed)
-			{
-				ctx->Ans.reserved1.Copy(ans.reserved1);
-				ctx->Ans.reserved2.Copy(ans.reserved2);
-			}
-			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Print, CardIssuerStand Print failed return:%d", eErr);
-			}
-			ctx->Answer(eErr);
-			return 0;
-		}
-		else {
-			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerStoreService_Print_Req req;
-			CardIssuerStoreService_Print_Ans ans;
-			req.data1 = ctx->Req.data1;
-			req.data2 = ctx->Req.data2;
-			req.data3 = ctx->Req.data3;
-			req.data4 = ctx->Req.data4;
-			req.data5 = ctx->Req.data5;
-			req.data6 = ctx->Req.data6;
-			req.reserved1.Copy(ctx->Req.reserved1);
-			req.reserved2.Copy(ctx->Req.reserved2);
-			eErr = (*m_pCardIssuerStore)(EntityResource::getLink().upgradeLink())->Print(req, ans, 50000);
-			if (eErr == Error_Succeed)
-			{
-				ctx->Ans.reserved1.Copy(ans.reserved1);
-				ctx->Ans.reserved2.Copy(ans.reserved2);
-			}
-			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Print, CardIssuerStore Print failed return:%d", eErr);
-			}
-			ctx->Answer(eErr);
-			return 0;
-		}
+	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Print is not deal with");
+	ctx->Answer(Error_Unexpect);
+	return 0;
 
-	}
-	else
-	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Print is err, session is not ok");
-		ctx->Answer(Error_Param);
-		return 1;
-	}
 }
 int CCardReadAdapterFSM::QuerySCIList(SpReqAnsContext<CardReadAdapterService_QuerySCIList_Req, CardReadAdapterService_QuerySCIList_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
 	DWORD dwUsrErrCode = 0;
-	if (IsCardIssuerSessionOK())
-	{
-		if (!IsCardIssuerStore()) {
-			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerStandService_QuerySCIList_Req req;
-			CardIssuerStandService_QuerySCIList_Ans ans;
-			req.reserved1.Copy(ctx->Req.reserved1);
-			req.reserved2.Copy(ctx->Req.reserved2);
-			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->QuerySCIList(req, ans, 50000, dwUsrErrCode);
-			if (eErr == Error_Succeed)
-			{
-				ctx->Ans.sciNo.Copy(ans.sciNo);
-				ctx->Ans.arrMateriel.Copy(ans.arrMateriel);
-				ctx->Ans.CardGroove.Copy(ans.CardGroove);
-				ctx->Ans.CardBoxNo.Copy(ans.CardBoxNo);
-				ctx->Ans.PsbCode.Copy(ans.PsbCode);
-				ctx->Ans.PsbName.Copy(ans.PsbName);
-				ctx->Ans.CardInit.Copy(ans.CardInit);
-				ctx->Ans.CardRemains.Copy(ans.CardRemains);
-				ctx->Ans.CardIssued.Copy(ans.CardIssued);
-				ctx->Ans.CardMixed.Copy(ans.CardMixed);
-				ctx->Ans.CardPercent.Copy(ans.CardPercent);
-				ctx->Ans.Maintainer.Copy(ans.Maintainer);
-				ctx->Ans.MaintainTime.Copy(ans.MaintainTime);
-				ctx->Ans.UpdateTime.Copy(ans.UpdateTime);
-				ctx->Ans.reserved1.Copy(ans.reserved1);
-				ctx->Ans.reserved2.Copy(ans.reserved2);
-			}
-			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QuerySCIList, CardIssuerStand QuerySCIList failed return:%d", eErr);
-			}
-			ctx->Answer(eErr, dwUsrErrCode);
-			return 0;
-		}
-		else {
-			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerStoreService_QuerySCIList_Req req;
-			CardIssuerStoreService_QuerySCIList_Ans ans;
-			req.reserved1.Copy(ctx->Req.reserved1);
-			req.reserved2.Copy(ctx->Req.reserved2);
-			eErr = (*m_pCardIssuerStore)(EntityResource::getLink().upgradeLink())->QuerySCIList(req, ans, 50000, dwUsrErrCode);
-			if (eErr == Error_Succeed)
-			{
-				ctx->Ans.sciNo.Copy(ans.sciNo);
-				ctx->Ans.arrMateriel.Copy(ans.arrMateriel);
-				ctx->Ans.CardGroove.Copy(ans.CardGroove);
-				ctx->Ans.CardBoxNo.Copy(ans.CardBoxNo);
-				ctx->Ans.PsbCode.Copy(ans.PsbCode);
-				ctx->Ans.PsbName.Copy(ans.PsbName);
-				ctx->Ans.CardInit.Copy(ans.CardInit);
-				ctx->Ans.CardRemains.Copy(ans.CardRemains);
-				ctx->Ans.CardIssued.Copy(ans.CardIssued);
-				ctx->Ans.CardMixed.Copy(ans.CardMixed);
-				ctx->Ans.CardPercent.Copy(ans.CardPercent);
-				ctx->Ans.Maintainer.Copy(ans.Maintainer);
-				ctx->Ans.MaintainTime.Copy(ans.MaintainTime);
-				ctx->Ans.UpdateTime.Copy(ans.UpdateTime);
-				ctx->Ans.reserved1.Copy(ans.reserved1);
-				ctx->Ans.reserved2.Copy(ans.reserved2);
-			}
-			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QuerySCIList, CardIssuerStore QuerySCIList failed return:%d", eErr);
-			}
-			ctx->Answer(eErr, dwUsrErrCode);
-			return 0;
-		}
-	}
-	else
-	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QuerySCIList is err, session is not ok");
-		ctx->Answer(Error_Param);
-		return 1;
-	}
+	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("QuerySCIList is not deal with");
+	ctx->Answer(Error_Unexpect);
+	return 0;
+
 }
 int CCardReadAdapterFSM::BindSCI(SpReqAnsContext<CardReadAdapterService_BindSCI_Req, CardReadAdapterService_BindSCI_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
 	DWORD dwUsrErrCode = 0;
-	if (IsCardIssuerSessionOK())
-	{
-		if (!IsCardIssuerStore()) {
-			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerStandService_BindSCI_Req req;
-			CardIssuerStandService_BindSCI_Ans ans;
-			req.type = ctx->Req.type;
-			req.sciNo = ctx->Req.sciNo;
-			req.reserved1.Copy(ctx->Req.reserved1);
-			req.reserved2.Copy(ctx->Req.reserved2);
-			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->BindSCI(req, ans, 50000, dwUsrErrCode);
-			if (eErr == Error_Succeed)
-			{
-				ctx->Ans.reserved1.Copy(ans.reserved1);
-				ctx->Ans.reserved2.Copy(ans.reserved2);
-			}
-			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("BindSCI, CardIssuerStand BindSCI failed return:%d", eErr);
-			}
-			ctx->Answer(eErr, dwUsrErrCode);
-			return 0;
-		}
-		else {
-			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerStoreService_BindSCI_Req req;
-			CardIssuerStoreService_BindSCI_Ans ans;
-			req.type = ctx->Req.type;
-			req.sciNo = ctx->Req.sciNo;
-			req.reserved1.Copy(ctx->Req.reserved1);
-			req.reserved2.Copy(ctx->Req.reserved2);
-			eErr = (*m_pCardIssuerStore)(EntityResource::getLink().upgradeLink())->BindSCI(req, ans, 50000, dwUsrErrCode);
-			if (eErr == Error_Succeed)
-			{
-				ctx->Ans.reserved1.Copy(ans.reserved1);
-				ctx->Ans.reserved2.Copy(ans.reserved2);
-			}
-			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("BindSCI, CardIssuerStore BindSCI failed return:%d", eErr);
-			}
-			ctx->Answer(eErr, dwUsrErrCode);
-			return 0;
-		}
+	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("BindSCI is not deal with");
+	ctx->Answer(Error_Unexpect);
+	return 0;
 
-	}
-	else
-	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("BindSCI is err, session is not ok");
-		ctx->Answer(Error_Param);
-		return 1;
-	}
 }
 int CCardReadAdapterFSM::PreOnlineOnStore(SpReqAnsContext<CardReadAdapterService_PreOnlineOnStore_Req, CardReadAdapterService_PreOnlineOnStore_Ans>::Pointer ctx)
 {

Module/mod_ContactlessCard/ContactlessFSM.cpp

@@ -1479,7 +1479,7 @@ int CContactlessCardFSM::QueryCardInfo(SpReqAnsContext<ContactlessCardService_Qu
 	if (eErr != Error_Succeed)
 	{
 		SetErrorAndLog(eErr, MEC_DEVAPI_RF_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
-		ctx->Answer(TransECWithRepeat(Error_Unexpect));
+		ctx->Answer(Error_Unexpect);
 		return 1;
 	}
 	int ret = 0;

Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp

@@ -1676,7 +1676,9 @@ namespace Task
 			}
 			if(failStatus == 1){
 				//安装成功，执行防火墙设置
-				m_fsm->SetNewVersionPathToFirewall();
+				if (!m_fsm->m_stopSetFirewall) {
+					m_fsm->SetNewVersionPathToFirewall();
+				}
 				DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("======end ExecInstall:succ======");
 				isInstallSucc =true;
 			}else{
@@ -2804,6 +2806,10 @@ ErrorCodeEnum CUpgradeTaskFSM::UpgradeToNewVersion()
 			return Error_Unexpect;
 		}else{
 			fflush(fp);
+			int CommitRet = _commit(_fileno(fp));
+			if (CommitRet != 0) {
+				LogWarn(Severity_Middle, Error_Exception, ERR_TASK_UPDATE_ACTIVE_FAIL, CSimpleStringA::Format("UpgradeToNewVersion fail, commit write active.txt fail, err=%d", (int)GetLastError()).GetData());
+			}
 			fclose(fp);
 			if (ExistsFileA(strBackupActiveFile.GetData())) {
 				RemoveFileA(strBackupActiveFile.GetData());
@@ -2856,6 +2862,10 @@ ErrorCodeEnum CUpgradeTaskFSM::UpgradeToNewVersion()
 			return Error_Unexpect;
 		}else{
 			fflush(fp);
+			int CommitRet = fsync(fileno(fp));
+			if (CommitRet != 0) {
+				LogWarn(Severity_Middle, Error_Exception, ERR_TASK_UPDATE_ACTIVE_FAIL, CSimpleStringA::Format("UpgradeToNewVersion fail, commit write active.txt fail, err=%d", errno).GetData());
+			}
 			fclose(fp);
 			if (ExistsFileA(strBackupActiveFile.GetData())) {
 				RemoveFileA(strBackupActiveFile.GetData());
@@ -4021,6 +4031,23 @@ ErrorCodeEnum CUpgradeTaskFSM::loadCenterCfgInfo()
 			LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL,  "get CenterSetting.ini StartFlag error");
 			return rc;
 		} 
+
+		int stopSetFirewallInt = 0;
+		rc = spConfig->ReadConfigValueInt("UpgradeManager", "stopSetFirewall", stopSetFirewallInt);
+		if (rc == Error_Succeed) {
+			if (stopSetFirewallInt == 0) {
+				m_stopSetFirewall = false;
+			}
+			else {
+				m_stopSetFirewall = true;
+			}
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read CenterSetting.ini stopSetFirewall=%d", stopSetFirewallInt);
+		}
+		else {
+			LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini stopSetFirewall error");
+			return rc;
+		}
+
 		int queryNewTaskInterval = 0;
 		rc = spConfig->ReadConfigValueInt("UpgradeManager", "queryNewTaskInterval", queryNewTaskInterval);
 		if (rc == Error_Succeed) {

Module/mod_UpgradeMgr/UpgradeTaskFSM.h

@@ -545,6 +545,7 @@ public:
 	int m_newEachDownloadLen;//新的每次下载数据长度阈值(k)
 	bool m_PrintHttpLog;  //是否打印通讯日志
 	bool m_startFlag; //升级实体启动标志位,默认是不开，
+	bool m_stopSetFirewall;//是否停止设置防火墙路径，默认是不停止
 	HashScanSet m_hashScanSet;//扫描文件hash设置
 
 	bool m_isSM3HashSucc;//hash是否计算成功

Module/mod_cardissuerstore/CardIssuerStore.xml

@@ -102,30 +102,6 @@
 		</twoway>
 		<oneway name="SetIssueFlag" overlap="true" method_id="12">			
 		</oneway>
-		<twoway name="ReadEx" overlap="true" method_id="13">
-			<req>
-				<param name="aid" type="string"/>
-				<param name="reserved1" type="string"/>
-				<param name="reserved2" type="string"/>
-			</req>
-			<res>
-				<param name="track1" type="string"/>
-				<param name="track2" type="string"/>
-				<param name="track3" type="string"/>
-				<param name="CDType" type="int"/>
-				<param name="ICType" type="int"/>
-				<param name="CMBType" type="int"/>
-				<param name="ICData" type="string"/>
-				<param name="status" type="int" />
-				<param name="t2Account" type="string" />
-				<param name="t2Region" type="string" />
-				<param name="t2CardSerial" type="string" />
-				<param name="t2CVC" type="string" />
-				<param name="t2ExpireDate" type="string" />
-				<param name="reserved1" type="string"/>
-				<param name="reserved2" type="string"/>
-			</res>
-		</twoway>
 		<twoway name="QueryCardInfo" overlap="true" method_id="14">
 			<req>
 			</req>
@@ -228,16 +204,6 @@
 				<param name="reserved2" type="array_string"/>					
 			</res>			
 		</twoway>
-		<twoway name="OpenSafeLock" overlap="true" method_id="21">
-			<req>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>			
-			</req>
-			<res>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>					
-			</res>			
-		</twoway>
 		<twoway name="SAMICCommand" overlap="true" method_id="22">
 			<req>
 				<param name="cmdType" type="int"/>
@@ -253,72 +219,6 @@
 				<param name="reserved2" type="array_string"/>					
 			</res>			
 		</twoway>
-		<twoway name="QueryPrinterStatus" overlap="true" method_id="23">
-			<req>
-				<param name="param1" type="array_int"/>
-				<param name="param2" type="array_string"/>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>			
-			</req>
-			<res>
-				<param name="ret1" type="array_int"/>
-				<param name="ret2" type="array_string"/>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>					
-			</res>			
-		</twoway>
-		<twoway name="Print" overlap="true" method_id="24">
-			<req>
-				<param name="data1" type="blob"/>
-				<param name="data2" type="blob"/>
-				<param name="data3" type="blob"/>
-				<param name="data4" type="blob"/>
-				<param name="data5" type="blob"/>
-				<param name="data6" type="blob"/>				
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>			
-			</req>
-			<res>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>					
-			</res>			
-		</twoway>
-		<twoway name="QuerySCIList" overlap="true" method_id="25">
-			<req>			
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>			
-			</req>
-			<res>
-				<param name="sciNo" type="array_string"/>
-        <param name="arrMateriel" type="array_string"/>
-        <param name="CardGroove" type="array_string"/>
-        <param name="CardBoxNo" type="array_string"/>
-        <param name="PsbCode" type="array_string"/>
-        <param name="PsbName" type="array_string"/>
-        <param name="CardInit" type="array_uint"/>
-        <param name="CardRemains" type="array_uint"/>
-        <param name="CardIssued" type="array_uint"/>
-        <param name="CardMixed" type="array_uint"/>
-        <param name="CardPercent" type="array_uint"/>
-        <param name="Maintainer" type="array_string"/>
-        <param name="MaintainTime" type="array_string"/>
-        <param name="UpdateTime" type="array_string"/>				
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>					
-			</res>			
-		</twoway>		
-		<twoway name="BindSCI" overlap="true" method_id="26">
-			<req>
-				<param name="type" type="int"/>
-				<param name="sciNo" type="string" />			
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>			
-			</req>
-			<res>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>					
-			</res>			
-		</twoway>
 		<twoway name="PreOnlineOnStore" overlap="true" method_id="27">
 			<req>
 				<param name="account" type="string"/>

Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp

@@ -1402,6 +1402,7 @@ unsigned int CCardIssuerFSM::s19_on_event(FSMEvent* pEvt)
 ErrorCodeEnum CCardIssuerFSM::OnInit()
 {
 	LOG_FUNCTION();
+	AddStateHooker(this);
 	m_pCardProcess = new CCardProcess();
 	if (m_pCardProcess == NULL)//almost no use...
 	{
@@ -2173,7 +2174,7 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStoreService_IssueEx_Req
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040222020").setResultCode("RTA2W0R")("卡箱1连续吞卡超限，请及时执行清机");
 
 		LogWarn(Severity_Middle, Error_Unexpect, dwTmpErrCode, errMsg.GetData());
-		ctxEx->Answer(TransECWithRepeat(Error_DevMedia), dwTmpErrCode);
+		ctxEx->Answer(Error_DevMedia, dwTmpErrCode);
 		return 2;
 	}
 	ErrorCodeEnum errCode;
@@ -3554,18 +3555,21 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStoreService_Pre
 	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<PreOnline>, After invoke DetectAndReadICData, retDetectAndRead:%d, activeCardType:%d", retDetectAndRead, activeCardType);
 	if (retDetectAndRead < 0)
 	{
-		if ((m_csMachineType.Compare("RVC.CardStore") == 0 || m_csMachineType.Compare("RVC.CardPrinter") == 0)
-			&& m_bCrossPreOnline) {
-			if (IfUseRf()) {
-				bContinue = true; //继续后面的非接流程
-			}
-			else {
-				AfterPreOnlineOnStore(Error_Unexpect, slot);
-			}
-		}
+		//if ((m_csMachineType.Compare("RVC.CardStore") == 0 || m_csMachineType.Compare("RVC.CardPrinter") == 0)
+		//	&& m_bCrossPreOnline) {
+		//	if (IfUseRf()) {
+		//		bContinue = true; //继续后面的非接流程
+		//	}
+		//	else {
+		//		AfterPreOnlineOnStore(Error_Unexpect, slot);
+		//	}
+		//}
 		CSimpleStringA xCardName("");
 		if (m_issueStatus && m_currentHopper - 1 >= 0)
 			xCardName = m_PsbNameEx[m_currentHopper - 1];
+
+
+		DWORD dwUserErrCode = 0;
 		if (retDetectAndRead == -1){
 
 			ErrorCodeEnum eErrCode = Error_Unexpect;
@@ -3588,7 +3592,8 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStoreService_Pre
 						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI(ApiName.GetData()).setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W0V")(csErrMsgWithReturnCode.GetData());
 						LogWarn(Severity_Middle, Error_Unexpect, dwCode, alarmMsg.GetData());
 					}
-					ctx->Answer(Error_Unexpect, dwCode);
+					dwUserErrCode = dwCode;
+					//ctx->Answer(Error_Unexpect, dwCode);
 				}
 				else {
 					//使用非接兜底
@@ -3610,7 +3615,8 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStoreService_Pre
 						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI(ApiName.GetData()).setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W0M")(csErrMsgWithReturnCode.GetData());
 						LogWarn(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveICCard_Failed, alarmMsg.GetData());
 					}
-					ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveICCard_Failed);
+					dwUserErrCode = CardIssuerStore_UserErrorCode_ActiveICCard_Failed;
+					//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveICCard_Failed);
 				}
 				else {
 					//使用非接兜底
@@ -3630,7 +3636,8 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStoreService_Pre
 				else {
 					dwTmpUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand, "DevAdapter::ICCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222003", "");
 				}
-				ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
+				dwUserErrCode = dwTmpUserErrCode;
+				//ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 				
 			}
 			else {
@@ -3655,7 +3662,8 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStoreService_Pre
 				else {
 					dwTmpUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand, "DevAdapter::ICCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222003", "");
 				}
-				ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
+				dwUserErrCode = dwTmpUserErrCode;
+				//ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 				
 			}
 			else {
@@ -3669,6 +3677,19 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStoreService_Pre
 			}
 
 		}
+
+		if ((m_csMachineType.Compare("RVC.CardStore") == 0 || m_csMachineType.Compare("RVC.CardPrinter") == 0) && m_bCrossPreOnline) {
+			if (IfUseRf()) {
+				bContinue = true; //继续后面的非接流程
+			}
+			else {
+				AfterPreOnlineOnStore(Error_Unexpect, slot);
+			}
+		}
+		if (!IfUseRf()){
+			ctx->Answer(Error_Unexpect, dwUserErrCode);
+		}
+
 		bICOK = false;
 		return 0;//读卡失败
 	}
@@ -3985,12 +4006,16 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStoreService_PreOnlin
 	if (retDetectAndRead < 0)
 	{
 		//非接兜底需要移回卡槽
-		if ((m_csMachineType.Compare("RVC.CardStore") == 0 || m_csMachineType.Compare("RVC.CardPrinter") == 0) && m_bCrossPreOnline) {
-			AfterPreOnlineOnStore(Error_Unexpect, slot);//移回卡槽
-		}
+		//if ((m_csMachineType.Compare("RVC.CardStore") == 0 || m_csMachineType.Compare("RVC.CardPrinter") == 0) && m_bCrossPreOnline) {
+		//	AfterPreOnlineOnStore(Error_Unexpect, slot);//移回卡槽
+		//}
+
+
 		CSimpleStringA xCardName("");
 		if (m_issueStatus && m_currentHopper - 1 >= 0)
 			xCardName = m_PsbNameEx[m_currentHopper - 1];
+
+		DWORD dwUserErrCode = 0;
 		if (retDetectAndRead == -1) {
 
 			ErrorCodeEnum eErrCode = Error_Unexpect;
@@ -4012,7 +4037,8 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStoreService_PreOnlin
 					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI(ApiName.GetData()).setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222020").setResultCode("RTA2W27")(csErrMsgWithReturnCode.GetData());
 					LogWarn(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_IssueCard_ActiveRF_Failed, alarmMsg.GetData());
 				}
-				ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_IssueCard_ActiveRF_Failed);
+				dwUserErrCode = CardIssuerStore_UserErrorCode_IssueCard_ActiveRF_Failed;
+				//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_IssueCard_ActiveRF_Failed);
 			}
 			else
 			{
@@ -4027,7 +4053,8 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStoreService_PreOnlin
 					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI(ApiName.GetData()).setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222003").setResultCode("RTA2W26")(csErrMsgWithReturnCode.GetData());
 					LogWarn(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveContactlessICCard_Failed, alarmMsg.GetData());
 				}
-				ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveContactlessICCard_Failed);
+				dwUserErrCode = CardIssuerStore_UserErrorCode_ActiveContactlessICCard_Failed;
+				//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveContactlessICCard_Failed);
 			}
 		}
 		else if (retDetectAndRead == -2) {
@@ -4039,7 +4066,8 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStoreService_PreOnlin
 			else {
 				dwTmpUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_RFTypeABCommand, "DevAdapter::RFTypeABCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222003", "");
 			}
-			ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
+			dwUserErrCode = dwTmpUserErrCode;
+			//ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 		}
 		else if (retDetectAndRead == -3) {
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("IC卡建立应用列表失败");
@@ -4050,8 +4078,17 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStoreService_PreOnlin
 			else {
 				dwTmpUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_RFTypeABCommand, "DevAdapter::RFTypeABCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222003", "");
 			}
-			ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
+			dwUserErrCode = dwTmpUserErrCode;
+			//ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 		}
+
+		//非接兜底需要移回卡槽
+		if ((m_csMachineType.Compare("RVC.CardStore") == 0 || m_csMachineType.Compare("RVC.CardPrinter") == 0) && m_bCrossPreOnline) {
+			AfterPreOnlineOnStore(Error_Unexpect, slot);//移回卡槽
+		}
+
+		ctx->Answer(Error_Unexpect, dwUserErrCode);
+
 		return 0;
 	}
 
@@ -6233,9 +6270,9 @@ int CCardIssuerFSM::AddCardToStoreStepLast(SpReqAnsContext<CardIssuerStoreServic
 			m_mapJsonErr["userCode"] = JsonElem(CardIssuerStore_UserErrorCode_KakuFindEmptySlot_Failed);
 			m_mapJsonErr["tips"] = JsonElem("[RTA2W0L] 卡库找不到空闲卡槽，请联系卡库厂商排查");
 			if (m_bNewAnsError)
-				ctx->Answer(TransECWithRepeat(Error_Unexpect), CardIssuerStore_UserErrorCode_KakuFindEmptySlot_Failed, generateJsonString(m_mapJsonErr));
+				ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_KakuFindEmptySlot_Failed, generateJsonString(m_mapJsonErr));
 			else
-				ctx->Answer(TransECWithRepeat(Error_Unexpect), CardIssuerStore_UserErrorCode_KakuFindEmptySlot_Failed);
+				ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_KakuFindEmptySlot_Failed);
 			return 0;
 		}
 		ctx->Ans.reserved1.Init(4);
@@ -6620,8 +6657,8 @@ int CCardIssuerFSM::QueryCardInfoOnStore(SpReqAnsContext<CardIssuerStoreService_
 			{
 				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("QueryCardInfoOnStore::QuerySlotsStatus reserved1=1 fail");
 				DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_QuerySlotsStatus, "DevAdapter::QuerySlotsStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
-				ctx->Answer(TransECWithRepeat(Error_Unexpect), dwTmpUserErrCode);
-				//ctx->Answer(TransECWithRepeat(Error_Unexpect), GetAlarmDEC());
+				ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
+				
 				return 2;
 			}
 			else {
@@ -10253,10 +10290,11 @@ int CCardIssuerFSM::PreOnlineCrossJS_Contact(SpReqAnsContext<CardIssuerStoreServ
 			}
 		}
 		else {
-			CaptureResult = AfterPreOnlineCrossJS(slot, m_currCardNo);//执行移回操作
-			m_findCard = 4;
-			ctx->Ans.findCard = 4;
-			ctx->Ans.cardPos = m_cardPos;
+			//CaptureResult = AfterPreOnlineCrossJS(slot, m_currCardNo);//执行移回操作
+			//m_findCard = 4;
+			//ctx->Ans.findCard = 4;
+			//ctx->Ans.cardPos = m_cardPos;
+			DWORD dwUserErrCode = 0;
 			if (retDetectAndRead == -1) {
 
 				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("跨机检测卡片类型时上电失败,slot:%d", slot);
@@ -10269,18 +10307,26 @@ int CCardIssuerFSM::PreOnlineCrossJS_Contact(SpReqAnsContext<CardIssuerStoreServ
 					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI(ApiName.GetData()).setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222052").setResultCode("RTA2W0M")(csErrMsgWithReturnCode.GetData());
 					LogWarn(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveICCard_Failed, alarmMsg.GetData());
 				}
-				ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveICCard_Failed);
+				dwUserErrCode = CardIssuerStore_UserErrorCode_ActiveICCard_Failed;
+				//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveICCard_Failed);
 			}
 			else if (retDetectAndRead == -2) {
 				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("跨机读取IC数据失败,slot:%d", slot);
-				DWORD dwTmpUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand, "DevAdapter::ICCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222052", "");
-				ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
+				dwUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand, "DevAdapter::ICCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222052", "");
+				//ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 			}
 			else if (retDetectAndRead == -3) {
 				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("跨机读取IC数据失败,slot:%d", slot);
-				DWORD dwTmpUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand, "DevAdapter::ICCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222052", "");
-				ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
+				dwUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand, "DevAdapter::ICCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222052", "");
+				//ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 			}
+
+			CaptureResult = AfterPreOnlineCrossJS(slot, m_currCardNo);//执行移回操作
+			m_findCard = 4;
+			ctx->Ans.findCard = 4;
+			ctx->Ans.cardPos = m_cardPos;
+
+			ctx->Answer(Error_Unexpect, dwUserErrCode);
 		}
 		bICOK = false;
 		return 0;//上电读卡失败
@@ -10591,16 +10637,17 @@ int CCardIssuerFSM::PreOnlineCrossJS_RF(SpReqAnsContext<CardIssuerStoreService_P
 
 	if (retDetectAndRead < 0)
 	{
-		CaptureResult = AfterPreOnlineCrossJS(slot, m_currCardNo);//执行移回操作
-		m_findCard = 4;
-		ctx->Ans.findCard = 4;
-		ctx->Ans.cardPos = m_cardPos;
+		//CaptureResult = AfterPreOnlineCrossJS(slot, m_currCardNo);//执行移回操作
+		//m_findCard = 4;
+		//ctx->Ans.findCard = 4;
+		//ctx->Ans.cardPos = m_cardPos;
 
 		ErrorCodeEnum eErrCode = Error_Unexpect;
 		CSimpleStringA ApiName = "";
 		CSimpleStringA alarmMsg = "";
 		CSimpleStringA csErrMsgWithReturnCode = "";
 
+		DWORD dwUserErrCode = 0;
 		if (retDetectAndRead == -1) {	
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("跨机非接检测卡片类型时上电失败,slot:%d", slot);
 			GetCardProcessLastErr(eErrCode, ApiName, alarmMsg, csErrMsgWithReturnCode);
@@ -10613,18 +10660,27 @@ int CCardIssuerFSM::PreOnlineCrossJS_RF(SpReqAnsContext<CardIssuerStoreService_P
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI(ApiName.GetData()).setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222052").setResultCode("RTA2W26")(csErrMsgWithReturnCode.GetData());
 				LogWarn(Severity_Middle, Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveContactlessICCard_Failed, alarmMsg.GetData());
 			}
-			ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveContactlessICCard_Failed);		
+			dwUserErrCode = CardIssuerStore_UserErrorCode_ActiveContactlessICCard_Failed;
+			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_ActiveContactlessICCard_Failed);		
 		}
 		else if (retDetectAndRead == -2) {
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("跨机非接读取IC数据失败,slot:%d", slot);
-			DWORD dwTmpUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_RFTypeABCommand, "DevAdapter::RFTypeABCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222052", "");
-			ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
+			dwUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_RFTypeABCommand, "DevAdapter::RFTypeABCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222052", "");
+			//ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 		}
 		else if (retDetectAndRead == -3) {
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("跨机非接读取IC数据失败,slot:%d", slot);
-			DWORD dwTmpUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_RFTypeABCommand, "DevAdapter::RFTypeABCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222052", "");
-			ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
+			dwUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_RFTypeABCommand, "DevAdapter::RFTypeABCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222052", "");
+			//ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 		}
+		CaptureResult = AfterPreOnlineCrossJS(slot, m_currCardNo);//执行移回操作
+		m_findCard = 4;
+		ctx->Ans.findCard = 4;
+		ctx->Ans.cardPos = m_cardPos;
+
+		ctx->Answer(Error_Unexpect, dwUserErrCode);
+
+
 		return 0;//上电读卡失败
 	}
 

Module/mod_cardissuerstore/CardIssuerStoreFSM.h

@@ -1022,7 +1022,7 @@ struct AddCardInfo
 };
 #pragma endregion JS接口 event
 
-class CCardIssuerFSM : public CCommDevFSM<CCardIssuerFSM, CardIssuerClass>
+class CCardIssuerFSM : public CCommDevFSM<CCardIssuerFSM, CardIssuerClass>, public IFSMStateHooker
 {
 public:
 	enum {s0,s1,s2,s4,s5,s6,s7,s8,s9,s10,s11,s14,s17,s18,s19};

Module/mod_cardissuerstore/CardIssuerStore_client_g.h

@@ -555,55 +555,6 @@ public:
 		return ret;
 	}
 
-	ErrorCodeEnum ReadEx(CardIssuerStoreService_ReadEx_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(CardIssuerStoreService_Method_ReadEx, CardIssuerStoreService_MethodSignature_ReadEx, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum ReadEx(CardIssuerStoreService_ReadEx_Req &Req, CardIssuerStoreService_ReadEx_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = ReadEx(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum ReadEx(CardIssuerStoreService_ReadEx_Req &Req, CardIssuerStoreService_ReadEx_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = ReadEx(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum ReadEx(CardIssuerStoreService_ReadEx_Req &Req, CardIssuerStoreService_ReadEx_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = ReadEx(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
 	ErrorCodeEnum QueryCardInfo(CardIssuerStoreService_QueryCardInfo_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
@@ -947,55 +898,6 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum OpenSafeLock(CardIssuerStoreService_OpenSafeLock_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(CardIssuerStoreService_Method_OpenSafeLock, CardIssuerStoreService_MethodSignature_OpenSafeLock, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum OpenSafeLock(CardIssuerStoreService_OpenSafeLock_Req &Req, CardIssuerStoreService_OpenSafeLock_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = OpenSafeLock(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum OpenSafeLock(CardIssuerStoreService_OpenSafeLock_Req &Req, CardIssuerStoreService_OpenSafeLock_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = OpenSafeLock(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum OpenSafeLock(CardIssuerStoreService_OpenSafeLock_Req &Req, CardIssuerStoreService_OpenSafeLock_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = OpenSafeLock(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
 	ErrorCodeEnum SAMICCommand(CardIssuerStoreService_SAMICCommand_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
@@ -1045,202 +947,6 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum QueryPrinterStatus(CardIssuerStoreService_QueryPrinterStatus_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(CardIssuerStoreService_Method_QueryPrinterStatus, CardIssuerStoreService_MethodSignature_QueryPrinterStatus, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum QueryPrinterStatus(CardIssuerStoreService_QueryPrinterStatus_Req &Req, CardIssuerStoreService_QueryPrinterStatus_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = QueryPrinterStatus(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum QueryPrinterStatus(CardIssuerStoreService_QueryPrinterStatus_Req &Req, CardIssuerStoreService_QueryPrinterStatus_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = QueryPrinterStatus(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum QueryPrinterStatus(CardIssuerStoreService_QueryPrinterStatus_Req &Req, CardIssuerStoreService_QueryPrinterStatus_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = QueryPrinterStatus(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum Print(CardIssuerStoreService_Print_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(CardIssuerStoreService_Method_Print, CardIssuerStoreService_MethodSignature_Print, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum Print(CardIssuerStoreService_Print_Req &Req, CardIssuerStoreService_Print_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = Print(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum Print(CardIssuerStoreService_Print_Req &Req, CardIssuerStoreService_Print_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = Print(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum Print(CardIssuerStoreService_Print_Req &Req, CardIssuerStoreService_Print_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = Print(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum QuerySCIList(CardIssuerStoreService_QuerySCIList_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(CardIssuerStoreService_Method_QuerySCIList, CardIssuerStoreService_MethodSignature_QuerySCIList, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum QuerySCIList(CardIssuerStoreService_QuerySCIList_Req &Req, CardIssuerStoreService_QuerySCIList_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = QuerySCIList(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum QuerySCIList(CardIssuerStoreService_QuerySCIList_Req &Req, CardIssuerStoreService_QuerySCIList_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = QuerySCIList(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum QuerySCIList(CardIssuerStoreService_QuerySCIList_Req &Req, CardIssuerStoreService_QuerySCIList_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = QuerySCIList(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum BindSCI(CardIssuerStoreService_BindSCI_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(CardIssuerStoreService_Method_BindSCI, CardIssuerStoreService_MethodSignature_BindSCI, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum BindSCI(CardIssuerStoreService_BindSCI_Req &Req, CardIssuerStoreService_BindSCI_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = BindSCI(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum BindSCI(CardIssuerStoreService_BindSCI_Req &Req, CardIssuerStoreService_BindSCI_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = BindSCI(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum BindSCI(CardIssuerStoreService_BindSCI_Req &Req, CardIssuerStoreService_BindSCI_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = BindSCI(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
 	ErrorCodeEnum PreOnlineOnStore(CardIssuerStoreService_PreOnlineOnStore_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();

Module/mod_cardissuerstore/CardIssuerStore_def_g.h

@@ -25,7 +25,6 @@ namespace CardIssuerStore {
 #define CardIssuerStoreService_Method_GetMaterialCount 10
 #define CardIssuerStoreService_Method_SetMaterialCount 11
 #define CardIssuerStoreService_Method_SetIssueFlag 12
-#define CardIssuerStoreService_Method_ReadEx 13
 #define CardIssuerStoreService_Method_QueryCardInfo 14
 #define CardIssuerStoreService_Method_WriteTrack 15
 #define CardIssuerStoreService_Method_GetMaterialCountEx 16
@@ -33,12 +32,7 @@ namespace CardIssuerStore {
 #define CardIssuerStoreService_Method_SetSomeFlag 18
 #define CardIssuerStoreService_Method_GetSCIInfo 19
 #define CardIssuerStoreService_Method_IssueEx 20
-#define CardIssuerStoreService_Method_OpenSafeLock 21
 #define CardIssuerStoreService_Method_SAMICCommand 22
-#define CardIssuerStoreService_Method_QueryPrinterStatus 23
-#define CardIssuerStoreService_Method_Print 24
-#define CardIssuerStoreService_Method_QuerySCIList 25
-#define CardIssuerStoreService_Method_BindSCI 26
 #define CardIssuerStoreService_Method_PreOnlineOnStore 27
 #define CardIssuerStoreService_Method_NotifyPreonline 28
 #define CardIssuerStoreService_Method_QueryCardInfoOnStore 29
@@ -77,7 +71,6 @@ namespace CardIssuerStore {
 #define CardIssuerStoreService_MethodSignature_GetMaterialCount -605917749
 #define CardIssuerStoreService_MethodSignature_SetMaterialCount 870103115
 #define CardIssuerStoreService_MethodSignature_SetIssueFlag 187641303
-#define CardIssuerStoreService_MethodSignature_ReadEx -842531343
 #define CardIssuerStoreService_MethodSignature_QueryCardInfo 154962579
 #define CardIssuerStoreService_MethodSignature_WriteTrack -1424799012
 #define CardIssuerStoreService_MethodSignature_GetMaterialCountEx 1356148904
@@ -85,12 +78,7 @@ namespace CardIssuerStore {
 #define CardIssuerStoreService_MethodSignature_SetSomeFlag -2033418025
 #define CardIssuerStoreService_MethodSignature_GetSCIInfo 1097494981
 #define CardIssuerStoreService_MethodSignature_IssueEx 1390328640
-#define CardIssuerStoreService_MethodSignature_OpenSafeLock 177980614
 #define CardIssuerStoreService_MethodSignature_SAMICCommand 406988293
-#define CardIssuerStoreService_MethodSignature_QueryPrinterStatus -890728447
-#define CardIssuerStoreService_MethodSignature_Print 2096006675
-#define CardIssuerStoreService_MethodSignature_QuerySCIList -1772231453
-#define CardIssuerStoreService_MethodSignature_BindSCI -1242011672
 #define CardIssuerStoreService_MethodSignature_PreOnlineOnStore 158325869
 #define CardIssuerStoreService_MethodSignature_NotifyPreonline -808637659
 #define CardIssuerStoreService_MethodSignature_QueryCardInfoOnStore 1217447214
@@ -129,7 +117,6 @@ namespace CardIssuerStore {
 #define CardIssuerStoreService_LogCode_GetMaterialCount "QLR040222010"
 #define CardIssuerStoreService_LogCode_SetMaterialCount "QLR040222011"
 #define CardIssuerStoreService_LogCode_SetIssueFlag "QLR040222012"
-#define CardIssuerStoreService_LogCode_ReadEx "QLR040222013"
 #define CardIssuerStoreService_LogCode_QueryCardInfo "QLR040222014"
 #define CardIssuerStoreService_LogCode_WriteTrack "QLR040222015"
 #define CardIssuerStoreService_LogCode_GetMaterialCountEx "QLR040222016"
@@ -137,12 +124,7 @@ namespace CardIssuerStore {
 #define CardIssuerStoreService_LogCode_SetSomeFlag "QLR040222018"
 #define CardIssuerStoreService_LogCode_GetSCIInfo "QLR040222019"
 #define CardIssuerStoreService_LogCode_IssueEx "QLR040222020"
-#define CardIssuerStoreService_LogCode_OpenSafeLock "QLR040222021"
 #define CardIssuerStoreService_LogCode_SAMICCommand "QLR040222022"
-#define CardIssuerStoreService_LogCode_QueryPrinterStatus "QLR040222023"
-#define CardIssuerStoreService_LogCode_Print "QLR040222024"
-#define CardIssuerStoreService_LogCode_QuerySCIList "QLR040222025"
-#define CardIssuerStoreService_LogCode_BindSCI "QLR040222026"
 #define CardIssuerStoreService_LogCode_PreOnlineOnStore "QLR040222027"
 #define CardIssuerStoreService_LogCode_NotifyPreonline "QLR040222028"
 #define CardIssuerStoreService_LogCode_QueryCardInfoOnStore "QLR040222029"
@@ -414,44 +396,6 @@ struct CardIssuerStoreService_SetIssueFlag_Info
 
 };
 
-struct CardIssuerStoreService_ReadEx_Req
-{
-	CSimpleStringA aid;
-	CSimpleStringA reserved1;
-	CSimpleStringA reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & aid & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStoreService_ReadEx_Ans
-{
-	CSimpleStringA track1;
-	CSimpleStringA track2;
-	CSimpleStringA track3;
-	int CDType;
-	int ICType;
-	int CMBType;
-	CSimpleStringA ICData;
-	int status;
-	CSimpleStringA t2Account;
-	CSimpleStringA t2Region;
-	CSimpleStringA t2CardSerial;
-	CSimpleStringA t2CVC;
-	CSimpleStringA t2ExpireDate;
-	CSimpleStringA reserved1;
-	CSimpleStringA reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & track1 & track2 & track3 & CDType & ICType & CMBType & ICData & status & t2Account & t2Region & t2CardSerial & t2CVC & t2ExpireDate & reserved1 & reserved2;
-	}
-
-};
-
 struct CardIssuerStoreService_QueryCardInfo_Req
 {
 
@@ -650,30 +594,6 @@ struct CardIssuerStoreService_IssueEx_Ans
 
 };
 
-struct CardIssuerStoreService_OpenSafeLock_Req
-{
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStoreService_OpenSafeLock_Ans
-{
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & reserved1 & reserved2;
-	}
-
-};
-
 struct CardIssuerStoreService_SAMICCommand_Req
 {
 	int cmdType;
@@ -703,128 +623,6 @@ struct CardIssuerStoreService_SAMICCommand_Ans
 
 };
 
-struct CardIssuerStoreService_QueryPrinterStatus_Req
-{
-	CAutoArray<int> param1;
-	CAutoArray<CSimpleStringA> param2;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & param1 & param2 & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStoreService_QueryPrinterStatus_Ans
-{
-	CAutoArray<int> ret1;
-	CAutoArray<CSimpleStringA> ret2;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & ret1 & ret2 & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStoreService_Print_Req
-{
-	CBlob data1;
-	CBlob data2;
-	CBlob data3;
-	CBlob data4;
-	CBlob data5;
-	CBlob data6;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & data1 & data2 & data3 & data4 & data5 & data6 & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStoreService_Print_Ans
-{
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStoreService_QuerySCIList_Req
-{
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStoreService_QuerySCIList_Ans
-{
-	CAutoArray<CSimpleStringA> sciNo;
-	CAutoArray<CSimpleStringA> arrMateriel;
-	CAutoArray<CSimpleStringA> CardGroove;
-	CAutoArray<CSimpleStringA> CardBoxNo;
-	CAutoArray<CSimpleStringA> PsbCode;
-	CAutoArray<CSimpleStringA> PsbName;
-	CAutoArray<unsigned int> CardInit;
-	CAutoArray<unsigned int> CardRemains;
-	CAutoArray<unsigned int> CardIssued;
-	CAutoArray<unsigned int> CardMixed;
-	CAutoArray<unsigned int> CardPercent;
-	CAutoArray<CSimpleStringA> Maintainer;
-	CAutoArray<CSimpleStringA> MaintainTime;
-	CAutoArray<CSimpleStringA> UpdateTime;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & sciNo & arrMateriel & CardGroove & CardBoxNo & PsbCode & PsbName & CardInit & CardRemains & CardIssued & CardMixed & CardPercent & Maintainer & MaintainTime & UpdateTime & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStoreService_BindSCI_Req
-{
-	int type;
-	CSimpleStringA sciNo;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & type & sciNo & reserved1 & reserved2;
-	}
-
-};
-
-struct CardIssuerStoreService_BindSCI_Ans
-{
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & reserved1 & reserved2;
-	}
-
-};
-
 struct CardIssuerStoreService_PreOnlineOnStore_Req
 {
 	CSimpleStringA account;

Module/mod_cardissuerstore/CardIssuerStore_server_g.h

@@ -121,13 +121,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStoreService_Method_ReadEx:
-			if (dwSignature == CardIssuerStoreService_MethodSignature_ReadEx) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStoreService_Method_QueryCardInfo:
 			if (dwSignature == CardIssuerStoreService_MethodSignature_QueryCardInfo) {
 				bOverlap = true;
@@ -177,13 +170,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStoreService_Method_OpenSafeLock:
-			if (dwSignature == CardIssuerStoreService_MethodSignature_OpenSafeLock) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStoreService_Method_SAMICCommand:
 			if (dwSignature == CardIssuerStoreService_MethodSignature_SAMICCommand) {
 				bOverlap = true;
@@ -191,34 +177,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStoreService_Method_QueryPrinterStatus:
-			if (dwSignature == CardIssuerStoreService_MethodSignature_QueryPrinterStatus) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CardIssuerStoreService_Method_Print:
-			if (dwSignature == CardIssuerStoreService_MethodSignature_Print) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CardIssuerStoreService_Method_QuerySCIList:
-			if (dwSignature == CardIssuerStoreService_MethodSignature_QuerySCIList) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CardIssuerStoreService_Method_BindSCI:
-			if (dwSignature == CardIssuerStoreService_MethodSignature_BindSCI) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStoreService_Method_PreOnlineOnStore:
 			if (dwSignature == CardIssuerStoreService_MethodSignature_PreOnlineOnStore) {
 				bOverlap = true;
@@ -463,11 +421,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStoreService_Method_ReadEx:
-			if (dwSignature != CardIssuerStoreService_MethodSignature_ReadEx) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStoreService_Method_QueryCardInfo:
 			if (dwSignature != CardIssuerStoreService_MethodSignature_QueryCardInfo) {
 				Error = Error_MethodSignatureFailed;
@@ -503,36 +456,11 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStoreService_Method_OpenSafeLock:
-			if (dwSignature != CardIssuerStoreService_MethodSignature_OpenSafeLock) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStoreService_Method_SAMICCommand:
 			if (dwSignature != CardIssuerStoreService_MethodSignature_SAMICCommand) {
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStoreService_Method_QueryPrinterStatus:
-			if (dwSignature != CardIssuerStoreService_MethodSignature_QueryPrinterStatus) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CardIssuerStoreService_Method_Print:
-			if (dwSignature != CardIssuerStoreService_MethodSignature_Print) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CardIssuerStoreService_Method_QuerySCIList:
-			if (dwSignature != CardIssuerStoreService_MethodSignature_QuerySCIList) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CardIssuerStoreService_Method_BindSCI:
-			if (dwSignature != CardIssuerStoreService_MethodSignature_BindSCI) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStoreService_Method_PreOnlineOnStore:
 			if (dwSignature != CardIssuerStoreService_MethodSignature_PreOnlineOnStore) {
 				Error = Error_MethodSignatureFailed;
@@ -725,11 +653,6 @@ public:
 	/// override by user
 	}
 
-	virtual void Handle_ReadEx(SpReqAnsContext<CardIssuerStoreService_ReadEx_Req, CardIssuerStoreService_ReadEx_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void Handle_QueryCardInfo(SpReqAnsContext<CardIssuerStoreService_QueryCardInfo_Req, CardIssuerStoreService_QueryCardInfo_Ans>::Pointer ctx)
 	{
 	/// override by user
@@ -765,36 +688,11 @@ public:
 	/// override by user
 	}
 
-	virtual void Handle_OpenSafeLock(SpReqAnsContext<CardIssuerStoreService_OpenSafeLock_Req, CardIssuerStoreService_OpenSafeLock_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void Handle_SAMICCommand(SpReqAnsContext<CardIssuerStoreService_SAMICCommand_Req, CardIssuerStoreService_SAMICCommand_Ans>::Pointer ctx)
 	{
 	/// override by user
 	}
 
-	virtual void Handle_QueryPrinterStatus(SpReqAnsContext<CardIssuerStoreService_QueryPrinterStatus_Req, CardIssuerStoreService_QueryPrinterStatus_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_Print(SpReqAnsContext<CardIssuerStoreService_Print_Req, CardIssuerStoreService_Print_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_QuerySCIList(SpReqAnsContext<CardIssuerStoreService_QuerySCIList_Req, CardIssuerStoreService_QuerySCIList_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_BindSCI(SpReqAnsContext<CardIssuerStoreService_BindSCI_Req, CardIssuerStoreService_BindSCI_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void Handle_PreOnlineOnStore(SpReqAnsContext<CardIssuerStoreService_PreOnlineOnStore_Req, CardIssuerStoreService_PreOnlineOnStore_Ans>::Pointer ctx)
 	{
 	/// override by user
@@ -1061,16 +959,6 @@ public:
 						Handle_SetIssueFlag(ctx);
 					}
 					break;
-				case CardIssuerStoreService_Method_ReadEx:
-					{
-						SpReqAnsContext<CardIssuerStoreService_ReadEx_Req,CardIssuerStoreService_ReadEx_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CardIssuerStoreService_ReadEx_Req,CardIssuerStoreService_ReadEx_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_ReadEx(ctx);
-					}
-					break;
 				case CardIssuerStoreService_Method_QueryCardInfo:
 					{
 						SpReqAnsContext<CardIssuerStoreService_QueryCardInfo_Req,CardIssuerStoreService_QueryCardInfo_Ans>::Pointer ctx;
@@ -1141,16 +1029,6 @@ public:
 						Handle_IssueEx(ctx);
 					}
 					break;
-				case CardIssuerStoreService_Method_OpenSafeLock:
-					{
-						SpReqAnsContext<CardIssuerStoreService_OpenSafeLock_Req,CardIssuerStoreService_OpenSafeLock_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CardIssuerStoreService_OpenSafeLock_Req,CardIssuerStoreService_OpenSafeLock_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_OpenSafeLock(ctx);
-					}
-					break;
 				case CardIssuerStoreService_Method_SAMICCommand:
 					{
 						SpReqAnsContext<CardIssuerStoreService_SAMICCommand_Req,CardIssuerStoreService_SAMICCommand_Ans>::Pointer ctx;
@@ -1161,46 +1039,6 @@ public:
 						Handle_SAMICCommand(ctx);
 					}
 					break;
-				case CardIssuerStoreService_Method_QueryPrinterStatus:
-					{
-						SpReqAnsContext<CardIssuerStoreService_QueryPrinterStatus_Req,CardIssuerStoreService_QueryPrinterStatus_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CardIssuerStoreService_QueryPrinterStatus_Req,CardIssuerStoreService_QueryPrinterStatus_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_QueryPrinterStatus(ctx);
-					}
-					break;
-				case CardIssuerStoreService_Method_Print:
-					{
-						SpReqAnsContext<CardIssuerStoreService_Print_Req,CardIssuerStoreService_Print_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CardIssuerStoreService_Print_Req,CardIssuerStoreService_Print_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_Print(ctx);
-					}
-					break;
-				case CardIssuerStoreService_Method_QuerySCIList:
-					{
-						SpReqAnsContext<CardIssuerStoreService_QuerySCIList_Req,CardIssuerStoreService_QuerySCIList_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CardIssuerStoreService_QuerySCIList_Req,CardIssuerStoreService_QuerySCIList_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_QuerySCIList(ctx);
-					}
-					break;
-				case CardIssuerStoreService_Method_BindSCI:
-					{
-						SpReqAnsContext<CardIssuerStoreService_BindSCI_Req,CardIssuerStoreService_BindSCI_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CardIssuerStoreService_BindSCI_Req,CardIssuerStoreService_BindSCI_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_BindSCI(ctx);
-					}
-					break;
 				case CardIssuerStoreService_Method_PreOnlineOnStore:
 					{
 						SpReqAnsContext<CardIssuerStoreService_PreOnlineOnStore_Req,CardIssuerStoreService_PreOnlineOnStore_Ans>::Pointer ctx;