From 54ac2338f50b1dd99dc02e81499e7ba6d3d73153 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 20 Aug 2024 11:54:09 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E6=97=A0=E5=8F=91=E4=BB=B6=E4=BA=BA=E6=97=B6=EF=BC=8C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/service/impl/SendMessageServiceImpl.java | 3 --- .../src/main/java/com/jero/quartz/job/MemberProjectJob.java | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index dfa96187..9c7fe977 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -101,9 +101,6 @@ public class SendMessageServiceImpl implements SendMessageService { // 1短信 2邮件 3系统 // 发送邮件 true String fromUser = sendMessageDTO.getFromUser(); - if (StringUtils.isBlank(fromUser)){ - fromUser = env.getProperty("message.systemEmailUser"); - } Integer sendEmailFlag = sendMessageDTO.getSendEmailFlag(); LoginUser loginUser = sysBaseAPI.getUserByName(fromUser); if(templateType.contains(ProjectCommon.MESSAGE_TYPE2) && !CommonConstant.DEL_FLAG_0.equals(sendEmailFlag)){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/quartz/job/MemberProjectJob.java b/jero-boot-incoming-payment/src/main/java/com/jero/quartz/job/MemberProjectJob.java index b579bdd5..c5ded65a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/quartz/job/MemberProjectJob.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/quartz/job/MemberProjectJob.java @@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; +import org.springframework.core.env.Environment; import javax.annotation.Resource; import java.util.Date; @@ -44,6 +45,8 @@ public class MemberProjectJob implements Job{ private SendMessageService sendMessageService; @Resource private IPayContactsManagementService payContactsManagementService; + @Resource + private Environment env; @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { @@ -71,7 +74,7 @@ public class MemberProjectJob implements Job{ } HashMap map = new HashMap<>(); map.put("expiredDay",offset.toString(DatePattern.CHINESE_DATE_PATTERN)); - sendMessageDTO.setFromUser(null); + sendMessageDTO.setFromUser(env.getProperty("message.systemEmailUser")); sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG17.getCode()); sendMessageDTO.setTemplateParam(map); sendMessageService.SendMessageService(sendMessageDTO);