Skip to content

Commit 9aecd3f

Browse files
hengboyhengboy
authored
Merge pull request #28 from hengboy/2.3.x
Move "api-boot-plugin-oauth"、"api-boot-plugin-security" to "api-boot"
2 parents 4b43e89 + 9a055e0 commit 9aecd3f

File tree

40 files changed

+127
-210
lines changed

40 files changed

+127
-210
lines changed

‎api-boot-project/api-boot-autoconfigure/pom.xml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,6 @@
9898
<optional>true</optional>
9999
</dependency>
100100

101-
<!--ApiBoot Security Plugin-->
102-
<dependency>
103-
<groupId>${project.groupId}</groupId>
104-
<artifactId>api-boot-plugin-security</artifactId>
105-
<optional>true</optional>
106-
</dependency>
107-
108-
<!--ApiBoot Oauth Plugin-->
109-
<dependency>
110-
<groupId>${project.groupId}</groupId>
111-
<artifactId>api-boot-plugin-oauth</artifactId>
112-
<optional>true</optional>
113-
</dependency>
114-
115101
<!--ApiBoot Quartz Plugin-->
116102
<dependency>
117103
<groupId>org.springframework.boot</groupId>

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationMemoryServerAutoConfiguration.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616

1717
package org.minbox.framework.api.boot.autoconfigure.oauth;
1818

