diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcCurrentUserAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcCurrentUserAutoConfiguration.java new file mode 100644 index 000000000..5f5aeb4b0 --- /dev/null +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcCurrentUserAutoConfiguration.java @@ -0,0 +1,30 @@ +package org.dromara.maxkey.autoconfigure; + +import java.util.List; + +import org.dromara.maxkey.authn.web.CurrentUserMethodArgumentResolver; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@EnableWebMvc +@AutoConfiguration +public class MvcCurrentUserAutoConfiguration implements WebMvcConfigurer { + private static final Logger logger = LoggerFactory.getLogger(MvcCurrentUserAutoConfiguration.class); + + @Override + public void addArgumentResolvers(List argumentResolvers) { + argumentResolvers.add(currentUserMethodArgumentResolver()); + logger.debug("add currentUserMethodArgumentResolver"); + } + + @Bean + public CurrentUserMethodArgumentResolver currentUserMethodArgumentResolver() { + return new CurrentUserMethodArgumentResolver(); + } + +} diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/ResourceMvcConfig.java b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcResourceAutoConfiguration.java similarity index 93% rename from maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/ResourceMvcConfig.java rename to maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcResourceAutoConfiguration.java index f74099fe1..cc0945cb9 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/ResourceMvcConfig.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcResourceAutoConfiguration.java @@ -9,8 +9,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @EnableWebMvc @AutoConfiguration -public class ResourceMvcConfig implements WebMvcConfigurer { - private static final Logger logger = LoggerFactory.getLogger(ResourceMvcConfig.class); +public class MvcResourceAutoConfiguration implements WebMvcConfigurer { + private static final Logger logger = LoggerFactory.getLogger(MvcResourceAutoConfiguration.class); @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerConfig.java b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerAutoConfiguration.java similarity index 95% rename from maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerConfig.java rename to maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerAutoConfiguration.java index ab14ab20c..b139c80b7 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerConfig.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerAutoConfiguration.java @@ -17,8 +17,8 @@ import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.info.License; @AutoConfiguration -public class SwaggerConfig { - static final Logger _logger = LoggerFactory.getLogger(SwaggerConfig.class); +public class SwaggerAutoConfiguration { + static final Logger _logger = LoggerFactory.getLogger(SwaggerAutoConfiguration.class); @Value("${maxkey.swagger.title}") String title; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMvcConfig.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMvcConfig.java index 271b72b87..c79cccb09 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMvcConfig.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMvcConfig.java @@ -187,14 +187,4 @@ public class MaxKeyMvcConfig implements WebMvcConfigurer { } - @Override - public void addArgumentResolvers(List argumentResolvers) { - argumentResolvers.add(currentUserMethodArgumentResolver()); - } - - @Bean - public CurrentUserMethodArgumentResolver currentUserMethodArgumentResolver() { - return new CurrentUserMethodArgumentResolver(); - } - } 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 285503981..b4d67de31 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 @@ -10,9 +10,10 @@ org.dromara.maxkey.autoconfigure.SessionAutoConfiguration org.dromara.maxkey.autoconfigure.TokenAutoConfiguration org.dromara.maxkey.autoconfigure.CasAutoConfiguration org.dromara.maxkey.autoconfigure.Oauth20AutoConfiguration -org.dromara.maxkey.autoconfigure.ResourceMvcConfig +org.dromara.maxkey.autoconfigure.MvcCurrentUserAutoConfiguration +org.dromara.maxkey.autoconfigure.MvcResourceAutoConfiguration org.dromara.maxkey.autoconfigure.Saml20AutoConfiguration org.dromara.maxkey.autoconfigure.SocialSignOnAutoConfiguration -org.dromara.maxkey.autoconfigure.SwaggerConfig +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/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java index 129cacf7a..cd8a101d7 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java @@ -17,21 +17,16 @@ package org.dromara.maxkey.autoconfigure; -import java.util.List; - import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.dromara.maxkey.authn.web.CurrentUserMethodArgumentResolver; import org.dromara.maxkey.authn.web.interceptor.PermissionInterceptor; import org.dromara.maxkey.configuration.ApplicationConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.context.annotation.Bean; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import org.springframework.web.method.support.HandlerMethodArgumentResolver; @EnableWebMvc @AutoConfiguration @@ -88,15 +83,5 @@ public class MaxKeyMgtMvcConfig implements WebMvcConfigurer { logger.debug("add Permission Adapter"); } - - @Override - public void addArgumentResolvers(List argumentResolvers) { - argumentResolvers.add(currentUserMethodArgumentResolver()); - } - - @Bean - public CurrentUserMethodArgumentResolver currentUserMethodArgumentResolver() { - return new CurrentUserMethodArgumentResolver(); - } } 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 b5d4d7b8b..ff0dcf684 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 @@ -8,9 +8,10 @@ org.dromara.maxkey.autoconfigure.OneTimePasswordAutoConfiguration org.dromara.maxkey.autoconfigure.SmsAutoConfiguration org.dromara.maxkey.autoconfigure.SessionAutoConfiguration org.dromara.maxkey.autoconfigure.TokenAutoConfiguration -org.dromara.maxkey.autoconfigure.ResourceMvcConfig +org.dromara.maxkey.autoconfigure.MvcCurrentUserAutoConfiguration +org.dromara.maxkey.autoconfigure.MvcResourceAutoConfiguration org.dromara.maxkey.autoconfigure.SynchronizerAutoConfiguration -org.dromara.maxkey.autoconfigure.SwaggerConfig +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/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiMvcConfig.java b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiMvcConfig.java index c61bb9c3d..ddaa42c87 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiMvcConfig.java +++ b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiMvcConfig.java @@ -17,10 +17,7 @@ package org.dromara.maxkey.autoconfigure; -import java.util.List; - import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; -import org.dromara.maxkey.authn.web.CurrentUserMethodArgumentResolver; import org.dromara.maxkey.authn.web.interceptor.PermissionInterceptor; import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.web.interceptor.RestApiPermissionAdapter; @@ -28,11 +25,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.context.annotation.Bean; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import org.springframework.web.method.support.HandlerMethodArgumentResolver; @EnableWebMvc @AutoConfiguration @@ -105,15 +100,5 @@ public class MaxKeyOpenApiMvcConfig implements WebMvcConfigurer { logger.debug("add Rest Api Permission Adapter"); } - - @Override - public void addArgumentResolvers(List argumentResolvers) { - argumentResolvers.add(currentUserMethodArgumentResolver()); - } - - @Bean - public CurrentUserMethodArgumentResolver currentUserMethodArgumentResolver() { - return new CurrentUserMethodArgumentResolver(); - } } 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 99366cedd..b06336b53 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 @@ -5,11 +5,12 @@ org.dromara.maxkey.autoconfigure.JwtAuthnAutoConfiguration org.dromara.maxkey.autoconfigure.RedisAutoConfiguration org.dromara.maxkey.autoconfigure.AuthnProviderAutoConfiguration org.dromara.maxkey.autoconfigure.OneTimePasswordAutoConfiguration -org.dromara.maxkey.autoconfigure.ResourceMvcConfig +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.SwaggerConfig +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