From 9374fa8dd07dabf89b2f886c9e2ab01578388c56 Mon Sep 17 00:00:00 2001
From: 502647092 <jtb1@163.com>
Date: Wed, 9 Sep 2015 20:47:47 +0800
Subject: [PATCH] update...

Signed-off-by: 502647092 <jtb1@163.com>
---
 .../cn/citycraft/CTZServer/ServerThread.java  | 25 +++++++++----------
 .../CTZServer/modules/AuthModule.java         | 16 +++++++++---
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/main/java/cn/citycraft/CTZServer/ServerThread.java b/src/main/java/cn/citycraft/CTZServer/ServerThread.java
index cca38be..b36a4e7 100644
--- a/src/main/java/cn/citycraft/CTZServer/ServerThread.java
+++ b/src/main/java/cn/citycraft/CTZServer/ServerThread.java
@@ -4,12 +4,12 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.HashMap;
 
 import org.bukkit.ChatColor;
 
 import cn.citycraft.CTZServer.commands.HandlerCommand;
 import cn.citycraft.CTZServer.socket.CTZLoginServerSocket;
+import cn.citycraft.sql.KeyValue;
 import cn.citycraft.sql.MySQLHelper;
 import cn.citycraft.sql.SQLHelper;
 import cn.citycraft.utils.FileUtil;
@@ -72,19 +72,18 @@ public class ServerThread implements Runnable {
 		CTZServer.getLogger().info("数据库连接成功,检查数据表是否存在...");
 		if (!sql.isTableExists(dbtable)) {
 			CTZServer.getLogger().info("数据表不存在,新建表" + dbtable + "...");
-			HashMap<String, String> fields = new HashMap<String, String>();
-			fields.put("player", "VARCHAR(16) NOT NULL");
-			fields.put("password", "VARCHAR(50) NOT NULL");
-			fields.put("ip", "varchar(40) NOT NULL");
-			fields.put("lastloginout", "BIGINT(20) NOT NULL");
-			fields.put("x", "DOUBLE NOT NULL");
-			fields.put("y", "DOUBLE NOT NULL");
-			fields.put("z", "DOUBLE NOT NULL");
-			fields.put("email", "VARCHAR(50)");
-			fields.put("world", "SMALLINT(6)");
-			fields.put("islogged", "SMALLINT(6) NOT NULL");
+			KeyValue kv = new KeyValue("player", "VARCHAR(16) NOT NULL")
+					.add("password", "VARCHAR(50) NOT NULL")
+					.add("ip", "varchar(40) NOT NULL")
+					.add("lastloginout", "BIGINT(20) NOT NULL")
+					.add("x", "DOUBLE NOT NULL")
+					.add("y", "DOUBLE NOT NULL")
+					.add("z", "DOUBLE NOT NULL")
+					.add("email", "VARCHAR(50)")
+					.add("world", "SMALLINT(6)")
+					.add("islogged", "SMALLINT(6) NOT NULL");
 			String Conditions = "UNIQUE (`player`)";
-			if (!sql.createTables(dbtable, fields, Conditions))
+			if (!sql.createTables(dbtable, kv, Conditions))
 				CTZServer.getLogger().warning("数据表" + dbtable + "创建失败,请尝试手动创建并重启服务器...");
 		}
 	}
diff --git a/src/main/java/cn/citycraft/CTZServer/modules/AuthModule.java b/src/main/java/cn/citycraft/CTZServer/modules/AuthModule.java
index b86f0fd..c49ca76 100644
--- a/src/main/java/cn/citycraft/CTZServer/modules/AuthModule.java
+++ b/src/main/java/cn/citycraft/CTZServer/modules/AuthModule.java
@@ -18,11 +18,21 @@ public class AuthModule {
 	private String ip;
 
 	@Column
-	private String x;
+	private long x;
 
 	@Column
-	private String y;
+	private long y;
 
 	@Column
-	private String z;
+	private long z;
+
+	@Column
+	private String world;
+
+	@Column
+	private long lastlogout;
+
+	@Column
+	private boolean islogin;
+
 }