test

src/MinerClientSelfHost/MinerClientController.cs

@@ -1,7 +1,7 @@
 using NTMiner.Controllers;
 using NTMiner.Core;
 using NTMiner.Core.Daemon;
-using NTMiner.Core.MinerServer;
+using NTMiner.Report;
 using NTMiner.Ws;
 using System;
 using System.Collections.Generic;

src/NTMiner.Controllers/IMinerClientController.cs

@@ -1,8 +1,7 @@
 using NTMiner.Core;
 using NTMiner.Core.Daemon;
-using NTMiner.Core.MinerServer;
+using NTMiner.Report;
 using NTMiner.Ws;
-using System;
 using System.Collections.Generic;
 
 namespace NTMiner.Controllers {

src/NTMiner.Controllers/IReportController.cs

@@ -1,5 +1,4 @@
-using NTMiner.Core.MinerClient;
-using NTMiner.Core.MinerServer;
+using NTMiner.Report;
 
 namespace NTMiner.Controllers {
     public interface IReportController {

src/NTMinerClient/Report/IReportDataProvider.cs

@@ -1,5 +1,4 @@
-using NTMiner.Core.MinerServer;
-using System;
+using System;
 
 namespace NTMiner.Report {
     public interface IReportDataProvider {

src/NTMinerClient/Report/ReportDataProvider.cs

@@ -1,6 +1,5 @@
 using NTMiner.Core;
 using NTMiner.Core.Gpus;
-using NTMiner.Core.MinerServer;
 using NTMiner.Core.Profile;
 using NTMiner.Core.Profiles;
 using NTMiner.Mine;

src/NTMinerDataSchemas/Core/MinerServer/ClientData.cs

@@ -1,6 +1,7 @@
 using LiteDB;
 using Newtonsoft.Json;
 using NTMiner.Core.MinerClient;
+using NTMiner.Report;
 using System;
 
 namespace NTMiner.Core.MinerServer {

src/NTMinerDataSchemas/Core/MinerServer/IClientData.cs

@@ -1,4 +1,5 @@
-using System;
+using NTMiner.Report;
+using System;
 
 namespace NTMiner.Core.MinerServer {
     public interface IClientData : IMinerData, ISpeedData {

src/NTMinerDataSchemas/NTMinerDataSchemas.csproj

@@ -149,7 +149,7 @@
     <Compile Include="Ws\WsMessage.cs" />
     <Compile Include="Core\MinerClient\IGpuSpeedData.cs" />
     <Compile Include="Core\MinerClient\ILocalIp.cs" />
-    <Compile Include="Core\MinerServer\ISpeedData.cs" />
+    <Compile Include="Report\ISpeedData.cs" />
     <Compile Include="Core\MinerClient\LocalIpDto.cs" />
     <Compile Include="Core\MinerServer\IMinerData.cs" />
     <Compile Include="Core\MinerServer\INTMinerWallet.cs" />
@@ -158,7 +158,7 @@
     <Compile Include="Core\MinerServer\KernelOutputKeywordsResponse.cs" />
     <Compile Include="Core\MinerServer\NTMinerWalletData.cs" />
     <Compile Include="Core\LocalMessageChannel.cs" />
-    <Compile Include="Core\MinerServer\ReportResponse.cs" />
+    <Compile Include="Report\ReportResponse.cs" />
     <Compile Include="Core\MinerServer\ServerMessageData.cs" />
     <Compile Include="Core\MinerServer\ServerMessagesRequest.cs" />
     <Compile Include="Core\MinerServer\ServerMessageType.cs" />
@@ -230,13 +230,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Core\MinerServer\QueryClientsRequest.cs" />
     <Compile Include="Core\MinerServer\QueryClientsResponse.cs" />
-    <Compile Include="Core\MinerServer\ReportState.cs" />
+    <Compile Include="Report\ReportState.cs" />
     <Compile Include="Core\PublishStatus.cs" />
     <Compile Include="IRequest.cs" />
     <Compile Include="ResponseBase.cs" />
     <Compile Include="ResponseBaseExtension.cs" />
     <Compile Include="Core\MinerServer\SaveCalcConfigsRequest.cs" />
-    <Compile Include="Core\MinerServer\SpeedData.cs" />
+    <Compile Include="Report\SpeedData.cs" />
     <Compile Include="Timestamp.cs" />
     <Compile Include="Core\MinerServer\UpdateClientRequest.cs" />
     <Compile Include="Core\WalletData.cs" />

src/NTMinerDataSchemas/Core/MinerServer/ISpeedData.cs → src/NTMinerDataSchemas/Report/ISpeedData.cs

@@ -1,7 +1,8 @@
-using NTMiner.Core.MinerClient;
+using NTMiner.Core;
+using NTMiner.Core.MinerClient;
 using System;
 
-namespace NTMiner.Core.MinerServer {
+namespace NTMiner.Report {
     public interface ISpeedData : IMinerIp {
         Guid MineContextId { get; }
         DateTime LocalServerMessageTimestamp { get; }

src/NTMinerDataSchemas/Core/MinerServer/ReportResponse.cs → src/NTMinerDataSchemas/Report/ReportResponse.cs

@@ -1,7 +1,8 @@
-using NTMiner.ServerNode;
+using NTMiner.Core.MinerServer;
+using NTMiner.ServerNode;
 using System.Collections.Generic;
 
-namespace NTMiner.Core.MinerServer {
+namespace NTMiner.Report {
     public class ReportResponse : ResponseBase {
         public ReportResponse() {
             this.ServerState = ServerStateResponse.Empty;

src/NTMinerDataSchemas/Core/MinerServer/ReportState.cs → src/NTMinerDataSchemas/Report/ReportState.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NTMiner.Core.MinerServer {
+namespace NTMiner.Report {
     public class ReportState {
         public ReportState() { }
         public Guid ClientId { get; set; }

src/NTMinerDataSchemas/Core/MinerServer/SpeedData.cs → src/NTMinerDataSchemas/Report/SpeedData.cs

@@ -1,7 +1,8 @@
-using NTMiner.Core.MinerClient;
+using NTMiner.Core;
+using NTMiner.Core.MinerClient;
 using System;
 
-namespace NTMiner.Core.MinerServer {
+namespace NTMiner.Report {
     /// <summary>
     /// 向服务器上报算力时的算力类型
     /// TODO:考虑加个压缩逻辑，只上报变更的字段

src/NTMinerRpcClient/Services/Client/NTMinerClientService.cs

@@ -1,6 +1,6 @@
 using NTMiner.Controllers;
 using NTMiner.Core;
-using NTMiner.Core.MinerServer;
+using NTMiner.Report;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

src/NTMinerRpcClient/Services/Official/ReportService.cs

@@ -1,6 +1,5 @@
 using NTMiner.Controllers;
-using NTMiner.Core.MinerClient;
-using NTMiner.Core.MinerServer;
+using NTMiner.Report;
 using System;
 
 namespace NTMiner.Services.Official {

src/NTMinerServer/Core/Messages.cs

@@ -1,6 +1,7 @@
 using NTMiner.Core.MinerClient;
 using NTMiner.Core.MinerServer;
 using NTMiner.Hub;
+using NTMiner.Report;
 using NTMiner.VirtualMemory;
 using System;
 using System.Collections.Generic;

src/NTMinerServer/Core/Mq/OperationMqBodyUtil.cs

@@ -1,5 +1,6 @@
 using NTMiner.Core.MinerClient;
 using NTMiner.Core.MinerServer;
+using NTMiner.Report;
 using NTMiner.VirtualMemory;
 using System;
 using System.Collections.Generic;

src/WebApiServer/Controllers/ReportController.cs

@@ -1,4 +1,4 @@
-using NTMiner.Core.MinerServer;
+using NTMiner.Report;
 using System;
 using System.Web.Http;
 

src/WebApiServer/Core/IClientDataSet.cs

@@ -1,4 +1,4 @@
-using NTMiner.Core.MinerServer;
+using NTMiner.Report;
 
 namespace NTMiner.Core {
     public interface IClientDataSet : IClientDataSetBase {

src/WebApiServer/Core/Impl/ClientDataSet.cs

@@ -1,6 +1,7 @@
 using NTMiner.Core.MinerServer;
 using NTMiner.Core.Mq.Senders;
 using NTMiner.Core.Redis;
+using NTMiner.Report;
 using System;
 using System.Collections.Generic;
 using System.Reflection;

src/WebApiServer/Core/Mq/MqMessagePaths/MinerClientMqMessagePath.cs

@@ -1,4 +1,5 @@
 using NTMiner.Core.MinerServer;
+using NTMiner.Report;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 using System;

src/WsServer/Core/Mq/Senders/IOperationMqSender.cs

@@ -1,5 +1,6 @@
 using NTMiner.Core.MinerClient;
 using NTMiner.Core.MinerServer;
+using NTMiner.Report;
 using NTMiner.VirtualMemory;
 using System;
 using System.Collections.Generic;

src/WsServer/Core/Mq/Senders/Impl/OperationMqSender.cs

@@ -1,5 +1,6 @@
 using NTMiner.Core.MinerClient;
 using NTMiner.Core.MinerServer;
+using NTMiner.Report;
 using NTMiner.VirtualMemory;
 using RabbitMQ.Client;
 using System;

src/WsServer/MinerClientWsMessageHandler.cs

@@ -1,6 +1,6 @@
 using NTMiner.Core;
 using NTMiner.Core.MinerClient;
-using NTMiner.Core.MinerServer;
+using NTMiner.Report;
 using NTMiner.VirtualMemory;
 using NTMiner.Ws;
 using System;