feat(i18n): i18n 支持

Author: svnlab

easyfile-common/src/main/java/com/openquartz/easyfile/common/i18n/I18nTranslator.java

@@ -42,7 +42,7 @@ public static String translate(String template) {
         }
 
         // 获取当前语言
-        Locale locale = LocaleContextHolder.currentLocale();
+        Locale locale = LocaleContext.currentLocale();
 
         MessageSource messageSource = SpringContextUtil.getBean(MessageSource.class);
         return messageSource.getMessage(key, null, locale);

easyfile-common/src/main/java/com/openquartz/easyfile/common/i18n/LocaleContextHolder.java renamed to easyfile-common/src/main/java/com/openquartz/easyfile/common/i18n/LocaleContext.java

@@ -1,7 +1,7 @@
 package com.openquartz.easyfile.common.i18n;
 
 import com.openquartz.easyfile.common.util.StringUtils;
-import org.springframework.core.NamedThreadLocal;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.lang.Nullable;
 
 import java.util.Locale;
@@ -13,31 +13,29 @@
  *
  * @author svnee
  */
-public class LocaleContextHolder {
+public class LocaleContext {
 
-    private static final ThreadLocal<Locale> currentLocaleContext = new NamedThreadLocal<>("Current Locale");
-
-    private LocaleContextHolder() {
+    private LocaleContext() {
     }
 
     public static Locale currentLocale() throws IllegalStateException {
-        return currentLocaleContext.get();
+        return LocaleContextHolder.getLocale();
     }
 
     public static String currentLocaleLanguage() throws IllegalStateException {
-        Locale locale = currentLocaleContext.get();
-        return Optional.ofNullable(locale).map(Locale::getLanguage).orElse(StringUtils.EMPTY);
+        Locale locale = currentLocale();
+        return Optional.of(locale).map(Locale::getLanguage).orElse(StringUtils.EMPTY);
     }
 
     public static void setCurrentLocale(@Nullable Locale locale) {
 
         if (Objects.nonNull(locale)) {
-            currentLocaleContext.set(locale);
+            LocaleContextHolder.setLocale(locale);
         }
 
     }
 
     public static void clear() {
-        currentLocaleContext.remove();
+        LocaleContextHolder.resetLocaleContext();
     }
 }

easyfile-core/src/main/java/com/openquartz/easyfile/core/intercept/I18nDownloadExecutorInterceptor.java

@@ -1,7 +1,7 @@
 package com.openquartz.easyfile.core.intercept;
 
 import com.openquartz.easyfile.common.bean.BaseDownloaderRequestContext;
-import com.openquartz.easyfile.common.i18n.LocaleContextHolder;
+import com.openquartz.easyfile.common.i18n.LocaleContext;
 import com.openquartz.easyfile.common.response.ExportResult;
 import com.openquartz.easyfile.core.executor.BaseDownloadExecutor;
 import com.openquartz.easyfile.storage.download.DownloadStorageService;
@@ -30,12 +30,12 @@ public int order() {
     public void beforeExecute(BaseDownloadExecutor executor, BaseDownloaderRequestContext context, Long registerId, InterceptorContext interceptorContext) {
 
         Locale currentLocale = downloadStorageService.getCurrentLocale(registerId);
-        LocaleContextHolder.setCurrentLocale(currentLocale);
+        LocaleContext.setCurrentLocale(currentLocale);
 
     }
 
     @Override
     public void afterExecute(BaseDownloadExecutor executor, BaseDownloaderRequestContext context, ExportResult result, InterceptorContext interceptorContext) {
-        LocaleContextHolder.clear();
+        LocaleContext.clear();
     }
 }

easyfile-example/easyfile-example-local/src/main/java/com/openquartz/easyfile/example/config/I18nConfig.java

@@ -0,0 +1,18 @@
+package com.openquartz.easyfile.example.config;
+
+import org.springframework.context.MessageSource;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.ReloadableResourceBundleMessageSource;
+
+@Configuration
+public class I18nConfig {
+
+    @Bean
+    public MessageSource messageSource() {
+        ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource();
+        messageSource.setBasename("classpath:i18n/messages"); // 设置基础名，指向资源文件的位置
+        messageSource.setDefaultEncoding("UTF-8"); // 设置默认编码
+        return messageSource;
+    }
+}

easyfile-example/easyfile-example-local/src/main/java/com/openquartz/easyfile/example/config/WebMvcConfig.java

@@ -5,29 +5,49 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.multipart.support.StandardServletMultipartResolver;
+import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
+import org.springframework.web.servlet.i18n.SessionLocaleResolver;
+
+import java.util.Locale;
 
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry
-            .addInterceptor(new WebRequestInterceptor())
-            .addPathPatterns("/**");
+        registry.addInterceptor(localeChangeInterceptor());
+        registry.addInterceptor(new WebRequestInterceptor())
+                .addPathPatterns("/**");
     }
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry
-            .addResourceHandler("/**")
-            .addResourceLocations("classpath:/static/", "classpath:/META-INF/resources/");
+                .addResourceHandler("/**")
+                .addResourceLocations("classpath:/static/", "classpath:/META-INF/resources/");
     }
 
     @Bean("multipartResolver")
     public MultipartResolver mulitipartResovler() {
         return new StandardServletMultipartResolver();
     }
+
+    @Bean
+    public LocaleResolver localeResolver() {
+        SessionLocaleResolver slr = new SessionLocaleResolver();
+        slr.setDefaultLocale(Locale.US); // 默认语言
+        return slr;
+    }
+
+    @Bean
+    public LocaleChangeInterceptor localeChangeInterceptor() {
+        LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
+        lci.setParamName("lang"); // URL参数名
+        return lci;
+    }
+
 }

easyfile-example/easyfile-example-local/src/main/resources/i18n/messages/messages_en.properties

@@ -3,7 +3,7 @@
 import static com.openquartz.easyfile.core.exception.DownloadErrorCode.FILE_GENERATOR_MUST_SUPPORT_ANNOTATION;
 import static com.openquartz.easyfile.core.exception.DownloadErrorCode.SYNC_DOWNLOAD_EXECUTE_ERROR;
 
-import com.openquartz.easyfile.common.i18n.LocaleContextHolder;
+import com.openquartz.easyfile.common.i18n.LocaleContext;
 import com.openquartz.easyfile.common.util.StringUtils;
 import com.openquartz.easyfile.core.executor.support.FileExportTriggerContext;
 import com.openquartz.easyfile.starter.spring.boot.autoconfig.properties.EasyFileDownloadProperties;
@@ -240,7 +240,7 @@ private RegisterDownloadRequest buildDownloadRequest(FileExportExecutor executor
         registerRequest.setFileSuffix(requestContext.getFileSuffix());
         registerRequest.setOtherMap(requestContext.getOtherMap());
         registerRequest.setMaxServerRetry(executor.maxServerRetry());
-        registerRequest.setLocale(LocaleContextHolder.currentLocaleLanguage());
+        registerRequest.setLocale(LocaleContext.currentLocaleLanguage());
         return registerRequest;
     }
 }