Skip to content

B
byit-myth-job
Commit 3a01736d by huangfusuper
Options

修正任务不遵循cron表达式 重复调用问题

parent 2917851d
Showing with 61 additions and 5 deletions
byit-myth-admin/pom.xml
...@@ -27,6 +27,20 @@ ...@@ -27,6 +27,20 @@
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/net.sourceforge.nekohtml/nekohtml -->
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
<version>1.9.22</version>
</dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
...@@ -48,6 +62,12 @@ ...@@ -48,6 +62,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>myth-job</groupId> <groupId>myth-job</groupId>
<artifactId>myth-web-core</artifactId> <artifactId>myth-web-core</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
......
byit-myth-admin/src/main/java/com/byit/controller/IndexController.java 0 → 100644
package com.byit.controller;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
public class IndexController {
@RequestMapping("/")
public String index()
{
return "index";
}
}
byit-myth-admin/src/main/resources/config/application-local.yml
...@@ -4,6 +4,16 @@ spring: ...@@ -4,6 +4,16 @@ spring:
url: jdbc:mysql://10.0.10.118:3306/myth-job?Unicode=true&characterEncoding=UTF-8&useSSL=true url: jdbc:mysql://10.0.10.118:3306/myth-job?Unicode=true&characterEncoding=UTF-8&useSSL=true
username: root username: root
password: 123456 password: 123456
thymeleaf:
prefix: classpath:/templates/
suffix: .html
cache: false
enabled: true
check-template: true
check-template-location: true
encoding: utf-8
mode: HTML5
mail: mail:
host: smtp.163.com host: smtp.163.com
......
byit-myth-admin/src/main/resources/templates/index.html 0 → 100644
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8"/>
<title>Title</title>
</head>
<body>
<h1>遇见事情不要慌qqqqssss</h1>
<script src="/js/jquery.min.js"/>
</body>
</html>
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskRunLogMapper.xml
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<result column="start_time" jdbcType="TIMESTAMP" property="startTime" /> <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
<result column="run_type" jdbcType="CHAR" property="runType" /> <result column="run_type" jdbcType="CHAR" property="runType" />
<result column="trigger_code" jdbcType="VARCHAR" property="triggerCode" /> <result column="trigger_code" jdbcType="VARCHAR" property="triggerCode" />
<result column="trigger_time" jdbcType="DATE" property="triggerTime" /> <result column="trigger_time" jdbcType="TIMESTAMP" property="triggerTime" />
<result column="job_group_ip" jdbcType="VARCHAR" property="jobGroupIp" /> <result column="job_group_ip" jdbcType="VARCHAR" property="jobGroupIp" />
<result column="map_flow_id" jdbcType="INTEGER" property="mapFlowId" /> <result column="map_flow_id" jdbcType="INTEGER" property="mapFlowId" />
<result column="run_command" jdbcType="VARCHAR" property="runCommand" /> <result column="run_command" jdbcType="VARCHAR" property="runCommand" />
...@@ -453,7 +453,7 @@ ...@@ -453,7 +453,7 @@
trigger_code = #{triggerCode,jdbcType=VARCHAR}, trigger_code = #{triggerCode,jdbcType=VARCHAR},
</if> </if>
<if test="triggerTime != null"> <if test="triggerTime != null">
trigger_time = #{triggerTime,jdbcType=DATE}, trigger_time = #{triggerTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="jobGroupIp != null"> <if test="jobGroupIp != null">
job_group_ip = #{jobGroupIp,jdbcType=VARCHAR}, job_group_ip = #{jobGroupIp,jdbcType=VARCHAR},
...@@ -558,7 +558,7 @@ ...@@ -558,7 +558,7 @@
trigger_code = #{triggerCode,jdbcType=VARCHAR}, trigger_code = #{triggerCode,jdbcType=VARCHAR},
</if> </if>
<if test="triggerTime != null"> <if test="triggerTime != null">
trigger_time = #{triggerTime,jdbcType=DATE}, trigger_time = #{triggerTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="jobGroupIp != null"> <if test="jobGroupIp != null">
job_group_ip = #{jobGroupIp,jdbcType=VARCHAR}, job_group_ip = #{jobGroupIp,jdbcType=VARCHAR},
......
byit-myth-core/myth-web-core/src/main/java/com/byit/web/advice/ExceptionHandle.java
...@@ -28,7 +28,7 @@ public class ExceptionHandle { ...@@ -28,7 +28,7 @@ public class ExceptionHandle {
}else if(e instanceof DataValidationException){ }else if(e instanceof DataValidationException){
return ResponseResult.error("500",e.getMessage()); return ResponseResult.error("500",e.getMessage());
} }
return ResponseResult.error("未知错误"); return ResponseResult.error(e.getMessage());
} }
/** /**
......
byit-myth-gateway/src/main/java/com/byit/gateway/filters/LoginFilter.java
...@@ -32,7 +32,7 @@ public class LoginFilter extends ZuulFilter { ...@@ -32,7 +32,7 @@ public class LoginFilter extends ZuulFilter {
@Override @Override
public boolean shouldFilter() { public boolean shouldFilter() {
return true; return false;
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment