From 16e0687b4e3928ef7464701dceb0269a5f986a15 Mon Sep 17 00:00:00 2001 From: barney <15270405776@163.com> Date: Sun, 23 Oct 2022 00:43:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=BC=82=E5=B8=B8=E6=8B=A6?= =?UTF-8?q?=E6=88=AA=E5=8F=8A=E8=87=AA=E5=AE=9A=E4=B9=89=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cache/.ehcache-diskstore.lock | 0 cache/blog-cache.data | Bin 0 -> 15980 bytes .../cc/bnblogs/Exception/CustomException.java | 8 +++ .../cc/bnblogs/config/ExceptionConfig.java | 33 ++++++++-- .../java/cc/bnblogs/config/WebConfig.java | 21 +++++++ .../bnblogs/controller/IndexController.java | 57 +++++++++++++++--- .../java/cc/bnblogs/enums/ErrorCodeEnum.java | 20 ++++++ src/main/resources/static/css/error.css | 4 +- .../templates/{error.html => fail.html} | 11 ++-- 9 files changed, 134 insertions(+), 20 deletions(-) create mode 100644 cache/.ehcache-diskstore.lock create mode 100644 cache/blog-cache.data create mode 100644 src/main/java/cc/bnblogs/Exception/CustomException.java create mode 100644 src/main/java/cc/bnblogs/enums/ErrorCodeEnum.java rename src/main/resources/templates/{error.html => fail.html} (82%) diff --git a/cache/.ehcache-diskstore.lock b/cache/.ehcache-diskstore.lock new file mode 100644 index 0000000..e69de29 diff --git a/cache/blog-cache.data b/cache/blog-cache.data new file mode 100644 index 0000000000000000000000000000000000000000..dfdf1f28cbd51d02cdec80dee755d41bf47c4000 GIT binary patch literal 15980 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 defaultException(Exception e) { + public void defaultException(Exception e, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + e.printStackTrace(); + log.error(e.getMessage(), e); + // 返回的是页面 + if (request.getRequestURI().endsWith(".html")) { + request.getRequestDispatcher("/error/500.html").forward(request, response); + } else { + // 返回的是json + response.setCharacterEncoding("utf-8"); + response.getWriter().print(new ObjectMapper().writeValueAsString(Result.error())); + } + } + + /** + * http状态码虽然是200，当业务上有错误(比如访问的文章、分类、标签不存在时) + * 当业务上存在404时，统一转发到/error/404.html + * @param e 自定义错误异常类 + * @return 404.html + */ + @ExceptionHandler(CustomException.class) + public String notFoundException(CustomException e) { e.printStackTrace(); log.error(e.getMessage(),e); - return Result.error(); + return "forward:/error/404.html"; } } diff --git a/src/main/java/cc/bnblogs/config/WebConfig.java b/src/main/java/cc/bnblogs/config/WebConfig.java index 10634a6..7d8cc3a 100644 --- a/src/main/java/cc/bnblogs/config/WebConfig.java +++ b/src/main/java/cc/bnblogs/config/WebConfig.java @@ -1,13 +1,22 @@ package cc.bnblogs.config; import cc.bnblogs.common.LRUCache; +import cc.bnblogs.common.Result; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.web.server.ConfigurableWebServerFactory; +import org.springframework.boot.web.server.ErrorPage; +import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.File; /** @@ -41,6 +50,18 @@ public class WebConfig implements WebMvcConfigurer { // 记住在absolutePath前加一个'/',否则本地图片读取不出来(重要的事情说三遍) registry.addResourceHandler("/upload/**").addResourceLocations("file://" + '/' + absolutePath); } + + /** + * 错误页面配置是根据HTTP请求返回的状态码决定的(Http异常) + * Controller层的报错是thymeleaf渲染页面时报错的(业务异常) + * @return 跳转到对应的error页面 + */ + @Bean + public WebServerFactoryCustomizer webServerFactoryCustomizer() { + return factory -> factory.addErrorPages( + new ErrorPage(HttpStatus.NOT_FOUND, "/error/404.html"), + new ErrorPage(HttpStatus.INTERNAL_SERVER_ERROR, "/error/500.html")); + } @Bean public LRUCache lruCache() { return new LRUCache(MAX_LRU_CACHE_SIZE); diff --git a/src/main/java/cc/bnblogs/controller/IndexController.java b/src/main/java/cc/bnblogs/controller/IndexController.java index 27b60b1..a3153d3 100644 --- a/src/main/java/cc/bnblogs/controller/IndexController.java +++ b/src/main/java/cc/bnblogs/controller/IndexController.java @@ -1,7 +1,9 @@ package cc.bnblogs.controller; +import cc.bnblogs.Exception.CustomException; import cc.bnblogs.common.*; import cc.bnblogs.config.WebConfig; +import cc.bnblogs.enums.ErrorCodeEnum; import cc.bnblogs.enums.ResultEnum; import cc.bnblogs.pojo.Article; import cc.bnblogs.pojo.Category; @@ -99,10 +101,13 @@ public class IndexController { @GetMapping("/tag/{id}.html") public String tagList(@PathVariable Integer id, @RequestParam(required = false,defaultValue = "1") Integer pageNumber, - Model model){ + Model model) throws CustomException { Tag tag = tagService.detail(id); + if (Objects.isNull(tag)) { + throw new CustomException(); + } model.addAttribute("tag",tag); - // todo id不存在时要特殊处理 + ArticleSearch articleSearch = ArticleSearch.indexSearch(pageNumber,5); articleSearch.setTid(id); PageHelper
articlePage = articleService.search(articleSearch); @@ -123,10 +128,12 @@ public class IndexController { @GetMapping("/category/{id}.html") public String categoryList(@PathVariable Integer id, @RequestParam(required = false,defaultValue = "1") Integer pageNumber, - Model model){ + Model model) throws CustomException { Category category = categoryService.detail(id); + if (Objects.isNull(category)) { + throw new CustomException(); + } model.addAttribute("category",category); - // todo 分类不存在时要特殊处理 ArticleSearch articleSearch = ArticleSearch.indexSearch(pageNumber,5); articleSearch.setCid(id); PageHelper
articlePage = articleService.search(articleSearch); @@ -178,22 +185,54 @@ public class IndexController { return "tags"; } - @GetMapping("/error") - public String error() { - return "error"; + /** + * 404错误请求 + * @param model MVC model + * @return 错误页 + */ + @GetMapping("/error/404.html") + public String error404(Model model) { + model.addAttribute("error", ErrorCodeEnum.ERROR_404); + return "fail"; + } + + /** + * 500错误请求 + * @param model MVC model + * @return 错误页 + */ + @GetMapping("/error/500.html") + public String error500(Model model) { + model.addAttribute("error", ErrorCodeEnum.ERROR_500); + return "fail"; } + /** + * 文章详情页 + * @param id 文章id + * @param model MVC model + * @param request HttpServletRequest请求 + * @param response HttpServletResponse响应 + * @return + */ + @GetMapping("/{id}.html") public String detail(@PathVariable Integer id, Model model, - HttpServletRequest request, HttpServletResponse response) { + HttpServletRequest request, HttpServletResponse response) + throws CustomException { Article article = articleService.detail(id); + // 文章不存在 + if (Objects.isNull(article)) { + throw new CustomException(); + } + // 如果cookie不存在 if (Objects.isNull(CookieUtil.getCookie(request,Article.VIEW_PREFIX + id))) { // 更新文章浏览量 articleService.viewArticle(id); CookieUtil.setCookie(response,Article.VIEW_PREFIX + id,"true"); } - // todo 文章内容不存在时应该抛出异常 + model.addAttribute("article",article); PageHelper commentPage = commentService.show(id,1); // 返回第一页评论 diff --git a/src/main/java/cc/bnblogs/enums/ErrorCodeEnum.java b/src/main/java/cc/bnblogs/enums/ErrorCodeEnum.java new file mode 100644 index 0000000..4033389 --- /dev/null +++ b/src/main/java/cc/bnblogs/enums/ErrorCodeEnum.java @@ -0,0 +1,20 @@ +package cc.bnblogs.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + + +/** + * @author zfp@bnblogs.cc + * @createTime: 2022/10/22 + */ + +@Getter +@AllArgsConstructor +public enum ErrorCodeEnum { + // HTTP请求的状态码和返回信息 + ERROR_404(404,"对不起，你请求的页面暂时未找到.
它或许已经被迁移至其它页面啦."), + ERROR_500(500,"您好，服务器暂时出发问题，请稍候访问.
或您也可以尝试联系站长."),; + private final Integer code; + private final String msg; +} diff --git a/src/main/resources/static/css/error.css b/src/main/resources/static/css/error.css index 4f3b3e7..05188bc 100644 --- a/src/main/resources/static/css/error.css +++ b/src/main/resources/static/css/error.css @@ -247,7 +247,9 @@ sup { display: block; top: 3rem; left: 3rem; - width: 5rem; + width: 20rem; + font-weight: 500; + font-size: larger; } .logo-link .logo { width: 100%; diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/fail.html similarity index 82% rename from src/main/resources/templates/error.html rename to src/main/resources/templates/fail.html index c630fb5..6b4c1e5 100644 --- a/src/main/resources/templates/error.html +++ b/src/main/resources/templates/fail.html @@ -1,5 +1,5 @@  - + Title @@ -13,7 +13,7 @@
-冷文学习者 +
@@ -47,10 +47,9 @@
-

错误码：404

+

错误码：

-

对不起，你请求的页面暂时未找到.
- 它或许已经被迁移至其它页面啦.

+

@@ -59,7 +58,7 @@