From e8a6448eb6d8b2724dd51f5aa45fe8e511e9b613 Mon Sep 17 00:00:00 2001 From: j502647092 Date: Tue, 15 Sep 2015 23:08:16 +0800 Subject: [PATCH] add new filed... Signed-off-by: j502647092 --- src/main/java/cn/citycraft/CTZServer/CTZAuth.java | 13 ++++++------- .../java/cn/citycraft/CTZServer/ServerThread.java | 5 +++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/cn/citycraft/CTZServer/CTZAuth.java b/src/main/java/cn/citycraft/CTZServer/CTZAuth.java index de213ce..73b31be 100644 --- a/src/main/java/cn/citycraft/CTZServer/CTZAuth.java +++ b/src/main/java/cn/citycraft/CTZServer/CTZAuth.java @@ -8,8 +8,8 @@ public class CTZAuth { static final String TableName = "ctzserver"; static final String UserField = "player"; static final String PWDField = "password"; - static final String LoginField = "password"; - static ServerThread serverThread; + static final String ISLoginField = "islogin"; + static final String ALLOWLoginField = "allowlogin"; static SQLHelper sql; public static void changePassword(String username, String password) { @@ -20,13 +20,12 @@ public class CTZAuth { return sql.isFieldExists(TableName, new KeyValue(UserField, username).add(PWDField, StringUtil.getMD5Code(password))); } - public static void init(ServerThread serverThread) { - CTZAuth.serverThread = serverThread; - CTZAuth.sql = serverThread.sql; + public static void init(SQLHelper sql) { + CTZAuth.sql = sql; } public static boolean isLogin(String username) { - String result = sql.dbSelectFirst(TableName, LoginField, new KeyValue(UserField, username)); + String result = sql.dbSelectFirst(TableName, ISLoginField, new KeyValue(UserField, username)); return (result != null && result.equalsIgnoreCase("1")); } @@ -35,7 +34,7 @@ public class CTZAuth { } public static boolean login(String username) { - return sql.dbUpdate(TableName, new KeyValue(LoginField, "1"), new KeyValue(UserField, username)); + return sql.dbUpdate(TableName, new KeyValue(ALLOWLoginField, "1"), new KeyValue(UserField, username)); } public static boolean registerPlayer(String username, String password) { diff --git a/src/main/java/cn/citycraft/CTZServer/ServerThread.java b/src/main/java/cn/citycraft/CTZServer/ServerThread.java index 2c427d4..994d609 100644 --- a/src/main/java/cn/citycraft/CTZServer/ServerThread.java +++ b/src/main/java/cn/citycraft/CTZServer/ServerThread.java @@ -30,7 +30,7 @@ public class ServerThread implements Runnable { initCommand(); initDatabase(); initServerInfo(); - CTZAuth.init(this); + CTZAuth.init(sql); server = new CTZLoginServerSocket(); server.start(); @@ -81,7 +81,8 @@ public class ServerThread implements Runnable { .add("z", "DOUBLE NOT NULL DEFAULT 0") .add("email", "VARCHAR(50) NOT NULL DEFAULT 'mc@mc.com'") .add("world", "VARCHAR(20) DEFAULT 'world'") - .add("islogged", "SMALLINT(6) NOT NULL DEFAULT 0"); + .add("islogged", "SMALLINT(6) NOT NULL DEFAULT 0") + .add("allowlogin", "SMALLINT(6) NOT NULL DEFAULT 0"); String Conditions = "UNIQUE (`player`)"; if (!sql.createTables(dbtable, kv, Conditions)) CTZServer.warn(ChatColor.RED + "数据表 " + dbtable + " 创建失败,请尝试手动创建并重启服务器...");