From 709293c2469835cf9c9487da83b6a0ed322995b5 Mon Sep 17 00:00:00 2001
From: kb <769801958@qq.com>
Date: Mon, 21 Aug 2023 01:11:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=AE=9A=E4=B9=89=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E9=94=AE=E9=80=9A=E7=94=A8=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jnotepadConfig.json                           |  32 +++++
 pom.xml                                       |  12 +-
 src/main/java/module-info.java                |   5 +-
 .../Interface/ControllerInterface.java        |   6 +
 .../Interface/LoadJnotepadConfig.java         | 118 ++++++++++++++++++
 .../Interface/ShortcutKeyInterface.java       |  10 --
 src/main/java/org/jcnc/jnotepad/LunchApp.java |   3 +-
 .../jcnc/jnotepad/config/JnotepadConfig.java  |  36 ++++++
 .../org/jcnc/jnotepad/config/ShortcutKey.java |  35 ++++++
 .../java/org/jcnc/jnotepad/config/Style.java  |  35 ++++++
 .../jnotepad/constant/JnotepadConstants.java  |  11 ++
 .../controller/event/handler/OpenConfig.java  |  56 +++++++++
 .../controller/manager/Controller.java        |  10 +-
 .../controller/manager/ShortcutKey.java       |  69 ----------
 .../controller/manager/loadConfig.java        |  64 ++++++++++
 .../jcnc/jnotepad/ui/LineNumberTextArea.java  |   5 +
 .../org/jcnc/jnotepad/view/init/View.java     |   7 +-
 .../jnotepad/view/manager/ViewManager.java    |   7 +-
 tool/jpackage.txt                             |   8 ++
 19 files changed, 435 insertions(+), 94 deletions(-)
 create mode 100644 jnotepadConfig.json
 create mode 100644 src/main/java/org/jcnc/jnotepad/Interface/LoadJnotepadConfig.java
 delete mode 100644 src/main/java/org/jcnc/jnotepad/Interface/ShortcutKeyInterface.java
 create mode 100644 src/main/java/org/jcnc/jnotepad/config/JnotepadConfig.java
 create mode 100644 src/main/java/org/jcnc/jnotepad/config/ShortcutKey.java
 create mode 100644 src/main/java/org/jcnc/jnotepad/config/Style.java
 create mode 100644 src/main/java/org/jcnc/jnotepad/constant/JnotepadConstants.java
 create mode 100644 src/main/java/org/jcnc/jnotepad/controller/event/handler/OpenConfig.java
 delete mode 100644 src/main/java/org/jcnc/jnotepad/controller/manager/ShortcutKey.java
 create mode 100644 src/main/java/org/jcnc/jnotepad/controller/manager/loadConfig.java

diff --git a/jnotepadConfig.json b/jnotepadConfig.json
new file mode 100644
index 0000000..fa3bb37
--- /dev/null
+++ b/jnotepadConfig.json
@@ -0,0 +1,32 @@
+{
+     "shortcutKey": [
+       {
+             "buttonName": "newItem",
+             "shortcutKeyValue": "ctrl+n"
+       },
+       {
+             "buttonName": "openItem",
+             "shortcutKeyValue": "ctrl+o"
+       },
+       {
+             "buttonName": "saveAsItem",
+             "shortcutKeyValue": "ctrl+shift+s"
+       },
+       {
+             "buttonName": "lineFeedItem",
+             "shortcutKeyValue": ""
+       },
+       {
+         "buttonName": "openConfig",
+         "shortcutKeyValue": "alt+s"
+       },
+       {
+             "buttonName": "addItem",
+             "shortcutKeyValue": ""
+       },
+       {
+             "buttonName": "countItem",
+             "shortcutKeyValue": ""
+       }
+     ]
+   }
diff --git a/pom.xml b/pom.xml
index e6fde4c..1ccdeac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,12 +32,18 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.google.code.gson</groupId>-->
+<!--            <artifactId>gson</artifactId>-->
+<!--            <version>2.10.1</version>-->
+<!--        </dependency>-->
         <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.12.7.1</version>
         </dependency>
 
