整理

src/main/java/com/stylefeng/guns/core/intercept/SessionInterceptor.java

@@ -7,6 +7,7 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.annotation.Pointcut;
 
 
 import com.stylefeng.guns.core.util.HttpSessionHolder;
 import com.stylefeng.guns.core.util.HttpSessionHolder;
+import org.springframework.stereotype.Component;
 
 
 /**
 /**
  * 静态调用session的拦截器
  * 静态调用session的拦截器
@@ -15,6 +16,7 @@ import com.stylefeng.guns.core.util.HttpSessionHolder;
  * @date 2016年11月13日 下午10:15:42
  * @date 2016年11月13日 下午10:15:42
  */
  */
 @Aspect
 @Aspect
+@Component
 public class SessionInterceptor extends BaseController {
 public class SessionInterceptor extends BaseController {
 
 
     @Pointcut("execution(* com.stylefeng.guns.*..controller.*.*(..))")
     @Pointcut("execution(* com.stylefeng.guns.*..controller.*.*(..))")

src/main/java/project/config/root/RootSpringConfig.java

 package project.config.root;
 package project.config.root;
 
 
 import project.config.datasource.DataSourceConfig;
 import project.config.datasource.DataSourceConfig;
-import project.config.druid.DruidConfig;
+import project.config.web.monitor.DruidMonitorConfig;
 import project.config.shiro.ShiroConfig;
 import project.config.shiro.ShiroConfig;
 import org.springframework.context.annotation.*;
 import org.springframework.context.annotation.*;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.ComponentScan.Filter;
@@ -18,7 +18,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
         @Filter(type = FilterType.ANNOTATION, value = EnableWebMvc.class)// 这个是为了不让扫描到springmvc的控制器
         @Filter(type = FilterType.ANNOTATION, value = EnableWebMvc.class)// 这个是为了不让扫描到springmvc的控制器
 })
 })
 @EnableAspectJAutoProxy
 @EnableAspectJAutoProxy
-@Import(value = {DataSourceConfig.class, ShiroConfig.class, DruidConfig.class})
+@Import(value = {DataSourceConfig.class, ShiroConfig.class, DruidMonitorConfig.class})
 public class RootSpringConfig {
 public class RootSpringConfig {
 
 
 }
 }

src/main/java/project/config/web/ControllerAopConfig.java

-package project.config.web;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
-
-import com.stylefeng.guns.core.intercept.SessionInterceptor;
-
-/**
- * 保留类，如果控制器需要些aop在这里写
- *
- * @author fengshuonan
- * @date 2016年11月12日 下午4:48:10
- */
-@Configuration
-@EnableAspectJAutoProxy
-public class ControllerAopConfig {
-
-    /**
-     * session的拦截器，用在非controller层调用session
-     */
-    @Bean
-    public SessionInterceptor counter() {
-        return new SessionInterceptor();
-    }
-
-}
+//package project.config.web;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.EnableAspectJAutoProxy;
+//
+//import com.stylefeng.guns.core.intercept.SessionInterceptor;
+//
+///**
+// * 保留类，如果控制器需要些aop在这里写
+// *
+// * @author fengshuonan
+// * @date 2016年11月12日 下午4:48:10
+// */
+//@Configuration
+//@EnableAspectJAutoProxy
+//public class ControllerAopConfig {
+//
+//    /**
+//     * session的拦截器，用在非controller层调用session
+//     */
+//    @Bean
+//    public SessionInterceptor sessionInterceptor() {
+//        return new SessionInterceptor();
+//    }
+//
+//}

src/main/java/project/config/web/WebMvcConfig.java → src/main/java/project/config/web/SpringMvcConfig.java

@@ -21,6 +21,7 @@ import org.springframework.web.servlet.config.annotation.DefaultServletHandlerCo
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import project.config.web.beetl.BeetlConfiguration;
 
 
 import java.nio.charset.Charset;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -36,8 +37,8 @@ import java.util.List;
 @EnableWebMvc
 @EnableWebMvc
 @ComponentScan(basePackages = {"com.stylefeng.guns.**.controller", "com.stylefeng.guns.common.controller"})
 @ComponentScan(basePackages = {"com.stylefeng.guns.**.controller", "com.stylefeng.guns.common.controller"})
 @EnableAspectJAutoProxy
 @EnableAspectJAutoProxy
-@Import(value = {ControllerAopConfig.class})
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
+//@Import(value = {ControllerAopConfig.class})
+public class SpringMvcConfig extends WebMvcConfigurerAdapter {
 
 
     // beetl的配置
     // beetl的配置
     @Bean(initMethod = "init")
     @Bean(initMethod = "init")

src/main/java/project/config/web/WebAppInitializer.java

@@ -28,7 +28,7 @@ public class WebAppInitializer extends AbstractAnnotationConfigDispatcherServlet
     // springmvc 上下文
     // springmvc 上下文
     @Override
     @Override
     protected Class<?>[] getServletConfigClasses() {
     protected Class<?>[] getServletConfigClasses() {
-        return new Class[]{WebMvcConfig.class};
+        return new Class[]{SpringMvcConfig.class};
     }
     }
 
 
     // 将DispatcherServlet映射到"/"
     // 将DispatcherServlet映射到"/"

src/main/java/project/config/web/BeetlConfiguration.java → src/main/java/project/config/web/beetl/BeetlConfiguration.java

-package project.config.web;
+package project.config.web.beetl;
 
 
 import org.beetl.ext.spring.BeetlGroupUtilConfiguration;
 import org.beetl.ext.spring.BeetlGroupUtilConfiguration;
 
 

src/main/java/project/config/druid/DruidConfig.java → src/main/java/project/config/web/monitor/DruidMonitorConfig.java

-package project.config.druid;
+package project.config.web.monitor;
 
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.support.spring.stat.BeanTypeAutoProxyCreator;
 import com.alibaba.druid.support.spring.stat.BeanTypeAutoProxyCreator;
@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
  * Created by fsn on 2017/3/9.
  * Created by fsn on 2017/3/9.
  */
  */
 @Configuration
 @Configuration
-public class DruidConfig {
+public class DruidMonitorConfig {
 
 
     @Bean
     @Bean
     public DruidStatInterceptor druidStatInterceptor(){
     public DruidStatInterceptor druidStatInterceptor(){