carm/MineSQL
carm/MineSQL
1
Fork 0
mirror of https://github.com/CarmJos/MineSQL.git synced 2024-09-19 12:15:45 +00:00
Code Releases Activity

完善Properties读取与初始化

Browse Source
This commit is contained in:
Carm Jos 2022-02-24 04:47:33 +08:00
parent 869a5df1fd
commit 7511125648
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/DBPropertiesUtil.java
View File

@ -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<String, Properties> readFromFolder(File propertiesFolder) {
Map<String, Properties> 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;

17
platforms/easysql-plugin-bukkit/src/main/java/cc/carm/plugin/easysql/EasySQLBukkit.java
View File

@ -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