feat(proj): 项目完成，测试使用。

platforms/bukkit/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>easysql-plugin</artifactId>
+        <artifactId>minesql-parent</artifactId>
         <groupId>cc.carm.plugin</groupId>
         <version>0.0.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
@@ -19,12 +19,12 @@
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
-    <artifactId>easysql-plugin-bukkit</artifactId>
+    <artifactId>minesql-bukkit</artifactId>
     <packaging>jar</packaging>
 
-    <name>EasySQL-Plugin-Bukkit</name>
+    <name>MineSQL-Bukkit</name>
     <description>轻松(用)SQL的独立运行库Bukkit版本插件。</description>
-    <url>https://github.com/CarmJos/EasySQL-Plugin</url>
+    <url>https://github.com/CarmJos/MineSQL</url>
 
     <developers>
         <developer>
@@ -48,19 +48,19 @@
 
     <issueManagement>
         <system>GitHub Issues</system>
-        <url>https://github.com/CarmJos/EasySQL-Plugin/issues</url>
+        <url>https://github.com/CarmJos/MineSQL/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>GitHub Actions</system>
-        <url>https://github.com/CarmJos/EasySQL-Plugin/actions/workflows/maven.yml</url>
+        <url>https://github.com/CarmJos/MineSQL/actions/workflows/maven.yml</url>
     </ciManagement>
 
     <dependencies>
 
         <dependency>
             <groupId>${project.parent.groupId}</groupId>
-            <artifactId>easysql-plugin-core</artifactId>
+            <artifactId>minesql-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>cc.carm.lib</groupId>
             <artifactId>easyplugin-main</artifactId>
-            <version>${easyplugin.version}</version>
+            <version>${deps.easyplugin.version}</version>
             <optional>true</optional>
             <scope>compile</scope>
         </dependency>
