|
@@ -21,6 +21,40 @@
|
|
|
#include "EventCode.h"
|
|
|
#include "json/json.h"
|
|
|
|
|
|
+#ifdef DEVOPS_ON_ST /*DevOps流水线编译,ST环境*/
|
|
|
+#define QUERY_CONTINUE_TASK_URL "https://accessproxy-service.paasst.cmbchina.cn/upgrade/api/continue-task"
|
|
|
+#define QUERY_CURR_TASK_URL "https://accessproxy-service.paasst.cmbchina.cn/upgrade/api/current/task"
|
|
|
+#define QUERY_NEW_TASK_URL "https://accessproxy-service.paasst.cmbchina.cn/upgrade/api/new/task"
|
|
|
+#define QUERY_PRE_TASK_URL "https://accessproxy-service.paasst.cmbchina.cn/upgrade/api/pre-task"
|
|
|
+#define SEND_SM3_TASK_URL "https://accessproxy-service.paasst.cmbchina.cn/upgrade/api/upload/hash"
|
|
|
+#define UPDATE_TASK_URL "https://accessproxy-service.paasst.cmbchina.cn/upgrade/api/update/upgrade/status"
|
|
|
+#define QUERY_TASK_STATUS_URL "https://accessproxy-service.paasst.cmbchina.cn/upgrade/api/task/status"
|
|
|
+#elif defined(DEVOPS_ON_UAT)/*DevOps流水线编译,UAT环境*/
|
|
|
+#define QUERY_CONTINUE_TASK_URL "https://upgrade.paasuat.cmbchina.cn/api/continueTask"
|
|
|
+#define QUERY_CURR_TASK_URL "https://upgrade.paasuat.cmbchina.cn/api/current/task"
|
|
|
+#define QUERY_NEW_TASK_URL "https://upgrade.paasuat.cmbchina.cn/api/new/task"
|
|
|
+#define QUERY_PRE_TASK_URL "https://upgrade.paasuat.cmbchina.cn/api/preTask"
|
|
|
+#define SEND_SM3_TASK_URL "https://upgrade.paasuat.cmbchina.cn/api/upload/hash"
|
|
|
+#define UPDATE_TASK_URL "https://upgrade.paasuat.cmbchina.cn/api/update/upgrade/status"
|
|
|
+#define QUERY_TASK_STATUS_URL "https://upgrade.paasuat.cmbchina.cn/api/task/status"
|
|
|
+#elif defined(DEVOPS_ON_PRD)/*DevOps流水线编译,PRD环境*/
|
|
|
+#define QUERY_CONTINUE_TASK_URL "https://upgrade.paas.cmbchina.cn/api/continueTask"
|
|
|
+#define QUERY_CURR_TASK_URL "https://upgrade.paas.cmbchina.cn/api/current/task"
|
|
|
+#define QUERY_NEW_TASK_URL "https://upgrade.paas.cmbchina.cn/api/new/task"
|
|
|
+#define QUERY_PRE_TASK_URL "https://upgrade.paas.cmbchina.cn/api/preTask"
|
|
|
+#define SEND_SM3_TASK_URL "https://upgrade.paas.cmbchina.cn/api/upload/hash"
|
|
|
+#define UPDATE_TASK_URL "https://upgrade.paas.cmbchina.cn/api/update/upgrade/status"
|
|
|
+#define QUERY_TASK_STATUS_URL "https://upgrade.paas.cmbchina.cn/api/task/status"
|
|
|
+#else/*DevOps流水线编译,Dev环境&本地编译等非DevOps环境*/
|
|
|
+#define QUERY_CONTINUE_TASK_URL "https://accessproxy-service.paasst.cmbchina.cn/upgrade/api/continue-task"
|
|
|
+#define QUERY_CURR_TASK_URL "https://accessproxy-service.paasst.cmbchina.cn/upgrade/api/current/task"
|
|
|
+#define QUERY_NEW_TASK_URL "https://accessproxy-service.paasst.cmbchina.cn/upgrade/api/new/task"
|
|
|
+#define QUERY_PRE_TASK_URL "https://accessproxy-service.paasst.cmbchina.cn/upgrade/api/pre-task"
|
|
|
+#define SEND_SM3_TASK_URL "https://accessproxy-service.paasst.cmbchina.cn/upgrade/api/upload/hash"
|
|
|
+#define UPDATE_TASK_URL "https://accessproxy-service.paasst.cmbchina.cn/upgrade/api/update/upgrade/status"
|
|
|
+#define QUERY_TASK_STATUS_URL "https://accessproxy-service.paasst.cmbchina.cn/upgrade/api/task/status"
|
|
|
+#endif
|
|
|
+
|
|
|
namespace Task
|
|
|
{
|
|
|
//计算和发送文件hash
|
|
@@ -3857,71 +3891,85 @@ ErrorCodeEnum CUpgradeTaskFSM::loadCenterCfgInfo()
|
|
|
ErrorCodeEnum rc = m_pEntity->GetFunction()->OpenConfig(Config_CenterSetting, spConfig);
|
|
|
if (rc == Error_Succeed){
|
|
|
|
|
|
- CSimpleStringA str="";
|
|
|
- //加载后端服务访问地址
|
|
|
- rc = spConfig->ReadConfigValue("UpgradeManager", "QueryPreTaskUrl", str);
|
|
|
- if(rc==Error_Succeed){
|
|
|
- m_centerUrl.queryPreTaskUrl = str;
|
|
|
- DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("init read CenterSetting.ini QueryPreTaskUrl=%s",str.GetData());
|
|
|
- }else{
|
|
|
- LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini QueryPreTaskUrl error");
|
|
|
- return rc;
|
|
|
- }
|
|
|
+ m_centerUrl.queryPreTaskUrl = QUERY_PRE_TASK_URL;
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read queryPreTaskUrl=%s", m_centerUrl.queryPreTaskUrl.c_str());
|
|
|
|
|
|
- rc = spConfig->ReadConfigValue("UpgradeManager", "QueryContinueTaskUrl", str);
|
|
|
- if(rc==Error_Succeed){
|
|
|
- m_centerUrl.queryContinueTaskUrl = str;
|
|
|
- DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("init read CenterSetting.ini QueryContinueTaskUrl=%s",str.GetData());
|
|
|
- }else{
|
|
|
- LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini QueryContinueTaskUrl error");
|
|
|
- return rc;
|
|
|
- }
|
|
|
+ m_centerUrl.queryContinueTaskUrl = QUERY_CONTINUE_TASK_URL;
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read queryContinueTaskUrl=%s", m_centerUrl.queryContinueTaskUrl.c_str());
|
|
|
|
|
|
+ m_centerUrl.updateTaskUrl = UPDATE_TASK_URL;
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read updateTaskUrl=%s", m_centerUrl.updateTaskUrl.c_str());
|
|
|
|
|
|
- rc = spConfig->ReadConfigValue("UpgradeManager", "UpdateTaskUrl", str);
|
|
|
- if(rc==Error_Succeed){
|
|
|
- m_centerUrl.updateTaskUrl = str;
|
|
|
- DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("init read CenterSetting.ini UpdateTaskUrl=%s",str.GetData());
|
|
|
- }else{
|
|
|
- LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini UpdateTaskUrl error");
|
|
|
- return rc;
|
|
|
- }
|
|
|
+ m_centerUrl.queryCurrTaskUrl = QUERY_CURR_TASK_URL;
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read queryCurrTaskUrl=%s", m_centerUrl.queryCurrTaskUrl.c_str());
|
|
|
|
|
|
- rc = spConfig->ReadConfigValue("UpgradeManager", "QueryCurrTaskUrl", str);
|
|
|
- if(rc==Error_Succeed){
|
|
|
- m_centerUrl.queryCurrTaskUrl = str;
|
|
|
- DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("init read CenterSetting.ini QueryCurrTaskUrl=%s",str.GetData());
|
|
|
- }else{
|
|
|
- LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini QueryCurrTaskUrl error");
|
|
|
- return rc;
|
|
|
- }
|
|
|
+ m_centerUrl.queryNewTaskUrl = QUERY_NEW_TASK_URL;
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read queryNewTaskUrl=%s", m_centerUrl.queryNewTaskUrl.c_str());
|
|
|
|
|
|
- rc = spConfig->ReadConfigValue("UpgradeManager", "QueryNewTaskUrl", str);
|
|
|
- if(rc==Error_Succeed){
|
|
|
- m_centerUrl.queryNewTaskUrl = str;
|
|
|
- DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("init read CenterSetting.ini QueryNewTaskUrl=%s",str.GetData());
|
|
|
- }else{
|
|
|
- LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini QueryNewTaskUrl error");
|
|
|
- return rc;
|
|
|
- }
|
|
|
+ m_centerUrl.queryTaskStatus = QUERY_TASK_STATUS_URL;
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read queryTaskStatus=%s", m_centerUrl.queryTaskStatus.c_str());
|
|
|
|
|
|
- rc = spConfig->ReadConfigValue("UpgradeManager", "QueryTaskStatus", str);
|
|
|
- if(rc==Error_Succeed){
|
|
|
- m_centerUrl.queryTaskStatus = str;
|
|
|
- DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("init read CenterSetting.ini QueryTaskStatus=%s",str.GetData());
|
|
|
- }else{
|
|
|
- LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini QueryTaskStatus error");
|
|
|
- return rc;
|
|
|
- }
|
|
|
+ m_centerUrl.sendSM3TaskUrl = SEND_SM3_TASK_URL;
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read sendSM3TaskUrl=%s", m_centerUrl.sendSM3TaskUrl.c_str());
|
|
|
|
|
|
- rc = spConfig->ReadConfigValue("UpgradeManager", "SendSM3TaskUrl", str);
|
|
|
- if(rc==Error_Succeed){
|
|
|
- m_centerUrl.sendSM3TaskUrl = str;
|
|
|
- DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("init read CenterSetting.ini SendSM3TaskUrl=%s",str.GetData());
|
|
|
- }else{
|
|
|
- LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini SendSM3TaskUrl error");
|
|
|
- return rc;
|
|
|
- }
|
|
|
+ CSimpleStringA str="";
|
|
|
+ //加载后端服务访问地址
|
|
|
+ //rc = spConfig->ReadConfigValue("UpgradeManager", "QueryPreTaskUrl", str);
|
|
|
+ //if(rc==Error_Succeed){
|
|
|
+ // m_centerUrl.queryPreTaskUrl = str;
|
|
|
+ // DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("init read CenterSetting.ini QueryPreTaskUrl=%s",str.GetData());
|
|
|
+ //}else{
|
|
|
+ // LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini QueryPreTaskUrl error");
|
|
|
+ // return rc;
|
|
|
+ //}
|
|
|
+ //rc = spConfig->ReadConfigValue("UpgradeManager", "QueryContinueTaskUrl", str);
|
|
|
+ //if(rc==Error_Succeed){
|
|
|
+ // m_centerUrl.queryContinueTaskUrl = str;
|
|
|
+ // DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("init read CenterSetting.ini QueryContinueTaskUrl=%s",str.GetData());
|
|
|
+ //}else{
|
|
|
+ // LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini QueryContinueTaskUrl error");
|
|
|
+ // return rc;
|
|
|
+ //}
|
|
|
+ //rc = spConfig->ReadConfigValue("UpgradeManager", "UpdateTaskUrl", str);
|
|
|
+ //if(rc==Error_Succeed){
|
|
|
+ // m_centerUrl.updateTaskUrl = str;
|
|
|
+ // DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("init read CenterSetting.ini UpdateTaskUrl=%s",str.GetData());
|
|
|
+ //}else{
|
|
|
+ // LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini UpdateTaskUrl error");
|
|
|
+ // return rc;
|
|
|
+ //}
|
|
|
+ //rc = spConfig->ReadConfigValue("UpgradeManager", "QueryCurrTaskUrl", str);
|
|
|
+ //if(rc==Error_Succeed){
|
|
|
+ // m_centerUrl.queryCurrTaskUrl = str;
|
|
|
+ // DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("init read CenterSetting.ini QueryCurrTaskUrl=%s",str.GetData());
|
|
|
+ //}else{
|
|
|
+ // LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini QueryCurrTaskUrl error");
|
|
|
+ // return rc;
|
|
|
+ //}
|
|
|
+ //rc = spConfig->ReadConfigValue("UpgradeManager", "QueryNewTaskUrl", str);
|
|
|
+ //if(rc==Error_Succeed){
|
|
|
+ // m_centerUrl.queryNewTaskUrl = str;
|
|
|
+ // DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("init read CenterSetting.ini QueryNewTaskUrl=%s",str.GetData());
|
|
|
+ //}else{
|
|
|
+ // LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini QueryNewTaskUrl error");
|
|
|
+ // return rc;
|
|
|
+ //}
|
|
|
+ //rc = spConfig->ReadConfigValue("UpgradeManager", "QueryTaskStatus", str);
|
|
|
+ //if(rc==Error_Succeed){
|
|
|
+ // m_centerUrl.queryTaskStatus = str;
|
|
|
+ // DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("init read CenterSetting.ini QueryTaskStatus=%s",str.GetData());
|
|
|
+ //}else{
|
|
|
+ // LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini QueryTaskStatus error");
|
|
|
+ // return rc;
|
|
|
+ //}
|
|
|
+ //rc = spConfig->ReadConfigValue("UpgradeManager", "SendSM3TaskUrl", str);
|
|
|
+ //if(rc==Error_Succeed){
|
|
|
+ // m_centerUrl.sendSM3TaskUrl = str;
|
|
|
+ // DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("init read CenterSetting.ini SendSM3TaskUrl=%s",str.GetData());
|
|
|
+ //}else{
|
|
|
+ // LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini SendSM3TaskUrl error");
|
|
|
+ // return rc;
|
|
|
+ //}
|
|
|
//新的下载分段切片长度值(单位K)
|
|
|
rc = spConfig->ReadConfigValue("UpgradeManager", "NewEachDownloadLen", str);
|
|
|
if(rc==Error_Succeed){
|