test

src/AppModels/AppContext.partials.KernelOutputKeywordViewModels.cs

@@ -20,7 +20,7 @@ namespace NTMiner {
                         _dicByKernelOutputId.Clear();
                         Init();
                     });
-                BuildEventPath<KernelOutputKeywordAddedEvent>("添加了内核输出过滤器后刷新VM内存", LogEnum.DevConsole,
+                BuildEventPath<UserKernelOutputKeywordAddedEvent>("添加了内核输出过滤器后刷新VM内存", LogEnum.DevConsole,
                     action: message => {
                         if (!_dicById.ContainsKey(message.Source.GetId())) {
                             KernelOutputKeywordViewModel vm = new KernelOutputKeywordViewModel(message.Source);
@@ -34,13 +34,13 @@ namespace NTMiner {
                             }
                         }
                     });
-                BuildEventPath<KernelOutputKeywordUpdatedEvent>("更新了内核输出过滤器后刷新VM内存", LogEnum.DevConsole,
+                BuildEventPath<UserKernelOutputKeywordUpdatedEvent>("更新了内核输出过滤器后刷新VM内存", LogEnum.DevConsole,
                     action: message => {
                         if (_dicById.TryGetValue(message.Source.GetId(), out KernelOutputKeywordViewModel vm)) {
                             vm.Update(message.Source);
                         }
                     });
-                BuildEventPath<KernelOutputKeywordRemovedEvent>("删除了内核输出过滤器后刷新VM内存", LogEnum.DevConsole,
+                BuildEventPath<UserKernelOutputKeywordRemovedEvent>("删除了内核输出过滤器后刷新VM内存", LogEnum.DevConsole,
                     action: message => {
                         if (_dicById.TryGetValue(message.Source.GetId(), out KernelOutputKeywordViewModel vm)) {
                             _dicById.Remove(vm.Id);

src/NTMinerRpcClient/KernelOutputKeyword/KernelOutputKeywordSet.cs

@@ -56,7 +56,9 @@ namespace NTMiner.KernelOutputKeyword {
                             var col = db.GetCollection<KernelOutputKeywordData>();
                             col.Update(exist);
                         }
-                        VirtualRoot.RaiseEvent(new KernelOutputKeywordUpdatedEvent(exist));
+                        if (!isServer) {
+                            VirtualRoot.RaiseEvent(new UserKernelOutputKeywordUpdatedEvent(exist));
+                        }
                     }
                     else {
                         KernelOutputKeywordData entity = new KernelOutputKeywordData().Update(message.Input);
@@ -66,11 +68,17 @@ namespace NTMiner.KernelOutputKeyword {
                             var col = db.GetCollection<KernelOutputKeywordData>();
                             col.Insert(entity);
                         }
-                        VirtualRoot.RaiseEvent(new KernelOutputKeywordAddedEvent(exist));
+                        if (!isServer) {
+                            VirtualRoot.RaiseEvent(new UserKernelOutputKeywordAddedEvent(exist));
+                        }
                     }
                 }
                 else if (DevMode.IsDevMode) {
-                    // TODO:
+                    OfficialServer.KernelOutputKeywordService.AddOrUpdateKernelOutputKeywordAsync(KernelOutputKeywordData.Create(message.Input), (response, e) => {
+                        if (response.IsSuccess()) {
+                            VirtualRoot.Execute(new LoadKernelOutputKeywordCommand());
+                        }
+                    });
                 }
             });
             VirtualRoot.BuildCmdPath<RemoveKernelOutputKeywordCommand>(action: (message) => {
@@ -88,10 +96,16 @@ namespace NTMiner.KernelOutputKeyword {
                         var col = db.GetCollection<KernelOutputKeywordData>();
                         col.Delete(message.EntityId);
                     }
-                    VirtualRoot.RaiseEvent(new KernelOutputKeywordRemovedEvent(entity));
+                    if (!isServer) {
+                        VirtualRoot.RaiseEvent(new UserKernelOutputKeywordRemovedEvent(entity));
+                    }
                 }
                 else if (DevMode.IsDevMode) {
-                    // TODO:
+                    OfficialServer.KernelOutputKeywordService.RemoveKernelOutputKeyword(message.EntityId, (response, e) => {
+                        if (response.IsSuccess()) {
+                            VirtualRoot.Execute(new LoadKernelOutputKeywordCommand());
+                        }
+                    });
                 }
             });
         }

src/NTMinerRpcClient/OfficialServer.partials.KernelOutputKeywordService.cs

@@ -26,8 +26,8 @@ namespace NTMiner {
             }
             #endregion
 
-            #region SetKernelOutputKeywordAsync
-            public void SetKernelOutputKeywordAsync(KernelOutputKeywordData entity, Action<ResponseBase, Exception> callback) {
+            #region AddOrUpdateKernelOutputKeywordAsync
+            public void AddOrUpdateKernelOutputKeywordAsync(KernelOutputKeywordData entity, Action<ResponseBase, Exception> callback) {
                 DataRequest<KernelOutputKeywordData> request = new DataRequest<KernelOutputKeywordData>() {
                     Data = entity
                 };

src/NTMinerRpcClient/ServerMessage/ServerMessageSet.cs

@@ -113,7 +113,9 @@ namespace NTMiner.ServerMessage {
                 }
                 else {
                     OfficialServer.ServerMessageService.MarkDeleteServerMessageAsync(message.EntityId, (response, ex) => {
-                        VirtualRoot.Execute(new LoadNewServerMessageCommand());
+                        if (response.IsSuccess()) {
+                            VirtualRoot.Execute(new LoadNewServerMessageCommand());
+                        }
                     });
                 }
             });

src/NTMinerlib/Messages.cs

@@ -130,15 +130,15 @@ namespace NTMiner {
         public IKernelOutputKeyword Input { get; private set; }
     }
 
-    [MessageType(description: "添加了内核输出关键字后")]
-    public class KernelOutputKeywordAddedEvent : DomainEvent<IKernelOutputKeyword> {
-        public KernelOutputKeywordAddedEvent(IKernelOutputKeyword source) : base(source) {
+    [MessageType(description: "添加了用户自定义内核输出关键字后")]
+    public class UserKernelOutputKeywordAddedEvent : DomainEvent<IKernelOutputKeyword> {
+        public UserKernelOutputKeywordAddedEvent(IKernelOutputKeyword source) : base(source) {
         }
     }
 
-    [MessageType(description: "更新了内核输出关键字后")]
-    public class KernelOutputKeywordUpdatedEvent : DomainEvent<IKernelOutputKeyword> {
-        public KernelOutputKeywordUpdatedEvent(IKernelOutputKeyword source) : base(source) {
+    [MessageType(description: "更新了用户自定义内核输出关键字后")]
+    public class UserKernelOutputKeywordUpdatedEvent : DomainEvent<IKernelOutputKeyword> {
+        public UserKernelOutputKeywordUpdatedEvent(IKernelOutputKeyword source) : base(source) {
         }
     }
 
@@ -148,9 +148,9 @@ namespace NTMiner {
         }
     }
 
-    [MessageType(description: "移除了内核输出关键字后")]
-    public class KernelOutputKeywordRemovedEvent : DomainEvent<IKernelOutputKeyword> {
-        public KernelOutputKeywordRemovedEvent(IKernelOutputKeyword source) : base(source) {
+    [MessageType(description: "移除了用户自定义内核输出关键字后")]
+    public class UserKernelOutputKeywordRemovedEvent : DomainEvent<IKernelOutputKeyword> {
+        public UserKernelOutputKeywordRemovedEvent(IKernelOutputKeyword source) : base(source) {
 
         }
     }