From f3c5ff6eb65d61573b7c9e47b25627e1e22b4605 Mon Sep 17 00:00:00 2001
From: CarmJos <KarmunJ@outlook.com>
Date: Fri, 25 Feb 2022 05:43:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AF=BB=E5=8F=96=E6=96=B9=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=BF=E5=85=B6=E6=9B=B4=E7=AE=80=E5=8D=95=E6=98=8E=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../storage/database/DBConfiguration.java        | 16 +++++++++++++---
 .../storage/database/MySQLStorage.java           |  3 ++-
 src/main/resources/config.yml                    |  6 +++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cc/carm/plugin/moeteleport/storage/database/DBConfiguration.java b/src/main/java/cc/carm/plugin/moeteleport/storage/database/DBConfiguration.java
index d1b04a5..382536e 100644
--- a/src/main/java/cc/carm/plugin/moeteleport/storage/database/DBConfiguration.java
+++ b/src/main/java/cc/carm/plugin/moeteleport/storage/database/DBConfiguration.java
@@ -9,9 +9,19 @@ public class DBConfiguration {
             "com.mysql.cj.jdbc.Driver"
     );
 
-    protected static final ConfigValue<String> URL = new ConfigValue<>(
-            "storage.mysql.url", String.class,
-            "jdbc:mysql://127.0.0.1:3306/minecraft"
+    protected static final ConfigValue<String> HOST = new ConfigValue<>(
+            "storage.mysql.host", String.class,
+            "127.0.0.1"
+    );
+
+    protected static final ConfigValue<Integer> PORT = new ConfigValue<>(
+            "storage.mysql.port", Integer.class,
+            3306
+    );
+
+    protected static final ConfigValue<String> DATABASE = new ConfigValue<>(
+            "storage.mysql.database", String.class,
+            "minecraft"
     );
 
     protected static final ConfigValue<String> USERNAME = new ConfigValue<>(
diff --git a/src/main/java/cc/carm/plugin/moeteleport/storage/database/MySQLStorage.java b/src/main/java/cc/carm/plugin/moeteleport/storage/database/MySQLStorage.java
index ab9b3b4..5647766 100644
--- a/src/main/java/cc/carm/plugin/moeteleport/storage/database/MySQLStorage.java
+++ b/src/main/java/cc/carm/plugin/moeteleport/storage/database/MySQLStorage.java
@@ -24,7 +24,8 @@ public class MySQLStorage implements DataStorage {
         try {
             Main.log("	尝试连接到数据库...");
             this.sqlManager = EasySQL.createManager(
-                    DBConfiguration.DRIVER_NAME.get(), DBConfiguration.URL.get(),
+                    DBConfiguration.DRIVER_NAME.get(),
+                    DBConfiguration.HOST.get() + ":" + DBConfiguration.PORT.get() + "/" + DBConfiguration.DATABASE.get(),
                     DBConfiguration.USERNAME.get(), DBConfiguration.PASSWORD.get()
             );
         } catch (Exception exception) {
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index e6287b3..e2cde54 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -33,9 +33,13 @@ storage:
   mysql:
     # 数据库驱动路径
     driver: "com.mysql.cj.jdbc.Driver"
-    url: "jdbc:mysql://127.0.0.1:3306/<db-name>"
+    # 数据库连接配置
+    host: "127.0.0.1"
+    port: 3306
+    database: "minecraft"
     username: "username"
     password: "password"
+    # 插件相关表的名称
     tables:
       last-location: "mt_last_locations"
       home: "mt_homes"