From 48eed63ee7c300524d08cd59af087fe373e6a25c Mon Sep 17 00:00:00 2001 From: carm Date: Thu, 10 Feb 2022 05:26:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E7=8E=B0=E9=83=A8?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../carm/plugin/easysql/EasySQLManagerImpl.java | 6 +++--- .../plugin/easysql/EasySQLPluginPlatform.java | 3 +++ .../carm/plugin/easysql/util/PropertiesUtil.java | 16 ++++++++++++++++ .../UpdateCheckUtil.java} | 4 ++-- .../cc/carm/plugin/easysql/EasySQLBukkit.java | 13 +++++++++++++ .../cc/carm/plugin/easysql/EasySQLBungee.java | 8 ++++++++ 7 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/PropertiesUtil.java rename easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/{UpdateChecker.java => util/UpdateCheckUtil.java} (94%) diff --git a/README.md b/README.md index 8aa9898..c4db872 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,4 @@ |___/ |___/ ``` -# EasySQL-Plugin ~~~~ \ No newline at end of file +# EasySQL-Plugin \ No newline at end of file diff --git a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/EasySQLManagerImpl.java b/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/EasySQLManagerImpl.java index 5cff04c..9f6e0f8 100644 --- a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/EasySQLManagerImpl.java +++ b/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/EasySQLManagerImpl.java @@ -22,7 +22,7 @@ public class EasySQLManagerImpl implements EasySQLManager { Map configurations = platform.readConfigurations(); if (configurations.isEmpty()) { - platform.getLogger().warning("No database configurations found. Skipping SQLManager initialization."); + platform.getLogger().warning("未检测到任何数据库配置，将不会创建任何SQLManager。"); return; } @@ -31,7 +31,7 @@ public class EasySQLManagerImpl implements EasySQLManager { SQLManager sqlManager = create(id, configuration); this.sqlManagerRegistry.put(id, sqlManager); } catch (Exception exception) { - platform.getLogger().warning("Failed to initialize SQLManager #" + id + " ."); + platform.getLogger().warning("初始化SQLManager(#" + id + ") 出错，请检查配置文件."); exception.printStackTrace(); } }); @@ -41,7 +41,7 @@ public class EasySQLManagerImpl implements EasySQLManager { @Override public @NotNull SQLManager get(@Nullable String id) throws NullPointerException { if (!this.sqlManagerRegistry.containsKey(id)) { - throw new NullPointerException("SQLManager #" + id + " does not exist."); + throw new NullPointerException("并不存在ID为 #" + id + " 的SQLManager."); } return this.sqlManagerRegistry.get(id); } diff --git a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/EasySQLPluginPlatform.java b/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/EasySQLPluginPlatform.java index a77161b..cb17095 100644 --- a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/EasySQLPluginPlatform.java +++ b/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/EasySQLPluginPlatform.java @@ -4,12 +4,15 @@ import cc.carm.plugin.easysql.api.DBConfiguration; import org.jetbrains.annotations.NotNull; import java.util.Map; +import java.util.Properties; import java.util.logging.Logger; public interface EasySQLPluginPlatform { @NotNull Map readConfigurations(); + @NotNull Map readProperties(); + Logger getLogger(); } diff --git a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/PropertiesUtil.java b/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/PropertiesUtil.java new file mode 100644 index 0000000..bd55ec6 --- /dev/null +++ b/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/PropertiesUtil.java @@ -0,0 +1,16 @@ +package cc.carm.plugin.easysql.util; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +public class PropertiesUtil { + + public static Map readDBProperties(File propertiesFolder) { + Map propertiesMap = new HashMap<>(); + + return propertiesMap; + } + +} diff --git a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/UpdateChecker.java b/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/UpdateCheckUtil.java similarity index 94% rename from easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/UpdateChecker.java rename to easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/UpdateCheckUtil.java index 0d8dfe4..0e27cf1 100644 --- a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/UpdateChecker.java +++ b/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/UpdateCheckUtil.java @@ -1,10 +1,10 @@ -package cc.carm.plugin.easysql; +package cc.carm.plugin.easysql.util; import cc.carm.lib.githubreleases4j.GithubReleases4J; import java.util.logging.Logger; -public class UpdateChecker { +public class UpdateCheckUtil { public static final String REPO_OWNER = "CarmJos"; public static final String REPO_NAME = "EasySQL-Plugin"; 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 31d64de..45e25fa 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 @@ -1,14 +1,22 @@ package cc.carm.plugin.easysql; import cc.carm.lib.easyplugin.EasyPlugin; +import cc.carm.lib.easyplugin.i18n.EasyPluginMessageProvider; import cc.carm.plugin.easysql.api.DBConfiguration; +import cc.carm.plugin.easysql.util.PropertiesUtil; import org.jetbrains.annotations.NotNull; +import java.io.File; import java.util.HashMap; import java.util.Map; +import java.util.Properties; public class EasySQLBukkit extends EasyPlugin implements EasySQLPluginPlatform { + public EasySQLBukkit() { + super(new EasyPluginMessageProvider.zh_CN()); + } + @Override protected void load() { @@ -24,6 +32,11 @@ public class EasySQLBukkit extends EasyPlugin implements EasySQLPluginPlatform { return new HashMap<>(); } + @Override + public @NotNull Map readProperties() { + return PropertiesUtil.readDBProperties(new File(getDataFolder(), "properties")); + } + @Override public void outputInfo() { log("\n" + diff --git a/platforms/easysql-plugin-bungee/src/main/java/cc/carm/plugin/easysql/EasySQLBungee.java b/platforms/easysql-plugin-bungee/src/main/java/cc/carm/plugin/easysql/EasySQLBungee.java index b7876ee..52e0591 100644 --- a/platforms/easysql-plugin-bungee/src/main/java/cc/carm/plugin/easysql/EasySQLBungee.java +++ b/platforms/easysql-plugin-bungee/src/main/java/cc/carm/plugin/easysql/EasySQLBungee.java @@ -1,6 +1,7 @@ package cc.carm.plugin.easysql; import cc.carm.plugin.easysql.api.DBConfiguration; +import cc.carm.plugin.easysql.util.PropertiesUtil; import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.ConfigurationProvider; @@ -13,6 +14,7 @@ import java.io.InputStream; import java.nio.file.Files; import java.util.HashMap; import java.util.Map; +import java.util.Properties; public class EasySQLBungee extends Plugin implements EasySQLPluginPlatform { @@ -71,4 +73,10 @@ public class EasySQLBungee extends Plugin implements EasySQLPluginPlatform { return new HashMap<>(); } + @Override + public @NotNull Map readProperties() { + return PropertiesUtil.readDBProperties(new File(getDataFolder(), "properties")); + } + + }