Refactor CommonController.

lyai007 · May 13, 2019 · 363acf4 · 363acf4
1 parent 7b480ca
commit 363acf4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 39 deletions.
diff --git a/src/main/java/run/halo/app/controller/admin/api/PostCommentController.java b/src/main/java/run/halo/app/controller/admin/api/PostCommentController.java
@@ -43,7 +43,7 @@ public Page<PostCommentWithPostVO> pageBy(@PageableDefault(sort = "updateTime",
 
     @GetMapping("latest")
     @ApiOperation("Pages latest comments")
-    public List<PostCommentWithPostVO> pageLatest(@RequestParam(name = "top", defaultValue = "10") int top,
+    public List<PostCommentWithPostVO> listLatest(@RequestParam(name = "top", defaultValue = "10") int top,
                                                   @RequestParam(name = "status", required = false) CommentStatus status) {
         // Get latest comment
         List<PostComment> content = postCommentService.pageLatest(top, status).getContent();

diff --git a/src/main/java/run/halo/app/controller/core/CommonController.java b/src/main/java/run/halo/app/controller/core/CommonController.java
@@ -6,12 +6,9 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
-import run.halo.app.model.entity.User;
-import run.halo.app.model.support.HaloConst;
 import run.halo.app.service.ThemeService;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 
 /**
  * Error page Controller
@@ -29,8 +26,6 @@ public class CommonController implements ErrorController {
 
     private static final String INTERNAL_ERROR_TEMPLATE = "500.ftl";
 
-    private static final String ADMIN_URL = "/admin";
-
     private final ThemeService themeService;
 
     public CommonController(ThemeService themeService) {
@@ -44,13 +39,9 @@ public CommonController(ThemeService themeService) {
      * @return String
      */
     @GetMapping(value = ERROR_PATH)
-    public String handleError(HttpServletRequest request, HttpSession session) {
+    public String handleError(HttpServletRequest request) {
         final Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code");
 
-        final String requestURI = request.getRequestURI();
-
-        final User user = (User) session.getAttribute(HaloConst.USER_SESSION_KEY);
-
         log.error("Error path: [{}], status: [{}]", getErrorPath(), statusCode);
 
         // Get the exception
@@ -62,40 +53,17 @@ public String handleError(HttpServletRequest request, HttpSession session) {
             if (StringUtils.startsWithIgnoreCase(throwable.getMessage(), "Could not resolve view with name '")) {
                 // TODO May cause unknown-reason problem
                 // if Ftl was not found then redirect to /404
-                if (requestURI.contains(ADMIN_URL) && null != user) {
-                    return "redirect:/admin/404";
-                } else {
-                    return "redirect:/404";
-                }
+                return "redirect:/404";
             }
         }
-        if (requestURI.contains(ADMIN_URL) && null != user) {
-            return "redirect:/admin/500";
-        } else {
+
+        if (statusCode == 500) {
             return "redirect:/500";
+        } else {
+            return "redirect:/404";
         }
     }
 
-    /**
-     * Render 404 error page
-     *
-     * @return template path:
-     */
-    @GetMapping(value = "/admin/404")
-    public String adminNotFround() {
-        return "common/error/404";
-    }
-
-    /**
-     * Render 500 error page
-     *
-     * @return template path:
-     */
-    @GetMapping(value = "/admin/500")
-    public String adminInternalError() {
-        return "common/error/500";
-    }
-
     /**
      * Render 404 error page
      *