Skip to content

Commit 49c804a

Browse files
committed
fix(security/crypto): 修复配置错误
1 parent 1fdb029 commit 49c804a

File tree

1 file changed

+3
-2
lines changed
  • continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor

1 file changed

+3
-2
lines changed

continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/PasswordEncoderEncryptor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import cn.hutool.extra.spring.SpringUtil;
2020
import org.springframework.security.crypto.password.PasswordEncoder;
2121
import top.continew.starter.security.crypto.autoconfigure.CryptoContext;
22+
import top.continew.starter.security.crypto.autoconfigure.CryptoProperties;
2223
import top.continew.starter.security.crypto.autoconfigure.PasswordEncoderProperties;
2324

2425
/**
@@ -37,7 +38,7 @@
3738
public class PasswordEncoderEncryptor extends AbstractEncryptor {
3839

3940
private final PasswordEncoder passwordEncoder = SpringUtil.getBean(PasswordEncoder.class);
40-
private final PasswordEncoderProperties properties = SpringUtil.getBean(PasswordEncoderProperties.class);
41+
private final CryptoProperties properties = SpringUtil.getBean(CryptoProperties.class);
4142

4243
public PasswordEncoderEncryptor(CryptoContext context) {
4344
super(context);
@@ -46,7 +47,7 @@ public PasswordEncoderEncryptor(CryptoContext context) {
4647
@Override
4748
public String encrypt(String plaintext) {
4849
// 如果已经是加密格式,直接返回
49-
if (properties.getAlgorithm().getPattern().matcher(plaintext).matches()) {
50+
if (properties.getPasswordEncoder().getAlgorithm().getPattern().matcher(plaintext).matches()) {
5051
return plaintext;
5152
}
5253
return passwordEncoder.encode(plaintext);

0 commit comments

Comments
 (0)