Merge branch 'master' into dev

Author: springboot-plus

src/main/java/io/geekidea/springbootplus/shiro/config/ShiroConfig.java

@@ -46,7 +46,6 @@
 import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.apache.shiro.web.mgt.DefaultWebSessionStorageEvaluator;
-import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
@@ -253,9 +252,9 @@ private Map<String, String> addDefaultFilterDefinition(Map<String, String> filte
             } else {
                 String[] strings = value.split(",");
                 List<String> list = new ArrayList<>();
-                list.addAll(Arrays.asList(strings));
                 // 添加默认filter过滤
                 list.add(REQUEST_PATH_FILTER_NAME);
+                list.addAll(Arrays.asList(strings));
                 definition = String.join(",", list);
             }
             map.put(key, definition);
@@ -300,18 +299,6 @@ public LifecycleBeanPostProcessor lifecycleBeanPostProcessor() {
         return new LifecycleBeanPostProcessor();
     }
 
-    /**
-     * depends-on lifecycleBeanPostProcessor
-     *
-     * @return
-     */
-    @Bean
-    public DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator() {
-        DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator();
-        defaultAdvisorAutoProxyCreator.setProxyTargetClass(true);
-        return defaultAdvisorAutoProxyCreator;
-    }
-
     @Bean
     public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor(SecurityManager securityManager) {
         AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor = new AuthorizationAttributeSourceAdvisor();

src/main/java/io/geekidea/springbootplus/shiro/jwt/JwtRealm.java

@@ -59,7 +59,6 @@ public boolean supports(AuthenticationToken token) {
      */
     @Override
     protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) {
-        // TODO 被调用两次
         log.debug("doGetAuthorizationInfo principalCollection...");
         // 设置角色/权限信息
         JwtToken jwtToken = (JwtToken) principalCollection.getPrimaryPrincipal();