ソースを参照

Support collect logs to kafka.

sdk-team 4 年 前
コミット
40ea7cd46c

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2022-03-15 Version: 1.36.1082
+- Support collect logs to kafka.
+
 2022-03-15 Version: 1.36.1081
 - Update by sdk platform.
 

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1081
+1.36.1082

+ 12 - 0
sae/include/alibabacloud/sae/model/CreateApplicationRequest.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setAutoConfig(bool autoConfig);
 				std::string getEnvs()const;
 				void setEnvs(const std::string& envs);
+				std::string getKafkaInstanceId()const;
+				void setKafkaInstanceId(const std::string& kafkaInstanceId);
 				std::string getPhpPECLExtensions()const;
 				void setPhpPECLExtensions(const std::string& phpPECLExtensions);
 				std::string getPhpArmsConfigLocation()const;
@@ -65,6 +67,8 @@ namespace AlibabaCloud
 				void setConfigMapMountDesc(const std::string& configMapMountDesc);
 				std::string getOssMountDescs()const;
 				void setOssMountDescs(const std::string& ossMountDescs);
+				std::string getKafkaEndpoint()const;
+				void setKafkaEndpoint(const std::string& kafkaEndpoint);
 				std::string getPreStop()const;
 				void setPreStop(const std::string& preStop);
 				int getCpu()const;
@@ -85,6 +89,8 @@ namespace AlibabaCloud
 				void setMemory(int memory);
 				std::string getSlsConfigs()const;
 				void setSlsConfigs(const std::string& slsConfigs);
+				bool getOpenCollectToKafka()const;
+				void setOpenCollectToKafka(bool openCollectToKafka);
 				std::string getCommandArgs()const;
 				void setCommandArgs(const std::string& commandArgs);
 				std::string getAcrAssumeRoleArn()const;
@@ -123,6 +129,8 @@ namespace AlibabaCloud
 				void setJdk(const std::string& jdk);
 				std::string getAppDescription()const;
 				void setAppDescription(const std::string& appDescription);
+				std::string getKafkaLogfileConfig()const;
+				void setKafkaLogfileConfig(const std::string& kafkaLogfileConfig);
 				std::string getAcrInstanceId()const;
 				void setAcrInstanceId(const std::string& acrInstanceId);
 				std::string getVpcId()const;
@@ -141,6 +149,7 @@ namespace AlibabaCloud
 				std::string mountHost_;
 				bool autoConfig_;
 				std::string envs_;
+				std::string kafkaInstanceId_;
 				std::string phpPECLExtensions_;
 				std::string phpArmsConfigLocation_;
 				std::string customHostAlias_;
@@ -150,6 +159,7 @@ namespace AlibabaCloud
 				std::string namespaceId_;
 				std::string configMapMountDesc_;
 				std::string ossMountDescs_;
+				std::string kafkaEndpoint_;
 				std::string preStop_;
 				int cpu_;
 				std::string vSwitchId_;
@@ -160,6 +170,7 @@ namespace AlibabaCloud
 				std::string webContainer_;
 				int memory_;
 				std::string slsConfigs_;
+				bool openCollectToKafka_;
 				std::string commandArgs_;
 				std::string acrAssumeRoleArn_;
 				std::string readiness_;
@@ -179,6 +190,7 @@ namespace AlibabaCloud
 				std::string mountDesc_;
 				std::string jdk_;
 				std::string appDescription_;
+				std::string kafkaLogfileConfig_;
 				std::string acrInstanceId_;
 				std::string vpcId_;
 				std::string imageUrl_;

+ 69 - 57
sae/include/alibabacloud/sae/model/DeployApplicationRequest.h

@@ -37,16 +37,56 @@ namespace AlibabaCloud
 
 				std::string getNasId()const;
 				void setNasId(const std::string& nasId);
-				std::string getWebContainer()const;
-				void setWebContainer(const std::string& webContainer);
 				std::string getJarStartArgs()const;
 				void setJarStartArgs(const std::string& jarStartArgs);
+				std::string getOssAkSecret()const;
+				void setOssAkSecret(const std::string& ossAkSecret);
+				std::string getMountHost()const;
+				void setMountHost(const std::string& mountHost);
+				int getBatchWaitTime()const;
+				void setBatchWaitTime(int batchWaitTime);
+				std::string getEnvs()const;
+				void setEnvs(const std::string& envs);
+				std::string getKafkaInstanceId()const;
+				void setKafkaInstanceId(const std::string& kafkaInstanceId);
+				std::string getPhpPECLExtensions()const;
+				void setPhpPECLExtensions(const std::string& phpPECLExtensions);
+				std::string getPhpArmsConfigLocation()const;
+				void setPhpArmsConfigLocation(const std::string& phpArmsConfigLocation);
+				std::string getCustomHostAlias()const;
+				void setCustomHostAlias(const std::string& customHostAlias);
+				std::string getJarStartOptions()const;
+				void setJarStartOptions(const std::string& jarStartOptions);
+				std::string getConfigMapMountDesc()const;
+				void setConfigMapMountDesc(const std::string& configMapMountDesc);
+				std::string getOssMountDescs()const;
+				void setOssMountDescs(const std::string& ossMountDescs);
+				std::string getKafkaEndpoint()const;
+				void setKafkaEndpoint(const std::string& kafkaEndpoint);
+				std::string getPreStop()const;
+				void setPreStop(const std::string& preStop);
+				std::string getUpdateStrategy()const;
+				void setUpdateStrategy(const std::string& updateStrategy);
+				std::string getChangeOrderDesc()const;
+				void setChangeOrderDesc(const std::string& changeOrderDesc);
+				int getMinReadyInstanceRatio()const;
+				void setMinReadyInstanceRatio(int minReadyInstanceRatio);
+				bool getAutoEnableApplicationScalingRule()const;
+				void setAutoEnableApplicationScalingRule(bool autoEnableApplicationScalingRule);
+				std::string getPostStart()const;
+				void setPostStart(const std::string& postStart);
+				std::string getPhpExtensions()const;
+				void setPhpExtensions(const std::string& phpExtensions);
+				bool getAssociateEip()const;
+				void setAssociateEip(bool associateEip);
+				std::string getWebContainer()const;
+				void setWebContainer(const std::string& webContainer);
 				std::string getEnableAhas()const;
 				void setEnableAhas(const std::string& enableAhas);
 				std::string getSlsConfigs()const;
 				void setSlsConfigs(const std::string& slsConfigs);
-				std::string getOssAkSecret()const;
-				void setOssAkSecret(const std::string& ossAkSecret);
+				bool getOpenCollectToKafka()const;
+				void setOpenCollectToKafka(bool openCollectToKafka);
 				std::string getCommandArgs()const;
 				void setCommandArgs(const std::string& commandArgs);
 				std::string getAcrAssumeRoleArn()const;
