diff --git a/.drone.yml b/.drone.yml index d608371..cd8f4f1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -45,7 +45,29 @@ steps: path: /app/config commands: - kubectl apply -f deployment.yml -n metis --kubeconfig=/app/config/base-taishan-kubectl.yml - + - + - name: notify + image: plugins/webhook + environment: + WEBHOOK_URL: + from_secret: wechat_webhook_url + settings: + urls: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=f2b3fcbc-e70f-4826-8b08-340518b3a96f + content_type: application/json + template: | + { + "msgtype": "markdown", + "markdown": { + "content": "{{#success build.status}}✅{{else}}❌{{/success}}**{{ repo.owner }}/{{ repo.name }}** (Build #{{build.number}})\n + >**构建结果**: {{ build.status }} + >**构建详情**: [点击查看]({{ build.link }}) + >**代码分支**: {{ build.branch }} + >**提交标识**: {{ build.commit }} + >**提交发起**: {{ build.author }} + >**提交信息**: {{ build.message }} + " + } + } volumes: - name: config diff --git a/src/main/java/com/metis/controller/ProcessDefinitionController.java b/src/main/java/com/metis/controller/ProcessDefinitionController.java index 58ebbf5..ce90d34 100644 --- a/src/main/java/com/metis/controller/ProcessDefinitionController.java +++ b/src/main/java/com/metis/controller/ProcessDefinitionController.java @@ -16,9 +16,9 @@ public class ProcessDefinitionController { @PostMapping("/create") - public Result create(@RequestBody ProcessBo processBo) { - processDefinitionFacade.create(processBo); - return Result.ok(); + public Result create(@RequestBody ProcessBo processBo) { + Long workflowId = processDefinitionFacade.create(processBo); + return Result.ok(workflowId); } @PutMapping("/update") diff --git a/src/main/java/com/metis/controller/TestController.java b/src/main/java/com/metis/controller/TestController.java index 16781ed..daa011b 100644 --- a/src/main/java/com/metis/controller/TestController.java +++ b/src/main/java/com/metis/controller/TestController.java @@ -3,6 +3,7 @@ package com.metis.controller; import com.metis.flow.domain.bo.BuildApp; import com.metis.flow.engine.AppFlowEngineRunnerService; import com.metis.flow.runner.FlowRunningContext; +import com.metis.flow.runner.RunnerResult; import com.metis.flow.validator.ValidatorService; import com.metis.result.Result; import lombok.RequiredArgsConstructor; @@ -28,9 +29,9 @@ public class TestController { @PostMapping("/run") - public Result run(@RequestBody FlowRunningContext context) { - engineRunnerService.running(context); - return Result.ok("测试成功"); + public Result run(@RequestBody FlowRunningContext context) { + RunnerResult running = engineRunnerService.running(context); + return Result.ok(running); } diff --git a/src/main/java/com/metis/facade/ProcessDefinitionFacade.java b/src/main/java/com/metis/facade/ProcessDefinitionFacade.java index e3749ae..d1b4958 100644 --- a/src/main/java/com/metis/facade/ProcessDefinitionFacade.java +++ b/src/main/java/com/metis/facade/ProcessDefinitionFacade.java @@ -21,12 +21,13 @@ public class ProcessDefinitionFacade { * * @param processBo 过程业务对象 */ - public void create(ProcessBo processBo) { + public Long create(ProcessBo processBo) { CreateApp createApp = CreateApp.builder() .name(processBo.getName()) .graph(processBo.getGraph()) .build(); App app = appEngineService.create(createApp); + return app.getWorkflowId(); } public App getByDeploymentId(Long deploymentId) {