test

src/AppModels/Vms/StartStopMineButtonViewModel.cs

@@ -16,13 +16,13 @@ namespace NTMiner.Vms {
                 Write.Stopwatch.Restart();
 #endif
             this.StartMine = new DelegateCommand(() => {
-                VirtualRoot.WorkerEvent(WorkerEventChannel.MinerClient, WorkerEventType.Info, $"{VirtualRoot.UserActionWorkerEvent}开始挖矿");
+                VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.UserActionWorkerEvent}开始挖矿");
                 this.MinerProfile.IsMining = true;
                 NTMinerRoot.Instance.StartMine();
                 BtnStopText = "正在挖矿";
             });
             this.StopMine = new DelegateCommand(() => {
-                VirtualRoot.WorkerEvent(WorkerEventChannel.MinerClient, WorkerEventType.Info, $"{VirtualRoot.UserActionWorkerEvent}停止挖矿");
+                VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.UserActionWorkerEvent}停止挖矿");
                 if (!NTMinerRoot.Instance.IsMining) {
                     this.MinerProfile.IsMining = false;
                 }

src/MinerClientSelfHost/MinerClientController.cs

@@ -27,7 +27,7 @@ namespace NTMiner {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}退出挖矿端");
+                VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}退出挖矿端");
                 TimeSpan.FromMilliseconds(100).Delay().ContinueWith((t) => {
                     VirtualRoot.Execute(new CloseNTMinerCommand());
                 });
@@ -45,7 +45,7 @@ namespace NTMiner {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}开始挖矿");
+                VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}开始挖矿");
                 NTMinerRoot.Instance.RestartMine(isWork: request.WorkId != Guid.Empty);
                 return ResponseBase.Ok();
             }
@@ -61,7 +61,7 @@ namespace NTMiner {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}停止挖矿");
+                VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}停止挖矿");
                 NTMinerRoot.Instance.StopMineAsync(StopMineReason.RPCUserAction);
                 return ResponseBase.Ok();
             }
@@ -77,7 +77,7 @@ namespace NTMiner {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}设置挖矿参数");
+                VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}设置挖矿参数");
                 NTMinerRoot.Instance.MinerProfile.SetMinerProfileProperty(request.PropertyName, request.Value);
                 return ResponseBase.Ok();
             }
@@ -106,7 +106,7 @@ namespace NTMiner {
 
         [HttpPost]
         public void OverClock() {
-            VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}刷新超频");
+            VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}刷新超频");
             NTMinerRoot.Instance.GpuProfileSet.Refresh();
         }
     }

src/MinerStudioSelfHost/MinerStudioController.cs

@@ -26,7 +26,7 @@ namespace NTMiner {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}退出群控端");
+                VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}退出群控端");
                 TimeSpan.FromMilliseconds(100).Delay().ContinueWith(t => {
                     VirtualRoot.Execute(new CloseNTMinerCommand());
                 });

src/NTMinerDaemon/NTMinerDaemonController.cs

