Z991239-5255 #comment 补充安装过程的交易码记录。优化日志

Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -1002,13 +1002,13 @@ int CVtmLoaderFSM::EntityLoad()
 	{
 		if (csCoreBootList.IsNullOrEmpty())
 		{
-			LogWarn(Severity_High, Error_Unexpect, VtmLoader_CoreBootCfg_Err, "CoreBoot配置为空，请联系总行开发人员检查");
-			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setLogCode("QLR040210F14").setResultCode("RTA1F05")("CoreBoot配置为空，请联系总行开发人员检查");
+			LogWarn(Severity_High, Error_Unexpect, VtmLoader_CoreBootCfg_Err, CSimpleStringA::Format("terminalNo[%s] CoreBoot配置为空，请联系总行开发人员检查", m_sysInfo.strTerminalID.GetData()));
+			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setLogCode("QLR040210F14").setResultCode("RTA1F05")("terminalNo[%s] CoreBoot配置为空，请联系总行开发人员检查", m_sysInfo.strTerminalID.GetData());
 		}
 		else
 		{
-			LogWarn(Severity_High, Error_Unexpect, VtmLoader_CoreBootCfg_Err, CSimpleStringA::Format("CoreBoot配置异常，请联系总行开发人员检查(%s)", csCoreBootList.GetData()).GetData());
-			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setLogCode("QLR040210F14").setResultCode("RTA1F05")(CSimpleStringA::Format("CoreBoot配置异常，请联系总行开发人员检查(%s)", csCoreBootList.GetData()));
+			LogWarn(Severity_High, Error_Unexpect, VtmLoader_CoreBootCfg_Err, CSimpleStringA::Format("terminalNo[%s] CoreBoot配置异常，请联系总行开发人员检查(%s)", m_sysInfo.strTerminalID.GetData(), csCoreBootList.GetData()).GetData());
+			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setLogCode("QLR040210F14").setResultCode("RTA1F05")(CSimpleStringA::Format("terminalNo[%s] CoreBoot配置异常，请联系总行开发人员检查(%s)",m_sysInfo.strTerminalID.GetData(), csCoreBootList.GetData()));
 		}
 		//if have PinPad module
 		//if (m_sysInfo.strMachineType.Compare("RVC.CardStore", true) == 0)
@@ -1816,7 +1816,7 @@ void CVtmLoaderFSM::SaveTerminalNo(SpReqAnsContext<VtmLoaderService_SaveTerminal
 		ctx->Answer(Error_Param);
 		return;
 	}
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("write terminalNo[%s] to root.ini", ctx->Req.terminalNo.GetData());
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(VtmLoaderService_LogCode_SaveTerminalNo)("write terminalNo[%s] to root.ini", ctx->Req.terminalNo.GetData());
 	ErrorCodeEnum eErr = GetEntityBase()->GetFunction()->GetPrivilegeFunction()->WriteTerminalNoToRootIni(ctx->Req.terminalNo);
 	ctx->Answer(eErr);
 }

Module/mod_vtmloader/VtmLoaderFSM.h

@@ -123,7 +123,13 @@ public:
 	SP::Toolkit::CConditionVarPlus m_hWaitTerminalNoVar,m_hWaiDeviceEntityVar,m_hSaveTerminalNoVar;
 	void SetTerminalNo(SpReqAnsContext<VtmLoaderService_SetTerminalNo_Req, VtmLoaderService_SetTerminalNo_Ans>::Pointer ctx)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("set terminalNo to [%s]", ctx->Req.terminalNo.GetData());
+		if (ctx->Req.terminalNo.IsNullOrEmpty())
+		{
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("Req.terminalNo is null or empty");
+			ctx->Answer(Error_Param);
+			return;
+		}
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(VtmLoaderService_LogCode_SetTerminalNo)("set terminalNo to [%s]", ctx->Req.terminalNo.GetData());
 		m_terminalNoFromWeb = ctx->Req.terminalNo;
 		ctx->Answer(Error_Succeed);
 		m_hWaitTerminalNoVar.Broadcast();