+
     </dependencies>
 
     <build>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index c4adc8c..6f6d224 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -3,7 +3,10 @@ module org.jcnc.jnotepad {
     requires atlantafx.base;
 //    requires cn.hutool.json;
 //    requires cn.hutool.core;
-    requires com.google.gson;
+//    requires com.google.gson;
+    requires com.fasterxml.jackson.core;
+    requires com.fasterxml.jackson.databind;
+    requires com.fasterxml.jackson.annotation;
     exports org.jcnc.jnotepad;
     exports org.jcnc.jnotepad.tool;
     exports org.jcnc.jnotepad.Interface;
diff --git a/src/main/java/org/jcnc/jnotepad/Interface/ControllerInterface.java b/src/main/java/org/jcnc/jnotepad/Interface/ControllerInterface.java
index db1f719..a927a03 100644
--- a/src/main/java/org/jcnc/jnotepad/Interface/ControllerInterface.java
+++ b/src/main/java/org/jcnc/jnotepad/Interface/ControllerInterface.java
@@ -43,6 +43,12 @@ public interface ControllerInterface {
      */
     EventHandler<ActionEvent> getOpenFileEventHandler();
 
+    /**
+     * 获取打开配置文件处理事件处理程序
+     *
+     * @return 打开配置文件处理事件处理程序
+     */
+    EventHandler<ActionEvent> getOpenConfigEventHandler();
     /**
      * 获取另存为文件处理事件处理程序
      *
diff --git a/src/main/java/org/jcnc/jnotepad/Interface/LoadJnotepadConfig.java b/src/main/java/org/jcnc/jnotepad/Interface/LoadJnotepadConfig.java
new file mode 100644
index 0000000..ccc8613
--- /dev/null
+++ b/src/main/java/org/jcnc/jnotepad/Interface/LoadJnotepadConfig.java
@@ -0,0 +1,118 @@
+package org.jcnc.jnotepad.Interface;
+
+import javafx.scene.control.Alert;
+import javafx.scene.control.MenuItem;
+import javafx.scene.input.KeyCombination;
+import org.jcnc.jnotepad.config.JnotepadConfig;
+import org.jcnc.jnotepad.config.ShortcutKey;
+import org.jcnc.jnotepad.view.manager.ViewManager;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static org.jcnc.jnotepad.constant.JnotepadConstants.CONFIG_NAME;
+
+/**
+ * 模板方法，空出了加载文件的具体实现
+ * @author 一个大转盘
+ * @date 2023/8/20
+ */
+public abstract class LoadJnotepadConfig {
+    public final void load() {
+        // 判断是否存在这个配置文件
+        try (InputStream inputStream = new FileInputStream(CONFIG_NAME)) {
+            // 存在则加载
+            loadConfig(inputStream);
+        } catch (IOException e) {
+            // 不存在则创建
+            createConfig();
+        }
+
+
+    }
+
+    void createConfig() {
+        List<ShortcutKey> shortcutKeyList = new ArrayList<>();
+        // 打开文件
+        ShortcutKey shortcutKeyOfOpen = new ShortcutKey("openItem", "ctrl+o");
+
+        // 新建
+        ShortcutKey shortcutKeyOfNew = new ShortcutKey("newItem", "ctrl+n");
+
+        // 保存作为
+        ShortcutKey shortcutKeyOfSaveAs = new ShortcutKey("saveAsItem", "ctrl+shift+s");
+
+        // 打开配置文件
+        ShortcutKey shortcutKeyOfOpenConfig = new ShortcutKey("openConfig", "alt+s");
+
+        shortcutKeyList.add(shortcutKeyOfOpen);
+        shortcutKeyList.add(shortcutKeyOfNew);
+        shortcutKeyList.add(shortcutKeyOfSaveAs);
+        shortcutKeyList.add(shortcutKeyOfOpenConfig);
+        JnotepadConfig.getInstance().shortcutKeyList = shortcutKeyList;
+        for (ShortcutKey shortcutKey : shortcutKeyList) {
+            // 保证json的key必须和变量名一致
+            MenuItem menuItem = ViewManager.itemMap.get(shortcutKey.getButtonName());
+            String shortKeyValue = shortcutKey.getShortcutKeyValue();
+
+            if ("".equals(shortKeyValue) || Objects.isNull(menuItem)) {
+                continue;
+            }
+            // 动态添加快捷键
+            menuItem.setAccelerator(KeyCombination.keyCombination(shortKeyValue));
+        }
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(CONFIG_NAME))) {
+            writer.write("""
+                    {
+                               "shortcutKey": [
+                                 {
+                                       "buttonName": "newItem",
+                                       "shortcutKeyValue": "ctrl+n"
+                                 },
+                                 {
+                                       "buttonName": "openItem",
+                                       "shortcutKeyValue": "ctrl+o"
+                                 },
+                                 {
+                                       "buttonName": "saveAsItem",
+                                       "shortcutKeyValue": "ctrl+shift+s"
+                                 },
+                                 {
+                                       "buttonName": "lineFeedItem",
+                                       "shortcutKeyValue": ""
+                                 },
+                                 {
+                                   "buttonName": "openConfig",
+                                   "shortcutKeyValue": "alt+s"
+                                 },
+                                 {
+                                       "buttonName": "addItem",
+                                       "shortcutKeyValue": ""
+                                 },
+                                 {
+                                       "buttonName": "countItem",
+                                       "shortcutKeyValue": ""
+                                 }
+                               ]
+                             }
+                          
+                                        
+                    """);
+        } catch (IOException e) {
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setTitle("错误");
+            alert.setHeaderText("文件读写错误");
+            alert.setContentText("文件读写错误");
+            alert.showAndWait();
+        }
+    }
+
+    /**
+     * 加载配置文件
+     * @date 2023/8/20 22:52
+     * @param inputStream 配置文件的输入流
+     */
+    protected abstract  void loadConfig(InputStream inputStream);
+}
diff --git a/src/main/java/org/jcnc/jnotepad/Interface/ShortcutKeyInterface.java b/src/main/java/org/jcnc/jnotepad/Interface/ShortcutKeyInterface.java
deleted file mode 100644
index 2f8c52e..0000000
--- a/src/main/java/org/jcnc/jnotepad/Interface/ShortcutKeyInterface.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.jcnc.jnotepad.Interface;
-
-/**
- * @author 一个大转盘
- * @date 2023/8/18
- */
-public interface ShortcutKeyInterface {
-    public void createShortcutKeyByConfig();
-
-}
diff --git a/src/main/java/org/jcnc/jnotepad/LunchApp.java b/src/main/java/org/jcnc/jnotepad/LunchApp.java
index f635f84..486d2ab 100644
--- a/src/main/java/org/jcnc/jnotepad/LunchApp.java
+++ b/src/main/java/org/jcnc/jnotepad/LunchApp.java
@@ -10,6 +10,7 @@ import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 import org.jcnc.jnotepad.constants.Constants;
 import org.jcnc.jnotepad.controller.manager.Controller;
