Merge branch 'feature_adapter_decouple' of http://gitee.itc.cmbchina.cn/QD_RemoteBankArea/LR04.02_RVCTerminalPlus into feature_adapter_decouple

Framework/Common/SpBase.h

@@ -186,6 +186,7 @@ enum RebootTriggerEnum
 	RebootTrigger_Unsubscribe,	    //The life of machine is over,and will not connect to backstage again
 	RebootTrigger_DeadForever,     //As some reason such as test failed, we want Framework dead and not reboot. TODO: let the Gardian know.
 	RebootTrigger_DeviceAdapterUpgrade,
+	RebootTrigger_ThirdPartyUpgrade,	//第三方升级（体系外升级）
 };
 
 enum RebootWayEnum

Module/include/EventCode.h

@@ -580,57 +580,14 @@ ERROR_ACCESSAUTH_CONNECT_ACS_x}
 #define Event_Req_Framework_Rollback 0x50600003
 //请求框架重启 事件 2 0x50600004 请求健康实体执行框架重启，非版本升级，监护不做回退监控
 #define Event_Req_Framework_No_Upgrade_Restart 0x50600004
-//请求框架重启 事件 2 0x50600010 请求健康实体执行框架重启，版本回退，监护不做回退监控
-
-#define Event_DeviceAdapterUpgrade_Framework_Restart 0x50600005	//适配器升级，请求重启应用
-
-#define Event_Req_Framework_Rollback_Restart 0x50600100
-//请求框架重启 事件 2 0x50600011 请求健康实体执行操作系统重启，版本升级，监护做回退监控
-#define Event_Req_OS_Upgrade_Restart 0x50600101
-
-#define LOG_WRAN_UPGRADE_PROGRESS 0x50610000 //升级过程告警
-
-
-
-#define ERR_WRAN_UPGRADE_PROGRESS 0x50600005 //升级过程获取升级信息报错
-#define ERR_WRAN_SYSPACK 0x50600006 //获取已安装体系外升级包报错
-#define ERR_WRAN_CREATE_INSTALL 0x50600010 //创建install文件报错
-#define ERR_WRAN_UPDATE_NEW_VERSION_FAIL 0x50600011 //更新active文件失败
-#define ERR_WRAN_OPEN_ACTIVE_FAIL 0x50600020 //active文件被锁
-#define ERR_WRAN_REGIST_SYS_VAR_FAIL 0X50600021 //注册系统变量监控失败
-#define WARN_SYS_PACK_INSTALL 0x50600022 //体系外升级包已安装
-#define WARN_BLACK_FILE_SUM 0x50600023 //黑名单文件数量
-//新升级告警码
-#define ERR_TASK_QUERY_UPGRADE_MODE 0X50620000 //查询升级灰度控制报错
-#define ERR_TASK_INIT_OLD_UPGRADE 0X50620001 //初始化旧模式状态机失败
-#define ERR_TASK_INIT_NEW_UPGRADE 0X50620002 //初始化新模式状态机失败
-#define ERR_TASK_READ_INI_FAIL 0x50620003 //读实体配置文件错误
-#define ERR_TASK_PACKNAME_NOT_EQUAL 0x50620004 //运行时缓存包名和服务返回不一致
-#define ERR_TASK_GET_SM3_HASH_FAIL 0x50620005 //获取终端hash列表报错
-#define ERR_TASK_SEND_SM3_HASH_FAIL 0x50620006 //发送终端hash列表报错
-#define ERR_TASK_QUERY_NEW_TASK_FAIL 0x50620007 //查询新任务报错
-#define ERR_TASK_QUERY_CURR_TASK_FAIL 0x50620008 //查询当前任务报错
-#define ERR_TASK_QUERY_TASK_STATUS_FAIL 0x50620009 //查询任务状态报错
-#define ERR_TASK_UPDATE_TASK_STATUS_FAIL 0x50620010 //更新任务状态报错
-#define ERR_TASK_UPDATE_TASK_STATUS_INVALID 0x50620011 //更新任务状态无效
-#define ERR_TASK_DOWNLOAD_PACK_FAIL 0x50620012 //下载安装包报错
-#define ERR_TASK_INVALID_STATUS_FAIL 0x50620013 //终端当前任务状态无效，清理此任务
-#define ERR_TASK_UPDATE_ACTIVE_FAIL 0X50620014 //版本切换更新active文件失败
-#define ERR_TASK_ROLL_BACK_ACTIVE_FAIL 0X50620015 //回滚更新active文件失败
-#define ERR_TASK_INVALID_RUNINFO_TASK 0X50620016 //运行时任务无效
-#define ERR_TASK_QUERY_NO_TASK 0X50620017 //查询无任务告警
-#define ERR_TASK_ROLLBACK_VERSION_CHECK_FAIL 0X50620018 //回退版检查失败
-#define ERR_TASK_ROLLBACK_FAIL 0X50620019 //回滚失败
-#define ERR_TASK_STOP_MEDIA_FAIL 0X5062001A //停止媒体失败
-#define ERR_TASK_INSTALL_VERSION_FAIL 0X5062001B //安装版本失败
-#define ERR_TASK_UNZIP_PACK_FAIL 0X5062001C //解压版本失败
-
-#define WARN_TASK_START_NEW_MODE 0X50620020 //启动新模式升级告警
-#define WARN_TASK_START_OLD_MODE 0X50620021 //启动旧模式升级告警
-#define WARN_TASK_COPY_FILE_ZERO 0x50620022 //升级copy文件夹文件个数为0
-#define ERR_TASK_QUERY_PRE_NEW_TASK_FAIL 0x50620023 //查询新任务报错
-#define ERR_TASK_QUERY_CONTINUE_NEW_TASK_FAIL 0x50620024 //查询继续新任务报错
-#define ERR_TASK_QUERY_CONTINUE_NEW_TASK_ERR 0x50620025 //查询继续新任务异常
+//适配器升级，请求重启应用
+#define Event_DeviceAdapterUpgrade_Framework_Restart 0x50600005	
+//请求框架重启 事件 2 0x50600006 请求健康实体执行框架重启，版本回退，监护不做回退监控
+#define Event_Req_Framework_Rollback_Restart 0x50600006
+//请求框架重启 事件 2 0x5060007 请求健康实体执行操作系统重启，版本升级，监护做回退监控
+#define Event_Req_OS_Upgrade_Restart 0x50600007
+
+
 
 
 // 通过健康实体请求框架重启

