Merge pull request #530 from wushengyeyouya/master

Fix the problem that will cause the startup of flow-execution-server failed.

Author: peacewong

dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/restful/FlowEntranceRestfulApi.java

@@ -131,7 +131,13 @@ public Message status(@PathVariable("id") String id, @RequestParam(required = fa
         return message;
     }
 
-    @RequestMapping(path = {"/{id}/kill"},method = {RequestMethod.GET})
+    /**
+     * This is method should be delete in next DSS version, since it is only used to fix a bug in temporary use
+     * @param id
+     * @param taskID
+     * @return
+     */
+    @RequestMapping(path = {"/{id}/killWorkflow"},method = {RequestMethod.GET})
     public Message kill(@PathVariable("id") String id, @RequestParam(value = "taskID",required = false) Long taskID) {
         String realId = ZuulEntranceUtils.parseExecID(id)[3];
         Option job = Option.apply((Object)null);