修复构建失败文件

gym-manage-api/gym-checkIn/src/test/java/cn/novalon/gym/manage/checkin/CheckInModuleTest.java

@@ -14,6 +14,7 @@ import cn.novalon.gym.manage.member.entity.MemberCard;
 import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
 import cn.novalon.gym.manage.member.repository.MemberCardRepository;
+import cn.novalon.gym.manage.member.repository.IMemberRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -57,6 +58,9 @@ class CheckInModuleTest {
     @Mock
     private IGroupCourseBookingService groupCourseBookingService;
 
+    @Mock
+    private IMemberRepository memberRepository;
+
     @Mock
     private MemberCard mockMemberCard;
 
@@ -72,7 +76,7 @@ class CheckInModuleTest {
     void setUp() {
         MockitoAnnotations.openMocks(this);
         checkService = new CheckServiceImpl(qrCodeConfig, redisUtil, memberCardRecordRepository, 
-                memberCardRepository, signInRecordRepository, groupCourseBookingService);
+                memberCardRepository, signInRecordRepository, groupCourseBookingService, memberRepository);
 
         when(mockMemberCard.getId()).thenReturn(1L);
         when(mockMemberCard.getMemberCardType()).thenReturn("TIME_CARD");

gym-manage-api/gym-groupCourse/src/test/java/cn/novalon/gym/manage/groupcourse/util/QRCodeUtilTest.java

@@ -61,9 +61,7 @@ class QRCodeUtilTest {
         String ossUrl = QRCodeUtil.generateQRCodeAndUploadToOSS(jsonContent);
         
         assertNotNull(ossUrl, "OSS访问地址不应为空");
-        assertTrue(ossUrl.startsWith("https://"), "OSS访问地址应为HTTPS");
+        assertTrue(ossUrl.startsWith("qrcode/"), "OSS访问地址应以qrcode/开头");
-        assertTrue(ossUrl.contains("ycc-filesaver.oss-cn-beijing.aliyuncs.com"), "OSS访问地址应包含正确的域名");
-        assertTrue(ossUrl.contains("/qrcode/"), "OSS访问地址应包含qrcode目录");
         assertTrue(ossUrl.endsWith(".png"), "OSS访问地址应为PNG格式");
         
         System.out.println("上传到OSS的二维码地址: " + ossUrl);

gym-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/dto/response/AuthResponseTest.java

@@ -8,7 +8,7 @@ class AuthResponseTest {
 
     @Test
     void testConstructorWithParameters() {
-        AuthResponse response = new AuthResponse("test-token", 1L, "testuser");
+        AuthResponse response = new AuthResponse("test-token", 1L, "testuser", null, null);
 
         assertEquals("test-token", response.getToken());
         assertEquals(1L, response.getUserId());
@@ -63,7 +63,7 @@ class AuthResponseTest {
 
     @Test
     void testConstructorWithNullValues() {
-        AuthResponse response = new AuthResponse(null, null, null);
+        AuthResponse response = new AuthResponse(null, null, null, null, null);
 
         assertNull(response.getToken());
         assertNull(response.getUserId());
@@ -72,7 +72,7 @@ class AuthResponseTest {
 
     @Test
     void testConstructorWithEmptyStrings() {
-        AuthResponse response = new AuthResponse("", 1L, "");
+        AuthResponse response = new AuthResponse("", 1L, "", null, null);
 
         assertEquals("", response.getToken());
         assertEquals(1L, response.getUserId());
@@ -164,7 +164,7 @@ class AuthResponseTest {
 
     @Test
     void testConstructorWithZeroUserId() {
-        AuthResponse response = new AuthResponse("token", 0L, "user");
+        AuthResponse response = new AuthResponse("token", 0L, "user", null, null);
 
         assertEquals("token", response.getToken());
         assertEquals(0L, response.getUserId());

gym-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/auth/SysAuthHandlerTest.java

@@ -6,9 +6,11 @@ import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
 import cn.novalon.gym.manage.sys.core.domain.SysUser;
 import cn.novalon.gym.manage.sys.core.domain.SysRole;
 import cn.novalon.gym.manage.sys.core.domain.SysLoginLog;
+import cn.novalon.gym.manage.sys.core.domain.SysPermission;
 import cn.novalon.gym.manage.sys.util.TestDataFactory;
 import cn.novalon.gym.manage.sys.core.service.ISysUserService;
 import cn.novalon.gym.manage.sys.core.service.ISysLoginLogService;
+import cn.novalon.gym.manage.sys.core.service.ISysPermissionService;
 import cn.novalon.gym.manage.sys.util.UserAgentParser;
 import cn.novalon.gym.manage.sys.util.IpLocationParser;
 import org.junit.jupiter.api.BeforeEach;
@@ -47,6 +49,9 @@ class SysAuthHandlerTest {
     @Mock
     private ISysLoginLogService loginLogService;
 
+    @Mock
+    private ISysPermissionService permissionService;
+
     @Mock
     private UserAgentParser userAgentParser;
 
@@ -59,7 +64,7 @@ class SysAuthHandlerTest {
     @BeforeEach
     void setUp() {
         authHandler = new SysAuthHandler(userService, passwordEncoder, jwtTokenProvider, loginLogService,
-                userAgentParser, ipLocationParser);
+                permissionService, userAgentParser, ipLocationParser);
 
         testUser = TestDataFactory.createTestUser();
     }
@@ -88,6 +93,10 @@ class SysAuthHandlerTest {
         when(userService.getUserRoles(1L)).thenReturn(Flux.just(mockRole));
         when(loginLogService.save(any())).thenReturn(Mono.just(new SysLoginLog()));
 
+        SysPermission mockPermission = new SysPermission();
+        mockPermission.setPermissionCode("system:user:view");
+        when(permissionService.findByRoleIds(anyList())).thenReturn(Flux.just(mockPermission));
+
         ServerRequest request = MockServerRequest.builder()
                 .body(Mono.just(loginRequest));
         Mono<ServerResponse> response = authHandler.login(request);

gym-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/role/SysRoleHandlerTest.java

@@ -2,6 +2,8 @@ package cn.novalon.gym.manage.sys.handler.role;
 
 import cn.novalon.gym.manage.sys.core.domain.SysRole;
 import cn.novalon.gym.manage.sys.core.service.ISysRoleService;
+import cn.novalon.gym.manage.sys.core.service.ISysUserService;
+import cn.novalon.gym.manage.sys.util.AuthUtil;
 import cn.novalon.gym.manage.sys.dto.request.RoleCreateRequest;
 import cn.novalon.gym.manage.sys.dto.request.RoleUpdateRequest;
 import cn.novalon.gym.manage.sys.core.command.CreateRoleCommand;
@@ -35,12 +37,18 @@ class SysRoleHandlerTest {
     @Mock
     private Validator validator;
 
+    @Mock
+    private AuthUtil authUtil;
+
+    @Mock
+    private ISysUserService userService;
+
     private SysRoleHandler roleHandler;
     private SysRole testRole;
 
     @BeforeEach
     void setUp() {
-        roleHandler = new SysRoleHandler(roleService, validator);
+        roleHandler = new SysRoleHandler(roleService, validator, authUtil, userService);
         
         testRole = new SysRole();
         testRole.setId(1L);
@@ -251,10 +259,13 @@ class SysRoleHandlerTest {
         updateRequest.setRoleSort(3);
         updateRequest.setStatus(0);
         
+        when(authUtil.getMemberIdOrThrow(any())).thenReturn(1L);
+        when(userService.verifyPassword(1L, "password123")).thenReturn(Mono.just(true));
         when(roleService.updateRole(any(UpdateRoleCommand.class))).thenReturn(Mono.just(testRole));
         
         ServerRequest request = MockServerRequest.builder()
-                .pathVariable("id", "1")
+                .pathVariable("id", "2")
+                .queryParam("adminPassword", "password123")
                 .body(Mono.just(updateRequest));
         Mono<ServerResponse> response = roleHandler.updateRole(request);
         
@@ -271,10 +282,13 @@ class SysRoleHandlerTest {
         RoleUpdateRequest updateRequest = new RoleUpdateRequest();
         updateRequest.setRoleName("UPDATED_ROLE");
         
+        when(authUtil.getMemberIdOrThrow(any())).thenReturn(1L);
+        when(userService.verifyPassword(1L, "password123")).thenReturn(Mono.just(true));
         when(roleService.updateRole(any(UpdateRoleCommand.class))).thenReturn(Mono.empty());
         
         ServerRequest request = MockServerRequest.builder()
                 .pathVariable("id", "999")
+                .queryParam("adminPassword", "password123")
                 .body(Mono.just(updateRequest));
         Mono<ServerResponse> response = roleHandler.updateRole(request);
         
@@ -288,10 +302,13 @@ class SysRoleHandlerTest {
 
     @Test
     void testDeleteRole() {
-        when(roleService.logicalDeleteRole(1L)).thenReturn(Mono.just(testRole));
+        when(authUtil.getMemberIdOrThrow(any())).thenReturn(1L);
+        when(userService.verifyPassword(1L, "password123")).thenReturn(Mono.just(true));
+        when(roleService.logicalDeleteRole(2L)).thenReturn(Mono.just(testRole));
         
         ServerRequest request = MockServerRequest.builder()
-                .pathVariable("id", "1")
+                .pathVariable("id", "2")
+                .queryParam("adminPassword", "password123")
                 .build();
         Mono<ServerResponse> response = roleHandler.deleteRole(request);
         
@@ -300,15 +317,18 @@ class SysRoleHandlerTest {
                     serverResponse.statusCode() == HttpStatus.OK)
                 .verifyComplete();
         
-        verify(roleService).logicalDeleteRole(1L);
+        verify(roleService).logicalDeleteRole(2L);
     }
 
     @Test
     void testDeleteRole_NotFound() {
+        when(authUtil.getMemberIdOrThrow(any())).thenReturn(1L);
+        when(userService.verifyPassword(1L, "password123")).thenReturn(Mono.just(true));
         when(roleService.logicalDeleteRole(999L)).thenReturn(Mono.empty());
         
         ServerRequest request = MockServerRequest.builder()
                 .pathVariable("id", "999")
+                .queryParam("adminPassword", "password123")
                 .build();
         Mono<ServerResponse> response = roleHandler.deleteRole(request);
         

gym-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/user/SysUserHandlerTest.java

@@ -2,6 +2,7 @@ package cn.novalon.gym.manage.sys.handler.user;
 
 import cn.novalon.gym.manage.sys.core.domain.SysUser;
 import cn.novalon.gym.manage.sys.core.service.ISysUserService;
+import cn.novalon.gym.manage.sys.util.AuthUtil;
 import cn.novalon.gym.manage.sys.dto.request.PasswordChangeRequest;
 import cn.novalon.gym.manage.sys.dto.request.UserRegisterRequest;
 import cn.novalon.gym.manage.sys.dto.request.UserUpdateRequest;
@@ -42,12 +43,15 @@ class SysUserHandlerTest {
     @Mock
     private Validator validator;
 
+    @Mock
+    private AuthUtil authUtil;
+
     private SysUserHandler userHandler;
     private SysUser testUser;
 
     @BeforeEach
     void setUp() {
-        userHandler = new SysUserHandler(userService, validator);
+        userHandler = new SysUserHandler(userService, validator, authUtil);
         
         testUser = new SysUser();
         testUser.setId(1L);
@@ -191,9 +195,12 @@ class SysUserHandlerTest {
     void testDeleteUser() {
         when(userService.findById(1L)).thenReturn(Mono.just(testUser));
         when(userService.deleteUser(1L)).thenReturn(Mono.empty());
+        when(authUtil.getMemberIdOrThrow(any())).thenReturn(1L);
+        when(userService.verifyPassword(1L, "password123")).thenReturn(Mono.just(true));
         
         ServerRequest request = MockServerRequest.builder()
                 .pathVariable("id", "1")
+                .queryParam("adminPassword", "password123")
                 .build();
         Mono<ServerResponse> response = userHandler.deleteUser(request);
         
@@ -379,10 +386,14 @@ class SysUserHandlerTest {
         updateRequest.setRoleId(2L);
         updateRequest.setStatus(0);
         
+        when(authUtil.getMemberIdOrThrow(any())).thenReturn(1L);
+        when(userService.verifyPassword(1L, "password123")).thenReturn(Mono.just(true));
+        when(userService.findById(1L)).thenReturn(Mono.just(testUser));
         when(userService.updateUser(any(UpdateUserCommand.class))).thenReturn(Mono.just(testUser));
         
         ServerRequest request = MockServerRequest.builder()
                 .pathVariable("id", "1")
+                .queryParam("adminPassword", "password123")
                 .body(Mono.just(updateRequest));
         Mono<ServerResponse> response = userHandler.updateUser(request);
         
@@ -399,10 +410,13 @@ class SysUserHandlerTest {
         UserUpdateRequest updateRequest = new UserUpdateRequest();
         updateRequest.setEmail("updated@example.com");
         
-        when(userService.updateUser(any(UpdateUserCommand.class))).thenReturn(Mono.empty());
+        when(authUtil.getMemberIdOrThrow(any())).thenReturn(1L);
+        when(userService.verifyPassword(1L, "password123")).thenReturn(Mono.just(true));
+        when(userService.findById(999L)).thenReturn(Mono.empty());
         
         ServerRequest request = MockServerRequest.builder()
                 .pathVariable("id", "999")
+                .queryParam("adminPassword", "password123")
                 .body(Mono.just(updateRequest));
         Mono<ServerResponse> response = userHandler.updateUser(request);
         
@@ -411,7 +425,7 @@ class SysUserHandlerTest {
                     serverResponse.statusCode() == HttpStatus.NOT_FOUND)
                 .verifyComplete();
         
-        verify(userService).updateUser(any(UpdateUserCommand.class));
+        verify(userService).findById(999L);
     }
 
     @Test