LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jar 升级&代码优化

Browse Source
This commit is contained in:
MaxKey
2024-03-04 17:10:45 +08:00
parent 1b509e34e7
commit a7bf8fa62a
18 changed files with 29 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/autoconfigure/SessionAutoConfiguration.java
+4 -11
View File
@@ -24,7 +24,6 @@ import org.dromara.maxkey.authn.web.SavedRequestAwareAuthenticationSuccessHandle
import org.dromara.maxkey.persistence.redis.RedisConnectionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.Bean;
@@ -32,7 +31,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
@AutoConfiguration
public class SessionAutoConfiguration implements InitializingBean {
public class SessionAutoConfiguration {
private static final Logger _logger =
LoggerFactory.getLogger(SessionAutoConfiguration.class);
@@ -50,11 +49,9 @@ public class SessionAutoConfiguration implements InitializingBean {
RedisConnectionFactory redisConnFactory,
@Value("${maxkey.session.timeout:1800}") int timeout
) {
_logger.debug("session timeout " + timeout);
SessionManager sessionManager =
new SessionManagerFactory(
persistence, jdbcTemplate, redisConnFactory,timeout);
return sessionManager;
_logger.debug("session timeout {}" , timeout);
return new SessionManagerFactory(
persistence, jdbcTemplate, redisConnFactory,timeout);
}
@Bean
@@ -62,8 +59,4 @@ public class SessionAutoConfiguration implements InitializingBean {
return new HttpSessionListenerAdapter();
}
@Override
public void afterPropertiesSet() throws Exception {
}
}
maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/autoconfigure/TokenAutoConfiguration.java
+7 -15
View File
@@ -28,7 +28,6 @@ import org.dromara.maxkey.persistence.cache.MomentaryService;
import org.dromara.maxkey.persistence.redis.RedisConnectionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.Bean;
@@ -36,7 +35,7 @@ import com.nimbusds.jose.JOSEException;
@AutoConfiguration
public class TokenAutoConfiguration implements InitializingBean {
public class TokenAutoConfiguration{
private static final Logger _logger =
LoggerFactory.getLogger(TokenAutoConfiguration.class);
@@ -55,15 +54,12 @@ public class TokenAutoConfiguration implements InitializingBean {
congressService = new InMemoryCongressService();
}
AuthTokenService authTokenService =
new AuthTokenService(
authJwkConfig,
congressService,
momentaryService,
refreshTokenService
);
return authTokenService;
return new AuthTokenService(
authJwkConfig,
congressService,
momentaryService,
refreshTokenService
);
}
@Bean
@@ -71,8 +67,4 @@ public class TokenAutoConfiguration implements InitializingBean {
return new AuthRefreshTokenService(authJwkConfig);
}
@Override
public void afterPropertiesSet() throws Exception {
}
}
maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/autoconfigure/IpLocationAutoConfiguration.java
+1 -6
View File
@@ -25,7 +25,6 @@ import org.dromara.maxkey.ip2location.online.Ip138;
import org.lionsoul.ip2region.xdb.Searcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.Bean;
@@ -41,7 +40,7 @@ import com.maxmind.geoip2.DatabaseReader;
*/
@AutoConfiguration
public class IpLocationAutoConfiguration implements InitializingBean {
public class IpLocationAutoConfiguration {
static final Logger _logger = LoggerFactory.getLogger(IpLocationAutoConfiguration.class);
/**
@@ -133,9 +132,5 @@ public class IpLocationAutoConfiguration implements InitializingBean {
);
}
@Override
public void afterPropertiesSet() throws Exception {
}
}
maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java
+1 -6
View File
@@ -24,14 +24,13 @@ import org.dromara.maxkey.persistence.redis.RedisConnectionFactory;
import org.dromara.maxkey.persistence.service.EmailSendersService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.Bean;
@AutoConfiguration
public class OneTimePasswordAutoConfiguration implements InitializingBean {
public class OneTimePasswordAutoConfiguration {
private static final Logger _logger =
LoggerFactory.getLogger(OneTimePasswordAutoConfiguration.class);
@@ -54,8 +53,4 @@ public class OneTimePasswordAutoConfiguration implements InitializingBean {
return otpAuthnService;
}
@Override
public void afterPropertiesSet() throws Exception {
}
}
maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java
+2 -8
View File
@@ -34,7 +34,6 @@ import org.dromara.maxkey.persistence.repository.LoginRepository;
import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.MessageSource;
@@ -43,9 +42,8 @@ import org.springframework.jdbc.core.JdbcTemplate;
@AutoConfiguration
public class AuthnProviderAutoConfiguration implements InitializingBean {
private static final Logger _logger =
LoggerFactory.getLogger(AuthnProviderAutoConfiguration.class);
public class AuthnProviderAutoConfiguration {
static final Logger _logger = LoggerFactory.getLogger(AuthnProviderAutoConfiguration.class);
@Bean
public AbstractAuthenticationProvider authenticationProvider(
@@ -138,8 +136,4 @@ public class AuthnProviderAutoConfiguration implements InitializingBean {
jdbcTemplate,applicationConfig,authTokenService,validity);
}
@Override
public void afterPropertiesSet() throws Exception {
}
}
maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java
+1 -8
View File
@@ -26,7 +26,6 @@ import org.dromara.maxkey.crypto.jose.keystore.JWKSetKeyStore;
import org.dromara.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.Bean;
@@ -34,7 +33,7 @@ import org.springframework.core.io.ClassPathResource;
@AutoConfiguration
public class JwtAuthnAutoConfiguration implements InitializingBean {
public class JwtAuthnAutoConfiguration {
private static final Logger _logger = LoggerFactory.getLogger(JwtAuthnAutoConfiguration.class);
/**
@@ -85,10 +84,4 @@ public class JwtAuthnAutoConfiguration implements InitializingBean {
_logger.debug("JWT Login Service init.");
return jwtLoginService;
}
@Override
public void afterPropertiesSet() throws Exception {
}
}
maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/autoconfigure/SmsAutoConfiguration.java
+2 -8
View File
@@ -25,16 +25,14 @@ import org.dromara.maxkey.persistence.service.EmailSendersService;
import org.dromara.maxkey.persistence.service.SmsProviderService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.Bean;
@AutoConfiguration
public class SmsAutoConfiguration implements InitializingBean {
private static final Logger _logger =
LoggerFactory.getLogger(SmsAutoConfiguration.class);
public class SmsAutoConfiguration {
private static final Logger _logger = LoggerFactory.getLogger(SmsAutoConfiguration.class);
@Bean(name = "smsOtpAuthnService")
@@ -56,8 +54,4 @@ public class SmsAutoConfiguration implements InitializingBean {
return smsOtpAuthnService;
}
@Override
public void afterPropertiesSet() throws Exception {
}
}
maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java
+1 -8
View File
@@ -22,12 +22,10 @@ import java.io.IOException;
import org.dromara.maxkey.authn.support.socialsignon.service.JdbcSocialsAssociateService;
import org.dromara.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService;
import org.dromara.maxkey.authn.support.socialsignon.token.RedisTokenStore;
import org.dromara.maxkey.constants.ConstsPersistence;
import org.dromara.maxkey.entity.SocialsProvider;
import org.dromara.maxkey.persistence.redis.RedisConnectionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -39,7 +37,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
@ComponentScan(basePackages = {
"org.maxkey.authn.support.socialsignon"
})
public class SocialSignOnAutoConfiguration implements InitializingBean {
public class SocialSignOnAutoConfiguration{
private static final Logger _logger = LoggerFactory.getLogger(SocialSignOnAutoConfiguration.class);
@Bean(name = "socialSignOnProviderService")
@@ -68,9 +66,4 @@ public class SocialSignOnAutoConfiguration implements InitializingBean {
return socialsAssociateService;
}
@Override
public void afterPropertiesSet() throws Exception {
}
}