Commit fdf82d24 authored by zhengjie's avatar zhengjie
Browse files

[代码优化](v2.6):定时任务告警邮箱优化,邮箱为空不调用发送逻辑

parent 9fc05249
...@@ -42,7 +42,6 @@ import java.util.concurrent.*; ...@@ -42,7 +42,6 @@ import java.util.concurrent.*;
* @date 2019-01-07 * @date 2019-01-07
*/ */
@Async @Async
@SuppressWarnings({"unchecked","all"})
public class ExecutionJob extends QuartzJobBean { public class ExecutionJob extends QuartzJobBean {
/** 该处仅供参考 */ /** 该处仅供参考 */
...@@ -108,8 +107,10 @@ public class ExecutionJob extends QuartzJobBean { ...@@ -108,8 +107,10 @@ public class ExecutionJob extends QuartzJobBean {
if(quartzJob.getEmail() != null){ if(quartzJob.getEmail() != null){
EmailService emailService = SpringContextHolder.getBean(EmailService.class); EmailService emailService = SpringContextHolder.getBean(EmailService.class);
// 邮箱报警 // 邮箱报警
EmailVo emailVo = taskAlarm(quartzJob, ThrowableUtil.getStackTrace(e)); if(StringUtils.isNoneBlank(quartzJob.getEmail())){
emailService.send(emailVo, emailService.find()); EmailVo emailVo = taskAlarm(quartzJob, ThrowableUtil.getStackTrace(e));
emailService.send(emailVo, emailService.find());
}
} }
} finally { } finally {
quartzLogRepository.save(log); quartzLogRepository.save(log);
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<log4jdbc.version>1.16</log4jdbc.version> <log4jdbc.version>1.16</log4jdbc.version>
<swagger.version>2.9.2</swagger.version> <swagger.version>2.9.2</swagger.version>
<fastjson.version>1.2.70</fastjson.version> <fastjson.version>1.2.70</fastjson.version>
<druid.version>1.1.22</druid.version> <druid.version>1.1.24</druid.version>
<commons-pool2.version>2.5.0</commons-pool2.version> <commons-pool2.version>2.5.0</commons-pool2.version>
<mapstruct.version>1.3.1.Final</mapstruct.version> <mapstruct.version>1.3.1.Final</mapstruct.version>
</properties> </properties>
......
Supports Markdown
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