Module/mod_UpgradeMgr/CMakeLists.txt

@@ -14,6 +14,7 @@ set(${MODULE_PREFIX}_SRCS
 	UpgradeTaskFSM.h
 	XUnzip.cpp
 	XUnzip.h
+	UpgradeManager_UserErrorCode.h
 	)
 else()
 set(${MODULE_PREFIX}_SRCS

Module/mod_UpgradeMgr/UpgradeManager_UserErrorCode.h

@@ -0,0 +1,50 @@
+#ifndef _UPGRADEMANAGER_USER_ERRORCODE_H
+#define _UPGRADEMANAGER_USER_ERRORCODE_H
+#pragma once
+
+#define LOG_WRAN_UPGRADE_PROGRESS 0x50610000 //升级过程告警,服务端使用了此码做解析
+#define ERR_WRAN_UPGRADE_PROGRESS 0x50610001 //升级过程获取升级信息报错
+
+//#define ERR_WRAN_CREATE_INSTALL 0x50600010 //创建install文件报错
+//#define ERR_WRAN_UPDATE_NEW_VERSION_FAIL 0x50600011 //更新active文件失败
+//#define ERR_WRAN_OPEN_ACTIVE_FAIL 0x50600020 //active文件被锁
+//#define ERR_WRAN_REGIST_SYS_VAR_FAIL 0X50600021 //注册系统变量监控失败
+//#define WARN_SYS_PACK_INSTALL 0x50600022 //体系外升级包已安装
+//#define WARN_BLACK_FILE_SUM 0x50600023 //黑名单文件数量
+//新升级告警码 从20000开始
+
+#define ERR_TASK_QUERY_UPGRADE_MODE 0X50620000 //查询升级灰度控制报错
+#define ERR_TASK_INIT_OLD_UPGRADE 0X50620001 //初始化旧模式状态机失败
+#define ERR_TASK_INIT_NEW_UPGRADE 0X50620002 //初始化新模式状态机失败
+#define ERR_TASK_READ_INI_FAIL 0x50620003 //读实体配置文件错误
+#define ERR_TASK_PACKNAME_NOT_EQUAL 0x50620004 //运行时缓存包名和服务返回不一致
+#define ERR_TASK_GET_SM3_HASH_FAIL 0x50620005 //获取终端hash列表报错
+#define ERR_TASK_SEND_SM3_HASH_FAIL 0x50620006 //发送终端hash列表报错
+#define ERR_TASK_QUERY_NEW_TASK_FAIL 0x50620007 //查询新任务报错
+#define ERR_TASK_QUERY_CURR_TASK_FAIL 0x50620008 //查询当前任务报错
+#define ERR_TASK_QUERY_TASK_STATUS_FAIL 0x50620009 //查询任务状态报错
+#define ERR_TASK_UPDATE_TASK_STATUS_FAIL 0x50620010 //更新任务状态报错
+#define ERR_TASK_UPDATE_TASK_STATUS_INVALID 0x50620011 //更新任务状态无效
+#define ERR_TASK_DOWNLOAD_PACK_FAIL 0x50620012 //下载安装包报错
+#define ERR_TASK_INVALID_STATUS_FAIL 0x50620013 //终端当前任务状态无效，清理此任务
+#define ERR_TASK_UPDATE_ACTIVE_FAIL 0X50620014 //版本切换更新active文件失败
+#define ERR_TASK_ROLL_BACK_ACTIVE_FAIL 0X50620015 //回滚更新active文件失败
+#define ERR_TASK_INVALID_RUNINFO_TASK 0X50620016 //运行时任务无效
+#define ERR_TASK_QUERY_NO_TASK 0X50620017 //查询无任务告警
+#define ERR_TASK_ROLLBACK_VERSION_CHECK_FAIL 0X50620018 //回退版检查失败
+#define ERR_TASK_ROLLBACK_FAIL 0X50620019 //回滚失败
+#define ERR_TASK_STOP_MEDIA_FAIL 0X5062001A //停止媒体失败
+#define ERR_TASK_INSTALL_VERSION_FAIL 0X5062001B //安装版本失败
+#define ERR_TASK_UNZIP_PACK_FAIL 0X5062001C //解压版本失败
+
+#define WARN_TASK_START_NEW_MODE 0X50620020 //启动新模式升级告警
+#define WARN_TASK_START_OLD_MODE 0X50620021 //启动旧模式升级告警
+#define WARN_TASK_COPY_FILE_ZERO 0x50620022 //升级copy文件夹文件个数为0
+#define ERR_TASK_QUERY_PRE_NEW_TASK_FAIL 0x50620023 //查询新任务报错
+#define ERR_TASK_QUERY_CONTINUE_NEW_TASK_FAIL 0x50620024 //查询继续新任务报错
+#define ERR_TASK_QUERY_CONTINUE_NEW_TASK_ERR 0x50620025 //查询继续新任务异常
+
+#define ERR_WRAN_OPEN_ACTIVE_FAIL 0x50620026 //active文件被锁
+#define ERR_WRAN_REGIST_SYS_VAR_FAIL 0X50620027 //注册系统变量监控失败
+#define WARN_BLACK_FILE_SUM 0x50620028 //黑名单文件数量
+#endif //_UPGRADEMANAGER_USER_ERRORCODE_H

Module/mod_UpgradeMgr/mod_UpgradeMgr.h

@@ -4,6 +4,7 @@
 #include "SpBase.h"
 #include "SimpleString.h"
 #include "UpgradeManager_server_g.h"
+#include "UpgradeManager_UserErrorCode.h"
 
 #ifdef RVC_OS_WIN
 

Module/mod_healthmanager/mod_healthmanager.cpp

@@ -1060,7 +1060,7 @@ void CHealthManagerEntity::OnLog(const CAutoArray<CUUID>& SubIDs, const CUUID nL
 			FrameworkRestartTask* task = new FrameworkRestartTask(this); //体系外升级，无监控
 			task->eWarmPageType = WarmPageType_ThirdPartyUpgrade;
 			task->needVerctrl = false;
-			task->eTrigger = RebootTrigger_FrameUpgrade;
+			task->eTrigger = RebootTrigger_ThirdPartyUpgrade;
 			task->eWay = RebootWay_Framework;
 			GetFunction()->PostThreadPoolTask(task);
 			break;