springBoot 2.7.3

This commit is contained in:
MaxKey
2022-09-19 09:18:27 +08:00
parent 8d5a90025c
commit 789ecfb6af
33 changed files with 102 additions and 93 deletions

View File

@@ -1,7 +1,7 @@
#端口号
application:
name: maxkey-gateway-server
formatted-version: v3.5.6 GA
formatted-version: v3.5.7 GA
server:
port: 9000
spring:

View File

@@ -15,7 +15,7 @@
*/
package org.maxkey;
package org.maxkey.autoconfigure;
import java.io.BufferedReader;
import java.io.IOException;
@@ -46,15 +46,15 @@ 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;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.security.crypto.password.PasswordEncoder;
@Configuration
@AutoConfiguration
@ComponentScan(basePackages = {
"org.maxkey.authn",
"org.maxkey.configuration",

View File

@@ -15,7 +15,7 @@
*/
package org.maxkey;
package org.maxkey.autoconfigure;
import java.util.List;
@@ -34,16 +34,16 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
@EnableWebMvc
@AutoConfiguration
public class MaxKeyMvcConfig implements WebMvcConfigurer {
private static final Logger _logger = LoggerFactory.getLogger(MaxKeyMvcConfig.class);

View File

@@ -1,18 +0,0 @@
# Auto Configure
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.maxkey.autoconfigure.ApplicationAutoConfiguration,\
org.maxkey.autoconfigure.MvcAutoConfiguration,\
org.maxkey.autoconfigure.KaptchaAutoConfiguration,\
org.maxkey.autoconfigure.RedisAutoConfiguration,\
org.maxkey.autoconfigure.AuthnProviderAutoConfiguration,\
org.maxkey.autoconfigure.OneTimePasswordAutoConfiguration,\
org.maxkey.autoconfigure.SessionAutoConfiguration,\
org.maxkey.autoconfigure.TokenAutoConfiguration,\
org.maxkey.autoconfigure.CasAutoConfiguration,\
org.maxkey.autoconfigure.Oauth20AutoConfiguration,\
org.maxkey.autoconfigure.Saml20AutoConfiguration,\
org.maxkey.autoconfigure.SocialSignOnAutoConfiguration,\
org.maxkey.autoconfigure.SwaggerConfig,\
org.maxkey.MaxKeyMvcConfig

View File

@@ -0,0 +1,16 @@
org.maxkey.autoconfigure.ApplicationAutoConfiguration
org.maxkey.autoconfigure.MvcAutoConfiguration
org.maxkey.autoconfigure.KaptchaAutoConfiguration
org.maxkey.autoconfigure.RedisAutoConfiguration
org.maxkey.autoconfigure.AuthnProviderAutoConfiguration
org.maxkey.autoconfigure.JwtAuthnAutoConfiguration
org.maxkey.autoconfigure.OneTimePasswordAutoConfiguration
org.maxkey.autoconfigure.SessionAutoConfiguration
org.maxkey.autoconfigure.TokenAutoConfiguration
org.maxkey.autoconfigure.CasAutoConfiguration
org.maxkey.autoconfigure.Oauth20AutoConfiguration
org.maxkey.autoconfigure.Saml20AutoConfiguration
org.maxkey.autoconfigure.SocialSignOnAutoConfiguration
org.maxkey.autoconfigure.SwaggerConfig
org.maxkey.autoconfigure.MaxKeyMvcConfig
org.maxkey.autoconfigure.MaxKeyConfig

View File

@@ -16,7 +16,7 @@
#MaxKey Title and Version #
############################################################################
application.title =MaxKey
application.formatted-version =v3.5.6 GA
application.formatted-version =v3.5.7 GA
#for dynamic service discovery
spring.application.name =maxkey
############################################################################

View File

@@ -15,7 +15,7 @@
*/
package org.maxkey;
package org.maxkey.autoconfigure;
import org.maxkey.password.onetimepwd.AbstractOtpAuthn;
import org.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn;
@@ -27,12 +27,12 @@ import org.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.security.crypto.password.PasswordEncoder;
@Configuration
@AutoConfiguration
public class MaxKeyMgtConfig implements InitializingBean {
private static final Logger _logger = LoggerFactory.getLogger(MaxKeyMgtConfig.class);

View File

@@ -15,7 +15,7 @@
*/
package org.maxkey;
package org.maxkey.autoconfigure;
import org.maxkey.authn.session.SessionManager;
import org.maxkey.configuration.ApplicationConfig;
@@ -33,11 +33,11 @@ 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;
import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.core.JdbcTemplate;
@Configuration
@AutoConfiguration
public class MaxKeyMgtListenerConfig implements InitializingBean {
private static final Logger _logger = LoggerFactory.getLogger(MaxKeyMgtListenerConfig.class);

View File

@@ -15,7 +15,7 @@
*/
package org.maxkey;
package org.maxkey.autoconfigure;
import java.util.List;
@@ -28,16 +28,16 @@ import org.maxkey.web.interceptor.RestApiPermissionAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
@Configuration
@EnableWebMvc
@AutoConfiguration
public class MaxKeyMgtMvcConfig implements WebMvcConfigurer {
private static final Logger _logger = LoggerFactory.getLogger(MaxKeyMgtMvcConfig.class);

View File

@@ -15,7 +15,7 @@
*/
package org.maxkey;
package org.maxkey.autoconfigure;
import javax.sql.DataSource;
@@ -30,8 +30,8 @@ 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;
import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.security.authentication.ProviderManager;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
@@ -42,7 +42,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
* @author Crystal.Sea
*
*/
@Configuration
@AutoConfiguration
public class Oauth20ClientAutoConfiguration implements InitializingBean {
private static final Logger _logger = LoggerFactory.getLogger(Oauth20ClientAutoConfiguration.class);

View File

@@ -1,17 +0,0 @@
# Auto Configure
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.maxkey.autoconfigure.ApplicationAutoConfiguration,\
org.maxkey.autoconfigure.KaptchaAutoConfiguration,\
org.maxkey.autoconfigure.MvcAutoConfiguration,\
org.maxkey.autoconfigure.JwtAuthnAutoConfiguration,\
org.maxkey.autoconfigure.RedisAutoConfiguration,\
org.maxkey.autoconfigure.AuthnProviderAutoConfiguration,\
org.maxkey.autoconfigure.OneTimePasswordAutoConfiguration,\
org.maxkey.autoconfigure.SessionAutoConfiguration,\
org.maxkey.autoconfigure.TokenAutoConfiguration,\
org.maxkey.synchronizer.autoconfigure.SynchronizerAutoConfiguration,\
org.maxkey.autoconfigure.SwaggerConfig,\
org.maxkey.Oauth20ClientAutoConfiguration,\
org.maxkey.MaxKeyMgtConfig,\
org.maxkey.MaxKeyMgtMvcConfig,\
org.maxkey.MaxKeyMgtListenerConfig

View File

@@ -0,0 +1,15 @@
org.maxkey.autoconfigure.ApplicationAutoConfiguration
org.maxkey.autoconfigure.KaptchaAutoConfiguration
org.maxkey.autoconfigure.MvcAutoConfiguration
org.maxkey.autoconfigure.JwtAuthnAutoConfiguration
org.maxkey.autoconfigure.RedisAutoConfiguration
org.maxkey.autoconfigure.AuthnProviderAutoConfiguration
org.maxkey.autoconfigure.OneTimePasswordAutoConfiguration
org.maxkey.autoconfigure.SessionAutoConfiguration
org.maxkey.autoconfigure.TokenAutoConfiguration
org.maxkey.autoconfigure.SynchronizerAutoConfiguration
org.maxkey.autoconfigure.SwaggerConfig
org.maxkey.autoconfigure.Oauth20ClientAutoConfiguration
org.maxkey.autoconfigure.MaxKeyMgtConfig
org.maxkey.autoconfigure.MaxKeyMgtMvcConfig
org.maxkey.autoconfigure.MaxKeyMgtListenerConfig

View File

@@ -16,7 +16,7 @@
#MaxKey Title and Version #
############################################################################
application.title =MaxKey-Mgt
application.formatted-version =v3.5.6 GA
application.formatted-version =v3.5.7 GA
#for dynamic service discovery
spring.application.name =maxkey-mgt
############################################################################