From 9fe51eab74becca3970fe79ab6c0eec0b1ba01a1 Mon Sep 17 00:00:00 2001
From: xiongxiaoyang <1179705413@qq.com>
Date: Wed, 17 May 2023 23:43:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=B5=E9=9D=A2=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java2nb/novel/core/advice/PageExceptionHandler.java   | 2 +-
 .../novel/controller/{ => page}/PageController.java       | 8 ++++----
 .../novel/controller/{ => page}/PageController.java       | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename novel-crawl/src/main/java/com/java2nb/novel/controller/{ => page}/PageController.java (87%)
 rename novel-front/src/main/java/com/java2nb/novel/controller/{ => page}/PageController.java (99%)

diff --git a/novel-common/src/main/java/com/java2nb/novel/core/advice/PageExceptionHandler.java b/novel-common/src/main/java/com/java2nb/novel/core/advice/PageExceptionHandler.java
index 609ed6d..85041fd 100644
--- a/novel-common/src/main/java/com/java2nb/novel/core/advice/PageExceptionHandler.java
+++ b/novel-common/src/main/java/com/java2nb/novel/core/advice/PageExceptionHandler.java
@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
  * @author 11797
  */
 @Slf4j
-@ControllerAdvice(basePackages = "com.java2nb.novel.page")
+@ControllerAdvice(basePackages = "com.java2nb.novel.controller.page")
 public class PageExceptionHandler {
 
 
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/controller/PageController.java b/novel-crawl/src/main/java/com/java2nb/novel/controller/page/PageController.java
similarity index 87%
rename from novel-crawl/src/main/java/com/java2nb/novel/controller/PageController.java
rename to novel-crawl/src/main/java/com/java2nb/novel/controller/page/PageController.java
index f7c6477..d7089a3 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/controller/PageController.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/controller/page/PageController.java
@@ -1,4 +1,4 @@
-package com.java2nb.novel.controller;
+package com.java2nb.novel.controller.page;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 public class PageController {
 
 
-
     @RequestMapping("{url}.html")
     public String module(@PathVariable("url") String url) {
         return url;
@@ -27,13 +26,14 @@ public class PageController {
     }
 
     @RequestMapping("{module}/{classify}/{url}.html")
-    public String module3(@PathVariable("module") String module, @PathVariable("classify") String classify, @PathVariable("url") String url) {
+    public String module3(@PathVariable("module") String module, @PathVariable("classify") String classify,
+        @PathVariable("url") String url) {
         return module + "/" + classify + "/" + url;
     }
 
     /**
      * 首页
-     * */
+     */
     @RequestMapping(path = {"/", "/index", "/index.html"})
     public String index() {
         return "crawl/crawlSource_list";
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java b/novel-front/src/main/java/com/java2nb/novel/controller/page/PageController.java
similarity index 99%
rename from novel-front/src/main/java/com/java2nb/novel/controller/PageController.java
rename to novel-front/src/main/java/com/java2nb/novel/controller/page/PageController.java
index f32f6d6..b6df1e9 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/page/PageController.java
@@ -1,5 +1,6 @@
-package com.java2nb.novel.controller;
+package com.java2nb.novel.controller.page;
 
+import com.java2nb.novel.controller.BaseController;
 import com.java2nb.novel.core.bean.UserDetails;
 import com.java2nb.novel.core.utils.ThreadLocalUtil;
 import com.java2nb.novel.entity.*;