From 20bf5e75f478140b738772c0e9f9bba4f6d54a75 Mon Sep 17 00:00:00 2001
From: songdragon <songdragon@zts.io>
Date: Sun, 27 Aug 2023 00:58:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AF=BB=E5=8F=96json?=
 =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E6=94=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnotepad/ui/menu/JNotepadMenuBar.java     | 27 +++----------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/jcnc/jnotepad/ui/menu/JNotepadMenuBar.java b/src/main/java/org/jcnc/jnotepad/ui/menu/JNotepadMenuBar.java
index 22e9f7b..a3ebb43 100644
--- a/src/main/java/org/jcnc/jnotepad/ui/menu/JNotepadMenuBar.java
+++ b/src/main/java/org/jcnc/jnotepad/ui/menu/JNotepadMenuBar.java
@@ -287,7 +287,6 @@ public class JNotepadMenuBar extends MenuBar {
      */
     private void setCurrentLanguage(String language) throws JsonProcessingException {
         boolean flag = false;
-        ObjectNode json = JsonUtil.OBJECT_MAPPER.createObjectNode();
         // 获取本地配置文件
         logger.info("尝试读取本地配置文件!");
         StringBuilder jsonData = new StringBuilder();
@@ -300,30 +299,12 @@ public class JNotepadMenuBar extends MenuBar {
             logger.error("读取失败,配置文件错误或不存在配置文件!");
             flag = true;
         }
+        ObjectNode json = null;
+
         if (!flag) {
-            ObjectMapper objectMapper = JsonUtil.OBJECT_MAPPER;
-            JsonNode jsonNode;
-            try {
-                jsonNode = objectMapper.readTree(jsonData.toString());
-            } catch (JsonProcessingException e) {
-                throw new AppException(e.getMessage());
-            }
-            final ObjectNode finalJson = json;
-            jsonNode.fields().forEachRemaining(entry -> {
-                String key = entry.getKey();
-                JsonNode childNode = entry.getValue();
-                if (!LOWER_LANGUAGE.equals(key)) {
-                    if (childNode.isArray()) {
-                        ArrayNode arrayNode = finalJson.putArray(key);
-                        arrayNode.add(childNode.toString());
-                    } else {
-                        finalJson.put(key, childNode.toString());
-                    }
-                }
-            });
+            json = JsonUtil.OBJECT_MAPPER.readValue(jsonData.toString(), ObjectNode.class);
             logger.info("读取本地配置文件成功!");
-        }
-        if (flag) {
+        } else {
             logger.info("获取默认内置配置文件!");
             // 如果读取本地失败则获取默认配置文件
             json = createShortcutKeyJson();