From bb317432d0890125a8f73eea9f03c19d20efc356 Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Thu, 17 Jan 2019 19:22:53 +0300 Subject: [PATCH] =?UTF-8?q?[ANY]=20=D0=A0=D0=B0=D0=B7=D0=B3=D1=80=D1=91?= =?UTF-8?q?=D0=B1=20auth*=20=D0=B8=20hwidHandler.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/handler/MySQLAuthHandler.java | 16 +++------------- .../launchserver/auth/hwid/MysqlHWIDHandler.java | 2 +- .../auth/provider/MySQLAuthProvider.java | 6 ++---- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/MySQLAuthHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/MySQLAuthHandler.java index 7c19b137..a98811e3 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/MySQLAuthHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/MySQLAuthHandler.java @@ -4,7 +4,6 @@ import ru.gravit.utils.helper.LogHelper; import java.io.IOException; -import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -66,11 +65,8 @@ protected Entry fetchEntry(UUID uuid) throws IOException { private Entry query(String sql, String value) throws IOException { try { - Connection c = mySQLHolder.getConnection(); - PreparedStatement s = c.prepareStatement(sql); + PreparedStatement s = mySQLHolder.getConnection().prepareStatement(sql); s.setString(1, value); - - // Execute query s.setQueryTimeout(MySQLSourceConfig.TIMEOUT); try (ResultSet set = s.executeQuery()) { return constructEntry(set); @@ -83,13 +79,10 @@ private Entry query(String sql, String value) throws IOException { @Override protected boolean updateAuth(UUID uuid, String username, String accessToken) throws IOException { try { - Connection c = mySQLHolder.getConnection(); - PreparedStatement s = c.prepareStatement(updateAuthSQL); + PreparedStatement s = mySQLHolder.getConnection().prepareStatement(updateAuthSQL); s.setString(1, username); // Username case s.setString(2, accessToken); s.setString(3, uuid.toString()); - - // Execute update s.setQueryTimeout(MySQLSourceConfig.TIMEOUT); return s.executeUpdate() > 0; } catch (SQLException e) { @@ -100,12 +93,9 @@ protected boolean updateAuth(UUID uuid, String username, String accessToken) thr @Override protected boolean updateServerID(UUID uuid, String serverID) throws IOException { try { - Connection c = mySQLHolder.getConnection(); - PreparedStatement s = c.prepareStatement(updateServerIDSQL); + PreparedStatement s = mySQLHolder.getConnection().prepareStatement(updateServerIDSQL); s.setString(1, serverID); s.setString(2, uuid.toString()); - - // Execute update s.setQueryTimeout(MySQLSourceConfig.TIMEOUT); return s.executeUpdate() > 0; } catch (SQLException e) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java index e102f3b7..b3852c7e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java @@ -226,6 +226,6 @@ public List getHwid(String username) { @Override public void close() { - // Do nothing + mySQLHolder.close(); } } diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MySQLAuthProvider.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MySQLAuthProvider.java index e3e0c6ae..cb817ba5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MySQLAuthProvider.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MySQLAuthProvider.java @@ -7,7 +7,6 @@ import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; -import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -28,8 +27,7 @@ public void init() { @Override public AuthProviderResult auth(String login, String password, String ip) throws SQLException, AuthException { - Connection c = mySQLHolder.getConnection(); - PreparedStatement s = c.prepareStatement(query); + PreparedStatement s = mySQLHolder.getConnection().prepareStatement(query); String[] replaceParams = {"login", login, "password", password, "ip", ip}; for (int i = 0; i < queryParams.length; i++) s.setString(i + 1, CommonHelper.replace(queryParams[i], replaceParams)); @@ -43,6 +41,6 @@ public AuthProviderResult auth(String login, String password, String ip) throws @Override public void close() { - // Do nothing + mySQLHolder.close(); } }