@@ -102,66 +102,15 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.3</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-
-                <configuration>
-                    <finalName>${project.name}-${project.version}</finalName>
-                    <outputDirectory>${project.parent.basedir}/asset/</outputDirectory>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <relocations>
-                        <relocation>
-                            <pattern>org.bstats</pattern>
-                            <shadedPattern>cc.carm.plugin.minesql.lib.bstats</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.json</pattern>
-                            <shadedPattern>cc.carm.plugin.minesql.lib.json</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>cc.carm.lib.easyplugin</pattern>
-                            <shadedPattern>cc.carm.plugin.minesql.lib.easyplugin</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>cc.carm.lib.githubreleases4j</pattern>
-                            <shadedPattern>cc.carm.plugin.minesql.lib.githubreleases4j</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>co.aikar.commands</pattern>
-                            <shadedPattern>cc.carm.plugin.minesql.lib.acf</shadedPattern> <!-- Replace this -->
-                        </relocation>
-                        <relocation>
-                            <pattern>co.aikar.locales</pattern>
-                            <shadedPattern>cc.carm.plugin.minesql.lib.locales</shadedPattern> <!-- Replace this -->
-                        </relocation>
-                    </relocations>
-                    <filters>
-                        <filter>
-                            <artifact>co.aikar:*</artifact>
-                            <excludes>
-                                <exclude>META-INF/MANIFEST.MF</exclude>
-                                <exclude>META-INF/*.txt</exclude>
-                                <exclude>acf-core*.properties</exclude>
-                                <exclude>acf-minecraft*.properties</exclude>
-                            </excludes>
-                        </filter>
-                        <filter>
-                            <artifact>*:*</artifact>
-                            <excludes>
-                                <exclude>META-INF/MANIFEST.MF</exclude>
-                                <exclude>META-INF/*.txt</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
-                </configuration>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

platforms/bukkit/src/main/java/cc/carm/plugin/minesql/BukkitConfiguration.java

@@ -1,90 +0,0 @@
-package cc.carm.plugin.minesql;
-
-import cc.carm.plugin.minesql.api.DBConfiguration;
-import cc.carm.plugin.minesql.api.SQLDriverType;
-import cc.carm.plugin.minesql.configuration.PluginConfiguration;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-public class BukkitConfiguration implements PluginConfiguration {
-
-    private final @NotNull FileConfiguration configuration;
-
-    protected BukkitConfiguration(@NotNull FileConfiguration configuration) {
-        this.configuration = configuration;
-    }
-
-    public @NotNull FileConfiguration getConfiguration() {
-        return configuration;
-    }
-
-    @Override
-    public boolean isDebugEnabled() {
-        return getConfiguration().getBoolean("debug", false);
-    }
-
-    @Override
-    public boolean isMetricsEnabled() {
-        return getConfiguration().getBoolean("metrics", true);
-    }
-
-    @Override
-    public boolean isUpdateCheckerEnabled() {
-        return getConfiguration().getBoolean("check-update", true);
-    }
-
-    @Override
-    public boolean isPropertiesEnabled() {
-        return getConfiguration().getBoolean("properties.enable", true);
-    }
-
-    @Override
-    public String getPropertiesFolder() {
-        return getConfiguration().getString("properties.folder", "db-properties/");
-    }
-
-    @Override
-    public @NotNull Map<String, DBConfiguration> getDBConfigurations() {
-        Map<String, DBConfiguration> dbConfigurations = new LinkedHashMap<>();
-        ConfigurationSection dbConfigurationsSection = getConfiguration().getConfigurationSection("databases");
-        if (dbConfigurationsSection != null) {
-            for (String dbName : dbConfigurationsSection.getKeys(false)) {
-                if (dbName.startsWith("example-")) continue;
-                ConfigurationSection dbSection = dbConfigurationsSection.getConfigurationSection(dbName);
-                if (dbSection == null) continue;
-
-                String driverString = dbSection.getString("driver-type");
-                SQLDriverType driverType = SQLDriverType.parse(driverString);
-                if (driverType == null) {
-                    MineSQLBukkit.getInstance().error("不存在预设的驱动类型 " + driverString + "," + " 请检查配置文件 databases." + dbName + "。");
-                    continue;
-                }
-                String host = dbSection.getString("host");
-                if (host == null) {
-                    MineSQLBukkit.getInstance().error("地址配置不得为空," + " 请检查配置文件 databases." + dbName + "。");
-                    continue;
-                }
-
-                int port = dbSection.getInt("port", -1);
-                if (port < 0) {
-                    MineSQLBukkit.getInstance().error("端口未配置正确," + " 请检查配置文件 databases." + dbName + "。");
-                    continue;
-                }
-                DBConfiguration dbConfiguration = DBConfiguration.create(driverType, host + ":" + port);
-
-                String username = dbSection.getString("username");
-                String password = dbSection.getString("password");
-
-                dbConfiguration.setUsername(username);
-                dbConfiguration.setPassword(password);
-
-                dbConfigurations.put(dbName, dbConfiguration);
-            }
-        }
-        return dbConfigurations;
-    }
-}

platforms/bukkit/src/main/java/cc/carm/plugin/minesql/MineSQLBukkit.java

@@ -1,147 +1,88 @@
 package cc.carm.plugin.minesql;
 
 import cc.carm.lib.easyplugin.EasyPlugin;
-import cc.carm.lib.easyplugin.i18n.EasyPluginMessageProvider;
-import cc.carm.lib.easysql.api.SQLManager;
-import cc.carm.plugin.minesql.api.DBConfiguration;
-import cc.carm.plugin.minesql.util.DBPropertiesUtil;
-import cc.carm.plugin.minesql.util.JarResourceUtils;
-import cn.beecp.BeeDataSource;
+import cc.carm.plugin.minesql.conf.PluginConfiguration;
 import co.aikar.commands.PaperCommandManager;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
-import java.util.*;
 
 public class MineSQLBukkit extends EasyPlugin implements MineSQLPlatform {
 
-    public MineSQLBukkit() {
-        super(new EasyPluginMessageProvider.zh_CN());
-    }
-
     protected static MineSQLBukkit instance;
 
-    private BukkitConfiguration configuration;
-    private MineSQLRegistry registry;
-
-    private PaperCommandManager commandManager;
+    protected MineSQLCore core;
+    protected PaperCommandManager commandManager;
 
     @Override
     protected void load() {
         MineSQLBukkit.instance = this;
 
-        log("加载配置文件...");
-        getInstance().saveDefaultConfig();
-        this.configuration = new BukkitConfiguration(getInstance().getConfig());
+        log("加载基础核心...");
+        this.core = new MineSQLCore(this);
 
-        log("初始化EasySQL注册器...");
-        this.registry = new MineSQLRegistry(this);
-
-        log("初始化EasySQLAPI...");
-        initializeAPI(getRegistry()); // 尽快地初始化接口，方便其他插件调用
+        log("初始化MineSQL API...");
+        MineSQL.initializeAPI(this.core);
     }
 
     @Override
     protected boolean initialize() {
         log("初始化指令管理器...");
         this.commandManager = new PaperCommandManager(this);
-        log("注册相关指令...");
-        initializeCommands(getCommandManager());
 
-        if (getConfiguration().isMetricsEnabled()) {
+        log("注册相关指令...");
+        this.core.initializeCommands(getCommandManager());
+
+        if (getConfiguration().METRICS.getNotNull()) {
             log("启用统计数据...");
             Metrics metrics = new Metrics(this, 14075);
             metrics.addCustomChart(new SimplePie("update_check",
-                    () -> getConfiguration().isUpdateCheckerEnabled() ? "ENABLED" : "DISABLED")
+                    () -> getConfiguration().UPDATE_CHECKER.getNotNull() ? "ENABLED" : "DISABLED")
             );
             metrics.addCustomChart(new SimplePie("properties_configuration",
-                    () -> getConfiguration().isPropertiesEnabled() ? "ENABLED" : "DISABLED")
+                    () -> getConfiguration().PROPERTIES.ENABLE.getNotNull() ? "ENABLED" : "DISABLED")
             );
         }
 
-        if (getConfiguration().isUpdateCheckerEnabled()) {
-            log("开始检查更新...");
-            getRegistry().checkUpdate(getDescription().getVersion());
+        if (getConfiguration().PROPERTIES.ENABLE.getNotNull()) {
+            log("开始检查更新，可能需要一小段时间...");
+            log("   如不希望检查更新，可在配置文件中关闭。");
+            getScheduler().runAsync(() -> this.core.checkUpdate(getDescription().getVersion()));
         } else {
             log("已禁用检查更新，跳过。");
         }
+
         return true;
     }
 
     @Override
     protected void shutdown() {
         log("终止全部数据库连接...");
-        for (String dbName : new HashSet<>(getRegistry().list().keySet())) {
-            log("   正在关闭数据库 " + dbName + "...");
-            SQLManager manager = getRegistry().get(dbName);
-            getRegistry().shutdown(manager, activeQueries -> {
-                log("   数据库 " + dbName + " 仍有有 " + activeQueries + " 条活动查询，强制关闭中...");
-                if (manager.getDataSource() instanceof BeeDataSource) {
-                    BeeDataSource dataSource = (BeeDataSource) manager.getDataSource();
-                    dataSource.close();         //Close bee connection pool
-                }
-            });
-        }
-        getRegistry().getManagers().clear(); // release all managers
+        this.core.getRegistry().shutdownAll();
     }
 
     @Override
     public boolean isDebugging() {
-        return getConfiguration().isDebugEnabled();
+        return getConfiguration().DEBUG.getNotNull();
     }
 
-    @Override
-    @NotNull
-    public MineSQLRegistry getRegistry() {
-        return this.registry;
-    }
-
-    @Override
-    public @NotNull
-    Map<String, DBConfiguration> readConfigurations() {
-        return getConfiguration().getDBConfigurations();
-    }
-
-    @Override
-    public @NotNull
-    Map<String, Properties> readProperties() {
-        if (!getConfiguration().isPropertiesEnabled()) return new HashMap<>();
-        String propertiesFolder = getConfiguration().getPropertiesFolder();
-        if (propertiesFolder == null || propertiesFolder.length() == 0) return new HashMap<>();
-
-        File file = new File(getDataFolder(), propertiesFolder);
-        if (!file.exists() || !file.isDirectory()) {
-            try {
-                JarResourceUtils.copyFolderFromJar(
-                        "db-properties", file,
-                        JarResourceUtils.CopyOption.COPY_IF_NOT_EXIST
-                );
-            } catch (Exception ex) {
-                error("初始化properties示例文件失败：" + ex.getMessage());
-            }
-        }
-
-        return DBPropertiesUtil.readFromFolder(file);
-    }
-
-    @Override
-    public void outputInfo() {
-        Optional.ofNullable(JarResourceUtils.readResource(this.getResource("PLUGIN_INFO"))).ifPresent(this::log);
-    }
-
-    public static MineSQLBukkit getInstance() {
+    public static @NotNull MineSQLBukkit getInstance() {
         return MineSQLBukkit.instance;
     }
 
-    protected BukkitConfiguration getConfiguration() {
-        return configuration;
+    public @NotNull PluginConfiguration getConfiguration() {
+        return this.core.getConfig();
     }
 
-    protected PaperCommandManager getCommandManager() {
+    public @NotNull PaperCommandManager getCommandManager() {
         return commandManager;
     }
 
+    @Override
+    public @NotNull File getPluginFolder() {
+        return getDataFolder();
+    }
 
 }

platforms/bukkit/src/main/resources/plugin.yml

@@ -1,7 +1,8 @@
-main: cc.carm.plugin.easysql.EasySQLBukkit
+main: cc.carm.plugin.minesql.MineSQLBukkit
 version: ${project.version}
-prefix: EasySQL-Plugin
-name: EasySQL-Plugin
+
+prefix: MineSQL
+name: MineSQL
 load: STARTUP
 
 website: ${project.url}