@@ -55,126 +95,98 @@ namespace AlibabaCloud
 				void setReadiness(const std::string& readiness);
 				std::string getTimezone()const;
 				void setTimezone(const std::string& timezone);
-				std::string getMountHost()const;
-				void setMountHost(const std::string& mountHost);
-				int getBatchWaitTime()const;
-				void setBatchWaitTime(int batchWaitTime);
 				std::string getOssAkId()const;
 				void setOssAkId(const std::string& ossAkId);
 				std::string getLiveness()const;
 				void setLiveness(const std::string& liveness);
-				std::string getEnvs()const;
-				void setEnvs(const std::string& envs);
-				std::string getPhpPECLExtensions()const;
-				void setPhpPECLExtensions(const std::string& phpPECLExtensions);
-				std::string getPhpArmsConfigLocation()const;
-				void setPhpArmsConfigLocation(const std::string& phpArmsConfigLocation);
 				std::string getPackageVersion()const;
 				void setPackageVersion(const std::string& packageVersion);
 				std::string getTomcatConfig()const;
 				void setTomcatConfig(const std::string& tomcatConfig);
-				std::string getCustomHostAlias()const;
-				void setCustomHostAlias(const std::string& customHostAlias);
 				std::string getWarStartOptions()const;
 				void setWarStartOptions(const std::string& warStartOptions);
-				std::string getJarStartOptions()const;
-				void setJarStartOptions(const std::string& jarStartOptions);
 				std::string getEdasContainerVersion()const;
 				void setEdasContainerVersion(const std::string& edasContainerVersion);
 				std::string getPackageUrl()const;
 				void setPackageUrl(const std::string& packageUrl);
 				int getTerminationGracePeriodSeconds()const;
 				void setTerminationGracePeriodSeconds(int terminationGracePeriodSeconds);
-				std::string getConfigMapMountDesc()const;
-				void setConfigMapMountDesc(const std::string& configMapMountDesc);
-				std::string getOssMountDescs()const;
-				void setOssMountDescs(const std::string& ossMountDescs);
 				std::string getPhpConfig()const;
 				void setPhpConfig(const std::string& phpConfig);
-				std::string getPreStop()const;
-				void setPreStop(const std::string& preStop);
 				bool getEnableGreyTagRoute()const;
 				void setEnableGreyTagRoute(bool enableGreyTagRoute);
 				std::string getCommand()const;
 				void setCommand(const std::string& command);
-				std::string getUpdateStrategy()const;
-				void setUpdateStrategy(const std::string& updateStrategy);
 				std::string getMountDesc()const;
 				void setMountDesc(const std::string& mountDesc);
 				std::string getJdk()const;
 				void setJdk(const std::string& jdk);
 				int getMinReadyInstances()const;
 				void setMinReadyInstances(int minReadyInstances);
-				std::string getChangeOrderDesc()const;
-				void setChangeOrderDesc(const std::string& changeOrderDesc);
+				std::string getKafkaLogfileConfig()const;
+				void setKafkaLogfileConfig(const std::string& kafkaLogfileConfig);
 				std::string getAcrInstanceId()const;
 				void setAcrInstanceId(const std::string& acrInstanceId);
 				std::string getAppId()const;
 				void setAppId(const std::string& appId);
 				std::string getImageUrl()const;
 				void setImageUrl(const std::string& imageUrl);
-				int getMinReadyInstanceRatio()const;
-				void setMinReadyInstanceRatio(int minReadyInstanceRatio);
 				std::string getPhp()const;
 				void setPhp(const std::string& php);
-				bool getAutoEnableApplicationScalingRule()const;
-				void setAutoEnableApplicationScalingRule(bool autoEnableApplicationScalingRule);
 				std::string getPhpConfigLocation()const;
 				void setPhpConfigLocation(const std::string& phpConfigLocation);
-				std::string getPostStart()const;
-				void setPostStart(const std::string& postStart);
-				std::string getPhpExtensions()const;
-				void setPhpExtensions(const std::string& phpExtensions);
-				bool getAssociateEip()const;
-				void setAssociateEip(bool associateEip);
 
             private:
 				std::string nasId_;
-				std::string webContainer_;
 				std::string jarStartArgs_;
+				std::string ossAkSecret_;
+				std::string mountHost_;
+				int batchWaitTime_;
+				std::string envs_;
+				std::string kafkaInstanceId_;
+				std::string phpPECLExtensions_;
+				std::string phpArmsConfigLocation_;
+				std::string customHostAlias_;
+				std::string jarStartOptions_;
+				std::string configMapMountDesc_;
+				std::string ossMountDescs_;
+				std::string kafkaEndpoint_;
+				std::string preStop_;
+				std::string updateStrategy_;
+				std::string changeOrderDesc_;
+				int minReadyInstanceRatio_;
+				bool autoEnableApplicationScalingRule_;
+				std::string postStart_;
+				std::string phpExtensions_;
+				bool associateEip_;
+				std::string webContainer_;
 				std::string enableAhas_;
 				std::string slsConfigs_;
-				std::string ossAkSecret_;
+				bool openCollectToKafka_;
 				std::string commandArgs_;
 				std::string acrAssumeRoleArn_;
 				std::string readiness_;
 				std::string timezone_;
-				std::string mountHost_;
-				int batchWaitTime_;
 				std::string ossAkId_;
 				std::string liveness_;
-				std::string envs_;
-				std::string phpPECLExtensions_;
-				std::string phpArmsConfigLocation_;
 				std::string packageVersion_;
 				std::string tomcatConfig_;
-				std::string customHostAlias_;
 				std::string warStartOptions_;
-				std::string jarStartOptions_;
 				std::string edasContainerVersion_;
 				std::string packageUrl_;
 				int terminationGracePeriodSeconds_;
-				std::string configMapMountDesc_;
-				std::string ossMountDescs_;
 				std::string phpConfig_;
-				std::string preStop_;
 				bool enableGreyTagRoute_;
 				std::string command_;
-				std::string updateStrategy_;
 				std::string mountDesc_;
 				std::string jdk_;
 				int minReadyInstances_;
-				std::string changeOrderDesc_;
+				std::string kafkaLogfileConfig_;
 				std::string acrInstanceId_;
 				std::string appId_;
 				std::string imageUrl_;
-				int minReadyInstanceRatio_;
 				std::string php_;
-				bool autoEnableApplicationScalingRule_;
 				std::string phpConfigLocation_;
