diff --git a/src/main/java/com/cisd/tms/modules/auth/service/impl/AuthSecurityResetServiceImpl.java b/src/main/java/com/cisd/tms/modules/auth/service/impl/AuthSecurityResetServiceImpl.java index 7af402b..6f212e7 100644 --- a/src/main/java/com/cisd/tms/modules/auth/service/impl/AuthSecurityResetServiceImpl.java +++ b/src/main/java/com/cisd/tms/modules/auth/service/impl/AuthSecurityResetServiceImpl.java @@ -106,7 +106,7 @@ public class AuthSecurityResetServiceImpl implements AuthSecurityResetService { private List seedRoles() { return List.of( 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(11004L, RoleCode.OPS_ADMIN.getCode(), "运维管理员", 1, RoleAccountStatus.UNENABLED.name()) ); diff --git a/src/main/resources/db/migration/V1__tms_schema_full.sql b/src/main/resources/db/migration/V1__tms_schema_full.sql index d19aa04..f7ca887 100644 --- a/src/main/resources/db/migration/V1__tms_schema_full.sql +++ b/src/main/resources/db/migration/V1__tms_schema_full.sql @@ -340,7 +340,7 @@ VALUES 'KEY_ADMIN', '密钥管理员', 1, - 'ACTIVE', + 'UNENABLED', CURRENT_TIMESTAMP(3), CURRENT_TIMESTAMP(3) ), diff --git a/src/test/java/com/cisd/tms/modules/auth/service/AuthSecurityResetServiceTest.java b/src/test/java/com/cisd/tms/modules/auth/service/AuthSecurityResetServiceTest.java index 1a77e2d..8187f9e 100644 --- a/src/test/java/com/cisd/tms/modules/auth/service/AuthSecurityResetServiceTest.java +++ b/src/test/java/com/cisd/tms/modules/auth/service/AuthSecurityResetServiceTest.java @@ -61,14 +61,24 @@ class AuthSecurityResetServiceTest { .filter(item -> RoleCode.SUPER_ADMIN.getCode().equals(item.getRoleCode())) .findFirst() .orElseThrow(); + RoleAccountEntity keyAdmin = roleCaptor.getAllValues().stream() + .filter(item -> RoleCode.KEY_ADMIN.getCode().equals(item.getRoleCode())) + .findFirst() + .orElseThrow(); RoleAccountEntity auditAdmin = roleCaptor.getAllValues().stream() .filter(item -> RoleCode.AUDIT_ADMIN.getCode().equals(item.getRoleCode())) .findFirst() .orElseThrow(); + RoleAccountEntity opsAdmin = roleCaptor.getAllValues().stream() + .filter(item -> RoleCode.OPS_ADMIN.getCode().equals(item.getRoleCode())) + .findFirst() + .orElseThrow(); Assertions.assertEquals("超级管理员", superAdmin.getDisplayName()); Assertions.assertEquals(2, superAdmin.getRequiredUkeyCount()); 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(), opsAdmin.getStatus()); ArgumentCaptor accountCaptor = ArgumentCaptor.forClass(AuthFullAccountEntity.class); Mockito.verify(fullAccountRepository, Mockito.times(5)).update(accountCaptor.capture());