From 2b2ed2a87e4eda798000adc93c4feca63d9ccaf1 Mon Sep 17 00:00:00 2001 From: pingguomc <141195321+pingguomc@users.noreply.github.com> Date: Mon, 9 Jun 2025 15:29:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?test:=20=E5=AE=9E=E7=8E=B0=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E7=AE=A1=E7=90=86=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redstarlib/impl/ImplConfigManager.java | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/top/redstarmc/plugin/redstarlib/impl/ImplConfigManager.java b/src/main/java/top/redstarmc/plugin/redstarlib/impl/ImplConfigManager.java index 6ebce36..661985e 100644 --- a/src/main/java/top/redstarmc/plugin/redstarlib/impl/ImplConfigManager.java +++ b/src/main/java/top/redstarmc/plugin/redstarlib/impl/ImplConfigManager.java @@ -7,7 +7,6 @@ import java.io.File; import java.util.Map; -import java.util.Objects; public class ImplConfigManager extends ConfigurationManager { @@ -16,29 +15,29 @@ public class ImplConfigManager extends ConfigurationManager { .toMap(); - private static final File config_file = new File(RedStarLib.getInstance().getDataFolder(),"config.yml"); - - private static YamlConfiguration config; + private static final File config_file = new File(RedStarLib.getInstance().getDataFolder(),"plugin.yml"); private static final String versioning = "0.0.0"; public ImplConfigManager(){ - super(config_file, config); + super(config_file); } @Override public void init() { - config = initFile(); - - if (!Objects.equals(config.getString("Versioning"), versioning)) { + YamlConfiguration config = getConfig(); - config = new YamlConfiguration(); + saveJarConfig("plugin.yml", RedStarLib.getInstance()); - saveMapConfig(default_config); - config.set("Versioning", versioning); - save(); - } +// if (!Objects.equals(config.getString("Versioning"), versioning)) { +// +// config = new YamlConfiguration(); +// +// saveMapConfig(default_config); +// config.set("Versioning", versioning); +// save(); +// } } } From be8acd35b3630ebc873949612ea70c8bbcfe7e0b Mon Sep 17 00:00:00 2001 From: pingguomc <141195321+pingguomc@users.noreply.github.com> Date: Mon, 9 Jun 2025 15:59:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redstarlib/manager/DataBaseManager.java | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 src/main/java/top/redstarmc/plugin/redstarlib/manager/DataBaseManager.java diff --git a/src/main/java/top/redstarmc/plugin/redstarlib/manager/DataBaseManager.java b/src/main/java/top/redstarmc/plugin/redstarlib/manager/DataBaseManager.java new file mode 100644 index 0000000..59e494b --- /dev/null +++ b/src/main/java/top/redstarmc/plugin/redstarlib/manager/DataBaseManager.java @@ -0,0 +1,66 @@ +package top.redstarmc.plugin.redstarlib.manager; + +import cc.carm.lib.easysql.api.SQLManager; +import cc.carm.lib.easysql.api.function.SQLDebugHandler; +import cc.carm.lib.easysql.hikari.HikariConfig; +import cc.carm.lib.easysql.hikari.HikariDataSource; +import cc.carm.lib.easysql.manager.SQLManagerImpl; +import org.jetbrains.annotations.NotNull; + +import java.util.Properties; + +public abstract class DataBaseManager { + + SQLManager sqlManager; + + public DataBaseManager(@NotNull Properties properties){ + create(new HikariDataSource(new HikariConfig(properties))); + sqlManager.setDebugMode(false); + } + + public DataBaseManager(@NotNull HikariConfig config){ + create(new HikariDataSource(config)); + sqlManager.setDebugMode(false); + } + + public DataBaseManager(boolean debugMode, @NotNull Properties properties){ + create(new HikariDataSource(new HikariConfig(properties))); + sqlManager.setDebugMode(debugMode); + } + + + public DataBaseManager(boolean debugMode,@NotNull HikariConfig config){ + create(new HikariDataSource(config)); + sqlManager.setDebugMode(debugMode); + } + + public DataBaseManager(boolean debugMode, U debugHandler, @NotNull Properties properties){ + create(new HikariDataSource(new HikariConfig(properties))); + sqlManager.setDebugMode(debugMode); + sqlManager.setDebugHandler(debugHandler); + } + + public DataBaseManager(boolean debugMode, U debugHandler,@NotNull HikariConfig config){ + create(new HikariDataSource(config)); + sqlManager.setDebugMode(debugMode); + sqlManager.setDebugHandler(debugHandler); + } + + public DataBaseManager(boolean debugMode, U debugHandler, HikariDataSource config){ + sqlManager = new SQLManagerImpl(config); + sqlManager.setDebugMode(debugMode); + sqlManager.setDebugHandler(debugHandler); + } + + private void create(@NotNull HikariDataSource hikariDataSource){ + sqlManager = new SQLManagerImpl(hikariDataSource); + } + + public SQLManager getSqlManager() { + return sqlManager; + } + + public SQLManager getSM() { + return sqlManager; + } +} From f298ff641e9ccd7c1fcad16a7ab73f2c692b3c4d Mon Sep 17 00:00:00 2001 From: pingguomc <141195321+pingguomc@users.noreply.github.com> Date: Tue, 10 Jun 2025 22:20:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?del:=20=E7=BA=BF=E7=A8=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redstarmc/plugin/redstarlib/manager/ThreadManager.java | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 src/main/java/top/redstarmc/plugin/redstarlib/manager/ThreadManager.java diff --git a/src/main/java/top/redstarmc/plugin/redstarlib/manager/ThreadManager.java b/src/main/java/top/redstarmc/plugin/redstarlib/manager/ThreadManager.java deleted file mode 100644 index bfa6d05..0000000 --- a/src/main/java/top/redstarmc/plugin/redstarlib/manager/ThreadManager.java +++ /dev/null @@ -1,4 +0,0 @@ -package top.redstarmc.plugin.redstarlib.manager; - -public abstract class ThreadManager { -}