From 0497f13b89c94b89a5102261c2750a664b007e95 Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Fri, 25 Jul 2025 00:16:27 +0800
Subject: [PATCH] =?UTF-8?q?refactor(devops):=20=E9=87=8D=E6=9E=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 重构了多个类的包结构，提高了代码的可维护性
- 添加了多个新的流水线节点服务类，增加了对Android、Node和NPM构建的支持
- 新增了人工部署审批和APK签名节点的实现
- 优化了现有流水线节点的执行逻辑，提高了执行效率
---
 .../src/api/devops/pipelineInstance.js        |  10 +-
 .../views/components/dev/CutePipelineNode.vue |  19 +-
 .../componentsDemo/CutePipelineNodeDemo.vue   | 953 +++++++++---------
 .../websocket/context/CsWsServer.java         |   2 +-
 .../DevopsPipelineInstanceController.java     |  28 +-
 .../DevopsPipelineTemplateController.java     |   2 +-
 .../dal/dataobject/PipelineTemplateTb.java    |   2 -
 .../DevOpsQueryLastPipelineDetailArgs.java    |   1 -
 .../AbstractPipelineNodeJobService.java       |   4 +-
 .../pipeline/core/PipelineJobBean.java        |   2 +-
 .../pipeline/core/PipelineNodeJobBean.java    |   2 +-
 .../PipelineInstanceNodeDetailService.java    |   2 +-
 .../PipelineInstanceNodeService.java          |   2 +-
 .../{ => core}/PipelineInstanceService.java   |   2 +-
 .../{ => core}/PipelineTemplateService.java   |   2 +-
 ...PipelineInstanceNodeDetailServiceImpl.java |   4 +-
 .../impl/PipelineInstanceNodeServiceImpl.java |   6 +-
 .../impl/PipelineInstanceServiceImpl.java     |   8 +-
 .../PipelineNodeApkSignAndroidService.java    |  44 +
 .../PipelineNodeApproveDeployService.java     |  44 +
 .../PipelineNodeBuildAndroidService.java      |  44 +
 .../PipelineNodeBuildJavaService.java}        |  13 +-
 .../PipelineNodeBuildNodeService.java         |  44 +
 .../pipeline/PipelineNodeBuildNpmService.java |  44 +
 .../PipelineNodeBuildPythonService.java       |  44 +
 .../pipeline/PipelineNodeBuildService.java    |  44 +
 .../PipelineNodeDeployApiService.java         |  46 +
 .../PipelineNodeDeployJavaService.java}       |  18 +-
 .../PipelineNodeDeployNodeService.java        |  44 +
 .../PipelineNodeHttpGetPluginService.java     |  44 +
 ...ineNodeHttpPostPluginStcResultService.java |  44 +
 ...ineNodeHttpPostPluginStcUploadService.java |  44 +
 .../PipelineNodeImageScanService.java         |  44 +
 .../pipeline/PipelineNodeInitService.java}    |  12 +-
 .../PipelineNodeMPassStartAndroidService.java |  44 +
 ...PipelineNodeMPassUploadAndroidService.java |  44 +
 .../PipelineNodeMergeBranchService.java}      |  13 +-
 .../PipelineNodeMergeConfirmService.java      |  44 +
 .../PipelineNodeMergeMasterService.java       |  44 +
 .../PipelineNodeReleaseAndroidService.java    |  44 +
 .../node}/PipelineNodeBuildJavaBiz.java       |   9 +-
 .../pipeline/node/PipelineNodeDemoBiz.java    |  26 +
 .../node}/PipelineNodeDeployJavaBiz.java      |   9 +-
 .../pipeline/node}/PipelineNodeInitBiz.java   |   6 +-
 .../node}/PipelineNodeMergeBranchBiz.java     |   6 +-
 45 files changed, 1413 insertions(+), 544 deletions(-)
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/{ => core}/PipelineInstanceNodeDetailService.java (95%)
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/{ => core}/PipelineInstanceNodeService.java (96%)
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/{ => core}/PipelineInstanceService.java (94%)
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/{ => core}/PipelineTemplateService.java (96%)
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/{ => core}/impl/PipelineInstanceNodeDetailServiceImpl.java (97%)
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/{ => core}/impl/PipelineInstanceNodeServiceImpl.java (97%)
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/{ => core}/impl/PipelineInstanceServiceImpl.java (96%)
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApkSignAndroidService.java
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveDeployService.java
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildAndroidService.java
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/{job/PipelineNodeBuildJavaJob.java => service/pipeline/PipelineNodeBuildJavaService.java} (87%)
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNodeService.java
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNpmService.java
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildPythonService.java
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildService.java
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployApiService.java
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/{job/PipelineNodeDeployJavaJob.java => service/pipeline/PipelineNodeDeployJavaService.java} (85%)
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployNodeService.java
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpGetPluginService.java
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginStcResultService.java
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginStcUploadService.java
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeImageScanService.java
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/{job/PipelineNodeInitJob.java => service/pipeline/PipelineNodeInitService.java} (87%)
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMPassStartAndroidService.java
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMPassUploadAndroidService.java
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/{job/PipelineNodeMergeBranchJob.java => service/pipeline/PipelineNodeMergeBranchService.java} (87%)
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeConfirmService.java
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeMasterService.java
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeReleaseAndroidService.java
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/{job/biz => service/pipeline/node}/PipelineNodeBuildJavaBiz.java (92%)
 create mode 100644 cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDemoBiz.java
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/{job/biz => service/pipeline/node}/PipelineNodeDeployJavaBiz.java (84%)
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/{job/biz => service/pipeline/node}/PipelineNodeInitBiz.java (92%)
 rename cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/{job/biz => service/pipeline/node}/PipelineNodeMergeBranchBiz.java (91%)

diff --git a/cutejava-front/src/api/devops/pipelineInstance.js b/cutejava-front/src/api/devops/pipelineInstance.js
index c0b90cac..c0e2e87b 100644
--- a/cutejava-front/src/api/devops/pipelineInstance.js
+++ b/cutejava-front/src/api/devops/pipelineInstance.js
@@ -1,16 +1,18 @@
 import request from '@/utils/request'
 
