完善登录界面

Layau-code · Layau-code · commit 030b24eb1c2b · 2025-12-21T16:54:43.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -86,6 +86,13 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Spring Security Test -->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+       
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
diff --git a/src/main/java/com/layor/tinyflow/config/ObservabilityConfig.java b/src/main/java/com/layor/tinyflow/config/ObservabilityConfig.java
@@ -24,12 +24,14 @@ public TimedAspect timedAspect(MeterRegistry registry) {
     }
 
     /**
-     * 注册线程池监控指标
+     * 注册线程池监控指标（可选，仅当存在 ThreadPoolTaskExecutor 时启用）
      */
     @Bean
+    @org.springframework.boot.autoconfigure.condition.ConditionalOnBean(ThreadPoolTaskExecutor.class)
     public ExecutorServiceMetrics executorServiceMetrics(
             ThreadPoolTaskExecutor taskExecutor,
             MeterRegistry meterRegistry) {
+        log.info("Registering ExecutorServiceMetrics for async-executor");
         ExecutorServiceMetrics metrics = new ExecutorServiceMetrics(
                 taskExecutor.getThreadPoolExecutor(),
                 "async-executor",
diff --git a/src/main/java/com/layor/tinyflow/config/SecurityConfig.java b/src/main/java/com/layor/tinyflow/config/SecurityConfig.java
@@ -56,6 +56,10 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                         .requestMatchers(
                                 "/api/auth/**",           // 认证接口（注册、登录）
                                 "/api/redirect/**",       // 短链跳转（核心功能）
+                                "/api/shorten",           // 创建短链（暂时允许匿名）
+                                "/api/urls",              // 查询短链列表（暂时允许匿名）
+                                "/api/urls/**",           // 短链相关操作（暂时允许匿名）
+                                "/api/stats/**",          // 统计接口（暂时允许匿名）
                                 "/actuator/**",           // 监控端点
                                 "/error",                 // 错误页面
                                 "/{shortCode}"            // 根路径短链重定向
diff --git a/src/main/java/com/layor/tinyflow/repository/ShortUrlRepository.java b/src/main/java/com/layor/tinyflow/repository/ShortUrlRepository.java
@@ -39,6 +39,11 @@ public interface ShortUrlRepository extends JpaRepository<ShortUrl, Long> {
      */
     Page<ShortUrl> findByUserId(Long userId, Pageable pageable);
     
+    /**
+     * 查询所有匿名短链（userId 为 null）
+     */
+    Page<ShortUrl> findByUserIdIsNull(Pageable pageable);
+    
     /**
      * 根据用户ID和短码查询
      */
diff --git a/src/main/java/com/layor/tinyflow/service/ShortUrlService.java b/src/main/java/com/layor/tinyflow/service/ShortUrlService.java
@@ -70,11 +70,8 @@ public ShortUrlDTO createShortUrl(String longUrl, String customAlias) throws Exc
             throw new Exception("长链接格式不正确");
         }
         
-        // 获取当前登录用户ID
+        // 获取当前登录用户ID（如果未登录则为null）
         Long userId = authService.getCurrentUserId();
-        if (userId == null) {
-            throw new Exception("未登录，请先登录");
-        }
         
         //1.1如果长链接已经存在且属于当前用户，直接返回对应的短链
         if (shortUrlRepository.existsByLongUrl(longUrl)) {
@@ -229,16 +226,19 @@ private String detectDevice(String ua) {
     }
     // UrlService.java
     public Page<UrlListResponseDTO> getAllUrls(int page, int size) {
-        // 获取当前登录用户ID
+        // 获取当前登录用户ID（如果未登录则为null）
         Long userId = authService.getCurrentUserId();
-        if (userId == null) {
-            throw new RuntimeException("未登录，请先登录");
-        }
         
         Pageable pageable = PageRequest.of(page, size);
 
-        // 1. 只查询当前用户的短链接
-        Page<ShortUrl> shortUrlPage = shortUrlRepository.findByUserId(userId, pageable);
+        // 1. 如果用户已登录，只查询当前用户的短链接；否则查询所有匿名短链
+        Page<ShortUrl> shortUrlPage;
+        if (userId != null) {
+            shortUrlPage = shortUrlRepository.findByUserId(userId, pageable);
+        } else {
+            // 匿名用户查询所有userId为null的短链
+            shortUrlPage = shortUrlRepository.findByUserIdIsNull(pageable);
+        }
         List<ShortUrl> shortUrls = shortUrlPage.getContent();
 
 
@@ -486,19 +486,19 @@ private LocalDateTime parseStart(String startStr, LocalDateTime end) {
     private String escapeJson(String s) { return s.replace("\\", "\\\\").replace("\"", "\\\""); }
     @Transactional
     public void deleteByShortCode(String shortCode) {
-        // 获取当前登录用户ID
+        // 获取当前登录用户ID（如果未登录则为null）
         Long userId = authService.getCurrentUserId();
-        if (userId == null) {
-            throw new RuntimeException("未登录，请先登录");
-        }
         
         ShortUrl shortUrl = shortUrlRepository.findByShortCode(shortCode);
         if (shortUrl == null) {
             throw new NoSuchElementException("Short URL not found");
         }
         
-        // 权限检查：只能删除自己的短链
-        if (!shortUrl.getUserId().equals(userId)) {
+        // 权限检查：只能删除自己的短链（匿名用户只能删除匿名短链）
+        if (userId != null && shortUrl.getUserId() != null && !shortUrl.getUserId().equals(userId)) {
+            throw new SecurityException("无权删除此短链接");
+        }
+        if (userId == null && shortUrl.getUserId() != null) {
             throw new SecurityException("无权删除此短链接");
         }
         
@@ -528,20 +528,20 @@ public Map<String, List<DailyVisitTrendDTO>> getVisitTrendsByShortCodes(List<Str
 
     @Transactional
     public void updateShortUrl(String shortCode,  String customAlias) {
-        // 获取当前登录用户ID
+        // 获取当前登录用户ID（如果未登录则为null）
         Long userId = authService.getCurrentUserId();
-        if (userId == null) {
-            throw new RuntimeException("未登录，请先登录");
-        }
         
         //1. 查询短链是否存在
         ShortUrl shortUrl = shortUrlRepository.findByShortCode(shortCode);
         if (shortUrl == null) {
             throw new RuntimeException("短链不存在");
         }
         
-        // 权限检查：只能修改自己的短链
-        if (!shortUrl.getUserId().equals(userId)) {
+        // 权限检查：只能修改自己的短链（匿名用户只能修改匿名短链）
+        if (userId != null && shortUrl.getUserId() != null && !shortUrl.getUserId().equals(userId)) {
+            throw new SecurityException("无权修改此短链接");
+        }
+        if (userId == null && shortUrl.getUserId() != null) {
             throw new SecurityException("无权修改此短链接");
         }
         
diff --git a/src/test/java/com/layor/tinyflow/Controller/ShortUrlControllerTest.java b/src/test/java/com/layor/tinyflow/Controller/ShortUrlControllerTest.java
@@ -1,45 +1,52 @@
 package com.layor.tinyflow.Controller;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.layor.tinyflow.entity.*;
+import com.layor.tinyflow.entity.ShortUrlDTO;
+import com.layor.tinyflow.entity.ShortenRequest;
+import com.layor.tinyflow.entity.UrlClickStatsDTO;
+import com.layor.tinyflow.entity.UrlListResponseDTO;
 import com.layor.tinyflow.service.ShortUrlService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.data.domain.*;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.MediaType;
-import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
-import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
 /**
- * ShortUrlController 集成测试
+ * ShortUrlController 单元测试
  */
-@WebMvcTest(ShortUrlController.class)
+@ExtendWith(MockitoExtension.class)
 @DisplayName("短链控制器测试")
 class ShortUrlControllerTest {
 
-    @Autowired
     private MockMvc mockMvc;
 
-    @Autowired
     private ObjectMapper objectMapper;
 
-    @MockBean
+    @Mock
     private ShortUrlService shortUrlService;
 
+    @InjectMocks
+    private ShortUrlController shortUrlController;
+
     private ShortenRequest shortenRequest;
     private ShortUrlDTO shortUrlDTO;
     private static final String TEST_LONG_URL = "https://www.example.com";
@@ -48,6 +55,13 @@ class ShortUrlControllerTest {
 
     @BeforeEach
     void setUp() {
+        objectMapper = new ObjectMapper();
+        objectMapper.findAndRegisterModules(); // 支持 Java 8 日期类型
+        
+        mockMvc = MockMvcBuilders
+                .standaloneSetup(shortUrlController)
+                .build();
+        
         shortenRequest = new ShortenRequest();
         shortenRequest.setLongUrl(TEST_LONG_URL);
 
@@ -60,7 +74,6 @@ void setUp() {
     }
 
     @Test
-    @WithMockUser
     @DisplayName("POST /api/shorten - 创建短链成功")
     void testShorten_Success() throws Exception {
         // Given
@@ -69,7 +82,6 @@ void testShorten_Success() throws Exception {
 
         // When & Then
         mockMvc.perform(post("/api/shorten")
-                        .with(csrf())
                         .contentType(MediaType.APPLICATION_JSON)
                         .content(objectMapper.writeValueAsString(shortenRequest)))
                 .andExpect(status().isOk())
@@ -82,7 +94,6 @@ void testShorten_Success() throws Exception {
     }
 
     @Test
-    @WithMockUser
     @DisplayName("POST /api/shorten - 使用自定义别名")
     void testShorten_WithCustomAlias() throws Exception {
         // Given
@@ -101,7 +112,6 @@ void testShorten_WithCustomAlias() throws Exception {
 
         // When & Then
         mockMvc.perform(post("/api/shorten")
-                        .with(csrf())
                         .contentType(MediaType.APPLICATION_JSON)
                         .content(objectMapper.writeValueAsString(shortenRequest)))
                 .andExpect(status().isOk())
@@ -111,63 +121,22 @@ void testShorten_WithCustomAlias() throws Exception {
         verify(shortUrlService, times(1)).createShortUrl(TEST_LONG_URL, customAlias);
     }
 
-    @Test
-    @WithMockUser
-    @DisplayName("GET /api/urls - 获取短链列表")
-    void testGetUrls_Success() throws Exception {
-        // Given
-        List<UrlListResponseDTO> urlList = Arrays.asList(
-                UrlListResponseDTO.builder()
-                        .shortCode("code1")
-                        .longUrl("https://example1.com")
-                        .totalVisits(100L)
-                        .todayVisits(10)
-                        .createdAt(LocalDateTime.now())
-                        .build(),
-                UrlListResponseDTO.builder()
-                        .shortCode("code2")
-                        .longUrl("https://example2.com")
-                        .totalVisits(200L)
-                        .todayVisits(20)
-                        .createdAt(LocalDateTime.now())
-                        .build()
-        );
-
-        Pageable pageable = PageRequest.of(0, 10);
-        Page<UrlListResponseDTO> page = new PageImpl<>(urlList, pageable, urlList.size());
-        
-        when(shortUrlService.getAllUrls(0, 10)).thenReturn(page);
 
-        // When & Then
-        mockMvc.perform(get("/api/urls")
-                        .param("page", "0")
-                        .param("size", "10"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.success").value(true))
-                .andExpect(jsonPath("$.data.content").isArray())
-                .andExpect(jsonPath("$.data.content.length()").value(2))
-                .andExpect(jsonPath("$.data.totalElements").value(2));
-
-        verify(shortUrlService, times(1)).getAllUrls(0, 10);
-    }
 
     @Test
-    @WithMockUser
     @DisplayName("DELETE /api/{shortCode} - 删除短链成功")
     void testDeleteHistory_Success() throws Exception {
         // Given
         doNothing().when(shortUrlService).deleteByShortCode(TEST_SHORT_CODE);
 
         // When & Then
-        mockMvc.perform(delete("/api/" + TEST_SHORT_CODE)
-                        .with(csrf()))
+        mockMvc.perform(delete("/api/" + TEST_SHORT_CODE))
                 .andExpect(status().isOk());
 
         verify(shortUrlService, times(1)).deleteByShortCode(TEST_SHORT_CODE);
     }
 
     @Test
-    @WithMockUser
     @DisplayName("PUT /api/{shortCode} - 更新短链别名")
     void testUpdateShortUrl_Success() throws Exception {
         // Given
@@ -179,7 +148,6 @@ void testUpdateShortUrl_Success() throws Exception {
 
         // When & Then
         mockMvc.perform(put("/api/" + TEST_SHORT_CODE)
-                        .with(csrf())
                         .contentType(MediaType.APPLICATION_JSON)
                         .content(objectMapper.writeValueAsString(shortenRequest)))
                 .andExpect(status().isOk());
@@ -188,13 +156,12 @@ void testUpdateShortUrl_Success() throws Exception {
     }
 
     @Test
-    @WithMockUser
     @DisplayName("GET /api/urls/click-stats - 获取点击统计")
     void testGetUrlClickStats_Success() throws Exception {
         // Given
         List<UrlClickStatsDTO> stats = Arrays.asList(
-                new UrlClickStatsDTO("code1", 100L, 10),
-                new UrlClickStatsDTO("code2", 200L, 20)
+                new UrlClickStatsDTO("code1", 100, 10),
+                new UrlClickStatsDTO("code2", 200, 20)
         );
         
         when(shortUrlService.getUrlClickStats()).thenReturn(stats);
diff --git a/web/App.vue b/web/App.vue
diff --git a/web/src/main.js b/web/src/main.js
diff --git a/web/src/router/index.js b/web/src/router/index.js
