From 9fc1132bbe74dc70965000946ea168a6a2523526 Mon Sep 17 00:00:00 2001 From: zhangmeng <1334717033@qq.com> Date: Mon, 13 Dec 2021 11:32:41 +0800 Subject: [PATCH] =?UTF-8?q?2021=E5=B9=B412=E6=9C=8813=E6=97=A511:32:05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UrlRequestController.java | 10 + .../admin/manager/feign/ArticleFeign.java | 3 + .../src/main/resources/application.yml | 1 + .../resources/templates/blog/v1/details.ftl | 6 +- .../templates/blog/v1/footer/footer.ftl | 4 +- .../templates/blog/v1/header/header.ftl | 2 +- .../resources/templates/blog/v1/index.ftl | 18 +- .../resources/templates/blog/v2/details.ftl | 326 ------------------ .../resources/templates/blog/v2/index.ftl | 186 ---------- .../service/blog/ArticleControllerApi.java | 3 + .../blog/controller/ArticleController.java | 26 ++ .../java/com/zhangmeng/blog/dao/ReplyDao.java | 15 + .../java/com/zhangmeng/blog/dao/TagsDao.java | 9 + .../src/main/resources/application.yml | 2 + .../src/main/resources/application.yml | 1 + 15 files changed, 85 insertions(+), 527 deletions(-) delete mode 100644 mystyle-cloud-admin-manager/src/main/resources/templates/blog/v2/details.ftl delete mode 100644 mystyle-cloud-admin-manager/src/main/resources/templates/blog/v2/index.ftl create mode 100644 mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/dao/ReplyDao.java create mode 100644 mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/dao/TagsDao.java diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java index 4107861..9d635ad 100644 --- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java +++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java @@ -518,4 +518,14 @@ public class UrlRequestController extends BaseController { model.addAllAttributes(map); return this.jumpPage("blog/v1/index"); } + + + @GetMapping("/blog/details/{id}") + public ModelAndView blog_details(Model model,@PathVariable("id") Long id) { + Map map = this.articleFeign.blog_common_page(id); + model.addAllAttributes(map); + Article article = this.articleFeign.findById(id); + model.addAttribute("article",article); + return this.jumpPage("blog/v1/details"); + } } \ No newline at end of file diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/ArticleFeign.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/ArticleFeign.java index 05298f5..94e20b3 100644 --- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/ArticleFeign.java +++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/ArticleFeign.java @@ -29,4 +29,7 @@ public interface ArticleFeign { @GetMapping("/article/getListByPage") Map getListByPage(@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize); + + @GetMapping("/article/blog_common_page") + Map blog_common_page(@RequestParam("article_id") Long article_id); } diff --git a/mystyle-cloud-admin-manager/src/main/resources/application.yml b/mystyle-cloud-admin-manager/src/main/resources/application.yml index f798b0d..bf969bc 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/application.yml +++ b/mystyle-cloud-admin-manager/src/main/resources/application.yml @@ -74,6 +74,7 @@ mystyle: - /blog/index - /user/findByUserId - /sysConfig/getSysConfig + - /blog/** verification-code: type: mysql expiration-time: 300 diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/details.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/details.ftl index 7aa8041..42cb10d 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/details.ftl +++ b/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/details.ftl @@ -3,7 +3,7 @@