manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级到 Spring Boot 2.0.5 以及相关依赖库全面升级，采用J2Cache作为缓存。

Browse Source
This commit is contained in:
thinkgem
2018-09-22 21:12:45 +08:00
parent c9ecd3cfc8
commit d9e18a70c7
71 changed files with 3664 additions and 1138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/core/src/test/java/com/jeesite/test/MsgPushTest.java
View File

@@ -4,6 +4,7 @@
package com.jeesite.test;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
@@ -15,14 +16,17 @@ import org.springframework.test.context.ActiveProfiles;
import com.jeesite.common.config.Global;
import com.jeesite.common.lang.DateUtils;
import com.jeesite.common.tests.BaseSpringContextTests;
import com.jeesite.modules.msg.entity.MsgTemplate;
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.MsgTemplateService;
import com.jeesite.modules.msg.task.impl.MsgLocalMergePushTask;
import com.jeesite.modules.msg.task.impl.MsgLocalPushTask;
import com.jeesite.modules.msg.utils.MsgPushUtils;
import com.jeesite.modules.sys.entity.User;
import com.jeesite.modules.sys.service.UserService;
import com.jeesite.modules.sys.utils.UserUtils;
/**
@@ -35,11 +39,16 @@ import com.jeesite.modules.sys.utils.UserUtils;
@Rollback(false)
public class MsgPushTest extends BaseSpringContextTests {
@Autowired
private UserService userService;
@Test
public void testSend(){
User user = UserUtils.get("system");
if (StringUtils.isAnyBlank(user.getMobile(), user.getEmail())){
throw new RuntimeException("请设置system用户的手机号码和邮箱地址");
user.setMobile("18555555555");
user.setEmail("test@163.com");
userService.updateUserInfo(user);
}
for (int i=0; i<1; i++){
testPC();
@@ -102,10 +111,22 @@ public class MsgPushTest extends BaseSpringContextTests {
// 延迟推送消息
MsgPushUtils.push(msgContent, "BizKey", "BizType", "system", new Date(), Global.YES);
}
@Autowired
private MsgTemplateService msgTemplateService;
public void testMailTpl(){
MsgTemplate msgTemplate = new MsgTemplate();
msgTemplate.setTplKey("mail_send_test");
List<MsgTemplate> tplList = msgTemplateService.findList(msgTemplate);
if (tplList.size() == 0){
msgTemplate.setTplName("邮件提示信息");
msgTemplate.setTplContent("你好，${keyword1}，请于 ${keyword2}，准时参加${keyword3}");
msgTemplate.setTplType("email");
msgTemplateService.save(msgTemplate);
}
EmailMsgContent msgContent = new EmailMsgContent();
msgContent.setTitle("提示信息");
msgContent.setTitle("邮件提示信息");
msgContent.setTplKey("mail_send_test");
msgContent.addTplData("keyword1", "小王");
msgContent.addTplData("keyword2", "2018-8-28 20:00");