luobo 3 éve
szülő
commit
70b2309ff1

+ 18 - 0
smart-framework/src/main/java/com/huijy/framework/config/ResourcesConfig.java

@@ -1,11 +1,14 @@
 package com.huijy.framework.config;
 
+import com.huijy.framework.interceptor.MemberAuthorizationInterceptor;
+import com.huijy.framework.resolver.LoginMemberHandlerMethodArgumentResolver;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -13,6 +16,8 @@ import com.huijy.common.config.RuoYiConfig;
 import com.huijy.common.constant.Constants;
 import com.huijy.framework.interceptor.RepeatSubmitInterceptor;
 
+import java.util.List;
+
 /**
  * 通用配置
  *
@@ -24,6 +29,11 @@ public class ResourcesConfig implements WebMvcConfigurer
     @Autowired
     private RepeatSubmitInterceptor repeatSubmitInterceptor;
 
+    @Autowired
+    private MemberAuthorizationInterceptor memberAuthorizationInterceptor;
+    @Autowired
+    private LoginMemberHandlerMethodArgumentResolver loginMemberHandlerMethodArgumentResolver;
+
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry)
     {
@@ -41,8 +51,16 @@ public class ResourcesConfig implements WebMvcConfigurer
     public void addInterceptors(InterceptorRegistry registry)
     {
         registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**");
+        registry.addInterceptor(memberAuthorizationInterceptor).addPathPatterns("/api/**");
     }
 
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+        argumentResolvers.add(loginMemberHandlerMethodArgumentResolver);
+    }
+
+
     /**
      * 跨域配置
      */

+ 0 - 47
smart-framework/src/main/java/com/huijy/framework/config/WebMvcConfig.java

@@ -1,47 +0,0 @@
-/**
- * Copyright (c) 2016-2019 人人开源 All rights reserved.
- *
- * https://www.renren.io
- *
- * 版权所有,侵权必究!
- */
-
-package com.huijy.framework.config;
-
-import com.huijy.framework.interceptor.MemberAuthorizationInterceptor;
-
-import com.huijy.framework.resolver.LoginMemberHandlerMethodArgumentResolver;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.util.List;
-
-/**
- * MVC配置
- *
- * @author Mark sunlightcs@gmail.com
- */
-@Configuration
-public class WebMvcConfig implements WebMvcConfigurer {
-    @Autowired
-    private MemberAuthorizationInterceptor memberAuthorizationInterceptor;
-    @Autowired
-    private LoginMemberHandlerMethodArgumentResolver loginMemberHandlerMethodArgumentResolver;
-
-
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(memberAuthorizationInterceptor).addPathPatterns("/api/**");
-
-    }
-
-    @Override
-    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-        argumentResolvers.add(loginMemberHandlerMethodArgumentResolver);
-    }
-}