From cf32a01466575225e41556732b862bcf2fb36eb1 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Tue, 7 Mar 2023 16:16:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20SysMessageM?= =?UTF-8?q?apper.java=20=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/message/mapper/SysMessageMapper.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/SysMessageMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/SysMessageMapper.java index c8591222..b40c8cdc 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/SysMessageMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/SysMessageMapper.java @@ -1,10 +1,7 @@ package com.jero.modules.message.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.message.entity.SysMessage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.message.entity.SysMessage; /** * @Description: 消息 From 6c03356a7e8970bc9952095175100e5bf9bad0ff Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Tue, 7 Mar 2023 16:19:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20PushMsgUtil?= =?UTF-8?q?.java=20=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/message/util/PushMsgUtil.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) 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; }