-				std::string postStart_;
-				std::string phpExtensions_;
-				bool associateEip_;
 
 			};
 		}

+ 1 - 0
sae/include/alibabacloud/sae/model/DescribeApplicationConfigResult.h

@@ -87,6 +87,7 @@ namespace AlibabaCloud
 					std::string appDescription;
 					std::string nasId;
 					std::string acrInstanceId;
+					std::string kafkaConfigs;
 					std::string slsConfigs;
 					std::string updateStrategy;
 					std::string ossAkId;

+ 1 - 0
sae/include/alibabacloud/sae/model/DescribeApplicationInstancesResult.h

@@ -41,6 +41,7 @@ namespace AlibabaCloud
 						std::string instanceId;
 						std::string vSwitchId;
 						std::string imageUrl;
+						long finishTimeStamp;
 						long instanceContainerRestarts;
 						std::string instanceContainerStatus;
 						std::string packageVersion;

+ 1 - 0
sae/include/alibabacloud/sae/model/DescribeChangeOrderResult.h

@@ -57,6 +57,7 @@ namespace AlibabaCloud
 					std::string currentPipelineId;
 					std::string coTypeCode;
 					bool _auto;
+					std::string appId;
 					bool supportRollback;
 					int batchWaitTime;
 					int subStatus;

+ 4 - 3
sae/include/alibabacloud/sae/model/DescribeGreyTagRouteResult.h