+import org.jcnc.jnotepad.controller.manager.loadConfig;
 import org.jcnc.jnotepad.ui.LineNumberTextArea;
 import org.jcnc.jnotepad.view.init.View;
 import org.jcnc.jnotepad.view.manager.ViewManager;
@@ -57,7 +58,7 @@ public class LunchApp extends Application {
         // 初始化菜单项和标签栏
         view.initItem();
         view.initTabPane();
-        view.initShortcutKey();
+        view.initShortcutKey(new loadConfig());
 
         if (isRelevance) {
 
diff --git a/src/main/java/org/jcnc/jnotepad/config/JnotepadConfig.java b/src/main/java/org/jcnc/jnotepad/config/JnotepadConfig.java
new file mode 100644
index 0000000..db66ccd
--- /dev/null
+++ b/src/main/java/org/jcnc/jnotepad/config/JnotepadConfig.java
@@ -0,0 +1,36 @@
+package org.jcnc.jnotepad.config;
+
+import java.util.List;
+
+/**
+ * 一个总的配置类，通过读取json文件获取值
+ * @author 一个大转盘
+ * @date 2023/8/20
+ */
+public class JnotepadConfig {
+    /**
+     * 快捷键列表
+     */
+    public List<ShortcutKey> shortcutKeyList;
+
+    /**
+     * 样式列表 TODO
+     */
+    public List<Style> styleList;
+
+    /**
+     * 单例模式
+     */
+    private JnotepadConfig(){}
+    private static JnotepadConfig instance;
+    public static JnotepadConfig getInstance(){
+        if (instance == null) {
+            synchronized (JnotepadConfig.class) {
+                if (instance == null) {
+                    instance = new JnotepadConfig();
+                }
+            }
+        }
+        return instance;
+    }
+}
diff --git a/src/main/java/org/jcnc/jnotepad/config/ShortcutKey.java b/src/main/java/org/jcnc/jnotepad/config/ShortcutKey.java
new file mode 100644
index 0000000..3d3b22e
--- /dev/null
+++ b/src/main/java/org/jcnc/jnotepad/config/ShortcutKey.java
@@ -0,0 +1,35 @@
+package org.jcnc.jnotepad.config;
+
+/**
+ * 快捷键
+ * @author 一个大转盘
+ * @date 2023/8/20
+ */
+public class ShortcutKey {
+    private String buttonName;
+    private String shortcutKeyValue;
+
+    public ShortcutKey() {
+    }
+
+    public ShortcutKey(String buttonName, String shortcutKeyValue) {
+        this.buttonName = buttonName;
+        this.shortcutKeyValue = shortcutKeyValue;
+    }
+
+    public String getButtonName() {
+        return buttonName;
+    }
+
+    public void setButtonName(String buttonName) {
+        this.buttonName = buttonName;
+    }
+
+    public String getShortcutKeyValue() {
+        return shortcutKeyValue;
+    }
+
+    public void setShortcutKeyValue(String shortcutKeyValue) {
+        this.shortcutKeyValue = shortcutKeyValue;
+    }
+}
diff --git a/src/main/java/org/jcnc/jnotepad/config/Style.java b/src/main/java/org/jcnc/jnotepad/config/Style.java
new file mode 100644
index 0000000..76030da
--- /dev/null
+++ b/src/main/java/org/jcnc/jnotepad/config/Style.java
@@ -0,0 +1,35 @@
+package org.jcnc.jnotepad.config;
+
+/**
+ * 样式
+ * @author 一个大转盘
+ * @date 2023/8/20
+ */
+public class Style {
+    private String styleName;
+    private String styleValue;
+
+    public Style() {
+    }
+
+    public Style(String styleName, String styleValue) {
+        this.styleName = styleName;
+        this.styleValue = styleValue;
+    }
+
+    public String getStyleName() {
+        return styleName;
+    }
+
+    public void setStyleName(String styleName) {
+        this.styleName = styleName;
+    }
+
+    public String getStyleValue() {
+        return styleValue;
+    }
+
+    public void setStyleValue(String styleValue) {
+        this.styleValue = styleValue;
+    }
+}
diff --git a/src/main/java/org/jcnc/jnotepad/constant/JnotepadConstants.java b/src/main/java/org/jcnc/jnotepad/constant/JnotepadConstants.java
new file mode 100644
index 0000000..177a423
--- /dev/null
+++ b/src/main/java/org/jcnc/jnotepad/constant/JnotepadConstants.java
@@ -0,0 +1,11 @@
+package org.jcnc.jnotepad.constant;
+
+/**
+ * 常量
+ * @author 一个大转盘
+ * @date 2023/8/20
+ */
+public class JnotepadConstants {
+    public static String CONFIG_NAME = "jnotepadConfig.json";
+    public static String CONFIG_SHORTCUT_KEY_NAME = "shortcutKey";
+}
diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/OpenConfig.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/OpenConfig.java
new file mode 100644
index 0000000..b693d92
--- /dev/null
+++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/OpenConfig.java
@@ -0,0 +1,56 @@
+package org.jcnc.jnotepad.controller.event.handler;
+
+import javafx.concurrent.Task;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.stage.FileChooser;
+import org.jcnc.jnotepad.controller.manager.Controller;
+import org.jcnc.jnotepad.ui.LineNumberTextArea;
+
+import java.io.File;
+
+import static org.jcnc.jnotepad.constant.JnotepadConstants.CONFIG_NAME;
+import static org.jcnc.jnotepad.view.manager.ViewManager.tabPane;
+
+/**
+ * 打开配置文件事件
+ * @author 一个大转盘
+ * @date 2023/8/21
+ */
+public class OpenConfig implements EventHandler<ActionEvent> {
+    @Override
+    public void handle(ActionEvent actionEvent) {
+        // 获取控制器
+        Controller controller = Controller.getInstance();
+        // 显示文件选择对话框，并获取选中的文件
+        File file = new File(CONFIG_NAME);
+
+        if (file != null) {
+            // 创建打开文件的任务
+            Task<Void> openFileTask = new Task<>() {
+                @Override
+                protected Void call() {
+                    // 调用控制器的getText方法，读取文件内容
+                    controller.getText(file);
+                    // 更新编码标签
+                    controller.upDateEncodingLabel(((LineNumberTextArea) tabPane.getSelectionModel().getSelectedItem().getContent()).getMainTextArea().getText());
+                    return null;
+                }
+            };
+
+            // 设置任务成功完成时的处理逻辑
+            openFileTask.setOnSucceeded(e -> {
+                // 处理成功的逻辑
+            });
+
+            // 设置任务失败时的处理逻辑
+            openFileTask.setOnFailed(e -> {
+                // 处理失败的逻辑
+            });
+
+            // 创建并启动线程执行任务
+            Thread thread = new Thread(openFileTask);
+            thread.start();
+        }
+    }
+}
diff --git a/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java b/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java
index 099e8be..77b0d70 100644
--- a/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java
+++ b/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java
@@ -7,10 +7,7 @@ import javafx.event.EventHandler;
 import javafx.scene.control.Tab;
 import org.jcnc.jnotepad.Interface.ControllerInterface;
 import org.jcnc.jnotepad.LunchApp;
-import org.jcnc.jnotepad.controller.event.handler.LineFeed;
-import org.jcnc.jnotepad.controller.event.handler.NewFile;
-import org.jcnc.jnotepad.controller.event.handler.OpenFile;
-import org.jcnc.jnotepad.controller.event.handler.SaveAsFile;
+import org.jcnc.jnotepad.controller.event.handler.*;
 import org.jcnc.jnotepad.tool.EncodingDetector;
 import org.jcnc.jnotepad.ui.LineNumberTextArea;
 import org.jcnc.jnotepad.view.manager.ViewManager;
@@ -87,6 +84,11 @@ public class Controller implements ControllerInterface {
         return new OpenFile();
     }
 
+    @Override
+    public EventHandler<ActionEvent> getOpenConfigEventHandler() {
+        return new OpenConfig();
+    }
+
     /**
      * 自动保存文本内容。
      *
diff --git a/src/main/java/org/jcnc/jnotepad/controller/manager/ShortcutKey.java b/src/main/java/org/jcnc/jnotepad/controller/manager/ShortcutKey.java
deleted file mode 100644
index d6a7874..0000000
--- a/src/main/java/org/jcnc/jnotepad/controller/manager/ShortcutKey.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.jcnc.jnotepad.controller.manager;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
-import javafx.scene.control.MenuItem;
-import javafx.scene.input.KeyCombination;
-import org.jcnc.jnotepad.Interface.ShortcutKeyInterface;
-import org.jcnc.jnotepad.tool.FileUtil;
-import org.jcnc.jnotepad.view.manager.ViewManager;
-
-import java.io.*;
-import java.net.URL;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * @author 一个大转盘
- * @date 2023/8/18
- */
-public class ShortcutKey implements ShortcutKeyInterface {
-    @Override
-    public void createShortcutKeyByConfig() {
-        String rootPath =System.getProperty("user.dir");
-        // 构建JSON文件路径
-        String jsonFilePath = rootPath +"/config/shortcutKey.json";
-        InputStream inputStream = getClass().getResourceAsStream("/config/shortcutKey.json");
-        StringBuffer jsonData = new StringBuffer();
-        File file = new File(jsonFilePath);
-        if(file.exists()){
-            try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    jsonData.append(line);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }else {
-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    jsonData.append(line);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        // 转json对象
-        GsonBuilder gsonBuilder = new GsonBuilder();
-        Gson gson = gsonBuilder.create();
-        Map<String, String> shortcutKeyConfig = gson.fromJson(jsonData.toString(), new TypeToken<Map<String, String>>() {
-        }.getType());
-        for (Map.Entry<String, String> stringObjectEntry : shortcutKeyConfig.entrySet()) {
-            // 保证json的key必须和变量名一致
-            MenuItem menuItem = ViewManager.itemMap.get(stringObjectEntry.getKey());
-            String shortKeyValue = stringObjectEntry.getValue();
-
-            if ("".equals(shortKeyValue) || Objects.isNull(menuItem)) {
-                continue;
-            }
-            // 动态添加快捷键
-            menuItem.setAccelerator(KeyCombination.keyCombination(shortKeyValue));
-        }
-
-
-    }
-}
diff --git a/src/main/java/org/jcnc/jnotepad/controller/manager/loadConfig.java b/src/main/java/org/jcnc/jnotepad/controller/manager/loadConfig.java
new file mode 100644
index 0000000..fab4803
--- /dev/null
+++ b/src/main/java/org/jcnc/jnotepad/controller/manager/loadConfig.java
@@ -0,0 +1,64 @@
+package org.jcnc.jnotepad.controller.manager;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import javafx.scene.control.MenuItem;
+import javafx.scene.input.KeyCombination;
+import org.jcnc.jnotepad.Interface.LoadJnotepadConfig;
+import org.jcnc.jnotepad.config.ShortcutKey;
+import org.jcnc.jnotepad.view.manager.ViewManager;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Type;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static org.jcnc.jnotepad.constant.JnotepadConstants.CONFIG_SHORTCUT_KEY_NAME;
+
+/**
+ * 实现加载配置
+ * @author 一个大转盘
+ * @date 2023/8/20
+ */
+public class loadConfig extends LoadJnotepadConfig {
+    @Override
+    protected void loadConfig(InputStream inputStream) {
+        StringBuffer jsonData = new StringBuffer();
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                jsonData.append(line);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        // 转json对象
+
+        ObjectMapper mapper = new ObjectMapper();
+        Map<String, List<Object>> mainConfig = null;
+        try {
+            mainConfig = mapper.readValue(jsonData.toString(), new TypeReference<HashMap<String, List<Object>>>(){});
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+        List<LinkedHashMap> objectList = mainConfig.get(CONFIG_SHORTCUT_KEY_NAME).stream().map(e->(LinkedHashMap)e).collect(Collectors.toList());
+
+        for (LinkedHashMap shortcutKey : objectList) {
+            // 保证json的key必须和变量名一致
+            MenuItem menuItem = ViewManager.itemMap.get(shortcutKey.get("buttonName"));
+            String shortKeyValue = (String) shortcutKey.get("shortcutKeyValue");
+
+            if ("".equals(shortKeyValue) || Objects.isNull(menuItem)) {
+                continue;
+            }
+            // 动态添加快捷键
+            menuItem.setAccelerator(KeyCombination.keyCombination(shortKeyValue));
+        }
+
+    }
+}
diff --git a/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java b/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java
index 91c08fb..1ba113c 100644
--- a/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java
+++ b/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java
@@ -22,7 +22,12 @@ public class LineNumberTextArea extends BorderPane {
         lineNumberArea.setMinWidth(MIN_LINE_NUMBER_WIDTH);
         // 设定自定义样式
         lineNumberArea.getStyleClass().add("text-line-number");
+        lineNumberArea.setStyle("    -fx-border-color: white #dce3e8 white white;\n" +
+                "    -fx-background-color: white  ;" +
+                "-fx-padding: -10px 0px 0px 0px;");
         mainTextArea.getStyleClass().add("main-text-area");
+        mainTextArea.setStyle("-fx-padding: -10px 0px 0px 0px;");
+
         lineNumberArea.textProperty().addListener((observable, oldValue, newValue) -> updateLineNumberWidth());
         mainTextArea.textProperty().addListener((observable, oldValue, newValue) -> updateLineNumberArea());
 
diff --git a/src/main/java/org/jcnc/jnotepad/view/init/View.java b/src/main/java/org/jcnc/jnotepad/view/init/View.java
index 4e99f63..1fba2f7 100644
--- a/src/main/java/org/jcnc/jnotepad/view/init/View.java
+++ b/src/main/java/org/jcnc/jnotepad/view/init/View.java
@@ -2,9 +2,9 @@ package org.jcnc.jnotepad.view.init;
 
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
+import org.jcnc.jnotepad.Interface.LoadJnotepadConfig;
 import org.jcnc.jnotepad.ui.LineNumberTextArea;
 import org.jcnc.jnotepad.controller.manager.Controller;
-import org.jcnc.jnotepad.controller.manager.ShortcutKey;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -24,6 +24,7 @@ public class View {
         EventHandler<ActionEvent> saveAsFileEventHandler = Controller.getInstance().getSaveAsFileEventHandler();
         saveAsItem.setOnAction(saveAsFileEventHandler);
         lineFeedItem.setOnAction(Controller.getInstance().getLineFeedEventHandler(new LineNumberTextArea()));
+        openConfig.setOnAction(Controller.getInstance().getOpenConfigEventHandler());
     }
 
     public void initTabPane() {
@@ -31,8 +32,8 @@ public class View {
     }
 
     // 初始化快捷键
-    public void initShortcutKey(){
-        new ShortcutKey().createShortcutKeyByConfig();
+    public void initShortcutKey(LoadJnotepadConfig loadJnotepadConfig){
+        loadJnotepadConfig.load();
     }
 
 }
diff --git a/src/main/java/org/jcnc/jnotepad/view/manager/ViewManager.java b/src/main/java/org/jcnc/jnotepad/view/manager/ViewManager.java
index d479541..d4fed17 100644
--- a/src/main/java/org/jcnc/jnotepad/view/manager/ViewManager.java
+++ b/src/main/java/org/jcnc/jnotepad/view/manager/ViewManager.java
@@ -24,7 +24,7 @@ public class ViewManager {
     // 菜单栏组件
     public static MenuBar menuBar; //菜单栏
     public static Menu fileMenu, setMenu, pluginMenu; //文件菜单//设置菜单//插件菜单 菜单
-    public static MenuItem newItem, openItem, saveAsItem, addItem, countItem; //新建/打开/保存/保存至//增加//查看 菜单按钮
+    public static MenuItem newItem, openItem, saveAsItem, addItem, countItem, openConfig; //新建/打开/保存/保存至//增加//查看//打开配置文件 菜单按钮
 
     public static CheckMenuItem lineFeedItem; //自动换行点击菜单按钮
     // 主界面布局
@@ -98,8 +98,9 @@ public class ViewManager {
         lineFeedItem = new CheckMenuItem("自动换行");
         itemMap.put("lineFeedItem", lineFeedItem);
         lineFeedItem.selectedProperty().set(true);
-
-        setMenu.getItems().addAll(lineFeedItem);
+        openConfig =  new MenuItem("打开配置文件");
+        itemMap.put("openConfig", openConfig);
+        setMenu.getItems().addAll(lineFeedItem, openConfig);
 
         //插件菜单
         pluginMenu = new Menu("插件");
diff --git a/tool/jpackage.txt b/tool/jpackage.txt
index fe617dd..067e5ae 100644
--- a/tool/jpackage.txt
+++ b/tool/jpackage.txt
@@ -7,6 +7,14 @@ jpackage `
   --app-version 1.1.10 `
   --vendor "JCNC"
 
+jpackage `
+  --name JNotepad `
+  --type app-image `
+  -m com.example.demo/com.example.demo.HelloApplication `
+  --runtime-image .\target\app\ `
+  --app-version 1.1.10 `
+  --vendor "JCNC"
+
 
 jpackage `
   --name demo `
-- 
Gitee