diff --git a/api-boot-project/api-boot-autoconfigure/pom.xml b/api-boot-project/api-boot-autoconfigure/pom.xml index f60ff140..62582e6c 100644 --- a/api-boot-project/api-boot-autoconfigure/pom.xml +++ b/api-boot-project/api-boot-autoconfigure/pom.xml @@ -98,20 +98,6 @@ true - - - ${project.groupId} - api-boot-plugin-security - true - - - - - ${project.groupId} - api-boot-plugin-oauth - true - - org.springframework.boot diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationMemoryServerAutoConfiguration.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationMemoryServerAutoConfiguration.java index 077a6b9a..e27c4078 100644 --- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationMemoryServerAutoConfiguration.java +++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationMemoryServerAutoConfiguration.java @@ -16,8 +16,10 @@ package org.minbox.framework.api.boot.autoconfigure.oauth; -import org.minbox.framework.api.boot.plugin.oauth.ApiBootAuthorizationServerConfiguration; -import org.minbox.framework.api.boot.plugin.oauth.grant.ApiBootOauthTokenGranter; +import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration; +import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -46,8 +48,14 @@ @EnableAuthorizationServer @ConditionalOnProperty(prefix = API_BOOT_OAUTH_PREFIX, name = "away", havingValue = "memory", matchIfMissing = true) public class ApiBootAuthorizationMemoryServerAutoConfiguration extends ApiBootAuthorizationServerAutoConfiguration { + /** + * logger instance + */ + static Logger logger = LoggerFactory.getLogger(ApiBootAuthorizationMemoryServerAutoConfiguration.class); + public ApiBootAuthorizationMemoryServerAutoConfiguration(ObjectProvider> objectProvider, ApiBootOauthProperties apiBootOauthProperties) { super(objectProvider, apiBootOauthProperties); + logger.info("ApiBoot Oauth2 initialize using memory."); } /** diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerAutoConfiguration.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerAutoConfiguration.java index 110a88aa..07c7c1e3 100644 --- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerAutoConfiguration.java +++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerAutoConfiguration.java @@ -16,8 +16,8 @@ package org.minbox.framework.api.boot.autoconfigure.oauth; -import org.minbox.framework.api.boot.plugin.oauth.ApiBootAuthorizationServerConfiguration; -import org.minbox.framework.api.boot.plugin.oauth.grant.ApiBootOauthTokenGranter; +import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration; +import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerJdbcAutoConfiguration.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerJdbcAutoConfiguration.java index 81f181a7..a6c2cc3b 100644 --- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerJdbcAutoConfiguration.java +++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerJdbcAutoConfiguration.java @@ -16,8 +16,10 @@ package org.minbox.framework.api.boot.autoconfigure.oauth; -import org.minbox.framework.api.boot.plugin.oauth.ApiBootAuthorizationServerConfiguration; -import org.minbox.framework.api.boot.plugin.oauth.grant.ApiBootOauthTokenGranter; +import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration; +import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -51,11 +53,16 @@ @ConditionalOnProperty(prefix = API_BOOT_OAUTH_PREFIX, name = "away", havingValue = "jdbc") @AutoConfigureAfter(DataSourceAutoConfiguration.class) public class ApiBootAuthorizationServerJdbcAutoConfiguration extends ApiBootAuthorizationServerAutoConfiguration { + /** + * logger instance + */ + static Logger logger = LoggerFactory.getLogger(ApiBootAuthorizationServerJdbcAutoConfiguration.class); private DataSource dataSource; public ApiBootAuthorizationServerJdbcAutoConfiguration(ObjectProvider> objectProvider, ApiBootOauthProperties apiBootOauthProperties, DataSource dataSource) { super(objectProvider, apiBootOauthProperties); this.dataSource = dataSource; + logger.info("ApiBoot Oauth2 initialize using jdbc."); } @Override diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerRedisAutoConfiguration.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerRedisAutoConfiguration.java index f7bfb5a5..09bd8e2e 100644 --- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerRedisAutoConfiguration.java +++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerRedisAutoConfiguration.java @@ -17,29 +17,26 @@ package org.minbox.framework.api.boot.autoconfigure.oauth; -import org.minbox.framework.api.boot.plugin.oauth.ApiBootAuthorizationServerConfiguration; -import org.minbox.framework.api.boot.plugin.oauth.grant.ApiBootOauthTokenGranter; +import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration; +import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.oauth2.config.annotation.builders.InMemoryClientDetailsServiceBuilder; import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; import org.springframework.security.oauth2.provider.token.TokenStore; -import org.springframework.security.oauth2.provider.token.store.JdbcTokenStore; import org.springframework.security.oauth2.provider.token.store.redis.RedisTokenStore; -import javax.sql.DataSource; - import java.util.List; import static org.minbox.framework.api.boot.autoconfigure.oauth.ApiBootOauthProperties.API_BOOT_OAUTH_PREFIX; @@ -57,6 +54,10 @@ @ConditionalOnProperty(prefix = API_BOOT_OAUTH_PREFIX, name = "away", havingValue = "redis") @AutoConfigureAfter(RedisAutoConfiguration.class) public class ApiBootAuthorizationServerRedisAutoConfiguration extends ApiBootAuthorizationServerAutoConfiguration { + /** + * logger instance + */ + static Logger logger = LoggerFactory.getLogger(ApiBootAuthorizationServerRedisAutoConfiguration.class); /** * redis connection factory */ @@ -72,6 +73,7 @@ public class ApiBootAuthorizationServerRedisAutoConfiguration extends ApiBootAut public ApiBootAuthorizationServerRedisAutoConfiguration(ObjectProvider> objectProvider, ApiBootOauthProperties apiBootOauthProperties, RedisConnectionFactory redisConnectionFactory) { super(objectProvider, apiBootOauthProperties); this.redisConnectionFactory = redisConnectionFactory; + logger.info("ApiBoot Oauth2 initialize using redis."); } /** diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootResourceServerAutoConfiguration.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootResourceServerAutoConfiguration.java index f33c1cc6..1f914145 100644 --- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootResourceServerAutoConfiguration.java +++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootResourceServerAutoConfiguration.java @@ -17,7 +17,7 @@ package org.minbox.framework.api.boot.autoconfigure.oauth; import org.minbox.framework.api.boot.autoconfigure.security.ApiBootSecurityProperties; -import org.minbox.framework.api.boot.plugin.security.SecurityUser; +import org.minbox.framework.api.boot.secuirty.SecurityUser; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootSecurityProperties.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootSecurityProperties.java index 61566ab3..a40181cb 100644 --- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootSecurityProperties.java +++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootSecurityProperties.java @@ -17,10 +17,10 @@ package org.minbox.framework.api.boot.autoconfigure.security; import lombok.Data; -import org.minbox.framework.api.boot.plugin.security.SecurityUser; +import org.minbox.framework.api.boot.secuirty.SecurityUser; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; -import org.minbox.framework.api.boot.plugin.security.delegate.ApiBootStoreDelegate; +import org.minbox.framework.api.boot.secuirty.delegate.ApiBootStoreDelegate; import java.util.ArrayList; import java.util.List; diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityAutoConfiguration.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityAutoConfiguration.java index d678fe5b..f1eb19c1 100644 --- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityAutoConfiguration.java +++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityAutoConfiguration.java @@ -16,9 +16,9 @@ package org.minbox.framework.api.boot.autoconfigure.security; -import org.minbox.framework.api.boot.plugin.security.ApiBootWebSecurityConfiguration; -import org.minbox.framework.api.boot.plugin.security.handler.ApiBootDefaultAccessDeniedHandler; -import org.minbox.framework.api.boot.plugin.security.point.ApiBootDefaultAuthenticationEntryPoint; +import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration; +import org.minbox.framework.api.boot.secuirty.handler.ApiBootDefaultAccessDeniedHandler; +import org.minbox.framework.api.boot.secuirty.point.ApiBootDefaultAuthenticationEntryPoint; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.access.AccessDeniedHandler; import org.springframework.util.ObjectUtils; diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityJdbcAutoConfiguration.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityJdbcAutoConfiguration.java index f625894c..fbeea89f 100644 --- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityJdbcAutoConfiguration.java +++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityJdbcAutoConfiguration.java @@ -16,10 +16,12 @@ package org.minbox.framework.api.boot.autoconfigure.security; -import org.minbox.framework.api.boot.plugin.security.ApiBootWebSecurityConfiguration; -import org.minbox.framework.api.boot.plugin.security.delegate.ApiBootDefaultStoreDelegate; -import org.minbox.framework.api.boot.plugin.security.delegate.ApiBootStoreDelegate; -import org.minbox.framework.api.boot.plugin.security.userdetails.ApiBootUserDetailsService; +import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration; +import org.minbox.framework.api.boot.secuirty.delegate.ApiBootDefaultStoreDelegate; +import org.minbox.framework.api.boot.secuirty.delegate.ApiBootStoreDelegate; +import org.minbox.framework.api.boot.secuirty.userdetails.ApiBootUserDetailsService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -53,9 +55,14 @@ @ConditionalOnProperty(prefix = API_BOOT_SECURITY_PREFIX, name = "away", havingValue = "jdbc") @AutoConfigureAfter(DataSourceAutoConfiguration.class) public class ApiBootWebSecurityJdbcAutoConfiguration extends ApiBootWebSecurityAutoConfiguration { + /** + * logger instance + */ + static Logger logger = LoggerFactory.getLogger(ApiBootWebSecurityJdbcAutoConfiguration.class); public ApiBootWebSecurityJdbcAutoConfiguration(ApiBootSecurityProperties apiBootSecurityProperties, ObjectProvider accessDeniedHandler, ObjectProvider authenticationEntryPoint) { super(apiBootSecurityProperties, accessDeniedHandler.getIfAvailable(), authenticationEntryPoint.getIfAvailable()); + logger.info("ApiBoot Security initialize using jdbc."); } @Override diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityMemoryAutoConfiguration.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityMemoryAutoConfiguration.java index c9a6cdf9..cca502dc 100644 --- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityMemoryAutoConfiguration.java +++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityMemoryAutoConfiguration.java @@ -16,8 +16,10 @@ package org.minbox.framework.api.boot.autoconfigure.security; -import org.minbox.framework.api.boot.plugin.security.ApiBootWebSecurityConfiguration; -import org.minbox.framework.api.boot.plugin.security.SecurityUser; +import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration; +import org.minbox.framework.api.boot.secuirty.SecurityUser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -50,19 +52,22 @@ @ConditionalOnClass(ApiBootWebSecurityConfiguration.class) @ConditionalOnProperty(prefix = API_BOOT_SECURITY_PREFIX, name = "away", havingValue = "memory", matchIfMissing = true) public class ApiBootWebSecurityMemoryAutoConfiguration extends ApiBootWebSecurityAutoConfiguration { + /** + * logger instance + */ + static Logger logger = LoggerFactory.getLogger(ApiBootWebSecurityMemoryAutoConfiguration.class); + public ApiBootWebSecurityMemoryAutoConfiguration(ApiBootSecurityProperties apiBootSecurityProperties, ObjectProvider accessDeniedHandler, ObjectProvider authenticationEntryPoint) { super(apiBootSecurityProperties, accessDeniedHandler.getIfAvailable(), authenticationEntryPoint.getIfAvailable()); + logger.info("ApiBoot Security initialize using memory."); } @Override @Bean protected UserDetailsService userDetailsService() { - InMemoryUserDetailsManager memoryUserDetails = new InMemoryUserDetailsManager(); + InMemoryUserDetailsManager memoryUserDetailsManager = new InMemoryUserDetailsManager(); List users = apiBootSecurityProperties.getUsers(); - if (!ObjectUtils.isEmpty(users)) { - return memoryUserDetails; - } - for (SecurityUser securityUser : users) { + users.forEach(securityUser -> { String encoderPassword = passwordEncoder().encode(securityUser.getPassword()); UserDetails userDetails = User.builder() @@ -70,8 +75,8 @@ protected UserDetailsService userDetailsService() { .password(encoderPassword) .roles(securityUser.getRoles()) .build(); - memoryUserDetails.createUser(userDetails); - } - return memoryUserDetails; + memoryUserDetailsManager.createUser(userDetails); + }); + return memoryUserDetailsManager; } } diff --git a/api-boot-project/api-boot-dependencies/pom.xml b/api-boot-project/api-boot-dependencies/pom.xml index b3545e54..ede8161a 100644 --- a/api-boot-project/api-boot-dependencies/pom.xml +++ b/api-boot-project/api-boot-dependencies/pom.xml @@ -194,16 +194,6 @@ spring-security-jwt ${spring.security.jwt.version} - - org.minbox.framework - api-boot-plugin-security - ${project.version} - - - org.minbox.framework - api-boot-plugin-oauth - ${project.version} - org.minbox.framework api-boot-starter-security-oauth-jwt diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/pom.xml deleted file mode 100644 index 7a25df85..00000000 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - api-boot-plugins - org.minbox.framework - ${revision} - - 4.0.0 - ApiBoot集成SpringSecurity - - ${basedir}/../../.. - - api-boot-plugin-oauth - - - - - org.minbox.framework - api-boot-plugin - - - org.springframework.boot - spring-boot-starter-web - true - - - - org.springframework.security.oauth - spring-security-oauth2 - - - com.fasterxml.jackson.core - jackson-databind - - - diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-security/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-security/pom.xml deleted file mode 100644 index 13d9b2a6..00000000 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-security/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - api-boot-plugins - org.minbox.framework - ${revision} - - 4.0.0 - ApiBoot集成SpringSecurity - - ${basedir}/../../.. - - api-boot-plugin-security - - - - - org.minbox.framework - api-boot-plugin - - - - org.springframework.security.oauth - spring-security-oauth2 - true - - - - org.springframework.boot - spring-boot-starter-web - true - - - - org.springframework.boot - spring-boot-starter-security - true - - - - com.google.guava - guava - true - - - diff --git a/api-boot-project/api-boot-plugins/pom.xml b/api-boot-project/api-boot-plugins/pom.xml index a3dab0e8..05cbce64 100644 --- a/api-boot-project/api-boot-plugins/pom.xml +++ b/api-boot-project/api-boot-plugins/pom.xml @@ -19,8 +19,6 @@ api-boot-plugin - api-boot-plugin-security - api-boot-plugin-oauth api-boot-plugin-resource-load api-boot-plugin-sequence diff --git a/api-boot-project/api-boot-starters/api-boot-starter-security-oauth-jwt/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter-security-oauth-jwt/pom.xml index 371d161f..84344bd8 100644 --- a/api-boot-project/api-boot-starters/api-boot-starter-security-oauth-jwt/pom.xml +++ b/api-boot-project/api-boot-starters/api-boot-starter-security-oauth-jwt/pom.xml @@ -50,15 +50,9 @@ com.google.guava guava - - org.minbox.framework - api-boot-plugin-security - - - - org.minbox.framework - api-boot-plugin-oauth + com.fasterxml.jackson.core + jackson-databind diff --git a/api-boot-project/api-boot/pom.xml b/api-boot-project/api-boot/pom.xml index faa81b50..5c66760f 100644 --- a/api-boot-project/api-boot/pom.xml +++ b/api-boot-project/api-boot/pom.xml @@ -43,6 +43,11 @@ spring-context-support true + + org.springframework.security.oauth + spring-security-oauth2 + true + @@ -65,6 +70,16 @@ spring-boot-starter-web true + + org.springframework.boot + spring-boot-starter-security + true + + + com.alibaba.boot + nacos-config-spring-boot-starter + true + @@ -124,15 +139,14 @@ quartz true - - com.alibaba.boot - nacos-config-spring-boot-starter - true - com.google.guava guava + + com.fasterxml.jackson.core + jackson-databind + diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/ApiBootAuthorizationServerConfiguration.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/ApiBootAuthorizationServerConfiguration.java similarity index 97% rename from api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/ApiBootAuthorizationServerConfiguration.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/ApiBootAuthorizationServerConfiguration.java index d07414cd..8f92ab93 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/ApiBootAuthorizationServerConfiguration.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/ApiBootAuthorizationServerConfiguration.java @@ -1,7 +1,7 @@ -package org.minbox.framework.api.boot.plugin.oauth; +package org.minbox.framework.api.boot.oauth; -import org.minbox.framework.api.boot.plugin.oauth.grant.ApiBootOauthTokenGranter; -import org.minbox.framework.api.boot.plugin.oauth.grant.DefaultApiBootOauthTokenGranter; +import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter; +import org.minbox.framework.api.boot.oauth.grant.DefaultApiBootOauthTokenGranter; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/exception/ApiBootOAuth2Exception.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/exception/ApiBootOAuth2Exception.java similarity index 80% rename from api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/exception/ApiBootOAuth2Exception.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/exception/ApiBootOAuth2Exception.java index 1029eda1..9ffcb2d6 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/exception/ApiBootOAuth2Exception.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/exception/ApiBootOAuth2Exception.java @@ -1,9 +1,9 @@ -package org.minbox.framework.api.boot.plugin.oauth.exception; +package org.minbox.framework.api.boot.oauth.exception; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.Getter; -import org.minbox.framework.api.boot.plugin.oauth.response.AuthorizationDeniedResponse; +import org.minbox.framework.api.boot.oauth.response.AuthorizationDeniedResponse; import org.springframework.security.oauth2.common.exceptions.OAuth2Exception; /** diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/exception/ApiBootOAuth2ExceptionSerializer.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/exception/ApiBootOAuth2ExceptionSerializer.java similarity index 93% rename from api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/exception/ApiBootOAuth2ExceptionSerializer.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/exception/ApiBootOAuth2ExceptionSerializer.java index 7544d0b5..d447f5e1 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/exception/ApiBootOAuth2ExceptionSerializer.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/exception/ApiBootOAuth2ExceptionSerializer.java @@ -1,4 +1,4 @@ -package org.minbox.framework.api.boot.plugin.oauth.exception; +package org.minbox.framework.api.boot.oauth.exception; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/exception/ApiBootTokenException.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/exception/ApiBootTokenException.java similarity index 94% rename from api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/exception/ApiBootTokenException.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/exception/ApiBootTokenException.java index 7d5f6228..f95a382b 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/exception/ApiBootTokenException.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/exception/ApiBootTokenException.java @@ -15,7 +15,7 @@ * */ -package org.minbox.framework.api.boot.plugin.oauth.exception; +package org.minbox.framework.api.boot.oauth.exception; import lombok.Getter; import org.springframework.security.core.AuthenticationException; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/grant/ApiBootOauthTokenGranter.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/grant/ApiBootOauthTokenGranter.java similarity index 90% rename from api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/grant/ApiBootOauthTokenGranter.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/grant/ApiBootOauthTokenGranter.java index 8e15d891..68627bff 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/grant/ApiBootOauthTokenGranter.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/grant/ApiBootOauthTokenGranter.java @@ -15,9 +15,9 @@ * */ -package org.minbox.framework.api.boot.plugin.oauth.grant; +package org.minbox.framework.api.boot.oauth.grant; -import org.minbox.framework.api.boot.plugin.oauth.exception.ApiBootTokenException; +import org.minbox.framework.api.boot.oauth.exception.ApiBootTokenException; import org.springframework.security.core.userdetails.UserDetails; import java.io.Serializable; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/grant/DefaultApiBootOauthTokenGranter.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/grant/DefaultApiBootOauthTokenGranter.java similarity index 98% rename from api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/grant/DefaultApiBootOauthTokenGranter.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/grant/DefaultApiBootOauthTokenGranter.java index 865fb92b..d6336dd1 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/grant/DefaultApiBootOauthTokenGranter.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/grant/DefaultApiBootOauthTokenGranter.java @@ -15,7 +15,7 @@ * */ -package org.minbox.framework.api.boot.plugin.oauth.grant; +package org.minbox.framework.api.boot.oauth.grant; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/response/AuthorizationDeniedResponse.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/response/AuthorizationDeniedResponse.java similarity index 80% rename from api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/response/AuthorizationDeniedResponse.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/response/AuthorizationDeniedResponse.java index ade000e2..25eea0be 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/response/AuthorizationDeniedResponse.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/response/AuthorizationDeniedResponse.java @@ -1,11 +1,9 @@ -package org.minbox.framework.api.boot.plugin.oauth.response; +package org.minbox.framework.api.boot.oauth.response; import com.fasterxml.jackson.core.JsonGenerator; -import org.minbox.framework.api.boot.plugin.oauth.exception.ApiBootOAuth2Exception; +import org.minbox.framework.api.boot.oauth.exception.ApiBootOAuth2Exception; import org.springframework.http.HttpStatus; -import java.io.Serializable; - /** * Interface definition to respond to authorization exception * diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/response/DefaultAuthorizationDeniedResponse.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/response/DefaultAuthorizationDeniedResponse.java similarity index 77% rename from api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/response/DefaultAuthorizationDeniedResponse.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/response/DefaultAuthorizationDeniedResponse.java index 7b7ce71c..a743d48d 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/response/DefaultAuthorizationDeniedResponse.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/response/DefaultAuthorizationDeniedResponse.java @@ -1,7 +1,8 @@ -package org.minbox.framework.api.boot.plugin.oauth.response; +package org.minbox.framework.api.boot.oauth.response; import com.fasterxml.jackson.core.JsonGenerator; -import org.minbox.framework.api.boot.plugin.oauth.exception.ApiBootOAuth2Exception; +import org.minbox.framework.api.boot.oauth.translator.ApiBootWebResponseExceptionTranslator; +import org.minbox.framework.api.boot.oauth.exception.ApiBootOAuth2Exception; import org.springframework.http.HttpStatus; import org.springframework.web.util.HtmlUtils; @@ -10,7 +11,7 @@ * Provide default OAuth2Exception exception response content * * @author 恒宇少年 - * @see org.minbox.framework.api.boot.plugin.oauth.translator.ApiBootWebResponseExceptionTranslator + * @see ApiBootWebResponseExceptionTranslator * @see ApiBootOAuth2Exception */ public class DefaultAuthorizationDeniedResponse implements AuthorizationDeniedResponse { diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/translator/ApiBootWebResponseExceptionTranslator.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/translator/ApiBootWebResponseExceptionTranslator.java similarity index 96% rename from api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/translator/ApiBootWebResponseExceptionTranslator.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/translator/ApiBootWebResponseExceptionTranslator.java index 5ea501af..149c71d4 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/src/main/java/org/minbox/framework/api/boot/plugin/oauth/translator/ApiBootWebResponseExceptionTranslator.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/translator/ApiBootWebResponseExceptionTranslator.java @@ -1,7 +1,7 @@ -package org.minbox.framework.api.boot.plugin.oauth.translator; +package org.minbox.framework.api.boot.oauth.translator; -import org.minbox.framework.api.boot.plugin.oauth.exception.ApiBootOAuth2Exception; -import org.minbox.framework.api.boot.plugin.oauth.response.AuthorizationDeniedResponse; +import org.minbox.framework.api.boot.oauth.response.AuthorizationDeniedResponse; +import org.minbox.framework.api.boot.oauth.exception.ApiBootOAuth2Exception; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/ApiBootWebSecurityConfiguration.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/ApiBootWebSecurityConfiguration.java similarity index 98% rename from api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/ApiBootWebSecurityConfiguration.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/ApiBootWebSecurityConfiguration.java index efffebf3..9aeac850 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/ApiBootWebSecurityConfiguration.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/ApiBootWebSecurityConfiguration.java @@ -1,4 +1,4 @@ -package org.minbox.framework.api.boot.plugin.security; +package org.minbox.framework.api.boot.secuirty; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/SecurityUser.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/SecurityUser.java similarity index 94% rename from api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/SecurityUser.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/SecurityUser.java index ce7e4205..1bac4f38 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/SecurityUser.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/SecurityUser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.minbox.framework.api.boot.plugin.security; +package org.minbox.framework.api.boot.secuirty; import lombok.Data; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/delegate/ApiBootDefaultStoreDelegate.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/delegate/ApiBootDefaultStoreDelegate.java similarity index 96% rename from api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/delegate/ApiBootDefaultStoreDelegate.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/delegate/ApiBootDefaultStoreDelegate.java index 82c5b6e1..9df938ba 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/delegate/ApiBootDefaultStoreDelegate.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/delegate/ApiBootDefaultStoreDelegate.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.minbox.framework.api.boot.plugin.security.delegate; +package org.minbox.framework.api.boot.secuirty.delegate; import com.google.common.base.CaseFormat; import org.minbox.framework.api.boot.common.exception.ApiBootException; -import org.minbox.framework.api.boot.plugin.security.userdetails.ApiBootDefaultUserDetails; +import org.minbox.framework.api.boot.secuirty.userdetails.ApiBootDefaultUserDetails; +import org.minbox.framework.api.boot.secuirty.jdbc.ApiBootDefaultUserEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.userdetails.UserDetails; @@ -45,7 +46,7 @@ public class ApiBootDefaultStoreDelegate implements ApiBootStoreDelegate { * Query {@link UserDetails} SQL by default * * @see ApiBootDefaultUserDetails - * @see org.minbox.framework.api.boot.plugin.security.jdbc.ApiBootDefaultUserEntity + * @see ApiBootDefaultUserEntity */ static String DEFAULT_SELECT_USER_SQL = "SELECT UI_ID, UI_USER_NAME, UI_NICK_NAME, UI_PASSWORD, UI_EMAIL, UI_AGE, UI_ADDRESS, UI_IS_LOCKED, UI_IS_ENABLED, UI_STATUS, UI_CREATE_TIME FROM API_BOOT_USER_INFO WHERE UI_USER_NAME = ?"; /** diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/delegate/ApiBootStoreDelegate.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/delegate/ApiBootStoreDelegate.java similarity index 96% rename from api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/delegate/ApiBootStoreDelegate.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/delegate/ApiBootStoreDelegate.java index a7adfd92..b08e179f 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/delegate/ApiBootStoreDelegate.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/delegate/ApiBootStoreDelegate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.minbox.framework.api.boot.plugin.security.delegate; +package org.minbox.framework.api.boot.secuirty.delegate; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UsernameNotFoundException; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/handler/ApiBootDefaultAccessDeniedHandler.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/handler/ApiBootDefaultAccessDeniedHandler.java similarity index 96% rename from api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/handler/ApiBootDefaultAccessDeniedHandler.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/handler/ApiBootDefaultAccessDeniedHandler.java index a2392bbc..1eff8869 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/handler/ApiBootDefaultAccessDeniedHandler.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/handler/ApiBootDefaultAccessDeniedHandler.java @@ -1,4 +1,4 @@ -package org.minbox.framework.api.boot.plugin.security.handler; +package org.minbox.framework.api.boot.secuirty.handler; import com.alibaba.fastjson.JSON; import org.minbox.framework.api.boot.common.model.ApiBootResult; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/jdbc/ApiBootDefaultUserEntity.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/jdbc/ApiBootDefaultUserEntity.java similarity index 96% rename from api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/jdbc/ApiBootDefaultUserEntity.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/jdbc/ApiBootDefaultUserEntity.java index b1840204..bcf862f6 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/jdbc/ApiBootDefaultUserEntity.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/jdbc/ApiBootDefaultUserEntity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.minbox.framework.api.boot.plugin.security.jdbc; +package org.minbox.framework.api.boot.secuirty.jdbc; import lombok.Data; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/point/ApiBootDefaultAuthenticationEntryPoint.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/point/ApiBootDefaultAuthenticationEntryPoint.java similarity index 96% rename from api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/point/ApiBootDefaultAuthenticationEntryPoint.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/point/ApiBootDefaultAuthenticationEntryPoint.java index 9b99bfeb..596b1937 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/point/ApiBootDefaultAuthenticationEntryPoint.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/point/ApiBootDefaultAuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package org.minbox.framework.api.boot.plugin.security.point; +package org.minbox.framework.api.boot.secuirty.point; import com.alibaba.fastjson.JSON; import org.minbox.framework.api.boot.common.model.ApiBootResult; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/userdetails/ApiBootDefaultUserDetails.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/userdetails/ApiBootDefaultUserDetails.java similarity index 87% rename from api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/userdetails/ApiBootDefaultUserDetails.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/userdetails/ApiBootDefaultUserDetails.java index d35f8dee..40f280cc 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/userdetails/ApiBootDefaultUserDetails.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/userdetails/ApiBootDefaultUserDetails.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.minbox.framework.api.boot.plugin.security.userdetails; +package org.minbox.framework.api.boot.secuirty.userdetails; import lombok.Data; import org.minbox.framework.api.boot.common.enums.YesOrNo; -import org.minbox.framework.api.boot.plugin.security.jdbc.ApiBootDefaultUserEntity; +import org.minbox.framework.api.boot.secuirty.jdbc.ApiBootDefaultUserEntity; +import org.minbox.framework.api.boot.secuirty.delegate.ApiBootDefaultStoreDelegate; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; @@ -29,7 +30,7 @@ * The default {@link UserDetails} implement class * * @author 恒宇少年 - * @see org.minbox.framework.api.boot.plugin.security.delegate.ApiBootDefaultStoreDelegate#loadUserByUsername(String) + * @see ApiBootDefaultStoreDelegate#loadUserByUsername(String) */ @Data public class ApiBootDefaultUserDetails extends ApiBootDefaultUserEntity implements UserDetails { diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/userdetails/ApiBootUserDetailsService.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/userdetails/ApiBootUserDetailsService.java similarity index 94% rename from api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/userdetails/ApiBootUserDetailsService.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/userdetails/ApiBootUserDetailsService.java index ef391142..3abd9394 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/userdetails/ApiBootUserDetailsService.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/secuirty/userdetails/ApiBootUserDetailsService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.minbox.framework.api.boot.plugin.security.userdetails; +package org.minbox.framework.api.boot.secuirty.userdetails; import org.minbox.framework.api.boot.common.event.LoadUserEvent; -import org.minbox.framework.api.boot.plugin.security.delegate.ApiBootStoreDelegate; +import org.minbox.framework.api.boot.secuirty.delegate.ApiBootStoreDelegate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/api-boot-samples/api-boot-sample-security-oauth-jwt/pom.xml b/api-boot-samples/api-boot-sample-security-oauth-jwt/pom.xml index ca0734db..8cb4c765 100644 --- a/api-boot-samples/api-boot-sample-security-oauth-jwt/pom.xml +++ b/api-boot-samples/api-boot-sample-security-oauth-jwt/pom.xml @@ -48,7 +48,7 @@ org.minbox.framework api-boot-dependencies - 2.2.2.RELEASE + ${api-boot.version} pom import @@ -59,7 +59,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.7.RELEASE + 2.3.1.RELEASE diff --git a/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/CustomAuthorizationDeniedResponse.java b/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/CustomAuthorizationDeniedResponse.java index db6f81d1..f373d493 100644 --- a/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/CustomAuthorizationDeniedResponse.java +++ b/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/CustomAuthorizationDeniedResponse.java @@ -1,8 +1,8 @@ package org.minbox.framework.api.boot.sample; import com.fasterxml.jackson.core.JsonGenerator; -import org.minbox.framework.api.boot.plugin.oauth.exception.ApiBootOAuth2Exception; -import org.minbox.framework.api.boot.plugin.oauth.response.AuthorizationDeniedResponse; +import org.minbox.framework.api.boot.oauth.exception.ApiBootOAuth2Exception; +import org.minbox.framework.api.boot.oauth.response.AuthorizationDeniedResponse; import org.springframework.stereotype.Component; /** diff --git a/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/DisableDefaultUserTableStoreDelegate.java b/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/DisableDefaultUserTableStoreDelegate.java index 2c6eec10..bce3823b 100644 --- a/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/DisableDefaultUserTableStoreDelegate.java +++ b/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/DisableDefaultUserTableStoreDelegate.java @@ -1,21 +1,12 @@ package org.minbox.framework.api.boot.sample; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.minbox.framework.api.boot.plugin.security.delegate.ApiBootStoreDelegate; +import org.minbox.framework.api.boot.secuirty.delegate.ApiBootStoreDelegate; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** * 禁用默认的用户表结构 * 使用自定义数据源读取用户信息 diff --git a/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/PhoneCodeOauthTokenGranter.java b/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/PhoneCodeOauthTokenGranter.java index daceaf00..edc3a147 100644 --- a/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/PhoneCodeOauthTokenGranter.java +++ b/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/PhoneCodeOauthTokenGranter.java @@ -17,8 +17,8 @@ package org.minbox.framework.api.boot.sample; -import org.minbox.framework.api.boot.plugin.oauth.exception.ApiBootTokenException; -import org.minbox.framework.api.boot.plugin.oauth.grant.ApiBootOauthTokenGranter; +import org.minbox.framework.api.boot.oauth.exception.ApiBootTokenException; +import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.GrantedAuthority; diff --git a/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/SystemUserMapper.java b/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/SystemUserMapper.java index 944a42b6..2469ab31 100644 --- a/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/SystemUserMapper.java +++ b/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/SystemUserMapper.java @@ -28,7 +28,7 @@ * Gitee：https://gitee.com/hengboy * GitHub：https://github.com/hengboy */ -public interface SystemUserMapper extends EnhanceMapper { +public interface SystemUserMapper extends EnhanceMapper { SystemUser findByUserName(String userName); } diff --git a/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/resources/application-memory.yml b/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/resources/application-memory.yml index 6b239dce..3371f505 100644 --- a/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/resources/application-memory.yml +++ b/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/resources/application-memory.yml @@ -17,7 +17,7 @@ api: # 自定义客户端获取token的有效期 access-token-validity-seconds: 1000 # 自定义客户端获取refresh token的有效期，默认为30天 - refresh-token-validity-seconds: 60 * 60 * 24 + refresh-token-validity-seconds: 86400 # 客户端admin基本配置 - client-id: admin client-secret: 123456