更新自动配置

guns-vip-base/src/main/java/cn/stylefeng/guns/base/config/GunsConfig.java

-package cn.stylefeng.guns.base.config;
-
-import cn.stylefeng.guns.base.core.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.base.core.log.LogObjectHolder;
-import cn.stylefeng.guns.base.core.log.aop.LogAop;
-import cn.stylefeng.guns.base.core.shiro.aop.PermissionAop;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
-import org.springframework.context.annotation.Scope;
-import org.springframework.core.annotation.Order;
-import org.springframework.web.context.WebApplicationContext;
-
-/**
- * 系统默认的配置
- *
- * @author fengshuonan
- * @Date 2019/5/10 22:51
- */
-@Configuration
-public class GunsConfig {
-
-    /**
-     * 快捷查询方法
-     *
-     * @author fengshuonan
-     * @Date 2019/5/10 22:52
-     */
-    @Bean
-    @DependsOn("springContextHolder")
-    public ConstantFactory constantFactory() {
-        return new ConstantFactory();
-    }
-
-    /**
-     * Guns自带的日志切面
-     *
-     * @author fengshuonan
-     * @Date 2019/5/10 22:53
-     */
-    @Bean
-    public LogAop logAop() {
-        return new LogAop();
-    }
-
-    /**
-     * Guns自带的日志切面
-     *
-     * @author fengshuonan
-     * @Date 2019/5/10 22:53
-     */
-    @Bean
-    @Scope(scopeName = WebApplicationContext.SCOPE_SESSION)
-    public LogObjectHolder logObjectHolder() {
-        return new LogObjectHolder();
-    }
-
-    /**
-     * 权限校验aop
-     *
-     * @author fengshuonan
-     * @Date 2019/5/10 22:56
-     */
-    @Bean
-    @Order(200)
-    public PermissionAop permissionAop() {
-        return new PermissionAop();
-    }
-
-}

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/constant/factory/ConstantFactory.java

@@ -28,16 +28,20 @@ import cn.stylefeng.roses.core.util.SpringContextHolder;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * 常量的生产工厂
+ * 快捷查询方法
  *
  * @author fengshuonan
  * @date 2017年2月13日 下午10:55:21
  */
+@Component
+@DependsOn("springContextHolder")
 public class ConstantFactory implements IConstantFactory {
 
     private RoleMapper roleMapper = SpringContextHolder.getBean(RoleMapper.class);

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/log/LogObjectHolder.java

@@ -16,6 +16,9 @@
 package cn.stylefeng.guns.base.core.log;
 
 import cn.stylefeng.roses.core.util.SpringContextHolder;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.WebApplicationContext;
 
 import java.io.Serializable;
 
@@ -25,6 +28,8 @@ import java.io.Serializable;
  * @author fengshuonan
  * @date 2017-03-31 11:19
  */
+@Component
+@Scope(scopeName = WebApplicationContext.SCOPE_SESSION)
 public class LogObjectHolder implements Serializable {
 
     private Object object = null;

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/log/aop/LogAop.java

@@ -32,6 +32,7 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
 import java.util.Map;
@@ -43,6 +44,7 @@ import java.util.Map;
  * @date 2016年12月6日 下午8:48:30
  */
 @Aspect
+@Component
 public class LogAop {
 
     private Logger log = LoggerFactory.getLogger(this.getClass());

guns-vip-base/src/main/java/cn/stylefeng/guns/base/core/shiro/aop/PermissionAop.java

@@ -23,6 +23,8 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
 
 import javax.naming.NoPermissionException;
 import java.lang.reflect.Method;
@@ -34,6 +36,8 @@ import java.lang.reflect.Method;
  * @date 2017-07-13 21:05
  */
 @Aspect
+@Component
+@Order(200)
 public class PermissionAop {
 
     @Autowired