diff --git a/src/main/java/neatlogic/framework/autoexec/constvalue/JobNodeStatus.java b/src/main/java/neatlogic/framework/autoexec/constvalue/JobNodeStatus.java
index 26baea7a1a0e907f446956641931c0e689c6466b..04aed942b2c7876ea2e5e115b06cd89e94e8b34d 100755
--- a/src/main/java/neatlogic/framework/autoexec/constvalue/JobNodeStatus.java
+++ b/src/main/java/neatlogic/framework/autoexec/constvalue/JobNodeStatus.java
@@ -17,6 +17,7 @@ public enum JobNodeStatus implements IEnum {
     SUCCEED("succeed", "已成功"),
     FAILED("failed", "已失败"),
     IGNORED("ignored", "已忽略"),
+    WAITING("waiting", "排队中"),
     WAIT_INPUT("waitInput", "待输入"),
     INVALID("invalid", "非法节点");
     private final String status;
diff --git a/src/main/java/neatlogic/framework/autoexec/constvalue/JobStatus.java b/src/main/java/neatlogic/framework/autoexec/constvalue/JobStatus.java
index 47f798edbf1c827ef35c7549e6311059f406c725..1f1b64a0cd324928ff9395830bd00f550bc61e90 100644
--- a/src/main/java/neatlogic/framework/autoexec/constvalue/JobStatus.java
+++ b/src/main/java/neatlogic/framework/autoexec/constvalue/JobStatus.java
@@ -27,6 +27,7 @@ import java.util.List;
 public enum JobStatus implements IEnum {
     SAVED("saved", "待提交"),
     PENDING("pending", "待运行"),
+    WAITING("waiting", "排队中"),
     RUNNING("running", "运行中"),
     PAUSING("pausing", "暂停中"),
     PAUSED("paused", "已暂停"),
diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java
index 5303d9f6c649fcb5be94022d1d1045f221ba020a..84cecb7adee6c6eec768e667c53e9317df5fa64c 100644
--- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java
+++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.java
@@ -231,6 +231,8 @@ public interface AutoexecJobMapper {
 
     List<RunnerMapVo> getJobPhaseRunnerMapByJobIdAndPhaseIdList(@Param("jobId") Long jobId, @Param("jobPhaseIdList") List<Long> jobPhaseId);
 
+    List<RunnerMapVo> getJobPhaseRunnerMapByJobId(@Param("jobId") Long jobId);
+
     List<RunnerMapVo> getJobPhaseRunnerByJobIdAndPhaseIdListAndStatus(@Param("jobId") Long jobId, @Param("jobPhaseIdList") List<Long> jobPhaseId, @Param("status") String status);
 
     List<RunnerMapVo> getJobRunnerListByJobIdAndGroupId(@Param("jobId") Long jobId, @Param("groupId") Long groupId);
@@ -266,6 +268,8 @@ public interface AutoexecJobMapper {
 
     Integer getJobPhaseStatusCountByJobIdAndStatus(@Param("jobId") Long jobId, @Param("status") String status);
 
+    Integer getJobPhaseRunnerStatusCountByJobIdAndStatus(@Param("jobId") Long jobId, @Param("status") String status);
+
     //inspect
     List<AutoexecJobResourceInspectVo> getJobResourceInspectByResourceId(List<Long> resourceIdList);
 
@@ -301,6 +305,8 @@ public interface AutoexecJobMapper {
 
     AutoexecJobContentReferenceVo getHashUseByOtherCount(@Param("jobId") Long id, @Param("hash") String hash);
 
+    AutoexecJobPhaseVo getJobFirstPhaseByGroupId(Long groupId);
+
     int insertJobInvoke(AutoexecJobInvokeVo invokeVo);
 
     Integer insertJobPhaseRunner(@Param("jobId") Long jobId, @Param("jobGroupId") Long jobGroupId, @Param("jobPhaseId") Long jobPhaseId, @Param("runnerMapId") Long runnerMapId, @Param("lcd") Date lcd);
@@ -339,6 +345,8 @@ public interface AutoexecJobMapper {
 
     Integer updateJobPhaseRunnerStatus(@Param("jobPhaseIdList") List<Long> jobPhaseIdList, @Param("runnerId") Long runnerId, @Param("status") String status);
 
+    Integer updateJobPhaseRunnerStatusByPhaseIdListAndRunnerIdList(@Param("jobPhaseIdList") List<Long> jobPhaseIdList,@Param("runnerIdList")List<Long> runnerIdList, @Param("status") String status);
+
     Integer updateJobPhaseRunnerStatusAndWarnCount(@Param("jobPhaseIdList") List<Long> jobPhaseIdList, @Param("runnerId") Long runnerId, @Param("status") String status, @Param("warnCount") Integer warnCount);
 
     Integer updateJobPhaseRunnerStatusByJobIdAndRunnerIdAndStatus(@Param("jobId") Long jobId, @Param("runnerId") Long runnerId, @Param("status") String status);
diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml
index 4b870344737b20286134a6211e021d34a39f1265..578f49ef32a2fda6a4b93b094d31ae5a69e639b8 100644
--- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml
+++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecJobMapper.xml
@@ -1073,6 +1073,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             </foreach>
         </if>
     </select>
+
+    <select id="getJobPhaseRunnerMapByJobId" resultType="neatlogic.framework.dto.runner.RunnerMapVo">
+        SELECT DISTINCT ar.`id`,
+        ar.`name`,
+        ar.`url`,
+        ar.`host`,
+        ar.`port`,
+        ajpr.runner_map_id as runnerMapId
+        FROM `autoexec_job_phase_runner` ajpr
+        LEFT JOIN `runner_map` arm ON ajpr.`runner_map_id` = arm.`id`
+        LEFT JOIN `runner` ar ON arm.`runner_id` = ar.`id`
+        WHERE ajpr.`job_id` = #{jobId}
+    </select>
     <select id="checkIsHasRunningNode" resultType="java.lang.Integer">
         select count(1)
         from `autoexec_job_phase_node`
@@ -1137,7 +1150,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                `exec_user`  as execUser,
                `exec_mode`  as execMode,
                `name`       as name,
-               `sort`,
+               `sort`
         FROM `autoexec_job_phase`
         where `job_id` = #{jobId}
           and `status` = #{status}
@@ -1514,6 +1527,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         WHERE job_id = #{jobId}
           and `status` = #{status}
     </select>
+
+    <select id="getJobPhaseRunnerStatusCountByJobIdAndStatus" resultType="java.lang.Integer">
+        SELECT COUNT(1)
+        FROM autoexec_job_phase_runner
+        WHERE job_id = #{jobId}
+          and `status` = #{status}
+    </select>
     <select id="getJobPhaseRunnerByJobIdAndPhaseIdListAndStatus"
             resultType="neatlogic.framework.dto.runner.RunnerMapVo">
         SELECT DISTINCT ar.`id`,
@@ -2338,6 +2358,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         FROM `autoexec_job_content` ajc
         WHERE ajc.`hash` = #{hash};
     </select>
+    <select id="getJobFirstPhaseByGroupId"
+            resultType="neatlogic.framework.autoexec.dto.job.AutoexecJobPhaseVo">
+        select * from autoexec_job_phase where group_id = #{value}
+        order by `sort` asc
+        limit 1
+    </select>
 
     <insert id="insertJob" parameterType="neatlogic.framework.autoexec.dto.job.AutoexecJobVo">
         INSERT INTO `autoexec_job` (`id`,
@@ -2878,6 +2904,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </foreach>
         AND `runner_map_id` = #{runnerId}
     </update>
+    <update id="updateJobPhaseRunnerStatusByPhaseIdListAndRunnerIdList">
+        UPDATE
+        `autoexec_job_phase_runner`
+        SET
+        `status` = #{status}
+        <if test="status == 'pending'">
+            , `is_fire_next` = 0
+        </if>
+        WHERE `job_phase_id` in
+        <foreach collection="jobPhaseIdList" item="phaseId" separator="," open="(" close=")">
+            #{phaseId}
+        </foreach>
+        AND `runner_map_id` in
+        <foreach collection="runnerIdList" item="runnerId" separator="," open="(" close=")">
+            #{runnerId}
+        </foreach>
+    </update>
     <update id="updateJobPhaseRunnerStatusAndWarnCount">
         UPDATE
         `autoexec_job_phase_runner`
@@ -2910,10 +2953,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         `autoexec_job_phase_node`
         SET
         `status` = #{status},
-        <if test="status == 'pending'">
+        <if test="status == 'pending' or status == 'waiting'">
             `start_time` = null,
         </if>
-        <if test="status == 'pending'">
+        <if test="status == 'pending' or status == 'waiting'">
             `end_time` = null
         </if>
         WHERE `id` in
diff --git a/src/main/java/neatlogic/framework/autoexec/exception/AutoexecJobGroupNotFoundException.java b/src/main/java/neatlogic/framework/autoexec/exception/AutoexecJobGroupNotFoundException.java
index 9b8ad1982a0f48eaeb73b1f13497533915065035..18ee64809b840c49b5409468a1ade4eca648eec7 100644
--- a/src/main/java/neatlogic/framework/autoexec/exception/AutoexecJobGroupNotFoundException.java
+++ b/src/main/java/neatlogic/framework/autoexec/exception/AutoexecJobGroupNotFoundException.java
@@ -25,5 +25,9 @@ public class AutoexecJobGroupNotFoundException extends ApiRuntimeException {
         super("作业({0}) 组（{1}）不存在", jobId, groupSort);
     }
 
+    public AutoexecJobGroupNotFoundException(Long jobId) {
+        super("作业({0}) 组不存在", jobId);
+    }
+
 
 }
diff --git a/src/main/java/neatlogic/framework/autoexec/job/AutoexecJobPhaseNodeExportHandlerBase.java b/src/main/java/neatlogic/framework/autoexec/job/AutoexecJobPhaseNodeExportHandlerBase.java
index 0109b12aed169067feed38dcbcbe9840c2ddcc58..7127e3a6e5c558bbe59a739a7c5cc071298091f9 100644
--- a/src/main/java/neatlogic/framework/autoexec/job/AutoexecJobPhaseNodeExportHandlerBase.java
+++ b/src/main/java/neatlogic/framework/autoexec/job/AutoexecJobPhaseNodeExportHandlerBase.java
@@ -162,8 +162,6 @@ public abstract class AutoexecJobPhaseNodeExportHandlerBase implements IAutoexec
                 HttpRequestUtil requestUtil = HttpRequestUtil.download(url, "POST", bos)
                         .setPayload(paramJson.toJSONString())
                         .setAuthType(AuthenticateType.BUILDIN)
-                        .setConnectTimeout(5000)
-                        .setReadTimeout(5000)
                         .sendRequest();
                 String error = requestUtil.getError();
                 if (StringUtils.isNotBlank(error)) {
diff --git a/src/main/java/neatlogic/framework/autoexec/util/AutoexecUtil.java b/src/main/java/neatlogic/framework/autoexec/util/AutoexecUtil.java
index 6775a38f134492778a7c01551545fcfe51632d09..16656b75c8212c1e9b59436c7b543e72fb747f30 100644
--- a/src/main/java/neatlogic/framework/autoexec/util/AutoexecUtil.java
+++ b/src/main/java/neatlogic/framework/autoexec/util/AutoexecUtil.java
@@ -24,7 +24,7 @@ public class AutoexecUtil {
      * @return runner response
      */
     public static String requestRunner(String runnerUrl, JSONObject paramJson) {
-        HttpRequestUtil requestUtil = HttpRequestUtil.post(runnerUrl).setPayload(paramJson.toJSONString()).setAuthType(AuthenticateType.BUILDIN).setConnectTimeout(5000).setReadTimeout(5000).sendRequest();
+        HttpRequestUtil requestUtil = HttpRequestUtil.post(runnerUrl).setPayload(paramJson.toJSONString()).setAuthType(AuthenticateType.BUILDIN).sendRequest();
         if (StringUtils.isNotBlank(requestUtil.getErrorMsg())) {
             throw new RunnerHttpRequestException(requestUtil.getErrorMsg());
         }