From 6cec7979aaec6febbef519888423c86133821b8c Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 28 二月 2024 17:30:45 +0800
Subject: [PATCH] 三一车辆提交

---
 ruoyi-common/src/main/java/com/ruoyi/common/filter/MyI18nInterceptor.java |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 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 07523a1..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,22 +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";
-        String language = "zh_CN";
-        //String language = request.getHeader(key);
-        // 鍓嶇浼犻�掔殑language蹇呴』鏄痾h-CN鏍煎紡鐨勶紝涓棿鐨�-蹇呴』瑕佸畬鏁达紝涓嶈兘鍙紶閫抸h鎴杄n
-        log.debug("褰撳墠璇█={}",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