diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/article/ArticleController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/article/ArticleController.java index e631559e..f80089b0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/article/ArticleController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/article/ArticleController.java @@ -41,7 +41,7 @@ public class ArticleController { } /** - * 文章列表 + * 文章详情 * * @author fzr * @param id 文章ID diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleArchivesServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleArchivesServiceImpl.java index b914583b..26b205a2 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleArchivesServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleArchivesServiceImpl.java @@ -121,6 +121,7 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService { model.setImage(UrlUtil.toRelativeUrl(articleParam.getImage())); model.setIntro(articleParam.getIntro()); model.setContent(articleParam.getContent()); + model.setSummary(articleParam.getSummary()); model.setSort(articleParam.getSort()); model.setIsShow(articleParam.getIsShow()); model.setAuthor(articleParam.getAuthor()); @@ -155,6 +156,7 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService { model.setImage(UrlUtil.toRelativeUrl(articleParam.getImage())); model.setIntro(articleParam.getIntro()); model.setContent(articleParam.getContent()); + model.setSummary(articleParam.getSummary()); model.setIsShow(articleParam.getIsShow()); model.setAuthor(articleParam.getAuthor()); model.setSort(articleParam.getSort()); diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java index 7f850722..87a16afb 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java @@ -45,6 +45,8 @@ public class ArticleParam implements Serializable { private String content = ""; + private String summary = ""; + @Length(max = 32, message = "作者名称不能超32个字符", groups = {create.class, update.class}) private String author = ""; diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleDetailVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleDetailVo.java index eba2256e..3c1b1d4a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleDetailVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleDetailVo.java @@ -17,6 +17,7 @@ public class ArticleDetailVo implements Serializable { private String title; // 标题 private String image; // 图片 private String intro; // 简介 + private String summary; // 摘要 private String content; // 内容 private String author; // 作者 private Integer visit; // 访问 diff --git a/server/like-common/src/main/java/com/mdd/common/entity/article/Article.java b/server/like-common/src/main/java/com/mdd/common/entity/article/Article.java index c831d7f6..de98fe97 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/article/Article.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/article/Article.java @@ -19,6 +19,7 @@ public class Article implements Serializable { private Integer cid; // 分类 private String title; // 标题 private String intro; // 简介 + private String summary; // 摘要 private String image; // 封面 private String content; // 内容 private String author; // 作者 @@ -28,6 +29,6 @@ public class Article implements Serializable { private Integer isDelete; // 是否删除: [0=否, 1=是] private Long createTime; // 创建时间 private Long updateTime; // 更新时间 - private Long deleteTime; // 删除时间 + private Long deleteTime; // 删除时间 } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java index d5a3bcd6..3aa2c36d 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java @@ -104,7 +104,7 @@ public class ArticleServiceImpl implements IArticleService { @Override public ArticleDetailVo detail(Integer id) { Article article = articleMapper.selectOne(new QueryWrapper
() - .select("id,title,image,intro,visit,author,content,create_time") + .select("id,title,image,intro,summary,visit,author,content,create_time") .eq("id", id) .eq("is_show", 1) .eq("is_delete", 0) diff --git a/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleDetailVo.java b/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleDetailVo.java index ceaa73fd..526c6dbd 100644 --- a/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleDetailVo.java +++ b/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleDetailVo.java @@ -13,6 +13,7 @@ public class ArticleDetailVo implements Serializable { private String title; private String image; private String intro; + private String summary; private Integer visit; private String author; private String content;