|
@@ -60,6 +60,7 @@ ErrorCodeEnum CHeartBeatFSM::OnInit()
|
|
|
spConfig->ReadConfigValueInt(GetEntityBase()->GetEntityName(), "CrossUseJS", tmpCrossUseJS);
|
|
|
if (tmpCrossUseJS == 1) {
|
|
|
m_bCrossUseJS = true;//使用JS跨机接口
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CrossUseJS=", tmpCrossUseJS);
|
|
|
}
|
|
|
|
|
|
spConfig->ReadConfigValueInt(GetEntityBase()->GetEntityName(),"TestFlag",m_tmpTestFlag);
|
|
@@ -765,7 +766,7 @@ void CHeartBeatFSM::LocalPreOnlineJS(int slot, CSimpleStringA fromTermNo, CSimpl
|
|
|
DWORD dwUserCode = 0;
|
|
|
if (!CheckCISSessionOrToConnect())
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("to call local PreOnline, but can't connect to CardIssuerStore.");
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("to call local PreOnlineCrossJS, but can't connect to CardIssuerStore.");
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -776,13 +777,13 @@ void CHeartBeatFSM::LocalPreOnlineJS(int slot, CSimpleStringA fromTermNo, CSimpl
|
|
|
req.slot = slot;
|
|
|
req.account = account;
|
|
|
|
|
|
- CSimpleStringA inParam = CSimpleStringA::Format("PreOnline, CardStore heartbeat invoke PreOnline, slot:%d, accountLen:%d", req.slot, req.account.GetLength());
|
|
|
+ CSimpleStringA inParam = CSimpleStringA::Format("PreOnlineCrossJS, CardStore heartbeat invoke PreOnline, slot:%d, accountLen:%d", req.slot, req.account.GetLength());
|
|
|
LogWarn(Severity_Low, Error_Unexpect, HeartBeat_UserErrorCode_Connect_CardStore_Invoke_PreOnline_Inparam, inParam.GetData());
|
|
|
ErrorCodeEnum eErr = (*m_pCISClient)(EntityResource::getLink().upgradeLink())->PreOnlineCrossJS(req, ans, 65000, dwUserCode);
|
|
|
|
|
|
//特殊报错
|
|
|
if (eErr != Error_Succeed) {
|
|
|
- errMsgData = CSimpleStringA::Format("local PreOnline failed:%d(0x%x),dwUserCode:%d(0x%x)", eErr, eErr, dwUserCode, dwUserCode);
|
|
|
+ errMsgData = CSimpleStringA::Format("local PreOnlineCrossJS failed:%d(0x%x),dwUserCode:%d(0x%x)", eErr, eErr, dwUserCode, dwUserCode);
|
|
|
LogWarn(Severity_Middle, Error_Unexpect, HeartBeat_UserErrorCode_Connect_CardStore_Invoke_PreOnline_Falied, errMsgData.GetData());
|
|
|
|
|
|
if (eErr == Error_InvalidState)
|
|
@@ -1406,6 +1407,7 @@ void CHeartBeatFSM::ProcessPreOnline(CardActiveReq* req)
|
|
|
{
|
|
|
if (req->type == 0 || req->type == 10) {
|
|
|
if (m_bCrossUseJS) {
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("心跳调用卡库跨机JS接口");
|
|
|
LocalPreOnlineJS(req->slot, req->TerminalNo, req->FromTerminalNo, req->Account, req->Param2, req->type);
|
|
|
}
|
|
|
else {
|