test

src/NTMiner/NTMinerRoot.cs

@@ -97,9 +97,7 @@ namespace NTMiner {
                                     else {
                                         Write.UserWarn($"本机时间和服务器时间不同步，请调整，本地：{DateTime.Now}，服务器：{serverTime}");
                                     }
-                                    if (serverMessageTime > VirtualRoot.LocalServerMessageSetTimestamp) {
-                                        VirtualRoot.Execute(new LoadNewServerMessageCommand());
-                                    }
+                                    VirtualRoot.Execute(new LoadNewServerMessageCommand(serverMessageTime));
                                 });
                             }
                             else {
@@ -154,9 +152,7 @@ namespace NTMiner {
                 else {
                     Write.DevDebug("server.json没有新版本");
                 }
-                if (serverMessageTime > VirtualRoot.LocalServerMessageSetTimestamp) {
-                    VirtualRoot.Execute(new LoadNewServerMessageCommand());
-                }
+                VirtualRoot.Execute(new LoadNewServerMessageCommand(serverMessageTime));
             });
         }
 

src/NTMinerRpcClient/ServerMessage/ServerMessageSet.cs

@@ -20,11 +20,15 @@ namespace NTMiner.ServerMessage {
             _isServer = isServer;
             if (!_isServer) {
                 VirtualRoot.BuildCmdPath<LoadNewServerMessageCommand>(action: message => {
-                    OfficialServer.ServerMessageService.GetServerMessagesAsync(VirtualRoot.LocalServerMessageSetTimestamp, (response, e) => {
+                    DateTime dateTime = VirtualRoot.LocalServerMessageSetTimestamp;
+                    // 如果已知服务器端最新消息的时间戳不比本地已加载的最新消息新就不用加载了
+                    if (message.KnowServerMessageTimestamp <= dateTime) {
+                        return;
+                    }
+                    OfficialServer.ServerMessageService.GetServerMessagesAsync(dateTime, (response, e) => {
                         if (response.IsSuccess() && response.Data.Count > 0) {
                             LinkedList<ServerMessageData> data = new LinkedList<ServerMessageData>();
                             lock (_locker) {
-                                DateTime dateTime = VirtualRoot.LocalServerMessageSetTimestamp;
                                 DateTime maxTime = dateTime;
                                 foreach (var item in response.Data.OrderBy(a => a.Timestamp)) {
                                     if (item.Timestamp > maxTime) {
@@ -93,7 +97,7 @@ namespace NTMiner.ServerMessage {
                 else {
                     OfficialServer.ServerMessageService.AddOrUpdateServerMessageAsync(new ServerMessageData(message.Input), (response, ex) => {
                         if (response.IsSuccess()) {
-                            VirtualRoot.Execute(new LoadNewServerMessageCommand());
+                            VirtualRoot.Execute(new LoadNewServerMessageCommand(DateTime.MaxValue));
                         }
                     });
                 }
@@ -123,7 +127,7 @@ namespace NTMiner.ServerMessage {
                 }
                 else {
                     OfficialServer.ServerMessageService.MarkDeleteServerMessageAsync(message.EntityId, (response, ex) => {
-                        VirtualRoot.Execute(new LoadNewServerMessageCommand());
+                        VirtualRoot.Execute(new LoadNewServerMessageCommand(DateTime.MaxValue));
                     });
                 }
             });
@@ -181,7 +185,6 @@ namespace NTMiner.ServerMessage {
                             }
                         }
                     }
-                    VirtualRoot.Execute(new LoadNewServerMessageCommand());
                     _isInited = true;
                 }
             }

src/NTMinerlib/Messages.cs

@@ -167,7 +167,11 @@ namespace NTMiner {
 
     [MessageType(description: "从服务器获取新的服务器消息")]
     public class LoadNewServerMessageCommand : Cmd {
-        public LoadNewServerMessageCommand() { }
+        public LoadNewServerMessageCommand(DateTime knowServerMessageTimestamp) {
+            this.KnowServerMessageTimestamp = knowServerMessageTimestamp;
+        }
+
+        public DateTime KnowServerMessageTimestamp { get; private set; }
     }
 
     [MessageType(description: "从服务器获取到新的服务器消息后")]