From 1bca1b9c61676b48cc3137d3003e520c75ecdd92 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 13 一月 2024 10:57:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/filter/MyI18nInterceptor.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/MyI18nInterceptor.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/MyI18nInterceptor.java
index 836fba0..eff27c1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/MyI18nInterceptor.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/MyI18nInterceptor.java
@@ -7,20 +7,35 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.Enumeration;
import java.util.Locale;
@Slf4j
public class MyI18nInterceptor implements HandlerInterceptor {
@Override
- public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
- final String key = "language";
- String language = "en_US";//request.getHeader(key);
- // 鍓嶇浼犻�掔殑language蹇呴』鏄痾h-CN鏍煎紡鐨勶紝涓棿鐨�-蹇呴』瑕佸畬鏁达紝涓嶈兘鍙紶閫抸h鎴杄n
- log.info("褰撳墠璇█={}",language);
- Locale locale = new Locale(language.split("_")[0],language.split("_")[1]);
- // 杩欐牱璧嬪�间互鍚庯紝MessageUtils.message鏂规硶灏变笉鐢ㄤ慨鏀逛簡
- LocaleContextHolder.setLocale(locale);
+ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler){
+ try {
+ final String key = "language";
+ //String language = "en-US";
+ //String language = "zh-CN";
+ Enumeration<String> headers = request.getHeaderNames();
+ String language = request.getHeader(key);
+ if (language == null) {
+ //String language = "en-US";
+ language = "zh-CN";
+ }
+ // 鍓嶇浼犻�掔殑language蹇呴』鏄痾h-CN鏍煎紡鐨勶紝涓棿鐨�-蹇呴』瑕佸畬鏁达紝涓嶈兘鍙紶閫抸h鎴杄n
+ log.debug("褰撳墠璇█={}", language);
+ Locale locale = new Locale(language.split("-")[0], language.split("-")[1]);
+ // 杩欐牱璧嬪�间互鍚庯紝MessageUtils.message鏂规硶灏变笉鐢ㄤ慨鏀逛簡
+ LocaleContextHolder.setLocale(locale);
+ }
+ catch (Exception ex)
+ {
+ log.error(ex.getMessage());
+ return false;
+ }
return true;
}
--
Gitblit v1.9.3