diff --git a/pom.xml b/pom.xml
index d97ce60..6473a2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,17 @@
spring-boot-starter-web
+
+ mysql
+ mysql-connector-java
+ runtime
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ 3.4.2
+
+
org.springframework.boot
spring-boot-devtools
@@ -39,20 +50,15 @@
true
- mysql
- mysql-connector-java
- runtime
+ org.springframework.boot
+ spring-boot-starter-test
+ test
org.projectlombok
lombok
true
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
org.springframework.boot
spring-boot-starter-mail
@@ -61,13 +67,7 @@
com.alibaba
fastjson
- 1.2.76
-
-
-
- com.baomidou
- mybatis-plus-boot-starter
- 3.4.1
+ 1.2.83
@@ -90,7 +90,7 @@
- biology
+ ai-backend-template
org.springframework.boot
diff --git a/src/main/java/com/weilab/biology/config/TokenFilter.java b/src/main/java/com/weilab/biology/config/CorsFilter.java
similarity index 96%
rename from src/main/java/com/weilab/biology/config/TokenFilter.java
rename to src/main/java/com/weilab/biology/config/CorsFilter.java
index 778a6a9..9d05d7c 100644
--- a/src/main/java/com/weilab/biology/config/TokenFilter.java
+++ b/src/main/java/com/weilab/biology/config/CorsFilter.java
@@ -9,7 +9,7 @@ import java.io.IOException;
@Component
-public class TokenFilter implements Filter {
+public class CorsFilter implements Filter {
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
diff --git a/src/main/java/com/weilab/biology/config/FilterConfig.java b/src/main/java/com/weilab/biology/config/FilterConfig.java
index e7ffe93..4049e41 100644
--- a/src/main/java/com/weilab/biology/config/FilterConfig.java
+++ b/src/main/java/com/weilab/biology/config/FilterConfig.java
@@ -4,11 +4,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.web.filter.DelegatingFilterProxy;
-
-import javax.servlet.DispatcherType;
-import java.util.HashMap;
-import java.util.Map;
/**
* Created by skyyemperor on 2020-12-27 10:54
@@ -18,13 +13,13 @@ import java.util.Map;
public class FilterConfig {
@Autowired
- private TokenFilter tokenFilter;
+ private CorsFilter corsFilter;
@SuppressWarnings({"rawtypes", "unchecked"})
@Bean
public FilterRegistrationBean tokenFilterRegistration() {
FilterRegistrationBean registration = new FilterRegistrationBean();
- registration.setFilter(tokenFilter);
+ registration.setFilter(corsFilter);
registration.addUrlPatterns("/*");
registration.setName("tokenFilter");
registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE);
diff --git a/src/main/java/com/weilab/biology/mapper/JobMapper.java b/src/main/java/com/weilab/biology/mapper/JobMapper.java
index 7885ee2..77000e8 100644
--- a/src/main/java/com/weilab/biology/mapper/JobMapper.java
+++ b/src/main/java/com/weilab/biology/mapper/JobMapper.java
@@ -20,7 +20,6 @@ public interface JobMapper extends BaseMapper {
Job selectNextWaitingJob();
- List selectJobList(@Param("type") Integer type,
- @Param("count") Integer count);
+ List selectJobList(@Param("type") Integer type);
}
\ No newline at end of file
diff --git a/src/main/java/com/weilab/biology/service/JobService.java b/src/main/java/com/weilab/biology/service/JobService.java
index 5af802a..25550ba 100644
--- a/src/main/java/com/weilab/biology/service/JobService.java
+++ b/src/main/java/com/weilab/biology/service/JobService.java
@@ -59,12 +59,23 @@ public class JobService {
@Autowired
private TaskExecutorUtil> taskExecutorUtil;
- private static final String SUBJECT = "【DeepBIO Result Notice】";
- private static final String SUCCESS_EMAIL_CONTENT = "Your request has been completed, click http://server.wei-group.net/front/biology/#/resultMail?jobId=%s to check the detail information";
- private static final String FAIL_EMAIL_CONTENT = "We are very sorry, but some errors occurred in the task you submitted, click http://server.wei-group.net/front/biology/#/resultMail?jobId=%s to check the detail information";
- private static final String TIMEOUT_EMAIL_CONTENT = "We are very sorry, but the task you submitted was overtime, click http://server.wei-group.net/front/biology/#/resultMail?jobId=%s to check the detail information";
- private static final String RECEIVED_EMAIL_CONTENT = "Your request has been received, click http://server.wei-group.net/front/biology/#/resultMail?jobId=%s to check the detail information";
- private static final String START_RUNNING_EMAIL_CONTENT = "Your task has started running, click http://server.wei-group.net/front/biology/#/resultMail?jobId=%s to check the detail information";
+ @Value("${email.subject}")
+ private String SUBJECT;
+
+ @Value("${email.content.success}")
+ private String SUCCESS_EMAIL_CONTENT;
+
+ @Value("${email.content.fail}")
+ private String FAIL_EMAIL_CONTENT;
+
+ @Value("${email.content.timeout}")
+ private String TIMEOUT_EMAIL_CONTENT;
+
+ @Value("${email.content.received}")
+ private String RECEIVED_EMAIL_CONTENT;
+
+ @Value("${email.content.running}")
+ private String START_RUNNING_EMAIL_CONTENT;
/**
* 提交job
@@ -156,7 +167,7 @@ public class JobService {
}
public Result getJobList(Integer type) {
- List jobs = jobMapper.selectJobList(type, 200);
+ List jobs = jobMapper.selectJobList(type);
return Result.success(jobs.stream().map(JobLessDto::parseJob).collect(Collectors.toList()));
}
diff --git a/src/main/resources/mapper/JobMapper.xml b/src/main/resources/mapper/JobMapper.xml
index a2603f3..f30ba9b 100644
--- a/src/main/resources/mapper/JobMapper.xml
+++ b/src/main/resources/mapper/JobMapper.xml
@@ -52,8 +52,9 @@
AND type = #{type}
+ AND create_time > DATE_SUB(CURDATE(), INTERVAL 3 MONTH)
ORDER BY job_id DESC
- LIMIT #{count}
+
\ No newline at end of file