From 789ecfb6afa32cc299e6ca2165bc75264e6aed97 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Mon, 19 Sep 2022 09:18:27 +0800 Subject: [PATCH] springBoot 2.7.3 --- build.gradle | 3 +++ config/build_docker.gradle | 3 +++ config/build_jar.gradle | 3 +++ config/build_standard.gradle | 3 +++ gradle.properties | 12 ++++++------ .../KaptchaAutoConfiguration.java | 4 ++-- .../SessionAutoConfiguration.java | 4 ++-- .../autoconfigure/TokenAutoConfiguration.java | 5 +++-- .../OneTimePasswordAutoConfiguration.java | 4 ++-- .../AuthnProviderAutoConfiguration.java | 4 ++-- .../JwtAuthnAutoConfiguration.java | 4 ++-- .../SocialSignOnAutoConfiguration.java | 4 ++-- .../ApplicationAutoConfiguration.java | 4 ++-- .../autoconfigure/MvcAutoConfiguration.java | 4 ++-- .../autoconfigure/RedisAutoConfiguration.java | 4 ++-- .../maxkey/autoconfigure/SwaggerConfig.java | 4 ++-- .../autoconfigure/CasAutoConfiguration.java | 4 ++-- .../Oauth20AutoConfiguration.java | 4 ++-- .../autoconfigure/Saml20AutoConfiguration.java | 4 ++-- .../SynchronizerAutoConfiguration.java | 6 +++--- .../src/main/resources/application.yml | 2 +- .../{ => autoconfigure}/MaxKeyConfig.java | 6 +++--- .../{ => autoconfigure}/MaxKeyMvcConfig.java | 6 +++--- .../main/resources/META-INF/spring.factories | 18 ------------------ ...oot.autoconfigure.AutoConfiguration.imports | 16 ++++++++++++++++ .../src/main/resources/application.properties | 2 +- .../{ => autoconfigure}/MaxKeyMgtConfig.java | 6 +++--- .../MaxKeyMgtListenerConfig.java | 6 +++--- .../MaxKeyMgtMvcConfig.java | 6 +++--- .../Oauth20ClientAutoConfiguration.java | 6 +++--- .../main/resources/META-INF/spring.factories | 17 ----------------- ...oot.autoconfigure.AutoConfiguration.imports | 15 +++++++++++++++ .../src/main/resources/application.properties | 2 +- 33 files changed, 102 insertions(+), 93 deletions(-) rename maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/{synchronizer => }/autoconfigure/SynchronizerAutoConfiguration.java (97%) rename maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/{ => autoconfigure}/MaxKeyConfig.java (98%) rename maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/{ => autoconfigure}/MaxKeyMvcConfig.java (98%) delete mode 100644 maxkey-webs/maxkey-web-maxkey/src/main/resources/META-INF/spring.factories create mode 100644 maxkey-webs/maxkey-web-maxkey/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/{ => autoconfigure}/MaxKeyMgtConfig.java (95%) rename maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/{ => autoconfigure}/MaxKeyMgtListenerConfig.java (96%) rename maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/{ => autoconfigure}/MaxKeyMgtMvcConfig.java (98%) rename maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/{ => autoconfigure}/Oauth20ClientAutoConfiguration.java (97%) delete mode 100644 maxkey-webs/maxkey-web-mgt/src/main/resources/META-INF/spring.factories create mode 100644 maxkey-webs/maxkey-web-mgt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/build.gradle b/build.gradle index 4bc530a48..2a1bdcc2b 100644 --- a/build.gradle +++ b/build.gradle @@ -382,6 +382,9 @@ subprojects { implementation group: 'org.latencyutils', name: 'LatencyUtils', version: "${LatencyUtilsVersion}" implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}" implementation group: 'org.reflections', name: 'reflections', version: "${reflectionsVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_common', version: "${prometheusVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel', version: "${prometheusVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel_agent', version: "${prometheusVersion}" implementation group: 'io.prometheus', name: 'simpleclient', version: "${prometheusVersion}" implementation group: 'io.prometheus', name: 'simpleclient_common', version: "${prometheusVersion}" implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}" diff --git a/config/build_docker.gradle b/config/build_docker.gradle index 1251b9c2a..31855f725 100644 --- a/config/build_docker.gradle +++ b/config/build_docker.gradle @@ -342,6 +342,9 @@ subprojects { implementation group: 'org.latencyutils', name: 'LatencyUtils', version: "${LatencyUtilsVersion}" implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}" implementation group: 'org.reflections', name: 'reflections', version: "${reflectionsVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_common', version: "${prometheusVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel', version: "${prometheusVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel_agent', version: "${prometheusVersion}" implementation group: 'io.prometheus', name: 'simpleclient', version: "${prometheusVersion}" implementation group: 'io.prometheus', name: 'simpleclient_common', version: "${prometheusVersion}" implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}" diff --git a/config/build_jar.gradle b/config/build_jar.gradle index 0c2c34ead..71667180c 100644 --- a/config/build_jar.gradle +++ b/config/build_jar.gradle @@ -341,6 +341,9 @@ subprojects { implementation group: 'org.latencyutils', name: 'LatencyUtils', version: "${LatencyUtilsVersion}" implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}" implementation group: 'org.reflections', name: 'reflections', version: "${reflectionsVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_common', version: "${prometheusVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel', version: "${prometheusVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel_agent', version: "${prometheusVersion}" implementation group: 'io.prometheus', name: 'simpleclient', version: "${prometheusVersion}" implementation group: 'io.prometheus', name: 'simpleclient_common', version: "${prometheusVersion}" implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}" diff --git a/config/build_standard.gradle b/config/build_standard.gradle index 0796ca8c3..e9a581ed7 100644 --- a/config/build_standard.gradle +++ b/config/build_standard.gradle @@ -378,6 +378,9 @@ subprojects { implementation group: 'org.latencyutils', name: 'LatencyUtils', version: "${LatencyUtilsVersion}" implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}" implementation group: 'org.reflections', name: 'reflections', version: "${reflectionsVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_common', version: "${prometheusVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel', version: "${prometheusVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel_agent', version: "${prometheusVersion}" implementation group: 'io.prometheus', name: 'simpleclient', version: "${prometheusVersion}" implementation group: 'io.prometheus', name: 'simpleclient_common', version: "${prometheusVersion}" implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}" diff --git a/gradle.properties b/gradle.properties index c4f0a600d..28e0623ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ # */ #maxkey properties group =maxkey.top -version =3.5.6 +version =3.5.7 vendor =https://www.maxkey.top author =MaxKeyTop @@ -62,15 +62,15 @@ poiVersion =5.2.2 tomcatVersion =9.0.65 tomcatembedloggingjuliVersion =8.5.2 #spring -springVersion =5.3.22 -springBootVersion =2.6.11 +springVersion =5.3.23 +springBootVersion =2.7.3 springSecurityVersion =5.6.7 springDataVersion =2.6.6 springkafkaVersion =2.9.0 springretryVersion =1.3.3 springplugincoreVersion =2.0.0.RELEASE springpluginmetadataVersion =2.0.0.RELEASE -springcloudVersion =3.1.3 +springcloudVersion =3.1.4 springcloudalibabaVersion =2021.1 springcloudalibabaspringVersion =1.0.11 springcloudalibabacsplVersion =1.8.5 @@ -171,8 +171,8 @@ xmlsecVersion =1.5.8 xpp3Version =1.1.6 xstreamVersion =1.4.10 passayVersion =1.6.1 -micrometercoreVersion =1.8.1 -prometheusVersion =0.14.1 +micrometercoreVersion =1.9.4 +prometheusVersion =0.16.0 LatencyUtilsVersion =2.0.3 stax2apiVersion =4.2.1 mapstructVersion =1.4.1.Final diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java index e830ef283..c5f8f9811 100644 --- a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java @@ -25,13 +25,13 @@ import java.util.Properties; 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.core.io.ClassPathResource; import org.springframework.core.io.Resource; -@Configuration +@AutoConfiguration public class KaptchaAutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(KaptchaAutoConfiguration.class); diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/SessionAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/SessionAutoConfiguration.java index b7bc3d6c4..24c41b234 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/SessionAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/SessionAutoConfiguration.java @@ -26,12 +26,12 @@ 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 SessionAutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(SessionAutoConfiguration.class); diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/TokenAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/TokenAutoConfiguration.java index 080cd1248..5acc268b9 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/TokenAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/TokenAutoConfiguration.java @@ -30,12 +30,12 @@ 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 com.nimbusds.jose.JOSEException; -@Configuration +@AutoConfiguration public class TokenAutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(TokenAutoConfiguration.class); @@ -48,6 +48,7 @@ public class TokenAutoConfiguration implements InitializingBean { AuthRefreshTokenService refreshTokenService, @Value("${maxkey.server.persistence}") int persistence) throws JOSEException { CongressService congressService; + _logger.debug("cache persistence {}" , persistence); if (persistence == ConstsPersistence.REDIS) { congressService = new RedisCongressService(redisConnFactory); }else { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java index c15abd318..694a26184 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java @@ -27,11 +27,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; -@Configuration +@AutoConfiguration public class OneTimePasswordAutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(OneTimePasswordAutoConfiguration.class); diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java index bd55b521f..947ab21b7 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java @@ -41,13 +41,13 @@ 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; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.core.JdbcTemplate; -@Configuration +@AutoConfiguration public class AuthnProviderAutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(AuthnProviderAutoConfiguration.class); diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java index e3ad0f1f8..a2a7fd29f 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java @@ -28,12 +28,12 @@ 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.core.io.ClassPathResource; -@Configuration +@AutoConfiguration public class JwtAuthnAutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(JwtAuthnAutoConfiguration.class); diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java index b4c6f7724..c29b80b18 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java @@ -24,13 +24,13 @@ import org.maxkey.entity.SocialsProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.core.JdbcTemplate; -@Configuration +@AutoConfiguration @ComponentScan(basePackages = { "org.maxkey.authn.support.socialsignon" }) diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java index 1f01837bc..5d6adb70a 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java @@ -43,8 +43,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.core.io.Resource; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; @@ -57,7 +57,7 @@ import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder; import com.nimbusds.jose.JOSEException; -@Configuration +@AutoConfiguration public class ApplicationAutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(ApplicationAutoConfiguration.class); diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java index 80d2e0f38..535f138b4 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java @@ -33,12 +33,12 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.actuate.endpoint.ApiVersion; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.web.server.ConfigurableWebServerFactory; import org.springframework.boot.web.server.ErrorPage; import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.support.ReloadableResourceBundleMessageSource; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -62,7 +62,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -@Configuration +@AutoConfiguration public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer { private static final Logger _logger = LoggerFactory.getLogger(MvcAutoConfiguration.class); diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java index ad279120a..0f05886f3 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java @@ -22,11 +22,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 redis.clients.jedis.JedisPoolConfig; -@Configuration +@AutoConfiguration public class RedisAutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(RedisAutoConfiguration.class); diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/SwaggerConfig.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/SwaggerConfig.java index d75f6e395..7a5943b07 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/SwaggerConfig.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/SwaggerConfig.java @@ -4,15 +4,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springdoc.core.GroupedOpenApi; 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 io.swagger.v3.oas.models.ExternalDocumentation; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.info.License; -@Configuration +@AutoConfiguration public class SwaggerConfig { final static Logger _logger = LoggerFactory.getLogger(SwaggerConfig.class); diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java index 186ef6167..51b093df9 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java @@ -26,12 +26,12 @@ 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.jdbc.core.JdbcTemplate; -@Configuration +@AutoConfiguration @ComponentScan(basePackages = { "org.maxkey.authz.cas.endpoint" }) diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java index bed903eed..c8c1876c0 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java @@ -49,10 +49,10 @@ 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.web.servlet.FilterRegistrationBean; 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.jdbc.core.JdbcTemplate; import org.springframework.security.authentication.ProviderManager; @@ -62,7 +62,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import com.nimbusds.jose.JOSEException; import com.nimbusds.jose.JWEAlgorithm; -@Configuration +@AutoConfiguration @ComponentScan(basePackages = { "org.maxkey.authz.oauth2.provider.endpoint", "org.maxkey.authz.oauth2.provider.userinfo.endpoint", diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java index 986a0250f..779e52eea 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java @@ -47,12 +47,12 @@ 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.ui.velocity.VelocityEngineFactoryBean; -@Configuration +@AutoConfiguration @ComponentScan(basePackages = { "org.maxkey.authz.saml20.provider.endpoint", "org.maxkey.authz.saml20.metadata.endpoint", diff --git a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/autoconfigure/SynchronizerAutoConfiguration.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/autoconfigure/SynchronizerAutoConfiguration.java similarity index 97% rename from maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/autoconfigure/SynchronizerAutoConfiguration.java rename to maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/autoconfigure/SynchronizerAutoConfiguration.java index c18476ca1..68b0d0af0 100644 --- a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/autoconfigure/SynchronizerAutoConfiguration.java +++ b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/autoconfigure/SynchronizerAutoConfiguration.java @@ -15,7 +15,7 @@ */ -package org.maxkey.synchronizer.autoconfigure; +package org.maxkey.autoconfigure; import java.sql.ResultSet; import java.sql.SQLException; @@ -37,13 +37,13 @@ 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.jdbc.core.RowMapper; import org.springframework.scheduling.quartz.SchedulerFactoryBean; -@Configuration +@AutoConfiguration public class SynchronizerAutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(SynchronizerAutoConfiguration.class); diff --git a/maxkey-webs/maxkey-gataway/src/main/resources/application.yml b/maxkey-webs/maxkey-gataway/src/main/resources/application.yml index 768fda6df..e9b7006be 100644 --- a/maxkey-webs/maxkey-gataway/src/main/resources/application.yml +++ b/maxkey-webs/maxkey-gataway/src/main/resources/application.yml @@ -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: diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/MaxKeyConfig.java similarity index 98% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/MaxKeyConfig.java index bec46d7d7..70e39688d 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/MaxKeyConfig.java @@ -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", diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/MaxKeyMvcConfig.java similarity index 98% rename from maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java rename to maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/MaxKeyMvcConfig.java index d7f02d8d2..9e6254c0b 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/MaxKeyMvcConfig.java @@ -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); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/META-INF/spring.factories b/maxkey-webs/maxkey-web-maxkey/src/main/resources/META-INF/spring.factories deleted file mode 100644 index cf94dcae7..000000000 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -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 - - diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-webs/maxkey-web-maxkey/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..2755ed3d6 --- /dev/null +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -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 \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties index 85ce62818..e473cc151 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties @@ -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 ############################################################################ diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtConfig.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtConfig.java similarity index 95% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtConfig.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtConfig.java index 8e49144f1..2b4b4855f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtConfig.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtConfig.java @@ -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); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtListenerConfig.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtListenerConfig.java similarity index 96% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtListenerConfig.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtListenerConfig.java index 8449d3e5a..de2922421 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtListenerConfig.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtListenerConfig.java @@ -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); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtMvcConfig.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java similarity index 98% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtMvcConfig.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java index 4fbdeb4f9..eb2540e38 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtMvcConfig.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java @@ -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); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/Oauth20ClientAutoConfiguration.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java similarity index 97% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/Oauth20ClientAutoConfiguration.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java index 49c2d0145..fb1ccaf96 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/Oauth20ClientAutoConfiguration.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java @@ -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); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/META-INF/spring.factories b/maxkey-webs/maxkey-web-mgt/src/main/resources/META-INF/spring.factories deleted file mode 100644 index f94f5b759..000000000 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -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 diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-webs/maxkey-web-mgt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..625938725 --- /dev/null +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -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 \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties index e659df768..5ec0610c9 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties @@ -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 ############################################################################