web/src/main/java/cn/seecoder/web/service/impl/pipeline/PipelineServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.seecoder.web.service.impl.pipeline;
 
+import cn.seecoder.common.exceptions.AccessDeniedException;
 import cn.seecoder.common.exceptions.ServiceException;
 import cn.seecoder.web.core.pipeline.PipelineException;
 import cn.seecoder.web.core.pipeline.template.PipelineTemplateTable;
@@ -10,6 +11,7 @@ import cn.seecoder.web.model.po.pipeline.PipelinePO;
 import cn.seecoder.web.model.po.pipeline.PipelineRecordPO;
 import cn.seecoder.web.model.po.user.UserPO;
 import cn.seecoder.web.model.vo.pipeline.*;
+import cn.seecoder.web.service.pipeline.DeploymentService;
 import cn.seecoder.web.service.pipeline.PipelineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,12 +36,15 @@ public class PipelineServiceImpl implements PipelineService {
 
     private final UserMapper userMapper;
 
+    private final DeploymentService deploymentService;
+
 
     @Autowired
-    public PipelineServiceImpl(PipelineRecordMapper pipelineRecordMapper, PipelineMapper pipelineMapper, UserMapper userMapper) {
+    public PipelineServiceImpl(PipelineRecordMapper pipelineRecordMapper, PipelineMapper pipelineMapper, UserMapper userMapper, DeploymentService deploymentService) {
         this.pipelineRecordMapper = pipelineRecordMapper;
         this.pipelineMapper = pipelineMapper;
         this.userMapper = userMapper;
+        this.deploymentService = deploymentService;
     }
 
 
@@ -124,10 +129,11 @@ public class PipelineServiceImpl implements PipelineService {
     }
 
     @Override
-    public void deletePipelineConfig(Integer projectId, Integer pipelineId) {
+    public void deletePipelineConfig(Integer projectId, Integer pipelineId) throws AccessDeniedException {
         //projectAuthentication(projectId);
-        //todo 是否要连带部署实例一起删除
+        //连带部署实例一起删除
         pipelineMapper.delete(pipelineId);
+        deploymentService.delete(projectId,pipelineId);
 
     }
 

web/src/main/resources/sql/table_init.sql

@@ -81,8 +81,6 @@ create table if not exists devcloud.deployment
     access_url    text        null,
     constraint deployment_pipeline_id_uindex
         unique (pipeline_id),
-    constraint deployment_pipeline_id_fk
-        foreign key (pipeline_id) references devcloud.pipeline (id)
 ) CHARSET=utf8;
 
 create table if not exists devcloud.project_related