test

src/NTMinerRpcClient/KernelOutputKeyword/KernelOutputKeywordSet.cs

@@ -9,13 +9,11 @@ namespace NTMiner.KernelOutputKeyword {
     public class KernelOutputKeywordSet : IKernelOutputKeywordSet {
         private readonly Dictionary<Guid, KernelOutputKeywordData> _dicById = new Dictionary<Guid, KernelOutputKeywordData>();
         private readonly string _connectionString;
-        private readonly bool _isServer;
 
         public KernelOutputKeywordSet(string dbFileFullName, bool isServer) {
             if (!string.IsNullOrEmpty(dbFileFullName)) {
                 _connectionString = $"filename={dbFileFullName};journal=false";
             }
-            _isServer = isServer;
             if (!isServer) {
                 VirtualRoot.BuildCmdPath<LoadKernelOutputKeywordCommand>(action: message => {
                     if (!VirtualRoot.IsKernelOutputKeywordVisible) {
@@ -34,8 +32,7 @@ namespace NTMiner.KernelOutputKeyword {
                             }
                             DateTime maxTime = localTimestamp;
                             if (response.Data.Count != 0) {
-                                var orderedData = response.Data.OrderBy(a => a.Keyword).ToArray();
-                                foreach (var item in orderedData) {
+                                foreach (var item in response.Data) {
                                     if (item.Timestamp > maxTime) {
                                         maxTime = item.Timestamp;
                                     }
@@ -45,7 +42,7 @@ namespace NTMiner.KernelOutputKeyword {
                                 if (maxTime != localTimestamp) {
                                     VirtualRoot.LocalKernelOutputKeywordSetTimestamp = maxTime;
                                 }
-                                VirtualRoot.RaiseEvent(new KernelOutputKeywordLoadedEvent(orderedData));
+                                VirtualRoot.RaiseEvent(new KernelOutputKeywordLoadedEvent(response.Data));
                             }
                         }
                     });

src/NTMinerRpcClient/ServerMessage/ServerMessageSet.cs

@@ -10,13 +10,10 @@ namespace NTMiner.ServerMessage {
         private readonly string _connectionString;
         private readonly LinkedList<ServerMessageData> _linkedList = new LinkedList<ServerMessageData>();
 
-        private readonly bool _isServer;
-
         public ServerMessageSet(string dbFileFullName, bool isServer) {
             if (!string.IsNullOrEmpty(dbFileFullName)) {
                 _connectionString = $"filename={dbFileFullName};journal=false";
             }
-            _isServer = isServer;
             if (!isServer) {
                 VirtualRoot.BuildCmdPath<LoadNewServerMessageCommand>(action: message => {
                     if (!VirtualRoot.IsServerMessagesVisible) {
@@ -42,7 +39,7 @@ namespace NTMiner.ServerMessage {
                     return;
                 }
                 InitOnece();
-                if (_isServer) {
+                if (isServer) {
                     #region Server
                     ServerMessageData exist;
                     List<ServerMessageData> toRemoves = new List<ServerMessageData>();
@@ -98,7 +95,7 @@ namespace NTMiner.ServerMessage {
                     return;
                 }
                 InitOnece();
-                if (_isServer) {
+                if (isServer) {
                     #region Server
                     ServerMessageData exist = null;
                     lock (_locker) {
@@ -131,7 +128,7 @@ namespace NTMiner.ServerMessage {
                 }
                 InitOnece();
                 // 服务端不应有清空消息的功能
-                if (_isServer) {
+                if (isServer) {
                     return;
                 }
                 using (LiteDatabase db = new LiteDatabase(_connectionString)) {

src/NTMinerlib/Messages.cs

@@ -219,11 +219,11 @@ namespace NTMiner {
 
     [MessageType(description: "从服务器获取了内核输出关键字后")]
     public class KernelOutputKeywordLoadedEvent : EventBase {
-        public KernelOutputKeywordLoadedEvent(KernelOutputKeywordData[] data) {
+        public KernelOutputKeywordLoadedEvent(List<KernelOutputKeywordData> data) {
             this.Data = data;
         }
 
-        public KernelOutputKeywordData[] Data { get; private set; }
+        public List<KernelOutputKeywordData> Data { get; private set; }
     }
 
     [MessageType(description: "添加或修改服务器消息")]