Z991239-6139 #comment feat: 升级，上传实体url地址写入代码

Signed-Off-By: commit-hook

Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp

@@ -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
@@ -3852,71 +3886,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){

Module/mod_upload/UploadFSM.cpp

@@ -28,6 +28,28 @@
 
 #define UPLOAD_CONTENT_EACH_LEN 512*1024
 
+#ifdef DEVOPS_ON_ST /*DevOps流水线编译，ST环境*/
+#define QUERY_PLAN_URL			"https://accessproxy-service.paasst.cmbchina.cn/uploadservice/api/plan/query"
+#define QUERY_TEMP_FILE_URL		"https://accessproxy-service.paasst.cmbchina.cn/uploadservice/api/upload/query/status"
+#define UPDATE_STATE_URL		"https://accessproxy-service.paasst.cmbchina.cn/uploadservice/api/upload/update/status"
+#define ADD_UPLOAD_FAIL_URL		"https://accessproxy-service.paasst.cmbchina.cn/uploadservice/api/upload/fail"
+#elif defined(DEVOPS_ON_UAT)/*DevOps流水线编译，UAT环境*/
+#define QUERY_PLAN_URL			"https://uploadservice.paasuat.cmbchina.cn/api/plan/query"
+#define QUERY_TEMP_FILE_URL		"https://uploadservice.paasuat.cmbchina.cn/api/upload/query/status"
+#define UPDATE_STATE_URL		"https://uploadservice.paasuat.cmbchina.cn/api/upload/update/status"
+#define ADD_UPLOAD_FAIL_URL		"https://uploadservice.paasuat.cmbchina.cn/api/upload/fail"
+#elif defined(DEVOPS_ON_PRD)/*DevOps流水线编译，PRD环境*/
+#define QUERY_PLAN_URL			"https://uploadservice.paas.cmbchina.cn/api/plan/query"
+#define QUERY_TEMP_FILE_URL		"https://uploadservice.paas.cmbchina.cn/api/upload/query/status"
+#define UPDATE_STATE_URL		"https://uploadservice.paas.cmbchina.cn/api/upload/update/status"
+#define ADD_UPLOAD_FAIL_URL		"https://uploadservice.paas.cmbchina.cn/api/upload/fail"
+#else/*DevOps流水线编译，Dev环境&本地编译等非DevOps环境*/
+#define QUERY_PLAN_URL			"https://accessproxy-service.paasst.cmbchina.cn/uploadservice/api/plan/query"
+#define QUERY_TEMP_FILE_URL		"https://accessproxy-service.paasst.cmbchina.cn/uploadservice/api/upload/query/status"
+#define UPDATE_STATE_URL		"https://accessproxy-service.paasst.cmbchina.cn/uploadservice/api/upload/update/status"
+#define ADD_UPLOAD_FAIL_URL		"https://accessproxy-service.paasst.cmbchina.cn/uploadservice/api/upload/fail"
+#endif
+
 UploadFSM::UploadFSM() : m_currUploadFile(NULL)
 {
 	m_uploadList = new list<UploadFileInfo*>();
@@ -759,51 +781,63 @@ ErrorCodeEnum UploadFSM::OnInit()
 		m_centerModel = (int)centerModel;//强制总行模式
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("model is centerModel, CenterModel = %d", m_centerModel);
 
-		//增加总行接口Url参数
-		CSimpleStringA str="";
-		Error = spConfig->ReadConfigValue("upload", "QueryPlanUrl", str);
-		if (Error == Error_Succeed) 
-		{    
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("[CenterUrl] QueryPlanUrl =%s",str.GetData());
-			m_centerUrl.queryPlanUrl = str.GetData();
-		} 
-		else 
-		{
-			return Error;
-		}
+		m_centerUrl.queryPlanUrl = QUERY_PLAN_URL;
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read queryPlanUrl=%s", m_centerUrl.queryPlanUrl.c_str());
 
-		Error = spConfig->ReadConfigValue("upload", "QueryTempFileUrl", str);
-		if (Error == Error_Succeed) 
-		{    
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("[CenterUrl] QueryTempFileUrl =%s",str.GetData());
-			m_centerUrl.queryTempFileUrl = str.GetData();
-		} 
-		else 
-		{
-			return Error;
-		}
+		m_centerUrl.queryTempFileUrl = QUERY_TEMP_FILE_URL;
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read queryTempFileUrl=%s", m_centerUrl.queryTempFileUrl.c_str());
 
-		Error = spConfig->ReadConfigValue("upload", "UpdateStateUrl", str);
-		if (Error == Error_Succeed) 
-		{    
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("[CenterUrl] UpdateStateUrl =%s",str.GetData());
-			m_centerUrl.updateStateUrl = str.GetData();
-		} 
-		else 
-		{
-			return Error;
-		}
+		m_centerUrl.updateStateUrl = UPDATE_STATE_URL;
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read updateStateUrl=%s", m_centerUrl.updateStateUrl.c_str());
 
-		Error = spConfig->ReadConfigValue("upload", "AddUploadFailUrl", str);
-		if (Error == Error_Succeed) 
-		{    
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("[CenterUrl] AddUploadFailUrl =%s",str.GetData());
-			m_centerUrl.addUploadFailUrl = str.GetData();
-		} 
-		else 
-		{
-			return Error;
-		}
+		m_centerUrl.addUploadFailUrl = ADD_UPLOAD_FAIL_URL;
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read addUploadFailUrl=%s", m_centerUrl.addUploadFailUrl.c_str());
+
+		//增加总行接口Url参数
+		CSimpleStringA str="";
+		//Error = spConfig->ReadConfigValue("upload", "QueryPlanUrl", str);
+		//if (Error == Error_Succeed) 
+		//{    
+		//	DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("[CenterUrl] QueryPlanUrl =%s",str.GetData());
+		//	m_centerUrl.queryPlanUrl = str.GetData();
+		//} 
+		//else 
+		//{
+		//	return Error;
+		//}
+
+		//Error = spConfig->ReadConfigValue("upload", "QueryTempFileUrl", str);
+		//if (Error == Error_Succeed) 
+		//{    
+		//	DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("[CenterUrl] QueryTempFileUrl =%s",str.GetData());
+		//	m_centerUrl.queryTempFileUrl = str.GetData();
+		//} 
+		//else 
+		//{
+		//	return Error;
+		//}
+
+		//Error = spConfig->ReadConfigValue("upload", "UpdateStateUrl", str);
+		//if (Error == Error_Succeed) 
+		//{    
+		//	DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("[CenterUrl] UpdateStateUrl =%s",str.GetData());
+		//	m_centerUrl.updateStateUrl = str.GetData();
+		//} 
+		//else 
+		//{
+		//	return Error;
+		//}
+
+		//Error = spConfig->ReadConfigValue("upload", "AddUploadFailUrl", str);
+		//if (Error == Error_Succeed) 
+		//{    
+		//	DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("[CenterUrl] AddUploadFailUrl =%s",str.GetData());
+		//	m_centerUrl.addUploadFailUrl = str.GetData();
+		//} 
+		//else 
+		//{
+		//	return Error;
+		//}
 
 		Error = spConfig->ReadConfigValue("upload", "EachUploadLen", str);
 		if (Error == Error_Succeed)