diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/util/PushMsgUtil.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/util/PushMsgUtil.java index 6eb22c34..3aeaa803 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/util/PushMsgUtil.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/util/PushMsgUtil.java @@ -1,19 +1,17 @@ package com.jero.modules.message.util; import com.alibaba.fastjson.JSON; -import freemarker.template.Configuration; -import freemarker.template.Template; -import freemarker.template.TemplateException; import com.jero.modules.message.entity.SysMessage; import com.jero.modules.message.entity.SysMessageTemplate; import com.jero.modules.message.handle.enums.SendMsgStatusEnum; import com.jero.modules.message.service.ISysMessageService; import com.jero.modules.message.service.ISysMessageTemplateService; +import freemarker.template.Configuration; +import freemarker.template.Template; +import freemarker.template.TemplateException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.alibaba.fastjson.JSONObject; - import java.io.IOException; import java.io.StringWriter; import java.util.Date; @@ -44,7 +42,7 @@ public class PushMsgUtil { public boolean sendMessage(String msgType, String templateCode, Map map, String sentTo) { List sysSmsTemplates = sysMessageTemplateService.selectByCode(templateCode); SysMessage sysMessage = new SysMessage(); - if (sysSmsTemplates.size() > 0) { + if (!sysSmsTemplates.isEmpty()) { SysMessageTemplate sysSmsTemplate = sysSmsTemplates.get(0); sysMessage.setEsType(msgType); sysMessage.setEsReceiver(sentTo); @@ -57,10 +55,7 @@ public class PushMsgUtil { try { template = new Template("SysMessageTemplate", content, freemarkerConfig); template.process(map, stringWriter); - } catch (IOException e) { - e.printStackTrace(); - return false; - } catch (TemplateException e) { + } catch (IOException |TemplateException e) { e.printStackTrace(); return false; }