From ddef7e09d25d2afea0cabbb923514a1b863b2aad Mon Sep 17 00:00:00 2001 From: ruibaby Date: Fri, 6 Dec 2019 20:06:56 +0800 Subject: [PATCH] feat: #412 --- build.gradle | 2 +- src/main/java/run/halo/app/model/entity/BasePost.java | 4 ++++ src/main/java/run/halo/app/model/params/PostParam.java | 1 - src/main/java/run/halo/app/model/params/SheetParam.java | 1 - 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 967447a23..44a1dca2b 100644 --- a/build.gradle +++ b/build.gradle @@ -101,7 +101,7 @@ dependencies { implementation "net.sf.image4j:image4j:$image4jVersion" implementation "org.flywaydb:flyway-core:$flywayVersion" - runtimeOnly 'com.h2database:h2' + runtimeOnly 'com.h2database:h2:1.4.196' runtimeOnly 'mysql:mysql-connector-java' diff --git a/src/main/java/run/halo/app/model/entity/BasePost.java b/src/main/java/run/halo/app/model/entity/BasePost.java index 89b1636e4..6c2dc7044 100644 --- a/src/main/java/run/halo/app/model/entity/BasePost.java +++ b/src/main/java/run/halo/app/model/entity/BasePost.java @@ -170,6 +170,10 @@ public class BasePost extends BaseEntity { likes = 0L; } + if (originalContent == null) { + originalContent = ""; + } + if (formatContent == null) { formatContent = ""; } diff --git a/src/main/java/run/halo/app/model/params/PostParam.java b/src/main/java/run/halo/app/model/params/PostParam.java index 347dda9d7..02d8c63b7 100644 --- a/src/main/java/run/halo/app/model/params/PostParam.java +++ b/src/main/java/run/halo/app/model/params/PostParam.java @@ -36,7 +36,6 @@ public class PostParam implements InputConverter { private String url; - @NotBlank(message = "文章内容不能为空") private String originalContent; private String summary; diff --git a/src/main/java/run/halo/app/model/params/SheetParam.java b/src/main/java/run/halo/app/model/params/SheetParam.java index e4fcb5d95..933246bab 100644 --- a/src/main/java/run/halo/app/model/params/SheetParam.java +++ b/src/main/java/run/halo/app/model/params/SheetParam.java @@ -30,7 +30,6 @@ public class SheetParam implements InputConverter { private String url; - @NotBlank(message = "页面内容不能为空") private String originalContent; @Size(max = 255, message = "页面缩略图链接的字符长度不能超过 {max}")