diff --git a/README.md b/README.md index 04252a30..8fcb3b42 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,15 @@ License + +Release + Release + +Codacy Badge + Sonar Status 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 3c1e9e8c..68f5e602 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 @@ -17,7 +17,6 @@ package top.charles7c.continew.starter.core.autoconfigure.password; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +37,7 @@ import java.util.List; import java.util.Map; /** - * 密码编解码自动配置 + * 密码编码器自动配置 * *

* 密码配置类,默认编解码器使用的是 BCryptPasswordEncoder
@@ -63,20 +62,15 @@ public class PasswordEncoderAutoConfiguration { } /** - * 密码加密解密 + * 密码编码器 * * @see DelegatingPasswordEncoder * @see PasswordEncoderFactories */ @Bean public PasswordEncoder passwordEncoder(List passwordEncoderList) { - String encodingId = "bcrypt"; - if (StrUtil.isNotBlank(properties.getEncodingId())) { - encodingId = properties.getEncodingId(); - } - Map encoders = new HashMap<>(); - encoders.put(encodingId, new BCryptPasswordEncoder()); + encoders.put("bcrypt", new BCryptPasswordEncoder()); encoders.put("ldap", new org.springframework.security.crypto.password.LdapShaPasswordEncoder()); encoders.put("MD4", new org.springframework.security.crypto.password.Md4PasswordEncoder()); encoders.put("MD5", new org.springframework.security.crypto.password.MessageDigestPasswordEncoder("MD5")); @@ -97,7 +91,8 @@ public class PasswordEncoderAutoConfiguration { .getSimpleName() .toLowerCase(), passwordEncoder)); } - CheckUtils.throwIf(!encoders.keySet().contains(encodingId), "所填 [{}] 密码编码器不存在!", encodingId); + String encodingId = properties.getEncodingId(); + CheckUtils.throwIf(!encoders.containsKey(encodingId), "{} is not found in idToPasswordEncoder.", encodingId); return new DelegatingPasswordEncoder(encodingId, encoders); } diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/password/PasswordEncoderProperties.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/password/PasswordEncoderProperties.java index 824b46d9..27211ecc 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/password/PasswordEncoderProperties.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/password/PasswordEncoderProperties.java @@ -34,9 +34,9 @@ public class PasswordEncoderProperties { private boolean enabled = false; /** - * 启用的算法 ID + * 默认启用的编码器 ID(默认:BCryptPasswordEncoder) */ - private String encodingId; + private String encodingId = "bcrypt"; public boolean isEnabled() { return enabled; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseServiceImpl.java index 626a21de..e9cc8d88 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseServiceImpl.java @@ -20,7 +20,6 @@ import cn.crane4j.core.support.OperateTemplate; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Opt; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNodeConfig; @@ -221,7 +220,7 @@ public abstract class BaseServiceImpl, T extends BaseDO, String checkProperty; // 携带表别名则获取 . 后面的字段名 if (property.contains(StringConstants.DOT)) { - checkProperty = CollectionUtil.getLast(StrUtil.split(property, StringConstants.DOT)); + checkProperty = CollUtil.getLast(StrUtil.split(property, StringConstants.DOT)); } else { checkProperty = property; }