Commit a9436d29317b484615dad9ce0901a31e7bc94a01
1 parent
492b27cb
移除超时的在线用户 优化一些代码风格,增加test校验
Showing
3 changed files
with
10 additions
and
12 deletions
src/main/java/cn/iocoder/dashboard/modules/system/job/auth/SysUserSessionTimeoutJob.java
| ... | ... | @@ -21,10 +21,7 @@ public class SysUserSessionTimeoutJob implements JobHandler { |
| 21 | 21 | |
| 22 | 22 | @Override |
| 23 | 23 | public String execute(String param) throws Exception { |
| 24 | - log.info("[execute][执行任务:{}]", "移除超时的在线用户"); | |
| 25 | - long timeoutCount = sysUserSessionService.clearSessionTimeout(); | |
| 26 | - log.info("[execute][执行任务:{}:{}]", "移除超时的在线用户完成", timeoutCount); | |
| 27 | - return null; | |
| 24 | + return String.valueOf(sysUserSessionService.clearSessionTimeout()); | |
| 28 | 25 | } |
| 29 | 26 | |
| 30 | 27 | } | ... | ... |
src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java
src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java
| ... | ... | @@ -11,6 +11,7 @@ import cn.iocoder.dashboard.modules.system.service.auth.impl.SysUserSessionServi |
| 11 | 11 | import cn.iocoder.dashboard.modules.system.service.dept.impl.SysDeptServiceImpl; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.service.user.SysUserServiceImpl; |
| 14 | +import cn.iocoder.dashboard.util.AssertUtils; | |
| 14 | 15 | import cn.iocoder.dashboard.util.RandomUtils; |
| 15 | 16 | import org.junit.jupiter.api.Test; |
| 16 | 17 | import org.springframework.boot.test.mock.mockito.MockBean; |
| ... | ... | @@ -31,9 +32,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; |
| 31 | 32 | * @version 1.0 |
| 32 | 33 | * @since <pre>3月 8, 2021</pre> |
| 33 | 34 | */ |
| 34 | -@Import({ | |
| 35 | - SysUserSessionServiceImpl.class | |
| 36 | -}) | |
| 35 | +@Import( | |
| 36 | + SysUserSessionServiceImpl.class) | |
| 37 | 37 | public class SysUserSessionServiceImplTest extends BaseDbAndRedisUnitTest { |
| 38 | 38 | |
| 39 | 39 | @Resource |
| ... | ... | @@ -62,14 +62,17 @@ public class SysUserSessionServiceImplTest extends BaseDbAndRedisUnitTest { |
| 62 | 62 | .limit(expectedTimeoutCount) |
| 63 | 63 | .map(i -> RandomUtils.randomPojo(SysUserSessionDO.class, o -> o.setSessionTimeout(DateUtil.offsetSecond(new Date(), -1)))) |
| 64 | 64 | .collect(Collectors.toList()); |
| 65 | - prepareData.add(RandomUtils.randomPojo(SysUserSessionDO.class, o -> o.setSessionTimeout(DateUtil.offsetMinute(new Date(), 30)))); | |
| 65 | + SysUserSessionDO sessionDO = RandomUtils.randomPojo(SysUserSessionDO.class, o -> o.setSessionTimeout(DateUtil.offsetMinute(new Date(), 30))); | |
| 66 | + prepareData.add(sessionDO); | |
| 66 | 67 | prepareData.forEach(sysUserSessionMapper::insert); |
| 67 | 68 | |
| 68 | 69 | //清空超时数据 |
| 69 | 70 | long actualTimeoutCount = sysUserSessionService.clearSessionTimeout(); |
| 71 | + //校验 | |
| 70 | 72 | assertEquals(expectedTimeoutCount, actualTimeoutCount); |
| 71 | - Integer actualTotal = sysUserSessionMapper.selectCount(new QueryWrapperX<>()); | |
| 72 | - assertEquals(expectedTotal, actualTotal); | |
| 73 | + List<SysUserSessionDO> userSessionDOS = sysUserSessionMapper.selectList(); | |
| 74 | + assertEquals(expectedTotal, userSessionDOS.size()); | |
| 75 | + AssertUtils.assertPojoEquals(sessionDO, userSessionDOS.get(0), "updateTime"); | |
| 73 | 76 | } |
| 74 | 77 | |
| 75 | 78 | } | ... | ... |