命名空间大小；

SATHTTP/SATHTTP/SATHTTP.cpp

@@ -13,7 +13,7 @@ CCurlClient g_curl;
 
 __if_not_exists(NotifyJobStart)
 {
-	int NotifyJobStart(std::string url, const SATParameters::STNotifyJobStartReq &stNotifyJobStartReq, SATParameters::STNotifyJobStartResp &stNotifyJobStartResp) throw()
+	int NotifyJobStart(std::string url, const SATHTTP::STNotifyJobStartReq &stNotifyJobStartReq, SATHTTP::STNotifyJobStartResp &stNotifyJobStartResp) throw()
 	{
 		return SetResult(url, stNotifyJobStartReq, stNotifyJobStartResp);
 	}
@@ -21,7 +21,7 @@ __if_not_exists(NotifyJobStart)
 
 __if_not_exists(ProcessJob)
 {
-	int ProcessJob(std::string url, const SATParameters::STJobProcessReq &stJobProcessReq, SATParameters::STJobProcessResp &stJobProcessResp) throw()
+	int ProcessJob(std::string url, const SATHTTP::STJobProcessReq &stJobProcessReq, SATHTTP::STJobProcessResp &stJobProcessResp) throw()
 	{
 		return SetResultList(url, stJobProcessReq, stJobProcessResp);
 	}
@@ -39,7 +39,7 @@ bool MKDIR(LPCTSTR dir);
 
 __if_not_exists(NotifyJobStart)
 {
-	int NotifyJobStart(std::string url, const SATParameters::STNotifyJobStartReq &stNotifyJobStartReq, SATParameters::STNotifyJobStartResp &stNotifyJobStartResp) throw()
+	int NotifyJobStart(std::string url, const SATHTTP::STNotifyJobStartReq &stNotifyJobStartReq, SATHTTP::STNotifyJobStartResp &stNotifyJobStartResp) throw()
 	{
 		return SetResult(url, stNotifyJobStartReq, stNotifyJobStartResp);
 	}
@@ -47,7 +47,7 @@ __if_not_exists(NotifyJobStart)
 
 __if_not_exists(ProcessJob)
 {
-	int ProcessJob(std::string url, const SATParameters::STJobProcessReq &stJobProcessReq, SATParameters::STJobProcessResp &stJobProcessResp) throw()
+	int ProcessJob(std::string url, const SATHTTP::STJobProcessReq &stJobProcessReq, SATHTTP::STJobProcessResp &stJobProcessResp) throw()
 	{
 		return SetResultList(url, stJobProcessReq, stJobProcessResp);
 	}
@@ -67,8 +67,8 @@ int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
 	else
 	{
 		std::string host = "http://10.118.158.198:8090";
-		SATParameters::STSaveLogReq stSaveLogReq;
-		SATParameters::STSaveLogResp stSaveLogResp;
+		SATHTTP::STSaveLogReq stSaveLogReq;
+		SATHTTP::STSaveLogResp stSaveLogResp;
 		std::string url = host + "/btc_execute_se/ajaxInteractiveManage!saveCaseOrTaskLog.action";
 
 		// 20191219092809213
@@ -124,7 +124,7 @@ bool MKDIR(LPCTSTR dir)
 	return true;
 };
 
-SATHTTP_API int Login(std::string url, const SATParameters::STLoginReq &stLoginReq, SATParameters::STLoginResp &stLoginResp)
+SATHTTP_API int Login(std::string url, const SATHTTP::STLoginReq &stLoginReq, SATHTTP::STLoginResp &stLoginResp)
 {
 	if ( !g_curl.IsInit() )
 		g_curl.Initialize();
@@ -225,7 +225,7 @@ SATHTTP_API int Login(std::string url, const SATParameters::STLoginReq &stLoginR
 	return FALSE;
 }
 
-SATHTTP_API int UpdateDeviceMessage(std::string url, const SATParameters::STUpdateDeviceReq &stUpdateDeviceReq, SATParameters::STUpdateDeviceResp &stUpdateDeviceResp)
+SATHTTP_API int UpdateDeviceMessage(std::string url, const SATHTTP::STUpdateDeviceReq &stUpdateDeviceReq, SATHTTP::STUpdateDeviceResp &stUpdateDeviceResp)
 {
 	// 转化为Json;
 	cJSON *pRoot = cJSON_CreateObject();
@@ -253,7 +253,7 @@ SATHTTP_API int UpdateDeviceMessage(std::string url, const SATParameters::STUpda
 		if ( pDeviceList )
 		{
 			cJSON_AddItemToObject(pData, "devicelist", pDeviceList);
-			for ( std::vector<SATParameters::STDevice>::const_iterator it = stUpdateDeviceReq.devicelist.begin(); it != stUpdateDeviceReq.devicelist.end(); it++ )
+			for ( std::vector<SATHTTP::STDevice>::const_iterator it = stUpdateDeviceReq.devicelist.begin(); it != stUpdateDeviceReq.devicelist.end(); it++ )
 			{
 				cJSON *pObj = cJSON_CreateObject();
 				if ( pObj )
@@ -351,7 +351,7 @@ SATHTTP_API int UpdateDeviceMessage(std::string url, const SATParameters::STUpda
 }
 
 
-SATHTTP_API int Heartbeat(std::string url, const SATParameters::STHeartbeatReq &stHeartbeatReq, SATParameters::STHeartbeatResp &stHeartbeatResp) 
+SATHTTP_API int Heartbeat(std::string url, const SATHTTP::STHeartbeatReq &stHeartbeatReq, SATHTTP::STHeartbeatResp &stHeartbeatResp) 
 {
 	// 转化为Json;
 	cJSON *pRoot = cJSON_CreateObject();
@@ -370,7 +370,7 @@ SATHTTP_API int Heartbeat(std::string url, const SATParameters::STHeartbeatReq &
 		if ( pDeviceList )
 		{
 			cJSON_AddItemToObject(pData, "deviceList", pDeviceList);
-			for ( std::vector<SATParameters::STDevice>::const_iterator it = stHeartbeatReq.devicelist.begin(); it != stHeartbeatReq.devicelist.end(); it++ )
+			for ( std::vector<SATHTTP::STDevice>::const_iterator it = stHeartbeatReq.devicelist.begin(); it != stHeartbeatReq.devicelist.end(); it++ )
 			{
 				cJSON *pObj = cJSON_CreateObject();
 				if ( pObj )
@@ -439,7 +439,7 @@ SATHTTP_API int Heartbeat(std::string url, const SATParameters::STHeartbeatReq &
 								cJSON *pTask = cJSON_GetArrayItem(pObj, i);
 								if ( pTask )
 								{
-									SATParameters::STTask stTask;
+									SATHTTP::STTask stTask;
 									stTask.strInstanceName = cJSON_GetObjectItem(pTask, "instanceName") ? cJSON_GetObjectItem(pTask, "instanceName")->valuestring : "";
 									stTask.strExecutionStatus = cJSON_GetObjectItem(pTask, "executionStatus") ? cJSON_GetObjectItem(pTask, "executionStatus")->valuestring : "";
 									stTask.strInstanceType = cJSON_GetObjectItem(pTask, "instanceType") ? cJSON_GetObjectItem(pTask, "instanceType")->valuestring : "";
@@ -528,7 +528,7 @@ SATHTTP_API int Heartbeat(std::string url, const SATParameters::STHeartbeatReq &
 													cJSON *pCase = cJSON_GetArrayItem(pCaseList, ii);
 													if ( pCase )
 													{
-														SATParameters::STCase stCase;
+														SATHTTP::STCase stCase;
 														stCase.strIndex = cJSON_GetObjectItem(pCase, "index") ? cJSON_GetObjectItem(pCase, "index")->valuestring : "";
 														stCase.strCaseName = cJSON_GetObjectItem(pCase, "caseName") ? cJSON_GetObjectItem(pCase, "caseName")->valuestring : "";
 														stCase.strMainFilePath = cJSON_GetObjectItem(pCase, "mainFilePath") ? cJSON_GetObjectItem(pCase, "mainFilePath")->valuestring : "";
@@ -565,7 +565,7 @@ SATHTTP_API int Heartbeat(std::string url, const SATParameters::STHeartbeatReq &
 	return FALSE;
 }
 
-SATHTTP_API int SetResult(std::string url, const SATParameters::STNotifyJobStartReq &stNotifyJobStartReq, SATParameters::STNotifyJobStartResp &stNotifyJobStartResp)
+SATHTTP_API int SetResult(std::string url, const SATHTTP::STNotifyJobStartReq &stNotifyJobStartReq, SATHTTP::STNotifyJobStartResp &stNotifyJobStartResp)
 {
 	// 转化为Json;
 	cJSON *pRoot = cJSON_CreateObject();
@@ -655,7 +655,7 @@ SATHTTP_API int SetResult(std::string url, const SATParameters::STNotifyJobStart
 	return FALSE;
 }
 
-SATHTTP_API int SetResultList(std::string url, const SATParameters::STJobProcessReq &stJobProcessReq, SATParameters::STJobProcessResp &stJobProcessResp)
+SATHTTP_API int SetResultList(std::string url, const SATHTTP::STJobProcessReq &stJobProcessReq, SATHTTP::STJobProcessResp &stJobProcessResp)
 {
 	// 转化为Json;
 	cJSON *pRoot = cJSON_CreateObject();
@@ -778,7 +778,7 @@ SATHTTP_API int SetResultList(std::string url, const SATParameters::STJobProcess
 }
 
 
-SATHTTP_API int GetCaseFileListUrl(std::string url, std::string strCaseId, SATParameters::STScriptUrlResp &stScriptUrlResp)
+SATHTTP_API int GetCaseFileListUrl(std::string url, std::string strCaseId, SATHTTP::STScriptUrlResp &stScriptUrlResp)
 {
 	// 转化为Json;
 	cJSON *pRoot = cJSON_CreateObject();
@@ -872,7 +872,7 @@ SATHTTP_API int GetCaseFileListUrl(std::string url, std::string strCaseId, SATPa
 	return FALSE;
 }
 
-SATHTTP_API int DownloadScript(std::string url, std::string strCaseId, std::string strSaveDir, SATParameters::STScriptUrlResp &stScriptUrlResp)
+SATHTTP_API int DownloadScript(std::string url, std::string strCaseId, std::string strSaveDir, SATHTTP::STScriptUrlResp &stScriptUrlResp)
 {
 	// 转化为Json;
 	cJSON *pRoot = cJSON_CreateObject();
@@ -988,7 +988,7 @@ SATHTTP_API int DownloadScript(std::string url, std::string strCaseId, std::stri
 }
 
 
-SATHTTP_API int StopTaskFromRunner(std::string url, std::string strInstnaceId, SATParameters::STStopTaskResp &stStopTaskResp)
+SATHTTP_API int StopTaskFromRunner(std::string url, std::string strInstnaceId, SATHTTP::STStopTaskResp &stStopTaskResp)
 {
 	// 转化为Json;
 	cJSON *pRoot = cJSON_CreateObject();
@@ -1064,7 +1064,7 @@ SATHTTP_API int StopTaskFromRunner(std::string url, std::string strInstnaceId, S
 	return FALSE;
 }
 
-SATHTTP_API int SaveCaseOrTaskLog(std::string url, const SATParameters::STSaveLogReq &stSaveLogReq, SATParameters::STSaveLogResp &stSaveLogResp)
+SATHTTP_API int SaveCaseOrTaskLog(std::string url, const SATHTTP::STSaveLogReq &stSaveLogReq, SATHTTP::STSaveLogResp &stSaveLogResp)
 {
 	// 转化为Json;
 	cJSON *pRoot = cJSON_CreateObject();
@@ -1148,7 +1148,7 @@ SATHTTP_API int SaveCaseOrTaskLog(std::string url, const SATParameters::STSaveLo
 }
 
 
-SATHTTP_API int SaveResultFile(std::string url, const SATParameters::STSaveFileReq &stSaveFileReq, SATParameters::STSaveFileResp &stSaveFileResp) 
+SATHTTP_API int SaveResultFile(std::string url, const SATHTTP::STSaveFileReq &stSaveFileReq, SATHTTP::STSaveFileResp &stSaveFileResp) 
 {
 	// 转化为Json;
 	cJSON *pRoot = cJSON_CreateObject();
@@ -1249,7 +1249,7 @@ SATHTTP_API int SaveResultFile(std::string url, const SATParameters::STSaveFileR
 	return FALSE;
 }
 
-SATHTTP_API int SaveResultImg(std::string url, const SATParameters::STSaveImgReq &stSaveImgReq, SATParameters::STSaveImgResp &stSaveImgResp)
+SATHTTP_API int SaveResultImg(std::string url, const SATHTTP::STSaveImgReq &stSaveImgReq, SATHTTP::STSaveImgResp &stSaveImgResp)
 {
 	// 转化为Json;
 	cJSON *pRoot = cJSON_CreateObject();

SATHTTP/SATHTTP/SATHTTP.h

@@ -19,7 +19,7 @@ public:
 	// TODO: 在此添加您的方法。
 };
 
-namespace SATParameters{
+namespace SATHTTP{
 	//////////////////////////////////////////////////////////////////////////
 	// 通用的结构体;
 	typedef struct __ST_DEVICE__{
@@ -381,31 +381,31 @@ namespace SATParameters{
 extern SATHTTP_API int nSATHTTP;
 
 // 登录接口;
-SATHTTP_API	int Login(std::string url, const SATParameters::STLoginReq &stLoginReq, SATParameters::STLoginResp &stLoginResp) throw();
+SATHTTP_API	int Login(std::string url, const SATHTTP::STLoginReq &stLoginReq, SATHTTP::STLoginResp &stLoginResp) throw();
 
 // 登录完后,必须向服务器更新设备信息,否则SAT上执行任务时无法更新Runner出来;
-SATHTTP_API int UpdateDeviceMessage(std::string url, const SATParameters::STUpdateDeviceReq &stUpdateDeviceReq, SATParameters::STUpdateDeviceResp &stUpdateDeviceResp) throw();
+SATHTTP_API int UpdateDeviceMessage(std::string url, const SATHTTP::STUpdateDeviceReq &stUpdateDeviceReq, SATHTTP::STUpdateDeviceResp &stUpdateDeviceResp) throw();
 
 // 更新完设备信息后,向服务器查询任务;
-SATHTTP_API int Heartbeat(std::string url, const SATParameters::STHeartbeatReq &stHeartbeatReq, SATParameters::STHeartbeatResp &stHeartbeatResp) throw();
+SATHTTP_API int Heartbeat(std::string url, const SATHTTP::STHeartbeatReq &stHeartbeatReq, SATHTTP::STHeartbeatResp &stHeartbeatResp) throw();
 
 // 从心跳包中获取到任务后,通知SAT任务开始(变更SAT上的任务状态);
 // 注意坑：STNotifyJobStartReq.strInstanceId引用的是STTask.Id而非STTask.nInstanceId
-SATHTTP_API int SetResult(std::string url, const SATParameters::STNotifyJobStartReq &stNotifyJobStartReq, SATParameters::STNotifyJobStartResp &stNotifyJobStartResp) throw();
+SATHTTP_API int SetResult(std::string url, const SATHTTP::STNotifyJobStartReq &stNotifyJobStartReq, SATHTTP::STNotifyJobStartResp &stNotifyJobStartResp) throw();
 
 // 通知SAT用例脚本已开始;
-SATHTTP_API int SetResultList(std::string url, const SATParameters::STJobProcessReq &stJobProcessReq, SATParameters::STJobProcessResp &stJobProcessResp) throw();
+SATHTTP_API int SetResultList(std::string url, const SATHTTP::STJobProcessReq &stJobProcessReq, SATHTTP::STJobProcessResp &stJobProcessResp) throw();
 
-SATHTTP_API int GetCaseFileListUrl(std::string url, std::string strCaseId, SATParameters::STScriptUrlResp &stScriptUrlResp) throw();
-SATHTTP_API int DownloadScript(std::string url, std::string strCaseId, std::string strSaveDir, SATParameters::STScriptUrlResp &stScriptUrlResp) throw();
+SATHTTP_API int GetCaseFileListUrl(std::string url, std::string strCaseId, SATHTTP::STScriptUrlResp &stScriptUrlResp) throw();
+SATHTTP_API int DownloadScript(std::string url, std::string strCaseId, std::string strSaveDir, SATHTTP::STScriptUrlResp &stScriptUrlResp) throw();
 
 // 停止Runner上的任务;
 // 注意：strInstnaceId对应的是STTask.nInstanceId;
-SATHTTP_API int StopTaskFromRunner(std::string url, std::string strInstnaceId, SATParameters::STStopTaskResp &stStopTaskResp) throw();
+SATHTTP_API int StopTaskFromRunner(std::string url, std::string strInstnaceId, SATHTTP::STStopTaskResp &stStopTaskResp) throw();
 
-SATHTTP_API int SaveCaseOrTaskLog(std::string url, const SATParameters::STSaveLogReq &stSaveLogReq, SATParameters::STSaveLogResp &stSaveLogResp) throw();
-SATHTTP_API int SaveResultFile(std::string url, const SATParameters::STSaveFileReq &stSaveFileReq, SATParameters::STSaveFileResp &stSaveFileResp) throw();
-SATHTTP_API int SaveResultImg(std::string url, const SATParameters::STSaveImgReq &stSaveImgReq, SATParameters::STSaveImgResp &stSaveImgResp) throw();
+SATHTTP_API int SaveCaseOrTaskLog(std::string url, const SATHTTP::STSaveLogReq &stSaveLogReq, SATHTTP::STSaveLogResp &stSaveLogResp) throw();
+SATHTTP_API int SaveResultFile(std::string url, const SATHTTP::STSaveFileReq &stSaveFileReq, SATHTTP::STSaveFileResp &stSaveFileResp) throw();
+SATHTTP_API int SaveResultImg(std::string url, const SATHTTP::STSaveImgReq &stSaveImgReq, SATHTTP::STSaveImgResp &stSaveImgResp) throw();
 SATHTTP_API int GetIdNumber();
 SATHTTP_API int GetPyCaseInfo();
 SATHTTP_API int GetCaseInfo();