TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-30 10:47:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve the mysql driver if using the simplified version

Browse Source
This commit is contained in:
games647
2022-08-08 10:16:12 +02:00
parent 833177933a
commit 3244a3ab64
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/com/github/games647/fastlogin/core/storage/MySQLStorage.java
View File

@ -31,6 +31,8 @@ import com.zaxxer.hikari.HikariConfig;
public class MySQLStorage extends SQLStorage { public class MySQLStorage extends SQLStorage {
private static final String JDBC_PROTOCOL = "jdbc:"; private static final String JDBC_PROTOCOL = "jdbc:";
private static final String MYSQL_DRIVER = "com.mysql.cj.jdbc.Driver";
private static final String MARIADB_DRIVER = "fastlogin.mariadb.jdbc.Driver";
public MySQLStorage(FastLoginCore<?, ?, ?> core, String driver, String host, int port, String database, public MySQLStorage(FastLoginCore<?, ?, ?> core, String driver, String host, int port, String database,
HikariConfig config, boolean useSSL) { HikariConfig config, boolean useSSL) {
@ -40,6 +42,12 @@ public class MySQLStorage extends SQLStorage {
private static HikariConfig setParams(HikariConfig config, private static HikariConfig setParams(HikariConfig config,
String driver, String host, int port, String database, String driver, String host, int port, String database,
boolean useSSL) { boolean useSSL) {
if ("mysql".equalsIgnoreCase(driver.trim())) {
config.setDriverClassName(MYSQL_DRIVER);
} else if ("mariadb".equalsIgnoreCase(driver.trim())) {
config.setDriverClassName(MARIADB_DRIVER);
}
config.setDriverClassName(driver); config.setDriverClassName(driver);
// Require SSL on the server if requested in config - this will also verify certificate // Require SSL on the server if requested in config - this will also verify certificate

1
core/src/main/java/com/github/games647/fastlogin/core/storage/SQLiteStorage.java
View File

@ -62,7 +62,6 @@ public class SQLiteStorage extends SQLStorage {
// vs the default: yyyy-MM-dd HH:mm:ss.SSS // vs the default: yyyy-MM-dd HH:mm:ss.SSS
SQLiteConfig sqLiteConfig = new SQLiteConfig(); SQLiteConfig sqLiteConfig = new SQLiteConfig();
sqLiteConfig.setDateStringFormat("yyyy-MM-dd HH:mm:ss"); sqLiteConfig.setDateStringFormat("yyyy-MM-dd HH:mm:ss");
// sqLiteConfig.setDatePrecision("seconds");
config.addDataSourceProperty("config", sqLiteConfig); config.addDataSourceProperty("config", sqLiteConfig);

2
pom.xml
View File

@ -56,7 +56,7 @@
<maven.compiler.release>${java.version}</maven.compiler.release> <maven.compiler.release>${java.version}</maven.compiler.release>
<floodgate.version>2.2.0-SNAPSHOT</floodgate.version> <floodgate.version>2.2.0-SNAPSHOT</floodgate.version>
<geyser.version>2.0.5-SNAPSHOT</geyser.version> <geyser.version>2.0.6-SNAPSHOT</geyser.version>
</properties> </properties>
<modules> <modules>

2
velocity/pom.xml
View File

@ -144,7 +144,7 @@
<dependency> <dependency>
<groupId>org.mariadb.jdbc</groupId> <groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId> <artifactId>mariadb-java-client</artifactId>
<version>3.0.6</version> <version>3.0.7</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>