From c0fef40d733a34ff8248f35eb0f1d6cc24e45b15 Mon Sep 17 00:00:00 2001
From: j502647092 <jtb1@163.com>
Date: Sun, 20 Sep 2015 22:49:45 +0800
Subject: [PATCH] add email faild...

Signed-off-by: j502647092 <jtb1@163.com>
---
 .../CTZServer/commands/CommandRegister.java   |   6 +-
 .../socket/CTZLoginServerSocket.java          | 104 +++++++++---------
 2 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/src/main/java/cn/citycraft/CTZServer/commands/CommandRegister.java b/src/main/java/cn/citycraft/CTZServer/commands/CommandRegister.java
index d5fec5f..2259441 100644
--- a/src/main/java/cn/citycraft/CTZServer/commands/CommandRegister.java
+++ b/src/main/java/cn/citycraft/CTZServer/commands/CommandRegister.java
@@ -15,7 +15,7 @@ public class CommandRegister extends BaseCommand {
 
 	@Override
 	public void execute(String label, String[] args) {
-		if (CTZAuth.registerPlayer(args[0], args[1]))
+		if (CTZAuth.registerPlayer(args[0], args[1], args[2]))
 			CTZServer.print(ChatColor.GREEN + "账户 " + args[0] + " 注册成功!");
 		else
 			CTZServer.warn(ChatColor.RED + "账户 " + args[0] + " 注册失败!");
@@ -28,12 +28,12 @@ public class CommandRegister extends BaseCommand {
 
 	@Override
 	public int getMinimumArguments() {
-		return 2;
+		return 3;
 	}
 
 	@Override
 	public String getPossibleArguments() {
-		return "<账号> <密码>";
+		return "<账号> <密码> <邮箱>";
 	}
 
 }
diff --git a/src/main/java/cn/citycraft/CTZServer/socket/CTZLoginServerSocket.java b/src/main/java/cn/citycraft/CTZServer/socket/CTZLoginServerSocket.java
index 17be00c..e214f29 100644
--- a/src/main/java/cn/citycraft/CTZServer/socket/CTZLoginServerSocket.java
+++ b/src/main/java/cn/citycraft/CTZServer/socket/CTZLoginServerSocket.java
@@ -14,55 +14,6 @@ import cn.citycraft.CTZServerCommon.CTZServer;
 import net.md_5.bungee.api.ChatColor;
 
 public class CTZLoginServerSocket extends Thread {
-	ServerSocket s = null;
-
-	Socket socket = null;
-	int port = 25580;
-
-	/**
-	 * 初始化服务端口
-	 */
-	public CTZLoginServerSocket() {
-	}
-
-	/**
-	 * 初始化服务端口
-	 */
-	public CTZLoginServerSocket(int port) {
-		this.port = port;
-	}
-
-	@Override
-	public void run() {
-		try {
-			// 设定服务端的端口号
-			s = new ServerSocket(port);
-			CTZServer.print(ChatColor.BLUE + "CTZ服务器开始监听 端口:" + s.getLocalPort());
-			// 等待请求,此方法会一直阻塞,直到获得请求才往下走
-			while (true) {
-				socket = s.accept();
-				new ClientThread(socket).start();
-			}
-		} catch (Exception e) {
-			CTZServer.print(ChatColor.RED + "CTZ服务器崩溃: " + e.getMessage());
-		} finally {
-			ShutDown();
-		}
-	}
-
-	/**
-	 * 关闭服务器
-	 */
-	public void ShutDown() {
-		try {
-			socket.close();
-			s.close();
-		} catch (Exception e) {
-		}
-		CTZServer.print(ChatColor.RED + "CTZ服务器已关闭...");
-		System.exit(0);
-	}
-
 	class ClientThread extends Thread {
 		Socket client = null;
 		BufferedReader br = null;
@@ -89,6 +40,7 @@ public class CTZLoginServerSocket extends Thread {
 						Response res = new Response();
 						String username = "";
 						String password = "";
+						String email = "";
 						if (req.isSuccess) {
 							switch (req.getPrefix().substring(1)) {
 							case "isregistered":
@@ -105,11 +57,12 @@ public class CTZLoginServerSocket extends Thread {
 							case "register":
 								username = req.Query("username");
 								password = req.Query("password");
-								if (username == null || password == null) {
+								email = req.Query("email");
+								if (username == null || password == null || email == null) {
 									res.setState(HttpStates.Bad_Request);
 									break;
 								}
-								if (CTZAuth.registerPlayer(username, password)) {
+								if (CTZAuth.registerPlayer(username, password, email)) {
 									res.setHtml("true");
 									CTZServer.print("§6玩家: §a" + username + " §d注册成功 IP: " + ip);
 								} else
@@ -176,4 +129,53 @@ public class CTZLoginServerSocket extends Thread {
 			}
 		}
 	}
+
+	ServerSocket s = null;
+	Socket socket = null;
+
+	int port = 25580;
+
+	/**
+	 * 初始化服务端口
+	 */
+	public CTZLoginServerSocket() {
+	}
+
+	/**
+	 * 初始化服务端口
+	 */
+	public CTZLoginServerSocket(int port) {
+		this.port = port;
+	}
+
+	@Override
+	public void run() {
+		try {
+			// 设定服务端的端口号
+			s = new ServerSocket(port);
+			CTZServer.print(ChatColor.BLUE + "CTZ服务器开始监听 端口:" + s.getLocalPort());
+			// 等待请求,此方法会一直阻塞,直到获得请求才往下走
+			while (true) {
+				socket = s.accept();
+				new ClientThread(socket).start();
+			}
+		} catch (Exception e) {
+			CTZServer.print(ChatColor.RED + "CTZ服务器崩溃: " + e.getMessage());
+		} finally {
+			ShutDown();
+		}
+	}
+
+	/**
+	 * 关闭服务器
+	 */
+	public void ShutDown() {
+		try {
+			socket.close();
+			s.close();
+		} catch (Exception e) {
+		}
+		CTZServer.print(ChatColor.RED + "CTZ服务器已关闭...");
+		System.exit(0);
+	}
 }
\ No newline at end of file