Fix bugs on database

Author: alazeprt

common/src/main/kotlin/me/regadpole/plumbot/config/ConfigLoader.kt

@@ -1,6 +1,7 @@
 package me.regadpole.plumbot.config
 
 import taboolib.common.platform.function.getDataFolder
+import taboolib.library.configuration.ConfigurationSection
 import taboolib.module.configuration.Configuration
 import taboolib.module.configuration.util.getMap
 import taboolib.module.database.getHost
@@ -9,6 +10,7 @@ class ConfigLoader(config: Configuration, commandsConfig: Configuration, returns
     private val config = Config(config)
     private val commands = Commands(commandsConfig)
     private val returns = Returns(returnsConfig)
+    private val tabooConfig = config
 
 
     class Config(config: Configuration){
@@ -68,10 +70,10 @@ class ConfigLoader(config: Configuration, commandsConfig: Configuration, returns
                 }
             }
             val enable = config.getBoolean("enable")
-            val host = config.getHost("host")
+            val host = config.getString("host")
             val port = config.getInt("port")
             val database = config.getString("database")
-            val username = config.getString("username")
+            val user = config.getString("user")
             val password = config.getString("password")
             val table = config.getString("table")
             val columns = config.getMap<String, String>("columns")
@@ -122,5 +124,8 @@ class ConfigLoader(config: Configuration, commandsConfig: Configuration, returns
     fun getReturns(): Returns {
         return returns
     }
+    fun getMySQLSection(): ConfigurationSection {
+        return tabooConfig.getConfigurationSection("database.settings.mysql")!!
+    }
 
 }

common/src/main/kotlin/me/regadpole/plumbot/database/MySQL.kt

@@ -4,12 +4,13 @@ import me.regadpole.plumbot.PlumBot
 import taboolib.common.platform.function.info
 import taboolib.module.database.ColumnOptionSQL
 import taboolib.module.database.ColumnTypeSQL
+import taboolib.module.database.HostSQL
 import taboolib.module.database.Table
 import javax.sql.DataSource
 
 class MySQL: Database {
 
-    private val host = PlumBot.getConfig().getConfig().database.host
+    private val host = HostSQL(PlumBot.getConfig().getMySQLSection())
     private val dataSource by lazy { host.createDataSource() }
 
     private val table = Table("whitelist", host) {

common/src/main/kotlin/me/regadpole/plumbot/database/SQLite.kt

@@ -3,12 +3,14 @@ package me.regadpole.plumbot.database
 import me.regadpole.plumbot.PlumBot
 import taboolib.common.platform.function.info
 import taboolib.module.database.ColumnTypeSQLite
+import taboolib.module.database.HostSQLite
 import taboolib.module.database.Table
+import java.io.File
 import javax.sql.DataSource
 
 class SQLite: Database {
 
-    private val host = PlumBot.getConfig().getConfig().database.host
+    private val host = HostSQLite(File(PlumBot.getConfig().getConfig().database.settings.sqlite.path!!))
     private val dataSource by lazy { host.createDataSource() }
 
     private val table = Table("whitelist", host) {

common/src/main/resources/config.yml

@@ -66,7 +66,7 @@ database:
       host: localhost
       port: 3306
       database: plumbot
-      username: plumbot
+      user: plumbot
       password: plumbot
       flagsURL: "?useSSL=false"
     # 连接池设置