改善日志显示

TokenNet/LoginMessage.cpp

@@ -40,20 +40,13 @@ void LoginMessage::Write(Stream& ms) const
 	{
 		bp.Set("UserName", User);
 		bp.Set("Password", Pass);
-		bp.Set("Cookie", Cookie);
-
-		if (Salt.Length() > 0)
-			bp.Set("Salt", Salt);
-		/*else
-		{
-			UInt64 now = Sys.Ms();
-			bp.Set("Salt", Buffer(&now, 8));
-		}*/
+		if(Cookie.Length())	bp.Set("Cookie", Cookie);
+		if(Salt.Length())	bp.Set("Salt", Salt);
 	}
 	else if (!Error)
 	{
 		bp.Set("Token", Token);
-		bp.Set("Key", Key);
+		if(Key.Length())	bp.Set("Key", Key);
 	}
 }
 
@@ -70,18 +63,18 @@ String& LoginMessage::ToStr(String& str) const
 
 		return str;
 	}
-	str = str + " User=" + User + " Pass=" + Pass + " Salt=" + Salt;
-	if (Cookie.Length())
+	
+	if(!Reply)
 	{
-		str = str + "  Cookie " + "Len " + Cookie.Length() + "  ";
-		int len = Cookie.Length();
-		
-		if (len > 10)str = str + "\r\n";
-		if (len > 32)len = 32;
-		
-		ByteArray(Cookie.ToHex().GetBuffer(),len).ToStr(str);
-		
+		str = str + " User=" + User + " Pass=" + Pass + " Salt=" + Salt;
 	}
+	else
+	{
+		str += " Token=";
+		str.Concat(Token, 16);
+		str = str + " Key=" + Key;
+	}
+	if (Cookie.Length()) str = str + "  Cookie[" + Cookie.Length() + "]";
 
 	return str;
 }

TokenNet/TokenClient.cpp

@@ -608,8 +608,7 @@ bool TokenClient::OnLogin(TokenMessage& msg, TokenController* ctrl)
 
 	LoginMessage logMsg;
 	logMsg.ReadMessage(msg);
-	logMsg.Show();
-	debug_printf("\r\n");
+	logMsg.Show(true);
 
 	if (logMsg.Error)
 	{
@@ -620,8 +619,8 @@ bool TokenClient::OnLogin(TokenMessage& msg, TokenController* ctrl)
 		if (result == 0xF7)
 		{
 			// 任何错误，重新握手
-			Status = 1;
-			Token = 0;
+			Status	= 1;
+			Token	= 0;
 			Register();
 			return false;
 		}
@@ -633,13 +632,13 @@ bool TokenClient::OnLogin(TokenMessage& msg, TokenController* ctrl)
 	}
 	else
 	{
-		Status = 2;
+		Status	= 2;
 		debug_printf("登录成功！ ");
 
-		Token = logMsg.Token;
+		Token	= logMsg.Token;
 
 		if (ctrl) ctrl->Token = Token;
-		logMsg.Show(true);
+
 		debug_printf("令牌：0x%08X ", Token);
 		if (logMsg.Key.Length())
 		{

TokenNet/TokenConfig.cpp

@@ -50,6 +50,7 @@ void TokenConfig::Show() const
 	debug_printf("\t厂商: %s \r\n", _Vendor);
 	debug_printf("\t登录: %s \r\n", _User);
 	debug_printf("\t密码: %s \r\n", _Pass);
+	debug_printf("\t令牌: %s \r\n", _Token);
 #endif
 }
 

TokenNet/TokenMessage.cpp

@@ -136,7 +136,7 @@ void TokenMessage::Show() const
 				name.Show();
 				debug_printf("=");
 
-				if(name == "Action")
+				if(name == "Action" || name == "ErrorMessage")
 					value.AsString().Show();
 				else
 					value.Show();