From fdf82d2479dbfbd2a68cc8ebb8a409279edef3e7 Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Fri, 29 Jan 2021 15:04:37 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6)?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E4=BC=98=E5=8C=96=EF=BC=8C=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E4=B8=8D=E8=B0=83=E7=94=A8=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/zhengjie/modules/quartz/utils/ExecutionJob.java     | 7 ++++---
 pom.xml                                                    | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java
index 798f9c35..8e261850 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java
@@ -42,7 +42,6 @@ import java.util.concurrent.*;
  * @date 2019-01-07
  */
 @Async
-@SuppressWarnings({"unchecked","all"})
 public class ExecutionJob extends QuartzJobBean {
 
     /** 该处仅供参考 */
@@ -108,8 +107,10 @@ public class ExecutionJob extends QuartzJobBean {
             if(quartzJob.getEmail() != null){
                 EmailService emailService = SpringContextHolder.getBean(EmailService.class);
                 // 邮箱报警
-                EmailVo emailVo = taskAlarm(quartzJob, ThrowableUtil.getStackTrace(e));
-                emailService.send(emailVo, emailService.find());
+                if(StringUtils.isNoneBlank(quartzJob.getEmail())){
+                    EmailVo emailVo = taskAlarm(quartzJob, ThrowableUtil.getStackTrace(e));
+                    emailService.send(emailVo, emailService.find());
+                }
             }
         } finally {
             quartzLogRepository.save(log);
diff --git a/pom.xml b/pom.xml
index b8fe4a46..a69c5d0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
         <log4jdbc.version>1.16</log4jdbc.version>
         <swagger.version>2.9.2</swagger.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>
         <mapstruct.version>1.3.1.Final</mapstruct.version>
     </properties>