Commit d4cf20746349b753dd48036e330c8d9f31eb7902
1 parent
e35dde12
项目结构调整 x 5
Showing
37 changed files
with
197 additions
and
121 deletions
pom.xml
| ... | ... | @@ -9,10 +9,9 @@ |
| 9 | 9 | <version>${revision}</version> |
| 10 | 10 | <packaging>pom</packaging> |
| 11 | 11 | <modules> |
| 12 | -<!-- <module>yudao-dependencies</module>--> | |
| 13 | -<!-- <module>yudao-framework</module>--> | |
| 14 | - <module>yudao-admin-server</module> | |
| 12 | + <module>yudao-dependencies</module> | |
| 15 | 13 | <module>yudao-framework</module> |
| 14 | + <module>yudao-admin-server</module> | |
| 16 | 15 | </modules> |
| 17 | 16 | |
| 18 | 17 | <name>yudao</name> |
| ... | ... | @@ -23,4 +22,16 @@ |
| 23 | 22 | <revision>1.0.0</revision> |
| 24 | 23 | </properties> |
| 25 | 24 | |
| 25 | + <dependencyManagement> | |
| 26 | + <dependencies> | |
| 27 | + <dependency> | |
| 28 | + <groupId>cn.iocoder.boot</groupId> | |
| 29 | + <artifactId>yudao-dependencies</artifactId> | |
| 30 | + <version>${revision}</version> | |
| 31 | + <type>pom</type> | |
| 32 | + <scope>import</scope> | |
| 33 | + </dependency> | |
| 34 | + </dependencies> | |
| 35 | + </dependencyManagement> | |
| 36 | + | |
| 26 | 37 | </project> | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java
| ... | ... | @@ -23,9 +23,9 @@ import java.util.function.Consumer; |
| 23 | 23 | |
| 24 | 24 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 25 | 25 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*; |
| 26 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 27 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 28 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 26 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 27 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 28 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 29 | 29 | import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; |
| 30 | 30 | import static org.junit.jupiter.api.Assertions.*; |
| 31 | 31 | import static org.mockito.Mockito.times; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java
| ... | ... | @@ -16,10 +16,10 @@ import javax.annotation.Resource; |
| 16 | 16 | |
| 17 | 17 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.FILE_NOT_EXISTS; |
| 18 | 18 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_PATH_EXISTS; |
| 19 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 20 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 21 | -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; | |
| 22 | -import static cn.iocoder.dashboard.util.RandomUtils.randomString; | |
| 19 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 20 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 21 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; | |
| 22 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; | |
| 23 | 23 | import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; |
| 24 | 24 | import static org.junit.jupiter.api.Assertions.*; |
| 25 | 25 | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.job; |
| 2 | 2 | |
| 3 | 3 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 4 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 5 | -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; | |
| 6 | -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; | |
| 7 | -import static cn.iocoder.dashboard.util.RandomUtils.randomString; | |
| 4 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 5 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; | |
| 6 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; | |
| 7 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; | |
| 8 | 8 | import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; |
| 9 | 9 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 10 | 10 | import static org.junit.jupiter.api.Assertions.assertNotNull; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java
| ... | ... | @@ -7,10 +7,10 @@ import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB |
| 7 | 7 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_HANDLER_EXISTS; |
| 8 | 8 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_NOT_EXISTS; |
| 9 | 9 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_UPDATE_ONLY_NORMAL_STATUS; |
| 10 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 11 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 12 | -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; | |
| 13 | -import static cn.iocoder.dashboard.util.RandomUtils.randomString; | |
| 10 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 11 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 12 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; | |
| 13 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; | |
| 14 | 14 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 15 | 15 | import static org.junit.jupiter.api.Assertions.assertNotNull; |
| 16 | 16 | import static org.junit.jupiter.api.Assertions.assertNull; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java
| ... | ... | @@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfA |
| 11 | 11 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; |
| 12 | 12 | import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiAccessLogMapper; |
| 13 | 13 | import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiAccessLogServiceImpl; |
| 14 | -import cn.iocoder.dashboard.util.RandomUtils; | |
| 14 | +import cn.iocoder.dashboard.util.test.RandomUtils; | |
| 15 | 15 | import cn.iocoder.dashboard.util.object.ObjectUtils; |
| 16 | 16 | import org.junit.jupiter.api.Test; |
| 17 | 17 | import org.springframework.context.annotation.Import; |
| ... | ... | @@ -21,7 +21,7 @@ import java.util.Date; |
| 21 | 21 | import java.util.List; |
| 22 | 22 | import java.util.concurrent.Future; |
| 23 | 23 | |
| 24 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 24 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 25 | 25 | import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; |
| 26 | 26 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 27 | 27 | import static org.junit.jupiter.api.Assertions.assertNotNull; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java
| ... | ... | @@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO |
| 11 | 11 | import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiErrorLogMapper; |
| 12 | 12 | import cn.iocoder.dashboard.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum; |
| 13 | 13 | import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiErrorLogServiceImpl; |
| 14 | -import cn.iocoder.dashboard.util.RandomUtils; | |
| 14 | +import cn.iocoder.dashboard.util.test.RandomUtils; | |
| 15 | 15 | import cn.iocoder.dashboard.util.object.ObjectUtils; |
| 16 | 16 | import org.junit.jupiter.api.Test; |
| 17 | 17 | import org.springframework.context.annotation.Import; |
| ... | ... | @@ -23,8 +23,8 @@ import java.util.concurrent.Future; |
| 23 | 23 | |
| 24 | 24 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_NOT_FOUND; |
| 25 | 25 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED; |
| 26 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 27 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 26 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 27 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 28 | 28 | import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; |
| 29 | 29 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 30 | 30 | import static org.junit.jupiter.api.Assertions.assertNotNull; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java
| ... | ... | @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 15 | -import cn.iocoder.dashboard.util.AssertUtils; | |
| 15 | +import cn.iocoder.dashboard.util.test.AssertUtils; | |
| 16 | 16 | import org.junit.jupiter.api.Test; |
| 17 | 17 | import org.springframework.boot.test.mock.mockito.MockBean; |
| 18 | 18 | import org.springframework.context.annotation.Import; |
| ... | ... | @@ -28,8 +28,8 @@ import javax.annotation.Resource; |
| 28 | 28 | import java.util.Set; |
| 29 | 29 | |
| 30 | 30 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 31 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 32 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 31 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 32 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 33 | 33 | import static java.util.Collections.singleton; |
| 34 | 34 | import static org.junit.jupiter.api.Assertions.*; |
| 35 | 35 | import static org.mockito.ArgumentMatchers.eq; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.auth; |
| 2 | 2 | |
| 3 | 3 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 4 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 5 | -import static cn.iocoder.dashboard.util.RandomUtils.randomDate; | |
| 6 | -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; | |
| 7 | -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; | |
| 8 | -import static cn.iocoder.dashboard.util.RandomUtils.randomString; | |
| 4 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 5 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomDate; | |
| 6 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; | |
| 7 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; | |
| 8 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; | |
| 9 | 9 | import static cn.iocoder.dashboard.util.date.DateUtils.addTime; |
| 10 | 10 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 11 | 11 | import static org.junit.jupiter.api.Assertions.assertNotEquals; |
| ... | ... | @@ -42,8 +42,8 @@ import cn.iocoder.dashboard.modules.system.service.auth.impl.SysUserSessionServi |
| 42 | 42 | import cn.iocoder.dashboard.modules.system.service.dept.impl.SysDeptServiceImpl; |
| 43 | 43 | import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl; |
| 44 | 44 | import cn.iocoder.dashboard.modules.system.service.user.SysUserServiceImpl; |
| 45 | -import cn.iocoder.dashboard.util.AssertUtils; | |
| 46 | -import cn.iocoder.dashboard.util.RandomUtils; | |
| 45 | +import cn.iocoder.dashboard.util.test.AssertUtils; | |
| 46 | +import cn.iocoder.dashboard.util.test.RandomUtils; | |
| 47 | 47 | import cn.iocoder.dashboard.util.object.ObjectUtils; |
| 48 | 48 | |
| 49 | 49 | /** | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Import; |
| 10 | 10 | |
| 11 | 11 | import javax.annotation.Resource; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.util.RandomUtils.randomString; | |
| 13 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; | |
| 14 | 14 | import static org.junit.jupiter.api.Assertions.*; |
| 15 | 15 | |
| 16 | 16 | @Import({SysCaptchaServiceImpl.class, CaptchaProperties.class, SysCaptchaRedisDAO.class}) | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java
| ... | ... | @@ -26,9 +26,9 @@ import java.util.function.Consumer; |
| 26 | 26 | import static cn.hutool.core.bean.BeanUtil.getFieldValue; |
| 27 | 27 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 28 | 28 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 29 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 30 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 31 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 29 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 30 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 31 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 32 | 32 | import static org.junit.jupiter.api.Assertions.*; |
| 33 | 33 | import static org.mockito.Mockito.times; |
| 34 | 34 | import static org.mockito.Mockito.verify; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java
| ... | ... | @@ -21,10 +21,10 @@ import java.util.function.Consumer; |
| 21 | 21 | |
| 22 | 22 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 23 | 23 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 24 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 25 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 26 | -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; | |
| 27 | -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; | |
| 24 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 25 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 26 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; | |
| 27 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; | |
| 28 | 28 | import static org.junit.jupiter.api.Assertions.*; |
| 29 | 29 | |
| 30 | 30 | /** | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java
| ... | ... | @@ -26,9 +26,9 @@ import java.util.function.Consumer; |
| 26 | 26 | |
| 27 | 27 | import static cn.hutool.core.bean.BeanUtil.getFieldValue; |
| 28 | 28 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 29 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 30 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 31 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 29 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 30 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 31 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 32 | 32 | import static org.junit.jupiter.api.Assertions.*; |
| 33 | 33 | import static org.mockito.ArgumentMatchers.eq; |
| 34 | 34 | import static org.mockito.Mockito.*; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java
| ... | ... | @@ -22,9 +22,9 @@ import java.util.function.Consumer; |
| 22 | 22 | |
| 23 | 23 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 24 | 24 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 25 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 26 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 27 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 25 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 26 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 27 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 28 | 28 | import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; |
| 29 | 29 | import static org.junit.jupiter.api.Assertions.*; |
| 30 | 30 | import static org.mockito.ArgumentMatchers.eq; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java
| ... | ... | @@ -27,9 +27,9 @@ import java.util.function.Consumer; |
| 27 | 27 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 28 | 28 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_DUPLICATE; |
| 29 | 29 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_NOT_EXISTS; |
| 30 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 31 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 32 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 30 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 31 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 32 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 33 | 33 | import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; |
| 34 | 34 | import static org.junit.jupiter.api.Assertions.*; |
| 35 | 35 | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.logger; |
| 2 | 2 | |
| 3 | -import cn.hutool.core.util.ArrayUtil; | |
| 4 | 3 | import cn.hutool.core.util.RandomUtil; |
| 5 | -import cn.hutool.core.util.ReflectUtil; | |
| 6 | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 7 | 5 | import cn.iocoder.dashboard.common.pojo.PageResult; |
| 8 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 9 | 6 | import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; |
| 10 | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; |
| 11 | 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; |
| ... | ... | @@ -15,18 +12,15 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysLoginLogMapper; |
| 15 | 12 | import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum; |
| 16 | 13 | import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum; |
| 17 | 14 | import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl; |
| 18 | -import cn.iocoder.dashboard.util.RandomUtils; | |
| 15 | +import cn.iocoder.dashboard.util.test.RandomUtils; | |
| 19 | 16 | import cn.iocoder.dashboard.util.object.ObjectUtils; |
| 20 | 17 | import org.junit.jupiter.api.Test; |
| 21 | 18 | import org.springframework.context.annotation.Import; |
| 22 | 19 | |
| 23 | 20 | import javax.annotation.Resource; |
| 24 | -import java.lang.reflect.Field; | |
| 25 | -import java.util.Arrays; | |
| 26 | 21 | import java.util.List; |
| 27 | -import java.util.stream.Collectors; | |
| 28 | 22 | |
| 29 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 23 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 30 | 24 | import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; |
| 31 | 25 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 32 | 26 | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java
| ... | ... | @@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysOperateLogMapper; |
| 16 | 16 | import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; |
| 17 | 17 | import cn.iocoder.dashboard.modules.system.service.logger.impl.SysOperateLogServiceImpl; |
| 18 | 18 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 19 | -import cn.iocoder.dashboard.util.RandomUtils; | |
| 19 | +import cn.iocoder.dashboard.util.test.RandomUtils; | |
| 20 | 20 | import cn.iocoder.dashboard.util.object.ObjectUtils; |
| 21 | 21 | import org.junit.jupiter.api.Test; |
| 22 | 22 | import org.springframework.boot.test.mock.mockito.MockBean; |
| ... | ... | @@ -27,8 +27,8 @@ import java.util.*; |
| 27 | 27 | import java.util.concurrent.ExecutionException; |
| 28 | 28 | import java.util.concurrent.Future; |
| 29 | 29 | |
| 30 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 31 | -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; | |
| 30 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 31 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; | |
| 32 | 32 | import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; |
| 33 | 33 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 34 | 34 | import static org.mockito.Mockito.when; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java
| ... | ... | @@ -20,10 +20,10 @@ import java.util.function.Consumer; |
| 20 | 20 | |
| 21 | 21 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 22 | 22 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.NOTICE_NOT_FOUND; |
| 23 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 24 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 25 | -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; | |
| 26 | -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; | |
| 23 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 24 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 25 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; | |
| 26 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; | |
| 27 | 27 | import static org.junit.jupiter.api.Assertions.*; |
| 28 | 28 | |
| 29 | 29 | @Import(SysNoticeServiceImpl.class) |
| ... | ... | @@ -161,4 +161,4 @@ class SysNoticeServiceImplTest extends BaseDbUnitTest { |
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | |
| 164 | -} | |
| 165 | 164 | \ No newline at end of file |
| 165 | +} | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java
| ... | ... | @@ -13,7 +13,7 @@ import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.service.permission.impl.SysMenuServiceImpl; |
| 15 | 15 | import cn.iocoder.dashboard.util.sping.SpringAopUtils; |
| 16 | -import cn.iocoder.dashboard.util.RandomUtils; | |
| 16 | +import cn.iocoder.dashboard.util.test.RandomUtils; | |
| 17 | 17 | import cn.iocoder.dashboard.util.object.ObjectUtils; |
| 18 | 18 | import com.google.common.collect.Multimap; |
| 19 | 19 | import org.junit.jupiter.api.Assertions; |
| ... | ... | @@ -25,9 +25,9 @@ import javax.annotation.Resource; |
| 25 | 25 | import java.util.*; |
| 26 | 26 | |
| 27 | 27 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 28 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 29 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 30 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 28 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 29 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 30 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 31 | 31 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 32 | 32 | import static org.mockito.Mockito.verify; |
| 33 | 33 | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java
| ... | ... | @@ -14,9 +14,9 @@ import org.springframework.context.annotation.Import; |
| 14 | 14 | import javax.annotation.Resource; |
| 15 | 15 | import java.util.List; |
| 16 | 16 | |
| 17 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 18 | -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; | |
| 19 | -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; | |
| 17 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 18 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; | |
| 19 | +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; | |
| 20 | 20 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 21 | 21 | import static org.mockito.Mockito.verify; |
| 22 | 22 | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java
| ... | ... | @@ -23,9 +23,9 @@ import java.util.*; |
| 23 | 23 | import java.util.stream.Collectors; |
| 24 | 24 | |
| 25 | 25 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 26 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 27 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 28 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 26 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 27 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 28 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 29 | 29 | import static cn.iocoder.dashboard.util.object.ObjectUtils.max; |
| 30 | 30 | import static org.junit.jupiter.api.Assertions.*; |
| 31 | 31 | import static org.mockito.Mockito.verify; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java
| ... | ... | @@ -25,8 +25,8 @@ import java.util.function.Consumer; |
| 25 | 25 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 26 | 26 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN; |
| 27 | 27 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS; |
| 28 | -import static cn.iocoder.dashboard.util.AssertUtils.*; | |
| 29 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 28 | +import static cn.iocoder.dashboard.util.test.AssertUtils.*; | |
| 29 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 30 | 30 | import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; |
| 31 | 31 | import static cn.iocoder.dashboard.util.object.ObjectUtils.max; |
| 32 | 32 | import static org.junit.jupiter.api.Assertions.*; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java
| ... | ... | @@ -27,8 +27,8 @@ import java.util.function.Consumer; |
| 27 | 27 | |
| 28 | 28 | import static cn.hutool.core.util.RandomUtil.randomBoolean; |
| 29 | 29 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 30 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 31 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 30 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 31 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 32 | 32 | import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; |
| 33 | 33 | import static org.junit.jupiter.api.Assertions.*; |
| 34 | 34 | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.sms; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.map.MapUtil; |
| 4 | -import cn.iocoder.dashboard.BaseMockitoUnitTest; | |
| 4 | +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; | |
| 5 | 5 | import cn.iocoder.dashboard.common.core.KeyValue; |
| 6 | 6 | import cn.iocoder.dashboard.common.enums.CommonStatusEnum; |
| 7 | 7 | import cn.iocoder.dashboard.common.enums.UserTypeEnum; |
| ... | ... | @@ -25,8 +25,8 @@ import java.util.Map; |
| 25 | 25 | |
| 26 | 26 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 27 | 27 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 28 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 29 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 28 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 29 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 30 | 30 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 31 | 31 | import static org.mockito.ArgumentMatchers.eq; |
| 32 | 32 | import static org.mockito.Mockito.*; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java
| ... | ... | @@ -34,9 +34,9 @@ import java.util.function.Consumer; |
| 34 | 34 | import static cn.hutool.core.bean.BeanUtil.getFieldValue; |
| 35 | 35 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 36 | 36 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 37 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 38 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 39 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 37 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 38 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 39 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 40 | 40 | import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; |
| 41 | 41 | import static cn.iocoder.dashboard.util.object.ObjectUtils.max; |
| 42 | 42 | import static org.junit.jupiter.api.Assertions.*; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java
| ... | ... | @@ -35,9 +35,9 @@ import java.util.function.Consumer; |
| 35 | 35 | import static cn.hutool.core.util.RandomUtil.randomBytes; |
| 36 | 36 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 37 | 37 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 38 | -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; | |
| 39 | -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; | |
| 40 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 38 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 39 | +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 40 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 41 | 41 | import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; |
| 42 | 42 | import static org.assertj.core.util.Lists.newArrayList; |
| 43 | 43 | import static org.junit.jupiter.api.Assertions.assertEquals; | ... | ... |
yudao-dependencies/pom.xml
| ... | ... | @@ -13,4 +13,93 @@ |
| 13 | 13 | <description>基础 bom 文件,管理整个项目的依赖版本</description> |
| 14 | 14 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> |
| 15 | 15 | |
| 16 | + <properties> | |
| 17 | + <revision>1.0.0</revision> | |
| 18 | + <!-- 工具类相关 --> | |
| 19 | + <lombok.version>1.16.14</lombok.version> | |
| 20 | + <mapstruct.version>1.4.1.Final</mapstruct.version> | |
| 21 | + <hutool.version>5.6.1</hutool.version> | |
| 22 | + <easyexcel.verion>2.2.7</easyexcel.verion> | |
| 23 | + <velocity.version>2.2</velocity.version> | |
| 24 | + <screw.version>1.0.5</screw.version> | |
| 25 | + | |
| 26 | + <!-- 三方云服务相关 --> | |
| 27 | + <aliyun-java-sdk-core.version>4.5.18</aliyun-java-sdk-core.version> | |
| 28 | + <aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version> | |
| 29 | + <yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version> | |
| 30 | + </properties> | |
| 31 | + | |
| 32 | + <dependencyManagement> | |
| 33 | + <dependencies> | |
| 34 | + <!-- 工具类相关 --> | |
| 35 | + <dependency> | |
| 36 | + <groupId>org.projectlombok</groupId> | |
| 37 | + <artifactId>lombok</artifactId> | |
| 38 | + <version>${lombok.version}</version> | |
| 39 | + </dependency> | |
| 40 | + | |
| 41 | + <dependency> | |
| 42 | + <groupId>org.mapstruct</groupId> | |
| 43 | + <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher --> | |
| 44 | + <version>${mapstruct.version}</version> | |
| 45 | + </dependency> | |
| 46 | + <dependency> | |
| 47 | + <groupId>org.mapstruct</groupId> | |
| 48 | + <artifactId>mapstruct-processor</artifactId> | |
| 49 | + <version>${mapstruct.version}</version> | |
| 50 | + <optional>true</optional> | |
| 51 | + </dependency> | |
| 52 | + <dependency> | |
| 53 | + <groupId>org.mapstruct</groupId> | |
| 54 | + <artifactId>mapstruct-jdk8</artifactId> | |
| 55 | + <version>${mapstruct.version}</version> | |
| 56 | + </dependency> | |
| 57 | + | |
| 58 | + <dependency> | |
| 59 | + <groupId>cn.hutool</groupId> | |
| 60 | + <artifactId>hutool-all</artifactId> | |
| 61 | + <version>${hutool.version}</version> | |
| 62 | + </dependency> | |
| 63 | + | |
| 64 | + <dependency> | |
| 65 | + <groupId>com.alibaba</groupId> | |
| 66 | + <artifactId>easyexcel</artifactId> | |
| 67 | + <version>${easyexcel.verion}</version> | |
| 68 | + </dependency> | |
| 69 | + | |
| 70 | + <dependency> | |
| 71 | + <groupId>org.apache.velocity</groupId> | |
| 72 | + <artifactId>velocity-engine-core</artifactId> | |
| 73 | + <version>${velocity.version}</version> | |
| 74 | + </dependency> | |
| 75 | + | |
| 76 | + <dependency> | |
| 77 | + <groupId>cn.smallbun.screw</groupId> | |
| 78 | + <artifactId>screw-core</artifactId> <!-- 实现数据库文档 --> | |
| 79 | + <version>${screw.version}</version> | |
| 80 | + </dependency> | |
| 81 | + | |
| 82 | + <!-- 三方云服务相关 --> | |
| 83 | + | |
| 84 | + <!-- SMS SDK begin --> | |
| 85 | + <dependency> | |
| 86 | + <groupId>com.yunpian.sdk</groupId> | |
| 87 | + <artifactId>yunpian-java-sdk</artifactId> | |
| 88 | + <version>${yunpian-java-sdk.version}</version> | |
| 89 | + </dependency> | |
| 90 | + | |
| 91 | + <dependency> | |
| 92 | + <groupId>com.aliyun</groupId> | |
| 93 | + <artifactId>aliyun-java-sdk-core</artifactId> | |
| 94 | + <version>${aliyun-java-sdk-core.version}</version> | |
| 95 | + </dependency> | |
| 96 | + <dependency> | |
| 97 | + <groupId>com.aliyun</groupId> | |
| 98 | + <artifactId>aliyun-java-sdk-dysmsapi</artifactId> | |
| 99 | + <version>${aliyun-java-sdk-dysmsapi.version}</version> | |
| 100 | + </dependency> | |
| 101 | + <!-- SMS SDK end --> | |
| 102 | + </dependencies> | |
| 103 | + </dependencyManagement> | |
| 104 | + | |
| 16 | 105 | </project> | ... | ... |
yudao-framework/pom.xml
| ... | ... | @@ -39,19 +39,9 @@ |
| 39 | 39 | <skywalking.version>8.5.0</skywalking.version> |
| 40 | 40 | <logback.encoder.version>6.1</logback.encoder.version> |
| 41 | 41 | <spring-boot-admin.version>2.3.1</spring-boot-admin.version> |
| 42 | - <!-- 工具类相关 --> | |
| 43 | - <lombok.version>1.16.14</lombok.version> | |
| 44 | - <mapstruct.version>1.4.1.Final</mapstruct.version> | |
| 45 | - <hutool.version>5.6.1</hutool.version> | |
| 46 | - <easyexcel.verion>2.2.7</easyexcel.verion> | |
| 47 | - <velocity.version>2.2</velocity.version> | |
| 48 | - <screw.version>1.0.5</screw.version> | |
| 42 | + <!-- Test 测试相关 --> | |
| 49 | 43 | <podam.version>7.2.6.RELEASE</podam.version> |
| 50 | 44 | <jedis-mock.version>0.1.16</jedis-mock.version> |
| 51 | - <!-- 三方云服务相关 --> | |
| 52 | - <aliyun-java-sdk-core.version>4.5.18</aliyun-java-sdk-core.version> | |
| 53 | - <aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version> | |
| 54 | - <yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version> | |
| 55 | 45 | </properties> |
| 56 | 46 | |
| 57 | 47 | <!-- 依赖声明 --> |
| ... | ... | @@ -250,48 +240,40 @@ |
| 250 | 240 | <dependency> |
| 251 | 241 | <groupId>org.projectlombok</groupId> |
| 252 | 242 | <artifactId>lombok</artifactId> |
| 253 | - <version>${lombok.version}</version> | |
| 254 | 243 | </dependency> |
| 255 | 244 | |
| 256 | 245 | <dependency> |
| 257 | 246 | <groupId>org.mapstruct</groupId> |
| 258 | 247 | <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher --> |
| 259 | - <version>${mapstruct.version}</version> | |
| 260 | 248 | </dependency> |
| 261 | 249 | <dependency> |
| 262 | 250 | <groupId>org.mapstruct</groupId> |
| 263 | 251 | <artifactId>mapstruct-processor</artifactId> |
| 264 | - <version>${mapstruct.version}</version> | |
| 265 | 252 | <optional>true</optional> |
| 266 | 253 | </dependency> |
| 267 | 254 | <dependency> |
| 268 | 255 | <groupId>org.mapstruct</groupId> |
| 269 | 256 | <artifactId>mapstruct-jdk8</artifactId> |
| 270 | - <version>${mapstruct.version}</version> | |
| 271 | 257 | </dependency> |
| 272 | 258 | |
| 273 | 259 | <dependency> |
| 274 | 260 | <groupId>cn.hutool</groupId> |
| 275 | 261 | <artifactId>hutool-all</artifactId> |
| 276 | - <version>${hutool.version}</version> | |
| 277 | 262 | </dependency> |
| 278 | 263 | |
| 279 | 264 | <dependency> |
| 280 | 265 | <groupId>com.alibaba</groupId> |
| 281 | 266 | <artifactId>easyexcel</artifactId> |
| 282 | - <version>${easyexcel.verion}</version> | |
| 283 | 267 | </dependency> |
| 284 | 268 | |
| 285 | 269 | <dependency> |
| 286 | 270 | <groupId>org.apache.velocity</groupId> |
| 287 | 271 | <artifactId>velocity-engine-core</artifactId> |
| 288 | - <version>${velocity.version}</version> | |
| 289 | 272 | </dependency> |
| 290 | 273 | |
| 291 | 274 | <dependency> |
| 292 | 275 | <groupId>cn.smallbun.screw</groupId> |
| 293 | 276 | <artifactId>screw-core</artifactId> <!-- 实现数据库文档 --> |
| 294 | - <version>${screw.version}</version> | |
| 295 | 277 | </dependency> |
| 296 | 278 | |
| 297 | 279 | <!-- 三方云服务相关 --> |
| ... | ... | @@ -300,18 +282,15 @@ |
| 300 | 282 | <dependency> |
| 301 | 283 | <groupId>com.yunpian.sdk</groupId> |
| 302 | 284 | <artifactId>yunpian-java-sdk</artifactId> |
| 303 | - <version>${yunpian-java-sdk.version}</version> | |
| 304 | 285 | </dependency> |
| 305 | 286 | |
| 306 | 287 | <dependency> |
| 307 | 288 | <groupId>com.aliyun</groupId> |
| 308 | 289 | <artifactId>aliyun-java-sdk-core</artifactId> |
| 309 | - <version>${aliyun-java-sdk-core.version}</version> | |
| 310 | 290 | </dependency> |
| 311 | 291 | <dependency> |
| 312 | 292 | <groupId>com.aliyun</groupId> |
| 313 | 293 | <artifactId>aliyun-java-sdk-dysmsapi</artifactId> |
| 314 | - <version>${aliyun-java-sdk-dysmsapi.version}</version> | |
| 315 | 294 | </dependency> |
| 316 | 295 | <!-- SMS SDK end --> |
| 317 | 296 | ... | ... |
yudao-framework/src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java renamed to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java
yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java
0 → 100644
yudao-framework/src/main/java/cn/iocoder/dashboard/util/AssertUtils.java renamed to yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/AssertUtils.java
yudao-framework/src/main/java/cn/iocoder/dashboard/util/RandomUtils.java renamed to yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java
yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.ReflectUtil; |
| 4 | -import cn.iocoder.dashboard.BaseMockitoUnitTest; | |
| 4 | +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; | |
| 5 | 5 | import cn.iocoder.dashboard.common.core.KeyValue; |
| 6 | 6 | import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; |
| 7 | 7 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; |
| ... | ... | @@ -29,7 +29,7 @@ import java.util.List; |
| 29 | 29 | import java.util.function.Function; |
| 30 | 30 | |
| 31 | 31 | import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR; |
| 32 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 32 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 33 | 33 | import static cn.iocoder.dashboard.util.json.JsonUtils.toJsonString; |
| 34 | 34 | import static org.junit.jupiter.api.Assertions.*; |
| 35 | 35 | import static org.mockito.ArgumentMatchers.any; | ... | ... |
yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.BaseMockitoUnitTest; | |
| 3 | +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; | |
| 4 | 4 | import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; |
| 5 | 5 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; |
| 6 | 6 | import org.junit.jupiter.api.Test; | ... | ... |
yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.ReflectUtil; |
| 4 | -import cn.iocoder.dashboard.BaseMockitoUnitTest; | |
| 4 | +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; | |
| 5 | 5 | import cn.iocoder.dashboard.common.core.KeyValue; |
| 6 | 6 | import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; |
| 7 | 7 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; |
| ... | ... | @@ -29,7 +29,7 @@ import java.util.Map; |
| 29 | 29 | import java.util.function.Function; |
| 30 | 30 | import java.util.function.Supplier; |
| 31 | 31 | |
| 32 | -import static cn.iocoder.dashboard.util.RandomUtils.*; | |
| 32 | +import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 33 | 33 | import static com.yunpian.sdk.constant.Code.OK; |
| 34 | 34 | import static org.junit.jupiter.api.Assertions.*; |
| 35 | 35 | import static org.mockito.Mockito.*; | ... | ... |
yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.BaseMockitoUnitTest; | |
| 3 | +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; | |
| 4 | 4 | import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; |
| 5 | 5 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; |
| 6 | 6 | import org.junit.jupiter.api.Test; | ... | ... |
yudao-framework/src/test/java/cn/iocoder/dashboard/package-info.java deleted
| 1 | -package cn.iocoder.dashboard; |