Sunyard/cisd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：初始化状态调整

Browse Source
This commit is contained in:
waner 2026-05-22 13:58:28 +08:00
parent 3800a19528
commit 2ddb448351
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/cisd/tms/modules/auth/service/impl/AuthSecurityResetServiceImpl.java
View File

@ -106,7 +106,7 @@ public class AuthSecurityResetServiceImpl implements AuthSecurityResetService {
private List<SeedRole> seedRoles() { private List<SeedRole> seedRoles() {
return List.of( return List.of(
new SeedRole(11001L, RoleCode.SUPER_ADMIN.getCode(), "超级管理员", 2, RoleAccountStatus.ACTIVE.name()), new SeedRole(11001L, RoleCode.SUPER_ADMIN.getCode(), "超级管理员", 2, RoleAccountStatus.ACTIVE.name()),
new SeedRole(11002L, RoleCode.KEY_ADMIN.getCode(), "密钥管理员", 1, RoleAccountStatus.ACTIVE.name()), new SeedRole(11002L, RoleCode.KEY_ADMIN.getCode(), "密钥管理员", 1, RoleAccountStatus.UNENABLED.name()),
new SeedRole(11003L, RoleCode.AUDIT_ADMIN.getCode(), "审计管理员", 1, RoleAccountStatus.UNENABLED.name()), new SeedRole(11003L, RoleCode.AUDIT_ADMIN.getCode(), "审计管理员", 1, RoleAccountStatus.UNENABLED.name()),
new SeedRole(11004L, RoleCode.OPS_ADMIN.getCode(), "运维管理员", 1, RoleAccountStatus.UNENABLED.name()) new SeedRole(11004L, RoleCode.OPS_ADMIN.getCode(), "运维管理员", 1, RoleAccountStatus.UNENABLED.name())
); );

2
src/main/resources/db/migration/V1__tms_schema_full.sql
View File

@ -340,7 +340,7 @@ VALUES
'KEY_ADMIN', 'KEY_ADMIN',
'密钥管理员', '密钥管理员',
1, 1,
'ACTIVE', 'UNENABLED',
CURRENT_TIMESTAMP(3), CURRENT_TIMESTAMP(3),
CURRENT_TIMESTAMP(3) CURRENT_TIMESTAMP(3)
), ),

10
src/test/java/com/cisd/tms/modules/auth/service/AuthSecurityResetServiceTest.java
View File

@ -61,14 +61,24 @@ class AuthSecurityResetServiceTest {
.filter(item -> RoleCode.SUPER_ADMIN.getCode().equals(item.getRoleCode())) .filter(item -> RoleCode.SUPER_ADMIN.getCode().equals(item.getRoleCode()))
.findFirst() .findFirst()
.orElseThrow(); .orElseThrow();
RoleAccountEntity keyAdmin = roleCaptor.getAllValues().stream()
.filter(item -> RoleCode.KEY_ADMIN.getCode().equals(item.getRoleCode()))
.findFirst()
.orElseThrow();
RoleAccountEntity auditAdmin = roleCaptor.getAllValues().stream() RoleAccountEntity auditAdmin = roleCaptor.getAllValues().stream()
.filter(item -> RoleCode.AUDIT_ADMIN.getCode().equals(item.getRoleCode())) .filter(item -> RoleCode.AUDIT_ADMIN.getCode().equals(item.getRoleCode()))
.findFirst() .findFirst()
.orElseThrow(); .orElseThrow();
RoleAccountEntity opsAdmin = roleCaptor.getAllValues().stream()
.filter(item -> RoleCode.OPS_ADMIN.getCode().equals(item.getRoleCode()))
.findFirst()
.orElseThrow();
Assertions.assertEquals("超级管理员", superAdmin.getDisplayName()); Assertions.assertEquals("超级管理员", superAdmin.getDisplayName());
Assertions.assertEquals(2, superAdmin.getRequiredUkeyCount()); Assertions.assertEquals(2, superAdmin.getRequiredUkeyCount());
Assertions.assertEquals(RoleAccountStatus.ACTIVE.name(), superAdmin.getStatus()); Assertions.assertEquals(RoleAccountStatus.ACTIVE.name(), superAdmin.getStatus());
Assertions.assertEquals(RoleAccountStatus.UNENABLED.name(), keyAdmin.getStatus());
Assertions.assertEquals(RoleAccountStatus.UNENABLED.name(), auditAdmin.getStatus()); Assertions.assertEquals(RoleAccountStatus.UNENABLED.name(), auditAdmin.getStatus());
Assertions.assertEquals(RoleAccountStatus.UNENABLED.name(), opsAdmin.getStatus());
ArgumentCaptor<AuthFullAccountEntity> accountCaptor = ArgumentCaptor.forClass(AuthFullAccountEntity.class); ArgumentCaptor<AuthFullAccountEntity> accountCaptor = ArgumentCaptor.forClass(AuthFullAccountEntity.class);
Mockito.verify(fullAccountRepository, Mockito.times(5)).update(accountCaptor.capture()); Mockito.verify(fullAccountRepository, Mockito.times(5)).update(accountCaptor.capture());