@@ -17,7 +17,7 @@ namespace NTMiner {
         [HttpPost]
         public ResponseBase EnableWindowsRemoteDesktop() {
             try {
-                VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}启用Windows远程桌面");
+                VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}启用Windows远程桌面");
                 Rdp.SetRdpEnabled(true, true);
                 Firewall.AddRemoteDesktopRule();
                 return ResponseBase.Ok();
@@ -30,7 +30,7 @@ namespace NTMiner {
 
         [HttpPost]
         public void CloseDaemon() {
-            VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}退出守护进程");
+            VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}退出守护进程");
             // 延迟100毫秒再退出从而避免当前的CloseDaemon请求尚未收到响应
             TimeSpan.FromMilliseconds(100).Delay().ContinueWith(t => {
                 HostRoot.Exit();
@@ -41,7 +41,7 @@ namespace NTMiner {
         [HttpPost]
         public string GetGpuProfilesJson() {
             try {
-                VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}获取显卡参数");
+                VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}获取显卡参数");
                 return SpecialPath.ReadGpuProfilesJsonFile();
             }
             catch (Exception e) {
@@ -55,7 +55,7 @@ namespace NTMiner {
         [HttpPost]
         public void SaveGpuProfilesJson() {
             try {
-                VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}保存显卡参数");
+                VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}保存显卡参数");
                 string json = Request.Content.ReadAsStringAsync().Result;
                 SpecialPath.SaveGpuProfilesJsonFile(json);
                 if (IsNTMinerOpened()) {
@@ -73,7 +73,7 @@ namespace NTMiner {
 
         [HttpPost]
         public void SetAutoBootStart([FromUri]bool autoBoot, [FromUri]bool autoStart) {
-            VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}开机启动{(autoBoot ? "√": "×")}，自动挖矿{(autoStart ? "√" : "×")}");
+            VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}开机启动{(autoBoot ? "√": "×")}，自动挖矿{(autoStart ? "√" : "×")}");
             MinerProfileUtil.SetAutoStart(autoBoot, autoStart);
             if (IsNTMinerOpened()) {
                 using (HttpClient client = new HttpClient()) {
@@ -89,7 +89,7 @@ namespace NTMiner {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}重启矿机");
+                VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}重启矿机");
                 Windows.Power.Restart(10);
                 CloseNTMiner();
                 return ResponseBase.Ok();
@@ -106,7 +106,7 @@ namespace NTMiner {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}关机");
+                VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}关机");
                 Windows.Power.Shutdown(10);
                 CloseNTMiner();
                 return ResponseBase.Ok();
@@ -133,7 +133,7 @@ namespace NTMiner {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}开始挖矿");
+                VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}开始挖矿");
                 ResponseBase response;
                 if (request.WorkId != Guid.Empty) {
                     File.WriteAllText(SpecialPath.NTMinerLocalJsonFileFullName, request.LocalJson);
@@ -174,7 +174,7 @@ namespace NTMiner {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}停止挖矿");
+                VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}停止挖矿");
                 ResponseBase response;
                 if (!IsNTMinerOpened()) {
                     return ResponseBase.Ok();
@@ -202,7 +202,7 @@ namespace NTMiner {
             if (request == null) {
                 return ResponseBase.InvalidInput("参数错误");
             }
-            VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}重启挖矿端");
+            VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}重启挖矿端");
             if (request.WorkId != Guid.Empty) {
                 File.WriteAllText(SpecialPath.NTMinerLocalJsonFileFullName, request.LocalJson);
                 File.WriteAllText(SpecialPath.NTMinerServerJsonFileFullName, request.ServerJson);
@@ -230,7 +230,7 @@ namespace NTMiner {
         }
 
         private void CloseNTMiner() {
-            VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}退出挖矿端");
+            VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}退出挖矿端");
             bool isClosed = false;
             try {
                 using (HttpClient client = new HttpClient()) {
@@ -261,7 +261,7 @@ namespace NTMiner {
             if (request == null || string.IsNullOrEmpty(request.NTMinerFileName)) {
                 return ResponseBase.InvalidInput("参数错误");
             }
-            VirtualRoot.WorkerEvent(WorkerEventChannel.RPC, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}升级挖矿端至{request.NTMinerFileName}");
+            VirtualRoot.WorkerEvent(WorkerEventChannel.Local, WorkerEventType.Info, $"{VirtualRoot.RPCWorkerEvent}升级挖矿端至{request.NTMinerFileName}");
             Task.Factory.StartNew(() => {
                 try {
                     string location = NTMinerRegistry.GetLocation();

src/NTMinerDataObjects/WorkerEventChannel.cs

@@ -9,35 +9,20 @@ namespace NTMiner {
         [Description("未定义")]
         Undefined = 0,
         /// <summary>
-        /// 挖矿端本地事件或来自挖矿端的事件
+        /// 本地
         /// </summary>
-        [Description("挖矿端")]
-        MinerClient = 1,
+        [Description("本地")]
+        Local = 1,
         /// <summary>
         /// 服务端事件，比如服务端升级了内核版本时会通知群控客户端（如果挖矿端接收事件也通知挖矿端）
         /// ，此时群控客户端或挖矿端将收到的事件视为MinerServer频道的事件。
         /// </summary>
-        [Description("服务端")]
+        [Description("服务器")]
         MinerServer = 2,
         /// <summary>
-        /// 群控客户端本地事件或来自群控客户端的事件
-        /// </summary>
-        [Description("群控端")]
-        MinerStudio = 3,
-        /// <summary>
-        /// 挖矿端守护进程本地事件或来自挖矿端守护进程的事件
-        /// </summary>
-        [Description("守护")]
-        MinerDaemon = 4,
-        /// <summary>
         /// 基于内核输出和关键字提取的事件
         /// </summary>
-        [Description("内核输出")]
-        KernelOutput = 5,
-        /// <summary>
-        /// 远程调用
-        /// </summary>
-        [Description("远程调用")]
-        RPC,
+        [Description("内核")]
+        KernelOutput = 3
     }
 }

src/NTMinerlib/VirtualRoot.partials.Consts.cs

@@ -9,7 +9,7 @@
 
         public const int WorkerEventSetSliding = 1000;
 
-        public const string RPCWorkerEvent = "远程请求：";
+        public const string RPCWorkerEvent = "请求：";
         public const string UserActionWorkerEvent = "用户操作：";
 
         #region 系统字典编码

src/UnitTests/WorkerEventTests.cs

@@ -11,7 +11,7 @@ namespace UnitTests {
         public void TestMethod1() {
             File.Delete(VirtualRoot.WorkerEventDbFileFullName);
             Assert.IsTrue(VirtualRoot.WorkerEvents.LastWorkerEventId == 0);
-            WorkerEventChannel eventChannel = WorkerEventChannel.MinerClient;
+            WorkerEventChannel eventChannel = WorkerEventChannel.Local;
             string content = "this is a test";
             VirtualRoot.WorkerEvent(eventChannel, WorkerEventType.Info, content);
             Assert.IsTrue(VirtualRoot.WorkerEvents.LastWorkerEventId == 1);
@@ -33,7 +33,7 @@ namespace UnitTests {
             File.Delete(VirtualRoot.WorkerEventDbFileFullName);
             Assert.IsTrue(VirtualRoot.WorkerEvents.LastWorkerEventId == 0);
             int times = 2000;
-            WorkerEventChannel eventChannel = WorkerEventChannel.MinerClient;
+            WorkerEventChannel eventChannel = WorkerEventChannel.Local;
             string content = "this is a test";
             for (int i = 0; i < times; i++) {
                 VirtualRoot.WorkerEvent(eventChannel, WorkerEventType.Info, content);