From 017156b0ebb02d8c1afa789d3c5e337f90cd145d Mon Sep 17 00:00:00 2001
From: songdragon <songdragon@zts.io>
Date: Fri, 25 Aug 2023 00:25:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=B8=8B.jnotepad=E4=BD=9C=E4=B8=BA=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=85=8D=E7=BD=AE=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/config/LoadJnotepadConfig.java        |  5 ++++-
 .../java/org/jcnc/jnotepad/init/Config.java   | 19 +++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jcnc/jnotepad/app/config/LoadJnotepadConfig.java b/src/main/java/org/jcnc/jnotepad/app/config/LoadJnotepadConfig.java
index e63657f..89843ef 100644
--- a/src/main/java/org/jcnc/jnotepad/app/config/LoadJnotepadConfig.java
+++ b/src/main/java/org/jcnc/jnotepad/app/config/LoadJnotepadConfig.java
@@ -3,12 +3,14 @@ package org.jcnc.jnotepad.app.config;
 import javafx.scene.control.MenuItem;
 import javafx.scene.input.KeyCombination;
 import org.jcnc.jnotepad.app.entity.ShortcutKey;
+import org.jcnc.jnotepad.init.Config;
 import org.jcnc.jnotepad.tool.LogUtil;
 import org.jcnc.jnotepad.tool.PopUpUtil;
 import org.jcnc.jnotepad.ui.menu.JNotepadMenuBar;
 import org.slf4j.Logger;
 
 import java.io.*;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -51,7 +53,8 @@ public abstract class LoadJnotepadConfig {
             // 动态添加快捷键
             menuItem.setAccelerator(KeyCombination.keyCombination(shortKeyValue));
         }
-        try (BufferedWriter writer = new BufferedWriter(new FileWriter(CONFIG_NAME))) {
+        String jsonConfigPath= Paths.get(new Config().getAppConfigDir(), CONFIG_NAME).toString();
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(jsonConfigPath))) {
             writer.write(JNOTEPAD_CONFIG);
         } catch (IOException e) {
             PopUpUtil.errorAlert("错误", "读写错误", "配置文件读写错误!");
diff --git a/src/main/java/org/jcnc/jnotepad/init/Config.java b/src/main/java/org/jcnc/jnotepad/init/Config.java
index 5b646d6..b9e45d9 100644
--- a/src/main/java/org/jcnc/jnotepad/init/Config.java
+++ b/src/main/java/org/jcnc/jnotepad/init/Config.java
@@ -5,6 +5,7 @@ import org.slf4j.Logger;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
 import java.util.Properties;
 
 import static org.jcnc.jnotepad.constants.AppConstants.CH_LANGUAGE_PACK_NAME;
@@ -20,8 +21,17 @@ public class Config {
 
     private String languagePackName;
 
+    private String appConfigDir;
     Logger logger = LogUtil.getLogger(this.getClass());
 
+    public Config() {
+        appConfigDir = System.getProperty("user.home") + File.separator + ".jnotepad";
+        boolean isConfigDirReady = Paths.get(appConfigDir).toFile().mkdirs();
+        if (!isConfigDirReady) {
+            appConfigDir = "/tmp";
+        }
+    }
+
     /**
      * 从文件中读取属性配置。
      *
@@ -51,7 +61,8 @@ public class Config {
 
         Properties enLanguagePack = getEnglishLanguagePack();
 
-        try (OutputStream outputStream = new FileOutputStream(CH_LANGUAGE_PACK_NAME)) {
+        String chineseFilePath = Paths.get(appConfigDir, CH_LANGUAGE_PACK_NAME).toString();
+        try (OutputStream outputStream = new FileOutputStream(chineseFilePath)) {
             OutputStreamWriter writer = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8);  // 使用 UTF-8 编码
             chLanguagePack.store(writer, JNOTEPAD_CH_LANGUAGE_PACK_NAME);
 
@@ -59,7 +70,8 @@ public class Config {
             logger.info("未检测到中文语言包!");
         }
 
-        try (OutputStream outputStream = new FileOutputStream(EN_LANGUAGE_PACK_NAME)) {
+        String enFilePath = Paths.get(appConfigDir, EN_LANGUAGE_PACK_NAME).toString();
+        try (OutputStream outputStream = new FileOutputStream(enFilePath)) {
             OutputStreamWriter writer = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8);  // 使用 UTF-8 编码
             enLanguagePack.store(writer, JNOTEPAD_EN_LANGUAGE_PACK_NAME);
 
@@ -114,4 +126,7 @@ public class Config {
         return properties;
     }
 
+    public String getAppConfigDir() {
+        return appConfigDir;
+    }
 }