diff --git a/build.gradle b/build.gradle index 65e532215..1756c2ce5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,21 @@ /* - * This build file was auto generated by running the Gradle buildrelease.bat + * Copyright [2021] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * MaxKey build file was auto generated by running the Gradle release.bat */ defaultTasks "clean", "build" @@ -148,7 +164,7 @@ subprojects { compile group: 'org.apache.poi', name: 'poi-ooxml', version: "${poiVersion}" compile group: 'org.apache.poi', name: 'poi-ooxml-schemas', version: "${poiVersion}" compile group: 'org.apache.poi', name: 'poi-scratchpad', version: "${poiVersion}" - compile group: 'org.apache.commons', name: 'not-yet-commons-ssl', version: '0.3.9' + //compile group: 'org.apache.commons', name: 'not-yet-commons-ssl', version: '0.3.9' //logs compile group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: "${log4jVersion}" diff --git a/maxkey-authentications/maxkey-authentication-captcha/build.gradle b/maxkey-authentications/maxkey-authentication-captcha/build.gradle new file mode 100644 index 000000000..0d0fcc9ae --- /dev/null +++ b/maxkey-authentications/maxkey-authentication-captcha/build.gradle @@ -0,0 +1,12 @@ + +description = "maxkey-authentication-captcha" + + +dependencies { + //local jars + compile fileTree(dir: '../maxkey-lib/', include: '*/*.jar') + + compile project(":maxkey-core") + compile project(":maxkey-persistence") + +} \ No newline at end of file diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java similarity index 100% rename from maxkey-core/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java rename to maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java diff --git a/maxkey-core/src/main/java/org/maxkey/web/image/ImageCaptchaEndpoint.java b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/web/contorller/ImageCaptchaEndpoint.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/web/image/ImageCaptchaEndpoint.java rename to maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/web/contorller/ImageCaptchaEndpoint.java index f0c83ba4f..6ce9e8d88 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/image/ImageCaptchaEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/web/contorller/ImageCaptchaEndpoint.java @@ -15,13 +15,14 @@ */ -package org.maxkey.web.image; +package org.maxkey.web.contorller; import com.google.code.kaptcha.Producer; import java.awt.image.BufferedImage; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.maxkey.web.WebConstants; +import org.maxkey.web.image.AbstractImageEndpoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-web-manage/src/main/resources/kaptcha.properties b/maxkey-authentications/maxkey-authentication-captcha/src/main/resources/kaptcha.properties similarity index 100% rename from maxkey-web-manage/src/main/resources/kaptcha.properties rename to maxkey-authentications/maxkey-authentication-captcha/src/main/resources/kaptcha.properties diff --git a/maxkey-authentications/build.gradle b/maxkey-authentications/maxkey-authentication-core/build.gradle similarity index 87% rename from maxkey-authentications/build.gradle rename to maxkey-authentications/maxkey-authentication-core/build.gradle index a3a0ad5c4..82d21ab4f 100644 --- a/maxkey-authentications/build.gradle +++ b/maxkey-authentications/maxkey-authentication-core/build.gradle @@ -1,13 +1,11 @@ -description = "maxkey-authentications" +description = "maxkey-authentication-core" dependencies { //local jars compile fileTree(dir: '../maxkey-lib/', include: '*/*.jar') - - compile project(":maxkey-core") compile project(":maxkey-persistence") compile project(":maxkey-protocols:maxkey-protocol-oauth-2.0") diff --git a/maxkey-authentications/src/main/java/META-INF/MANIFEST.MF b/maxkey-authentications/maxkey-authentication-core/src/main/java/META-INF/MANIFEST.MF similarity index 100% rename from maxkey-authentications/src/main/java/META-INF/MANIFEST.MF rename to maxkey-authentications/maxkey-authentication-core/src/main/java/META-INF/MANIFEST.MF diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryAuthenticationRealm.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryAuthenticationRealm.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryAuthenticationRealm.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryServer.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryServer.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryServer.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryServer.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/realm/ldap/LdapServer.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/ldap/LdapServer.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/realm/ldap/LdapServer.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/ldap/LdapServer.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/kerberos/KerberosProxy.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/kerberos/KerberosProxy.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/kerberos/KerberosProxy.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/kerberos/KerberosProxy.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/kerberos/KerberosService.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/kerberos/KerberosService.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/kerberos/KerberosService.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/kerberos/KerberosService.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/kerberos/KerberosToken.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/kerberos/KerberosToken.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/kerberos/KerberosToken.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/kerberos/KerberosToken.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFedAttributeMutatorImpl.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFedAttributeMutatorImpl.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFedAttributeMutatorImpl.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFedAttributeMutatorImpl.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationAttributeMutator.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationAttributeMutator.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationAttributeMutator.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationAttributeMutator.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationConfiguration.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationConfiguration.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationConfiguration.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationConfiguration.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationConstants.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationConstants.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationConstants.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationConstants.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationCredential.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationCredential.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationCredential.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationCredential.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationService.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationService.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationService.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationService.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationUtils.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationUtils.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationUtils.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationUtils.java diff --git a/maxkey-authentications/maxkey-authentication-social/build.gradle b/maxkey-authentications/maxkey-authentication-social/build.gradle new file mode 100644 index 000000000..3854f1536 --- /dev/null +++ b/maxkey-authentications/maxkey-authentication-social/build.gradle @@ -0,0 +1,12 @@ + +description = "maxkey-authentication-social" + + +dependencies { + //local jars + compile fileTree(dir: '../maxkey-lib/', include: '*/*.jar') + + compile project(":maxkey-core") + compile project(":maxkey-persistence") + +} \ No newline at end of file diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/META-INF/MANIFEST.MF b/maxkey-authentications/maxkey-authentication-social/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 000000000..254272e1c --- /dev/null +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProvider.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProvider.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProvider.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProvider.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociate.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociate.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociate.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociate.java diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java similarity index 100% rename from maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java similarity index 96% rename from maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java rename to maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java index 3cf0d6ff7..79326c77f 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java @@ -70,7 +70,9 @@ public class SocialSignOnAutoConfiguration implements InitializingBean { socialSignOnProvider.setClientId(clientId); socialSignOnProvider.setClientSecret(clientSecret); socialSignOnProvider.setSortOrder(Integer.valueOf(sortOrder)); - _logger.debug("socialSignOnProvider " + socialSignOnProvider); + _logger.debug("socialSignOnProvider " + socialSignOnProvider.getProvider() + + "(" + socialSignOnProvider.getProviderName()+")"); + _logger.trace("socialSignOnProvider " + socialSignOnProvider); socialSignOnProviderList.add(socialSignOnProvider); } socialSignOnProviderService.setSocialSignOnProviders(socialSignOnProviderList); diff --git a/maxkey-core/src/main/java/org/maxkey/web/image/AbstractImageEndpoint.java b/maxkey-core/src/main/java/org/maxkey/web/image/AbstractImageEndpoint.java index 62d987af5..dbd014f4e 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/image/AbstractImageEndpoint.java +++ b/maxkey-core/src/main/java/org/maxkey/web/image/AbstractImageEndpoint.java @@ -45,7 +45,7 @@ public class AbstractImageEndpoint { @Autowired @Qualifier("applicationConfig") - ApplicationConfig applicationConfig; + protected ApplicationConfig applicationConfig; /** * producerImage. diff --git a/maxkey-lib/not-yet-commons-ssl-0.3.9.jar b/maxkey-lib/not-yet-commons-ssl-0.3.9.jar new file mode 100644 index 000000000..cb1bee3ab Binary files /dev/null and b/maxkey-lib/not-yet-commons-ssl-0.3.9.jar differ diff --git a/maxkey-web-manage/build.gradle b/maxkey-web-manage/build.gradle index cec67cb1a..024858fdb 100644 --- a/maxkey-web-manage/build.gradle +++ b/maxkey-web-manage/build.gradle @@ -61,6 +61,7 @@ jib { dependencies { compile project(":maxkey-core") + compile project(":maxkey-authentications:maxkey-authentication-captcha") compile project(":maxkey-persistence") compile project(":maxkey-protocols:maxkey-protocol-oauth-2.0") compile project(":maxkey-protocols:maxkey-protocol-saml-2.0") diff --git a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtMvcConfig.java b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtMvcConfig.java index 5b1ba0048..f1164981f 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtMvcConfig.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtMvcConfig.java @@ -48,6 +48,8 @@ public class MaxKeyMgtMvcConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { + _logger.debug("addResourceHandlers"); + _logger.debug("add statics"); registry.addResourceHandler("/static/**") .addResourceLocations("classpath:/static/"); @@ -65,7 +67,7 @@ public class MaxKeyMgtMvcConfig implements WebMvcConfigurer { registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/"); registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); - _logger.debug("add addResourceHandler"); + _logger.debug("addResourceHandler finished ."); } @Override diff --git a/maxkey-web-maxkey/build.gradle b/maxkey-web-maxkey/build.gradle index 2c8638162..8601cec37 100644 --- a/maxkey-web-maxkey/build.gradle +++ b/maxkey-web-maxkey/build.gradle @@ -64,7 +64,10 @@ dependencies { compile project(":maxkey-core") compile project(":maxkey-persistence") - compile project(":maxkey-authentications") + compile project(":maxkey-authentications:maxkey-authentication-core") + compile project(":maxkey-authentications:maxkey-authentication-social") + compile project(":maxkey-authentications:maxkey-authentication-captcha") + compile project(":maxkey-protocols:maxkey-protocol-authorize") compile project(":maxkey-protocols:maxkey-protocol-cas") 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 d6c34038c..1dbce7a16 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java @@ -68,6 +68,7 @@ public class MaxKeyMvcConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { + _logger.debug("addResourceHandlers"); _logger.debug("add statics"); registry.addResourceHandler("/static/**") .addResourceLocations("classpath:/static/"); @@ -85,7 +86,7 @@ public class MaxKeyMvcConfig implements WebMvcConfigurer { registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/"); registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); - _logger.debug("add addResourceHandler"); + _logger.debug("addResourceHandler finished ."); } @Override diff --git a/maxkey-web-maxkey/src/main/resources/kaptcha.properties b/maxkey-web-maxkey/src/main/resources/kaptcha.properties deleted file mode 100644 index ed39b3c30..000000000 --- a/maxkey-web-maxkey/src/main/resources/kaptcha.properties +++ /dev/null @@ -1,9 +0,0 @@ -kaptcha.image.width=80 -kaptcha.image.height=25 -kaptcha.border=no -kaptcha.obscurificator.impl=com.google.code.kaptcha.impl.ShadowGimpy -kaptcha.textproducer.font.size=23 -kaptcha.textproducer.char.string=0123456789 -kaptcha.textproducer.char.length=4 -kaptcha.noise.impl=com.google.code.kaptcha.impl.NoNoise -#kaptcha.noise.color=white \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 2ffe2c102..15558f921 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,10 @@ rootProject.name = 'MaxKey' //Common include 'maxkey-core' include 'maxkey-persistence' -include 'maxkey-authentications' +//include 'maxkey-authentications' +include 'maxkey-authentications:maxkey-authentication-core' +include 'maxkey-authentications:maxkey-authentication-captcha' +include 'maxkey-authentications:maxkey-authentication-social' //identity include 'maxkey-identitys:maxkey-identity-scim'