Merge branch 'dev'

# Conflicts:
#	pom.xml

README.md

@@ -32,6 +32,7 @@
 1、增加monitor traceId监控模块
 2、增加防灾冗余
 3、优化文件结构
+4、增加对controller返回null响应增强
 
 
 1.0.2.RELEASE

monitor-starter/pom.xml

@@ -35,5 +35,9 @@
             <artifactId>dubbo</artifactId>
             <version>2.7.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

monitor-starter/src/main/java/com/secoo/matrix/monitor/config/MonitorAutoConfiguration.java

+package com.secoo.matrix.monitor.config;
+
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MonitorAutoConfiguration   {
+
+
+ }

monitor-starter/src/main/java/com/secoo/matrix/monitor/filter/HttpTraceFilter.java

+package com.secoo.matrix.monitor.filter;
+
+import com.secoo.matrix.monitor.utils.TraceIDUtils;
+
+import javax.servlet.*;
+import java.io.IOException;
+
+/**
+ * @author qianglu
+ */
+public class HttpTraceFilter implements Filter {
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        try {
+            TraceIDUtils.continueTraceID();
+            filterChain.doFilter(servletRequest,servletResponse);
+        } catch (Exception e) {
+        }
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+}

monitor-starter/src/main/java/com/secoo/matrix/monitor/rcp/filter/LoggerFilter.java → monitor-starter/src/main/java/com/secoo/matrix/monitor/filter/LoggerFilter.java

-package com.secoo.matrix.monitor.rcp.filter;
+package com.secoo.matrix.monitor.filter;
 
 import com.secoo.matrix.monitor.constant.MonitorConstant;
 import com.secoo.matrix.monitor.utils.TraceIDUtils;

monitor-starter/src/main/java/com/secoo/matrix/monitor/http/intercept/TraceInterceptor.java → monitor-starter/src/main/java/com/secoo/matrix/monitor/http/TraceInterceptor.java

-package com.secoo.matrix.monitor.http.intercept;
+package com.secoo.matrix.monitor.http;
 
 import com.secoo.matrix.monitor.utils.TraceIDUtils;
 import org.slf4j.Logger;

monitor-starter/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter

-logFilter=com.secoo.matrix.monitor.rcp.filter.LoggerFilter
+#logFilter=com.secoo.matrix.monitor.filter.LoggerFilter

monitor-starter/src/main/resources/META-INF/spring.factories

+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.secoo.matrix.monitor.config.MonitorAutoConfiguration
\ No newline at end of file

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.secoo.mall</groupId>
     <artifactId>matrix</artifactId>
-    <version>1.0.3.RELEASE</version>
+    <version>1.0.3-DEV-SNAPSHOT</version>
     <packaging>pom</packaging>
 
 
@@ -20,9 +20,10 @@
         <module>dubbo-starter</module>
         <module>web-starter</module>
         <module>openfeign-starter</module>
-        <module>monitor-starter</module>
         <module>rocketmq-starter</module>
         <module>config-starter</module>
+        <module>monitor-starter</module>
+        <module>config-starter</module>
     </modules>
 
     <parent>
@@ -58,7 +59,9 @@
         </profile>
         <profile>
             <id>test</id>
-
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
                 <ver_type>-SNAPSHOT</ver_type>
                 <repo_id>secoo-test</repo_id>
@@ -75,9 +78,6 @@
         </profile>
         <profile>
             <id>pro</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <properties>
                 <ver_type>.RELEASE</ver_type>
                 <repo_id>secoo-pro</repo_id>
@@ -99,62 +99,62 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>monitor-starter</artifactId>
-                <version>1.0.3.RELEASE</version>
+                <version>1.0.3-DEV-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>common-core</artifactId>
-                <version>1.0.3.RELEASE</version>
+                <version>1.0.3-DEV-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>config-starter</artifactId>
-                <version>1.0.3.RELEASE</version>
+                <version>1.0.3-DEV-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>common-util</artifactId>
-                <version>1.0.3.RELEASE</version>
+                <version>1.0.3-DEV-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>redis-starter</artifactId>
-                <version>1.0.3.RELEASE</version>
+                <version>1.0.3-DEV-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>mybatis-starter</artifactId>
-                <version>1.0.3.RELEASE</version>
+                <version>1.0.3-DEV-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>mongodb-starter</artifactId>
-                <version>1.0.3.RELEASE</version>
+                <version>1.0.3-DEV-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>elasticsearch-starter</artifactId>
-                <version>1.0.3.RELEASE</version>
+                <version>1.0.3-DEV-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>dubbo-starter</artifactId>
-                <version>1.0.3.RELEASE</version>
+                <version>1.0.3-DEV-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>web-starter</artifactId>
-                <version>1.0.3.RELEASE</version>
+                <version>1.0.3-DEV-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>rocketmq-starter</artifactId>
-                <version>1.0.3.RELEASE</version>
+                <version>1.0.3-DEV-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>openfeign-starter</artifactId>
-                <version>1.0.3.RELEASE</version>
+                <version>1.0.3-DEV-SNAPSHOT</version>
             </dependency>
 
             <dependency>

