feat: 移除 redission,格式化代码
This commit is contained in:
@@ -31,12 +31,6 @@ dependencies {
|
||||
implementation("com.zaxxer:HikariCP:${hikariVersion}") {
|
||||
exclude(group = "org.slf4j")
|
||||
}
|
||||
val redissionVersion = property("redission_version")
|
||||
implementation("org.redisson:redisson:${redissionVersion}") {
|
||||
exclude(group = "io.netty")
|
||||
exclude(group = "org.yaml")
|
||||
exclude(group = "org.slf4j")
|
||||
}
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
@@ -43,6 +43,8 @@ public class HamsterCorePlugin extends Plugin {
|
||||
Logger logger = getLogger();
|
||||
long start = System.currentTimeMillis();
|
||||
logger.info("仓鼠核心正在关闭...");
|
||||
CoreBungeeAPI.getInstance().getDataSource().close();
|
||||
logger.info("已关闭数据库连接池.");
|
||||
CoreUtils.WORKER_EXECUTOR.shutdownNow();
|
||||
logger.info("已暂停 WORKER_EXECUTOR.");
|
||||
CoreUtils.SCHEDULED_EXECUTOR.shutdownNow();
|
||||
|
@@ -8,19 +8,10 @@ import com.zaxxer.hikari.HikariDataSource;
|
||||
import net.kyori.adventure.platform.AudienceProvider;
|
||||
import net.md_5.bungee.config.Configuration;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.redisson.Redisson;
|
||||
import org.redisson.api.RedissonClient;
|
||||
import org.redisson.config.Config;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
public final class CoreBungeeAPI extends CoreAPI {
|
||||
private final HikariDataSource datasource;
|
||||
private final RedissonClient redissonClient;
|
||||
|
||||
private CoreBungeeAPI() {
|
||||
HamsterCorePlugin plugin = HamsterCorePlugin.getInstance();
|
||||
@@ -47,20 +38,6 @@ public final class CoreBungeeAPI extends CoreAPI {
|
||||
hikariConfig.setValidationTimeout(datasourceConfig.getLong("validation-timeout", 5000));
|
||||
hikariConfig.setPoolName("HamsterCore-Pool");
|
||||
datasource = new HikariDataSource(hikariConfig);
|
||||
|
||||
|
||||
File file = new File(plugin.getDataFolder(), "redission.yml");
|
||||
try {
|
||||
if (!file.exists()) {
|
||||
Files.copy(
|
||||
plugin.getResourceAsStream("redission.yml"),
|
||||
file.toPath(), StandardCopyOption.REPLACE_EXISTING
|
||||
);
|
||||
}
|
||||
redissonClient = Redisson.create(Config.fromYAML(file));
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("redis 连接加载失败!", e);
|
||||
}
|
||||
}
|
||||
|
||||
public static CoreBungeeAPI getInstance() {
|
||||
@@ -83,9 +60,4 @@ public final class CoreBungeeAPI extends CoreAPI {
|
||||
public @NotNull HikariDataSource getDataSource() {
|
||||
return datasource;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull RedissonClient getRedissonClient() {
|
||||
return redissonClient;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user