-export function startPipeline() {
+export function startPipeline(data) {
   return request({
     url: 'api/devops/pipelineInstance/start',
-    method: 'post'
+    method: 'post',
+    data
   })
 }
 
-export function restartPipeline() {
+export function restartPipeline(data) {
   return request({
     url: 'api/devops/pipelineInstance/restart',
-    method: 'post'
+    method: 'post',
+    data
   })
 }
 
diff --git a/cutejava-front/src/views/components/dev/CutePipelineNode.vue b/cutejava-front/src/views/components/dev/CutePipelineNode.vue
index 972cecb0..af2fe34b 100644
--- a/cutejava-front/src/views/components/dev/CutePipelineNode.vue
+++ b/cutejava-front/src/views/components/dev/CutePipelineNode.vue
@@ -61,10 +61,9 @@
     <el-row>
       <el-col :span="12" style="text-align: left">
         <!-- 流水线状态为fail，且节点支持重试 -->
-        <div
-          v-if="pipelineData.currentNodeStatus && pipelineData.currentNodeStatus === 'fail' && pipelineData.retry === true"
-        >
+        <div v-if="pipelineData.currentNodeStatus && pipelineData.currentNodeStatus === 'fail' && pipelineData.retry === true">
           <div class="box-buttons">
+            {{ '1' }}
             <el-button
               type="text"
               size="medium"
@@ -80,10 +79,9 @@
           </div>
         </div>
         <!-- 流水线状态为success，且有需要满足条件的操作按钮 -->
-        <div
-          v-else-if="pipelineData.currentNodeStatus && pipelineData.currentNodeStatus === statusColorConst.success.code && pipelineData.buttons && pipelineData.buttons.length > 0"
-        >
+        <div v-else-if="pipelineData.currentNodeStatus && pipelineData.currentNodeStatus === statusColorConst.success.code && pipelineData.buttons && pipelineData.buttons.length > 0">
           <div class="box-buttons">
+            {{ '2' }}
             <el-button
               v-for="buttonItem in pipelineData.buttons"
               :key="buttonItem.service"
@@ -102,10 +100,9 @@
           </div>
         </div>
         <!-- 流水线状态非pending，且有操作按钮 -->
-        <div
-          v-else-if="pipelineData.currentNodeStatus && pipelineData.currentNodeStatus !== statusColorConst.pending.code && pipelineData.buttons && pipelineData.buttons.length > 0"
-        >
+        <div v-else-if="pipelineData.currentNodeStatus && pipelineData.currentNodeStatus !== statusColorConst.pending.code && pipelineData.buttons && pipelineData.buttons.length > 0">
           <div class="box-buttons">
+            {{ '3' }}
             <el-button
               v-for="buttonItem in pipelineData.buttons"
               :key="buttonItem.service"
@@ -267,8 +264,8 @@ export default {
 </script>
 <style scoped>
 .box-card {
-  width: 260px; /* 卡片宽度 */
-  max-width: 260px; /* 卡片宽度 */
+  width: 300px; /* 卡片宽度 */
+  max-width: 300px; /* 卡片宽度 */
   padding: 10px;
   background-color: #fff; /* 背景颜色 */
   box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); /* 阴影效果 */
diff --git a/cutejava-front/src/views/componentsDemo/CutePipelineNodeDemo.vue b/cutejava-front/src/views/componentsDemo/CutePipelineNodeDemo.vue
index 2d4e5f15..9571cc8f 100644
--- a/cutejava-front/src/views/componentsDemo/CutePipelineNodeDemo.vue
+++ b/cutejava-front/src/views/componentsDemo/CutePipelineNodeDemo.vue
@@ -1,8 +1,9 @@
 <template>
   <div>
-    <el-divider>演示：动态流水线
+    <el-divider>演示：{{ dynamicTemplate.description ? dynamicTemplate.description: '动态流水线演示' }}
       <el-button
         v-prevent-re-click
+        style="margin-left: 10px"
         type="primary"
         :loading="dynamicStartButtonLoading"
         :disabled="dynamicStartButtonLoading"
@@ -20,46 +21,46 @@
       </div>
       <div v-else class="box-pipeline-content">
         <cute-pipeline-node
-          v-for="(template, index) in dynamicTemplate"
+          v-for="(template, index) in dynamicTemplateList"
           :key="template.code"
-          :template-data.sync="dynamicTemplate[index]"
-        />
-      </div>
-    </div>
-    <el-divider>演示：成功</el-divider>
-    <div class="box-pipeline">
-      <div v-if="dataList2 && dataList2.length > 0" class="box-pipeline-content">
-        <cute-pipeline-node
-          v-for="(template, index) in dataList2"
-          :key="template.code"
-          :template-data.sync="dataList2[index]"
-        />
-      </div>
-      <div v-else class="box-pipeline-content">
-        <cute-pipeline-node
-          v-for="(template, index) in defaultTemplate"
-          :key="template.code"
-          :template-data.sync="defaultTemplate[index]"
-        />
-      </div>
-    </div>
-    <el-divider>演示：失败或重试</el-divider>
-    <div class="box-pipeline">
-      <div v-if="dataList3 && dataList3.length > 0" class="box-pipeline-content">
-        <cute-pipeline-node
-          v-for="(template, index) in dataList3"
-          :key="template.code"
-          :template-data.sync="dataList3[index]"
-        />
-      </div>
-      <div v-else class="box-pipeline-content">
-        <cute-pipeline-node
-          v-for="(template, index) in defaultTemplate"
-          :key="template.code"
-          :template-data.sync="defaultTemplate[index]"
+          :template-data.sync="dynamicTemplateList[index]"
         />
       </div>
     </div>
+    <!--    <el-divider>演示：成功</el-divider>-->
+    <!--    <div class="box-pipeline">-->
+    <!--      <div v-if="dataList2 && dataList2.length > 0" class="box-pipeline-content">-->
+    <!--        <cute-pipeline-node-->
+    <!--          v-for="(template, index) in dataList2"-->
+    <!--          :key="template.code"-->
+    <!--          :template-data.sync="dataList2[index]"-->
+    <!--        />-->
+    <!--      </div>-->
+    <!--      <div v-else class="box-pipeline-content">-->
+    <!--        <cute-pipeline-node-->
+    <!--          v-for="(template, index) in defaultTemplate"-->
+    <!--          :key="template.code"-->
+    <!--          :template-data.sync="defaultTemplate[index]"-->
+    <!--        />-->
+    <!--      </div>-->
+    <!--    </div>-->
+    <!--    <el-divider>演示：失败或重试</el-divider>-->
+    <!--    <div class="box-pipeline">-->
+    <!--      <div v-if="dataList3 && dataList3.length > 0" class="box-pipeline-content">-->
+    <!--        <cute-pipeline-node-->
+    <!--          v-for="(template, index) in dataList3"-->
+    <!--          :key="template.code"-->
+    <!--          :template-data.sync="dataList3[index]"-->
+    <!--        />-->
+    <!--      </div>-->
+    <!--      <div v-else class="box-pipeline-content">-->
+    <!--        <cute-pipeline-node-->
+    <!--          v-for="(template, index) in defaultTemplate"-->
+    <!--          :key="template.code"-->
+    <!--          :template-data.sync="defaultTemplate[index]"-->
+    <!--        />-->
+    <!--      </div>-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -67,8 +68,8 @@
 
 import CutePipelineNode from '@/views/components/dev/CutePipelineNode'
 import { getPipelineTemplate } from '@/api/devops/pipelineTemplate'
-import { queryLastPipelineDetail, queryLastPipelineDetailWs, startPipeline } from '@/api/devops/pipelineInstance'
-import { CountArraysObjectByPropKey, FormatDateTimeStr } from '@/utils/CsUtil'
+import { queryLastPipelineDetailWs, startPipeline } from '@/api/devops/pipelineInstance'
+import { CountArraysObjectByPropKey } from '@/utils/CsUtil'
 import CsMessage from '@/utils/elementui/CsMessage'
 import CsWsClient from '@/utils/CsWsClient'
 import { mapGetters } from 'vuex'
@@ -78,423 +79,431 @@ export default {
   components: { CutePipelineNode },
   data() {
     return {
-      // 静态模板
-      defaultTemplate: [
-        {
-          code: 'node_init',
-          type: 'service',
-          name: '初始化'
-        },
-        {
-          code: 'node_merge_branch',
-          type: 'service',
-          name: '合并代码',
-          click: true,
-          retry: true
-        },
-        {
-          code: 'node_build_java',
-          type: 'service',
-          name: '构建',
-          click: true,
-          retry: true,
-          detailType: 'gitlab',
-          parameters: {
-            pipeline: 'pipeline-backend'
-          }
-        },
-        {
-          code: 'node_image_scan',
-          type: 'service',
-          name: '镜像扫描',
-          click: true,
-          retry: true,
-          detailType: 'gitlab',
-          parameters: {
-            pipeline: 'pipeline-image-scan'
-          }
-        },
-        {
-          code: 'node_approve_deploy',
-          type: 'service',
-          name: '部署审批',
-          click: false,
-          retry: true,
-          buttons: [{
-            type: 'execute',
-            title: '同意',
-            code: 'agree',
-            parameters: {}
-          },
-          {
-            type: 'execute',
-            title: '拒绝',
-            code: 'refuse',
-            parameters: {}
-          }
-          ]
-        },
-        {
-          code: 'node_deploy_java',
-          type: 'service',
-          name: '部署',
-          click: true,
-          retry: false,
-          buttons: [{
-            type: 'link',
-            title: '查看部署详情',
-            code: 'success',
-            parameters: {
-              'isBlank': true
-            }
-          }]
-        },
-        {
-          code: 'node_merge_confirm',
-          type: 'service',
-          name: '合并确认',
-          click: false,
-          retry: false,
-          buttons: [{
-            type: 'execute',
-            title: '通过',
-            code: 'agree',
-            parameters: {}
-          }]
-        },
-        {
-          code: 'node_merge_master',
-          type: 'service',
-          name: '合并回Master',
-          click: false,
-          retry: true
-        }],
-      // 成功
-      dataList2: [
-        {
-          code: 'node_init',
-          type: 'service',
-          name: '初始化',
-          createTime: '2025-07-17 21:12:01',
-          updateTime: '2025-07-17 21:13:01',
-          startTime: '2025-07-17 21:13:01',
-          currentNodeMsg: '执行成功',
-          currentNodeStatus: 'success',
-          status: 'success'
-        },
-        {
-          code: 'node_merge_branch',
-          type: 'service',
-          name: '合并代码',
-          click: true,
-          retry: true,
-          createTime: '2025-07-17 21:13:01',
-          updateTime: '2025-07-17 21:18:01',
-          startTime: '2025-07-17 21:13:01',
-          currentNodeMsg: '执行成功',
-          currentNodeStatus: 'success',
-          status: 'success'
-        },
-        {
-          code: 'node_build_java',
-          type: 'service',
-          name: '构建',
-          click: true,
-          retry: true,
-          detailType: 'gitlab',
-          parameters: {
-            pipeline: 'pipeline-backend'
-          },
-          createTime: '2025-07-17 21:18:01',
-          updateTime: '2025-07-17 21:28:01',
-          startTime: '2025-07-17 21:18:01',
-          currentNodeMsg: '执行成功',
-          currentNodeStatus: 'success',
-          status: 'success'
-        },
-        {
-          code: 'node_image_scan',
-          type: 'service',
-          name: '镜像扫描',
-          click: true,
-          retry: true,
-          detailType: 'gitlab',
-          parameters: {
-            pipeline: 'pipeline-image-scan'
-          },
-          createTime: '2025-07-17 21:28:01',
-          updateTime: '2025-07-17 21:28:21',
-          startTime: '2025-07-17 21:28:01',
-          currentNodeMsg: '执行成功',
-          currentNodeStatus: 'success',
-          status: 'success'
-        },
-        {
-          code: 'node_approve_deploy',
-          type: 'service',
-          name: '部署审批',
-          click: false,
-          retry: true,
-          buttons: [
-            {
-              type: 'execute',
-              title: '同意',
-              code: 'agree',
-              parameters: {}
-            },
-            {
-              type: 'execute',
-              title: '拒绝',
-              code: 'refuse',
-              parameters: {}
-            }
-          ],
-          createTime: '2025-07-17 21:28:21',
-          updateTime: '2025-07-17 21:30:21',
-          startTime: '2025-07-17 21:28:21',
-          currentNodeMsg: '执行成功',
-          currentNodeStatus: 'success',
-          status: 'success'
-        },
-        {
-          code: 'node_deploy_java',
-          type: 'service',
-          name: '部署',
-          click: true,
-          retry: false,
-          buttons: [{
-            type: 'link',
-            title: '查看部署详情',
-            code: 'success',
-            parameters: {
-              'isBlank': true
-            }
-          }],
-          createTime: '2025-07-17 21:28:21',
-          updateTime: '2025-07-17 21:58:21',
-          startTime: '2025-07-17 21:30:21',
-          currentNodeMsg: '执行成功',
-          currentNodeStatus: 'success',
-          status: 'success'
-        },
-        {
-          code: 'node_merge_confirm',
-          type: 'service',
-          name: '合并确认',
-          click: false,
-          retry: false,
-          buttons: [{
-            type: 'execute',
-            title: '通过',
-            code: 'agree',
-            parameters: {}
-          }],
-          createTime: '2025-07-17 21:28:21',
-          updateTime: '2025-07-17 22:10:21',
-          startTime: '2025-07-17 21:58:21',
-          currentNodeMsg: '执行成功',
-          currentNodeStatus: 'success',
-          status: 'success'
-        },
-        {
-          code: 'node_merge_master',
-          type: 'service',
-          name: '合并回Master',
-          click: false,
-          retry: true,
-          createTime: '2025-07-17 21:28:21',
-          updateTime: '2025-07-17 22:10:58',
-          startTime: '2025-07-17 22:10:21',
-          currentNodeMsg: '执行成功',
-          currentNodeStatus: 'success',
-          status: 'success'
-        }
-      ],
-      // 失败或重试
-      dataList3: [
-        {
-          code: 'node_init',
-          type: 'service',
-          name: '初始化',
-          createTime: '2025-07-17 21:12:01',
-          updateTime: '2025-07-17 21:13:01',
-          startTime: '2025-07-17 21:13:01',
-          currentNodeMsg: '执行成功',
-          currentNodeStatus: 'success',
-          status: 'success'
-        },
-        {
-          code: 'node_merge_branch',
-          type: 'service',
-          name: '合并代码',
-          click: true,
-          retry: true,
-          createTime: '2025-07-17 21:13:01',
-          updateTime: '2025-07-17 21:18:01',
-          startTime: '2025-07-17 21:13:01',
-          currentNodeMsg: '执行成功',
-          currentNodeStatus: 'success',
-          status: 'success'
-        },
-        {
-          code: 'node_build_java',
-          type: 'service',
-          name: '构建',
-          click: true,
-          retry: true,
-          detailType: 'gitlab',
-          parameters: {
-            pipeline: 'pipeline-backend'
-          },
-          createTime: '2025-07-17 21:18:01',
-          updateTime: '2025-07-17 21:28:01',
-          startTime: '2025-07-17 21:18:01',
-          currentNodeMsg: '执行失败',
-          currentNodeStatus: 'fail',
-          status: 'fail'
-        },
-        {
-          code: 'node_image_scan',
-          type: 'service',
-          name: '镜像扫描',
-          click: true,
-          retry: true,
-          detailType: 'gitlab',
-          parameters: {
-            pipeline: 'pipeline-image-scan'
-          },
-          createTime: '2025-07-17 21:28:01',
-          updateTime: '2025-07-17 21:28:21',
-          startTime: null,
-          currentNodeMsg: '待执行',
-          currentNodeStatus: 'pending',
-          status: 'pending'
-        },
-        {
-          code: 'node_approve_deploy',
-          type: 'service',
-          name: '部署审批',
-          click: false,
-          retry: true,
-          buttons: [
-            {
-              type: 'execute',
-              title: '同意',
-              code: 'agree',
-              parameters: {}
-            },
-            {
-              type: 'execute',
-              title: '拒绝',
-              code: 'refuse',
-              parameters: {}
-            }
-          ],
-          createTime: '2025-07-17 21:28:21',
-          updateTime: '2025-07-17 21:28:21',
-          startTime: null,
-          currentNodeMsg: '待执行',
-          currentNodeStatus: 'pending',
-          status: 'pending'
-        },
-        {
-          code: 'node_deploy_java',
-          type: 'service',
-          name: '部署',
-          click: true,
-          retry: false,
-          buttons: [{
-            type: 'link',
-            title: '查看部署详情',
-            code: 'success',
-            parameters: {
-              'isBlank': true
-            }
-          }],
-          createTime: '2025-07-17 21:28:21',
-          updateTime: '2025-07-17 21:28:21',
-          startTime: null,
-          currentNodeMsg: '待执行',
-          currentNodeStatus: 'pending',
-          status: 'pending'
-        },
-        {
-          code: 'node_merge_confirm',
-          type: 'service',
-          name: '合并确认',
-          click: false,
-          retry: false,
-          buttons: [{
-            type: 'execute',
-            title: '通过',
-            code: 'agree',
-            parameters: {}
-          }],
-          createTime: '2025-07-17 21:28:21',
-          updateTime: '2025-07-17 21:28:21',
-          startTime: null,
-          currentNodeMsg: '待执行',
-          currentNodeStatus: 'pending',
-          status: 'pending'
-        },
-        {
-          code: 'node_merge_master',
-          type: 'service',
-          name: '合并回Master',
-          click: false,
-          retry: true,
-          createTime: '2025-07-17 21:28:21',
-          updateTime: '2025-07-17 21:28:21',
-          startTime: null,
-          currentNodeMsg: '待执行',
-          currentNodeStatus: 'pending',
-          status: 'pending'
-        }
-      ],
+      // // 静态模板
+      // defaultTemplate: [
+      //   {
+      //     code: 'node_init',
+      //     type: 'service',
+      //     name: '初始化'
+      //   },
+      //   {
+      //     code: 'node_merge_branch',
+      //     type: 'service',
+      //     name: '合并代码',
+      //     click: true,
+      //     retry: true
+      //   },
+      //   {
+      //     code: 'node_build_java',
+      //     type: 'service',
+      //     name: '构建',
+      //     click: true,
+      //     retry: true,
+      //     detailType: 'gitlab',
+      //     parameters: {
+      //       pipeline: 'pipeline-backend'
+      //     }
+      //   },
+      //   {
+      //     code: 'node_image_scan',
+      //     type: 'service',
+      //     name: '镜像扫描',
+      //     click: true,
+      //     retry: true,
+      //     detailType: 'gitlab',
+      //     parameters: {
+      //       pipeline: 'pipeline-image-scan'
+      //     }
+      //   },
+      //   {
+      //     code: 'node_approve_deploy',
+      //     type: 'service',
+      //     name: '部署审批',
+      //     click: false,
+      //     retry: true,
+      //     buttons: [{
+      //       type: 'execute',
+      //       title: '同意',
+      //       code: 'agree',
+      //       parameters: {}
+      //     },
+      //     {
+      //       type: 'execute',
+      //       title: '拒绝',
+      //       code: 'refuse',
+      //       parameters: {}
+      //     }
+      //     ]
+      //   },
+      //   {
+      //     code: 'node_deploy_java',
+      //     type: 'service',
+      //     name: '部署',
+      //     click: true,
+      //     retry: false,
+      //     buttons: [{
+      //       type: 'link',
+      //       title: '查看部署详情',
+      //       code: 'success',
+      //       parameters: {
+      //         'isBlank': true
+      //       }
+      //     }]
+      //   },
+      //   {
+      //     code: 'node_merge_confirm',
+      //     type: 'service',
+      //     name: '合并确认',
+      //     click: false,
+      //     retry: false,
+      //     buttons: [{
+      //       type: 'execute',
+      //       title: '通过',
+      //       code: 'agree',
+      //       parameters: {}
+      //     }]
+      //   },
+      //   {
+      //     code: 'node_merge_master',
+      //     type: 'service',
+      //     name: '合并回Master',
+      //     click: false,
+      //     retry: true
+      //   }],
+      // // 成功
+      // dataList2: [
+      //   {
+      //     code: 'node_init',
+      //     type: 'service',
+      //     name: '初始化',
+      //     createTime: '2025-07-17 21:12:01',
+      //     updateTime: '2025-07-17 21:13:01',
+      //     startTime: '2025-07-17 21:13:01',
+      //     currentNodeMsg: '执行成功',
+      //     currentNodeStatus: 'success',
+      //     status: 'success'
+      //   },
+      //   {
+      //     code: 'node_merge_branch',
+      //     type: 'service',
+      //     name: '合并代码',
+      //     click: true,
+      //     retry: true,
+      //     createTime: '2025-07-17 21:13:01',
+      //     updateTime: '2025-07-17 21:18:01',
+      //     startTime: '2025-07-17 21:13:01',
+      //     currentNodeMsg: '执行成功',
+      //     currentNodeStatus: 'success',
+      //     status: 'success'
+      //   },
+      //   {
+      //     code: 'node_build_java',
+      //     type: 'service',
+      //     name: '构建',
+      //     click: true,
+      //     retry: true,
+      //     detailType: 'gitlab',
+      //     parameters: {
+      //       pipeline: 'pipeline-backend'
+      //     },
+      //     createTime: '2025-07-17 21:18:01',
+      //     updateTime: '2025-07-17 21:28:01',
+      //     startTime: '2025-07-17 21:18:01',
+      //     currentNodeMsg: '执行成功',
+      //     currentNodeStatus: 'success',
+      //     status: 'success'
+      //   },
+      //   {
+      //     code: 'node_image_scan',
+      //     type: 'service',
+      //     name: '镜像扫描',
+      //     click: true,
+      //     retry: true,
+      //     detailType: 'gitlab',
+      //     parameters: {
+      //       pipeline: 'pipeline-image-scan'
+      //     },
+      //     createTime: '2025-07-17 21:28:01',
+      //     updateTime: '2025-07-17 21:28:21',
+      //     startTime: '2025-07-17 21:28:01',
+      //     currentNodeMsg: '执行成功',
+      //     currentNodeStatus: 'success',
+      //     status: 'success'
+      //   },
+      //   {
+      //     code: 'node_approve_deploy',
+      //     type: 'service',
+      //     name: '部署审批',
+      //     click: false,
+      //     retry: true,
+      //     buttons: [
+      //       {
+      //         type: 'execute',
+      //         title: '同意',
+      //         code: 'agree',
+      //         parameters: {}
+      //       },
+      //       {
+      //         type: 'execute',
+      //         title: '拒绝',
+      //         code: 'refuse',
+      //         parameters: {}
+      //       }
+      //     ],
+      //     createTime: '2025-07-17 21:28:21',
+      //     updateTime: '2025-07-17 21:30:21',
+      //     startTime: '2025-07-17 21:28:21',
+      //     currentNodeMsg: '执行成功',
+      //     currentNodeStatus: 'success',
+      //     status: 'success'
+      //   },
+      //   {
+      //     code: 'node_deploy_java',
+      //     type: 'service',
+      //     name: '部署',
+      //     click: true,
+      //     retry: false,
+      //     buttons: [{
+      //       type: 'link',
+      //       title: '查看部署详情',
+      //       code: 'success',
+      //       parameters: {
+      //         'isBlank': true
+      //       }
+      //     }],
+      //     createTime: '2025-07-17 21:28:21',
+      //     updateTime: '2025-07-17 21:58:21',
+      //     startTime: '2025-07-17 21:30:21',
+      //     currentNodeMsg: '执行成功',
+      //     currentNodeStatus: 'success',
+      //     status: 'success'
+      //   },
+      //   {
+      //     code: 'node_merge_confirm',
+      //     type: 'service',
+      //     name: '合并确认',
+      //     click: false,
+      //     retry: false,
+      //     buttons: [{
+      //       type: 'execute',
+      //       title: '通过',
+      //       code: 'agree',
+      //       parameters: {}
+      //     }],
+      //     createTime: '2025-07-17 21:28:21',
+      //     updateTime: '2025-07-17 22:10:21',
+      //     startTime: '2025-07-17 21:58:21',
+      //     currentNodeMsg: '执行成功',
+      //     currentNodeStatus: 'success',
+      //     status: 'success'
+      //   },
+      //   {
+      //     code: 'node_merge_master',
+      //     type: 'service',
+      //     name: '合并回Master',
+      //     click: false,
+      //     retry: true,
+      //     createTime: '2025-07-17 21:28:21',
+      //     updateTime: '2025-07-17 22:10:58',
+      //     startTime: '2025-07-17 22:10:21',
+      //     currentNodeMsg: '执行成功',
+      //     currentNodeStatus: 'success',
+      //     status: 'success'
+      //   }
+      // ],
+      // // 失败或重试
+      // dataList3: [
+      //   {
+      //     code: 'node_init',
+      //     type: 'service',
+      //     name: '初始化',
+      //     createTime: '2025-07-17 21:12:01',
+      //     updateTime: '2025-07-17 21:13:01',
+      //     startTime: '2025-07-17 21:13:01',
+      //     currentNodeMsg: '执行成功',
+      //     currentNodeStatus: 'success',
+      //     status: 'success'
+      //   },
+      //   {
+      //     code: 'node_merge_branch',
+      //     type: 'service',
+      //     name: '合并代码',
+      //     click: true,
+      //     retry: true,
+      //     createTime: '2025-07-17 21:13:01',
+      //     updateTime: '2025-07-17 21:18:01',
+      //     startTime: '2025-07-17 21:13:01',
+      //     currentNodeMsg: '执行成功',
+      //     currentNodeStatus: 'success',
+      //     status: 'success'
+      //   },
+      //   {
+      //     code: 'node_build_java',
+      //     type: 'service',
+      //     name: '构建',
+      //     click: true,
+      //     retry: true,
+      //     detailType: 'gitlab',
+      //     parameters: {
+      //       pipeline: 'pipeline-backend'
+      //     },
+      //     createTime: '2025-07-17 21:18:01',
+      //     updateTime: '2025-07-17 21:28:01',
+      //     startTime: '2025-07-17 21:18:01',
+      //     currentNodeMsg: '执行失败',
+      //     currentNodeStatus: 'fail',
+      //     status: 'fail'
+      //   },
+      //   {
+      //     code: 'node_image_scan',
+      //     type: 'service',
+      //     name: '镜像扫描',
+      //     click: true,
+      //     retry: true,
+      //     detailType: 'gitlab',
+      //     parameters: {
+      //       pipeline: 'pipeline-image-scan'
+      //     },
+      //     createTime: '2025-07-17 21:28:01',
+      //     updateTime: '2025-07-17 21:28:21',
+      //     startTime: null,
+      //     currentNodeMsg: '待执行',
+      //     currentNodeStatus: 'pending',
+      //     status: 'pending'
+      //   },
+      //   {
+      //     code: 'node_approve_deploy',
+      //     type: 'service',
+      //     name: '部署审批',
+      //     click: false,
+      //     retry: true,
+      //     buttons: [
+      //       {
+      //         type: 'execute',
+      //         title: '同意',
+      //         code: 'agree',
+      //         parameters: {}
+      //       },
+      //       {
+      //         type: 'execute',
+      //         title: '拒绝',
+      //         code: 'refuse',
+      //         parameters: {}
+      //       }
+      //     ],
+      //     createTime: '2025-07-17 21:28:21',
+      //     updateTime: '2025-07-17 21:28:21',
+      //     startTime: null,
+      //     currentNodeMsg: '待执行',
+      //     currentNodeStatus: 'pending',
+      //     status: 'pending'
+      //   },
+      //   {
+      //     code: 'node_deploy_java',
+      //     type: 'service',
+      //     name: '部署',
+      //     click: true,
+      //     retry: false,
+      //     buttons: [{
+      //       type: 'link',
+      //       title: '查看部署详情',
+      //       code: 'success',
+      //       parameters: {
+      //         'isBlank': true
+      //       }
+      //     }],
+      //     createTime: '2025-07-17 21:28:21',
+      //     updateTime: '2025-07-17 21:28:21',
+      //     startTime: null,
+      //     currentNodeMsg: '待执行',
+      //     currentNodeStatus: 'pending',
+      //     status: 'pending'
+      //   },
+      //   {
+      //     code: 'node_merge_confirm',
+      //     type: 'service',
+      //     name: '合并确认',
+      //     click: false,
+      //     retry: false,
+      //     buttons: [{
+      //       type: 'execute',
+      //       title: '通过',
+      //       code: 'agree',
+      //       parameters: {}
+      //     }],
+      //     createTime: '2025-07-17 21:28:21',
+      //     updateTime: '2025-07-17 21:28:21',
+      //     startTime: null,
+      //     currentNodeMsg: '待执行',
+      //     currentNodeStatus: 'pending',
+      //     status: 'pending'
+      //   },
+      //   {
+      //     code: 'node_merge_master',
+      //     type: 'service',
+      //     name: '合并回Master',
+      //     click: false,
+      //     retry: true,
+      //     createTime: '2025-07-17 21:28:21',
+      //     updateTime: '2025-07-17 21:28:21',
+      //     startTime: null,
+      //     currentNodeMsg: '待执行',
+      //     currentNodeStatus: 'pending',
+      //     status: 'pending'
+      //   }
+      // ],
       // 动态流水线
-      dynamicStartupStatus: 'start',
       dynamicStartupStatusMap: {
         start: { label: '启动', code: 'start' },
         restart: { label: '重新启动', code: 'restart' }
       },
+      // 按钮状态
+      dynamicStartupStatus: 'start',
       dynamicStartButtonLoading: false,
-      dynamicTemplate: [],
-      dynamicHook: null,
+      // 当前模板
+      dynamicTemplate: {
+        id: 6
+      },
+      // 当前流水线节点模板
+      dynamicTemplateList: [],
+      // dynamicHook: null,
+      // 当前流水线实例
       dynamicInstance: {},
+      // 当前ws客户端
       dynamicWsClient: null
     }
   },
-  mounted() {
-    this.refreshData()
-    this.initPipelineTemplate(4)
-    // const pipelineInstanceId = sessionStorage.getItem('pipelineInstanceId')
-    // if (pipelineInstanceId) {
-    //   this.fetchLastDetail(pipelineInstanceId)
-    // }
-    // this.connectWebSocketServer(pipelineInstanceId)
-  },
   computed: {
     ...mapGetters([
       'user'
     ])
   },
+  mounted() {
+    // this.refreshData()
+    this.initPipelineTemplate(this.dynamicTemplate.id)
+    // const pipelineInstanceId = sessionStorage.getItem('pipelineInstanceId')
+    // if (pipelineInstanceId) {
+    //   this.fetchLastDetail(pipelineInstanceId)
+    // }
+    // this.connectWebSocketServer(pipelineInstanceId)
+  },
   methods: {
-    refreshData() {
-      // 成功
-      for (const datum of this.dataList2) {
-        if (datum.status === 'running') {
-          datum.updateTime = FormatDateTimeStr(new Date())
-        }
-      }
-      this.dataList2 = [...this.dataList2]
-      // 失败或重试
-      for (const datum of this.dataList3) {
-        if (datum.status === 'running') {
-          datum.updateTime = FormatDateTimeStr(new Date())
-        }
-      }
-      this.dataList3 = [...this.dataList3]
-    },
+    // refreshData() {
+    //   // 成功
+    //   for (const datum of this.dataList2) {
+    //     if (datum.status === 'running') {
+    //       datum.updateTime = FormatDateTimeStr(new Date())
+    //     }
+    //   }
+    //   this.dataList2 = [...this.dataList2]
+    //   // 失败或重试
+    //   for (const datum of this.dataList3) {
+    //     if (datum.status === 'running') {
+    //       datum.updateTime = FormatDateTimeStr(new Date())
+    //     }
+    //   }
+    //   this.dataList3 = [...this.dataList3]
+    // },
     /**
      * 初始化流水线模板
      * @param templateId
@@ -504,7 +513,8 @@ export default {
       const pipelineTemplate = await getPipelineTemplate(templateId)
       if (pipelineTemplate && pipelineTemplate.template) {
         try {
-          this.dynamicTemplate = JSON.parse(pipelineTemplate.template)
+          this.dynamicTemplate = pipelineTemplate
+          this.dynamicTemplateList = JSON.parse(pipelineTemplate.template)
         } catch (e) {
           // ignore
         }
@@ -539,7 +549,7 @@ export default {
         that.dynamicInstance = JSON.parse(callbackData.data)
         // 判断流水线是否结束
         const successCount = CountArraysObjectByPropKey(that.dynamicInstance.nodes, 'status', 'success')
-        if (that.dynamicTemplate && that.dynamicTemplate.length === successCount) {
+        if (that.dynamicTemplateList && that.dynamicTemplateList.length === successCount) {
           // 所有节点执行成功
           if (that.dynamicWsClient) {
             that.dynamicWsClient.close()
@@ -557,38 +567,41 @@ export default {
         // ignore
       }
     },
-    /**
-     * 通过Http的方式拉取流水线最新的状态
-     * @param instanceId
-     * @returns {Promise<void>}
-     */
-    async fetchLastDetail(instanceId) {
-      const that = this
-      const intervalTime = 2000
-      setTimeout(() => {
-        that.dynamicHook = setInterval(() => {
-          queryLastPipelineDetail(instanceId).then((data) => {
-            that.dynamicInstance = data
-            // 判断流水线是否结束
-            const successCount = CountArraysObjectByPropKey(data.nodes, 'status', 'success')
-            if (that.dynamicTemplate && that.dynamicTemplate.length === successCount) {
-              clearInterval(that.dynamicHook)
-              that.dynamicHook = null
-              that.dynamicStartupStatus = that.dynamicStartupStatusMap.start.code
-            } else {
-              that.dynamicStartupStatus = that.dynamicStartupStatusMap.restart.code
-            }
-          })
-        }, intervalTime)
-        that.dynamicStartButtonLoading = false
-      }, 2000)
-    },
+    // /**
+    //  * 通过Http的方式拉取流水线最新的状态
+    //  * @param instanceId
+    //  * @returns {Promise<void>}
+    //  */
+    // async fetchLastDetail(instanceId) {
+    //   const that = this
+    //   const intervalTime = 2000
+    //   setTimeout(() => {
+    //     that.dynamicHook = setInterval(() => {
+    //       queryLastPipelineDetail(instanceId).then((data) => {
+    //         that.dynamicInstance = data
+    //         // 判断流水线是否结束
+    //         const successCount = CountArraysObjectByPropKey(data.nodes, 'status', 'success')
+    //         if (that.dynamicTemplateList && that.dynamicTemplateList.length === successCount) {
+    //           clearInterval(that.dynamicHook)
+    //           that.dynamicHook = null
+    //           that.dynamicStartupStatus = that.dynamicStartupStatusMap.start.code
+    //         } else {
+    //           that.dynamicStartupStatus = that.dynamicStartupStatusMap.restart.code
+    //         }
+    //       })
+    //     }, intervalTime)
+    //     that.dynamicStartButtonLoading = false
+    //   }, 2000)
+    // },
     /**
      * 启动流水线
      * @returns {Promise<void>}
      */
-    async startPipelineTest() {
+    async startPipelineTest(data) {
       const that = this
+      const args = {
+        id: that.dynamicTemplate.id
+      }
       try {
         if (that.dynamicHook) {
           clearInterval(that.dynamicHook)
@@ -603,7 +616,7 @@ export default {
         //   result = await startPipeline()
         //   CsMessage.Success('流水线启动成功')
         // }
-        const result = await startPipeline()
+        const result = await startPipeline(args)
         CsMessage.Success('流水线启动成功')
         // await that.fetchLastDetail(result.instanceId)
         sessionStorage.setItem('pipelineInstanceId', result.instanceId)
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWsServer.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWsServer.java
index 8dd39fec..6e2c3285 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWsServer.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWsServer.java
@@ -87,7 +87,7 @@ public class CsWsServer {
      */
     public void sendMessage(CsWsMessage message, @PathParam("sid") String sid) throws IOException {
         String body = JSON.toJSONString(message);
-        log.info("推送消息到{}, 推送内容:{}", sid, message);
+//        log.info("推送消息到{}, 推送内容:{}", sid, message);
         try {
             if (sid == null) {
                 sendToAll(body);
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/controller/DevopsPipelineInstanceController.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/controller/DevopsPipelineInstanceController.java
index aa41d89b..b8aae548 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/controller/DevopsPipelineInstanceController.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/controller/DevopsPipelineInstanceController.java
@@ -3,8 +3,8 @@ package cn.odboy.devops.controller;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceTb;
 import cn.odboy.devops.dal.dataobject.PipelineTemplateTb;
 import cn.odboy.devops.dal.model.DevOpsQueryLastPipelineDetailArgs;
-import cn.odboy.devops.service.PipelineInstanceService;
-import cn.odboy.devops.service.PipelineTemplateService;
+import cn.odboy.devops.service.core.PipelineInstanceService;
+import cn.odboy.devops.service.core.PipelineTemplateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -29,15 +29,18 @@ public class DevopsPipelineInstanceController {
     @Autowired
     private PipelineInstanceService pipelineInstanceService;
 
+    /**
+     * 已验证流程
+     */
     @ApiOperation("启动流水线")
     @PostMapping(value = "/start")
     @PreAuthorize("@el.check()")
-    public ResponseEntity<?> startPipeline() {
+    public ResponseEntity<?> startPipeline(@RequestBody PipelineTemplateTb args) {
         // 输入参数
         String appName = "cuteops";
         String envCode = "daily";
         // 获取模板
-        PipelineTemplateTb pipelineTemplateTb = pipelineTemplateService.getPipelineTemplateById(4L);
+        PipelineTemplateTb pipelineTemplateTb = pipelineTemplateService.getPipelineTemplateById(args.getId());
         // 创建流水线实例
         PipelineInstanceTb pipelineInstanceTb = new PipelineInstanceTb();
         pipelineInstanceTb.setTemplateId(pipelineTemplateTb.getId());
@@ -49,13 +52,26 @@ public class DevopsPipelineInstanceController {
         return ResponseEntity.ok(pipelineInstanceService.startPipeline(pipelineInstanceTb));
     }
 
+    /**
+     * TODO 待实现
+     */
     @ApiOperation("重启流水线")
     @PostMapping(value = "/restart")
     @PreAuthorize("@el.check()")
-    public ResponseEntity<?> restartPipeline() {
+    public ResponseEntity<?> restartPipeline(@RequestBody PipelineTemplateTb args) {
+        return ResponseEntity.ok("功能开发中");
+    }
+
+    /**
+     * 已验证流程
+     */
+    @ApiOperation("流水线节点重试")
+    @PostMapping(value = "/retry")
+    @PreAuthorize("@el.check()")
+    public ResponseEntity<?> retryPipelineNode(@RequestBody PipelineTemplateTb args) {
         String appName = "cuteops";
         String envCode = "daily";
-        PipelineTemplateTb pipelineTemplateTb = pipelineTemplateService.getPipelineTemplateById(4L);
+        PipelineTemplateTb pipelineTemplateTb = pipelineTemplateService.getPipelineTemplateById(args.getId());
         PipelineInstanceTb pipelineInstanceTb = new PipelineInstanceTb();
         pipelineInstanceTb.setTemplateId(pipelineTemplateTb.getId());
         pipelineInstanceTb.setInstanceName("流水线测试");
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/controller/DevopsPipelineTemplateController.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/controller/DevopsPipelineTemplateController.java
index 6e85a30c..fb50ba49 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/controller/DevopsPipelineTemplateController.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/controller/DevopsPipelineTemplateController.java
@@ -1,7 +1,7 @@
 package cn.odboy.devops.controller;
 
 import cn.odboy.base.CsArgs;
-import cn.odboy.devops.service.PipelineTemplateService;
+import cn.odboy.devops.service.core.PipelineTemplateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/PipelineTemplateTb.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/PipelineTemplateTb.java
index fe3560bd..ddb70c17 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/PipelineTemplateTb.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/dataobject/PipelineTemplateTb.java
@@ -1,12 +1,10 @@
 package cn.odboy.devops.dal.dataobject;
 
 import cn.odboy.base.CsBaseUserTimeLogicTb;
-import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/model/DevOpsQueryLastPipelineDetailArgs.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/model/DevOpsQueryLastPipelineDetailArgs.java
index 03d728f6..9f6618d0 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/model/DevOpsQueryLastPipelineDetailArgs.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/dal/model/DevOpsQueryLastPipelineDetailArgs.java
@@ -5,7 +5,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 @Getter
 @Setter
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/AbstractPipelineNodeJobService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/AbstractPipelineNodeJobService.java
index 6b7597bd..2c97b249 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/AbstractPipelineNodeJobService.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/AbstractPipelineNodeJobService.java
@@ -2,8 +2,8 @@ package cn.odboy.devops.framework.pipeline;
 
 import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
-import cn.odboy.devops.service.PipelineInstanceNodeDetailService;
-import cn.odboy.devops.service.PipelineInstanceNodeService;
+import cn.odboy.devops.service.core.PipelineInstanceNodeDetailService;
+import cn.odboy.devops.service.core.PipelineInstanceNodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Date;
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobBean.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobBean.java
index d3c50ae7..c2c71d39 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobBean.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineJobBean.java
@@ -9,7 +9,7 @@ import cn.odboy.devops.dal.dataobject.PipelineInstanceTb;
 import cn.odboy.devops.dal.mysql.PipelineInstanceMapper;
 import cn.odboy.devops.dal.redis.PipelineInstanceDAO;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
-import cn.odboy.devops.service.PipelineInstanceNodeService;
+import cn.odboy.devops.service.core.PipelineInstanceNodeService;
 import cn.odboy.framework.context.SpringBeanHolder;
 import cn.odboy.framework.exception.BadRequestException;
 import com.alibaba.fastjson2.JSON;
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobBean.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobBean.java
index 1bff805f..5559ccaf 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobBean.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/framework/pipeline/core/PipelineNodeJobBean.java
@@ -4,7 +4,7 @@ import cn.odboy.devops.constant.pipeline.PipelineConst;
 import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
-import cn.odboy.devops.service.PipelineInstanceNodeService;
+import cn.odboy.devops.service.core.PipelineInstanceNodeService;
 import cn.odboy.framework.context.SpringBeanHolder;
 import cn.odboy.framework.exception.BadRequestException;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/PipelineInstanceNodeDetailService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeDetailService.java
similarity index 95%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/PipelineInstanceNodeDetailService.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeDetailService.java
index 31e6e633..db9167db 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/PipelineInstanceNodeDetailService.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeDetailService.java
@@ -1,4 +1,4 @@
-package cn.odboy.devops.service;
+package cn.odboy.devops.service.core;
 
 import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeDetailTb;
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/PipelineInstanceNodeService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeService.java
similarity index 96%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/PipelineInstanceNodeService.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeService.java
index 433eec28..02a46998 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/PipelineInstanceNodeService.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/PipelineInstanceNodeService.java
@@ -1,4 +1,4 @@
-package cn.odboy.devops.service;
+package cn.odboy.devops.service.core;
 
 import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/PipelineInstanceService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/PipelineInstanceService.java
similarity index 94%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/PipelineInstanceService.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/PipelineInstanceService.java
index b3fc05ea..d64f3a1f 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/PipelineInstanceService.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/PipelineInstanceService.java
@@ -1,4 +1,4 @@
-package cn.odboy.devops.service;
+package cn.odboy.devops.service.core;
 
 import cn.odboy.devops.dal.dataobject.PipelineInstanceTb;
 import cn.odboy.devops.dal.model.StartPipelineResultVo;
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/PipelineTemplateService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/PipelineTemplateService.java
similarity index 96%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/PipelineTemplateService.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/PipelineTemplateService.java
index b943d854..5b66fb4a 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/PipelineTemplateService.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/PipelineTemplateService.java
@@ -1,4 +1,4 @@
-package cn.odboy.devops.service;
+package cn.odboy.devops.service.core;
 
 import cn.odboy.devops.dal.dataobject.PipelineTemplateTb;
 import cn.odboy.devops.dal.mysql.PipelineTemplateMapper;
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/impl/PipelineInstanceNodeDetailServiceImpl.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeDetailServiceImpl.java
similarity index 97%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/impl/PipelineInstanceNodeDetailServiceImpl.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeDetailServiceImpl.java
index 15ce4bf2..2382970f 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/impl/PipelineInstanceNodeDetailServiceImpl.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeDetailServiceImpl.java
@@ -1,10 +1,10 @@
-package cn.odboy.devops.service.impl;
+package cn.odboy.devops.service.core.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeDetailTb;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
-import cn.odboy.devops.service.PipelineInstanceNodeDetailService;
+import cn.odboy.devops.service.core.PipelineInstanceNodeDetailService;
 import com.anwen.mongo.conditions.query.LambdaQueryChainWrapper;
 import com.anwen.mongo.conditions.update.LambdaUpdateChainWrapper;
 import com.anwen.mongo.service.impl.ServiceImpl;
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/impl/PipelineInstanceNodeServiceImpl.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java
similarity index 97%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/impl/PipelineInstanceNodeServiceImpl.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java
index 4f570094..e700e96d 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/impl/PipelineInstanceNodeServiceImpl.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceNodeServiceImpl.java
@@ -1,12 +1,12 @@
-package cn.odboy.devops.service.impl;
+package cn.odboy.devops.service.core.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.odboy.devops.constant.pipeline.PipelineStatusEnum;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceTb;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
-import cn.odboy.devops.service.PipelineInstanceNodeDetailService;
-import cn.odboy.devops.service.PipelineInstanceNodeService;
+import cn.odboy.devops.service.core.PipelineInstanceNodeDetailService;
+import cn.odboy.devops.service.core.PipelineInstanceNodeService;
 import com.alibaba.fastjson2.JSON;
 import com.anwen.mongo.conditions.query.LambdaQueryChainWrapper;
 import com.anwen.mongo.service.impl.ServiceImpl;
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/impl/PipelineInstanceServiceImpl.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceServiceImpl.java
similarity index 96%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/impl/PipelineInstanceServiceImpl.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceServiceImpl.java
index edff2833..eb74abc6 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/impl/PipelineInstanceServiceImpl.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/core/impl/PipelineInstanceServiceImpl.java
@@ -1,4 +1,4 @@
-package cn.odboy.devops.service.impl;
+package cn.odboy.devops.service.core.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.thread.ThreadUtil;
@@ -13,9 +13,9 @@ import cn.odboy.devops.dal.redis.PipelineInstanceDAO;
 import cn.odboy.devops.framework.pipeline.core.PipelineJobManage;
 import cn.odboy.devops.framework.pipeline.model.PipelineInstanceVo;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeDataVo;
-import cn.odboy.devops.service.PipelineInstanceNodeDetailService;
-import cn.odboy.devops.service.PipelineInstanceNodeService;
-import cn.odboy.devops.service.PipelineInstanceService;
+import cn.odboy.devops.service.core.PipelineInstanceNodeDetailService;
+import cn.odboy.devops.service.core.PipelineInstanceNodeService;
+import cn.odboy.devops.service.core.PipelineInstanceService;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.websocket.context.CsWsClientManager;
 import cn.odboy.framework.websocket.context.CsWsMessage;
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApkSignAndroidService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApkSignAndroidService.java
new file mode 100644
index 00000000..2ed3b216
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApkSignAndroidService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：安卓包签名
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_apk_sign_android")
+public class PipelineNodeApkSignAndroidService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveDeployService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveDeployService.java
new file mode 100644
index 00000000..c1463ebb
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeApproveDeployService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：人工部署审批
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_approve_deploy")
+public class PipelineNodeApproveDeployService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildAndroidService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildAndroidService.java
new file mode 100644
index 00000000..86f36d29
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildAndroidService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：Android构建
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_build_android")
+public class PipelineNodeBuildAndroidService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeBuildJavaJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildJavaService.java
similarity index 87%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeBuildJavaJob.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildJavaService.java
index 1ccc38c4..f67c2ed9 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeBuildJavaJob.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildJavaService.java
@@ -1,4 +1,4 @@
-package cn.odboy.devops.job;
+package cn.odboy.devops.service.pipeline;
 
 import cn.odboy.devops.constant.pipeline.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
@@ -6,8 +6,7 @@ import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
-import cn.odboy.devops.job.biz.PipelineNodeBuildJavaBiz;
-import cn.odboy.devops.job.biz.PipelineNodeInitBiz;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeBuildJavaBiz;
 import cn.odboy.framework.exception.BadRequestException;
 import com.alibaba.fastjson2.JSON;
 import lombok.RequiredArgsConstructor;
@@ -16,9 +15,15 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+/**
+ * 流水线节点任务：Java构建
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
 @RequiredArgsConstructor
 @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_build_java")
-public class PipelineNodeBuildJavaJob extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+public class PipelineNodeBuildJavaService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
     private final PipelineNodeBuildJavaBiz pipelineNodeBuildJavaBiz;
 
     @Override
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNodeService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNodeService.java
new file mode 100644
index 00000000..c84c639b
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNodeService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：Node构建
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_build_node")
+public class PipelineNodeBuildNodeService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNpmService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNpmService.java
new file mode 100644
index 00000000..9c82dd1f
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildNpmService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：Npm构建
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_build_npm")
+public class PipelineNodeBuildNpmService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildPythonService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildPythonService.java
new file mode 100644
index 00000000..93b69ddf
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildPythonService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：Python构建
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_build_python")
+public class PipelineNodeBuildPythonService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildService.java
new file mode 100644
index 00000000..47842a48
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeBuildService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：构建
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_build")
+public class PipelineNodeBuildService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployApiService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployApiService.java
new file mode 100644
index 00000000..4994c6dc
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployApiService.java
@@ -0,0 +1,46 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.devops.service.core.PipelineTemplateService;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：前端部署
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_deploy_api")
+public class PipelineNodeDeployApiService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+    private final PipelineTemplateService pipelineTemplateService;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeDeployJavaJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployJavaService.java
similarity index 85%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeDeployJavaJob.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployJavaService.java
index fe4b4b8f..de8e2237 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeDeployJavaJob.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployJavaService.java
@@ -1,4 +1,4 @@
-package cn.odboy.devops.job;
+package cn.odboy.devops.service.pipeline;
 
 import cn.odboy.devops.constant.pipeline.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
@@ -7,9 +7,8 @@ import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
-import cn.odboy.devops.job.biz.PipelineNodeBuildJavaBiz;
-import cn.odboy.devops.job.biz.PipelineNodeDeployJavaBiz;
-import cn.odboy.devops.service.PipelineTemplateService;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDeployJavaBiz;
+import cn.odboy.devops.service.core.PipelineTemplateService;
 import cn.odboy.framework.exception.BadRequestException;
 import com.alibaba.fastjson2.JSON;
 import lombok.RequiredArgsConstructor;
@@ -18,9 +17,15 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+/**
+ * 流水线节点任务：Java部署
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
 @RequiredArgsConstructor
 @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_deploy_java")
-public class PipelineNodeDeployJavaJob extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+public class PipelineNodeDeployJavaService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
     private final PipelineNodeDeployJavaBiz pipelineNodeDeployJavaBiz;
     private final PipelineTemplateService pipelineTemplateService;
 
@@ -30,7 +35,6 @@ public class PipelineNodeDeployJavaJob extends AbstractPipelineNodeJobService im
         long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
         long templateId = jobDataMap.getLong(PipelineConst.TEMPLATE_ID);
         PipelineTemplateTb pipelineTemplate = pipelineTemplateService.getPipelineTemplateById(templateId);
-        String templateType = pipelineTemplate.getType();
         PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
         PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
         String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
@@ -39,7 +43,7 @@ public class PipelineNodeDeployJavaJob extends AbstractPipelineNodeJobService im
         PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
         // 步骤执行
         pipelineNodeDeployJavaBiz.deployStart(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
-        pipelineNodeDeployJavaBiz.deployJavaByWithContextName(pipelineInstanceNode, contextName, env, templateList, lastNodeResult, templateType);
+        pipelineNodeDeployJavaBiz.deployJavaByWithContextName(pipelineInstanceNode, contextName, env, templateList, lastNodeResult, pipelineTemplate);
         pipelineNodeDeployJavaBiz.deployFinish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
         return PipelineNodeJobExecuteResult.success();
     }
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployNodeService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployNodeService.java
new file mode 100644
index 00000000..dc8c7f7f
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeDeployNodeService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：Node部署
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_deploy_python")
+public class PipelineNodeDeployNodeService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpGetPluginService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpGetPluginService.java
new file mode 100644
index 00000000..797f5bb3
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpGetPluginService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：Get调用插件
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_http_get_plugin")
+public class PipelineNodeHttpGetPluginService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginStcResultService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginStcResultService.java
new file mode 100644
index 00000000..3b6d5cd3
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginStcResultService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：Post调用插件 代码上传扫描结果
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_http_post_plugin-stc_result")
+public class PipelineNodeHttpPostPluginStcResultService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginStcUploadService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginStcUploadService.java
new file mode 100644
index 00000000..72935dd6
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeHttpPostPluginStcUploadService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：Post调用插件 代码上传扫描
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_http_post_plugin-stc_upload")
+public class PipelineNodeHttpPostPluginStcUploadService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeImageScanService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeImageScanService.java
new file mode 100644
index 00000000..bebfc934
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeImageScanService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：镜像扫描
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_image_scan")
+public class PipelineNodeImageScanService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeInitJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeInitService.java
similarity index 87%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeInitJob.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeInitService.java
index cfdc4a03..5a6d0844 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeInitJob.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeInitService.java
@@ -1,4 +1,4 @@
-package cn.odboy.devops.job;
+package cn.odboy.devops.service.pipeline;
 
 import cn.odboy.devops.constant.pipeline.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
@@ -6,7 +6,7 @@ import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
-import cn.odboy.devops.job.biz.PipelineNodeInitBiz;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeInitBiz;
 import cn.odboy.framework.exception.BadRequestException;
 import com.alibaba.fastjson2.JSON;
 import lombok.RequiredArgsConstructor;
@@ -16,10 +16,16 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+/**
+ * 流水线节点任务：初始化准备
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
 @Slf4j
 @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_init")
 @RequiredArgsConstructor
-public class PipelineNodeInitJob extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+public class PipelineNodeInitService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
     private final PipelineNodeInitBiz pipelineNodeInitBiz;
 
     @Override
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMPassStartAndroidService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMPassStartAndroidService.java
new file mode 100644
index 00000000..f6c0eb39
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMPassStartAndroidService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：安卓发布包加固混淆
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_mpaas_start_android")
+public class PipelineNodeMPassStartAndroidService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMPassUploadAndroidService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMPassUploadAndroidService.java
new file mode 100644
index 00000000..bf1ac3c6
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMPassUploadAndroidService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：上传安卓发布包
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_mpaas_upload_android")
+public class PipelineNodeMPassUploadAndroidService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeMergeBranchJob.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeBranchService.java
similarity index 87%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeMergeBranchJob.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeBranchService.java
index 39c2ffaa..3522f201 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/PipelineNodeMergeBranchJob.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeBranchService.java
@@ -1,4 +1,4 @@
-package cn.odboy.devops.job;
+package cn.odboy.devops.service.pipeline;
 
 import cn.odboy.devops.constant.pipeline.PipelineConst;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
@@ -6,8 +6,7 @@ import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
 import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
-import cn.odboy.devops.job.biz.PipelineNodeInitBiz;
-import cn.odboy.devops.job.biz.PipelineNodeMergeBranchBiz;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeMergeBranchBiz;
 import cn.odboy.framework.exception.BadRequestException;
 import com.alibaba.fastjson2.JSON;
 import lombok.RequiredArgsConstructor;
@@ -16,9 +15,15 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+/**
+ * 流水线节点任务：分支合并
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
 @RequiredArgsConstructor
 @Service(value = PipelineConst.EXECUTOR_PREFIX + "node_merge_branch")
-public class PipelineNodeMergeBranchJob extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+public class PipelineNodeMergeBranchService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
     private final PipelineNodeMergeBranchBiz pipelineNodeMergeBranchBiz;
 
     @Override
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeConfirmService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeConfirmService.java
new file mode 100644
index 00000000..309dbae2
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeConfirmService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：人工合并确认
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_merge_confirm")
+public class PipelineNodeMergeConfirmService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeMasterService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeMasterService.java
new file mode 100644
index 00000000..a7aef1ad
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeMergeMasterService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：合并release到master
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_merge_master")
+public class PipelineNodeMergeMasterService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeReleaseAndroidService.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeReleaseAndroidService.java
new file mode 100644
index 00000000..b2124707
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/PipelineNodeReleaseAndroidService.java
@@ -0,0 +1,44 @@
+package cn.odboy.devops.service.pipeline;
+
+import cn.odboy.devops.constant.pipeline.PipelineConst;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.AbstractPipelineNodeJobService;
+import cn.odboy.devops.framework.pipeline.core.PipelineNodeJobExecutor;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import cn.odboy.devops.service.pipeline.node.PipelineNodeDemoBiz;
+import cn.odboy.framework.exception.BadRequestException;
+import com.alibaba.fastjson2.JSON;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 流水线节点任务：特殊合并到release分支
+ *
+ * @author odboy
+ * @date 2025-07-24
+ */
+@RequiredArgsConstructor
+@Service(value = PipelineConst.EXECUTOR_PREFIX + "node_release_android")
+public class PipelineNodeReleaseAndroidService extends AbstractPipelineNodeJobService implements PipelineNodeJobExecutor {
+    private final PipelineNodeDemoBiz pipelineNodeDemoBiz;
+
+    @Override
+    public PipelineNodeJobExecuteResult execute(JobDataMap jobDataMap) throws BadRequestException {
+        // 参数列表
+        long instanceId = jobDataMap.getLong(PipelineConst.INSTANCE_ID);
+        PipelineNodeTemplateVo currentNodeTemplate = (PipelineNodeTemplateVo) jobDataMap.get(PipelineConst.CURRENT_NODE_TEMPLATE);
+        PipelineInstanceNodeTb pipelineInstanceNode = getCurrentNodeInfo(instanceId, currentNodeTemplate.getCode());
+        String contextName = jobDataMap.getString(PipelineConst.CONTEXT_NAME);
+        String env = jobDataMap.getString(PipelineConst.ENV);
+        List<PipelineNodeTemplateVo> templateList = JSON.parseArray(jobDataMap.getString(PipelineConst.TEMPLATE), PipelineNodeTemplateVo.class);
+        PipelineNodeJobExecuteResult lastNodeResult = (PipelineNodeJobExecuteResult) jobDataMap.get(PipelineConst.LAST_NODE_RESULT);
+        // 步骤执行
+        pipelineNodeDemoBiz.start(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        pipelineNodeDemoBiz.finish(pipelineInstanceNode, contextName, env, templateList, lastNodeResult);
+        return PipelineNodeJobExecuteResult.success();
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/biz/PipelineNodeBuildJavaBiz.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeBuildJavaBiz.java
similarity index 92%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/biz/PipelineNodeBuildJavaBiz.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeBuildJavaBiz.java
index 068c166b..ee4bb622 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/biz/PipelineNodeBuildJavaBiz.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeBuildJavaBiz.java
@@ -1,4 +1,4 @@
-package cn.odboy.devops.job.biz;
+package cn.odboy.devops.service.pipeline.node;
 
 import cn.hutool.core.thread.ThreadUtil;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
@@ -16,18 +16,21 @@ public class PipelineNodeBuildJavaBiz {
 
     @PipelineNodeStepLog("构建开始")
     public void buildJavaStart(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
-        ThreadUtil.safeSleep(2000);
+        ThreadUtil.safeSleep(1000);
     }
+
     @PipelineNodeStepLog("构建中")
     public void startGitlabPipeline(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(2000);
     }
+
     @PipelineNodeStepLog("上传包到OSS")
     public void uploadPackageToOss(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
         ThreadUtil.safeSleep(2000);
     }
+
     @PipelineNodeStepLog("构建完成")
     public void buildJavaFinish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
-        ThreadUtil.safeSleep(2000);
+        ThreadUtil.safeSleep(1000);
     }
 }
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDemoBiz.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDemoBiz.java
new file mode 100644
index 00000000..e2fdab44
--- /dev/null
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDemoBiz.java
@@ -0,0 +1,26 @@
+package cn.odboy.devops.service.pipeline.node;
+
+import cn.hutool.core.thread.ThreadUtil;
+import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.framework.pipeline.log.PipelineNodeStepLog;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
+import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+public class PipelineNodeDemoBiz {
+
+    @PipelineNodeStepLog("开始")
+    public void start(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+        ThreadUtil.safeSleep(1000);
+    }
+
+    @PipelineNodeStepLog("完成")
+    public void finish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
+        ThreadUtil.safeSleep(1000);
+    }
+}
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/biz/PipelineNodeDeployJavaBiz.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDeployJavaBiz.java
similarity index 84%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/biz/PipelineNodeDeployJavaBiz.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDeployJavaBiz.java
index bde902f1..71f20856 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/biz/PipelineNodeDeployJavaBiz.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeDeployJavaBiz.java
@@ -1,7 +1,8 @@
-package cn.odboy.devops.job.biz;
+package cn.odboy.devops.service.pipeline.node;
 
 import cn.hutool.core.thread.ThreadUtil;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
+import cn.odboy.devops.dal.dataobject.PipelineTemplateTb;
 import cn.odboy.devops.framework.pipeline.log.PipelineNodeStepLog;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeJobExecuteResult;
 import cn.odboy.devops.framework.pipeline.model.PipelineNodeTemplateVo;
@@ -15,16 +16,16 @@ import java.util.List;
 public class PipelineNodeDeployJavaBiz {
     @PipelineNodeStepLog("部署开始")
     public void deployStart(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
-        ThreadUtil.safeSleep(2000);
+        ThreadUtil.safeSleep(1000);
     }
 
     @PipelineNodeStepLog("部署中")
-    public void deployJavaByWithContextName(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult, String templateType) {
+    public void deployJavaByWithContextName(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult, PipelineTemplateTb templateType) {
         ThreadUtil.safeSleep(2000);
     }
 
     @PipelineNodeStepLog("部署完成")
     public void deployFinish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
-        ThreadUtil.safeSleep(2000);
+        ThreadUtil.safeSleep(1000);
     }
 }
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/biz/PipelineNodeInitBiz.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeInitBiz.java
similarity index 92%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/biz/PipelineNodeInitBiz.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeInitBiz.java
index 8a0c4919..9833053a 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/biz/PipelineNodeInitBiz.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeInitBiz.java
@@ -1,4 +1,4 @@
-package cn.odboy.devops.job.biz;
+package cn.odboy.devops.service.pipeline.node;
 
 import cn.hutool.core.thread.ThreadUtil;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
@@ -15,7 +15,7 @@ import java.util.List;
 public class PipelineNodeInitBiz {
     @PipelineNodeStepLog("初始化开始")
     public void initStart(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
-        ThreadUtil.safeSleep(2000);
+        ThreadUtil.safeSleep(1000);
     }
 
     @PipelineNodeStepLog("Master分支合并到Release分支")
@@ -30,6 +30,6 @@ public class PipelineNodeInitBiz {
 
     @PipelineNodeStepLog("初始化完成")
     public void initFinish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
-        ThreadUtil.safeSleep(2000);
+        ThreadUtil.safeSleep(1000);
     }
 }
diff --git a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/biz/PipelineNodeMergeBranchBiz.java b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeMergeBranchBiz.java
similarity index 91%
rename from cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/biz/PipelineNodeMergeBranchBiz.java
rename to cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeMergeBranchBiz.java
index 78d9118b..26e43c22 100644
--- a/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/job/biz/PipelineNodeMergeBranchBiz.java
+++ b/cutejava/cutejava-module-devops/src/main/java/cn/odboy/devops/service/pipeline/node/PipelineNodeMergeBranchBiz.java
@@ -1,4 +1,4 @@
-package cn.odboy.devops.job.biz;
+package cn.odboy.devops.service.pipeline.node;
 
 import cn.hutool.core.thread.ThreadUtil;
 import cn.odboy.devops.dal.dataobject.PipelineInstanceNodeTb;
@@ -15,7 +15,7 @@ import java.util.List;
 public class PipelineNodeMergeBranchBiz {
     @PipelineNodeStepLog("分支合并开始")
     public void mergeBranchStart(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
-        ThreadUtil.safeSleep(2000);
+        ThreadUtil.safeSleep(1000);
     }
 
     @PipelineNodeStepLog("集成区分支合并到release分支")
@@ -25,6 +25,6 @@ public class PipelineNodeMergeBranchBiz {
 
     @PipelineNodeStepLog("分支合并完成")
     public void mergeBranchFinish(PipelineInstanceNodeTb pipelineInstanceNode, String contextName, String env, List<PipelineNodeTemplateVo> templateList, PipelineNodeJobExecuteResult lastNodeResult) {
-        ThreadUtil.safeSleep(2000);
+        ThreadUtil.safeSleep(1000);
     }
 }