modify muli lang

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

@@ -8,6 +8,7 @@ import com.secoo.mall.common.util.response.ResponseUtil;
 import com.secoo.mall.web.annotation.ApiController;
 import com.secoo.mall.web.annotation.ApiIgnoreJson;
 import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContext;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.AnnotationUtils;
@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
 import javax.annotation.Resource;
+import java.util.Locale;
 
 @RestControllerAdvice(annotations = ApiController.class)
 public class ControllerResponseAdvice implements ResponseBodyAdvice<Object> {
@@ -34,8 +36,9 @@ public class ControllerResponseAdvice implements ResponseBodyAdvice<Object> {
 
     @ExceptionHandler(ParameterException.class)
     public Object parameterExceptionHandler(ParameterException e) {
-        LoggerUtil.info(getMsg(e));
-        return ResponseUtil.getFailResponse(e.getCode(), getMsg(e));
+        String msg=getMsg(e);
+        LoggerUtil.info(msg);
+        return ResponseUtil.getFailResponse(e.getCode(), msg);
     }
 
     @ExceptionHandler(Exception.class)

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 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.AcceptHeaderLocaleResolver;
-import org.springframework.web.servlet.i18n.CookieLocaleResolver;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 
 import java.util.Locale;
 
 @Configuration
 public class WebConfig implements WebMvcConfigurer {
-    /**
-     * 自定义国际化文件存放路径
-     *
-     * @return
-     */
-    /*@Bean
-    public org.springframework.validation.Validator getValidator() {
-        Validator validator = Validation.byDefaultProvider()
-                .configure()
-                .messageInterpolator(new ResourceBundleMessageInterpolator(new PlatformResourceBundleLocator("i18n/message")))
-                .buildValidatorFactory().getValidator();
-        return (org.springframework.validation.Validator) validator;
-    }*/
+
     @Bean
     public ResourceBundleMessageSource messageSource() {
         ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
@@ -34,16 +21,10 @@ public class WebConfig implements WebMvcConfigurer {
         return messageSource;
     }
 
-    @Bean
-    public LocaleResolver localeHeaderResolver() {
-        AcceptHeaderLocaleResolver localeResolver = new AcceptHeaderLocaleResolver();
-        localeResolver.setDefaultLocale(Locale.SIMPLIFIED_CHINESE);
-        return localeResolver;
-    }
 
-    @Bean
+    @Bean(name = "localeResolver")
     public LocaleResolver localeCookieResolver() {
-        CookieLocaleResolver localeResolver = new CookieLocaleResolver();
+        DefaultLocaleResolver localeResolver = new DefaultLocaleResolver();
         localeResolver.setCookieName("language");
         //设置默认区域
         localeResolver.setDefaultLocale(Locale.SIMPLIFIED_CHINESE);

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

+package com.secoo.mall.web.resolver;
+
+import com.secoo.mall.common.util.string.StringUtil;
+import org.springframework.lang.Nullable;
+import org.springframework.web.servlet.i18n.CookieLocaleResolver;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
+
+public class DefaultLocaleResolver extends CookieLocaleResolver {
+
+    @Nullable
+    protected Locale determineDefaultLocale(HttpServletRequest request) {
+        if (!StringUtil.isEmpty(request.getHeader("Accept-Language"))) {
+            return Locale.forLanguageTag(request.getHeader("Accept-Language"));
+        }
+
+        String lang = request.getParameter("lang");
+        if (StringUtil.isNotEmpty(lang)) {
+            return parseLocaleValue(lang);
+        }
+
+        return super.determineDefaultLocale(request);
+    }
+}