From 7328e9aff1c8ed7be5b47ab0fca75e0df75432d8 Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Fri, 14 Jun 2024 14:17:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E8=BF=9E=E6=8E=A5=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                    | 2 +-
 src/main/java/cn/lunadeer/dominion/Dominion.java           | 2 +-
 .../java/cn/lunadeer/dominion/managers/ConfigManager.java  | 7 -------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9a91d37..d78c077 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.lunadeer</groupId>
     <artifactId>Dominion</artifactId>
-    <version>1.31.4-beta</version>
+    <version>1.31.5-beta</version>
     <packaging>jar</packaging>
 
     <name>Dominion</name>
diff --git a/src/main/java/cn/lunadeer/dominion/Dominion.java b/src/main/java/cn/lunadeer/dominion/Dominion.java
index 23dd2d4..16417bc 100644
--- a/src/main/java/cn/lunadeer/dominion/Dominion.java
+++ b/src/main/java/cn/lunadeer/dominion/Dominion.java
@@ -27,7 +27,7 @@ public final class Dominion extends JavaPlugin {
         config = new ConfigManager(this);
         XLogger.setDebug(config.isDebug());
         database = new DatabaseManager(this,
-                config.getDbType().equals("pgsql") ? DatabaseManager.TYPE.POSTGRESQL : DatabaseManager.TYPE.SQLITE,
+                DatabaseManager.TYPE.valueOf(config.getDbType().toUpperCase()),
                 config.getDbHost(),
                 config.getDbPort(),
                 config.getDbName(),
diff --git a/src/main/java/cn/lunadeer/dominion/managers/ConfigManager.java b/src/main/java/cn/lunadeer/dominion/managers/ConfigManager.java
index a5a225a..42e3c15 100644
--- a/src/main/java/cn/lunadeer/dominion/managers/ConfigManager.java
+++ b/src/main/java/cn/lunadeer/dominion/managers/ConfigManager.java
@@ -22,10 +22,6 @@ public class ConfigManager {
         _debug = _file.getBoolean("Debug", false);
         XLogger.setDebug(_debug);
         _db_type = _file.getString("Database.Type", "sqlite");
-        if (!_db_type.equals("pgsql") && !_db_type.equals("sqlite")) {
-            XLogger.err("当前数据库只支持 pgsql 或 sqlite，已重置为 sqlite");
-            setDbType("sqlite");
-        }
         _db_host = _file.getString("Database.Host", "localhost");
         _db_port = _file.getString("Database.Port", "5432");
         _db_name = _file.getString("Database.Name", "dominion");
@@ -171,9 +167,6 @@ public class ConfigManager {
     }
 
     public String getDbPass() {
-        if (_db_pass.contains("@")) {
-            setDbPass("'" + _db_pass + "'");
-        }
         return _db_pass;
     }