xieyinlu/zhilu-admin
1
0
Fork 0
mirror of https://github.com/ccmjga/zhilu-admin synced 2026-03-14 05:33:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix dayjs

Browse Source
This commit is contained in:
Chuck1sn
2025-05-19 11:01:18 +08:00
parent 225c7fb350
commit dd3c92172e
11 changed files with 59 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/com/zl/mjga/dto/urp/UserRolePermissionDto.java
View File

@@ -23,7 +23,6 @@ public class UserRolePermissionDto {
private Boolean enable;
@Builder.Default private List<RoleDto> roles = new LinkedList<>();
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private OffsetDateTime createTime;
public Set<PermissionRespDto> getPermissions() {

34
backend/src/test/java/com/zl/mjga/integration/mvc/JacksonAnnotationMvcTest.java
View File

@@ -58,21 +58,21 @@ public class JacksonAnnotationMvcTest {
.andExpect(jsonPath("$.data[0].password").doesNotExist());
}
@Test
@WithMockUser
void dateFieldWithFormatAnnotation_whenResponseIncludeField_fieldShouldBeExpectDataFormat()
throws Exception {
OffsetDateTime stubCreateDateTime =
OffsetDateTime.of(2023, 12, 2, 1, 1, 1, 0, OffsetDateTime.now().getOffset());
UserRolePermissionDto stubUserRolePermissionDto = new UserRolePermissionDto();
stubUserRolePermissionDto.setCreateTime(stubCreateDateTime);
when(identityAccessService.pageQueryUser(any(PageRequestDto.class), any(UserQueryDto.class)))
.thenReturn(new PageResponseDto<>(1, List.of(stubUserRolePermissionDto)));
mockMvc
.perform(
get(String.format("/iam/users?page=1&size=5&username=%s", "7bF3mcNVTj6P6v2"))
.contentType(MediaType.APPLICATION_FORM_URLENCODED))
.andExpect(status().isOk())
.andExpect(jsonPath("$.data[0].createTime").value("2023-12-02 01:01:01"));
}
// @Test
// @WithMockUser
// void dateFieldWithFormatAnnotation_whenResponseIncludeField_fieldShouldBeExpectDataFormat()
// throws Exception {
// OffsetDateTime stubCreateDateTime =
// OffsetDateTime.of(2023, 12, 2, 1, 1, 1, 0, OffsetDateTime.now().getOffset());
// UserRolePermissionDto stubUserRolePermissionDto = new UserRolePermissionDto();
// stubUserRolePermissionDto.setCreateTime(stubCreateDateTime);
// when(identityAccessService.pageQueryUser(any(PageRequestDto.class), any(UserQueryDto.class)))
// .thenReturn(new PageResponseDto<>(1, List.of(stubUserRolePermissionDto)));
// mockMvc
// .perform(
// get(String.format("/iam/users?page=1&size=5&username=%s", "7bF3mcNVTj6P6v2"))
// .contentType(MediaType.APPLICATION_FORM_URLENCODED))
// .andExpect(status().isOk())
// .andExpect(jsonPath("$.data[0].createTime").value("2023-12-02 01:01:01"));
// }
}