优化代码结构，提高性能

ColdeZhang · May 12, 2024 · 4f752d1 · 4f752d1
1 parent 10fd19b
commit 4f752d1
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/src/main/java/cn/lunadeer/dominion/Dominion.java b/src/main/java/cn/lunadeer/dominion/Dominion.java
@@ -3,7 +3,11 @@
 import cn.lunadeer.dominion.events.EnvironmentEvents;
 import cn.lunadeer.dominion.events.PlayerEvents;
 import cn.lunadeer.dominion.events.SelectPointEvents;
-import cn.lunadeer.dominion.utils.*;
+import cn.lunadeer.dominion.managers.ConfigManager;
+import cn.lunadeer.dominion.managers.DatabaseManager;
+import cn.lunadeer.dominion.utils.GiteaReleaseCheck;
+import cn.lunadeer.dominion.utils.Scheduler;
+import cn.lunadeer.dominion.utils.XLogger;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -22,8 +26,8 @@ public void onEnable() {
         // Plugin startup logic
         instance = this;
         config = new ConfigManager(this);
-        dbConnection = Database.createConnection();
-        Database.migrate();
+        dbConnection = DatabaseManager.createConnection();
+        DatabaseManager.migrate();
         scheduler = new Scheduler(this);
         AutoClean.run();
         Cache.instance = new Cache();

diff --git a/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java b/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java
@@ -2,7 +2,7 @@
 
 import cn.lunadeer.dominion.Cache;
 import cn.lunadeer.dominion.Dominion;
-import cn.lunadeer.dominion.utils.Database;
+import cn.lunadeer.dominion.managers.DatabaseManager;
 import cn.lunadeer.dominion.utils.XLogger;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -18,7 +18,7 @@ public class DominionDTO {
 
     private static List<DominionDTO> query(String sql) {
         List<DominionDTO> dominions = new ArrayList<>();
-        try (ResultSet rs = Database.query(sql)) {
+        try (ResultSet rs = DatabaseManager.query(sql)) {
             if (sql.contains("UPDATE") || sql.contains("DELETE") || sql.contains("INSERT")) {
                 // 如果是更新操作，重新加载缓存
                 Cache.instance.loadDominions();

diff --git a/src/main/java/cn/lunadeer/dominion/dtos/PlayerDTO.java b/src/main/java/cn/lunadeer/dominion/dtos/PlayerDTO.java
@@ -1,6 +1,6 @@
 package cn.lunadeer.dominion.dtos;
 
-import cn.lunadeer.dominion.utils.Database;
+import cn.lunadeer.dominion.managers.DatabaseManager;
 import cn.lunadeer.dominion.utils.XLogger;
 import org.bukkit.entity.Player;
 
@@ -31,7 +31,7 @@ public PlayerDTO onJoin() {
 
     private static List<PlayerDTO> query(String sql) {
         List<PlayerDTO> players = new ArrayList<>();
-        try (ResultSet rs = Database.query(sql)) {
+        try (ResultSet rs = DatabaseManager.query(sql)) {
             if (rs == null) return players;
             while (rs.next()) {
                 Integer id = rs.getInt("id");

diff --git a/src/main/java/cn/lunadeer/dominion/dtos/PlayerPrivilegeDTO.java b/src/main/java/cn/lunadeer/dominion/dtos/PlayerPrivilegeDTO.java
@@ -1,7 +1,7 @@
 package cn.lunadeer.dominion.dtos;
 
 import cn.lunadeer.dominion.Cache;
-import cn.lunadeer.dominion.utils.Database;
+import cn.lunadeer.dominion.managers.DatabaseManager;
 import cn.lunadeer.dominion.utils.XLogger;
 
 import java.sql.ResultSet;
@@ -582,7 +582,7 @@ public PlayerPrivilegeDTO(UUID playerUUID, Integer domID,
 
     private static List<PlayerPrivilegeDTO> query(String sql) {
         List<PlayerPrivilegeDTO> players = new ArrayList<>();
-        try (ResultSet rs = Database.query(sql)) {
+        try (ResultSet rs = DatabaseManager.query(sql)) {
             if (sql.contains("UPDATE") || sql.contains("DELETE") || sql.contains("INSERT")) {
                 // 如果是更新操作，重新加载缓存
                 Cache.instance.loadPlayerPrivileges();

diff --git a/...unadeer/dominion/utils/ConfigManager.java → ...deer/dominion/managers/ConfigManager.java b/...unadeer/dominion/utils/ConfigManager.java → ...deer/dominion/managers/ConfigManager.java
@@ -1,6 +1,7 @@
-package cn.lunadeer.dominion.utils;
+package cn.lunadeer.dominion.managers;
 
 import cn.lunadeer.dominion.Dominion;
+import cn.lunadeer.dominion.utils.XLogger;
 import org.bukkit.Material;
 import org.bukkit.configuration.file.FileConfiguration;
 

diff --git a/.../cn/lunadeer/dominion/utils/Database.java → ...er/dominion/managers/DatabaseManager.java b/.../cn/lunadeer/dominion/utils/Database.java → ...er/dominion/managers/DatabaseManager.java
@@ -1,10 +1,11 @@
-package cn.lunadeer.dominion.utils;
+package cn.lunadeer.dominion.managers;
 
 import cn.lunadeer.dominion.Dominion;
+import cn.lunadeer.dominion.utils.XLogger;
 
 import java.sql.*;
 
-public class Database {
+public class DatabaseManager {
 
     public static Connection createConnection() {
         try {