diff --git a/VERSION b/VERSION index fdfd258f0..f0b8ae88d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1319 \ No newline at end of file +1.36.1320 \ No newline at end of file diff --git a/schedulerx2/include/alibabacloud/schedulerx2/model/GetJobInfoResult.h b/schedulerx2/include/alibabacloud/schedulerx2/model/GetJobInfoResult.h index 7b816a5b2..84d733105 100644 --- a/schedulerx2/include/alibabacloud/schedulerx2/model/GetJobInfoResult.h +++ b/schedulerx2/include/alibabacloud/schedulerx2/model/GetJobInfoResult.h @@ -83,11 +83,13 @@ namespace AlibabaCloud MapTaskXAttrs mapTaskXAttrs; std::string name; JobMonitorInfo jobMonitorInfo; + std::string jobType; std::string content; std::string className; int attemptInterval; std::string executeMode; long jobId; + std::string xAttrs; }; JobConfigInfo jobConfigInfo; }; diff --git a/schedulerx2/include/alibabacloud/schedulerx2/model/ListJobsResult.h b/schedulerx2/include/alibabacloud/schedulerx2/model/ListJobsResult.h index 14354c3ab..1920ede76 100644 --- a/schedulerx2/include/alibabacloud/schedulerx2/model/ListJobsResult.h +++ b/schedulerx2/include/alibabacloud/schedulerx2/model/ListJobsResult.h @@ -83,11 +83,13 @@ namespace AlibabaCloud MapTaskXAttrs mapTaskXAttrs; std::string name; JobMonitorInfo jobMonitorInfo; + std::string jobType; std::string content; std::string className; int attemptInterval; std::string executeMode; long jobId; + std::string xAttrs; }; std::vector jobs; }; diff --git a/schedulerx2/src/model/GetJobInfoResult.cc b/schedulerx2/src/model/GetJobInfoResult.cc index 58ca83102..f181e720b 100644 --- a/schedulerx2/src/model/GetJobInfoResult.cc +++ b/schedulerx2/src/model/GetJobInfoResult.cc @@ -63,8 +63,12 @@ void GetJobInfoResult::parse(const std::string &payload) data_.jobConfigInfo.jarUrl = jobConfigInfoNode["JarUrl"].asString(); if(!jobConfigInfoNode["ClassName"].isNull()) data_.jobConfigInfo.className = jobConfigInfoNode["ClassName"].asString(); + if(!jobConfigInfoNode["JobType"].isNull()) + data_.jobConfigInfo.jobType = jobConfigInfoNode["JobType"].asString(); if(!jobConfigInfoNode["AttemptInterval"].isNull()) data_.jobConfigInfo.attemptInterval = std::stoi(jobConfigInfoNode["AttemptInterval"].asString()); + if(!jobConfigInfoNode["XAttrs"].isNull()) + data_.jobConfigInfo.xAttrs = jobConfigInfoNode["XAttrs"].asString(); auto mapTaskXAttrsNode = jobConfigInfoNode["MapTaskXAttrs"]; if(!mapTaskXAttrsNode["TaskMaxAttempt"].isNull()) data_.jobConfigInfo.mapTaskXAttrs.taskMaxAttempt = std::stoi(mapTaskXAttrsNode["TaskMaxAttempt"].asString()); diff --git a/schedulerx2/src/model/ListJobsResult.cc b/schedulerx2/src/model/ListJobsResult.cc index 42af86f84..800beff19 100644 --- a/schedulerx2/src/model/ListJobsResult.cc +++ b/schedulerx2/src/model/ListJobsResult.cc @@ -66,8 +66,12 @@ void ListJobsResult::parse(const std::string &payload) jobObject.className = dataNodeJobsJob["ClassName"].asString(); if(!dataNodeJobsJob["Content"].isNull()) jobObject.content = dataNodeJobsJob["Content"].asString(); + if(!dataNodeJobsJob["JobType"].isNull()) + jobObject.jobType = dataNodeJobsJob["JobType"].asString(); if(!dataNodeJobsJob["AttemptInterval"].isNull()) jobObject.attemptInterval = std::stoi(dataNodeJobsJob["AttemptInterval"].asString()); + if(!dataNodeJobsJob["XAttrs"].isNull()) + jobObject.xAttrs = dataNodeJobsJob["XAttrs"].asString(); auto mapTaskXAttrsNode = value["MapTaskXAttrs"]; if(!mapTaskXAttrsNode["TaskMaxAttempt"].isNull()) jobObject.mapTaskXAttrs.taskMaxAttempt = std::stoi(mapTaskXAttrsNode["TaskMaxAttempt"].asString());