更新 admin 模块

manager/src/main/java/cn/reghao/devops/manager/admin/controller/BiliApiController.java

@@ -0,0 +1,17 @@
+package cn.reghao.devops.manager.admin.controller;
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author reghao
+ * @date 2019-08-30 18:49:15
+ */
+@Slf4j
+@Api(tags = "bili api")
+@Controller
+@RequestMapping("/api/bili")
+public class BiliApiController {
+}

manager/src/main/java/cn/reghao/devops/manager/admin/controller/PostController.java → manager/src/main/java/cn/reghao/devops/manager/admin/controller/BiliController.java

@@ -19,11 +19,39 @@ import org.springframework.web.bind.annotation.RequestParam;
  * @date 2019-08-30 18:49:15
  */
 @Slf4j
-@Api(tags = "稿件")
+@Api(tags = "bili page")
 @Controller
-@RequestMapping("/post")
-public class PostController {
-    @GetMapping("/category")
+@RequestMapping("/bili")
+public class BiliController {
+    @ApiOperation(value = "站点配置")
+    @GetMapping(value = "/site/config")
+    public String siteConfig(String username, Model model) {
+        PageRequest pageRequest = PageSort.pageRequest();
+        int pageNumber = pageRequest.getPageNumber();
+        int pageSize = pageRequest.getPageSize();
+        PageList<?> pageList = PageList.empty();
+        Page<?> page = new PageImpl<>(pageList.getList(), pageRequest, pageList.getTotalSize());
+
+        model.addAttribute("page", page);
+        model.addAttribute("list", page.getContent());
+        return "/site/config";
+    }
+
+    @ApiOperation(value = "账户")
+    @GetMapping(value = "/site/account")
+    public String appLogPage(String username, Model model) {
+        PageRequest pageRequest = PageSort.pageRequest();
+        int pageNumber = pageRequest.getPageNumber();
+        int pageSize = pageRequest.getPageSize();
+        PageList<?> pageList = PageList.empty();
+        Page<?> page = new PageImpl<>(pageList.getList(), pageRequest, pageList.getTotalSize());
+
+        model.addAttribute("page", page);
+        model.addAttribute("list", page.getContent());
+        return "/site/account";
+    }
+
+    @GetMapping("/post/category")
     public String categoryPage(Model model) {
         PageRequest pageRequest = PageSort.pageRequest();
         PageList<?> pageList = PageList.empty();
@@ -35,7 +63,7 @@ public class PostController {
     }
 
     @ApiOperation(value = "视频稿件")
-    @GetMapping("/video")
+    @GetMapping("/post/video")
     public String videoPage(@RequestParam(value = "title", required = false) String title, Model model) {
         if (title != null) {
             model.addAttribute("title", title);
@@ -50,7 +78,7 @@ public class PostController {
         return "/post/videolist";
     }
 
-    @GetMapping("/audio")
+    @GetMapping("/post/audio")
     public String audioPage(Model model) {
         PageRequest pageRequest = PageSort.pageRequest();
         PageList<?> pageList = PageList.empty();
@@ -61,7 +89,7 @@ public class PostController {
         return "/post/index";
     }
 
-    @GetMapping("/image")
+    @GetMapping("/post/image")
     public String imagePage(Model model) {
         PageRequest pageRequest = PageSort.pageRequest();
         PageList<?> pageList = PageList.empty();

manager/src/main/java/cn/reghao/devops/manager/admin/controller/SiteController.java

@@ -1,52 +0,0 @@
-package cn.reghao.devops.manager.admin.controller;
-
-import cn.reghao.devops.manager.util.db.PageSort;
-import cn.reghao.jutil.jdk.db.PageList;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * @author reghao
- * @date 2019-08-30 18:49:15
- */
-@Slf4j
-@Api(tags = "站点")
-@Controller
-@RequestMapping("/site")
-public class SiteController {
-    @ApiOperation(value = "站点配置")
-    @GetMapping(value = "/config")
-    public String siteConfig(String username, Model model) {
-        PageRequest pageRequest = PageSort.pageRequest();
-        int pageNumber = pageRequest.getPageNumber();
-        int pageSize = pageRequest.getPageSize();
-        PageList<?> pageList = PageList.empty();
-        Page<?> page = new PageImpl<>(pageList.getList(), pageRequest, pageList.getTotalSize());
-
-        model.addAttribute("page", page);
-        model.addAttribute("list", page.getContent());
-        return "/site/config";
-    }
-
-    @ApiOperation(value = "账户")
-    @GetMapping(value = "/account")
-    public String appLogPage(String username, Model model) {
-        PageRequest pageRequest = PageSort.pageRequest();
-        int pageNumber = pageRequest.getPageNumber();
-        int pageSize = pageRequest.getPageSize();
-        PageList<?> pageList = PageList.empty();
-        Page<?> page = new PageImpl<>(pageList.getList(), pageRequest, pageList.getTotalSize());
-
-        model.addAttribute("page", page);
-        model.addAttribute("list", page.getContent());
-        return "/site/account";
-    }
-}

manager/src/main/java/cn/reghao/devops/manager/admin/controller/SpiderApiController.java

@@ -1,45 +1,37 @@
 package cn.reghao.devops.manager.admin.controller;
 
-import cn.reghao.devops.manager.util.db.PageSort;
-import cn.reghao.jutil.jdk.db.PageList;
+import cn.reghao.devops.manager.admin.model.ChartData;
+import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author reghao
  * @date 2023-11-04 14:31:54
  */
 @Slf4j
-@Api(tags = "爬虫")
+@Api(tags = "spider api")
 @Controller
-@RequestMapping("/spider")
+@RequestMapping("/api/spider")
 public class SpiderApiController {
-    @GetMapping("/chart")
-    public String spiderChart(Model model) {
-        PageRequest pageRequest = PageSort.pageRequest();
-        PageList<?> pageList = PageList.empty();
-        Page<?> page = new PageImpl<>(pageList.getList(), pageRequest, pageList.getTotalSize());
-
-        model.addAttribute("page", page);
-        model.addAttribute("list", page.getContent());
-        return "/spider/chart";
-    }
+    @GetMapping(value = "/chart", produces = MediaType.APPLICATION_JSON_VALUE)
+    public String spiderChart() {
+        List<ChartData> list = new ArrayList<>();
+        List<Integer> data1 = List.of(2038, 120, 220, 214, 125, 117, 210);
+        ChartData chartData1 = new ChartData("npm", "line", data1);
+        list.add(chartData1);
 
-    @GetMapping("/url")
-    public String categoryPage(Model model) {
-        PageRequest pageRequest = PageSort.pageRequest();
-        PageList<?> pageList = PageList.empty();
-        Page<?> page = new PageImpl<>(pageList.getList(), pageRequest, pageList.getTotalSize());
+        List<Integer> data2 = List.of(135, 147, 150, 230, 224, 218, 2360);
+        ChartData chartData2 = new ChartData("dotnetCore", "line", data2);
+        list.add(chartData2);
 
-        model.addAttribute("page", page);
-        model.addAttribute("list", page.getContent());
-        return "/spider/index";
+        return WebResult.success(list);
     }
 }

manager/src/main/java/cn/reghao/devops/manager/admin/controller/SpiderController.java

@@ -1,37 +1,45 @@
 package cn.reghao.devops.manager.admin.controller;
 
-import cn.reghao.devops.manager.admin.model.ChartData;
-import cn.reghao.jutil.jdk.result.WebResult;
+import cn.reghao.devops.manager.util.db.PageSort;
+import cn.reghao.jutil.jdk.db.PageList;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.MediaType;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @author reghao
  * @date 2023-11-04 14:31:54
  */
 @Slf4j
-@Api(tags = "爬虫")
+@Api(tags = "spider page")
 @RestController
-@RequestMapping("/api/spider")
+@RequestMapping("/spider")
 public class SpiderController {
-    @GetMapping(value = "/chart", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String spiderChart() {
-        List<ChartData> list = new ArrayList<>();
-        List<Integer> data1 = List.of(2038, 120, 220, 214, 125, 117, 210);
-        ChartData chartData1 = new ChartData("npm", "line", data1);
-        list.add(chartData1);
+    @GetMapping("/chart")
+    public String spiderChart(Model model) {
+        PageRequest pageRequest = PageSort.pageRequest();
+        PageList<?> pageList = PageList.empty();
+        Page<?> page = new PageImpl<>(pageList.getList(), pageRequest, pageList.getTotalSize());
+
+        model.addAttribute("page", page);
+        model.addAttribute("list", page.getContent());
+        return "/spider/chart";
+    }
 
-        List<Integer> data2 = List.of(135, 147, 150, 230, 224, 218, 2360);
-        ChartData chartData2 = new ChartData("dotnetCore", "line", data2);
-        list.add(chartData2);
+    @GetMapping("/url")
+    public String categoryPage(Model model) {
+        PageRequest pageRequest = PageSort.pageRequest();
+        PageList<?> pageList = PageList.empty();
+        Page<?> page = new PageImpl<>(pageList.getList(), pageRequest, pageList.getTotalSize());
 
-        return WebResult.success(list);
+        model.addAttribute("page", page);
+        model.addAttribute("list", page.getContent());
+        return "/spider/index";
     }
 }