From cc5162378b045bd7cd6dfdc71e545848b4b0abcb Mon Sep 17 00:00:00 2001 From: linhaojun Date: Tue, 20 Sep 2022 14:54:00 +0800 Subject: [PATCH] =?UTF-8?q?:rocket:=20=E5=BC=80=E5=8F=91=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=8A=A0=E5=AF=86=E8=AE=BF=E9=97=AE=EF=BC=88=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/aurora/enums/ArticleStatusEnum.java | 4 ++-- .../src/main/java/com/aurora/vo/ArticleVO.java | 7 +++++++ aurora-vue/aurora-admin/src/views/article/Article.vue | 8 +++++--- .../src/components/ArticleCard/src/ArticleCard.vue | 5 ++++- .../src/components/ArticleCard/src/HorizontalArticle.vue | 4 ++-- aurora-vue/aurora-blog/src/icons/svg/lock.svg | 1 + 6 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 aurora-vue/aurora-blog/src/icons/svg/lock.svg diff --git a/aurora-springboot/src/main/java/com/aurora/enums/ArticleStatusEnum.java b/aurora-springboot/src/main/java/com/aurora/enums/ArticleStatusEnum.java index bbf606f..e8d5763 100644 --- a/aurora-springboot/src/main/java/com/aurora/enums/ArticleStatusEnum.java +++ b/aurora-springboot/src/main/java/com/aurora/enums/ArticleStatusEnum.java @@ -15,9 +15,9 @@ public enum ArticleStatusEnum { */ PUBLIC(1, "公开"), /** - * 私密 + * 密码 */ - SECRET(2, "私密"), + SECRET(2, "密码"), /** * 草稿 */ diff --git a/aurora-springboot/src/main/java/com/aurora/vo/ArticleVO.java b/aurora-springboot/src/main/java/com/aurora/vo/ArticleVO.java index 79a671a..ce563ce 100644 --- a/aurora-springboot/src/main/java/com/aurora/vo/ArticleVO.java +++ b/aurora-springboot/src/main/java/com/aurora/vo/ArticleVO.java @@ -4,6 +4,7 @@ package com.aurora.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; + import javax.validation.constraints.NotBlank; import java.util.List; @@ -86,4 +87,10 @@ public class ArticleVO { */ @ApiModelProperty(name = "originalUrl", value = "原文链接", dataType = "String") private String originalUrl; + + /** + * 文章访问密码 + */ + @ApiModelProperty(name = "password", value = "文章访问密码", dataType = "String") + private String password; } diff --git a/aurora-vue/aurora-admin/src/views/article/Article.vue b/aurora-vue/aurora-admin/src/views/article/Article.vue index 2644bc0..fd3919a 100644 --- a/aurora-vue/aurora-admin/src/views/article/Article.vue +++ b/aurora-vue/aurora-admin/src/views/article/Article.vue @@ -134,9 +134,12 @@ 公开 - 私密 + 密码 + + +
取 消 @@ -197,7 +200,6 @@ export default { articleCover: '', categoryName: null, tagNames: [], - originalUrl: '', isTop: 0, type: 1, status: 1 @@ -481,4 +483,4 @@ export default { height: 260px; overflow-y: auto; } - + \ No newline at end of file diff --git a/aurora-vue/aurora-blog/src/components/ArticleCard/src/ArticleCard.vue b/aurora-vue/aurora-blog/src/components/ArticleCard/src/ArticleCard.vue index b778e75..6056226 100644 --- a/aurora-vue/aurora-blog/src/components/ArticleCard/src/ArticleCard.vue +++ b/aurora-vue/aurora-blog/src/components/ArticleCard/src/ArticleCard.vue @@ -39,7 +39,10 @@

- {{ article.articleTitle }} + + {{ article.articleTitle }} + +

{{ article.articleContent }}

diff --git a/aurora-vue/aurora-blog/src/components/ArticleCard/src/HorizontalArticle.vue b/aurora-vue/aurora-blog/src/components/ArticleCard/src/HorizontalArticle.vue index 08541da..0760a08 100644 --- a/aurora-vue/aurora-blog/src/components/ArticleCard/src/HorizontalArticle.vue +++ b/aurora-vue/aurora-blog/src/components/ArticleCard/src/HorizontalArticle.vue @@ -24,7 +24,6 @@ {{ article.categoryName }} -