Upstream/SaneEconomy
1
0
Fork 0
mirror of https://github.com/AppleDash/SaneEconomy.git synced 2024-09-27 14:12:58 +02:00
Code Issues Projects Releases Wiki Activity

Add support for ?useSSL=false in the JDBC URL. Fixes #48

Browse Source
This commit is contained in:
AppleDash 2017-06-14 10:28:10 -04:00
parent 36e53b03fb
commit 921734241e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SaneEconomyCore/src/main/java/org/appledash/saneeconomy/utils/SaneEconomyConfiguration.java
View File

@ -158,9 +158,10 @@ public class SaneEconomyConfiguration {
String backendUser = config.getString("username");
String backendPass = config.getString("password");
String tablePrefix = config.getString("table_prefix", "");
boolean useSsl = config.getBoolean("use_ssl", false);
return new DatabaseCredentials(
backendHost, backendPort, backendUser, backendPass, backendDb, tablePrefix
backendHost, backendPort, backendUser, backendPass, backendDb, tablePrefix, useSsl
);
}
}

6
SaneEconomyCore/src/main/java/org/appledash/saneeconomy/utils/database/DatabaseCredentials.java
View File

@ -13,14 +13,16 @@ public class DatabaseCredentials {
private final String tablePrefix;
private final int maxRetries;
private final int queryTimeout;
private final boolean useSsl;
public DatabaseCredentials(String hostname, int port, String username, String password, String databaseName, String tablePrefix) {
public DatabaseCredentials(String hostname, int port, String username, String password, String databaseName, String tablePrefix, boolean useSsl) {
this.hostname = hostname;
this.port = port;
this.username = username;
this.password = password;
this.databaseName = databaseName;
this.tablePrefix = tablePrefix;
this.useSsl = useSsl;
maxRetries = 5;
queryTimeout = 5000;
}
@ -46,7 +48,7 @@ public class DatabaseCredentials {
}
public String getJDBCURL() {
return String.format("jdbc:mysql://%s:%d/%s", hostname, port, databaseName);
return String.format("jdbc:mysql://%s:%d/%s?useSSL=%s", hostname, port, databaseName, useSsl);
}
public String getTablePrefix() {