From 7bcf1095ffc563d3e6dcd4f9c1e02b07fa000ded Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 28 Aug 2018 22:12:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95=E5=AE=8C=E5=96=84=EF=BC=9B=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=8E=A8=E9=80=81=E7=9A=84PC=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BF=AE=E6=AD=A3=EF=BC=9B=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BC=98=E5=8C=96=E4=BF=AE=E6=AD=A3=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/test/MsgPushTest.java    | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

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 7fa1d33f..aeb466c3 100644
--- a/modules/core/src/test/java/com/jeesite/test/MsgPushTest.java
+++ b/modules/core/src/test/java/com/jeesite/test/MsgPushTest.java
@@ -18,7 +18,7 @@ import com.jeesite.modules.msg.entity.content.AppMsgContent;
 import com.jeesite.modules.msg.entity.content.EmailMsgContent;
 import com.jeesite.modules.msg.entity.content.PcMsgContent;
 import com.jeesite.modules.msg.entity.content.SmsMsgContent;
-import com.jeesite.modules.msg.service.MsgPushService;
+import com.jeesite.modules.msg.task.impl.MsgLocalMergePushTask;
 import com.jeesite.modules.msg.task.impl.MsgLocalPushTask;
 import com.jeesite.modules.msg.utils.MsgPushUtils;
 
@@ -34,22 +34,17 @@ public class MsgPushTest extends BaseSpringContextTests {
 
 	@Test
 	public void testSend(){
-		for (int i=0; i<3; i++){
+		for (int i=0; i<1; i++){
 			testPC();
 			testApp();
 			testSMS();
 			testMail();
+			testMailTpl();
+		}
+		for (int j=0; j<3; j++){
+			testTaskMergePush();
+			testTaskPush();
 		}
-//		testTask();
-	}
-	
-	@Autowired
-	private MsgPushService msgPushService;
-	
-	public void testTask(){
-		MsgLocalPushTask task = new MsgLocalPushTask();
-		task.setMsgPushService(msgPushService);
-		task.execute();
 	}
 	
 	public void testPC(){
@@ -101,4 +96,27 @@ public class MsgPushTest extends BaseSpringContextTests {
 		MsgPushUtils.push(msgContent, "BizKey", "BizType", "system", new Date(), Global.YES);
 	}
 	
+	public void testMailTpl(){
+		EmailMsgContent msgContent = new EmailMsgContent();
+		msgContent.setTitle("提示信息");
+		msgContent.setTplKey("mail_send_test");
+		msgContent.addTplData("keyword1", "小王");
+		msgContent.addTplData("keyword2", "2018-8-28 20:00");
+		msgContent.addTplData("keyword3", "ERP项目方案讨论视频会议");
+		// 即时推送模板消息，模板内容：你好，${keyword1}，请于 ${keyword2}，准时参加${keyword3}
+		MsgPushUtils.push(msgContent, "BizKey", "BizType", "system");
+	}
+	
+	@Autowired
+	private MsgLocalMergePushTask msgLocalMergePushTask;
+	public void testTaskMergePush(){
+		msgLocalMergePushTask.execute();
+	}
+	
+	@Autowired
+	private MsgLocalPushTask msgLocalPushTask;
+	public void testTaskPush(){
+		msgLocalPushTask.execute();
+	}
+	
 }