Z991239-4303 #comment 合并心跳实体代码，打印连接地址功能

Signed-Off-By: commit-hook

Module/include/EventCode.h

@@ -926,6 +926,8 @@ ERROR_ACCESSAUTH_CONNECT_ACS}
 #define LOG_EVT_INC_DEVICE_LOCK_ON 0x5030501A			//设备锁定
 #define LOG_EVT_INC_DEVICE_UNLOCK 0x5030501B			//设备解除锁定
 #define LOG_EVT_INC_DEVICE_KICK_OFF 0x5030501C			//设备罚出
+#define LOG_EVT_CONNECT_BRANCH 0x5030501D			    //连接分行服务
+#define LOG_EVT_CONNECT_CENTER 0x5030501E			    //连接总行服务
 
 
 

Module/mod_heartbeat/HeartBeatFSM.cpp

@@ -403,6 +403,21 @@ int CHeartBeatFSM::DoHandShake()
 			GetEntityBase()->GetFunction()->SetSysVar("HeartbeatState", "C");
 			m_pHandShakeConn->SendHandShake();
 
+			if(m_pHandShakeConn->IsConnectionOK() && !m_bAlarmed)
+			{
+				regex reg("((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])");
+				if(regex_match(m_servIP.GetData(), reg))
+				{
+					CSimpleStringA msg = CSimpleStringA::Format("Branch server IP: %s, backup ip: %s", m_servIP.GetData(), m_servIPB.GetData());
+					LogWarn(Severity_Low, Error_Succeed, LOG_EVT_CONNECT_BRANCH, msg);
+				}
+				else
+				{
+					CSimpleStringA msg = CSimpleStringA::Format("Center server url: %s", m_servIP.GetData());
+					LogWarn(Severity_Low, Error_Succeed, LOG_EVT_CONNECT_CENTER, msg);
+				}
+				m_bAlarmed = true;
+			}
 			Sleep(20000);//oiltest
 			if (m_tmpTestFlag)
 			{

Module/mod_heartbeat/HeartBeatFSM.h

@@ -257,7 +257,7 @@ public:
 	CHeartBeatFSM():m_initTimes(0),m_bUseBackup(false),m_testResult(Error_Succeed),
 	m_warnLevel(0), m_entErrorList(""), m_nLodCtrFlag(0), m_pHandShakeConn(NULL)
 	, m_tradeState(99),m_bJBMachine(false), m_pCRAClient(NULL), m_pIDClient(NULL) , m_pPinPadClient(NULL)
-	, m_localDeviceNo(""), m_ILDeviceNo(""), m_tmpMultiBlob(""), m_terminalStage(""){}
+	, m_localDeviceNo(""), m_ILDeviceNo(""), m_tmpMultiBlob(""), m_terminalStage(""), m_bAlarmed(false){}
 	~CHeartBeatFSM(){}
 	virtual ErrorCodeEnum OnInit();
 	virtual ErrorCodeEnum OnExit();
@@ -343,6 +343,7 @@ private:
 	IDCertificate::IDCertService_ClientBase *m_pIDClient;
 	PinPad::PinPadService_ClientBase *m_pPinPadClient;
 
+	bool m_bAlarmed;
 	bool m_isCardStore;
 };
 struct StartTask : public ITaskSp