web-starter/src/main/java/com/secoo/mall/web/advice/ControllerResponseAdvice.java

@@ -36,7 +36,7 @@ public class ControllerResponseAdvice implements ResponseBodyAdvice<Object> {
 
     @ExceptionHandler(ParameterException.class)
     public Object parameterExceptionHandler(ParameterException e) {
-        String msg=getMsg(e);
+        String msg = getMsg(e);
         LoggerUtil.info(msg);
         return ResponseUtil.getFailResponse(e.getCode(), msg);
     }
@@ -54,7 +54,7 @@ public class ControllerResponseAdvice implements ResponseBodyAdvice<Object> {
 
     @Override
     public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
-        return ResponseUtil.getSuccessResponse(o);
+         return ResponseUtil.getSuccessResponse(o);
     }
 
     private String getMsg(BusinessException e) {

web-starter/src/main/java/com/secoo/mall/web/config/MultLangConfig.java

+package com.secoo.mall.web.config;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.secoo.mall.web.resolver.DefaultLocaleResolver;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.ResourceBundleMessageSource;
+import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
+
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+
+/**
+ * 多语言配置
+ */
+@Configuration
+public class MultLangConfig implements WebMvcConfigurer {
+
+    @Bean
+    public ResourceBundleMessageSource messageSource() {
+        ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
+        messageSource.setBasename("i18n/message");
+        return messageSource;
+    }
+
+
+    @Bean(name = "localeResolver")
+    public LocaleResolver localeCookieResolver() {
+        DefaultLocaleResolver localeResolver = new DefaultLocaleResolver();
+        localeResolver.setCookieName("language");
+        //设置默认区域
+        localeResolver.setDefaultLocale(Locale.SIMPLIFIED_CHINESE);
+        localeResolver.setCookieMaxAge(3600);//设置cookie有效期.
+        return localeResolver;
+    }
+
+
+    @Bean
+    public LocaleChangeInterceptor localeChangeInterceptor() {
+        LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
+        // 参数名
+        lci.setParamName("lang");
+        return lci;
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(localeChangeInterceptor());
+    }
+
+
+}
+

web-starter/src/main/java/com/secoo/mall/web/config/WebConfig.java

 package com.secoo.mall.web.config;
 
-import com.secoo.mall.web.resolver.DefaultLocaleResolver;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.ResourceBundleMessageSource;
-import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
 
-import java.util.Locale;
+import java.util.ArrayList;
+import java.util.List;
 
 @Configuration
-public class WebConfig implements WebMvcConfigurer {
+public class WebConfig {
 
+ 
     @Bean
-    public ResourceBundleMessageSource messageSource() {
-        ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
-        messageSource.setBasename("i18n/message");
-        return messageSource;
-    }
-
-
-    @Bean(name = "localeResolver")
-    public LocaleResolver localeCookieResolver() {
-        DefaultLocaleResolver localeResolver = new DefaultLocaleResolver();
-        localeResolver.setCookieName("language");
-        //设置默认区域
-        localeResolver.setDefaultLocale(Locale.SIMPLIFIED_CHINESE);
-        localeResolver.setCookieMaxAge(3600);//设置cookie有效期.
-        return localeResolver;
-    }
-
-
-    @Bean
-    public LocaleChangeInterceptor localeChangeInterceptor() {
-        LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
-        // 参数名
-        lci.setParamName("lang");
-        return lci;
-    }
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(localeChangeInterceptor());
+    public HttpMessageConverters fastJsonHttpMessageConverters() {
+        FastJsonHttpMessageConverter fastJsonHttpMessageConverter = new FastJsonHttpMessageConverter();
+        FastJsonConfig fastJsonConfig = new FastJsonConfig();
+        fastJsonConfig.setSerializerFeatures(SerializerFeature.WriteMapNullValue);
+        List<MediaType> fastMediaTypes = new ArrayList<>();
+        fastMediaTypes.add(MediaType.APPLICATION_JSON_UTF8);
+        fastJsonHttpMessageConverter.setSupportedMediaTypes(fastMediaTypes);
+        fastJsonHttpMessageConverter.setFastJsonConfig(fastJsonConfig);
+        fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        return new HttpMessageConverters((HttpMessageConverter<?>) fastJsonHttpMessageConverter);
     }
 
 }
-

web-starter/src/main/java/com/secoo/mall/web/resolver/DefaultLocaleResolver.java

@@ -7,6 +7,9 @@ import org.springframework.web.servlet.i18n.CookieLocaleResolver;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Locale;
 
+/**
+ * 多语言解析器
+ */
 public class DefaultLocaleResolver extends CookieLocaleResolver {
 
     @Nullable