diff --git a/aurora-springboot/src/main/java/com/aurora/entity/Article.java b/aurora-springboot/src/main/java/com/aurora/entity/Article.java
index 0080fde..b096cf8 100644
--- a/aurora-springboot/src/main/java/com/aurora/entity/Article.java
+++ b/aurora-springboot/src/main/java/com/aurora/entity/Article.java
@@ -26,6 +26,8 @@ public class Article {
private String articleTitle;
+ private String articleAbstract;
+
private String articleContent;
private Integer isTop;
diff --git a/aurora-springboot/src/main/java/com/aurora/model/dto/ArticleAdminViewDTO.java b/aurora-springboot/src/main/java/com/aurora/model/dto/ArticleAdminViewDTO.java
index dcae436..a13b973 100644
--- a/aurora-springboot/src/main/java/com/aurora/model/dto/ArticleAdminViewDTO.java
+++ b/aurora-springboot/src/main/java/com/aurora/model/dto/ArticleAdminViewDTO.java
@@ -22,6 +22,8 @@ public class ArticleAdminViewDTO {
private String articleTitle;
+ private String articleAbstract;
+
private String articleContent;
private String articleCover;
diff --git a/aurora-springboot/src/main/java/com/aurora/model/vo/ArticleVO.java b/aurora-springboot/src/main/java/com/aurora/model/vo/ArticleVO.java
index b650d96..1a18c63 100644
--- a/aurora-springboot/src/main/java/com/aurora/model/vo/ArticleVO.java
+++ b/aurora-springboot/src/main/java/com/aurora/model/vo/ArticleVO.java
@@ -26,6 +26,9 @@ public class ArticleVO {
@ApiModelProperty(name = "articleContent", value = "文章内容", required = true, dataType = "String")
private String articleContent;
+ @ApiModelProperty(name = "articleAbstract", value = "文章摘要", dataType = "String")
+ private String articleAbstract;
+
@ApiModelProperty(name = "articleCover", value = "文章缩略图", dataType = "String")
private String articleCover;
diff --git a/aurora-springboot/src/main/resources/mapper/ArticleMapper.xml b/aurora-springboot/src/main/resources/mapper/ArticleMapper.xml
index 81de718..f25d754 100644
--- a/aurora-springboot/src/main/resources/mapper/ArticleMapper.xml
+++ b/aurora-springboot/src/main/resources/mapper/ArticleMapper.xml
@@ -63,7 +63,7 @@
category_id,
article_cover,
article_title,
- SUBSTR(article_content, 1, 500) AS article_content,
+ if(article_abstract is null or article_abstract = '', SUBSTR(article_content, 1, 500), article_abstract) AS article_content,
is_top,
is_featured,
status,
@@ -79,6 +79,7 @@
category_id,
article_cover,
article_title,
+ article_abstract,
article_content,
is_top,
is_featured,
@@ -100,7 +101,7 @@
SELECT a.id AS id,
article_cover,
article_title,
- SUBSTR(article_content, 1, 500) AS article_content,
+ if(article_abstract is null or article_abstract = '', SUBSTR(article_content, 1, 500), article_abstract) AS article_content,
is_top,
is_featured,
status,
@@ -115,6 +116,7 @@
user_id,
category_id,
article_cover,
+ article_abstract,
article_title,
article_content,
is_top,
diff --git a/aurora-vue/aurora-admin/src/views/article/Article.vue b/aurora-vue/aurora-admin/src/views/article/Article.vue
index ec367cc..d0e4c7c 100644
--- a/aurora-vue/aurora-admin/src/views/article/Article.vue
+++ b/aurora-vue/aurora-admin/src/views/article/Article.vue
@@ -127,6 +127,9 @@