diff --git a/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java b/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java
index 9be3f5e3c0..037b68c01f 100644
--- a/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java
+++ b/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java
@@ -1,22 +1,18 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
- *
+ *
* https://www.renren.io
- *
+ *
* 版权所有,侵权必究!
*/
package com.epmet;
-import com.epmet.resolver.LoginUserHandlerMethodArgumentResolver;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-
-import java.util.List;
+import org.springframework.context.annotation.ComponentScan;
/**
* 网关服务
@@ -27,15 +23,10 @@ import java.util.List;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-public class GatewayApplication extends WebMvcConfigurationSupport {
+@ComponentScan(basePackages={"com.epmet.*"})
+public class GatewayApplication {
- public static void main(String[] args) {
- SpringApplication.run(GatewayApplication.class, args);
- }
- //添加自定义的拦截器
- @Override
- public void addArgumentResolvers(List argumentResolvers){
- super.addArgumentResolvers(argumentResolvers);
- argumentResolvers.add(new LoginUserHandlerMethodArgumentResolver());
- }
+ public static void main(String[] args) {
+ SpringApplication.run(GatewayApplication.class, args);
+ }
}
diff --git a/epmet-gateway/src/main/java/com/epmet/config/WebConfig.java b/epmet-gateway/src/main/java/com/epmet/config/WebConfig.java
index 9808b30063..f083793b7c 100644
--- a/epmet-gateway/src/main/java/com/epmet/config/WebConfig.java
+++ b/epmet-gateway/src/main/java/com/epmet/config/WebConfig.java
@@ -9,27 +9,12 @@
package com.epmet.config;
import com.epmet.resolver.LoginUserHandlerMethodArgumentResolver;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.epmet.commons.tools.security.resolver.UserDetailHandlerMethodArgumentResolver;
-import com.epmet.commons.tools.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.ByteArrayHttpMessageConverter;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.ResourceHttpMessageConverter;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import java.text.SimpleDateFormat;
import java.util.List;
-import java.util.TimeZone;
/**
* MVC配置
@@ -39,11 +24,11 @@ import java.util.TimeZone;
*/
@Configuration
public class WebConfig implements WebMvcConfigurer {
-// @Autowired
-// private LoginUserHandlerMethodArgumentResolver loginUserHandlerMethodArgumentResolver;
+ @Autowired
+ private LoginUserHandlerMethodArgumentResolver loginUserHandlerMethodArgumentResolver;
@Override
public void addArgumentResolvers(List argumentResolvers) {
- argumentResolvers.add(new LoginUserHandlerMethodArgumentResolver());
+ argumentResolvers.add(loginUserHandlerMethodArgumentResolver);
}
}
diff --git a/epmet-gateway/src/main/java/com/epmet/resolver/LoginUserHandlerMethodArgumentResolver.java b/epmet-gateway/src/main/java/com/epmet/resolver/LoginUserHandlerMethodArgumentResolver.java
index 332e01d5d2..10a271303b 100644
--- a/epmet-gateway/src/main/java/com/epmet/resolver/LoginUserHandlerMethodArgumentResolver.java
+++ b/epmet-gateway/src/main/java/com/epmet/resolver/LoginUserHandlerMethodArgumentResolver.java
@@ -31,7 +31,7 @@ import org.springframework.web.method.support.ModelAndViewContainer;
*
* @author Mark sunlightcs@gmail.com
*/
-//@Component
+@Component
public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired