From 51d7b4858bb3dbf61560419e943c4ef9d7744481 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 3 Mar 2023 10:58:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91PushMsgUtil.ja?= =?UTF-8?q?va=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/modules/message/util/PushMsgUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 fb5e83b2..6eb22c34 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,5 +1,6 @@ package com.jero.modules.message.util; +import com.alibaba.fastjson.JSON; import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; @@ -66,7 +67,7 @@ public class PushMsgUtil { content = stringWriter.toString(); sysMessage.setEsTitle(title); sysMessage.setEsContent(content); - sysMessage.setEsParam(JSONObject.toJSONString(map)); + sysMessage.setEsParam(JSON.toJSONString(map)); sysMessage.setEsSendTime(new Date()); sysMessage.setEsSendStatus(SendMsgStatusEnum.WAIT.getCode()); sysMessage.setEsSendNum(0); From 45bf9c857da548a61aac699a6614afe4acb53f49 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 3 Mar 2023 10:59:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90fix=20ESLint=E3=80=91src/component?= =?UTF-8?q?s/jero/JEasyCron?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/jero/JEasyCron/EasyCron.vue | 128 +++++++++++------- .../components/jero/JEasyCron/InputCron.vue | 4 +- .../components/jero/JEasyCron/tabs/day.vue | 65 +++++---- .../components/jero/JEasyCron/tabs/hour.vue | 2 +- .../components/jero/JEasyCron/tabs/minute.vue | 2 +- .../components/jero/JEasyCron/tabs/mixin.js | 5 +- .../components/jero/JEasyCron/tabs/month.vue | 2 +- .../components/jero/JEasyCron/tabs/second.vue | 2 +- .../components/jero/JEasyCron/tabs/week.vue | 10 +- .../components/jero/JEasyCron/tabs/year.vue | 2 +- .../components/jero/JEasyCron/validator.js | 2 +- 11 files changed, 131 insertions(+), 93 deletions(-) diff --git a/jero-web/src/components/jero/JEasyCron/EasyCron.vue b/jero-web/src/components/jero/JEasyCron/EasyCron.vue index 58d2e294..cef33b55 100644 --- a/jero-web/src/components/jero/JEasyCron/EasyCron.vue +++ b/jero-web/src/components/jero/JEasyCron/EasyCron.vue @@ -1,66 +1,66 @@