@@ -38,8 +38,8 @@ namespace AlibabaCloud
 					{
 						struct Item
 						{
-							std::string type;
 							std::string cond;
+							std::string type;
 							std::string expr;
 							std::string value;
 							int index;
@@ -54,8 +54,8 @@ namespace AlibabaCloud
 					{
 						struct Item2
 						{
-							std::string type;
 							std::string cond;
+							std::string type;
 							std::string expr;
 							std::string value;
 							int index;
@@ -69,8 +69,9 @@ namespace AlibabaCloud
 						std::string methodName;
 						std::vector<DubboRule::Item2> items1;
 					};
-					std::string description;
 					long greyTagRouteId;
+					std::string description;
+					std::string appId;
 					long createTime;
 					std::vector<ScRule> scRules;
 					long updateTime;

+ 1 - 1
sae/include/alibabacloud/sae/model/DescribeNamespacesResult.h

@@ -41,8 +41,8 @@ namespace AlibabaCloud
 						std::string tenantId;
 						std::string addressServerHost;
 						std::string accessKey;
-						std::string regionId;
 						std::string namespaceId;
+						std::string regionId;
 						std::string namespaceDescription;
 					};
 					std::vector<_Namespace> namespaces;

+ 0 - 2
sae/include/alibabacloud/sae/model/ListAppServicesPageResult.h

@@ -38,11 +38,9 @@ namespace AlibabaCloud
 					{
 						std::string group;
 						std::string edasAppId;
-						std::string gmtModifyTime;
 						std::string version;
 						std::string serviceName;
 						std::string edasAppName;
-						std::string clusterName;
 						long instanceNum;
 					};
 					std::string pageSize;

+ 44 - 0
sae/src/model/CreateApplicationRequest.cc

@@ -94,6 +94,17 @@ void CreateApplicationRequest::setEnvs(const std::string& envs)
 	setParameter("Envs", envs);
 }
 
+std::string CreateApplicationRequest::getKafkaInstanceId()const
+{
+	return kafkaInstanceId_;
+}
+
+void CreateApplicationRequest::setKafkaInstanceId(const std::string& kafkaInstanceId)
+{
+	kafkaInstanceId_ = kafkaInstanceId;
+	setParameter("KafkaInstanceId", kafkaInstanceId);
+}
+
 std::string CreateApplicationRequest::getPhpPECLExtensions()const
 {
 	return phpPECLExtensions_;
@@ -193,6 +204,17 @@ void CreateApplicationRequest::setOssMountDescs(const std::string& ossMountDescs
 	setBodyParameter("OssMountDescs", ossMountDescs);
 }
 
+std::string CreateApplicationRequest::getKafkaEndpoint()const
+{
+	return kafkaEndpoint_;
+}
+
+void CreateApplicationRequest::setKafkaEndpoint(const std::string& kafkaEndpoint)
+{
+	kafkaEndpoint_ = kafkaEndpoint;
+	setParameter("KafkaEndpoint", kafkaEndpoint);
+}
+
 std::string CreateApplicationRequest::getPreStop()const
 {
 	return preStop_;
@@ -303,6 +325,17 @@ void CreateApplicationRequest::setSlsConfigs(const std::string& slsConfigs)
 	setParameter("SlsConfigs", slsConfigs);
 }
 
+bool CreateApplicationRequest::getOpenCollectToKafka()const
+{
+	return openCollectToKafka_;
+}
+
+void CreateApplicationRequest::setOpenCollectToKafka(bool openCollectToKafka)
+{
+	openCollectToKafka_ = openCollectToKafka;
+	setParameter("OpenCollectToKafka", openCollectToKafka ? "true" : "false");
+}
+
 std::string CreateApplicationRequest::getCommandArgs()const
 {
 	return commandArgs_;
@@ -512,6 +545,17 @@ void CreateApplicationRequest::setAppDescription(const std::string& appDescripti
 	setParameter("AppDescription", appDescription);
 }
 
+std::string CreateApplicationRequest::getKafkaLogfileConfig()const
+{
+	return kafkaLogfileConfig_;
+}
+
+void CreateApplicationRequest::setKafkaLogfileConfig(const std::string& kafkaLogfileConfig)
+{
+	kafkaLogfileConfig_ = kafkaLogfileConfig;
+	setParameter("KafkaLogfileConfig", kafkaLogfileConfig);
+}
+
 std::string CreateApplicationRequest::getAcrInstanceId()const
 {
 	return acrInstanceId_;

+ 240 - 196
sae/src/model/DeployApplicationRequest.cc

@@ -39,26 +39,246 @@ void DeployApplicationRequest::setNasId(const std::string& nasId)
 	setParameter("NasId", nasId);
 }
 
-std::string DeployApplicationRequest::getWebContainer()const
+std::string DeployApplicationRequest::getJarStartArgs()const
 {
-	return webContainer_;
+	return jarStartArgs_;
 }
 
-void DeployApplicationRequest::setWebContainer(const std::string& webContainer)
+void DeployApplicationRequest::setJarStartArgs(const std::string& jarStartArgs)
 {
-	webContainer_ = webContainer;
-	setParameter("WebContainer", webContainer);
+	jarStartArgs_ = jarStartArgs;
+	setParameter("JarStartArgs", jarStartArgs);
 }
 
-std::string DeployApplicationRequest::getJarStartArgs()const
+std::string DeployApplicationRequest::getOssAkSecret()const
 {
-	return jarStartArgs_;
+	return ossAkSecret_;
 }
 
-void DeployApplicationRequest::setJarStartArgs(const std::string& jarStartArgs)
+void DeployApplicationRequest::setOssAkSecret(const std::string& ossAkSecret)
 {
-	jarStartArgs_ = jarStartArgs;
-	setParameter("JarStartArgs", jarStartArgs);
+	ossAkSecret_ = ossAkSecret;
+	setBodyParameter("OssAkSecret", ossAkSecret);
+}
+
+std::string DeployApplicationRequest::getMountHost()const
+{
+	return mountHost_;
+}
+
+void DeployApplicationRequest::setMountHost(const std::string& mountHost)
+{
+	mountHost_ = mountHost;
+	setParameter("MountHost", mountHost);
+}
+
+int DeployApplicationRequest::getBatchWaitTime()const
+{
+	return batchWaitTime_;
+}
+
+void DeployApplicationRequest::setBatchWaitTime(int batchWaitTime)
+{
+	batchWaitTime_ = batchWaitTime;
+	setParameter("BatchWaitTime", std::to_string(batchWaitTime));
+}
+
+std::string DeployApplicationRequest::getEnvs()const
+{
+	return envs_;
+}
+
+void DeployApplicationRequest::setEnvs(const std::string& envs)
+{
+	envs_ = envs;
+	setParameter("Envs", envs);
+}
+
+std::string DeployApplicationRequest::getKafkaInstanceId()const
+{
+	return kafkaInstanceId_;
+}
+
+void DeployApplicationRequest::setKafkaInstanceId(const std::string& kafkaInstanceId)
+{
+	kafkaInstanceId_ = kafkaInstanceId;
+	setParameter("KafkaInstanceId", kafkaInstanceId);
+}
+
+std::string DeployApplicationRequest::getPhpPECLExtensions()const
+{
+	return phpPECLExtensions_;
+}
+
+void DeployApplicationRequest::setPhpPECLExtensions(const std::string& phpPECLExtensions)
+{
+	phpPECLExtensions_ = phpPECLExtensions;
+	setBodyParameter("PhpPECLExtensions", phpPECLExtensions);
+}
+
+std::string DeployApplicationRequest::getPhpArmsConfigLocation()const
+{
+	return phpArmsConfigLocation_;
+}
+
+void DeployApplicationRequest::setPhpArmsConfigLocation(const std::string& phpArmsConfigLocation)
+{
+	phpArmsConfigLocation_ = phpArmsConfigLocation;
+	setParameter("PhpArmsConfigLocation", phpArmsConfigLocation);
+}
+
+std::string DeployApplicationRequest::getCustomHostAlias()const
+{
+	return customHostAlias_;
+}
+
+void DeployApplicationRequest::setCustomHostAlias(const std::string& customHostAlias)
+{
+	customHostAlias_ = customHostAlias;
+	setParameter("CustomHostAlias", customHostAlias);
+}
+
+std::string DeployApplicationRequest::getJarStartOptions()const
+{
+	return jarStartOptions_;
+}
+
+void DeployApplicationRequest::setJarStartOptions(const std::string& jarStartOptions)
+{
+	jarStartOptions_ = jarStartOptions;
+	setParameter("JarStartOptions", jarStartOptions);
+}
+
+std::string DeployApplicationRequest::getConfigMapMountDesc()const
+{
+	return configMapMountDesc_;
+}
+
+void DeployApplicationRequest::setConfigMapMountDesc(const std::string& configMapMountDesc)
+{
+	configMapMountDesc_ = configMapMountDesc;
+	setBodyParameter("ConfigMapMountDesc", configMapMountDesc);
+}
+
+std::string DeployApplicationRequest::getOssMountDescs()const
+{
+	return ossMountDescs_;
+}
+
+void DeployApplicationRequest::setOssMountDescs(const std::string& ossMountDescs)
+{
+	ossMountDescs_ = ossMountDescs;
+	setBodyParameter("OssMountDescs", ossMountDescs);
+}
+
+std::string DeployApplicationRequest::getKafkaEndpoint()const
+{
+	return kafkaEndpoint_;
+}
+
+void DeployApplicationRequest::setKafkaEndpoint(const std::string& kafkaEndpoint)
+{
+	kafkaEndpoint_ = kafkaEndpoint;
+	setParameter("KafkaEndpoint", kafkaEndpoint);
+}
+
+std::string DeployApplicationRequest::getPreStop()const
+{
+	return preStop_;
+}
+
+void DeployApplicationRequest::setPreStop(const std::string& preStop)
+{
+	preStop_ = preStop;
+	setParameter("PreStop", preStop);
+}
+
+std::string DeployApplicationRequest::getUpdateStrategy()const
+{
+	return updateStrategy_;
+}
+
+void DeployApplicationRequest::setUpdateStrategy(const std::string& updateStrategy)
+{
+	updateStrategy_ = updateStrategy;
+	setParameter("UpdateStrategy", updateStrategy);
+}
+
+std::string DeployApplicationRequest::getChangeOrderDesc()const
+{
+	return changeOrderDesc_;
+}
+
+void DeployApplicationRequest::setChangeOrderDesc(const std::string& changeOrderDesc)
+{
+	changeOrderDesc_ = changeOrderDesc;
+	setParameter("ChangeOrderDesc", changeOrderDesc);
+}
+
+int DeployApplicationRequest::getMinReadyInstanceRatio()const
+{
+	return minReadyInstanceRatio_;
+}
+
+void DeployApplicationRequest::setMinReadyInstanceRatio(int minReadyInstanceRatio)
+{
+	minReadyInstanceRatio_ = minReadyInstanceRatio;
+	setParameter("MinReadyInstanceRatio", std::to_string(minReadyInstanceRatio));
+}
+
+bool DeployApplicationRequest::getAutoEnableApplicationScalingRule()const
+{
+	return autoEnableApplicationScalingRule_;
+}
+
+void DeployApplicationRequest::setAutoEnableApplicationScalingRule(bool autoEnableApplicationScalingRule)
+{
+	autoEnableApplicationScalingRule_ = autoEnableApplicationScalingRule;
+	setParameter("AutoEnableApplicationScalingRule", autoEnableApplicationScalingRule ? "true" : "false");
+}
+
+std::string DeployApplicationRequest::getPostStart()const
+{
+	return postStart_;
+}
+
+void DeployApplicationRequest::setPostStart(const std::string& postStart)
+{
+	postStart_ = postStart;
+	setParameter("PostStart", postStart);
+}
+
+std::string DeployApplicationRequest::getPhpExtensions()const
+{
+	return phpExtensions_;
+}
+
+void DeployApplicationRequest::setPhpExtensions(const std::string& phpExtensions)
+{
+	phpExtensions_ = phpExtensions;
+	setBodyParameter("PhpExtensions", phpExtensions);
+}
+
+bool DeployApplicationRequest::getAssociateEip()const
+{
+	return associateEip_;
+}
+
+void DeployApplicationRequest::setAssociateEip(bool associateEip)
+{
+	associateEip_ = associateEip;
+	setBodyParameter("AssociateEip", associateEip ? "true" : "false");
+}
+
+std::string DeployApplicationRequest::getWebContainer()const
+{
+	return webContainer_;
+}
+
+void DeployApplicationRequest::setWebContainer(const std::string& webContainer)
+{
+	webContainer_ = webContainer;
+	setParameter("WebContainer", webContainer);
 }
 
 std::string DeployApplicationRequest::getEnableAhas()const
@@ -83,15 +303,15 @@ void DeployApplicationRequest::setSlsConfigs(const std::string& slsConfigs)
 	setParameter("SlsConfigs", slsConfigs);
 }
 
-std::string DeployApplicationRequest::getOssAkSecret()const
+bool DeployApplicationRequest::getOpenCollectToKafka()const
 {
-	return ossAkSecret_;
+	return openCollectToKafka_;
 }
 
-void DeployApplicationRequest::setOssAkSecret(const std::string& ossAkSecret)
+void DeployApplicationRequest::setOpenCollectToKafka(bool openCollectToKafka)
 {
-	ossAkSecret_ = ossAkSecret;
-	setBodyParameter("OssAkSecret", ossAkSecret);
+	openCollectToKafka_ = openCollectToKafka;
+	setParameter("OpenCollectToKafka", openCollectToKafka ? "true" : "false");
 }
 
 std::string DeployApplicationRequest::getCommandArgs()const
@@ -138,28 +358,6 @@ void DeployApplicationRequest::setTimezone(const std::string& timezone)
 	setParameter("Timezone", timezone);
 }
 
-std::string DeployApplicationRequest::getMountHost()const
-{
-	return mountHost_;
-}
-
-void DeployApplicationRequest::setMountHost(const std::string& mountHost)
-{
-	mountHost_ = mountHost;
-	setParameter("MountHost", mountHost);
-}
-
-int DeployApplicationRequest::getBatchWaitTime()const
-{
-	return batchWaitTime_;
-}
-
-void DeployApplicationRequest::setBatchWaitTime(int batchWaitTime)
-{
-	batchWaitTime_ = batchWaitTime;
-	setParameter("BatchWaitTime", std::to_string(batchWaitTime));
-}
-
 std::string DeployApplicationRequest::getOssAkId()const
 {
 	return ossAkId_;
@@ -182,39 +380,6 @@ void DeployApplicationRequest::setLiveness(const std::string& liveness)
 	setParameter("Liveness", liveness);
 }
 
-std::string DeployApplicationRequest::getEnvs()const
-{
-	return envs_;
-}
-
-void DeployApplicationRequest::setEnvs(const std::string& envs)
-{
-	envs_ = envs;
-	setParameter("Envs", envs);
-}
-
-std::string DeployApplicationRequest::getPhpPECLExtensions()const
-{
-	return phpPECLExtensions_;
-}
-
-void DeployApplicationRequest::setPhpPECLExtensions(const std::string& phpPECLExtensions)
-{
-	phpPECLExtensions_ = phpPECLExtensions;
-	setBodyParameter("PhpPECLExtensions", phpPECLExtensions);
-}
-
-std::string DeployApplicationRequest::getPhpArmsConfigLocation()const
-{
-	return phpArmsConfigLocation_;
-}
-
-void DeployApplicationRequest::setPhpArmsConfigLocation(const std::string& phpArmsConfigLocation)
-{
-	phpArmsConfigLocation_ = phpArmsConfigLocation;
-	setParameter("PhpArmsConfigLocation", phpArmsConfigLocation);
-}
-
 std::string DeployApplicationRequest::getPackageVersion()const
 {
 	return packageVersion_;
@@ -237,17 +402,6 @@ void DeployApplicationRequest::setTomcatConfig(const std::string& tomcatConfig)
 	setParameter("TomcatConfig", tomcatConfig);
 }
 
-std::string DeployApplicationRequest::getCustomHostAlias()const
-{
-	return customHostAlias_;
-}
-
-void DeployApplicationRequest::setCustomHostAlias(const std::string& customHostAlias)
-{
-	customHostAlias_ = customHostAlias;
-	setParameter("CustomHostAlias", customHostAlias);
-}
-
 std::string DeployApplicationRequest::getWarStartOptions()const
 {
 	return warStartOptions_;
@@ -259,17 +413,6 @@ void DeployApplicationRequest::setWarStartOptions(const std::string& warStartOpt
 	setParameter("WarStartOptions", warStartOptions);
 }
 
-std::string DeployApplicationRequest::getJarStartOptions()const
-{
-	return jarStartOptions_;
-}
-
-void DeployApplicationRequest::setJarStartOptions(const std::string& jarStartOptions)
-{
-	jarStartOptions_ = jarStartOptions;
-	setParameter("JarStartOptions", jarStartOptions);
-}
-
 std::string DeployApplicationRequest::getEdasContainerVersion()const
 {
 	return edasContainerVersion_;
@@ -303,28 +446,6 @@ void DeployApplicationRequest::setTerminationGracePeriodSeconds(int terminationG
 	setParameter("TerminationGracePeriodSeconds", std::to_string(terminationGracePeriodSeconds));
 }
 
-std::string DeployApplicationRequest::getConfigMapMountDesc()const
-{
-	return configMapMountDesc_;
-}
-
-void DeployApplicationRequest::setConfigMapMountDesc(const std::string& configMapMountDesc)
-{
-	configMapMountDesc_ = configMapMountDesc;
-	setBodyParameter("ConfigMapMountDesc", configMapMountDesc);
-}
-
-std::string DeployApplicationRequest::getOssMountDescs()const
-{
-	return ossMountDescs_;
-}
-
-void DeployApplicationRequest::setOssMountDescs(const std::string& ossMountDescs)
-{
-	ossMountDescs_ = ossMountDescs;
-	setBodyParameter("OssMountDescs", ossMountDescs);
-}
-
 std::string DeployApplicationRequest::getPhpConfig()const
 {
 	return phpConfig_;
@@ -336,17 +457,6 @@ void DeployApplicationRequest::setPhpConfig(const std::string& phpConfig)
 	setBodyParameter("PhpConfig", phpConfig);
 }
 
-std::string DeployApplicationRequest::getPreStop()const
-{
-	return preStop_;
-}
-
-void DeployApplicationRequest::setPreStop(const std::string& preStop)
-{
-	preStop_ = preStop;
-	setParameter("PreStop", preStop);
-}
-
 bool DeployApplicationRequest::getEnableGreyTagRoute()const
 {
 	return enableGreyTagRoute_;
@@ -369,17 +479,6 @@ void DeployApplicationRequest::setCommand(const std::string& command)
 	setParameter("Command", command);
 }
 
-std::string DeployApplicationRequest::getUpdateStrategy()const
-{
-	return updateStrategy_;
-}
-
-void DeployApplicationRequest::setUpdateStrategy(const std::string& updateStrategy)
-{
-	updateStrategy_ = updateStrategy;
-	setParameter("UpdateStrategy", updateStrategy);
-}
-
 std::string DeployApplicationRequest::getMountDesc()const
 {
 	return mountDesc_;
@@ -413,15 +512,15 @@ void DeployApplicationRequest::setMinReadyInstances(int minReadyInstances)
 	setParameter("MinReadyInstances", std::to_string(minReadyInstances));
 }
 
-std::string DeployApplicationRequest::getChangeOrderDesc()const
+std::string DeployApplicationRequest::getKafkaLogfileConfig()const
 {
-	return changeOrderDesc_;
+	return kafkaLogfileConfig_;
 }
 
-void DeployApplicationRequest::setChangeOrderDesc(const std::string& changeOrderDesc)
+void DeployApplicationRequest::setKafkaLogfileConfig(const std::string& kafkaLogfileConfig)
 {
-	changeOrderDesc_ = changeOrderDesc;
-	setParameter("ChangeOrderDesc", changeOrderDesc);
+	kafkaLogfileConfig_ = kafkaLogfileConfig;
+	setParameter("KafkaLogfileConfig", kafkaLogfileConfig);
 }
 
 std::string DeployApplicationRequest::getAcrInstanceId()const
@@ -457,17 +556,6 @@ void DeployApplicationRequest::setImageUrl(const std::string& imageUrl)
 	setParameter("ImageUrl", imageUrl);
 }
 
-int DeployApplicationRequest::getMinReadyInstanceRatio()const
-{
-	return minReadyInstanceRatio_;
-}
-
-void DeployApplicationRequest::setMinReadyInstanceRatio(int minReadyInstanceRatio)
-{
-	minReadyInstanceRatio_ = minReadyInstanceRatio;
-	setParameter("MinReadyInstanceRatio", std::to_string(minReadyInstanceRatio));
-}
-
 std::string DeployApplicationRequest::getPhp()const
 {
 	return php_;
@@ -479,17 +567,6 @@ void DeployApplicationRequest::setPhp(const std::string& php)
 	setBodyParameter("Php", php);
 }
 
-bool DeployApplicationRequest::getAutoEnableApplicationScalingRule()const
-{
-	return autoEnableApplicationScalingRule_;
-}
-
-void DeployApplicationRequest::setAutoEnableApplicationScalingRule(bool autoEnableApplicationScalingRule)
-{
-	autoEnableApplicationScalingRule_ = autoEnableApplicationScalingRule;
-	setParameter("AutoEnableApplicationScalingRule", autoEnableApplicationScalingRule ? "true" : "false");
-}
-
 std::string DeployApplicationRequest::getPhpConfigLocation()const
 {
 	return phpConfigLocation_;
@@ -501,36 +578,3 @@ void DeployApplicationRequest::setPhpConfigLocation(const std::string& phpConfig
 	setParameter("PhpConfigLocation", phpConfigLocation);
 }
 
-std::string DeployApplicationRequest::getPostStart()const
-{
-	return postStart_;
-}
-
-void DeployApplicationRequest::setPostStart(const std::string& postStart)
-{
-	postStart_ = postStart;
-	setParameter("PostStart", postStart);
-}
-
-std::string DeployApplicationRequest::getPhpExtensions()const
-{
-	return phpExtensions_;
-}
-
-void DeployApplicationRequest::setPhpExtensions(const std::string& phpExtensions)
-{
-	phpExtensions_ = phpExtensions;
-	setBodyParameter("PhpExtensions", phpExtensions);
-}
-
-bool DeployApplicationRequest::getAssociateEip()const
-{
-	return associateEip_;
-}
-
-void DeployApplicationRequest::setAssociateEip(bool associateEip)
-{
-	associateEip_ = associateEip;
-	setBodyParameter("AssociateEip", associateEip ? "true" : "false");
-}
-

+ 2 - 0
sae/src/model/DescribeApplicationConfigResult.cc

@@ -146,6 +146,8 @@ void DescribeApplicationConfigResult::parse(const std::string &payload)
 		data_.acrAssumeRoleArn = dataNode["AcrAssumeRoleArn"].asString();
 	if(!dataNode["AssociateEip"].isNull())
 		data_.associateEip = dataNode["AssociateEip"].asString() == "true";
+	if(!dataNode["KafkaConfigs"].isNull())
+		data_.kafkaConfigs = dataNode["KafkaConfigs"].asString();
 	auto allConfigMapMountDescNode = dataNode["ConfigMapMountDesc"]["ConfigMapMountDescItem"];
 	for (auto dataNodeConfigMapMountDescConfigMapMountDescItem : allConfigMapMountDescNode)
 	{

+ 2 - 0
sae/src/model/DescribeApplicationInstancesResult.cc

@@ -72,6 +72,8 @@ void DescribeApplicationInstancesResult::parse(const std::string &payload)
 			instanceObject.packageVersion = dataNodeInstancesInstance["PackageVersion"].asString();
 		if(!dataNodeInstancesInstance["Eip"].isNull())
 			instanceObject.eip = dataNodeInstancesInstance["Eip"].asString();
+		if(!dataNodeInstancesInstance["FinishTimeStamp"].isNull())
+			instanceObject.finishTimeStamp = std::stol(dataNodeInstancesInstance["FinishTimeStamp"].asString());
 		data_.instances.push_back(instanceObject);
 	}
 	if(!value["Message"].isNull())

+ 2 - 0
sae/src/model/DescribeChangeOrderResult.cc

@@ -74,6 +74,8 @@ void DescribeChangeOrderResult::parse(const std::string &payload)
 		data_._auto = dataNode["Auto"].asString() == "true";
 	if(!dataNode["CurrentPipelineId"].isNull())
 		data_.currentPipelineId = dataNode["CurrentPipelineId"].asString();
+	if(!dataNode["AppId"].isNull())
+		data_.appId = dataNode["AppId"].asString();
 	auto allPipelinesNode = dataNode["Pipelines"]["Pipeline"];
 	for (auto dataNodePipelinesPipeline : allPipelinesNode)
 	{

+ 28 - 26
sae/src/model/DescribeGreyTagRouteResult.cc

@@ -40,16 +40,18 @@ void DescribeGreyTagRouteResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	if(!dataNode["Description"].isNull())
-		data_.description = dataNode["Description"].asString();
 	if(!dataNode["GreyTagRouteId"].isNull())
 		data_.greyTagRouteId = std::stol(dataNode["GreyTagRouteId"].asString());
+	if(!dataNode["Name"].isNull())
+		data_.name = dataNode["Name"].asString();
+	if(!dataNode["Description"].isNull())
+		data_.description = dataNode["Description"].asString();
 	if(!dataNode["CreateTime"].isNull())
 		data_.createTime = std::stol(dataNode["CreateTime"].asString());
 	if(!dataNode["UpdateTime"].isNull())
 		data_.updateTime = std::stol(dataNode["UpdateTime"].asString());
-	if(!dataNode["Name"].isNull())
-		data_.name = dataNode["Name"].asString();
+	if(!dataNode["AppId"].isNull())
+		data_.appId = dataNode["AppId"].asString();
 	auto allScRulesNode = dataNode["ScRules"]["scRule"];
 	for (auto dataNodeScRulesscRule : allScRulesNode)
 	{
@@ -62,20 +64,20 @@ void DescribeGreyTagRouteResult::parse(const std::string &payload)
 		for (auto dataNodeScRulesscRuleitemsitem : allitemsNode)
 		{
 			Data::ScRule::Item itemsObject;
-			if(!dataNodeScRulesscRuleitemsitem["name"].isNull())
-				itemsObject.name = dataNodeScRulesscRuleitemsitem["name"].asString();
 			if(!dataNodeScRulesscRuleitemsitem["index"].isNull())
 				itemsObject.index = std::stoi(dataNodeScRulesscRuleitemsitem["index"].asString());
 			if(!dataNodeScRulesscRuleitemsitem["expr"].isNull())
 				itemsObject.expr = dataNodeScRulesscRuleitemsitem["expr"].asString();
-			if(!dataNodeScRulesscRuleitemsitem["type"].isNull())
-				itemsObject.type = dataNodeScRulesscRuleitemsitem["type"].asString();
-			if(!dataNodeScRulesscRuleitemsitem["cond"].isNull())
-				itemsObject.cond = dataNodeScRulesscRuleitemsitem["cond"].asString();
-			if(!dataNodeScRulesscRuleitemsitem["value"].isNull())
-				itemsObject.value = dataNodeScRulesscRuleitemsitem["value"].asString();
 			if(!dataNodeScRulesscRuleitemsitem["operator"].isNull())
 				itemsObject._operator = dataNodeScRulesscRuleitemsitem["operator"].asString();
+			if(!dataNodeScRulesscRuleitemsitem["value"].isNull())
+				itemsObject.value = dataNodeScRulesscRuleitemsitem["value"].asString();
+			if(!dataNodeScRulesscRuleitemsitem["cond"].isNull())
+				itemsObject.cond = dataNodeScRulesscRuleitemsitem["cond"].asString();
+			if(!dataNodeScRulesscRuleitemsitem["type"].isNull())
+				itemsObject.type = dataNodeScRulesscRuleitemsitem["type"].asString();
+			if(!dataNodeScRulesscRuleitemsitem["name"].isNull())
+				itemsObject.name = dataNodeScRulesscRuleitemsitem["name"].asString();
 			scRuleObject.items.push_back(itemsObject);
 		}
 		data_.scRules.push_back(scRuleObject);
@@ -84,34 +86,34 @@ void DescribeGreyTagRouteResult::parse(const std::string &payload)
 	for (auto dataNodeDubboRulesdubboRule : allDubboRulesNode)
 	{
 		Data::DubboRule dubboRuleObject;
-		if(!dataNodeDubboRulesdubboRule["condition"].isNull())
-			dubboRuleObject.condition = dataNodeDubboRulesdubboRule["condition"].asString();
-		if(!dataNodeDubboRulesdubboRule["methodName"].isNull())
-			dubboRuleObject.methodName = dataNodeDubboRulesdubboRule["methodName"].asString();
 		if(!dataNodeDubboRulesdubboRule["serviceName"].isNull())
 			dubboRuleObject.serviceName = dataNodeDubboRulesdubboRule["serviceName"].asString();
-		if(!dataNodeDubboRulesdubboRule["version"].isNull())
-			dubboRuleObject.version = dataNodeDubboRulesdubboRule["version"].asString();
 		if(!dataNodeDubboRulesdubboRule["group"].isNull())
 			dubboRuleObject.group = dataNodeDubboRulesdubboRule["group"].asString();
+		if(!dataNodeDubboRulesdubboRule["version"].isNull())
+			dubboRuleObject.version = dataNodeDubboRulesdubboRule["version"].asString();
+		if(!dataNodeDubboRulesdubboRule["methodName"].isNull())
+			dubboRuleObject.methodName = dataNodeDubboRulesdubboRule["methodName"].asString();
+		if(!dataNodeDubboRulesdubboRule["condition"].isNull())
+			dubboRuleObject.condition = dataNodeDubboRulesdubboRule["condition"].asString();
 		auto allitems1Node = dataNodeDubboRulesdubboRule["items"]["item"];
 		for (auto dataNodeDubboRulesdubboRuleitemsitem : allitems1Node)
 		{
 			Data::DubboRule::Item2 items1Object;
-			if(!dataNodeDubboRulesdubboRuleitemsitem["name"].isNull())
-				items1Object.name = dataNodeDubboRulesdubboRuleitemsitem["name"].asString();
 			if(!dataNodeDubboRulesdubboRuleitemsitem["index"].isNull())
 				items1Object.index = std::stoi(dataNodeDubboRulesdubboRuleitemsitem["index"].asString());
 			if(!dataNodeDubboRulesdubboRuleitemsitem["expr"].isNull())
 				items1Object.expr = dataNodeDubboRulesdubboRuleitemsitem["expr"].asString();
-			if(!dataNodeDubboRulesdubboRuleitemsitem["type"].isNull())
-				items1Object.type = dataNodeDubboRulesdubboRuleitemsitem["type"].asString();
-			if(!dataNodeDubboRulesdubboRuleitemsitem["cond"].isNull())
-				items1Object.cond = dataNodeDubboRulesdubboRuleitemsitem["cond"].asString();
-			if(!dataNodeDubboRulesdubboRuleitemsitem["value"].isNull())
-				items1Object.value = dataNodeDubboRulesdubboRuleitemsitem["value"].asString();
 			if(!dataNodeDubboRulesdubboRuleitemsitem["operator"].isNull())
 				items1Object._operator = dataNodeDubboRulesdubboRuleitemsitem["operator"].asString();
+			if(!dataNodeDubboRulesdubboRuleitemsitem["value"].isNull())
+				items1Object.value = dataNodeDubboRulesdubboRuleitemsitem["value"].asString();
+			if(!dataNodeDubboRulesdubboRuleitemsitem["cond"].isNull())
+				items1Object.cond = dataNodeDubboRulesdubboRuleitemsitem["cond"].asString();
+			if(!dataNodeDubboRulesdubboRuleitemsitem["type"].isNull())
+				items1Object.type = dataNodeDubboRulesdubboRuleitemsitem["type"].asString();
+			if(!dataNodeDubboRulesdubboRuleitemsitem["name"].isNull())
+				items1Object.name = dataNodeDubboRulesdubboRuleitemsitem["name"].asString();
 			dubboRuleObject.items1.push_back(items1Object);
 		}
 		data_.dubboRules.push_back(dubboRuleObject);

+ 16 - 16
sae/src/model/DescribeNamespacesResult.cc

@@ -42,42 +42,42 @@ void DescribeNamespacesResult::parse(const std::string &payload)
 	auto dataNode = value["Data"];
 	if(!dataNode["CurrentPage"].isNull())
 		data_.currentPage = std::stoi(dataNode["CurrentPage"].asString());
-	if(!dataNode["PageSize"].isNull())
-		data_.pageSize = std::stoi(dataNode["PageSize"].asString());
 	if(!dataNode["TotalSize"].isNull())
 		data_.totalSize = std::stoi(dataNode["TotalSize"].asString());
+	if(!dataNode["PageSize"].isNull())
+		data_.pageSize = std::stoi(dataNode["PageSize"].asString());
 	auto allNamespacesNode = dataNode["Namespaces"]["Namespace"];
 	for (auto dataNodeNamespacesNamespace : allNamespacesNode)
 	{
 		Data::_Namespace _namespaceObject;
+		if(!dataNodeNamespacesNamespace["NamespaceDescription"].isNull())
+			_namespaceObject.namespaceDescription = dataNodeNamespacesNamespace["NamespaceDescription"].asString();
 		if(!dataNodeNamespacesNamespace["AccessKey"].isNull())
 			_namespaceObject.accessKey = dataNodeNamespacesNamespace["AccessKey"].asString();
-		if(!dataNodeNamespacesNamespace["AddressServerHost"].isNull())
-			_namespaceObject.addressServerHost = dataNodeNamespacesNamespace["AddressServerHost"].asString();
 		if(!dataNodeNamespacesNamespace["SecretKey"].isNull())
 			_namespaceObject.secretKey = dataNodeNamespacesNamespace["SecretKey"].asString();
-		if(!dataNodeNamespacesNamespace["TenantId"].isNull())
-			_namespaceObject.tenantId = dataNodeNamespacesNamespace["TenantId"].asString();
-		if(!dataNodeNamespacesNamespace["RegionId"].isNull())
-			_namespaceObject.regionId = dataNodeNamespacesNamespace["RegionId"].asString();
 		if(!dataNodeNamespacesNamespace["NamespaceId"].isNull())
 			_namespaceObject.namespaceId = dataNodeNamespacesNamespace["NamespaceId"].asString();
+		if(!dataNodeNamespacesNamespace["AddressServerHost"].isNull())
+			_namespaceObject.addressServerHost = dataNodeNamespacesNamespace["AddressServerHost"].asString();
 		if(!dataNodeNamespacesNamespace["NamespaceName"].isNull())
 			_namespaceObject.namespaceName = dataNodeNamespacesNamespace["NamespaceName"].asString();
-		if(!dataNodeNamespacesNamespace["NamespaceDescription"].isNull())
-			_namespaceObject.namespaceDescription = dataNodeNamespacesNamespace["NamespaceDescription"].asString();
+		if(!dataNodeNamespacesNamespace["TenantId"].isNull())
+			_namespaceObject.tenantId = dataNodeNamespacesNamespace["TenantId"].asString();
+		if(!dataNodeNamespacesNamespace["RegionId"].isNull())
+			_namespaceObject.regionId = dataNodeNamespacesNamespace["RegionId"].asString();
 		data_.namespaces.push_back(_namespaceObject);
 	}
-	if(!value["Code"].isNull())
-		code_ = value["Code"].asString();
-	if(!value["ErrorCode"].isNull())
-		errorCode_ = value["ErrorCode"].asString();
 	if(!value["Message"].isNull())
 		message_ = value["Message"].asString();
-	if(!value["Success"].isNull())
-		success_ = value["Success"].asString() == "true";
 	if(!value["TraceId"].isNull())
 		traceId_ = value["TraceId"].asString();
+	if(!value["ErrorCode"].isNull())
+		errorCode_ = value["ErrorCode"].asString();
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Success"].isNull())
+		success_ = value["Success"].asString() == "true";
 
 }
 

+ 0 - 4
sae/src/model/ListAppServicesPageResult.cc

@@ -63,14 +63,10 @@ void ListAppServicesPageResult::parse(const std::string &payload)
 				resultObject.instanceNum = std::stol(valueDataDataItemResultMscAgentServiceResponse["InstanceNum"].asString());
 			if(!valueDataDataItemResultMscAgentServiceResponse["EdasAppId"].isNull())
 				resultObject.edasAppId = valueDataDataItemResultMscAgentServiceResponse["EdasAppId"].asString();
-			if(!valueDataDataItemResultMscAgentServiceResponse["GmtModifyTime"].isNull())
-				resultObject.gmtModifyTime = valueDataDataItemResultMscAgentServiceResponse["GmtModifyTime"].asString();
 			if(!valueDataDataItemResultMscAgentServiceResponse["ServiceName"].isNull())
 				resultObject.serviceName = valueDataDataItemResultMscAgentServiceResponse["ServiceName"].asString();
 			if(!valueDataDataItemResultMscAgentServiceResponse["Group"].isNull())
 				resultObject.group = valueDataDataItemResultMscAgentServiceResponse["Group"].asString();
-			if(!valueDataDataItemResultMscAgentServiceResponse["ClusterName"].isNull())
-				resultObject.clusterName = valueDataDataItemResultMscAgentServiceResponse["ClusterName"].asString();
 			dataObject.result.push_back(resultObject);
 		}
 		data_.push_back(dataObject);