From b7c453d2d589fd0822eeec0d60d4d57479ec17a4 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 4 Sep 2019 10:10:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=99=A4=E6=AD=A7=E4=B9=89=EF=BC=8C?= =?UTF-8?q?=E5=BB=B6=E8=BF=9F=E6=8E=A8=E9=80=81=E6=94=B9=E4=B8=BA=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E6=8E=A8=E9=80=81=EF=BC=8C=E5=90=88=E5=B9=B6=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E4=B9=9F=E6=98=AF=E5=BB=B6=E8=BF=9F=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E7=A7=8D=EF=BC=8C=E5=90=88=E5=B9=B6=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E8=A1=A8=E7=A4=BA=EF=BC=9A=E4=B8=8D=E9=87=8D=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E9=80=9A=E7=9F=A5=E8=BF=9B=E8=A1=8C=E6=B1=87=E6=80=BB?= =?UTF-8?q?=EF=BC=8C30=E5=88=86=E9=92=9F=E6=88=96=E6=9B=B4=E9=95=BF?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=B8=80=E6=AC=A1=EF=BC=8C=E5=B0=86=E5=A4=9A?= =?UTF-8?q?=E6=9D=A1=E6=B6=88=E6=81=AF=E5=90=88=E5=B9=B6=E4=B8=BA=E4=B8=80?= =?UTF-8?q?=E6=9D=A1=E6=B6=88=E6=81=AF=E5=BB=B6=E8=BF=9F=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=BB=99=E7=94=A8=E6=88=B7=EF=BC=8C=E5=92=8C=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E5=BB=B6=E8=BF=9F=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E4=B8=8D=E6=98=AF=E4=B8=80=E5=9B=9E=E4=BA=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jeesite/modules/sys/db/InitCoreData.java | 2 +- .../core/src/test/java/com/jeesite/test/MsgPushTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java index 814df633..97de023d 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java @@ -387,7 +387,7 @@ public class InitCoreData extends BaseInitDataTests { job.setStatus(JobEntity.STATUS_PAUSED); jobDao.insert(job); job = new JobEntity(MsgLocalMergePushTask.class.getSimpleName(), "SYSTEM"); - job.setDescription("消息推送服务 (延迟推送)"); + job.setDescription("消息推送服务 (合并推送)"); job.setInvokeTarget("msgLocalMergePushTask.execute()"); job.setCronExpression("0 0/30 * * * ?"); job.setConcurrent(Global.NO); diff --git a/modules/core/src/test/java/com/jeesite/test/MsgPushTest.java b/modules/core/src/test/java/com/jeesite/test/MsgPushTest.java index 088a5078..4445e063 100644 --- a/modules/core/src/test/java/com/jeesite/test/MsgPushTest.java +++ b/modules/core/src/test/java/com/jeesite/test/MsgPushTest.java @@ -72,7 +72,7 @@ public class MsgPushTest extends BaseSpringContextTests { MsgPushUtils.push(msgContent, "BizKey", "BizType", "system"); // 定时推送消息 MsgPushUtils.push(msgContent, "BizKey", "BizType", "system", DateUtils.parseDate("2018-05-05 08:30")); - // 延迟推送消息 + // 合并推送消息 MsgPushUtils.push(msgContent, "BizKey", "BizType", "system", new Date(), Global.YES); } @@ -84,7 +84,7 @@ public class MsgPushTest extends BaseSpringContextTests { MsgPushUtils.push(msgContent, "BizKey", "BizType", "system"); // 定时推送消息 MsgPushUtils.push(msgContent, "BizKey", "BizType", "system", DateUtils.parseDate("2018-05-05 08:30")); - // 延迟推送消息 + // 合并推送消息 MsgPushUtils.push(msgContent, "BizKey", "BizType", "system", new Date(), Global.YES); } @@ -96,7 +96,7 @@ public class MsgPushTest extends BaseSpringContextTests { MsgPushUtils.push(msgContent, "BizKey", "BizType", "system"); // 定时推送消息 MsgPushUtils.push(msgContent, "BizKey", "BizType", "system", DateUtils.parseDate("2018-05-05 08:30")); - // 延迟推送消息 + // 合并推送消息 MsgPushUtils.push(msgContent, "BizKey", "BizType", "system", new Date(), Global.YES); } @@ -108,7 +108,7 @@ public class MsgPushTest extends BaseSpringContextTests { MsgPushUtils.push(msgContent, "BizKey", "BizType", "system"); // 定时推送消息 MsgPushUtils.push(msgContent, "BizKey", "BizType", "system", DateUtils.parseDate("2018-05-05 08:30")); - // 延迟推送消息 + // 合并推送消息 MsgPushUtils.push(msgContent, "BizKey", "BizType", "system", new Date(), Global.YES); }