carm/MineSQL
1
Fork 0
mirror of https://github.com/CarmJos/MineSQL.git synced 2026-06-05 00:48:16 +08:00
Code Releases Activity

feat(cp): Update to newest beecp

Browse Source
This commit is contained in:
Carm Jos
2025-01-26 08:37:05 +08:00
parent 1e2b18026a
commit 31aa49a60b
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/cc/carm/plugin/minesql/MineSQLCore.java
+5 -5
View File
@@ -16,14 +16,14 @@ import cc.carm.plugin.minesql.conf.PluginConfiguration;
import cc.carm.plugin.minesql.conf.SQLSourceGroup; import cc.carm.plugin.minesql.conf.SQLSourceGroup;
import cc.carm.plugin.minesql.lib.PluginLibraries; import cc.carm.plugin.minesql.lib.PluginLibraries;
import cc.carm.plugin.minesql.util.DBPropertiesUtil; import cc.carm.plugin.minesql.util.DBPropertiesUtil;
import cn.beecp.BeeDataSource;
import cn.beecp.BeeDataSourceConfig;
import co.aikar.commands.CommandManager; import co.aikar.commands.CommandManager;
import co.aikar.commands.InvalidCommandArgument; import co.aikar.commands.InvalidCommandArgument;
import co.aikar.commands.Locales; import co.aikar.commands.Locales;
import net.byteflux.libby.Library; import net.byteflux.libby.Library;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.stone.beecp.BeeDataSource;
import org.stone.beecp.BeeDataSourceConfig;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.io.File; import java.io.File;
@@ -143,9 +143,9 @@ public class MineSQLCore implements IMineSQL {
Optional.ofNullable(conf.getSettings().getReadOnly()).ifPresent(config::setDefaultReadOnly); Optional.ofNullable(conf.getSettings().getReadOnly()).ifPresent(config::setDefaultReadOnly);
Optional.ofNullable(conf.getSettings().getSchema()).ifPresent(config::setDefaultSchema); Optional.ofNullable(conf.getSettings().getSchema()).ifPresent(config::setDefaultSchema);
Optional.ofNullable(conf.getSettings().getValidationSQL()).ifPresent(config::setValidTestSql); Optional.ofNullable(conf.getSettings().getValidationSQL()).ifPresent(config::setAliveTestSql);
Optional.ofNullable(conf.getSettings().getValidationTimeout()).ifPresent(config::setValidTestTimeout); Optional.ofNullable(conf.getSettings().getValidationTimeout()).ifPresent(config::setAliveTestTimeout);
Optional.ofNullable(conf.getSettings().getValidationInterval()).ifPresent(config::setValidAssumeTime); Optional.ofNullable(conf.getSettings().getValidationInterval()).ifPresent(config::setTimerCheckInterval);
SQLManagerImpl manager = create(name, config); SQLManagerImpl manager = create(name, config);
if (conf.getInitializer() != null) { if (conf.getInitializer() != null) {
platforms/velocity/src/main/java/cc/carm/plugin/minesql/MineSQLVelocity.java
-1
View File
@@ -123,7 +123,6 @@ public class MineSQLVelocity implements MineSQLPlatform {
return this.dataFolder; return this.dataFolder;
} }
@Override @Override
public @NotNull CommandManager<?, ?, ?, ?, ?, ?> getCommandManager() { public @NotNull CommandManager<?, ?, ?, ?, ?, ?> getCommandManager() {
return commandManager; return commandManager;
pom.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<deps.easysql.version>0.4.7</deps.easysql.version> <deps.easysql.version>0.4.7</deps.easysql.version>
<deps.easyconf.version>3.5.1</deps.easyconf.version> <deps.easyconf.version>3.5.1</deps.easyconf.version>
<deps.easyplugin.version>1.5.5</deps.easyplugin.version> <deps.easyplugin.version>1.5.5</deps.easyplugin.version>
<deps.beecp.version>3.3.9</deps.beecp.version> <deps.beecp.version>4.1.7</deps.beecp.version>
<deps.libby.version>1.1.5</deps.libby.version> <deps.libby.version>1.1.5</deps.libby.version>
<deps.acf.version>0.5.1-SNAPSHOT</deps.acf.version> <deps.acf.version>0.5.1-SNAPSHOT</deps.acf.version>