优化token配置

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/AuthorizationAutoConfiguration.java

@@ -1,13 +1,18 @@
 package org.hswebframework.web.authorization.simple;
 
 import org.hswebframework.web.authorization.Authentication;
+import org.hswebframework.web.authorization.AuthenticationManager;
 import org.hswebframework.web.authorization.builder.AuthenticationBuilderFactory;
 import org.hswebframework.web.authorization.builder.DataAccessConfigBuilderFactory;
 import org.hswebframework.web.authorization.simple.builder.DataAccessConfigConvert;
 import org.hswebframework.web.authorization.simple.builder.SimpleAuthenticationBuilderFactory;
 import org.hswebframework.web.authorization.simple.builder.SimpleDataAccessConfigBuilderFactory;
+import org.hswebframework.web.authorization.token.DefaultUserTokenManager;
+import org.hswebframework.web.authorization.token.UserTokenAuthenticationSupplier;
+import org.hswebframework.web.authorization.token.UserTokenManager;
 import org.hswebframework.web.convert.CustomMessageConverter;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -16,8 +21,6 @@ import org.springframework.context.annotation.Configuration;
 import java.util.List;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
 @Configuration
@@ -26,6 +29,19 @@ public class AuthorizationAutoConfiguration {
     @Autowired(required = false)
     private List<DataAccessConfigConvert> dataAccessConfigConverts;
 
+    @Bean
+    @ConditionalOnMissingBean(UserTokenManager.class)
+    @ConfigurationProperties(prefix = "hsweb.authorize")
+    public UserTokenManager userTokenManager() {
+        return new DefaultUserTokenManager();
+    }
+
+    @Bean
+    @ConditionalOnBean(AuthenticationManager.class)
+    public UserTokenAuthenticationSupplier userTokenAuthenticationSupplier(AuthenticationManager authenticationManager) {
+        return new UserTokenAuthenticationSupplier(authenticationManager);
+    }
+
     @Bean
     @ConditionalOnMissingBean(DataAccessConfigBuilderFactory.class)
     @ConfigurationProperties(prefix = "hsweb.authorization.data-access", ignoreInvalidFields = true)

hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/configuration/AuthorizingHandlerAutoConfiguration.java

@@ -43,10 +43,6 @@ public class AuthorizingHandlerAutoConfiguration {
         return new DefaultAuthorizingHandler(dataAccessController);
     }
 
-    @Bean
-    public UserTokenAuthenticationSupplier userTokenAuthenticationSupplier(AuthenticationManager authenticationManager) {
-        return new UserTokenAuthenticationSupplier(authenticationManager);
-    }
 
     @Bean
     @ConditionalOnMissingBean(UserTokenParser.class)
@@ -59,12 +55,6 @@ public class AuthorizingHandlerAutoConfiguration {
         return new SessionIdUserTokenGenerator();
     }
 
-    @Bean
-    @ConditionalOnMissingBean(UserTokenManager.class)
-    @ConfigurationProperties(prefix = "hsweb.authorize")
-    public UserTokenManager userTokenManager() {
-        return new DefaultUserTokenManager();
-    }
 
     @Bean
     public WebMvcConfigurer webUserTokenInterceptorConfigurer(UserTokenManager userTokenManager,

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/UserTokenController.java

@@ -17,7 +17,7 @@ import java.util.List;
 @RequestMapping("${hsweb.web.mappings.user-token:user-token}")
 @AccessLogger("token信息")
 @Authorize(permission = "user-token")
-public class UserTokenController {
+public class UserTokenInfoController {
 
     @Autowired
     private UserTokenManager userTokenManager;