diff --git a/src/main/java/eu/org/biwin/screen/advice/GlobalExceptionHandler.java b/src/main/java/eu/org/biwin/screen/advice/GlobalExceptionHandler.java index 3f9f61b..940d1f8 100644 --- a/src/main/java/eu/org/biwin/screen/advice/GlobalExceptionHandler.java +++ b/src/main/java/eu/org/biwin/screen/advice/GlobalExceptionHandler.java @@ -1,6 +1,7 @@ package eu.org.biwin.screen.advice; import cn.dev33.satoken.exception.NotLoginException; +import cn.dev33.satoken.exception.NotRoleException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.http.HttpStatus; @@ -34,6 +35,10 @@ public class GlobalExceptionHandler { return "redirect:/login"; } + @ExceptionHandler(NotRoleException.class) + public Object handlerNotRoleException(NotRoleException nre, HttpServletRequest request, HttpServletResponse response) { + return "redirect:/"; + } @ExceptionHandler(Exception.class) public ResponseEntity handleException(Exception e) { e.printStackTrace(); diff --git a/src/main/java/eu/org/biwin/screen/controller/AdminController.java b/src/main/java/eu/org/biwin/screen/controller/AdminController.java index ed20df5..1ec8c63 100644 --- a/src/main/java/eu/org/biwin/screen/controller/AdminController.java +++ b/src/main/java/eu/org/biwin/screen/controller/AdminController.java @@ -83,12 +83,6 @@ public class AdminController { return JSONUtil.toJsonStr(result); } - @GetMapping - @SaCheckRole("admin") // Add annotation to each protected method - public String adminPage() { - return "admin"; - } - @GetMapping("/codes") @ResponseBody @SaCheckRole("admin") // Add annotation to each protected method diff --git a/src/main/java/eu/org/biwin/screen/controller/GalleryController.java b/src/main/java/eu/org/biwin/screen/controller/GalleryController.java index e3a1967..9c1cc39 100644 --- a/src/main/java/eu/org/biwin/screen/controller/GalleryController.java +++ b/src/main/java/eu/org/biwin/screen/controller/GalleryController.java @@ -1,5 +1,6 @@ package eu.org.biwin.screen.controller; +import cn.dev33.satoken.annotation.SaCheckRole; import cn.dev33.satoken.stp.StpUtil; import eu.org.biwin.screen.model.ImageGroup; import jakarta.servlet.http.HttpServletRequest; @@ -96,6 +97,12 @@ public class GalleryController { return "cart"; } + @GetMapping("/admin") + @SaCheckRole("admin") // Add annotation to each protected method + public String adminPage() { + return "admin"; + } + @PostMapping("/doLogin") @ResponseBody public String doLogin(String password) { diff --git a/src/main/resources/templates/cart.html b/src/main/resources/templates/cart.html index 95db768..8a11466 100644 --- a/src/main/resources/templates/cart.html +++ b/src/main/resources/templates/cart.html @@ -74,7 +74,7 @@
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 4cd83e8..0c7b8c0 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -77,7 +77,7 @@