diff --git a/maxkey-authentications/maxkey-authentication-core/build.gradle b/maxkey-authentications/maxkey-authentication-core/build.gradle index 3c85f1477..5334d4b83 100644 --- a/maxkey-authentications/maxkey-authentication-core/build.gradle +++ b/maxkey-authentications/maxkey-authentication-core/build.gradle @@ -9,6 +9,6 @@ dependencies { implementation project(":maxkey-common") implementation project(":maxkey-core") implementation project(":maxkey-persistence") - implementation project(":maxkey-authentications:maxkey-authentication-otp") + implementation project(":maxkey-starter:maxkey-starter-otp") } \ No newline at end of file diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-authentications/maxkey-authentication-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..dad4aa020 --- /dev/null +++ b/maxkey-authentications/maxkey-authentication-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +org.dromara.maxkey.autoconfigure.MvcCurrentUserAutoConfiguration +org.dromara.maxkey.autoconfigure.SessionAutoConfiguration +org.dromara.maxkey.autoconfigure.TokenAutoConfiguration \ No newline at end of file diff --git a/maxkey-authentications/maxkey-authentication-provider/build.gradle b/maxkey-authentications/maxkey-authentication-provider/build.gradle index 034d420a0..5e019e9f3 100644 --- a/maxkey-authentications/maxkey-authentication-provider/build.gradle +++ b/maxkey-authentications/maxkey-authentication-provider/build.gradle @@ -9,9 +9,11 @@ dependencies { implementation project(":maxkey-common") implementation project(":maxkey-core") implementation project(":maxkey-persistence") + + implementation project(":maxkey-starter:maxkey-starter-ip2location") + implementation project(":maxkey-starter:maxkey-starter-otp") + implementation project(":maxkey-starter:maxkey-starter-sms") + implementation project(":maxkey-authentications:maxkey-authentication-core") - implementation project(":maxkey-authentications:maxkey-authentication-ip2location") - implementation project(":maxkey-authentications:maxkey-authentication-otp") - implementation project(":maxkey-authentications:maxkey-authentication-sms") } \ No newline at end of file diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-authentications/maxkey-authentication-provider/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..2a77b7af5 --- /dev/null +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +org.dromara.maxkey.autoconfigure.AuthnProviderAutoConfiguration +org.dromara.maxkey.autoconfigure.JwtAuthnAutoConfiguration \ No newline at end of file diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-authentications/maxkey-authentication-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..dd29740e6 --- /dev/null +++ b/maxkey-authentications/maxkey-authentication-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.maxkey.autoconfigure.SocialSignOnAutoConfiguration \ No newline at end of file diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java index c48de90e0..7ec00b121 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java @@ -17,7 +17,6 @@ package org.dromara.maxkey.configuration; -import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.constants.ConstsDatabase; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java index 88f90dd07..9f178e870 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java @@ -27,7 +27,6 @@ import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.Map; -import org.dromara.maxkey.persistence.repository.LocalizationRepository; import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,9 +50,6 @@ public class LocaleTagDirective implements TemplateDirectiveModel { @Autowired private HttpServletRequest request; - @Autowired - LocalizationRepository localizationService; - @SuppressWarnings("rawtypes") @Override public void execute(Environment env, diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/InstitutionsRepository.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/InstitutionsRepository.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/InstitutionsRepository.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/InstitutionsRepository.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LocalizationRepository.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/LocalizationRepository.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LocalizationRepository.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/LocalizationRepository.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LoginHistoryRepository.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/LoginHistoryRepository.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LoginHistoryRepository.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/LoginHistoryRepository.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LoginRepository.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/LoginRepository.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LoginRepository.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/LoginRepository.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyMessageResolver.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyMessageResolver.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyMessageResolver.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyMessageResolver.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyRepository.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyRepository.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyRepository.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyRepository.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyValidator.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyValidator.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyValidator.java rename to maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyValidator.java diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-protocols/maxkey-protocol-cas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..a470ef958 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.maxkey.autoconfigure.CasAutoConfiguration \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..9a955d48b --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.maxkey.autoconfigure.Saml20AutoConfiguration \ No newline at end of file diff --git a/maxkey-authentications/maxkey-authentication-captcha/build.gradle b/maxkey-starter/maxkey-starter-captcha/build.gradle similarity index 85% rename from maxkey-authentications/maxkey-authentication-captcha/build.gradle rename to maxkey-starter/maxkey-starter-captcha/build.gradle index 7f6d1682a..5ceea3ed4 100644 --- a/maxkey-authentications/maxkey-authentication-captcha/build.gradle +++ b/maxkey-starter/maxkey-starter-captcha/build.gradle @@ -1,5 +1,5 @@ -description = "maxkey-authentication-captcha" +description = "maxkey-starter-captcha" dependencies { diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/impl/LightNoise.java b/maxkey-starter/maxkey-starter-captcha/src/main/java/com/google/code/kaptcha/impl/LightNoise.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/impl/LightNoise.java rename to maxkey-starter/maxkey-starter-captcha/src/main/java/com/google/code/kaptcha/impl/LightNoise.java diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/impl/Ripple.java b/maxkey-starter/maxkey-starter-captcha/src/main/java/com/google/code/kaptcha/impl/Ripple.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/impl/Ripple.java rename to maxkey-starter/maxkey-starter-captcha/src/main/java/com/google/code/kaptcha/impl/Ripple.java diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/impl/UniqueTextCreator.java b/maxkey-starter/maxkey-starter-captcha/src/main/java/com/google/code/kaptcha/impl/UniqueTextCreator.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/impl/UniqueTextCreator.java rename to maxkey-starter/maxkey-starter-captcha/src/main/java/com/google/code/kaptcha/impl/UniqueTextCreator.java diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/text/impl/RandomColorWordRenderer.java b/maxkey-starter/maxkey-starter-captcha/src/main/java/com/google/code/kaptcha/text/impl/RandomColorWordRenderer.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/text/impl/RandomColorWordRenderer.java rename to maxkey-starter/maxkey-starter-captcha/src/main/java/com/google/code/kaptcha/text/impl/RandomColorWordRenderer.java diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/autoconfigure/KaptchaAutoConfiguration.java b/maxkey-starter/maxkey-starter-captcha/src/main/java/org/dromara/maxkey/autoconfigure/KaptchaAutoConfiguration.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/autoconfigure/KaptchaAutoConfiguration.java rename to maxkey-starter/maxkey-starter-captcha/src/main/java/org/dromara/maxkey/autoconfigure/KaptchaAutoConfiguration.java diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptcha.java b/maxkey-starter/maxkey-starter-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptcha.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptcha.java rename to maxkey-starter/maxkey-starter-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptcha.java diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptchaEndpoint.java b/maxkey-starter/maxkey-starter-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptchaEndpoint.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptchaEndpoint.java rename to maxkey-starter/maxkey-starter-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptchaEndpoint.java diff --git a/maxkey-starter/maxkey-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-starter/maxkey-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..bf82041fe --- /dev/null +++ b/maxkey-starter/maxkey-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.maxkey.autoconfigure.KaptchaAutoConfiguration \ No newline at end of file diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/resources/kaptcha.properties b/maxkey-starter/maxkey-starter-captcha/src/main/resources/kaptcha.properties similarity index 100% rename from maxkey-authentications/maxkey-authentication-captcha/src/main/resources/kaptcha.properties rename to maxkey-starter/maxkey-starter-captcha/src/main/resources/kaptcha.properties diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/resources/kaptcha_c.properties b/maxkey-starter/maxkey-starter-captcha/src/main/resources/kaptcha_c.properties similarity index 100% rename from maxkey-authentications/maxkey-authentication-captcha/src/main/resources/kaptcha_c.properties rename to maxkey-starter/maxkey-starter-captcha/src/main/resources/kaptcha_c.properties diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/resources/kaptcha_d.properties b/maxkey-starter/maxkey-starter-captcha/src/main/resources/kaptcha_d.properties similarity index 100% rename from maxkey-authentications/maxkey-authentication-captcha/src/main/resources/kaptcha_d.properties rename to maxkey-starter/maxkey-starter-captcha/src/main/resources/kaptcha_d.properties diff --git a/maxkey-authentications/maxkey-authentication-ip2location/build.gradle b/maxkey-starter/maxkey-starter-ip2location/build.gradle similarity index 81% rename from maxkey-authentications/maxkey-authentication-ip2location/build.gradle rename to maxkey-starter/maxkey-starter-ip2location/build.gradle index b6bae3f5f..c48dc51d3 100644 --- a/maxkey-authentications/maxkey-authentication-ip2location/build.gradle +++ b/maxkey-starter/maxkey-starter-ip2location/build.gradle @@ -1,5 +1,5 @@ -description = "maxkey-authentication-core" +description = "maxkey-starter-ip2location" dependencies { diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/autoconfigure/IpLocationAutoConfiguration.java b/maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/autoconfigure/IpLocationAutoConfiguration.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/autoconfigure/IpLocationAutoConfiguration.java rename to maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/autoconfigure/IpLocationAutoConfiguration.java diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/AbstractIpLocation.java b/maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/AbstractIpLocation.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/AbstractIpLocation.java rename to maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/AbstractIpLocation.java diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/IpLocation.java b/maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/IpLocation.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/IpLocation.java rename to maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/IpLocation.java diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/IpLocationLocal.java b/maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/IpLocationLocal.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/IpLocationLocal.java rename to maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/IpLocationLocal.java diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/IpLocationParser.java b/maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/IpLocationParser.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/IpLocationParser.java rename to maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/IpLocationParser.java diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/Region.java b/maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/Region.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/Region.java rename to maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/Region.java diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/offline/GeoIP2V4.java b/maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/offline/GeoIP2V4.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/offline/GeoIP2V4.java rename to maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/offline/GeoIP2V4.java diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/offline/Ip2regionV2.java b/maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/offline/Ip2regionV2.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/offline/Ip2regionV2.java rename to maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/offline/Ip2regionV2.java diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/online/Ip138.java b/maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/online/Ip138.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/online/Ip138.java rename to maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/online/Ip138.java diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/online/Ip138Response.java b/maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/online/Ip138Response.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/online/Ip138Response.java rename to maxkey-starter/maxkey-starter-ip2location/src/main/java/org/dromara/maxkey/ip2location/online/Ip138Response.java diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-starter/maxkey-starter-ip2location/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to maxkey-starter/maxkey-starter-ip2location/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/resources/geoip2/COPYRIGHT.txt b/maxkey-starter/maxkey-starter-ip2location/src/main/resources/geoip2/COPYRIGHT.txt similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/resources/geoip2/COPYRIGHT.txt rename to maxkey-starter/maxkey-starter-ip2location/src/main/resources/geoip2/COPYRIGHT.txt diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/resources/geoip2/GeoLite2-City.mmdb b/maxkey-starter/maxkey-starter-ip2location/src/main/resources/geoip2/GeoLite2-City.mmdb similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/resources/geoip2/GeoLite2-City.mmdb rename to maxkey-starter/maxkey-starter-ip2location/src/main/resources/geoip2/GeoLite2-City.mmdb diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/resources/geoip2/LICENSE.txt b/maxkey-starter/maxkey-starter-ip2location/src/main/resources/geoip2/LICENSE.txt similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/resources/geoip2/LICENSE.txt rename to maxkey-starter/maxkey-starter-ip2location/src/main/resources/geoip2/LICENSE.txt diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/resources/geoip2/README.txt b/maxkey-starter/maxkey-starter-ip2location/src/main/resources/geoip2/README.txt similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/resources/geoip2/README.txt rename to maxkey-starter/maxkey-starter-ip2location/src/main/resources/geoip2/README.txt diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/main/resources/ip2region/ip2region.xdb b/maxkey-starter/maxkey-starter-ip2location/src/main/resources/ip2region/ip2region.xdb similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/main/resources/ip2region/ip2region.xdb rename to maxkey-starter/maxkey-starter-ip2location/src/main/resources/ip2region/ip2region.xdb diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/test/java/org/dromara/maxkey/ip2location/Geoip2Test.java b/maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/Geoip2Test.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/test/java/org/dromara/maxkey/ip2location/Geoip2Test.java rename to maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/Geoip2Test.java diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/test/java/org/dromara/maxkey/ip2location/Ip2RegionV2Test.java b/maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/Ip2RegionV2Test.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/test/java/org/dromara/maxkey/ip2location/Ip2RegionV2Test.java rename to maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/Ip2RegionV2Test.java diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionIp138Test.java b/maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionIp138Test.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionIp138Test.java rename to maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionIp138Test.java diff --git a/maxkey-authentications/maxkey-authentication-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionParserTest.java b/maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionParserTest.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionParserTest.java rename to maxkey-starter/maxkey-starter-ip2location/src/test/java/org/dromara/maxkey/ip2location/IpRegionParserTest.java diff --git a/maxkey-authentications/maxkey-authentication-otp/build.gradle b/maxkey-starter/maxkey-starter-otp/build.gradle similarity index 84% rename from maxkey-authentications/maxkey-authentication-otp/build.gradle rename to maxkey-starter/maxkey-starter-otp/build.gradle index 040bb2d60..f0a4aefce 100644 --- a/maxkey-authentications/maxkey-authentication-otp/build.gradle +++ b/maxkey-starter/maxkey-starter-otp/build.gradle @@ -1,5 +1,5 @@ -description = "maxkey-authentication-otp" +description = "maxkey-starter-otp" dependencies { diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/META-INF/MANIFEST.MF b/maxkey-starter/maxkey-starter-otp/src/main/java/META-INF/MANIFEST.MF similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/META-INF/MANIFEST.MF rename to maxkey-starter/maxkey-starter-otp/src/main/java/META-INF/MANIFEST.MF diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/AbstractOtpAuthn.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/AbstractOtpAuthn.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/AbstractOtpAuthn.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/AbstractOtpAuthn.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/MailOtpAuthnService.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/MailOtpAuthnService.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/MailOtpAuthnService.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/MailOtpAuthnService.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/OneTimePassword.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/OneTimePassword.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/OneTimePassword.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/OneTimePassword.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/HOTP.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/HOTP.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/HOTP.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/HOTP.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/HmacOTP.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/HmacOTP.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/HmacOTP.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/HmacOTP.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/OtpKeyUriFormat.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/OtpKeyUriFormat.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/OtpKeyUriFormat.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/OtpKeyUriFormat.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/OtpSecret.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/OtpSecret.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/OtpSecret.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/OtpSecret.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/TimeBasedOTP.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/TimeBasedOTP.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/TimeBasedOTP.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/algorithm/TimeBasedOTP.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/CapOtpAuthn.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/CapOtpAuthn.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/CapOtpAuthn.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/CapOtpAuthn.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/MailOtpAuthn.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/MailOtpAuthn.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/MailOtpAuthn.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/MailOtpAuthn.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java b/maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java rename to maxkey-starter/maxkey-starter-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java diff --git a/maxkey-starter/maxkey-starter-otp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-starter/maxkey-starter-otp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..c9b2e3a52 --- /dev/null +++ b/maxkey-starter/maxkey-starter-otp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.maxkey.autoconfigure.OneTimePasswordAutoConfiguration \ No newline at end of file diff --git a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java b/maxkey-starter/maxkey-starter-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java rename to maxkey-starter/maxkey-starter-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java b/maxkey-starter/maxkey-starter-otp/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java rename to maxkey-starter/maxkey-starter-otp/src/test/java/org/maxkey/otp/algorithm/KeyUriFormatTest.java diff --git a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java b/maxkey-starter/maxkey-starter-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java rename to maxkey-starter/maxkey-starter-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java diff --git a/maxkey-authentications/maxkey-authentication-sms/build.gradle b/maxkey-starter/maxkey-starter-sms/build.gradle similarity index 66% rename from maxkey-authentications/maxkey-authentication-sms/build.gradle rename to maxkey-starter/maxkey-starter-sms/build.gradle index 1f56ccf8c..12ce57fd7 100644 --- a/maxkey-authentications/maxkey-authentication-sms/build.gradle +++ b/maxkey-starter/maxkey-starter-sms/build.gradle @@ -1,5 +1,5 @@ -description = "maxkey-authentication-sms" +description = "maxkey-starter-sms" dependencies { @@ -9,6 +9,6 @@ dependencies { implementation project(":maxkey-common") implementation project(":maxkey-core") implementation project(":maxkey-persistence") - implementation project(":maxkey-authentications:maxkey-authentication-otp") + implementation project(":maxkey-starter:maxkey-starter-otp") } \ No newline at end of file diff --git a/maxkey-authentications/maxkey-authentication-sms/src/main/java/META-INF/MANIFEST.MF b/maxkey-starter/maxkey-starter-sms/src/main/java/META-INF/MANIFEST.MF similarity index 100% rename from maxkey-authentications/maxkey-authentication-sms/src/main/java/META-INF/MANIFEST.MF rename to maxkey-starter/maxkey-starter-sms/src/main/java/META-INF/MANIFEST.MF diff --git a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/autoconfigure/SmsAutoConfiguration.java b/maxkey-starter/maxkey-starter-sms/src/main/java/org/dromara/maxkey/autoconfigure/SmsAutoConfiguration.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/autoconfigure/SmsAutoConfiguration.java rename to maxkey-starter/maxkey-starter-sms/src/main/java/org/dromara/maxkey/autoconfigure/SmsAutoConfiguration.java diff --git a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/SmsOtpAuthn.java b/maxkey-starter/maxkey-starter-sms/src/main/java/org/dromara/maxkey/password/sms/SmsOtpAuthn.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/SmsOtpAuthn.java rename to maxkey-starter/maxkey-starter-sms/src/main/java/org/dromara/maxkey/password/sms/SmsOtpAuthn.java diff --git a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/SmsOtpAuthnService.java b/maxkey-starter/maxkey-starter-sms/src/main/java/org/dromara/maxkey/password/sms/SmsOtpAuthnService.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/SmsOtpAuthnService.java rename to maxkey-starter/maxkey-starter-sms/src/main/java/org/dromara/maxkey/password/sms/SmsOtpAuthnService.java diff --git a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnAliyun.java b/maxkey-starter/maxkey-starter-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnAliyun.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnAliyun.java rename to maxkey-starter/maxkey-starter-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnAliyun.java diff --git a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnTencentCloud.java b/maxkey-starter/maxkey-starter-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnTencentCloud.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnTencentCloud.java rename to maxkey-starter/maxkey-starter-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnTencentCloud.java diff --git a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnYunxin.java b/maxkey-starter/maxkey-starter-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnYunxin.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnYunxin.java rename to maxkey-starter/maxkey-starter-sms/src/main/java/org/dromara/maxkey/password/sms/impl/SmsOtpAuthnYunxin.java diff --git a/maxkey-starter/maxkey-starter-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-starter/maxkey-starter-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..3a98e2380 --- /dev/null +++ b/maxkey-starter/maxkey-starter-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.maxkey.autoconfigure.SmsAutoConfiguration \ No newline at end of file diff --git a/maxkey-starter/maxkey-starter-web/build.gradle b/maxkey-starter/maxkey-starter-web/build.gradle new file mode 100644 index 000000000..039ef4e12 --- /dev/null +++ b/maxkey-starter/maxkey-starter-web/build.gradle @@ -0,0 +1,13 @@ + +description = "maxkey-starter-web" + + +dependencies { + //local jars + implementation fileTree(dir: '../maxkey-lib/', include: '*/*.jar') + + implementation project(":maxkey-common") + implementation project(":maxkey-core") + implementation project(":maxkey-persistence") + +} \ No newline at end of file diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java b/maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java rename to maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java b/maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java rename to maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcResourceAutoConfiguration.java b/maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/MvcResourceAutoConfiguration.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcResourceAutoConfiguration.java rename to maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/MvcResourceAutoConfiguration.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/RedisAutoConfiguration.java b/maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/RedisAutoConfiguration.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/RedisAutoConfiguration.java rename to maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/RedisAutoConfiguration.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerAutoConfiguration.java b/maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerAutoConfiguration.java similarity index 100% rename from maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerAutoConfiguration.java rename to maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerAutoConfiguration.java diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java b/maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java similarity index 89% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java rename to maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java index 2cbf7dc77..92369d7c9 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java +++ b/maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java @@ -35,13 +35,13 @@ import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; public class WebInstRequestFilter extends GenericFilterBean { - final static Logger _logger = LoggerFactory.getLogger(GenericFilterBean.class); + static final Logger _logger = LoggerFactory.getLogger(WebInstRequestFilter.class); - public final static String HEADER_HOST = "host"; + public static final String HEADER_HOST = "host"; - public final static String HEADER_HOSTNAME = "hostname"; + public static final String HEADER_HOSTNAME = "hostname"; - public final static String HEADER_ORIGIN = "Origin"; + public static final String HEADER_ORIGIN = "Origin"; InstitutionsRepository institutionsRepository; @@ -69,6 +69,7 @@ public class WebInstRequestFilter extends GenericFilterBean { host = host.split(":")[0]; _logger.trace("domain split {}",host); } + _logger.trace("host {}",host); Institutions institution = institutionsRepository.get(host); _logger.trace("{}" ,institution); request.getSession().setAttribute(WebConstants.CURRENT_INST, institution); @@ -77,6 +78,7 @@ public class WebInstRequestFilter extends GenericFilterBean { if(StringUtils.isEmpty(origin)) { origin = applicationConfig.getFrontendUri(); } + _logger.trace("origin {}" ,origin); } chain.doFilter(servletRequest, servletResponse); } diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebXssRequestFilter.java b/maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/web/WebXssRequestFilter.java similarity index 72% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/WebXssRequestFilter.java rename to maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/web/WebXssRequestFilter.java index ad9d813e5..d0c3f23ab 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebXssRequestFilter.java +++ b/maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/web/WebXssRequestFilter.java @@ -35,10 +35,10 @@ import jakarta.servlet.http.HttpServletRequest; public class WebXssRequestFilter extends GenericFilterBean { - final static Logger _logger = LoggerFactory.getLogger(GenericFilterBean.class); + static final Logger _logger = LoggerFactory.getLogger(WebXssRequestFilter.class); - final static ConcurrentHashMap skipUrlMap = new ConcurrentHashMap (); - final static ConcurrentHashMap skipParameterName = new ConcurrentHashMap (); + static final ConcurrentHashMap skipUrlMap = new ConcurrentHashMap <>(); + static final ConcurrentHashMap skipParameterName = new ConcurrentHashMap <>(); static { //add or update @@ -74,24 +74,24 @@ public class WebXssRequestFilter extends GenericFilterBean { boolean isWebXss = false; HttpServletRequest request= ((HttpServletRequest)servletRequest); if(_logger.isTraceEnabled()) {WebContext.printRequest(request);} - if(skipUrlMap.containsKey(request.getRequestURI().substring(request.getContextPath().length()))) { - isWebXss = false; + String requestURL =request.getRequestURI().substring(request.getContextPath().length()); + if(skipUrlMap.containsKey(requestURL)) { + _logger.trace("skip URL {}",requestURL); }else { Enumeration parameterNames = request.getParameterNames(); while (parameterNames.hasMoreElements()) { - String key = (String) parameterNames.nextElement(); - if(skipParameterName.containsKey(key)) {continue;} - - String value = request.getParameter(key); - _logger.trace("parameter name "+key +" , value " + value); - String tempValue = value; - if(!StringEscapeUtils.escapeHtml4(tempValue).equals(value) - ||tempValue.toLowerCase().indexOf("script")>-1 - ||tempValue.toLowerCase().replace(" ", "").indexOf("eval(")>-1) { - isWebXss = true; - _logger.error("parameter name "+key +" , value " + value - + ", contains dangerous content ! "); - break; + String key = parameterNames.nextElement(); + if(!skipParameterName.containsKey(key)) { + String value = request.getParameter(key); + _logger.trace("parameter name {} , value {}" , key, value); + String tempValue = value; + if(!StringEscapeUtils.escapeHtml4(tempValue).equals(value) + ||tempValue.toLowerCase().indexOf("script")>-1 + ||tempValue.toLowerCase().replace(" ", "").indexOf("eval(")>-1) { + isWebXss = true; + _logger.error("parameter name {} , value {}, contains dangerous content ! ",key,value); + break; + } } } } diff --git a/maxkey-starter/maxkey-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-starter/maxkey-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..d3e1f77f6 --- /dev/null +++ b/maxkey-starter/maxkey-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +org.dromara.maxkey.autoconfigure.ApplicationAutoConfiguration +org.dromara.maxkey.autoconfigure.RedisAutoConfiguration +org.dromara.maxkey.autoconfigure.MvcCurrentUserAutoConfiguration +org.dromara.maxkey.autoconfigure.MvcResourceAutoConfiguration +org.dromara.maxkey.autoconfigure.SwaggerAutoConfiguration \ No newline at end of file diff --git a/maxkey-synchronizers/maxkey-synchronizer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-synchronizers/maxkey-synchronizer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..d95454e09 --- /dev/null +++ b/maxkey-synchronizers/maxkey-synchronizer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.maxkey.autoconfigure.SynchronizerAutoConfiguration \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-maxkey/build.gradle b/maxkey-webs/maxkey-web-maxkey/build.gradle index ee1ab3a5e..d5183c1b7 100644 --- a/maxkey-webs/maxkey-web-maxkey/build.gradle +++ b/maxkey-webs/maxkey-web-maxkey/build.gradle @@ -39,14 +39,16 @@ dependencies { implementation project(":maxkey-core") implementation project(":maxkey-persistence") + implementation project(":maxkey-starter:maxkey-starter-captcha") + implementation project(":maxkey-starter:maxkey-starter-ip2location") + implementation project(":maxkey-starter:maxkey-starter-otp") + implementation project(":maxkey-starter:maxkey-starter-sms") + implementation project(":maxkey-starter:maxkey-starter-web") + implementation project(":maxkey-authentications:maxkey-authentication-core") implementation project(":maxkey-authentications:maxkey-authentication-social") - implementation project(":maxkey-authentications:maxkey-authentication-captcha") - implementation project(":maxkey-authentications:maxkey-authentication-ip2location") - implementation project(":maxkey-authentications:maxkey-authentication-otp") implementation project(":maxkey-authentications:maxkey-authentication-provider") - implementation project(":maxkey-authentications:maxkey-authentication-sms") - + implementation project(":maxkey-protocols:maxkey-protocol-authorize") implementation project(":maxkey-protocols:maxkey-protocol-cas") implementation project(":maxkey-protocols:maxkey-protocol-extendapi") 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 index b4d67de31..9b528047e 100644 --- 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 @@ -1,19 +1,3 @@ -org.dromara.maxkey.autoconfigure.ApplicationAutoConfiguration -org.dromara.maxkey.autoconfigure.MvcAutoConfiguration -org.dromara.maxkey.autoconfigure.KaptchaAutoConfiguration -org.dromara.maxkey.autoconfigure.RedisAutoConfiguration -org.dromara.maxkey.autoconfigure.AuthnProviderAutoConfiguration -org.dromara.maxkey.autoconfigure.JwtAuthnAutoConfiguration -org.dromara.maxkey.autoconfigure.OneTimePasswordAutoConfiguration -org.dromara.maxkey.autoconfigure.SmsAutoConfiguration -org.dromara.maxkey.autoconfigure.SessionAutoConfiguration -org.dromara.maxkey.autoconfigure.TokenAutoConfiguration -org.dromara.maxkey.autoconfigure.CasAutoConfiguration org.dromara.maxkey.autoconfigure.Oauth20AutoConfiguration -org.dromara.maxkey.autoconfigure.MvcCurrentUserAutoConfiguration -org.dromara.maxkey.autoconfigure.MvcResourceAutoConfiguration -org.dromara.maxkey.autoconfigure.Saml20AutoConfiguration -org.dromara.maxkey.autoconfigure.SocialSignOnAutoConfiguration -org.dromara.maxkey.autoconfigure.SwaggerAutoConfiguration org.dromara.maxkey.autoconfigure.MaxKeyMvcConfig org.dromara.maxkey.autoconfigure.MaxKeyConfig \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/build.gradle b/maxkey-webs/maxkey-web-mgt/build.gradle index 8302c9d65..6c3d45dc5 100644 --- a/maxkey-webs/maxkey-web-mgt/build.gradle +++ b/maxkey-webs/maxkey-web-mgt/build.gradle @@ -44,12 +44,14 @@ dependencies { implementation project(":maxkey-core") implementation project(":maxkey-persistence") + implementation project(":maxkey-starter:maxkey-starter-captcha") + implementation project(":maxkey-starter:maxkey-starter-ip2location") + implementation project(":maxkey-starter:maxkey-starter-otp") + implementation project(":maxkey-starter:maxkey-starter-sms") + implementation project(":maxkey-starter:maxkey-starter-web") + implementation project(":maxkey-authentications:maxkey-authentication-core") - implementation project(":maxkey-authentications:maxkey-authentication-captcha") - implementation project(":maxkey-authentications:maxkey-authentication-ip2location") - implementation project(":maxkey-authentications:maxkey-authentication-otp") implementation project(":maxkey-authentications:maxkey-authentication-provider") - implementation project(":maxkey-authentications:maxkey-authentication-sms") implementation project(":maxkey-protocols:maxkey-protocol-oauth-2.0") implementation project(":maxkey-protocols:maxkey-protocol-saml-2.0") 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 index ff0dcf684..8207f7b82 100644 --- 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 @@ -1,17 +1,3 @@ -org.dromara.maxkey.autoconfigure.ApplicationAutoConfiguration -org.dromara.maxkey.autoconfigure.KaptchaAutoConfiguration -org.dromara.maxkey.autoconfigure.MvcAutoConfiguration -org.dromara.maxkey.autoconfigure.JwtAuthnAutoConfiguration -org.dromara.maxkey.autoconfigure.RedisAutoConfiguration -org.dromara.maxkey.autoconfigure.AuthnProviderAutoConfiguration -org.dromara.maxkey.autoconfigure.OneTimePasswordAutoConfiguration -org.dromara.maxkey.autoconfigure.SmsAutoConfiguration -org.dromara.maxkey.autoconfigure.SessionAutoConfiguration -org.dromara.maxkey.autoconfigure.TokenAutoConfiguration -org.dromara.maxkey.autoconfigure.MvcCurrentUserAutoConfiguration -org.dromara.maxkey.autoconfigure.MvcResourceAutoConfiguration -org.dromara.maxkey.autoconfigure.SynchronizerAutoConfiguration -org.dromara.maxkey.autoconfigure.SwaggerAutoConfiguration org.dromara.maxkey.autoconfigure.Oauth20ClientAutoConfiguration org.dromara.maxkey.autoconfigure.MaxKeyMgtConfig org.dromara.maxkey.autoconfigure.MaxKeyMgtMvcConfig diff --git a/maxkey-webs/maxkey-web-openapi/build.gradle b/maxkey-webs/maxkey-web-openapi/build.gradle index ad79eee7e..6cd16bc37 100644 --- a/maxkey-webs/maxkey-web-openapi/build.gradle +++ b/maxkey-webs/maxkey-web-openapi/build.gradle @@ -44,12 +44,14 @@ dependencies { implementation project(":maxkey-core") implementation project(":maxkey-persistence") + implementation project(":maxkey-starter:maxkey-starter-captcha") + implementation project(":maxkey-starter:maxkey-starter-ip2location") + implementation project(":maxkey-starter:maxkey-starter-otp") + implementation project(":maxkey-starter:maxkey-starter-sms") + implementation project(":maxkey-starter:maxkey-starter-web") + implementation project(":maxkey-authentications:maxkey-authentication-core") - implementation project(":maxkey-authentications:maxkey-authentication-captcha") - implementation project(":maxkey-authentications:maxkey-authentication-ip2location") - implementation project(":maxkey-authentications:maxkey-authentication-otp") implementation project(":maxkey-authentications:maxkey-authentication-provider") - implementation project(":maxkey-authentications:maxkey-authentication-sms") implementation project(":maxkey-protocols:maxkey-protocol-oauth-2.0") implementation project(":maxkey-protocols:maxkey-protocol-saml-2.0") diff --git a/maxkey-webs/maxkey-web-openapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-webs/maxkey-web-openapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b06336b53..f2d8906a3 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/maxkey-webs/maxkey-web-openapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,16 +1,3 @@ -org.dromara.maxkey.autoconfigure.ApplicationAutoConfiguration -org.dromara.maxkey.autoconfigure.KaptchaAutoConfiguration -org.dromara.maxkey.autoconfigure.MvcAutoConfiguration -org.dromara.maxkey.autoconfigure.JwtAuthnAutoConfiguration -org.dromara.maxkey.autoconfigure.RedisAutoConfiguration -org.dromara.maxkey.autoconfigure.AuthnProviderAutoConfiguration -org.dromara.maxkey.autoconfigure.OneTimePasswordAutoConfiguration -org.dromara.maxkey.autoconfigure.MvcCurrentUserAutoConfiguration -org.dromara.maxkey.autoconfigure.MvcResourceAutoConfiguration -org.dromara.maxkey.autoconfigure.SmsAutoConfiguration -org.dromara.maxkey.autoconfigure.SessionAutoConfiguration -org.dromara.maxkey.autoconfigure.TokenAutoConfiguration -org.dromara.maxkey.autoconfigure.SwaggerAutoConfiguration org.dromara.maxkey.autoconfigure.Oauth20ClientAutoConfiguration org.dromara.maxkey.autoconfigure.MaxKeyOpenApiConfig org.dromara.maxkey.autoconfigure.MaxKeyOpenApiMvcConfig \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 1fc2a658e..1700f70b5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -25,13 +25,16 @@ include ('maxkey-common') include ('maxkey-core') include ('maxkey-persistence') +//maxkey-starter +include ('maxkey-starter:maxkey-starter-captcha') +include ('maxkey-starter:maxkey-starter-ip2location') +include ('maxkey-starter:maxkey-starter-otp') +include ('maxkey-starter:maxkey-starter-sms') +include ('maxkey-starter:maxkey-starter-web') + //authentications -include ('maxkey-authentications:maxkey-authentication-captcha') include ('maxkey-authentications:maxkey-authentication-core') -include ('maxkey-authentications:maxkey-authentication-ip2location') -include ('maxkey-authentications:maxkey-authentication-otp') include ('maxkey-authentications:maxkey-authentication-provider') -include ('maxkey-authentications:maxkey-authentication-sms') include ('maxkey-authentications:maxkey-authentication-social') //rest apis