From 9fd17cdb8aa1c6255893f0d991790cefb31d84a0 Mon Sep 17 00:00:00 2001
From: tianwenbo <tianwenbo@syxysoft.com>
Date: Fri, 10 Mar 2023 17:47:44 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20I18nUtil.java?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xxl/job/admin/core/util/I18nUtil.java | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java
index 772a96ec..a575d845 100644
--- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java
+++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java
@@ -20,6 +20,9 @@ import java.util.Properties;
  * @author xuxueli 2018-01-17 20:39:06
  */
 public class I18nUtil {
+    private I18nUtil() {
+    }
+
     private static Logger logger = LoggerFactory.getLogger(I18nUtil.class);
 
     private static Properties prop = null;
@@ -49,7 +52,11 @@ public class I18nUtil {
      * @return
      */
     public static String getString(String key) {
-        return loadI18nProp().getProperty(key);
+        Properties properties = loadI18nProp();
+        if(properties!=null&&properties.getProperty(key)!=null){
+            return properties.getProperty(key);
+        }
+        return "";
     }
 
     /**
@@ -59,21 +66,24 @@ public class I18nUtil {
      * @return
      */
     public static String getMultString(String... keys) {
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
 
         Properties prop = loadI18nProp();
         if (keys!=null && keys.length>0) {
             for (String key: keys) {
-                map.put(key, prop.getProperty(key));
+                if(prop!=null) {
+                    map.put(key, prop.getProperty(key));
+                }
             }
         } else {
-            for (String key: prop.stringPropertyNames()) {
-                map.put(key, prop.getProperty(key));
+            if(prop!=null){
+                for (String key : prop.stringPropertyNames()) {
+                    map.put(key, prop.getProperty(key));
+                }
             }
         }
 
-        String json = JacksonUtil.writeValueAsString(map);
-        return json;
+        return JacksonUtil.writeValueAsString(map);
     }
 
 }