From 9e6d39469d40a40b40653625084682449a5ccd4d Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Sun, 20 Aug 2023 16:46:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=20redission=EF=BC=8C?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core-bukkit/build.gradle.kts | 6 ---- .../plugin/core/bukkit/HamsterCorePlugin.java | 8 ++++-- .../plugin/core/bukkit/api/CoreBukkitAPI.java | 28 ------------------- .../bukkit/page/handler/PageableHandler.java | 8 +++--- core-bungeecord/build.gradle.kts | 6 ---- .../plugin/core/bungee/HamsterCorePlugin.java | 2 ++ .../plugin/core/bungee/api/CoreBungeeAPI.java | 28 ------------------- core-common/build.gradle.kts | 7 ----- .../mc/plugin/core/common/api/CoreAPI.java | 4 --- .../mc/plugin/core/common/util/CoreUtils.java | 2 +- gradle.properties | 1 - 11 files changed, 12 insertions(+), 88 deletions(-) diff --git a/core-bukkit/build.gradle.kts b/core-bukkit/build.gradle.kts index 319e7ed..c62e1c3 100644 --- a/core-bukkit/build.gradle.kts +++ b/core-bukkit/build.gradle.kts @@ -38,12 +38,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 { diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java index 3940e4b..d0a3958 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java @@ -13,9 +13,9 @@ import cn.hamster3.mc.plugin.core.bukkit.page.listener.PageListener; import cn.hamster3.mc.plugin.core.bukkit.util.serializer.ItemStackAdapter; import cn.hamster3.mc.plugin.core.bukkit.util.serializer.PotionEffectAdapter; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; +import cn.hamster3.mc.plugin.core.common.util.CoreUtils; import cn.hamster3.mc.plugin.core.common.util.serializer.ComponentTypeAdapter; import cn.hamster3.mc.plugin.core.common.util.serializer.MessageTypeAdapter; -import cn.hamster3.mc.plugin.core.common.util.CoreUtils; import com.google.gson.GsonBuilder; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import net.kyori.adventure.text.Component; @@ -78,12 +78,12 @@ public class HamsterCorePlugin extends JavaPlugin { ParentLoreCommand.INSTANCE.hook(); long time = System.currentTimeMillis() - start; logger.info("仓鼠核心启动完成，总计耗时 " + time + " ms."); - Bukkit.getScheduler().runTaskLater(this, ()->{ + Bukkit.getScheduler().runTaskLater(this, () -> { PointAPI.reloadPlayerPointAPIHook(); logger.info("已完成 PlayerPoints 挂载."); VaultAPI.reloadVaultHook(); logger.info("已完成 VaultAPI 挂载."); - },1L); + }, 1L); } @Override @@ -91,6 +91,8 @@ public class HamsterCorePlugin extends JavaPlugin { Logger logger = getLogger(); long start = System.currentTimeMillis(); logger.info("仓鼠核心正在关闭..."); + CoreBukkitAPI.getInstance().getDataSource().close(); + logger.info("已关闭数据库连接池."); CoreUtils.WORKER_EXECUTOR.shutdownNow(); logger.info("已暂停 WORKER_EXECUTOR."); CoreUtils.SCHEDULED_EXECUTOR.shutdownNow(); diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java index 673d951..da7f755 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java @@ -8,20 +8,10 @@ import net.kyori.adventure.platform.bukkit.BukkitAudiences; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; 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; -import java.util.Objects; @SuppressWarnings("unused") public final class CoreBukkitAPI extends CoreAPI { private final HikariDataSource datasource; - private final RedissonClient redissonClient; private CoreBukkitAPI() { HamsterCorePlugin plugin = HamsterCorePlugin.getInstance(); @@ -48,19 +38,6 @@ public final class CoreBukkitAPI 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( - Objects.requireNonNull(plugin.getResource("redission.yml")), - file.toPath(), StandardCopyOption.REPLACE_EXISTING - ); - } - redissonClient = Redisson.create(Config.fromYAML(file)); - } catch (IOException e) { - throw new RuntimeException("redis 连接加载失败!", e); - } } public static CoreBukkitAPI getInstance() { @@ -83,9 +60,4 @@ public final class CoreBukkitAPI extends CoreAPI { public @NotNull HikariDataSource getDataSource() { return datasource; } - - @Override - public @NotNull RedissonClient getRedissonClient() { - return redissonClient; - } } diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageableHandler.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageableHandler.java index a2f3b91..04900fc 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageableHandler.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageableHandler.java @@ -60,6 +60,10 @@ public abstract class PageableHandler extends FixedPageHandler { return elementButtonName; } + public void setElementButtonName(String elementButtonName) { + this.elementButtonName = elementButtonName; + } + @NotNull public String getElementButtonName(@NotNull E element) { return elementButtonName; @@ -218,8 +222,4 @@ public abstract class PageableHandler extends FixedPageHandler { public void setBarrierButtonName(String barrierButtonName) { this.barrierButtonName = barrierButtonName; } - - public void setElementButtonName(String elementButtonName) { - this.elementButtonName = elementButtonName; - } } diff --git a/core-bungeecord/build.gradle.kts b/core-bungeecord/build.gradle.kts index b495218..b4138ab 100644 --- a/core-bungeecord/build.gradle.kts +++ b/core-bungeecord/build.gradle.kts @@ -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 { diff --git a/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java b/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java index 3e34f5c..c662c78 100644 --- a/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java +++ b/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java @@ -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(); diff --git a/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java b/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java index 79caa40..c93e75d 100644 --- a/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java +++ b/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java @@ -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; - } } diff --git a/core-common/build.gradle.kts b/core-common/build.gradle.kts index e6be1c1..bfe04ff 100644 --- a/core-common/build.gradle.kts +++ b/core-common/build.gradle.kts @@ -25,13 +25,6 @@ dependencies { implementation("net.kyori:adventure-text-serializer-legacy:${adventureSerializerVersion}") { exclude(group = "org.jetbrains") } - - val redissionVersion = property("redission_version") - implementation("org.redisson:redisson:${redissionVersion}") { - exclude(group = "io.netty") - exclude(group = "org.yaml") - exclude(group = "org.slf4j") - } } tasks { diff --git a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java index 799b139..fa0c541 100644 --- a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java +++ b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java @@ -2,7 +2,6 @@ package cn.hamster3.mc.plugin.core.common.api; import net.kyori.adventure.platform.AudienceProvider; import org.jetbrains.annotations.NotNull; -import org.redisson.api.RedissonClient; import javax.sql.DataSource; import java.sql.Connection; @@ -26,7 +25,4 @@ public abstract class CoreAPI { public Connection getConnection() throws SQLException { return getDataSource().getConnection(); } - - @NotNull - public abstract RedissonClient getRedissonClient(); } diff --git a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java index 38105c2..8d02855 100644 --- a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java +++ b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java @@ -1,9 +1,9 @@ package cn.hamster3.mc.plugin.core.common.util; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; +import cn.hamster3.mc.plugin.core.common.thread.NamedThreadFactory; import cn.hamster3.mc.plugin.core.common.util.serializer.ComponentTypeAdapter; import cn.hamster3.mc.plugin.core.common.util.serializer.MessageTypeAdapter; -import cn.hamster3.mc.plugin.core.common.thread.NamedThreadFactory; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; diff --git a/gradle.properties b/gradle.properties index 0b8694a..1e44958 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,3 @@ org.gradle.jvmargs=-Xmx2G adventure_version=4.3.0 adventure_serializer_version=4.14.0 HikariCP_version=4.0.3 -redission_version=3.23.2