diff --git a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/DBPropertiesUtil.java b/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/DBPropertiesUtil.java index 7e149a0..845dbd1 100644 --- a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/DBPropertiesUtil.java +++ b/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/DBPropertiesUtil.java @@ -1,5 +1,6 @@ package cc.carm.plugin.easysql.util; +import cc.carm.plugin.easysql.util.JarResourceUtils; import org.jetbrains.annotations.NotNull; import java.io.File; @@ -14,7 +15,7 @@ public class DBPropertiesUtil { public static Map readFromFolder(File propertiesFolder) { Map propertiesMap = new HashMap<>(); - if (!propertiesFolder.isDirectory()) return propertiesMap; + if (!propertiesFolder.exists() || !propertiesFolder.isDirectory()) return propertiesMap; File[] files = propertiesFolder.listFiles(); if (files == null || files.length == 0) return propertiesMap; diff --git a/platforms/easysql-plugin-bukkit/src/main/java/cc/carm/plugin/easysql/EasySQLBukkit.java b/platforms/easysql-plugin-bukkit/src/main/java/cc/carm/plugin/easysql/EasySQLBukkit.java index 171488c..548ba61 100644 --- a/platforms/easysql-plugin-bukkit/src/main/java/cc/carm/plugin/easysql/EasySQLBukkit.java +++ b/platforms/easysql-plugin-bukkit/src/main/java/cc/carm/plugin/easysql/EasySQLBukkit.java @@ -4,8 +4,8 @@ import cc.carm.lib.easyplugin.EasyPlugin; import cc.carm.lib.easyplugin.i18n.EasyPluginMessageProvider; import cc.carm.lib.easysql.api.SQLManager; import cc.carm.plugin.easysql.api.DBConfiguration; -import cc.carm.plugin.easysql.util.JarResourceUtils; import cc.carm.plugin.easysql.util.DBPropertiesUtil; +import cc.carm.plugin.easysql.util.JarResourceUtils; import cn.beecp.BeeDataSource; import co.aikar.commands.PaperCommandManager; import org.bstats.bukkit.Metrics; @@ -111,7 +111,20 @@ public class EasySQLBukkit extends EasyPlugin implements EasySQLPluginPlatform { if (!getConfiguration().isPropertiesEnabled()) return new HashMap<>(); String propertiesFolder = getConfiguration().getPropertiesFolder(); if (propertiesFolder == null || propertiesFolder.length() == 0) return new HashMap<>(); - else return DBPropertiesUtil.readFromFolder(new File(getDataFolder(), propertiesFolder)); + + File file = new File(getDataFolder(), propertiesFolder); + if (!file.exists() || !file.isDirectory()) { + try { + JarResourceUtils.copyFolderFromJar( + "db-properties", file, + JarResourceUtils.CopyOption.COPY_IF_NOT_EXIST + ); + } catch (Exception ex) { + error("初始化properties示例文件失败:" + ex.getMessage()); + } + } + + return DBPropertiesUtil.readFromFolder(file); } @Override