From 2f70f8d4f2e13c3ad71b249caa72aac0b32bf27f Mon Sep 17 00:00:00 2001
From: Stone <nnhy@vip.qq.com>
Date: Sun, 29 Nov 2015 16:58:16 +0000
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=BB=9D=E5=AF=B9=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=97=B6=E9=97=B4=EF=BC=8C=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sys.cpp                  |  2 ++
 Sys.h                    |  1 +
 TinyNet/TinyServer.cpp   |  2 +-
 TokenNet/TokenClient.cpp | 10 ----------
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Sys.cpp b/Sys.cpp
index 51d08921..8e74eddd 100644
--- a/Sys.cpp
+++ b/Sys.cpp
@@ -483,6 +483,8 @@ void TimeSleep(uint us)
 
 // 系统启动后的毫秒数
 ulong TSys::Ms() { return Time.Current(); }
+// 系统绝对当前时间，秒
+uint TSys::Seconds() { return Time.Seconds + Time.BaseSeconds; }
 
 void TSys::Sleep(uint ms)
 {
diff --git a/Sys.h b/Sys.h
index 72093388..dfcbf1f6 100644
--- a/Sys.h
+++ b/Sys.h
@@ -96,6 +96,7 @@ public:
 	uint StackTop();	// 栈顶，后面是初始化不清零区域
 
 	ulong	Ms();		// 系统启动后的毫秒数
+	uint	Seconds();	// 系统绝对当前时间，秒
 
     void Sleep(uint ms); // 毫秒级延迟
     void Delay(uint us); // 微秒级延迟
diff --git a/TinyNet/TinyServer.cpp b/TinyNet/TinyServer.cpp
index d1d946e3..ae60aff2 100644
--- a/TinyNet/TinyServer.cpp
+++ b/TinyNet/TinyServer.cpp
@@ -374,7 +374,7 @@ bool TinyServer::OnPing(const TinyMessage& msg)
 	
 	// 0x02给客户端同步时间，4字节的秒
 	auto ms2	= rs.ToStream();
-	pm.WriteTime(ms2, Sys.Ms() / 1000);
+	pm.WriteTime(ms2, Sys.Seconds());
 
 	Reply(rs);
 
diff --git a/TokenNet/TokenClient.cpp b/TokenNet/TokenClient.cpp
index 7195a418..fcac3d42 100644
--- a/TokenNet/TokenClient.cpp
+++ b/TokenNet/TokenClient.cpp
@@ -397,16 +397,6 @@ bool TokenClient::OnPing(TokenMessage& msg, Controller* ctrl)
 		Delay = cost;
 
 	debug_printf("心跳延迟 %dms / %dms \r\n", cost, Delay);
-#if DEBUG
-	debug_printf("start: ");
-	DateTime dt(start / 1000);
-	dt.Show();
-	debug_printf("\r\n");
 
-	debug_printf("TimeNow: ");
-	DateTime dt2(Sys.Ms() / 1000);
-	dt2.Show();
-	debug_printf("\r\n");
-#endif
 	return true;
 }