chore: auto bump version and changelog [skip ci]

cfc-backend/src/test/java/com/etotem/cfc/controller/AuthControllerTest.java

@@ -11,7 +11,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -306,15 +305,14 @@ public class AuthControllerTest {
 
     @Test
     public void getInfo_Success() {
-        HttpServletRequest request = mock(HttpServletRequest.class);
-        when(request.getAttribute("userId")).thenReturn(1L);
+        Long userId = 1L;
 
         User mockUser = new User();
         mockUser.setId(1L);
         mockUser.setNickname("测试用户");
         when(userService.getUserInfo(1L)).thenReturn(mockUser);
 
-        Result<User> result = controller.getInfo(request);
+        Result<User> result = controller.getInfo(userId);
         assertEquals(200, result.getCode());
         assertNotNull(result.getData());
         // Password should be cleared
@@ -323,11 +321,9 @@ public class AuthControllerTest {
 
     @Test
     public void getInfo_NotLoggedIn() {
-        HttpServletRequest request = mock(HttpServletRequest.class);
-        when(request.getAttribute("userId")).thenReturn(null);
-        when(request.getHeader("X-User-Id")).thenReturn(null);
+        Long userId = null;
 
-        Result<User> result = controller.getInfo(request);
+        Result<User> result = controller.getInfo(userId);
         assertEquals(500, result.getCode());
         assertEquals("未登录", result.getMessage());
     }
@@ -336,15 +332,14 @@ public class AuthControllerTest {
 
     @Test
     public void setPassword_Success() {
-        HttpServletRequest request = mock(HttpServletRequest.class);
-        when(request.getAttribute("userId")).thenReturn(1L);
+        Long userId = 1L;
 
         SetPasswordDTO dto = new SetPasswordDTO();
         dto.setPassword("newPass123");
 
         when(userService.setPassword(1L, "newPass123")).thenReturn(true);
 
-        Result<Boolean> result = controller.setPassword(request, dto);
+        Result<Boolean> result = controller.setPassword(dto, userId);
         assertEquals(200, result.getCode());
         assertTrue(result.getData());
     }
@@ -353,29 +348,27 @@ public class AuthControllerTest {
 
     @Test
     public void verifyPassword_Correct() {
-        HttpServletRequest request = mock(HttpServletRequest.class);
-        when(request.getAttribute("userId")).thenReturn(1L);
+        Long userId = 1L;
 
         VerifyPasswordDTO dto = new VerifyPasswordDTO();
         dto.setPassword("correctPass");
 
         when(userService.verifyPassword(1L, "correctPass")).thenReturn(true);
 
-        Result<Boolean> result = controller.verifyPassword(request, dto);
+        Result<Boolean> result = controller.verifyPassword(dto, userId);
         assertTrue(result.getData());
     }
 
     @Test
     public void verifyPassword_Wrong() {
-        HttpServletRequest request = mock(HttpServletRequest.class);
-        when(request.getAttribute("userId")).thenReturn(1L);
+        Long userId = 1L;
 
         VerifyPasswordDTO dto = new VerifyPasswordDTO();
         dto.setPassword("wrongPass");
 
         when(userService.verifyPassword(1L, "wrongPass")).thenReturn(false);
 
-        Result<Boolean> result = controller.verifyPassword(request, dto);
+        Result<Boolean> result = controller.verifyPassword(dto, userId);
         assertFalse(result.getData());
     }
 
@@ -541,8 +534,7 @@ public class AuthControllerTest {
 
     @Test
     public void switchRole_Success() {
-        HttpServletRequest request = mock(HttpServletRequest.class);
-        when(request.getAttribute("userId")).thenReturn(1L);
+        Long userId = 1L;
 
         SwitchRoleDTO dto = new SwitchRoleDTO();
         dto.setRole("teacher");
@@ -552,21 +544,19 @@ public class AuthControllerTest {
         loginResult.setRole("teacher");
         when(userService.switchRoleForLogin(1L, "teacher")).thenReturn(loginResult);
 
-        Result<LoginResultDTO> result = controller.switchRole(request, dto);
+        Result<LoginResultDTO> result = controller.switchRole(dto, userId);
         assertEquals(200, result.getCode());
         assertEquals("teacher", result.getData().getRole());
     }
 
     @Test
     public void switchRole_NotLoggedIn() {
-        HttpServletRequest request = mock(HttpServletRequest.class);
-        when(request.getAttribute("userId")).thenReturn(null);
-        when(request.getHeader("X-User-Id")).thenReturn(null);
+        Long userId = null;
 
         SwitchRoleDTO dto = new SwitchRoleDTO();
         dto.setRole("teacher");
 
-        Result<LoginResultDTO> result = controller.switchRole(request, dto);
+        Result<LoginResultDTO> result = controller.switchRole(dto, userId);
         assertEquals(500, result.getCode());
         assertEquals("未登录", result.getMessage());
     }

cfc-backend/src/test/java/com/etotem/cfc/integration/FamilyMemberManagementFlowTest.java

@@ -180,7 +180,7 @@ public class FamilyMemberManagementFlowTest {
 
         // === When：提交更新表单 ===
         Result<FamilyMemberVO> result = familyMembersController.updateMember(
-                createMockRequest(PARENT_USER_ID), updateRequest);
+                updateRequest, PARENT_USER_ID);
 
         // === Then：Milestone-3 - 更新成功 ===
         assertEquals(200, result.getCode());
@@ -212,7 +212,7 @@ public class FamilyMemberManagementFlowTest {
 
         // === When：执行切换视角操作 ===
         Result<SwitchMemberVO> result = familyMembersController.switchToMember(
-                createMockRequest(PARENT_USER_ID), switchRequest);
+                switchRequest, PARENT_USER_ID);
 
         // === Then：Milestone-4 - 切换成功，获得切换凭证 ===
         assertEquals(200, result.getCode());
@@ -239,7 +239,7 @@ public class FamilyMemberManagementFlowTest {
 
         // === When：执行切换操作 ===
         Result<SwitchMemberVO> result = familyMembersController.switchToMember(
-                createMockRequest(PARENT_USER_ID), switchRequest);
+                switchRequest, PARENT_USER_ID);
 
         // === Then：返回错误提示 ===
         assertEquals(500, result.getCode());
@@ -264,7 +264,7 @@ public class FamilyMemberManagementFlowTest {
 
         // === When：确认移除成员 ===
         Result<String> result = familyMembersController.kickMember(
-                createMockRequest(PARENT_USER_ID), kickRequest);
+                kickRequest, PARENT_USER_ID);
 
         // === Then：Milestone-5 - 移除成功 ===
         assertEquals(200, result.getCode());
@@ -290,7 +290,7 @@ public class FamilyMemberManagementFlowTest {
 
         // === When：尝试移除成员 ===
         Result<String> result = familyMembersController.kickMember(
-                createMockRequest(PARENT_USER_ID), kickRequest);
+                kickRequest, PARENT_USER_ID);
 
         // === Then：返回错误提示 ===
         assertEquals(500, result.getCode());
@@ -315,7 +315,7 @@ public class FamilyMemberManagementFlowTest {
 
         // === When：普通成员尝试踢人 ===
         Result<String> result = familyMembersController.kickMember(
-                createMockRequest(childUserId), kickRequest);
+                kickRequest, childUserId);
 
         // === Then：权限不足，拒绝操作 ===
         assertEquals(500, result.getCode());
@@ -333,9 +333,5 @@ public class FamilyMemberManagementFlowTest {
         return vo;
     }
 
-    private javax.servlet.http.HttpServletRequest createMockRequest(Long userId) {
-        javax.servlet.http.HttpServletRequest request = mock(javax.servlet.http.HttpServletRequest.class);
-        when(request.getAttribute("userId")).thenReturn(userId);
-        return request;
-    }
+
 }

cfc-web/.last_build_commit

@@ -1 +1 @@
-0e49d3594ce5e164445516d01a4302965a46fc08
+274f2357be357e50356412261ca6a20bac43fdb4