From 78574d692e09d068d9e6b1c8c4232a64a4a4816a Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Sat, 16 Mar 2024 10:12:57 +0800
Subject: [PATCH] =?UTF-8?q?docs:=20=E4=BF=AE=E6=AD=A3=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java | 8 ++++----
 core-bukkit/src/main/resources/config.yml                 | 4 ++--
 .../hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java | 2 +-
 core-bungee/src/main/resources/config.yml                 | 5 ++---
 .../cn/hamster3/mc/plugin/core/common/api/CoreAPI.java    | 5 ++---
 5 files changed, 11 insertions(+), 13 deletions(-)

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 8bcc78e..af17474 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
@@ -27,7 +27,7 @@ public final class CoreBukkitAPI extends CoreAPI {
     @NotNull
     private final Gson gson;
     @NotNull
-    private final Gson humanGson;
+    private final Gson gsonHuman;
 
     private CoreBukkitAPI(@NotNull ConfigSection config) {
         super(config);
@@ -38,7 +38,7 @@ public final class CoreBukkitAPI extends CoreAPI {
                 .registerTypeAdapter(MinecraftVersion.getCraftBukkitClassSilent("inventory.CraftItemStack"), ItemStackAdapter.INSTANCE)
                 .registerTypeAdapter(PotionEffect.class, PotionEffectAdapter.INSTANCE)
                 .create();
-        humanGson = new GsonBuilder()
+        gsonHuman = new GsonBuilder()
                 .registerTypeAdapter(Component.class, ComponentTypeAdapter.INSTANCE)
                 .registerTypeAdapter(DisplayMessage.class, MessageTypeAdapter.INSTANCE)
                 .registerTypeAdapter(ItemStack.class, ItemStackAdapter.INSTANCE)
@@ -72,8 +72,8 @@ public final class CoreBukkitAPI extends CoreAPI {
     }
 
     @Override
-    public @NotNull Gson getHumanGson() {
-        return humanGson;
+    public @NotNull Gson getGsonHuman() {
+        return gsonHuman;
     }
 
     @Override
diff --git a/core-bukkit/src/main/resources/config.yml b/core-bukkit/src/main/resources/config.yml
index def002f..f05abda 100644
--- a/core-bukkit/src/main/resources/config.yml
+++ b/core-bukkit/src/main/resources/config.yml
@@ -2,9 +2,9 @@
 #   完整格式如下：
 #     redis://用户名:密码@主机名:端口/数据库索引?参数名=参数值&参数名=参数值
 #   若没有设置 redis 用户名，但设置了密码，则可以使用以下格式：
-#     redis://密码@localhost:6379/0?clientName=HamsterCore
+#     redis://:密码@localhost:6379?clientName=HamsterCore
 #   若没有设置 redis 用户名，也没有设置密码，则可以使用以下格式：
-#     redis://localhost:6379/0?clientName=HamsterCore
+#     redis://localhost:6379?clientName=HamsterCore
 # 若不设置数据库，则默认使用 0
 redis-url: "redis://localhost:6379/0?clientName=HamsterCore&timeout=5s"
 
diff --git a/core-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java b/core-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java
index cb8c4da..cc8ea98 100644
--- a/core-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java
+++ b/core-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java
@@ -61,7 +61,7 @@ public final class CoreBungeeAPI extends CoreAPI {
     }
 
     @Override
-    public @NotNull Gson getHumanGson() {
+    public @NotNull Gson getGsonHuman() {
         return humanGson;
     }
 
diff --git a/core-bungee/src/main/resources/config.yml b/core-bungee/src/main/resources/config.yml
index 1007648..f5bce48 100644
--- a/core-bungee/src/main/resources/config.yml
+++ b/core-bungee/src/main/resources/config.yml
@@ -2,12 +2,11 @@
 #   完整格式如下：
 #     redis://用户名:密码@主机名:端口/数据库索引?参数名=参数值&参数名=参数值
 #   若没有设置 redis 用户名，但设置了密码，则可以使用以下格式：
-#     redis://密码@localhost:6379?clientName=HamsterCore
+#     redis://:密码@localhost:6379?clientName=HamsterCore
 #   若没有设置 redis 用户名，也没有设置密码，则可以使用以下格式：
 #     redis://localhost:6379?clientName=HamsterCore
 # 若不设置数据库，则默认使用 0
-# 详细信息：https://github.com/lettuce-io/lettuce-core/wiki/Redis-URI-and-connection-details
-redis-url: "redis://localhost:6379?clientName=HamsterCore&timeout=5s"
+redis-url: "redis://localhost:6379/0?clientName=HamsterCore&timeout=5s"
 
 datasource:
   # 数据库链接驱动地址
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 c92cbf1..8267738 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
@@ -11,7 +11,6 @@ import org.jetbrains.annotations.NotNull;
 import redis.clients.jedis.JedisPool;
 
 import javax.sql.DataSource;
-import java.net.URI;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.concurrent.ExecutorService;
@@ -51,7 +50,7 @@ public abstract class CoreAPI {
         scheduledService = Executors.newScheduledThreadPool(1, new NamedThreadFactory("HamsterCore - Scheduler"));
 
         getLogger().info("正在创建 Redis 连接池");
-        jedisPool = new JedisPool(URI.create(config.getString("redis-url", "redis://localhost:6379/0?clientName=HamsterCore&timeout=5s")));
+        jedisPool = new JedisPool(config.getString("redis-url"));
         getLogger().info("Redis 连接池创建完成");
 
         ConfigSection datasourceConfig = config.getSection("datasource");
@@ -112,7 +111,7 @@ public abstract class CoreAPI {
      * @return GSON 工具，会使用格式化输出、且解析中包含null参数
      */
     @NotNull
-    public abstract Gson getHumanGson();
+    public abstract Gson getGsonHuman();
 
     @NotNull
     public abstract AudienceProvider getAudienceProvider();