Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-29 14:05:25 +01:00
Code Issues Projects Releases Wiki Activity

Add SSL variable and set it to false

Browse Source 
Slightly different check for config table existence
This commit is contained in:
Zrips 2017-07-04 14:36:16 +03:00
parent f79cdf3d60
commit 743de06281
2 changed files with 66 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java
View File

@ -1579,7 +1579,7 @@ public abstract class JobsDAO {
}
}
private static void close(Statement stmt) {
protected static void close(Statement stmt) {
if (stmt != null)
try {
stmt.close();

85
src/main/java/com/gamingmesh/jobs/dao/JobsDAOMySQL.java
View File

@ -21,6 +21,7 @@ package com.gamingmesh.jobs.dao;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.HashMap;
import java.util.UUID;
import java.util.Map.Entry;
@ -34,7 +35,7 @@ public class JobsDAOMySQL extends JobsDAO {
private String database;
private JobsDAOMySQL(Jobs plugin, String hostname, String database, String username, String password, String prefix) {
super(plugin, "com.mysql.jdbc.Driver", "jdbc:mysql://" + hostname + "/" + database, username, password, prefix);
super(plugin, "com.mysql.jdbc.Driver", "jdbc:mysql://" + hostname + "/" + database + "?autoReconnect=true&useSSL=false", username, password, prefix);
this.database = database;
}
@ -73,28 +74,11 @@ public class JobsDAOMySQL extends JobsDAO {
Jobs.getPluginLogger().severe("Could not run database updates! Could not connect to MySQL!");
return;
}
PreparedStatement prest = null;
int rows = 0;
ResultSet res = null;
try {
// Check for config table
prest = conn.prepareStatement("SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = ? AND table_name = ?;");
prest.setString(1, database);
prest.setString(2, getPrefix() + "config");
res = prest.executeQuery();
if (res.next()) {
rows = res.getInt(1);
}
} finally {
close(res);
close(prest);
}
if (rows == 0) {
if (!isTable(getPrefix() + "config")) {
PreparedStatement insert = null;
try {
executeSQL("CREATE TABLE `" + getPrefix() + "config` (`key` varchar(50) NOT NULL PRIMARY KEY, `value` varchar(100) NOT NULL);");
insert = conn.prepareStatement("INSERT INTO `" + getPrefix() + "config` (`key`, `value`) VALUES (?, ?);");
insert.setString(1, "version");
insert.setString(2, "1");
@ -105,6 +89,66 @@ public class JobsDAOMySQL extends JobsDAO {
}
}
@SuppressWarnings("resource")
private boolean isTable(String table) {
Statement statement;
try {
statement = getConnection().createStatement();
} catch (SQLException e) {
Jobs.consoleMsg("&cCould not check if its table, SQLException: " + e.getMessage());
return false;
}
try {
statement.executeQuery("SELECT * FROM " + table);
statement.close();
return true;
} catch (SQLException e) {
close(statement);
return false;
}
}
public boolean isCollumn(String table, String collumn) {
Statement statement;
try {
statement = getConnection().createStatement();
} catch (SQLException e) {
Jobs.consoleMsg("&cCould not check if its collumn, SQLException: " + e.getMessage());
return false;
}
try {
statement.executeQuery("SELECT " + collumn + " FROM " + table);
statement.close();
return true;
} catch (SQLException e) {
close(statement);
return false;
}
}
@SuppressWarnings("resource")
public boolean createTable(String query) {
Jobs.consoleMsg(query);
Statement statement = null;
if (query == null || query.equals("")) {
Jobs.consoleMsg("&cCould not create table: query is empty or null.");
return false;
}
try {
statement = getConnection().createStatement();
statement.execute(query);
statement.close();
} catch (SQLException e) {
Jobs.consoleMsg("&cCould not create table, SQLException: " + e.getMessage());
close(statement);
return false;
} finally {
close(statement);
}
return true;
}
@Override
protected synchronized void checkUpdate() throws SQLException {
JobsConnection conn = getConnection();
@ -640,7 +684,8 @@ public class JobsDAOMySQL extends JobsDAO {
prestUsersT = conn.prepareStatement("SELECT * FROM " + getPrefix() + "users;");
res4 = prestUsersT.executeQuery();
while (res4.next()) {
tempPlayerMap.put(res4.getString("player_uuid"), new PlayerInfo(res4.getString("username"), res4.getInt("id"), UUID.fromString(res4.getString("player_uuid")), System.currentTimeMillis()));
tempPlayerMap.put(res4.getString("player_uuid"), new PlayerInfo(res4.getString("username"), res4.getInt("id"), UUID.fromString(res4.getString("player_uuid")), System
.currentTimeMillis()));
}
} catch (Exception e) {
e.printStackTrace();