19-
import org.minbox.framework.api.boot.plugin.oauth.ApiBootAuthorizationServerConfiguration;
20-
import org.minbox.framework.api.boot.plugin.oauth.grant.ApiBootOauthTokenGranter;
19+
import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration;
20+
import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter;
21+
import org.slf4j.Logger;
22+
import org.slf4j.LoggerFactory;
2123
import org.springframework.beans.factory.ObjectProvider;
2224
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2325
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -46,8 +48,14 @@
4648
@EnableAuthorizationServer
4749
@ConditionalOnProperty(prefix = API_BOOT_OAUTH_PREFIX, name = "away", havingValue = "memory", matchIfMissing = true)
4850
public class ApiBootAuthorizationMemoryServerAutoConfiguration extends ApiBootAuthorizationServerAutoConfiguration {
51+
/**
52+
* logger instance
53+
*/
54+
static Logger logger = LoggerFactory.getLogger(ApiBootAuthorizationMemoryServerAutoConfiguration.class);
55+
4956
public ApiBootAuthorizationMemoryServerAutoConfiguration(ObjectProvider<List<ApiBootOauthTokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties) {
5057
super(objectProvider, apiBootOauthProperties);
58+
logger.info("ApiBoot Oauth2 initialize using memory.");
5159
}
5260

5361
/**

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package org.minbox.framework.api.boot.autoconfigure.oauth;
1818

19-
import org.minbox.framework.api.boot.plugin.oauth.ApiBootAuthorizationServerConfiguration;
20-
import org.minbox.framework.api.boot.plugin.oauth.grant.ApiBootOauthTokenGranter;
19+
import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration;
20+
import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter;
2121
import org.springframework.beans.factory.ObjectProvider;
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2323
import org.springframework.context.annotation.Bean;

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerJdbcAutoConfiguration.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616

1717
package org.minbox.framework.api.boot.autoconfigure.oauth;
1818

19-
import org.minbox.framework.api.boot.plugin.oauth.ApiBootAuthorizationServerConfiguration;
20-
import org.minbox.framework.api.boot.plugin.oauth.grant.ApiBootOauthTokenGranter;
19+
import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration;
20+
import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter;
21+
import org.slf4j.Logger;
22+
import org.slf4j.LoggerFactory;
2123
import org.springframework.beans.factory.ObjectProvider;
2224
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2325
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -51,11 +53,16 @@
5153
@ConditionalOnProperty(prefix = API_BOOT_OAUTH_PREFIX, name = "away", havingValue = "jdbc")
5254
@AutoConfigureAfter(DataSourceAutoConfiguration.class)
5355
public class ApiBootAuthorizationServerJdbcAutoConfiguration extends ApiBootAuthorizationServerAutoConfiguration {
56+
/**
57+
* logger instance
58+
*/
59+
static Logger logger = LoggerFactory.getLogger(ApiBootAuthorizationServerJdbcAutoConfiguration.class);
5460
private DataSource dataSource;
5561

5662
public ApiBootAuthorizationServerJdbcAutoConfiguration(ObjectProvider<List<ApiBootOauthTokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties, DataSource dataSource) {
5763
super(objectProvider, apiBootOauthProperties);
5864
this.dataSource = dataSource;
65+
logger.info("ApiBoot Oauth2 initialize using jdbc.");
5966
}
6067

6168
@Override

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerRedisAutoConfiguration.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,26 @@
1717

1818
package org.minbox.framework.api.boot.autoconfigure.oauth;
1919

20-
import org.minbox.framework.api.boot.plugin.oauth.ApiBootAuthorizationServerConfiguration;
21-
import org.minbox.framework.api.boot.plugin.oauth.grant.ApiBootOauthTokenGranter;
20+
import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration;
21+
import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter;
22+
import org.slf4j.Logger;
23+
import org.slf4j.LoggerFactory;
2224
import org.springframework.beans.factory.ObjectProvider;
2325
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2426
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2527
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2628
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2729
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
28-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
2930
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3031
import org.springframework.context.annotation.Bean;
3132
import org.springframework.context.annotation.Configuration;
3233
import org.springframework.data.redis.connection.RedisConnectionFactory;
33-
import org.springframework.data.redis.core.RedisTemplate;
3434
import org.springframework.security.oauth2.config.annotation.builders.InMemoryClientDetailsServiceBuilder;
3535
import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
3636
import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
3737
import org.springframework.security.oauth2.provider.token.TokenStore;
38-
import org.springframework.security.oauth2.provider.token.store.JdbcTokenStore;
3938
import org.springframework.security.oauth2.provider.token.store.redis.RedisTokenStore;
4039

41-
import javax.sql.DataSource;
42-
4340
import java.util.List;
4441

4542
import static org.minbox.framework.api.boot.autoconfigure.oauth.ApiBootOauthProperties.API_BOOT_OAUTH_PREFIX;
@@ -57,6 +54,10 @@
5754
@ConditionalOnProperty(prefix = API_BOOT_OAUTH_PREFIX, name = "away", havingValue = "redis")
5855
@AutoConfigureAfter(RedisAutoConfiguration.class)
5956
public class ApiBootAuthorizationServerRedisAutoConfiguration extends ApiBootAuthorizationServerAutoConfiguration {
57+
/**
58+
* logger instance
59+
*/
60+
static Logger logger = LoggerFactory.getLogger(ApiBootAuthorizationServerRedisAutoConfiguration.class);
6061
/**
6162
* redis connection factory
6263
*/
@@ -72,6 +73,7 @@ public class ApiBootAuthorizationServerRedisAutoConfiguration extends ApiBootAut
7273
public ApiBootAuthorizationServerRedisAutoConfiguration(ObjectProvider<List<ApiBootOauthTokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties, RedisConnectionFactory redisConnectionFactory) {
7374
super(objectProvider, apiBootOauthProperties);
7475
this.redisConnectionFactory = redisConnectionFactory;
76+
logger.info("ApiBoot Oauth2 initialize using redis.");
7577
}
7678

7779
/**

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootResourceServerAutoConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.minbox.framework.api.boot.autoconfigure.oauth;
1818

1919
import org.minbox.framework.api.boot.autoconfigure.security.ApiBootSecurityProperties;
20-
import org.minbox.framework.api.boot.plugin.security.SecurityUser;
20+
import org.minbox.framework.api.boot.secuirty.SecurityUser;
2121
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2222
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2323
import org.springframework.context.annotation.Configuration;

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootSecurityProperties.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
package org.minbox.framework.api.boot.autoconfigure.security;
1818

1919
import lombok.Data;
20-
import org.minbox.framework.api.boot.plugin.security.SecurityUser;
20+
import org.minbox.framework.api.boot.secuirty.SecurityUser;
2121
import org.springframework.boot.context.properties.ConfigurationProperties;
2222
import org.springframework.context.annotation.Configuration;
23-
import org.minbox.framework.api.boot.plugin.security.delegate.ApiBootStoreDelegate;
23+
import org.minbox.framework.api.boot.secuirty.delegate.ApiBootStoreDelegate;
2424

2525
import java.util.ArrayList;
2626
import java.util.List;

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityAutoConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package org.minbox.framework.api.boot.autoconfigure.security;
1818

19-
import org.minbox.framework.api.boot.plugin.security.ApiBootWebSecurityConfiguration;
20-
import org.minbox.framework.api.boot.plugin.security.handler.ApiBootDefaultAccessDeniedHandler;
21-
import org.minbox.framework.api.boot.plugin.security.point.ApiBootDefaultAuthenticationEntryPoint;
19+
import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration;
20+
import org.minbox.framework.api.boot.secuirty.handler.ApiBootDefaultAccessDeniedHandler;
21+
import org.minbox.framework.api.boot.secuirty.point.ApiBootDefaultAuthenticationEntryPoint;
2222
import org.springframework.security.web.AuthenticationEntryPoint;
2323
import org.springframework.security.web.access.AccessDeniedHandler;
2424
import org.springframework.util.ObjectUtils;

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityJdbcAutoConfiguration.java‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616

1717
package org.minbox.framework.api.boot.autoconfigure.security;
1818

19-
import org.minbox.framework.api.boot.plugin.security.ApiBootWebSecurityConfiguration;
20-
import org.minbox.framework.api.boot.plugin.security.delegate.ApiBootDefaultStoreDelegate;
21-
import org.minbox.framework.api.boot.plugin.security.delegate.ApiBootStoreDelegate;
22-
import org.minbox.framework.api.boot.plugin.security.userdetails.ApiBootUserDetailsService;
19+
import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration;
20+
import org.minbox.framework.api.boot.secuirty.delegate.ApiBootDefaultStoreDelegate;
21+
import org.minbox.framework.api.boot.secuirty.delegate.ApiBootStoreDelegate;
22+
import org.minbox.framework.api.boot.secuirty.userdetails.ApiBootUserDetailsService;
23+
import org.slf4j.Logger;
24+
import org.slf4j.LoggerFactory;
2325
import org.springframework.beans.factory.ObjectProvider;
2426
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2527
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -53,9 +55,14 @@
5355
@ConditionalOnProperty(prefix = API_BOOT_SECURITY_PREFIX, name = "away", havingValue = "jdbc")
5456
@AutoConfigureAfter(DataSourceAutoConfiguration.class)
5557
public class ApiBootWebSecurityJdbcAutoConfiguration extends ApiBootWebSecurityAutoConfiguration {
58+
/**
59+
* logger instance
60+
*/
61+
static Logger logger = LoggerFactory.getLogger(ApiBootWebSecurityJdbcAutoConfiguration.class);
5662

5763
public ApiBootWebSecurityJdbcAutoConfiguration(ApiBootSecurityProperties apiBootSecurityProperties, ObjectProvider<AccessDeniedHandler> accessDeniedHandler, ObjectProvider<AuthenticationEntryPoint> authenticationEntryPoint) {
5864
super(apiBootSecurityProperties, accessDeniedHandler.getIfAvailable(), authenticationEntryPoint.getIfAvailable());
65+
logger.info("ApiBoot Security initialize using jdbc.");
5966
}
6067

6168
@Override

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityMemoryAutoConfiguration.java‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616

1717
package org.minbox.framework.api.boot.autoconfigure.security;
1818

19-
import org.minbox.framework.api.boot.plugin.security.ApiBootWebSecurityConfiguration;
20-
import org.minbox.framework.api.boot.plugin.security.SecurityUser;
19+
import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration;
20+
import org.minbox.framework.api.boot.secuirty.SecurityUser;
21+
import org.slf4j.Logger;
22+
import org.slf4j.LoggerFactory;
2123
import org.springframework.beans.factory.ObjectProvider;
2224
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2325
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -50,28 +52,31 @@
5052
@ConditionalOnClass(ApiBootWebSecurityConfiguration.class)
5153
@ConditionalOnProperty(prefix = API_BOOT_SECURITY_PREFIX, name = "away", havingValue = "memory", matchIfMissing = true)
5254
public class ApiBootWebSecurityMemoryAutoConfiguration extends ApiBootWebSecurityAutoConfiguration {
55+
/**
56+
* logger instance
57+
*/
58+
static Logger logger = LoggerFactory.getLogger(ApiBootWebSecurityMemoryAutoConfiguration.class);
59+
5360
public ApiBootWebSecurityMemoryAutoConfiguration(ApiBootSecurityProperties apiBootSecurityProperties, ObjectProvider<AccessDeniedHandler> accessDeniedHandler, ObjectProvider<AuthenticationEntryPoint> authenticationEntryPoint) {
5461
super(apiBootSecurityProperties, accessDeniedHandler.getIfAvailable(), authenticationEntryPoint.getIfAvailable());
62+
logger.info("ApiBoot Security initialize using memory.");
5563
}
5664

5765
@Override
5866
@Bean
5967
protected UserDetailsService userDetailsService() {
60-
InMemoryUserDetailsManager memoryUserDetails = new InMemoryUserDetailsManager();
68+
InMemoryUserDetailsManager memoryUserDetailsManager = new InMemoryUserDetailsManager();
6169
List<SecurityUser> users = apiBootSecurityProperties.getUsers();
62-
if (!ObjectUtils.isEmpty(users)) {
63-
return memoryUserDetails;
64-
}
65-
for (SecurityUser securityUser : users) {
70+
users.forEach(securityUser -> {
6671
String encoderPassword = passwordEncoder().encode(securityUser.getPassword());
6772
UserDetails userDetails =
6873
User.builder()
6974
.username(securityUser.getUsername())
7075
.password(encoderPassword)
7176
.roles(securityUser.getRoles())
7277
.build();
73-
memoryUserDetails.createUser(userDetails);
74-
}
75-
return memoryUserDetails;
78+
memoryUserDetailsManager.createUser(userDetails);
79+
});
80+
return memoryUserDetailsManager;
7681
}
7782
}

0 commit comments

Comments
 (0)