From 38164a50b48133ab63721563c0a0db88a6b0de2c Mon Sep 17 00:00:00 2001 From: shimingxy Date: Sat, 30 May 2020 10:07:38 +0800 Subject: [PATCH] =?UTF-8?q?properties=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit properties优化 --- .../ApplicationAutoConfiguration.java | 12 ++++++---- .../JwtAuthnAutoConfiguration.java | 5 ++-- .../KaptchaAutoConfiguration.java | 4 +++- .../autoconfigure/MvcAutoConfiguration.java | 6 +++-- .../autoconfigure/RedisAutoConfiguration.java | 3 ++- .../org/maxkey/config/ApplicationConfig.java | 14 ++++++++++- .../config/CharacterEncodingConfig.java | 4 +++- .../java/org/maxkey/config/EmailConfig.java | 3 ++- .../java/org/maxkey/config/LoginConfig.java | 3 ++- .../maxkey/constants/ConstantsProperties.java | 24 +++++++++++++++++++ .../java/org/maxkey/MaxKeyMgtApplication.java | 4 +++- .../main/java/org/maxkey/MaxKeyMgtConfig.java | 14 +++-------- ...ionConfig.properties => maxkey.properties} | 0 .../java/org/maxkey/MaxKeyApplication.java | 3 ++- .../main/java/org/maxkey/MaxKeyConfig.java | 15 ++++-------- .../main/java/org/maxkey/MaxKeyMvcConfig.java | 3 ++- .../autoconfigure/CasAutoConfiguration.java | 3 ++- .../Oauth20AutoConfiguration.java | 5 ++-- .../Saml20AutoConfiguration.java | 5 ++-- ...ionConfig.properties => maxkey.properties} | 0 20 files changed, 87 insertions(+), 43 deletions(-) create mode 100644 maxkey-core/src/main/java/org/maxkey/constants/ConstantsProperties.java rename maxkey-web-manage/src/main/resources/{config/applicationConfig.properties => maxkey.properties} (100%) rename maxkey-web-maxkey/src/main/resources/{config/applicationConfig.properties => maxkey.properties} (100%) 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 a409178d..d9806fe2 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java @@ -9,6 +9,7 @@ import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.maxkey.authn.support.rememberme.InMemoryRemeberMeService; import org.maxkey.authn.support.rememberme.JdbcRemeberMeService; import org.maxkey.authn.support.rememberme.RedisRemeberMeService; +import org.maxkey.constants.ConstantsProperties; import org.maxkey.crypto.keystore.KeyStoreLoader; import org.maxkey.crypto.password.PasswordReciprocal; import org.maxkey.persistence.redis.RedisConnectionFactory; @@ -31,8 +32,8 @@ import org.springframework.security.crypto.password.PasswordEncoder; @Configuration -@PropertySource("classpath:/application.properties") -@PropertySource("classpath:/config/applicationConfig.properties") +@PropertySource(ConstantsProperties.applicationPropertySource) +@PropertySource(ConstantsProperties.maxKeyPropertySource) public class ApplicationAutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(ApplicationAutoConfiguration.class); @@ -53,8 +54,11 @@ public class ApplicationAutoConfiguration implements InitializingBean { public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() throws IOException { ClassPathResource classPathResource1 = - new ClassPathResource("/config/applicationConfig.properties"); - ClassPathResource classPathResource2 = new ClassPathResource("/application.properties"); + new ClassPathResource(ConstantsProperties.classPathResource( + ConstantsProperties.applicationPropertySource)); + ClassPathResource classPathResource2 = + new ClassPathResource(ConstantsProperties.classPathResource( + ConstantsProperties.maxKeyPropertySource)); PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer(); diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java index 25be9b35..f4184ff8 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java @@ -7,6 +7,7 @@ import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; import org.maxkey.authn.support.jwt.JwtLoginService; import org.maxkey.config.oidc.OIDCProviderMetadataDetails; +import org.maxkey.constants.ConstantsProperties; import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; import org.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; import org.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; @@ -21,8 +22,8 @@ import org.springframework.core.io.ClassPathResource; @Configuration -@PropertySource("classpath:/application.properties") -@PropertySource("classpath:/config/applicationConfig.properties") +@PropertySource(ConstantsProperties.applicationPropertySource) +@PropertySource(ConstantsProperties.maxKeyPropertySource) public class JwtAuthnAutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(JwtAuthnAutoConfiguration.class); diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java index 14d7ebe2..01047fc9 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java @@ -5,6 +5,7 @@ import com.google.code.kaptcha.impl.DefaultKaptcha; import com.google.code.kaptcha.util.Config; import java.io.IOException; import java.util.Properties; +import org.maxkey.constants.ConstantsProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; @@ -25,7 +26,8 @@ public class KaptchaAutoConfiguration implements InitializingBean { */ @Bean (name = "captchaProducer") public Producer captchaProducer() throws IOException { - Resource resource = new ClassPathResource("/kaptcha.properties"); + Resource resource = new ClassPathResource( + ConstantsProperties.classPathResource(ConstantsProperties.kaptchaPropertySource)); _logger.debug("Kaptcha config file " + resource.getURL()); DefaultKaptcha kaptcha = new DefaultKaptcha(); Properties properties = new Properties(); 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 9011f520..732e1332 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java @@ -2,6 +2,8 @@ package org.maxkey.autoconfigure; import java.util.ArrayList; import java.util.List; + +import org.maxkey.constants.ConstantsProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; @@ -28,8 +30,8 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl @Configuration -@PropertySource("classpath:/application.properties") -@PropertySource("classpath:/config/applicationConfig.properties") +@PropertySource(ConstantsProperties.applicationPropertySource) +@PropertySource(ConstantsProperties.maxKeyPropertySource) public class MvcAutoConfiguration implements InitializingBean { 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 8bfc32e6..185d50fb 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java @@ -1,5 +1,6 @@ package org.maxkey.autoconfigure; +import org.maxkey.constants.ConstantsProperties; import org.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,7 +12,7 @@ import org.springframework.context.annotation.PropertySource; import redis.clients.jedis.JedisPoolConfig; @Configuration -@PropertySource("classpath:/application.properties") +@PropertySource(ConstantsProperties.applicationPropertySource) public class RedisAutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(RedisAutoConfiguration.class); diff --git a/maxkey-core/src/main/java/org/maxkey/config/ApplicationConfig.java b/maxkey-core/src/main/java/org/maxkey/config/ApplicationConfig.java index f675f410..4f13c3da 100644 --- a/maxkey-core/src/main/java/org/maxkey/config/ApplicationConfig.java +++ b/maxkey-core/src/main/java/org/maxkey/config/ApplicationConfig.java @@ -1,5 +1,6 @@ package org.maxkey.config; +import org.maxkey.constants.ConstantsProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +19,8 @@ import org.springframework.stereotype.Component; * */ @Component -@PropertySource("classpath:/config/applicationConfig.properties") +@PropertySource(ConstantsProperties.maxKeyPropertySource) +@PropertySource(ConstantsProperties.applicationPropertySource) public class ApplicationConfig { private static final Logger _logger = LoggerFactory.getLogger(ApplicationConfig.class); @@ -47,6 +49,16 @@ public class ApplicationConfig { @Value("${config.server.management.uri}") String managementUri; + @Value("${server.port:8080}") + private int port; + + public int getPort() { + return port; + } + + public void setPort(int port) { + this.port = port; + } /* * //is enable whiteList for ipAddress filter boolean whiteList; * diff --git a/maxkey-core/src/main/java/org/maxkey/config/CharacterEncodingConfig.java b/maxkey-core/src/main/java/org/maxkey/config/CharacterEncodingConfig.java index 5e5fbd73..224182d3 100644 --- a/maxkey-core/src/main/java/org/maxkey/config/CharacterEncodingConfig.java +++ b/maxkey-core/src/main/java/org/maxkey/config/CharacterEncodingConfig.java @@ -1,6 +1,8 @@ package org.maxkey.config; import java.io.UnsupportedEncodingException; + +import org.maxkey.constants.ConstantsProperties; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @@ -12,7 +14,7 @@ import org.springframework.context.annotation.PropertySource; * */ @Configuration -@PropertySource("classpath:/application.properties") +@PropertySource(ConstantsProperties.applicationPropertySource) public class CharacterEncodingConfig { /** diff --git a/maxkey-core/src/main/java/org/maxkey/config/EmailConfig.java b/maxkey-core/src/main/java/org/maxkey/config/EmailConfig.java index 1b50a1d0..d435274d 100644 --- a/maxkey-core/src/main/java/org/maxkey/config/EmailConfig.java +++ b/maxkey-core/src/main/java/org/maxkey/config/EmailConfig.java @@ -1,11 +1,12 @@ package org.maxkey.config; +import org.maxkey.constants.ConstantsProperties; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @Configuration -@PropertySource("classpath:/application.properties") +@PropertySource(ConstantsProperties.applicationPropertySource) public class EmailConfig { @Value("${spring.mail.username}") diff --git a/maxkey-core/src/main/java/org/maxkey/config/LoginConfig.java b/maxkey-core/src/main/java/org/maxkey/config/LoginConfig.java index e64e4ac6..ded65f79 100644 --- a/maxkey-core/src/main/java/org/maxkey/config/LoginConfig.java +++ b/maxkey-core/src/main/java/org/maxkey/config/LoginConfig.java @@ -1,11 +1,12 @@ package org.maxkey.config; +import org.maxkey.constants.ConstantsProperties; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @Configuration -@PropertySource("classpath:/config/applicationConfig.properties") +@PropertySource(ConstantsProperties.maxKeyPropertySource) public class LoginConfig { @Value("${config.login.captcha}") boolean captcha; diff --git a/maxkey-core/src/main/java/org/maxkey/constants/ConstantsProperties.java b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsProperties.java new file mode 100644 index 00000000..7bc0c5a4 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/constants/ConstantsProperties.java @@ -0,0 +1,24 @@ +package org.maxkey.constants; + +import org.junit.Test; + +public class ConstantsProperties { + + public static final String applicationPropertySource = + "classpath:/application.properties"; + + public static final String maxKeyPropertySource = + "classpath:/maxkey.properties"; + + public static final String kaptchaPropertySource = + "classpath:/kaptcha.properties"; + + public static String classPathResource(String propertySource) { + return propertySource.replaceAll("classpath:",""); + } + + @Test + public void classPathResourceTest() { + System.out.println(classPathResource(maxKeyPropertySource)); + } +} diff --git a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java index 86403397..82a1cdbd 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java @@ -2,6 +2,8 @@ package org.maxkey; import java.util.Date; import javax.servlet.ServletException; + +import org.maxkey.config.ApplicationConfig; import org.maxkey.web.InitializeContext; import org.mybatis.spring.annotation.MapperScan; import org.slf4j.Logger; @@ -50,7 +52,7 @@ public class MaxKeyMgtApplication extends SpringBootServletInitializer { _logger.error("",e); } _logger.info("MaxKeyMgt at "+new Date(applicationContext.getStartupDate())); - _logger.info("MaxKeyMgt Server Port "+applicationContext.getBean(MaxKeyMgtConfig.class).getPort()); + _logger.info("MaxKeyMgt Server Port "+applicationContext.getBean(ApplicationConfig.class).getPort()); _logger.info("MaxKeyMgt started."); } diff --git a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java index ccbc57e5..4530dec9 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtConfig.java @@ -2,6 +2,7 @@ package org.maxkey; import javax.sql.DataSource; import org.maxkey.authz.oauth2.provider.client.JdbcClientDetailsService; +import org.maxkey.constants.ConstantsProperties; import org.maxkey.crypto.password.opt.impl.TimeBasedOtpAuthn; import org.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm; import org.slf4j.Logger; @@ -15,20 +16,11 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.security.crypto.password.PasswordEncoder; @Configuration -@PropertySource("classpath:/application.properties") +@PropertySource(ConstantsProperties.applicationPropertySource) public class MaxKeyMgtConfig implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(MaxKeyMgtConfig.class); - @Value("${server.port:8080}") - private int port; - - public int getPort() { - return port; - } - - public void setPort(int port) { - this.port = port; - } + @Bean(name = "oauth20JdbcClientDetailsService") public JdbcClientDetailsService JdbcClientDetailsService( diff --git a/maxkey-web-manage/src/main/resources/config/applicationConfig.properties b/maxkey-web-manage/src/main/resources/maxkey.properties similarity index 100% rename from maxkey-web-manage/src/main/resources/config/applicationConfig.properties rename to maxkey-web-manage/src/main/resources/maxkey.properties diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java index 23982f11..54b28408 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java @@ -4,6 +4,7 @@ import java.util.Date; import javax.servlet.ServletException; import org.apache.ibatis.io.VFS; import org.apache.mybatis.jpa.SpringBootVFS; +import org.maxkey.config.ApplicationConfig; import org.maxkey.web.InitializeContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +36,7 @@ public class MaxKeyApplication extends SpringBootServletInitializer { } _logger.info("MaxKey at " + new Date(applicationContext.getStartupDate())); _logger.info("MaxKey Server Port " - + applicationContext.getBean(MaxKeyConfig.class).getPort()); + + applicationContext.getBean(ApplicationConfig.class).getPort()); _logger.info("MaxKey started."); } diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java index 00063dd7..a287de48 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java @@ -21,6 +21,7 @@ import org.maxkey.authn.support.socialsignon.service.JdbcSocialsAssociateService import org.maxkey.authn.support.socialsignon.service.SocialSignOnProvider; import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; import org.maxkey.authz.oauth2.provider.endpoint.TokenEndpointAuthenticationFilter; +import org.maxkey.constants.ConstantsProperties; import org.maxkey.crypto.password.opt.algorithm.KeyUriFormat; import org.maxkey.crypto.password.opt.impl.MailOtpAuthn; import org.maxkey.crypto.password.opt.impl.SmsOtpAuthn; @@ -50,8 +51,8 @@ import org.springframework.jdbc.core.JdbcTemplate; @Configuration //@ImportResource(locations = { "classpath:spring/maxkey.xml" }) -@PropertySource("classpath:/application.properties") -@PropertySource("classpath:/config/applicationConfig.properties") +@PropertySource(ConstantsProperties.applicationPropertySource) +@PropertySource(ConstantsProperties.maxKeyPropertySource) @MapperScan("org.maxkey.dao.persistence,") @ComponentScan(basePackages = { "org.maxkey.config", @@ -74,13 +75,6 @@ import org.springframework.jdbc.core.JdbcTemplate; public class MaxKeyConfig implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(MaxKeyConfig.class); - @Value("${server.port:8080}") - private int port; - - public int getPort() { - return port; - } - @Bean public FilterRegistrationBean TokenEndpointAuthenticationFilter() { _logger.debug("TokenEndpointAuthenticationFilter init "); @@ -250,7 +244,8 @@ public class MaxKeyConfig implements InitializingBean { public SocialSignOnProviderService socialSignOnProviderService() throws IOException { SocialSignOnProviderService socialSignOnProviderService = new SocialSignOnProviderService(); - Resource resource = new ClassPathResource("/config/applicationConfig.properties"); + Resource resource = new ClassPathResource( + ConstantsProperties.classPathResource(ConstantsProperties.classPathResource(ConstantsProperties.maxKeyPropertySource))); Properties properties = new Properties(); properties.load(resource.getInputStream()); String [] providerList =properties.get("config.login.socialsignon.providers").toString().split(","); diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java index 9ce67068..c850231a 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java @@ -2,6 +2,7 @@ package org.maxkey; import org.maxkey.authn.support.basic.BasicEntryPoint; import org.maxkey.authn.support.httpheader.HttpHeaderEntryPoint; +import org.maxkey.constants.ConstantsProperties; import org.maxkey.web.interceptor.HistoryLoginAppAdapter; import org.maxkey.web.interceptor.HistoryLogsAdapter; import org.maxkey.web.interceptor.PermissionAdapter; @@ -20,7 +21,7 @@ import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; @Configuration @EnableWebMvc -@PropertySource("classpath:/config/applicationConfig.properties") +@PropertySource(ConstantsProperties.maxKeyPropertySource) public class MaxKeyMvcConfig implements WebMvcConfigurer { private static final Logger _logger = LoggerFactory.getLogger(MaxKeyMvcConfig.class); @Autowired diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java b/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java index 88d6332a..3516e587 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java @@ -4,6 +4,7 @@ import org.maxkey.authz.cas.endpoint.ticket.service.InMemoryTicketServices; import org.maxkey.authz.cas.endpoint.ticket.service.JdbcTicketServices; import org.maxkey.authz.cas.endpoint.ticket.service.RedisTicketServices; import org.maxkey.authz.cas.endpoint.ticket.service.TicketServices; +import org.maxkey.constants.ConstantsProperties; import org.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +20,7 @@ import org.springframework.jdbc.core.JdbcTemplate; @ComponentScan(basePackages = { "org.maxkey.authz.cas.endpoint" }) -@PropertySource("classpath:/application.properties") +@PropertySource(ConstantsProperties.maxKeyPropertySource) public class CasAutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(CasAutoConfiguration.class); diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java b/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java index 4c9536c5..88f56da4 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java @@ -25,6 +25,7 @@ import org.maxkey.authz.oauth2.provider.token.store.JwtAccessTokenConverter; import org.maxkey.authz.oauth2.provider.token.store.RedisTokenStore; import org.maxkey.authz.oidc.idtoken.OIDCIdTokenEnhancer; import org.maxkey.config.oidc.OIDCProviderMetadataDetails; +import org.maxkey.constants.ConstantsProperties; import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; import org.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; import org.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; @@ -53,8 +54,8 @@ import com.nimbusds.jose.JWEAlgorithm; "org.maxkey.authz.oauth2.provider.userinfo.endpoint", "org.maxkey.authz.oauth2.provider.approval.controller" }) -@PropertySource("classpath:/application.properties") -@PropertySource("classpath:/config/applicationConfig.properties") +@PropertySource(ConstantsProperties.applicationPropertySource) +@PropertySource(ConstantsProperties.maxKeyPropertySource) public class Oauth20AutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(Oauth20AutoConfiguration.class); diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java b/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java index 24e34894..0437c4b2 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java @@ -17,6 +17,7 @@ import org.maxkey.authz.saml20.binding.impl.PostBindingAdapter; import org.maxkey.authz.saml20.binding.impl.PostSimpleSignBindingAdapter; import org.maxkey.authz.saml20.provider.xml.AuthnResponseGenerator; import org.maxkey.authz.saml20.xml.SAML2ValidatorSuite; +import org.maxkey.constants.ConstantsProperties; import org.maxkey.crypto.keystore.KeyStoreLoader; import org.maxkey.domain.Saml20Metadata; import org.opensaml.common.binding.security.IssueInstantRule; @@ -40,8 +41,8 @@ import org.springframework.ui.velocity.VelocityEngineFactoryBean; "org.maxkey.authz.saml20.provider.endpoint", "org.maxkey.authz.saml20.metadata.endpoint", }) -@PropertySource("classpath:/application.properties") -@PropertySource("classpath:/config/applicationConfig.properties") +@PropertySource(ConstantsProperties.applicationPropertySource) +@PropertySource(ConstantsProperties.maxKeyPropertySource) public class Saml20AutoConfiguration implements InitializingBean { private static final Logger _logger = LoggerFactory.getLogger(Saml20AutoConfiguration.class); diff --git a/maxkey-web-maxkey/src/main/resources/config/applicationConfig.properties b/maxkey-web-maxkey/src/main/resources/maxkey.properties similarity index 100% rename from maxkey-web-maxkey/src/main/resources/config/applicationConfig.properties rename to maxkey-web-maxkey/src/main/resources/maxkey.properties