Merge remote-tracking branch 'origin/developer' into developer

byit-myth-core/myth-admin-core/src/main/java/com/byit/task/ScriptExecutorJobTask.java

@@ -110,7 +110,9 @@ public class ScriptExecutorJobTask implements TimerTask {
         }catch (Exception e){
             StringRedisTemplate stringRedisTemplate = (StringRedisTemplate) SpringUtil.getBean("stringRedisTemplate");
             RunLog runLog = RunLog.builder().isEnd(true).isSuccess(false).runLog("执行资源异常" +  e.getMessage()).build();
-            stringRedisTemplate.convertAndSend("REAL-EXEC-" + mythJobTaskSchedule.getLogId() , JSON.toJSONString(runLog, WriteClassName));
+            //stringRedisTemplate.convertAndSend("REAL-EXEC-" + mythJobTaskSchedule.getLogId() , JSON.toJSONString(runLog, WriteClassName));
+            //使用redis 想队尾push一个值
+            stringRedisTemplate.opsForList().rightPush("REAL-EXEC-" + mythJobTaskSchedule.getLogId() , JSON.toJSONString(runLog, WriteClassName));
             log.error("------执行机异常{}-----", e.getMessage());
             dispatchResponseDto.setMsg(e.getMessage());
             dispatchResponseDto.setCode(JobResultEnum.DISPATCH_FAIL.getCode());

byit-myth-executor/myth-executor-server/src/main/java/com/byit/process/MythJobProcess.java

@@ -154,7 +154,9 @@ public class MythJobProcess implements Callable<String>{
                 this.process.destroy();
             }
             RunLog runLog = RunLog.builder().isEnd(true).isSuccess(exitCode == 0 ? true : false).build();
-            stringRedisTemplate.convertAndSend(runKey, JSON.toJSONString(runLog, WriteClassName));
+            //stringRedisTemplate.convertAndSend(runKey, JSON.toJSONString(runLog, WriteClassName))
+            //TODO 向队尾追加一个日志
+            stringRedisTemplate.opsForList().rightPush(runKey , JSON.toJSONString(runLog, WriteClassName));
             return  outputGobbler.getRecentLog() + "\n" + errorGobbler.getRecentLog();
         }
     }

byit-myth-executor/myth-executor-server/src/main/java/com/byit/service/ScriptExecutorServiceImpl.java

@@ -163,10 +163,12 @@ public class ScriptExecutorServiceImpl implements ScriptExecutorService {
                 jobRunResultDto.setReturnResult(ReturnResult.FAIL);
             }
         } catch (Exception e){
+            log.error("调度执行机出现异常：{}",e.getMessage());
             ReturnResult<String> returnResult = new ReturnResult<>();
             returnResult.setCode(ReturnResult.FAIL.getCode());
             returnResult.setMsg(e.getMessage());
             jobRunResultDto.setReturnResult(returnResult);
+
         }
         //设置结束时间
         jobRunResultDto.setEndTime(new Date());

byit-myth-executor/myth-executor-server/src/main/java/com/byit/utils/LogGobbler.java

@@ -44,7 +44,9 @@ public class LogGobbler extends Thread {
                 }
                 this.buffer.append(line + "\n");
                 runLog.setRunLog(line);
-                stringRedisTemplate.convertAndSend(runKey, JSON.toJSONString(runLog, WriteClassName));
+                //stringRedisTemplate.convertAndSend(runKey, JSON.toJSONString(runLog, WriteClassName))
+                //TODO 向队列队尾插入一个值
+                stringRedisTemplate.opsForList().rightPush(runKey , JSON.toJSONString(runLog, WriteClassName));
                 printLog(line);
             }
         } catch (final IOException e) {

byit-myth-gateway/pom.xml

@@ -45,8 +45,7 @@
 
         <dependency>
             <groupId>myth-job</groupId>
-            <artifactId>myth-web-core</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <artifactId>myth-core-common</artifactId>
         </dependency>
 
 

byit-myth-gateway/src/main/java/com/byit/gateway/controller/ErrorHandlerController.java

+package com.byit.gateway.controller;
+
+import com.byit.dto.web.ResponseResult;
+import com.byit.enums.TransferResultEnum;
+import com.netflix.zuul.context.RequestContext;
+import com.netflix.zuul.exception.ZuulException;
+import org.springframework.boot.autoconfigure.web.ErrorController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author huangfu
+ */
+@RestController
+public class ErrorHandlerController  implements ErrorController {
+    @Override
+    public String getErrorPath() {
+        return "/error";
+    }
+
+    @RequestMapping(value = "/error", produces={"application/json; charset=utf-8"})
+    public Object error(HttpServletResponse response){
+        RequestContext ctx = RequestContext.getCurrentContext();
+        ZuulException exception = (ZuulException)ctx.getThrowable();
+        String msg = "";
+        String code = "";
+        if (exception == null) {
+            code = TransferResultEnum.ERROR.getCode();
+            msg = "网关异常："+TransferResultEnum.ERROR.getMsg();
+        }else {
+            msg ="网关异常：" + exception.getMessage();
+            code = exception.nStatusCode+"";
+        }
+        ResponseResult responseResult = new ResponseResult();
+        responseResult.setMsg(msg);
+        responseResult.setTimeCost(System.currentTimeMillis());
+        responseResult.setCode(code);
+        return responseResult;
+    }
+}

byit-myth-gateway/src/main/resources/application-dev.yml

@@ -34,3 +34,6 @@ spring:
 
 zuul:
   ignored-services: '*'
+#  sendErrorFilter:
+#    error:
+#      disable: true