From c7680d4741487c0cbbecb0875b4f0d39e178125a Mon Sep 17 00:00:00 2001 From: zhangmeng <1334717033@qq.com> Date: Mon, 13 Dec 2021 16:18:51 +0800 Subject: [PATCH] =?UTF-8?q?2021=E5=B9=B412=E6=9C=8813=E6=97=A516:18:25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/controller/BlogController.java | 7 +++ .../controller/CategoryController.java | 10 ++++ .../admin/manager/feign/CategoryFeign.java | 4 ++ .../resources/templates/blog/v1/about.ftl | 26 ++++---- .../resources/templates/blog/v1/category.ftl | 16 ++--- .../resources/templates/blog/v1/details.ftl | 6 +- .../templates/blog/v1/footer/footer.ftl | 2 +- .../resources/templates/blog/v1/index.ftl | 12 ++-- .../service/blog/CategoryControllerApi.java | 3 + .../blog/controller/ArticleController.java | 1 + .../blog/controller/CategoryController.java | 60 +++++++++++++++++-- .../src/main/resources/application.yml | 1 + 12 files changed, 112 insertions(+), 36 deletions(-) diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/BlogController.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/BlogController.java index 74c6bc8..d50e281 100644 --- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/BlogController.java +++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/BlogController.java @@ -50,4 +50,11 @@ public class BlogController extends BaseController { model.addAllAttributes(map); return this.jumpPage("blog/v1/category"); } + + @GetMapping("/about") + public ModelAndView about(Model model) { + Map map = this.articleFeign.blog_common_page(); + model.addAllAttributes(map); + return this.jumpPage("blog/v1/about"); + } } diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/CategoryController.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/CategoryController.java index e02f208..8080653 100644 --- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/CategoryController.java +++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/CategoryController.java @@ -1,5 +1,6 @@ package com.zhangmeng.admin.manager.controller; +import com.zhangmeng.admin.manager.feign.ArticleFeign; import com.zhangmeng.admin.manager.feign.CategoryFeign; import com.zhangmeng.model.base.baseController.BaseController; import com.zhangmeng.model.entity.Category; @@ -17,6 +18,9 @@ public class CategoryController extends BaseController { @Autowired private CategoryFeign categoryFeign; + @Autowired + private ArticleFeign articleFeign; + @GetMapping("/index") public ModelAndView category_index() { return this.jumpPage("admin/category/list"); @@ -41,4 +45,10 @@ public class CategoryController extends BaseController { return this.jumpPage("admin/category/edit"); } + @GetMapping("/category_list") + public ModelAndView category_list(String categoryId, Integer pageNum, Integer pageSize, Model model) { + model.addAllAttributes(this.categoryFeign.getMap(categoryId, pageNum, pageSize)); + model.addAllAttributes(this.articleFeign.blog_common_page()); + return this.jumpPage("blog/v1/category"); + } } diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/CategoryFeign.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/CategoryFeign.java index 292396d..b48e73f 100644 --- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/CategoryFeign.java +++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/CategoryFeign.java @@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; +import java.util.Map; @FeignClient(value = SysConstant.mystyle_cloud_blog,contextId = "CategoryFeign") public interface CategoryFeign { @@ -16,4 +17,7 @@ public interface CategoryFeign { @GetMapping("/category/findById") public Category findById(@RequestParam("categoryId") Long categoryId); + + @GetMapping("/category/getMap") + public Map getMap(@RequestParam("categoryId") String categoryId,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize); } diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/about.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/about.ftl index 77c44e6..bf7db8b 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/about.ftl +++ b/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/about.ftl @@ -3,10 +3,10 @@