调度中心添加杀死工作流和杀死任务的API接口修改

byit-myth-admin/src/main/java/com/byit/api/ApiFlowController.java

 package com.byit.api;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.byit.service.ApiFlowService;
 import com.byit.service.FlowService;
 import io.swagger.annotations.Api;

byit-myth-core/myth-admin-core/pom.xml

@@ -59,11 +59,6 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.byit</groupId>
-            <artifactId>byit-validation-starter</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
 
         <dependency>
             <groupId>myth-job</groupId>

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/impl/FlowServiceImpl.java

@@ -379,12 +379,12 @@ public class FlowServiceImpl implements FlowService {
         return result;
     }
 
-    private synchronized Boolean killJob(Integer logId, String exectUrl){
+    private static synchronized Boolean killJob(Integer logId, String exectUrl){
         //具体访问的URL
         String killUrl = exectUrl + "/processManager/killJob";
-        Map<String, Integer> requestMap = new HashMap<>(2);
+        Map<String, Object> requestMap = new HashMap<>(2);
         requestMap.put("logId", logId);
-        String killResult = HttpUtil.post(killUrl, JSON.toJSONString(requestMap));
+        String killResult = HttpUtil.post(killUrl, requestMap);
         log.info("请求结果{}", killResult);
         ResponseResult responseResult = JSON.parseObject(killResult, ResponseResult.class);
         if ("SUCCESS".equals(responseResult.getResult())){
@@ -392,4 +392,5 @@ public class FlowServiceImpl implements FlowService {
         }
         return false;
     }
+
 }
\ No newline at end of file

byit-myth-core/myth-core-common/pom.xml

@@ -45,6 +45,16 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.byit</groupId>
+            <artifactId>byit-validation-starter</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

byit-myth-admin/src/main/java/com/byit/advice/ExceptionHandle.java → byit-myth-core/myth-core-common/src/main/java/com/byit/job/advice/ExceptionHandle.java

-package com.byit.advice;
+package com.byit.job.advice;
 
 import com.byit.exception.DataValidationException;
 import com.byit.job.enums.IEnum;

byit-myth-admin/src/main/java/com/byit/advice/ResponseAdvice.java → byit-myth-core/myth-core-common/src/main/java/com/byit/job/advice/ResponseAdvice.java

-package com.byit.advice;
+package com.byit.job.advice;
 
 import com.alibaba.fastjson.JSON;
 import com.byit.job.vo.ResponseResult;

byit-myth-executor/myth-executor-server/src/main/java/com/byit/ExecutorServiceApplication.java

 package com.byit;
 
+import com.byit.rpc.remoting.provider.annotation.RpcService;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
@@ -10,6 +11,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @date: 2019/11/14 16:03
  **/
 @SpringBootApplication
+@RpcService(http_type = true)
 public class ExecutorServiceApplication {
     public static void main(String[] args) {
         SpringApplication.run(ExecutorServiceApplication.class,args);

byit-myth-executor/myth-executor-server/src/main/java/com/byit/controller/ProcessManagerController.java

@@ -4,7 +4,7 @@ import com.byit.executor.jobExecutor.process.MythJobProcess;
 import com.byit.executor.util.JobContentUtil;
 import com.byit.utils.ValidationUtil;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -12,11 +12,11 @@ import org.springframework.web.bind.annotation.RestController;
  * @Author guo_m
  * @Date 2020-02-22
  */
-@RestController("processManager")
+@RestController
+@RequestMapping("processManager")
 public class ProcessManagerController {
 
     @PostMapping("killJob")
-    @ResponseBody
     public String killJob(Integer logId){
         ValidationUtil.dataNotNull(logId, "日志id不允许为空！");
         MythJobProcess mythJobProcess = JobContentUtil.getJobThread(logId);