From e1b7fea24f76661253652a88235eb8fb5847a616 Mon Sep 17 00:00:00 2001 From: jasmine <362055143@qq.com> Date: Wed, 31 Jan 2024 02:16:44 +0000 Subject: [PATCH] =?UTF-8?q?fix(core):=20=E5=AE=8C=E5=96=84=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E5=99=A8=E9=85=8D=E7=BD=AE=E6=A0=A1=E9=AA=8C=20*=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3List=20=E5=BE=AA=E7=8E=AF?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98=20*=20=E5=AF=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=80=89=E6=8B=A9=E7=9A=84=E7=BC=96=E7=A0=81=E5=99=A8?= =?UTF-8?q?=E5=81=9A=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../password/PasswordEncoderAutoConfiguration.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/password/PasswordEncoderAutoConfiguration.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/password/PasswordEncoderAutoConfiguration.java index c77b46c7..9ddc8c85 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/password/PasswordEncoderAutoConfiguration.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/password/PasswordEncoderAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.security.crypto.factory.PasswordEncoderFactories; import org.springframework.security.crypto.password.*; import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder; import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; import java.util.HashMap; import java.util.List; @@ -55,12 +56,9 @@ import java.util.Map; public class PasswordEncoderAutoConfiguration { private final PasswordEncoderProperties properties; - private final List passwordEncoderList; - public PasswordEncoderAutoConfiguration(PasswordEncoderProperties properties, - List passwordEncoderList) { + public PasswordEncoderAutoConfiguration(PasswordEncoderProperties properties) { this.properties = properties; - this.passwordEncoderList = passwordEncoderList; } /** @@ -70,7 +68,7 @@ public class PasswordEncoderAutoConfiguration { * @see PasswordEncoderFactories */ @Bean - public PasswordEncoder passwordEncoder() { + public PasswordEncoder passwordEncoder(List passwordEncoderList) { String encodingId = "bcrypt"; if (StrUtil.isNotBlank(properties.getEncodingId())) { encodingId = properties.getEncodingId(); @@ -98,6 +96,7 @@ public class PasswordEncoderAutoConfiguration { .getSimpleName() .toLowerCase(), passwordEncoder)); } + CheckUtils.throwIf(!encoders.keySet().contains(encodingId), "所填 [{}] 密码编码器不存在!", encodingId); return new DelegatingPasswordEncoder(encodingId, encoders); }