diff --git a/src/main/java/com/newyetai/common/freemarker/util/FreeMarkerTemplateUtils.java b/src/main/java/com/newyetai/common/freemarker/util/FreeMarkerTemplateUtils.java index 3148cac..e3e732b 100644 --- a/src/main/java/com/newyetai/common/freemarker/util/FreeMarkerTemplateUtils.java +++ b/src/main/java/com/newyetai/common/freemarker/util/FreeMarkerTemplateUtils.java @@ -29,6 +29,7 @@ public class FreeMarkerTemplateUtils { CONFIGURATION.setDefaultEncoding("UTF-8"); CONFIGURATION.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER); CONFIGURATION.setCacheStorage(NullCacheStorage.INSTANCE); + CONFIGURATION.setClassicCompatible(true); } public static Template getTemplate(String templateName) throws IOException { diff --git a/src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeSendRecordServiceImpl.java b/src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeSendRecordServiceImpl.java index 57b37fd..37caaa6 100644 --- a/src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeSendRecordServiceImpl.java +++ b/src/main/java/com/newyetai/usercenter/notice/service/impl/NoticeSendRecordServiceImpl.java @@ -1,5 +1,6 @@ package com.newyetai.usercenter.notice.service.impl; +import com.newyetai.common.util.DateUtils; import java.util.List; import java.util.Map; import java.util.Set; @@ -129,6 +130,8 @@ public class NoticeSendRecordServiceImpl implements NoticeSendRecordService { log.error("无对应消息通道处理..."); } Set receiverUserIds = noticeSendRecordOperateDTO.getReceiverUserIds(); + // 内置发送时间 + noticeSendRecordOperateDTO.getContentParamDataMap().put("defaultSendDay", DateUtils.getCurrentYmd()); NoticeSendRecordDTO noticeSendRecordDTO = NoticeSendRecordDTO.builder().templateId(noticeSendRecordOperateDTO.getTemplateId()) .senderOrgId(noticeSendRecordOperateDTO.getOperateOrgId())