yudao
/
spring-cloud
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/YunaiV/yudao-cloud

pull/37/MERGE
YunaiV 2023-06-17 14:21:29 +08:00
parent 20cb26fb05 2cac29d7d1
commit fb60881aa7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-dependencies/pom.xml
View File

@ -60,10 +60,10 @@
<velocity.version>2.3</velocity.version> <velocity.version>2.3</velocity.version>
<screw.version>1.0.5</screw.version> <screw.version>1.0.5</screw.version>
<fastjson.version>1.2.83</fastjson.version> <fastjson.version>1.2.83</fastjson.version>
<guava.version>31.1-jre</guava.version> <guava.version>32.0.0-jre</guava.version>
<guice.version>5.1.0</guice.version> <guice.version>5.1.0</guice.version>
<transmittable-thread-local.version>2.14.2</transmittable-thread-local.version> <transmittable-thread-local.version>2.14.2</transmittable-thread-local.version>
<commons-net.version>3.8.0</commons-net.version> <commons-net.version>3.9.0</commons-net.version>
<jsch.version>0.1.55</jsch.version> <jsch.version>0.1.55</jsch.version>
<tika-core.version>2.7.0</tika-core.version> <tika-core.version>2.7.0</tika-core.version>
<netty-all.version>4.1.90.Final</netty-all.version> <netty-all.version>4.1.90.Final</netty-all.version>

6
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java
View File

@ -17,7 +17,7 @@ import javax.annotation.Resource;
import java.util.Map; import java.util.Map;
import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.hutool.core.util.RandomUtil.randomEle;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
@ -140,7 +140,7 @@ public class MailLogServiceImplTest extends BaseDbUnitTest {
o.setAccountId(10L); o.setAccountId(10L);
o.setTemplateId(100L); o.setTemplateId(100L);
o.setSendStatus(MailSendStatusEnum.INIT.getStatus()); o.setSendStatus(MailSendStatusEnum.INIT.getStatus());
o.setSendTime(buildTime(2023, 2, 10)); o.setSendTime(buildLocalDateTime(2023, 2, 10));
o.setTemplateParams(randomTemplateParams()); o.setTemplateParams(randomTemplateParams());
}); });
mailLogMapper.insert(dbMailLog); mailLogMapper.insert(dbMailLog);
@ -157,7 +157,7 @@ public class MailLogServiceImplTest extends BaseDbUnitTest {
// 测试 sendStatus 不匹配 // 测试 sendStatus 不匹配
mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setSendStatus(MailSendStatusEnum.SUCCESS.getStatus()))); mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setSendStatus(MailSendStatusEnum.SUCCESS.getStatus())));
// 测试 sendTime 不匹配 // 测试 sendTime 不匹配
mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setSendTime(buildTime(2023, 3, 10)))); mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setSendTime(buildLocalDateTime(2023, 3, 10))));
// 准备参数 // 准备参数
MailLogPageReqVO reqVO = new MailLogPageReqVO(); MailLogPageReqVO reqVO = new MailLogPageReqVO();
reqVO.setUserId(1L); reqVO.setUserId(1L);