Merge branch 'dev-0.2.3-log-collector' of github.com:WeDataSphere/Streamis into dev-0.2.3-log-collector

Author: Davidhua1996

streamis-jobmanager/streamis-jobmanager-server/src/main/java/com/webank/wedatasphere/streamis/jobmanager/restful/api/JobRestfulApi.java

@@ -235,6 +235,11 @@ public Message executeHistoryJob(HttpServletRequest req,
     private Message withStreamJob(HttpServletRequest req, String projectName,
                                   String jobName, String username,
                                   Function<StreamJob, Message> streamJobFunction) {
+        if(StringUtils.isBlank(projectName)) {
+            return Message.error("projectName cannot be empty!");
+        } else if(StringUtils.isBlank(jobName)) {
+            return Message.error("jobName cannot be empty!");
+        }
         List<QueryJobListVo> streamJobs = streamJobService.getByProList(projectName, username, jobName, null, null).getList();
         if(CollectionUtils.isEmpty(streamJobs)) {
             return Message.error("Not exits Streamis job " + jobName);
@@ -259,6 +264,9 @@ public Message addTask(HttpServletRequest req,
                            @RequestParam(value = "appUrl") String appUrl) {
         String username = SecurityFilter.getLoginUsername(req);
         LOG.info("User {} try to add a new task for Streamis job {} with appId: {}, appUrl: {}.", username, jobName, appId, appUrl);
+        if(StringUtils.isBlank(appId)) {
+            return Message.error("appId cannot be empty!");
+        }
         return withStreamJob(req, projectName, jobName, username, streamJob -> {
             // 如果存在正在运行的，先将其停止掉
             StreamTask streamTask = streamTaskService.getLatestTaskByJobId(streamJob.getId());
@@ -328,14 +336,15 @@ private Message withFlinkJobInfo(String jobName, String flinkJobInfoStr, Functio
         return flinkJobInfoFunction.apply(flinkJobInfo);
     }
 
-    @RequestMapping(path = "/updateTask", method = RequestMethod.GET)
+    @RequestMapping(path = "/updateTask", method = RequestMethod.POST)
     public Message updateTask(HttpServletRequest req,
-                              @RequestParam(value = "projectName") String projectName,
-                              @RequestParam(value = "jobName") String jobName,
-                              @RequestParam(value = "appId") String appId,
-                              @RequestParam(value = "metrics") String metrics) {
+                              @RequestBody Map<String, String> json) {
         String username = SecurityFilter.getLoginUsername(req);
-        LOG.info("User {} try to update task for Streamis job {} with appId: {}.", username, jobName, appId);
+        String projectName = json.get("projectName");
+        String jobName = json.get("jobName");
+        String appId = json.get("appId");
+        String metrics = json.get("metrics");
+        LOG.info("User {} try to update task for Streamis job {} with appId: {}, metrics: {}.", username, jobName, appId, metrics);
         return withStreamJob(req, projectName, jobName, username, streamJob -> {
             StreamTask streamTask = streamTaskService.getLatestTaskByJobId(streamJob.getId());
             if (streamTask == null) {