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); }