Z991239-5294 #comment 完善通过集中配置控制machinemodel检查；健康停止guardian时不再告知guardian

Module/mod_healthmanager/mod_healthmanager.cpp

@@ -703,8 +703,9 @@ bool CHealthManagerEntity::StopGuardian()
 	Sleep(3000);
 	return false;
 #else
-	int ret = m_pfUpgradeRestart(6, 0);
-	Dbg("healthmanager tell the guardian to quit.%d", ret);
+	//why add the fallowing before ?oiltmp@20240407
+	//int ret = m_pfUpgradeRestart(6, 0);
+	//Dbg("healthmanager tell the guardian to quit.%d", ret);
 	Sleep(5000);
 	pid_t pID;
 	bool bFind = false;
@@ -875,12 +876,13 @@ bool CHealthManagerEntity::DoRestart()
 	if(csimpleStrMachineTypeCfg.IndexOf(m_sysStaticInfo.strMachineType)>=0 || csTermStage.Compare("N") == 0)//oilyang@20240104 N for install vtm app
 	{
 		LogWarn(Severity_Low, Error_Unexpect, HealthManager_UserErrorCode_Need_No_Guardian, "terminal is not need start up guardian");
+		m_bNeedGuardian = false;
 		if (CheckGuardianIsRun() > 0)//or true?
 		{
 			bool bStop = StopGuardian();
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("no need for guardian, to stop guardian:%d", bStop);
 		}
-		m_bNeedGuardian = false;
+		
 		//设置一个系统变量给关门页面使用
 		//liuwt@20220104 N noguardian Y needguardian
 		eErr = GetFunction()->SetSysVar("NeedGuardian","N");

Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -961,7 +961,7 @@ int CVtmLoaderFSM::EntityLoad()
 	//前提：收到了配置拉取完成的指令，才会进入到这里
 	//为了测试，假装已经拿到了集中配置
 	m_ullEntityLoadStart = SP::Module::Comm::RVCGetTickCount();
-	LogWarn(Severity_Low, Error_Succeed, VtmLoader_BootInfoPrint, "开始加载实体");
+	
 	CSmartPointer<IConfigInfo> spConfigCen,spRunCfg;
 	GetEntityBase()->GetFunction()->OpenConfig(Config_CenterSetting, spConfigCen);
 	GetEntityBase()->GetFunction()->OpenConfig(Config_Run, spRunCfg);
@@ -1010,6 +1010,7 @@ int CVtmLoaderFSM::EntityLoad()
 	iTmp = 0;
 	if (spConfigCen->ReadConfigValueInt("Common", "AddrDetectInterval", iTmp) == Error_Succeed && iTmp > 0)
 		spRunCfg->WriteConfigValueInt("Common", "AddrDetectInterval", iTmp);
+
 	CSimpleStringA csTmpAddr(true);
 	if (spConfigCen->ReadConfigValue("Common", "SettingDetectAddr", csTmpAddr) == Error_Succeed && !csTmpAddr.IsNullOrEmpty())
 		spRunCfg->WriteConfigValue("Common", "SettingDetectAddr", csTmpAddr.GetData());
@@ -1017,6 +1018,12 @@ int CVtmLoaderFSM::EntityLoad()
 	if (spConfigCen->ReadConfigValue("Common", "AccessAuthDetectAddr", csTmpAddr) == Error_Succeed && !csTmpAddr.IsNullOrEmpty())
 		spRunCfg->WriteConfigValue("Common", "AccessAuthDetectAddr", csTmpAddr.GetData());
 
+	iTmp = 0;
+	if (spConfigCen->ReadConfigValueInt(GetEntityBase()->GetEntityName(), "NoCheckMachineModel", iTmp) == Error_Succeed && iTmp == 1)
+		m_iNoCheckMachineModel = 1;
+
+	LogWarn(Severity_Low, Error_Succeed, VtmLoader_BootInfoPrint, "开始加载实体");
+
 	//int count, cbNum, slNum, opNum;
 	//count = cbNum = slNum = opNum = 0;
 	m_csEntityList = "GuiConsole|Chromium|VtmLoader|";
@@ -2347,7 +2354,6 @@ bool CVtmLoaderFSM::CheckConfigInfoInTestRoom()
 		CSmartPointer<IConfigInfo> spConfigRoot;
 		if (GetEntityBase()->GetFunction()->OpenConfig(Config_Root, spConfigRoot) != Error_Succeed)
 		{
-
 			return true;
 		}
 		CSimpleStringA csMachineModel(true);