hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-15 03:25:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

项目结构调整 x 4

Browse Source
This commit is contained in:
YunaiV
2021-04-28 20:40:48 +08:00
parent 90e4966420
commit e35dde1207
7 changed files with 74 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java
View File

@ -250,7 +250,7 @@ public class SysDictDataServiceImpl implements SysDictDataService {
@Override
public List<DictDataRespDTO> listDictDatasFromCache(String type) {
return SysDictDataConvert.INSTANCE.convertList03(labelDictDataCache.row(type).values()));
return SysDictDataConvert.INSTANCE.convertList03(labelDictDataCache.row(type).values());
}
}

1
yudao-admin-server/src/main/resources/application-dev.yaml
View File

@ -99,6 +99,7 @@ apollo:
eagerLoad:
enabled: true # 设置 Apollo 在日志初始化前生效，可以实现日志的动态级别配置
jdbc: # 自定义的 JDBC 配置项，用于数据库的地址
dao: cn.iocoder.dashboard.modules.infra.dal.mysql.config.InfConfigDAOImpl
url: ${spring.datasource.dynamic.datasource.master.url}
username: ${spring.datasource.dynamic.datasource.master.username}
password: ${spring.datasource.dynamic.datasource.master.password}

1
yudao-admin-server/src/main/resources/application-local.yaml
View File

@ -99,6 +99,7 @@ apollo:
eagerLoad:
enabled: true # 设置 Apollo 在日志初始化前生效，可以实现日志的动态级别配置
jdbc: # 自定义的 JDBC 配置项，用于数据库的地址
dao: cn.iocoder.dashboard.modules.infra.dal.mysql.config.InfConfigDAOImpl
url: ${spring.datasource.dynamic.datasource.master.url}
username: ${spring.datasource.dynamic.datasource.master.username}
password: ${spring.datasource.dynamic.datasource.master.password}

4
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java
View File

@ -66,7 +66,7 @@ public class SysAuthServiceImplTest extends BaseDbUnitTest {
// 准备参数
String username = randomString();
// mock 方法
SysUserDO user = randomUserDO(o -> o.setUsername(username));
SysUserDO user = randomPojo(SysUserDO.class, o -> o.setUsername(username));
when(userService.getUserByUsername(eq(username))).thenReturn(user);
// 调用
@ -93,7 +93,7 @@ public class SysAuthServiceImplTest extends BaseDbUnitTest {
// 准备参数
Long userId = randomLongId();
// mock 方法 01
SysUserDO user = randomUserDO(o -> o.setId(userId));
SysUserDO user = randomPojo(SysUserDO.class, o -> o.setId(userId));
when(userService.getUser(eq(userId))).thenReturn(user);
// mock 方法 02
Set<Long> roleIds = randomSet(Long.class);