Merge branch 'master' of github.com:DTStack/DAGScheduleX into feat_ma…

…ster_1.1_dazhi
DTStack · Apr 11, 2022 · f826601 · f826601
2 parents b3c2a71 + 39c300f
commit f826601
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-.md → ...ISSUE_TEMPLATE/-bug--module--bug-title.md b/.github/ISSUE_TEMPLATE/bug-.md → ...ISSUE_TEMPLATE/-bug--module--bug-title.md
@@ -1,8 +1,8 @@
 ---
-name: 'Bug '
+name: "[BUG][module] bug title"
 about: 发现了一个新bug
 title: ''
-labels: ''
+labels: bug
 assignees: ''
 
 ---

diff --git a/.github/ISSUE_TEMPLATE/-feature--module--feature-title.md b/.github/ISSUE_TEMPLATE/-feature--module--feature-title.md
@@ -0,0 +1,10 @@
+---
+name: "[Feature][module] feature title"
+about: 一个好的建议
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+
diff --git a/taier-common/src/main/java/com/dtstack/taier/common/client/ClientOperator.java b/taier-common/src/main/java/com/dtstack/taier/common/client/ClientOperator.java
@@ -119,11 +119,11 @@ public String getCheckpoints(String pluginInfo, JobIdentifier jobIdentifier) {
 
 
     public JobResult stopJob(JobClient jobClient) throws Exception {
-        if(jobClient.getEngineTaskId() == null){
+        if (jobClient.getApplicationId() == null) {
             return JobResult.createSuccessResult(jobClient.getJobId());
         }
         JobIdentifier jobIdentifier = new JobIdentifier(jobClient.getEngineTaskId(), jobClient.getApplicationId(), jobClient.getJobId()
-        ,jobClient.getTenantId(),jobClient.getTaskType(),jobClient.getDeployMode(),jobClient.getUserId(),jobClient.getPluginInfo(),jobClient.getComponentVersion());
+                , jobClient.getTenantId(), jobClient.getTaskType(), jobClient.getDeployMode(), jobClient.getUserId(), jobClient.getPluginInfo(), jobClient.getComponentVersion());
         jobIdentifier.setForceCancel(jobClient.getForceCancel());
         checkoutOperator(jobClient.getPluginInfo(), jobIdentifier);