This commit is contained in:
Chuck1sn
2025-05-19 10:01:19 +08:00
parent 94a69d999b
commit 225c7fb350
5 changed files with 14 additions and 5 deletions

View File

@@ -46,6 +46,7 @@ class UserRolePermissionMvcTest {
stubUserRolePermissionDto.setUsername(stubUsername); stubUserRolePermissionDto.setUsername(stubUsername);
User stubUser = new User(); User stubUser = new User();
stubUser.setId(1L); stubUser.setId(1L);
stubUser.setEnable(Boolean.TRUE);
when(userRepository.fetchOneByUsername(anyString())).thenReturn(stubUser); when(userRepository.fetchOneByUsername(anyString())).thenReturn(stubUser);
when(identityAccessService.queryUniqueUserWithRolePermission(anyLong())) when(identityAccessService.queryUniqueUserWithRolePermission(anyLong()))
.thenReturn(stubUserRolePermissionDto); .thenReturn(stubUserRolePermissionDto);

View File

@@ -14,6 +14,7 @@ import com.zl.mjga.controller.IdentityAccessController;
import com.zl.mjga.controller.SignController; import com.zl.mjga.controller.SignController;
import com.zl.mjga.dto.sign.SignInDto; import com.zl.mjga.dto.sign.SignInDto;
import com.zl.mjga.model.urp.EPermission; import com.zl.mjga.model.urp.EPermission;
import com.zl.mjga.repository.PermissionRepository;
import com.zl.mjga.repository.RoleRepository; import com.zl.mjga.repository.RoleRepository;
import com.zl.mjga.repository.UserRepository; import com.zl.mjga.repository.UserRepository;
import com.zl.mjga.service.IdentityAccessService; import com.zl.mjga.service.IdentityAccessService;
@@ -47,6 +48,7 @@ public class AuthenticationAndAuthorityTest {
@MockBean private UserRepository userRepository; @MockBean private UserRepository userRepository;
@MockBean private RoleRepository roleRepository; @MockBean private RoleRepository roleRepository;
@MockBean private PermissionRepository permissionRepository;
@Test @Test
public void givenRequestOnPublicService_shouldSucceedWith200() throws Exception { public void givenRequestOnPublicService_shouldSucceedWith200() throws Exception {

View File

@@ -14,9 +14,9 @@ public class PageRequestDtoUnitTest {
@Test @Test
void setSortBy_whenSortByFieldIsExpectFormat_thenDeserializeCorrect() { void setSortBy_whenSortByFieldIsExpectFormat_thenDeserializeCorrect() {
String sortBy1 = "id asc,name desc"; String sortBy1 = "id:asc,name:desc";
String sortBy2 = "id asc"; String sortBy2 = "id:asc";
String sortBy3 = "id asc,"; String sortBy3 = "id:asc,";
String sortBy4 = ","; String sortBy4 = ",";
String sortBy5 = ""; String sortBy5 = "";
PageRequestDto pageRequestDto1 = new PageRequestDto(); PageRequestDto pageRequestDto1 = new PageRequestDto();

View File

@@ -36,6 +36,7 @@ public class SignUnitTest {
// arrange // arrange
User stubUser = new User(); User stubUser = new User();
stubUser.setId(1L); stubUser.setId(1L);
stubUser.setEnable(true);
stubUser.setUsername("testUserName"); stubUser.setUsername("testUserName");
stubUser.setPassword("GjFH2fzRB2y7DDrO"); stubUser.setPassword("GjFH2fzRB2y7DDrO");
when(userRepository.fetchOneByUsername("testUserName")).thenReturn(stubUser); when(userRepository.fetchOneByUsername("testUserName")).thenReturn(stubUser);

View File

@@ -41,10 +41,15 @@
<label for="checkbox-all-search" class="sr-only">checkbox</label> <label for="checkbox-all-search" class="sr-only">checkbox</label>
</div> </div>
</th> </th>
<th scope="col" class="px-6 py-3">用户名</th> <th scope="col" class="px-6 py-3 cursor-pointer" @click="handleSortClick('username')">
<div class="flex items-center">
<span>用户名</span>
<SortIcon :sortField="getSortField('username')" />
</div>
</th>
<th scope="col" class="px-6 py-3 cursor-pointer" @click="handleSortClick('createTime')"> <th scope="col" class="px-6 py-3 cursor-pointer" @click="handleSortClick('createTime')">
<div class="flex items-center"> <div class="flex items-center">
<span>创建时间</span> <span>创建时间</span>
<SortIcon :sortField="getSortField('createTime')" /> <SortIcon :sortField="getSortField('createTime')" />
</div> </div>
</th> </th>