PotatoCraft-Studio#273 feat: mysql-connect-options settings

Author: sandtechnology

src/main/java/org/maxgamer/quickshop/QuickShop.java

@@ -1184,7 +1184,14 @@ private boolean setupDatabase() {
                 String port = dbCfg.getString("port");
                 String database = dbCfg.getString("database");
                 boolean useSSL = dbCfg.getBoolean("usessl");
-                dbCore = new MySQLCore(this, Objects.requireNonNull(host, "MySQL host can't be null"), Objects.requireNonNull(user, "MySQL username can't be null"), Objects.requireNonNull(pass, "MySQL password can't be null"), Objects.requireNonNull(database, "MySQL database name can't be null"), Objects.requireNonNull(port, "MySQL port can't be null"), useSSL);
+                Map<String, String> optionsMap = new HashMap<>();
+                for (String options : dbCfg.getStringList("mysql-connect-options")) {
+                    String[] strings = options.split("=", 2);
+                    if (strings.length == 2) {
+                        optionsMap.put(strings[0], strings[1]);
+                    }
+                }
+                dbCore = new MySQLCore(this, Objects.requireNonNull(host, "MySQL host can't be null"), Objects.requireNonNull(user, "MySQL username can't be null"), Objects.requireNonNull(pass, "MySQL password can't be null"), Objects.requireNonNull(database, "MySQL database name can't be null"), Objects.requireNonNull(port, "MySQL port can't be null"), useSSL, optionsMap);
             } else {
                 // SQLite database - Doing this handles file creation
                 dbCore = new SQLiteCore(this, new File(this.getDataFolder(), "shops.db"));
@@ -2201,6 +2208,10 @@ private void updateConfig(int selectedVersion) throws IOException {
             getConfig().set("shop.create-needs-select-type", false);
             getConfig().set("config-version", ++selectedVersion);
         }
+        if (selectedVersion == 161) {
+            getConfig().set("database.mysql-connect-options", new ArrayList<>(Arrays.asList("autoReconnect=true", "useUnicode=true", "characterEncoding=utf8")));
+            getConfig().set("config-version", ++selectedVersion);
+        }
         if (getConfig().isSet("shop.shop")) {
             getConfig().set("shop.shop", null);
         }

src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Convert.java

@@ -37,7 +37,9 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.logging.Level;
 
@@ -84,10 +86,17 @@ public void onCommand(@NotNull ConsoleCommandSender sender, @NotNull String comm
             String port = dbCfg.getString("port");
             String databaseStr = dbCfg.getString("database");
             boolean useSSL = dbCfg.getBoolean("usessl");
+            Map<String, String> optionsMap = new HashMap<>();
+            for (String options : dbCfg.getStringList("mysql-connect-options")) {
+                String[] strings = options.split("=", 2);
+                if (strings.length == 2) {
+                    optionsMap.put(strings[0], strings[1]);
+                }
+            }
             running = true;
             plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () -> {
                 try {
-                    AbstractDatabaseCore dbCore = new MySQLCore(plugin, Objects.requireNonNull(host, "MySQL host can't be null"), Objects.requireNonNull(user, "MySQL username can't be null"), Objects.requireNonNull(pass, "MySQL password can't be null"), Objects.requireNonNull(databaseStr, "MySQL database name can't be null"), Objects.requireNonNull(port, "MySQL port can't be null"), useSSL);
+                    AbstractDatabaseCore dbCore = new MySQLCore(plugin, Objects.requireNonNull(host, "MySQL host can't be null"), Objects.requireNonNull(user, "MySQL username can't be null"), Objects.requireNonNull(pass, "MySQL password can't be null"), Objects.requireNonNull(databaseStr, "MySQL database name can't be null"), Objects.requireNonNull(port, "MySQL port can't be null"), useSSL, optionsMap);
                     DatabaseManager databaseManager = new DatabaseManager(QuickShop.getInstance(), dbCore);
                     sender.sendMessage(ChatColor.GREEN + "Converting...");
                     transferShops(new SimpleDatabaseHelper(plugin, databaseManager), sender);

src/main/java/org/maxgamer/quickshop/database/MySQLCore.java

@@ -27,6 +27,7 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
 public class MySQLCore extends AbstractDatabaseCore {
@@ -52,14 +53,17 @@ public MySQLCore(
             @NotNull String pass,
             @NotNull String database,
             @NotNull String port,
-            boolean useSSL) {
+            boolean useSSL, Map<String, String> options) {
         this.plugin = plugin;
         info = new Properties();
         info.setProperty("autoReconnect", "true");
         info.setProperty("user", user);
         info.setProperty("password", pass);
         info.setProperty("useUnicode", "true");
         info.setProperty("characterEncoding", "utf8");
+        for (Map.Entry<String, String> entry : options.entrySet()) {
+            info.setProperty(entry.getKey(), entry.getValue());
+        }
         //info.setProperty("maxReconnects", "65535");
         // info.setProperty("failOverReadOnly", "false");
         info.setProperty("useSSL", String.valueOf(useSSL));

src/main/resources/config.yml

@@ -1,7 +1,7 @@
 # QuickShop-Reremake Plugin Configuration
 
 #Do not touch this if you don't know what you're doing!
-config-version: 161
+config-version: 162
 
 #Set the default language code the plugin should use, it will apply to:
 #Item Name
@@ -135,7 +135,7 @@ use-caching: true
 #1=Adventure (Removed In Current Version)
 chat-type: 0
 
-#MySQL database settings.
+#Mysql Database settings.
 database:
   #false = use local SQLite database.
   #true = use local/remote MySQL database.
@@ -145,15 +145,23 @@ database:
   database: quickshop
   user: root
   password: passwd
-  #Set prefix to "none" to remove prefix
+  #Table prefix, set prefix to "none" to remove prefix
   prefix: "qs_"
+  #Whether to use ssl when using mysql
   usessl: false
   #Whether to use async queue?
   queue: true
   #How long should the interval between each commit be when using queue (in seconds)?
   queue-commit-interval: 2
   #Auto set table encoding to utf8mb4 (beta)
   auto-fix-encoding-issue-in-database: false
+  #Connect options when using mysql
+  #Each entry contains one option, using key=value format
+  #Built-in options as follows, you can change value or add new option
+  mysql-connect-options:
+    - "autoReconnect=true"
+    - "useUnicode=true"
+    - "characterEncoding=utf8"
 
 #Limits the number of shops a person can create and own at a time.
 limits: