diff --git a/src/main/java/run/halo/app/controller/content/ContentArchiveController.java b/src/main/java/run/halo/app/controller/content/ContentArchiveController.java index 80a2c4231..708ec6e9c 100644 --- a/src/main/java/run/halo/app/controller/content/ContentArchiveController.java +++ b/src/main/java/run/halo/app/controller/content/ContentArchiveController.java @@ -2,7 +2,6 @@ package run.halo.app.controller.content; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.PageUtil; -import cn.hutool.crypto.digest.BCrypt; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -185,7 +184,7 @@ public class ContentArchiveController { throw new ForbiddenException("没有查询到该文章信息"); } - if (BCrypt.checkpw(password, post.getPassword())) { + if (password.equals(post.getPassword())) { String token = IdUtil.simpleUUID(); cacheStore.putAny(token, token, 10, TimeUnit.SECONDS); 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 abf14a7c6..43f3d08b5 100644 --- a/src/main/java/run/halo/app/model/params/PostParam.java +++ b/src/main/java/run/halo/app/model/params/PostParam.java @@ -68,13 +68,7 @@ public class PostParam implements InputConverter { thumbnail = ""; } - Post post = InputConverter.super.convertTo(); - // Crypt password - if (StringUtils.isNotBlank(password)) { - post.setPassword(BCrypt.hashpw(password, BCrypt.gensalt())); - } - - return post; + return InputConverter.super.convertTo(); } @Override @@ -87,10 +81,5 @@ public class PostParam implements InputConverter { } InputConverter.super.update(post); - - // Crypt password - if (StringUtils.isNotBlank(password)) { - post.setPassword(BCrypt.hashpw(password, BCrypt.gensalt())); - } } } 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 e657ddbbc..1e45eb24a 100644 --- a/src/main/java/run/halo/app/model/params/SheetParam.java +++ b/src/main/java/run/halo/app/model/params/SheetParam.java @@ -60,13 +60,7 @@ public class SheetParam implements InputConverter { thumbnail = ""; } - Sheet sheet = InputConverter.super.convertTo(); - // Crypt password - if (StringUtils.isNotBlank(password)) { - sheet.setPassword(BCrypt.hashpw(password, BCrypt.gensalt())); - } - - return sheet; + return InputConverter.super.convertTo(); } @Override @@ -80,10 +74,5 @@ public class SheetParam implements InputConverter { } InputConverter.super.update(sheet); - - // Crypt password - if (StringUtils.isNotBlank(password)) { - sheet.setPassword(BCrypt.hashpw(password, BCrypt.gensalt())); - } } }