From 78fe857e99a742a3ed7e49a6c5f30f7b7d2fcf32 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 19 四月 2023 17:02:41 +0800
Subject: [PATCH] 语言国际化

---
 src/main/java/com/whyc/util/MessageUtils.java |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/whyc/util/MessageUtils.java b/src/main/java/com/whyc/util/MessageUtils.java
index da45c0a..14a107f 100644
--- a/src/main/java/com/whyc/util/MessageUtils.java
+++ b/src/main/java/com/whyc/util/MessageUtils.java
@@ -1,20 +1,13 @@
 package com.whyc.util;
 
 import com.whyc.config.I18nLocaleResolver;
-import lombok.var;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.MessageSource;
-import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpSession;
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
-import java.util.Objects;
 
 @Component
 public class MessageUtils {
@@ -77,11 +70,13 @@
      * @return 鍥介檯鍖栧悗鍐呭淇℃伅
      */
     public static String getMessageSocket(String code, String lang) {
-        Locale locale;
-        if((lang.equals("zh"))){
-            locale = Locale.SIMPLIFIED_CHINESE;
-        }else{ //涓嶆槸涓枃,鍒欓噰鐢╡n_US
-            locale = Locale.US;
+        Locale locale = Locale.SIMPLIFIED_CHINESE;
+        if (lang != null) {
+            if ((lang.equals("zh"))) {
+                locale = Locale.SIMPLIFIED_CHINESE;
+            } else { //涓嶆槸涓枃,鍒欓噰鐢╡n_US
+                locale = Locale.US;
+            }
         }
         return getMessage(code, null, code, locale);
     }

--
Gitblit v1.9.1