Z991239-6440 #comment feat: 去除心跳实体无用的方法和卡集实体中的无效引用，去除无效的变量数据

Signed-Off-By: commit-hook

Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -2522,38 +2522,7 @@ void CCardReadAdapterFSM::CrossTermInvokeInfo(SpOnewayCallContext<CardReadAdapte
 	LOG_FUNCTION();
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("entity sn:%x,type:%d,errcode:%x", ctx->Info.nEntityID, ctx->Info.type, ctx->Info.result);
 }
-int CCardReadAdapterFSM::LocalCallHeartBeat(int method, CBlob &bbSend,bool bTwoWay)
-{
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("method id(type):%d", method);
-	HeartBeatService_ClientBase* pClient = new HeartBeatService_ClientBase(GetEntityBase());
-	if (pClient == NULL)
-	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("create HeartBeat client failed.GetLastError:%d", GetLastError());
-		return -1;
-	}
-	ErrorCodeEnum eErr = Error_Unexpect;
-	eErr = pClient->Connect();
-	if (eErr != Error_Succeed)
-	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("client connect to HeartBeat failed:%x", eErr);
-		return -1;
-	}
-	HeartBeatService_CrossTermCall_Req req;
-	HeartBeatService_CrossTermCall_Ans ans;
-	req.nEntityID = 0x21b;
-	req.isTwoWay = bTwoWay;
-	req.fromTerminalNo = m_terminalNo;
-	GetAttachedTerminal(req.toTerminalNo);
-	//req.toTerminalNo = "7717715004";
-	req.param1 = "";
-	req.param2 = "";
-	req.paramX = bbSend;
-	req.type = method;
-	eErr = (*pClient)(EntityResource::getLink().upgradeLink())->CrossTermCall(req, ans, 20000);
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CrossTermCall to HeartBeat from %s to %s, result:%x",
-			req.fromTerminalNo.GetData(), req.toTerminalNo.GetData(), eErr);
-	return 0;
-}
+
 bool CCardReadAdapterFSM::GetAttachedTerminal(CSimpleStringA &csTerm)
 {
 	return (Error_Succeed == GetEntityBase()->GetFunction()->GetSysVar("AttachedTerminal", csTerm));

Module/mod_CardReadAdapter/CardReadAdapterFSM.h

@@ -808,7 +808,7 @@ public:
 	void SelfTest(EntityTestEnum eTestType, CSmartPointer<ITransactionContext> pTransactionContext);
 	void SetReadCtx(SpReqAnsContext<CardReadAdapterService_Read_Req, CardReadAdapterService_Read_Ans>::Pointer ctx) { m_readCtx = ctx; }
 
-	int LocalCallHeartBeat(int method, CBlob &bbSend, bool bTwoWay=false);
+	
 	bool GetAttachedTerminal(CSimpleStringA &csTerm);
 	int CrossTermCall(SpReqAnsContext<CardReadAdapterService_CrossTermCall_Req, CardReadAdapterService_CrossTermCall_Ans>::Pointer ctx);
 	void CrossTermInvokeInfo(SpOnewayCallContext<CardReadAdapterService_CrossTermInvokeInfo_Info>::Pointer ctx);

Module/mod_heartbeat/HeartBeatFSM.cpp

@@ -53,6 +53,7 @@ const char * ProcessTimeQuery	= "\\Processor Information(_Total)\\% Processor Ti
 #define	CARDISSUER_STAND_MAIN_SERVER				"rvctsst.cmbchina.cn 30033"
 #define CARDISSUER_STAND_BACKUP_SERVER				""
 #define	CARDISSUER_STORE_MAIN_SERVER				"rvctsst.cmbchina.cn 30033"
+/*多个备机地址用分隔符'|'隔开，eg: rvctsst1.cmbchina.cn 30033|rvctsst2.cmbchina.cn 30033*/
 #define CARDISSUER_STORE_BACKUP_SERVER				""
 #endif
 
@@ -67,9 +68,6 @@ ErrorCodeEnum CHeartBeatFSM::OnInit()
 	CSmartPointer<IConfigInfo> spConfig;
 	CSystemStaticInfo sysInfo;
 	Error = GetEntityBase()->GetFunction()->GetSystemStaticInfo(sysInfo);
-	if(Error == Error_Succeed) {
-		m_localDeviceNo = sysInfo.strTerminalID;
-	}
 
 	Error = spEntityFunction->OpenConfig(Config_CenterSetting, spConfig);
 	if (Error != Error_Succeed) {
@@ -201,8 +199,9 @@ void CHeartBeatFSM::s0_on_entry()
 		FSMEvent *e = new FSMEvent(USER_EVT_START);
 		PostEventFIFO(e);
 		m_initTimes++;
-		if (m_initTimes > 1)
-			Sleep(20000);
+		if (m_initTimes > 1) {
+			Sleep(m_ConnectSleepInterval);
+		}
 		if (m_initTimes > MAX_INIT_TIMES)
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("have try to init x times,give up!");
@@ -370,16 +369,6 @@ int CHeartBeatFSM::Starting()
 		m_pHandShakeConn = new HeartBeatConnection(m_pEntity, this);
 		if (m_pHandShakeConn != NULL)
 		{
-			//bool bConn = false;
-
-			//if(m_isCardStore)
-			//{
-			//	bConn = m_pHandShakeConn->Connect(m_servIP, m_port, 3);
-			//}
-			//else
-			//{
-			//	bConn = m_pHandShakeConn->ConnectFromCentralSetting();
-			//}
 			CSimpleStringA connectedServ = "";
 			bool bConn = m_pHandShakeConn->ConnectFromAddress(m_servStr, m_servStrBArr, connectedServ);
 			
@@ -429,7 +418,7 @@ int CHeartBeatFSM::DoHandShake()
 			m_pHandShakeConn->SendHandShake();
 
 			Sleep(m_longConnInterval);//修改成可配置的时间间隔
-			//Sleep(20000);//oiltest
+			
 			if (m_tmpTestFlag)
 			{
 				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("send spshell.exe restart event.");

Module/mod_heartbeat/HeartBeatFSM.h

@@ -304,11 +304,11 @@ public:
 		FSM_RULE_ENTRY(s4,s0,USER_EVT_STOP,0)
 	END_FSM_RULE()
 
-	CHeartBeatFSM():m_initTimes(0),m_bUseBackup(false),m_testResult(Error_Succeed),
+	CHeartBeatFSM():m_initTimes(0),m_testResult(Error_Succeed),
 	m_warnLevel(0), m_entErrorList(""), m_nLodCtrFlag(0), m_pHandShakeConn(NULL)
 	,m_pCRAClient(NULL),m_pCISClient(NULL)
-	, m_localDeviceNo(""), m_ILDeviceNo(""), m_tmpMultiBlob(""), m_terminalStage(""), m_strHandShakeUrl(""),m_bAlarmed(false), m_bCrossUseJS(false)
-	,m_longConnInterval(20000),m_handShakeConnInterval(20000){
+	, m_strHandShakeUrl(""), m_bCrossUseJS(false)
+	,m_longConnInterval(20000),m_handShakeConnInterval(20000), m_ConnectSleepInterval(20000){
 		m_servStrBArr.Init(1);
 	}
 	~CHeartBeatFSM(){}
@@ -347,15 +347,9 @@ public:
 	ErrorCodeEnum SetErrorList(int warmLevel,CSimpleStringA strList);
 	void SelfTest(EntityTestEnum eTestType,CSmartPointer<ITransactionContext> pTransactionContext);
 	int GetWarnLevel(){return m_warnLevel;}
-	void SetTerminalStageState(CSimpleStringA stage) { m_terminalStage = stage; }
-	CSimpleStringA GetTerminalStageState() { return m_terminalStage; }
 
 	// Terminal Performance Counter component [Josephus in 9:17:13 2016/4/23]
 	ErrorCodeEnum GetPerformCounter(TermianlCounter& counter);
-	const CSimpleStringA GetRealIP()
-	{
-		return m_csServerIP;
-	}
 	const char* GetRunDiskPath()
 	{
 		return (LPCTSTR)m_csRunDiskName;
@@ -384,20 +378,19 @@ private:
 	int m_tmpTestFlag;
 	int m_longConnInterval;//长连接时间间隔
 	int m_handShakeConnInterval;//新心跳时间间隔
-	CSimpleStringA m_servStr,m_entErrorList,m_localDeviceNo,m_ILDeviceNo,m_tmpMultiBlob, m_terminalStage;
+	CSimpleStringA m_servStr,m_entErrorList;
 	CAutoArray<CSimpleStringA> m_servStrBArr;
 	int m_initTimes,m_warnLevel;
-	unsigned long m_ulServIP;
+	int m_ConnectSleepInterval;
+
 	HeartBeatConnection* m_pHandShakeConn;
-	bool m_bUseBackup;
+
 	ErrorCodeEnum m_testResult;
-	CSimpleStringA m_csServerIP, m_csRunDiskName;
+	CSimpleStringA m_csRunDiskName;
 	int m_nLodCtrFlag;
 	CardReadAdapter::CardReadAdapterService_ClientBase *m_pCRAClient;
 	CardIssuerStore::CardIssuerStoreService_ClientBase* m_pCISClient;
 	bool m_bCrossUseJS;
-
-	bool m_bAlarmed;
 	bool m_isCardStore;
 };
 struct StartTask : public ITaskSp

Module/mod_heartbeat/HeartBeat_client_g.h

@@ -156,100 +156,6 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum CrossTermCall(HeartBeatService_CrossTermCall_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(HeartBeatService_Method_CrossTermCall, HeartBeatService_MethodSignature_CrossTermCall, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum CrossTermCall(HeartBeatService_CrossTermCall_Req &Req, HeartBeatService_CrossTermCall_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = CrossTermCall(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum CrossTermCall(HeartBeatService_CrossTermCall_Req &Req, HeartBeatService_CrossTermCall_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = CrossTermCall(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 CrossTermCall(HeartBeatService_CrossTermCall_Req &Req, HeartBeatService_CrossTermCall_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = CrossTermCall(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 CrossTermInvokeInfo(HeartBeatService_CrossTermInvokeInfo_Info &Info)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		CAutoBuffer Buf = SpObject2Buffer(Info);
-		auto ret = pFunc->OnewayCall(HeartBeatService_Method_CrossTermInvokeInfo, HeartBeatService_MethodSignature_CrossTermInvokeInfo, Buf, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum CallFromILToRVC(HeartBeatService_CallFromILToRVC_Info &Info)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		CAutoBuffer Buf = SpObject2Buffer(Info);
-		auto ret = pFunc->OnewayCall(HeartBeatService_Method_CallFromILToRVC, HeartBeatService_MethodSignature_CallFromILToRVC, Buf, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum CallResultToIL(HeartBeatService_CallResultToIL_Info &Info)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		CAutoBuffer Buf = SpObject2Buffer(Info);
-		auto ret = pFunc->OnewayCall(HeartBeatService_Method_CallResultToIL, HeartBeatService_MethodSignature_CallResultToIL, Buf, m_context);
-		m_context.clear();
-		return ret;
-	}
-
 
 	bool SafeDelete()
 	{

Module/mod_heartbeat/HeartBeat_def_g.h

@@ -14,24 +14,12 @@ namespace HeartBeat {
 
 #define HeartBeatService_Method_Instruction 0
 #define HeartBeatService_Method_CardActive 1
-#define HeartBeatService_Method_CrossTermCall 2
-#define HeartBeatService_Method_CrossTermInvokeInfo 3
-#define HeartBeatService_Method_CallFromILToRVC 4
-#define HeartBeatService_Method_CallResultToIL 5
 
 #define HeartBeatService_MethodSignature_Instruction 828107543
 #define HeartBeatService_MethodSignature_CardActive -1982864690
-#define HeartBeatService_MethodSignature_CrossTermCall 1287388941
-#define HeartBeatService_MethodSignature_CrossTermInvokeInfo 54854091
-#define HeartBeatService_MethodSignature_CallFromILToRVC 975871920
-#define HeartBeatService_MethodSignature_CallResultToIL 221065913
 
 #define HeartBeatService_LogCode_Instruction "QLR040250300"
 #define HeartBeatService_LogCode_CardActive "QLR040250301"
-#define HeartBeatService_LogCode_CrossTermCall "QLR040250302"
-#define HeartBeatService_LogCode_CrossTermInvokeInfo "QLR040250303"
-#define HeartBeatService_LogCode_CallFromILToRVC "QLR040250304"
-#define HeartBeatService_LogCode_CallResultToIL "QLR040250305"
 
 struct HeartBeatService_Instruction_Req
 {
@@ -84,94 +72,6 @@ struct HeartBeatService_CardActive_Ans
 
 };
 
-struct HeartBeatService_CrossTermCall_Req
-{
-	int type;
-	bool isTwoWay;
-	CSimpleStringA fromTerminalNo;
-	CSimpleStringA toTerminalNo;
-	int nEntityID;
-	CSimpleStringA param1;
-	CSimpleStringA param2;
-	int param3;
-	int param4;
-	CBlob paramX;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-	CAutoArray<CBlob> reservedX;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & type & isTwoWay & fromTerminalNo & toTerminalNo & nEntityID & param1 & param2 & param3 & param4 & paramX & reserved1 & reserved2 & reservedX;
-	}
-
-};
-
-struct HeartBeatService_CrossTermCall_Ans
-{
-	int retCode;
-	CSimpleStringA retParam1;
-	CSimpleStringA retParam2;
-	int retParam3;
-	int retParam4;
-	CBlob retParamX;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-	CAutoArray<CBlob> reservedX;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & retCode & retParam1 & retParam2 & retParam3 & retParam4 & retParamX & reserved1 & reserved2 & reservedX;
-	}
-
-};
-
-struct HeartBeatService_CrossTermInvokeInfo_Info
-{
-	int type;
-	int result;
-	CSimpleStringA fromTerminalNo;
-	CSimpleStringA toTerminalNo;
-	int nEntityID;
-	CSimpleStringA param1;
-	CSimpleStringA param2;
-	int param3;
-	int param4;
-	CBlob paramX;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-	CAutoArray<CBlob> reservedX;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & type & result & fromTerminalNo & toTerminalNo & nEntityID & param1 & param2 & param3 & param4 & paramX & reserved1 & reserved2 & reservedX;
-	}
-
-};
-
-struct HeartBeatService_CallFromILToRVC_Info
-{
-	CSimpleStringA req_context;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & req_context;
-	}
-
-};
-
-struct HeartBeatService_CallResultToIL_Info
-{
-	int error;
-	CSimpleStringA ans_context;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & error & ans_context;
-	}
-
-};
-
 
 ///////////////////////////
 

Module/mod_heartbeat/HeartBeat_server_g.h

@@ -44,34 +44,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case HeartBeatService_Method_CrossTermCall:
-			if (dwSignature == HeartBeatService_MethodSignature_CrossTermCall) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case HeartBeatService_Method_CrossTermInvokeInfo:
-			if (dwSignature == HeartBeatService_MethodSignature_CrossTermInvokeInfo) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case HeartBeatService_Method_CallFromILToRVC:
-			if (dwSignature == HeartBeatService_MethodSignature_CallFromILToRVC) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case HeartBeatService_Method_CallResultToIL:
-			if (dwSignature == HeartBeatService_MethodSignature_CallResultToIL) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		default:
 			Error = Error_MethodNotFound;
 			break;
@@ -93,26 +65,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case HeartBeatService_Method_CrossTermCall:
-			if (dwSignature != HeartBeatService_MethodSignature_CrossTermCall) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case HeartBeatService_Method_CrossTermInvokeInfo:
-			if (dwSignature != HeartBeatService_MethodSignature_CrossTermInvokeInfo) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case HeartBeatService_Method_CallFromILToRVC:
-			if (dwSignature != HeartBeatService_MethodSignature_CallFromILToRVC) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case HeartBeatService_Method_CallResultToIL:
-			if (dwSignature != HeartBeatService_MethodSignature_CallResultToIL) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		default:
 			Error = Error_MethodNotFound;
 			break;
@@ -130,26 +82,6 @@ public:
 	/// override by user
 	}
 
-	virtual void Handle_CrossTermCall(SpReqAnsContext<HeartBeatService_CrossTermCall_Req, HeartBeatService_CrossTermCall_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_CrossTermInvokeInfo(SpOnewayCallContext<HeartBeatService_CrossTermInvokeInfo_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_CallFromILToRVC(SpOnewayCallContext<HeartBeatService_CallFromILToRVC_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_CallResultToIL(SpOnewayCallContext<HeartBeatService_CallResultToIL_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void OnRequest(CSmartPointer<ITransactionContext> pTransactionContext)
 	{
 		CAutoBuffer Buf;
@@ -186,46 +118,6 @@ public:
 						Handle_CardActive(ctx);
 					}
 					break;
-				case HeartBeatService_Method_CrossTermCall:
-					{
-						SpReqAnsContext<HeartBeatService_CrossTermCall_Req,HeartBeatService_CrossTermCall_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<HeartBeatService_CrossTermCall_Req,HeartBeatService_CrossTermCall_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_CrossTermCall(ctx);
-					}
-					break;
-				case HeartBeatService_Method_CrossTermInvokeInfo:
-					{
-						SpOnewayCallContext<HeartBeatService_CrossTermInvokeInfo_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<HeartBeatService_CrossTermInvokeInfo_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_CrossTermInvokeInfo(ctx);
-					}
-					break;
-				case HeartBeatService_Method_CallFromILToRVC:
-					{
-						SpOnewayCallContext<HeartBeatService_CallFromILToRVC_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<HeartBeatService_CallFromILToRVC_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_CallFromILToRVC(ctx);
-					}
-					break;
-				case HeartBeatService_Method_CallResultToIL:
-					{
-						SpOnewayCallContext<HeartBeatService_CallResultToIL_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<HeartBeatService_CallResultToIL_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_CallResultToIL(ctx);
-					}
-					break;
 				default:
 					assert(0);
 					break;

Module/mod_heartbeat/heartbeat.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="gb2312" ?>
 <entity name="HeartBeat">
 	<class name="HeartBeatService" overlap="true" exclusive="false">
-		<twoway name="Instruction" overlap="true">
+		<twoway name="Instruction" overlap="true" method_id="0">
 			<req>
 				<param name="type" type="int" />
 			</req>
 			<res>
 			</res>			
 		</twoway>
-		<twoway name="CardActive" overlap="true">
+		<twoway name="CardActive" overlap="true" method_id="1">
 			<req>
 				<param name="account" type="string"/>
 				<param name="data" type="string"/>
@@ -25,66 +25,5 @@
 				<param name="reserved2" type="array_string"/>
 			</res>				
 		</twoway>
-		<twoway name="CrossTermCall" overlap="true">
-			<req>
-				<param name="type" type="int"/>
-				<param name="isTwoWay" type="bool"/>
-				<param name="fromTerminalNo" type="string"/>
-				<param name="toTerminalNo" type="string"/>
-				<param name="nEntityID" type="int"/>
-				<param name="param1" type="string"/>
-				<param name="param2" type="string"/>
-				<param name="param3" type="int"/>
-				<param name="param4" type="int"/>
-				<param name="paramX" type="blob"/>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>
-				<param name="reservedX" type="array_blob"/>					
-			</req>
-			<res>
-				<param name="retCode" type="int"/>
-				<param name="retParam1" type="string"/>
-				<param name="retParam2" type="string"/>
-				<param name="retParam3" type="int"/>
-				<param name="retParam4" type="int"/>
-				<param name="retParamX" type="blob"/>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>
-				<param name="reservedX" type="array_blob"/>
-			</res>				
-		</twoway>
-		<oneway name="CrossTermInvokeInfo" overlap="true">
-				<param name="type" type="int"/>
-				<param name="result" type="int"/>
-				<param name="fromTerminalNo" type="string"/>
-				<param name="toTerminalNo" type="string"/>
-				<param name="nEntityID" type="int"/>
-				<param name="param1" type="string"/>
-				<param name="param2" type="string"/>
-				<param name="param3" type="int"/>
-				<param name="param4" type="int"/>
-				<param name="paramX" type="blob"/>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>
-				<param name="reservedX" type="array_blob"/>	
-		</oneway>
-				<!-- 简版发起调用 -->
-		<oneway name="CallFromILToRVC" overlap="true">
-			<param name="req_context" type="string"/>
-		</oneway>
-				<!-- 前端通知调用结果，供返回简版 -->
-		<oneway name="CallResultToIL" overlap="true">
-			<param name="error" type="int"/>
-			<param name="ans_context" type="string"/>
-		</oneway>
-	</class>				
-	<!-- 通知前端发起业务流程 -->
-		<message name="NotifyIEToCall">
-			<param name="context" type="string"/>
-		</message>
-	<!-- 通知简版业务端调用结果 -->
-	<message name="NotifyIECallResult">
-		<param name="error" type="int"/>
-		<param name="ans_context" type="string"/>
-	</message>														
+	</class>														
 </entity>

Module/mod_heartbeat/mod_heartbeat.cpp

@@ -19,14 +19,14 @@ void HeartBeatServerSession::Handle_CardActive(SpReqAnsContext<HeartBeatService_
 void CHeartBeatEntity::OnSysVarEvent(const char *pszKey,
 	const char *pszValue, const char *pszOldValue, const char *pszEntityName)
 {
-	if ((_strnicmp(pszKey, "TerminalStage", strlen("TerminalStage")) == 0))
-	{
-		if (_strnicmp(pszValue, "A", strlen("A")) == 0)
-		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("To set terminal stage to %s.",pszValue);
-			m_fsm.SetTerminalStageState(pszValue);
-		}
-	}
+	//if ((_strnicmp(pszKey, "TerminalStage", strlen("TerminalStage")) == 0))
+	//{
+	//	if (_strnicmp(pszValue, "A", strlen("A")) == 0)
+	//	{
+	//		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("To set terminal stage to %s.",pszValue);
+	//		
+	//	}
+	//}
 }
 void CHeartBeatEntity::OnBroadcastEvent(CUUID SubID, const char *pszEntityName, DWORD dwMessageId, DWORD dwMessageSignature, CAutoBuffer Buffer)
 {

Module/mod_heartbeat/mod_heartbeat.h

@@ -30,7 +30,7 @@ public:
 	{
 		LOG_FUNCTION();
 		ErrorCodeEnum rt = m_fsm.Init(this);
-		GetFunction()->RegistSysVarEvent("TerminalStage", this);
+		//GetFunction()->RegistSysVarEvent("TerminalStage", this);
 		pTransactionContext->SendAnswer(rt);
 	}
 	virtual void OnPrePause(CSmartPointer<ITransactionContext> pTransactionContext)