From 23772223bdd0bd217d5c2b51af5d9e35e58037df Mon Sep 17 00:00:00 2001 From: zhaojun <873019219@qq.com> Date: Sun, 13 Apr 2025 17:20:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BD=91=E9=A1=B5=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zfile/core/controller/FrontIndexController.java | 12 ++++++++---- .../zfile/core/exception/GlobalExceptionHandler.java | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/im/zhaojun/zfile/core/controller/FrontIndexController.java b/src/main/java/im/zhaojun/zfile/core/controller/FrontIndexController.java index 9bb6e2a..82a82db 100644 --- a/src/main/java/im/zhaojun/zfile/core/controller/FrontIndexController.java +++ b/src/main/java/im/zhaojun/zfile/core/controller/FrontIndexController.java @@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.web.WebProperties; import org.springframework.core.io.FileSystemResourceLoader; import org.springframework.core.io.ResourceLoader; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -37,7 +38,7 @@ public class FrontIndexController { */ @RequestMapping(value = { "/"}) @ResponseBody - public String redirect() { + public ResponseEntity redirect() { // 读取 resources/static/index.html 文件修改 title 和 favicon 后返回 ResourceLoader resourceLoader = new FileSystemResourceLoader(); String[] staticLocations = webProperties.getResources().getStaticLocations(); @@ -64,7 +65,7 @@ public class FrontIndexController { log.debug("读取 index.html 文件成功, 文件路径: {}", staticLocation); } catch (Exception e) { log.error("{} 资源存在但读取 index.html 文件失败.", staticLocation); - return "static index.html read error"; + return ResponseEntity.status(500).body("static index.html read error"); } SystemConfigDTO systemConfig = systemConfigService.getSystemConfig(); @@ -81,11 +82,14 @@ public class FrontIndexController { content = content.replace("/favicon.svg", faviconUrl); } - return content; + // 添加缓存控制头 + return ResponseEntity.ok() + .header("Cache-Control", "max-age=600, must-revalidate, proxy-revalidate") .header("Pragma", "no-cache") + .body(content); } } - return "static index.html not found"; + return ResponseEntity.status(404).body("static index.html not found"); } @RequestMapping(value = { "/guest"}) diff --git a/src/main/java/im/zhaojun/zfile/core/exception/GlobalExceptionHandler.java b/src/main/java/im/zhaojun/zfile/core/exception/GlobalExceptionHandler.java index 696bcbc..dc079f5 100644 --- a/src/main/java/im/zhaojun/zfile/core/exception/GlobalExceptionHandler.java +++ b/src/main/java/im/zhaojun/zfile/core/exception/GlobalExceptionHandler.java @@ -139,7 +139,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(value = NoResourceFoundException.class) @ResponseBody public String notFoundAccessException() { - return frontIndexController.redirect(); + return frontIndexController.redirect().getBody(); } @ExceptionHandler(value = MethodNotAllowedAccessException.class)