Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement MySQL 8 support #1779

Browse Source
This commit is contained in:
Gabriele C 2021-08-21 23:22:21 +02:00
parent 18c31e3a42
commit 97a599c885
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/config.md
View File

@ -1,5 +1,5 @@
<!-- AUTO-GENERATED FILE! Do not edit this directly --> <!-- AUTO-GENERATED FILE! Do not edit this directly -->
<!-- File auto-generated on Sat Aug 21 22:53:23 CEST 2021. See docs/config/config.tpl.md --> <!-- File auto-generated on Sat Aug 21 23:12:31 CEST 2021. See docs/config/config.tpl.md -->
## AuthMe Configuration ## AuthMe Configuration
The first time you run AuthMe it will create a config.yml file in the plugins/AuthMe folder, The first time you run AuthMe it will create a config.yml file in the plugins/AuthMe folder,
@ -28,7 +28,10 @@ DataSource:
mySQLUsername: authme mySQLUsername: authme
# Password to connect to the MySQL database # Password to connect to the MySQL database
mySQLPassword: '12345' mySQLPassword: '12345'
# Driver Name of the MySQL database # Driver Name of the MySQL database.
# Built-in drivers:
# MySQL: 'com.mysql.cj.jdbc.Driver'
# MariaDB: 'org.mariadb.jdbc.Driver'
mySQLDriverClassName: com.mysql.cj.jdbc.Driver mySQLDriverClassName: com.mysql.cj.jdbc.Driver
# Database Name, use with converters or as SQLITE database name # Database Name, use with converters or as SQLITE database name
mySQLDatabase: authme mySQLDatabase: authme
@ -587,4 +590,4 @@ To change settings on a running server, save your changes to config.yml and use
--- ---
This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat Aug 21 22:53:23 CEST 2021 This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat Aug 21 23:12:31 CEST 2021

16
pom.xml
View File

@ -64,7 +64,7 @@
<maven.minimumVersion>3.6.0</maven.minimumVersion> <maven.minimumVersion>3.6.0</maven.minimumVersion>
<!-- Dependencies versions --> <!-- Dependencies versions -->
<spigot.version>1.17-R0.1-SNAPSHOT</spigot.version> <spigot.version>1.17.1-R0.1-SNAPSHOT</spigot.version>
<!-- Versioning properties --> <!-- Versioning properties -->
<project.outputName>AuthMe</project.outputName> <project.outputName>AuthMe</project.outputName>
@ -290,6 +290,7 @@
<goals> <goals>
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<!--
<configuration> <configuration>
<artifactSet> <artifactSet>
<excludes> <excludes>
@ -297,7 +298,9 @@
</excludes> </excludes>
</artifactSet> </artifactSet>
</configuration> </configuration>
-->
</execution> </execution>
<!--
<execution> <execution>
<id>shaded-jar-legacy</id> <id>shaded-jar-legacy</id>
<phase>package</phase> <phase>package</phase>
@ -305,10 +308,11 @@
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration> <configuration>
<!-- Use the base jar name, to help server owners download the right jar --> Use the base jar name, to help server owners download the right jar
<finalName>${project.finalNameBase}-legacy</finalName> <finalName>${project.finalNameBase}-legacy</finalName>
</configuration> </configuration>
</execution> </execution>
-->
</executions> </executions>
<configuration> <configuration>
<!-- Don't create the reduced pom file, as we don't deploy the shaded jar --> <!-- Don't create the reduced pom file, as we don't deploy the shaded jar -->
@ -623,7 +627,13 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.49</version> <version>8.0.26</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>2.7.4</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

5
src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java
View File

@ -45,7 +45,10 @@ public final class DatabaseSettings implements SettingsHolder {
public static final Property<String> MYSQL_PASSWORD = public static final Property<String> MYSQL_PASSWORD =
newProperty("DataSource.mySQLPassword", "12345"); newProperty("DataSource.mySQLPassword", "12345");
@Comment("Driver Name of the MySQL database") @Comment({"Driver Name of the MySQL database.",
"Built-in drivers:",
" MySQL: 'com.mysql.cj.jdbc.Driver'",
" MariaDB: 'org.mariadb.jdbc.Driver'"})
public static final Property<String> MYSQL_DRIVER_CLASS_NAME = public static final Property<String> MYSQL_DRIVER_CLASS_NAME =
newProperty("DataSource.mySQLDriverClassName", "com.mysql.cj.jdbc.Driver"); newProperty("DataSource.mySQLDriverClassName", "com.mysql.cj.jdbc.Driver");