style: 优化部分代码格式

This commit is contained in:
2024-01-31 00:15:03 +08:00
parent 2dfcf1d454
commit ab8c1aec2f
5 changed files with 31 additions and 29 deletions

View File

@@ -59,7 +59,7 @@
<artifactId>hutool-db</artifactId>
</dependency>
<!-- 密码加解密-->
<!-- Spring Security 附带的一个通用加解密-->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>

View File

@@ -18,6 +18,7 @@ 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 lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -28,8 +29,6 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.factory.PasswordEncoderFactories;
import org.springframework.security.crypto.password.*;
import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder;
import org.springframework.util.StringUtils;
import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties;
import top.charles7c.continew.starter.core.constant.PropertiesConstants;
import java.util.HashMap;
@@ -37,10 +36,14 @@ import java.util.List;
import java.util.Map;
/**
* 密码配置类,默认编解码器使用的是BCryptPasswordEncoder
* 编码后的密码是遵循一定规则的{idForEncode}encodePassword,前缀{}包含了编码的方式再拼接上该方式编码后的密码串。
* 可以添加自定义的编解码也可以修改默认的编解码器只需修改默认的encodingId。
* 优点如果有一天我们对密码编码规则进行替换或者轮转。现有的用户不会受到影响。只要修改默认的DelegatingPasswordEncoder的idForEncode
* 密码编解码自动配置
*
* <p>
* 密码配置类,默认编解码器使用的是 BCryptPasswordEncoder <br />
* 编码后的密码是遵循一定规则的 {idForEncode}encodePassword前缀 {} 包含了编码的方式再拼接上该方式编码后的密码串。<br />
* 可以添加自定义的编解码,也可以修改默认的编解码器,只需修改默认的 encodingId。<br />
* 优点:如果有一天我们对密码编码规则进行替换或者轮转,现有的用户不会受到影响,只要修改 DelegatingPasswordEncoder 的 idForEncode 即可。
* </p>
*
* @author Jasmine
* @since 1.3.0
@@ -54,7 +57,8 @@ public class PasswordEncoderAutoConfiguration {
private final PasswordEncoderProperties properties;
private final List<PasswordEncoder> passwordEncoderList;
public PasswordEncoderAutoConfiguration(PasswordEncoderProperties properties, List<PasswordEncoder> passwordEncoderList) {
public PasswordEncoderAutoConfiguration(PasswordEncoderProperties properties,
List<PasswordEncoder> passwordEncoderList) {
this.properties = properties;
this.passwordEncoderList = passwordEncoderList;
}
@@ -68,7 +72,7 @@ public class PasswordEncoderAutoConfiguration {
@Bean
public PasswordEncoder passwordEncoder() {
String encodingId = "bcrypt";
if(StrUtil.isNotBlank(properties.getEncodingId())) {
if (StrUtil.isNotBlank(properties.getEncodingId())) {
encodingId = properties.getEncodingId();
}
@@ -84,15 +88,21 @@ public class PasswordEncoderAutoConfiguration {
encoders.put("scrypt@SpringSecurity_v5_8", SCryptPasswordEncoder.defaultsForSpringSecurity_v5_8());
encoders.put("SHA-1", new org.springframework.security.crypto.password.MessageDigestPasswordEncoder("SHA-1"));
encoders
.put("SHA-256", new org.springframework.security.crypto.password.MessageDigestPasswordEncoder("SHA-256"));
.put("SHA-256", new org.springframework.security.crypto.password.MessageDigestPasswordEncoder("SHA-256"));
encoders.put("sha256", new org.springframework.security.crypto.password.StandardPasswordEncoder());
encoders.put("argon2", Argon2PasswordEncoder.defaultsForSpringSecurity_v5_2());
encoders.put("argon2@SpringSecurity_v5_8", Argon2PasswordEncoder.defaultsForSpringSecurity_v5_8());
// 添加自定义的密码编解码器
if(CollUtil.isNotEmpty(passwordEncoderList)) {
passwordEncoderList.forEach(passwordEncoder-> encoders.put(passwordEncoder.getClass().getSimpleName().toLowerCase(), passwordEncoder));
if (CollUtil.isNotEmpty(passwordEncoderList)) {
passwordEncoderList.forEach(passwordEncoder -> encoders.put(passwordEncoder.getClass()
.getSimpleName()
.toLowerCase(), passwordEncoder));
}
return new DelegatingPasswordEncoder(encodingId, encoders);
}
@PostConstruct
public void postConstruct() {
log.debug("[ContiNew Starter] - Auto Configuration 'PasswordEncoder' completed initialization.");
}
}

View File

@@ -16,35 +16,27 @@
package top.charles7c.continew.starter.core.autoconfigure.password;
/**
* @author Jasmine
* @version 1.0
* @description
* @see PasswordEncoderProperties
* @since 2024-01-30 17:19:19
*/
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import top.charles7c.continew.starter.core.constant.PropertiesConstants;
/**
* 项目配置属性
* 密码编解码配置属性
*
* @author Charles7c
* @since 1.0.0
* @author Jasmine
* @since 1.3.0
*/
@Data
@ConfigurationProperties(PropertiesConstants.PASSWORD_ENCODER)
public class PasswordEncoderProperties {
/**
* 是否启用
* 是否启用密码编解码配置
*/
private Boolean enabled;
private boolean enabled = false;
/**
* 启的算法
* 启的算法 ID
*/
private String encodingId;
}

View File

@@ -43,8 +43,8 @@ import java.util.concurrent.ScheduledExecutorService;
@Lazy
@AutoConfiguration
@RequiredArgsConstructor
@ConditionalOnProperty(prefix = PropertiesConstants.THREAD_POOL, name = PropertiesConstants.ENABLED, havingValue = "true")
@EnableAsync(proxyTargetClass = true)
@ConditionalOnProperty(prefix = PropertiesConstants.THREAD_POOL, name = PropertiesConstants.ENABLED, havingValue = "true")
public class AsyncAutoConfiguration implements AsyncConfigurer {
private final ScheduledExecutorService scheduledExecutorService;

View File

@@ -65,6 +65,6 @@ public class GlobalExceptionHandlerAutoConfiguration {
@PostConstruct
public void postConstruct() {
log.debug("[ContiNew Starter] - Auto Configuration 'Extension-Global Exception Handler' completed " + "initialization.");
log.debug("[ContiNew Starter] - Auto Configuration 'Extension-Global Exception Handler' completed initialization.");
}
}