From d2516e693349a8c99217ea2ba3cb32f5fbaf37c9 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Mon, 21 Oct 2024 07:32:44 +0800 Subject: [PATCH] maxkey-authentications\maxkey-authentication-social -> maxkey-starter\maxkey-starter-social --- .../maxkey-starter-social}/build.gradle | 2 +- .../maxkey-starter-social}/src/main/java/META-INF/MANIFEST.MF | 0 .../main/java/me/zhyd/oauth/config/AuthMxkDefaultSource.java | 0 .../main/java/me/zhyd/oauth/request/AuthFeishu2Request.java | 0 .../java/me/zhyd/oauth/request/AuthHuaweiWeLinkRequest.java | 0 .../main/java/me/zhyd/oauth/request/AuthMaxkeyRequest.java | 0 .../oauth/request/AuthWeChatEnterpriseWebRequestCost.java | 0 .../java/me/zhyd/oauth/request/MaxkeyAuthDefaultSource.java | 0 .../java/me/zhyd/oauth/request/WeLinkAuthDefaultSource.java | 0 .../support/socialsignon/AbstractSocialSignOnEndpoint.java | 0 .../authn/support/socialsignon/SocialSignOnEndpoint.java | 0 .../socialsignon/service/JdbcSocialsAssociateService.java | 0 .../socialsignon/service/SocialSignOnProviderService.java | 0 .../support/socialsignon/service/SocialsAssociateService.java | 0 .../authn/support/socialsignon/token/RedisTokenStore.java | 0 .../maxkey/autoconfigure/SocialSignOnAutoConfiguration.java | 3 +-- ...ringframework.boot.autoconfigure.AutoConfiguration.imports | 0 maxkey-webs/maxkey-web-maxkey/build.gradle | 2 +- maxkey-webs/maxkey-web-maxkey/config/build_docker.gradle | 4 ++-- maxkey-webs/maxkey-web-maxkey/config/build_standard.gradle | 4 ++-- maxkey-webs/maxkey-web-maxkey/config/build_tradition.gradle | 4 ++-- settings.gradle | 2 +- 22 files changed, 10 insertions(+), 11 deletions(-) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/build.gradle (89%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/META-INF/MANIFEST.MF (100%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/me/zhyd/oauth/config/AuthMxkDefaultSource.java (100%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/me/zhyd/oauth/request/AuthFeishu2Request.java (100%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/me/zhyd/oauth/request/AuthHuaweiWeLinkRequest.java (100%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/me/zhyd/oauth/request/AuthMaxkeyRequest.java (100%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseWebRequestCost.java (100%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/me/zhyd/oauth/request/MaxkeyAuthDefaultSource.java (100%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/me/zhyd/oauth/request/WeLinkAuthDefaultSource.java (100%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/org/dromara/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java (100%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java (100%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java (100%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java (100%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java (100%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/org/dromara/maxkey/authn/support/socialsignon/token/RedisTokenStore.java (100%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/java/org/dromara/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java (96%) rename {maxkey-authentications/maxkey-authentication-social => maxkey-starter/maxkey-starter-social}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) diff --git a/maxkey-authentications/maxkey-authentication-social/build.gradle b/maxkey-starter/maxkey-starter-social/build.gradle similarity index 89% rename from maxkey-authentications/maxkey-authentication-social/build.gradle rename to maxkey-starter/maxkey-starter-social/build.gradle index ead068ef..0513d731 100644 --- a/maxkey-authentications/maxkey-authentication-social/build.gradle +++ b/maxkey-starter/maxkey-starter-social/build.gradle @@ -1,5 +1,5 @@ -description = "maxkey-authentication-social" +description = "maxkey-starter-social" dependencies { diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/META-INF/MANIFEST.MF b/maxkey-starter/maxkey-starter-social/src/main/java/META-INF/MANIFEST.MF similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/META-INF/MANIFEST.MF rename to maxkey-starter/maxkey-starter-social/src/main/java/META-INF/MANIFEST.MF diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/config/AuthMxkDefaultSource.java b/maxkey-starter/maxkey-starter-social/src/main/java/me/zhyd/oauth/config/AuthMxkDefaultSource.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/config/AuthMxkDefaultSource.java rename to maxkey-starter/maxkey-starter-social/src/main/java/me/zhyd/oauth/config/AuthMxkDefaultSource.java diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthFeishu2Request.java b/maxkey-starter/maxkey-starter-social/src/main/java/me/zhyd/oauth/request/AuthFeishu2Request.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthFeishu2Request.java rename to maxkey-starter/maxkey-starter-social/src/main/java/me/zhyd/oauth/request/AuthFeishu2Request.java diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthHuaweiWeLinkRequest.java b/maxkey-starter/maxkey-starter-social/src/main/java/me/zhyd/oauth/request/AuthHuaweiWeLinkRequest.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthHuaweiWeLinkRequest.java rename to maxkey-starter/maxkey-starter-social/src/main/java/me/zhyd/oauth/request/AuthHuaweiWeLinkRequest.java diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthMaxkeyRequest.java b/maxkey-starter/maxkey-starter-social/src/main/java/me/zhyd/oauth/request/AuthMaxkeyRequest.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthMaxkeyRequest.java rename to maxkey-starter/maxkey-starter-social/src/main/java/me/zhyd/oauth/request/AuthMaxkeyRequest.java diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseWebRequestCost.java b/maxkey-starter/maxkey-starter-social/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseWebRequestCost.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseWebRequestCost.java rename to maxkey-starter/maxkey-starter-social/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseWebRequestCost.java diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/MaxkeyAuthDefaultSource.java b/maxkey-starter/maxkey-starter-social/src/main/java/me/zhyd/oauth/request/MaxkeyAuthDefaultSource.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/MaxkeyAuthDefaultSource.java rename to maxkey-starter/maxkey-starter-social/src/main/java/me/zhyd/oauth/request/MaxkeyAuthDefaultSource.java diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/WeLinkAuthDefaultSource.java b/maxkey-starter/maxkey-starter-social/src/main/java/me/zhyd/oauth/request/WeLinkAuthDefaultSource.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/WeLinkAuthDefaultSource.java rename to maxkey-starter/maxkey-starter-social/src/main/java/me/zhyd/oauth/request/WeLinkAuthDefaultSource.java diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java b/maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java rename to maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java b/maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java rename to maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java b/maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java rename to maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java b/maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java rename to maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java b/maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java rename to maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/token/RedisTokenStore.java b/maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/token/RedisTokenStore.java similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/token/RedisTokenStore.java rename to maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/token/RedisTokenStore.java diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java b/maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java similarity index 96% rename from maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java rename to maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java index 9521286c..e6f62d10 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java +++ b/maxkey-starter/maxkey-starter-social/src/main/java/org/dromara/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java @@ -56,8 +56,7 @@ public class SocialSignOnAutoConfiguration{ } @Bean(name = "socialsAssociateService") - JdbcSocialsAssociateService socialsAssociateService( - JdbcTemplate jdbcTemplate) { + JdbcSocialsAssociateService socialsAssociateService(JdbcTemplate jdbcTemplate) { JdbcSocialsAssociateService socialsAssociateService = new JdbcSocialsAssociateService(jdbcTemplate); _logger.debug("JdbcSocialsAssociateService inited."); return socialsAssociateService; diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/maxkey-starter/maxkey-starter-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from maxkey-authentications/maxkey-authentication-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to maxkey-starter/maxkey-starter-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/maxkey-webs/maxkey-web-maxkey/build.gradle b/maxkey-webs/maxkey-web-maxkey/build.gradle index d5183c1b..428c42ca 100644 --- a/maxkey-webs/maxkey-web-maxkey/build.gradle +++ b/maxkey-webs/maxkey-web-maxkey/build.gradle @@ -43,10 +43,10 @@ dependencies { 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-social") 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-provider") implementation project(":maxkey-protocols:maxkey-protocol-authorize") diff --git a/maxkey-webs/maxkey-web-maxkey/config/build_docker.gradle b/maxkey-webs/maxkey-web-maxkey/config/build_docker.gradle index 43bfa540..7db7defb 100644 --- a/maxkey-webs/maxkey-web-maxkey/config/build_docker.gradle +++ b/maxkey-webs/maxkey-web-maxkey/config/build_docker.gradle @@ -57,11 +57,11 @@ dependencies { 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-social") 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-provider") + implementation project(":maxkey-authentications:maxkey-authentication-provider") implementation project(":maxkey-protocols:maxkey-protocol-authorize") implementation project(":maxkey-protocols:maxkey-protocol-cas") diff --git a/maxkey-webs/maxkey-web-maxkey/config/build_standard.gradle b/maxkey-webs/maxkey-web-maxkey/config/build_standard.gradle index fa94514b..b164d88a 100644 --- a/maxkey-webs/maxkey-web-maxkey/config/build_standard.gradle +++ b/maxkey-webs/maxkey-web-maxkey/config/build_standard.gradle @@ -43,11 +43,11 @@ dependencies { 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-social") 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-provider") + implementation project(":maxkey-authentications:maxkey-authentication-provider") implementation project(":maxkey-protocols:maxkey-protocol-authorize") implementation project(":maxkey-protocols:maxkey-protocol-cas") diff --git a/maxkey-webs/maxkey-web-maxkey/config/build_tradition.gradle b/maxkey-webs/maxkey-web-maxkey/config/build_tradition.gradle index 6cf1951c..a178cba2 100644 --- a/maxkey-webs/maxkey-web-maxkey/config/build_tradition.gradle +++ b/maxkey-webs/maxkey-web-maxkey/config/build_tradition.gradle @@ -12,11 +12,11 @@ dependencies { 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-social") 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-provider") + implementation project(":maxkey-authentications:maxkey-authentication-provider") implementation project(":maxkey-protocols:maxkey-protocol-authorize") implementation project(":maxkey-protocols:maxkey-protocol-cas") diff --git a/settings.gradle b/settings.gradle index 1700f70b..9dd5ecbd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -30,12 +30,12 @@ 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-social') include ('maxkey-starter:maxkey-starter-web') //authentications include ('maxkey-authentications:maxkey-authentication-core') include ('maxkey-authentications:maxkey-authentication-provider') -include ('maxkey-authentications:maxkey-authentication-social') //rest apis include ('maxkey-web-apis:maxkey-web-api-rest')