test

src/WebApiServer/Controllers/ApiControllerBase.cs

@@ -89,10 +89,6 @@ namespace NTMiner.Controllers {
             }
         }
 
-        protected bool IsValidUser<TResponse>(ISignableData data, out TResponse response) where TResponse : ResponseBase, new() {
-            return IsValidUser(data, out response, out _);
-        }
-
         protected bool IsValidUser<TResponse>(ISignableData data, out TResponse response, out UserData user) where TResponse : ResponseBase, new() {
             user = null;
             if (!WebApiRoot.UserSet.IsReadied) {
@@ -128,10 +124,6 @@ namespace NTMiner.Controllers {
             return true;
         }
 
-        protected bool IsValidAdmin<TResponse>(ISignableData data, out TResponse response) where TResponse : ResponseBase, new() {
-            return IsValidAdmin(data, out response, out _);
-        }
-
         protected bool IsValidAdmin<TResponse>(ISignableData data, out TResponse response, out UserData user) where TResponse : ResponseBase, new() {
             user = null;
             if (!WebApiRoot.UserSet.IsReadied) {

src/WebApiServer/Controllers/AppSettingController.cs

@@ -25,7 +25,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidAdmin(request, out ResponseBase response)) {
+                if (!IsValidAdmin(request, out ResponseBase response, out _)) {
                     return response;
                 }
                 VirtualRoot.Execute(new SetLocalAppSettingCommand(request.Data));

src/WebApiServer/Controllers/CalcConfigController.cs

@@ -28,7 +28,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidAdmin(request, out ResponseBase response)) {
+                if (!IsValidAdmin(request, out ResponseBase response, out _)) {
                     return response;
                 }
                 WebApiRoot.CalcConfigSet.SaveCalcConfigs(request.Data);

src/WebApiServer/Controllers/FileUrlController.cs

@@ -13,7 +13,7 @@ namespace NTMiner.Controllers {
                 return string.Empty;
             }
             try {
-                if (!IsValidAdmin(request, out ResponseBase response)) {
+                if (!IsValidAdmin(request, out ResponseBase response, out _)) {
                     return response.Description;
                 }
                 var req = new GeneratePresignedUriRequest("minerjson", request.FileName, SignHttpMethod.Put);
@@ -50,7 +50,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidAdmin(request, out ResponseBase response)) {
+                if (!IsValidAdmin(request, out ResponseBase response, out _)) {
                     return response;
                 }
                 WebApiRoot.NTMinerFileSet.AddOrUpdate(request.Data);
@@ -68,7 +68,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidAdmin(request, out ResponseBase response)) {
+                if (!IsValidAdmin(request, out ResponseBase response, out _)) {
                     return response;
                 }
                 WebApiRoot.NTMinerFileSet.RemoveById(request.Data);

src/WebApiServer/Controllers/KernelOutputKeywordController.cs

@@ -25,7 +25,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidAdmin(request, out ResponseBase response)) {
+                if (!IsValidAdmin(request, out ResponseBase response, out _)) {
                     return response;
                 }
                 VirtualRoot.Execute(new RemoveKernelOutputKeywordCommand(request.Data));
@@ -44,7 +44,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidAdmin(request, out ResponseBase response)) {
+                if (!IsValidAdmin(request, out ResponseBase response, out _)) {
                     return response;
                 }
                 if (request.Data.GetDataLevel() != DataLevel.Global) {

src/WebApiServer/Controllers/NTMinerWalletController.cs

@@ -12,7 +12,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidAdmin(request, out ResponseBase response)) {
+                if (!IsValidAdmin(request, out ResponseBase response, out _)) {
                     return response;
                 }
                 WebApiRoot.NTMinerWalletSet.AddOrUpdate(request.Data);
@@ -32,7 +32,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidAdmin(request, out ResponseBase response)) {
+                if (!IsValidAdmin(request, out ResponseBase response, out _)) {
                     return response;
                 }
                 WebApiRoot.NTMinerWalletSet.RemoveById(request.Data);

src/WebApiServer/Controllers/OverClockDataController.cs

@@ -13,7 +13,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidAdmin(request, out ResponseBase response)) {
+                if (!IsValidAdmin(request, out ResponseBase response, out _)) {
                     return response;
                 }
                 WebApiRoot.OverClockDataSet.AddOrUpdate(request.Data);
@@ -33,7 +33,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidAdmin(request, out ResponseBase response)) {
+                if (!IsValidAdmin(request, out ResponseBase response, out _)) {
                     return response;
                 }
                 WebApiRoot.OverClockDataSet.RemoveById(request.Data);

src/WebApiServer/Controllers/ServerMessageController.cs

@@ -25,7 +25,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidAdmin(request, out ResponseBase response)) {
+                if (!IsValidAdmin(request, out ResponseBase response, out _)) {
                     return response;
                 }
                 VirtualRoot.Execute(new AddOrUpdateServerMessageCommand(request.Data));
@@ -44,7 +44,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidAdmin(request, out ResponseBase response)) {
+                if (!IsValidAdmin(request, out ResponseBase response, out _)) {
                     return response;
                 }
                 VirtualRoot.Execute(new MarkDeleteServerMessageCommand(request.Data));

src/WebApiServer/Controllers/UserAppSettingController.cs

@@ -12,7 +12,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput<DataResponse<List<UserAppSettingData>>>("参数错误");
             }
             try {
-                if (!IsValidUser(request, out DataResponse<List<UserAppSettingData>> response)) {
+                if (!IsValidUser(request, out DataResponse<List<UserAppSettingData>> response, out _)) {
                     return response;
                 }
                 var data = WebApiRoot.UserAppSettingSet;
@@ -30,7 +30,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidUser(request, out ResponseBase response)) {
+                if (!IsValidUser(request, out ResponseBase response, out _)) {
                     return response;
                 }
                 WebApiRoot.UserAppSettingSet.SetAppSetting(request.Data);

src/WebApiServer/Controllers/WebApiServerNodeController.cs

@@ -9,7 +9,7 @@ namespace NTMiner.Controllers {
             if (request == null) {
                 return ResponseBase.InvalidInput<DataResponse<WebApiServerState>>("参数错误");
             }
-            if (!IsValidAdmin(request, out DataResponse<WebApiServerState> response)) {
+            if (!IsValidAdmin(request, out DataResponse<WebApiServerState> response, out _)) {
                 return response;
             }
             return new DataResponse<WebApiServerState> {

src/WebApiServer/Controllers/WsServerNodeController.cs

@@ -12,7 +12,7 @@ namespace NTMiner.Controllers {
             if (request == null) {
                 return ResponseBase.InvalidInput<DataResponse<List<WsServerNodeState>>>("参数错误");
             }
-            if (!IsValidAdmin(request, out DataResponse<List<WsServerNodeState>> response)) {
+            if (!IsValidAdmin(request, out DataResponse<List<WsServerNodeState>> response, out _)) {
                 return response;
             }
             return new DataResponse<List<WsServerNodeState>> {
@@ -28,7 +28,7 @@ namespace NTMiner.Controllers {
             if (request == null) {
                 return ResponseBase.InvalidInput<DataResponse<string[]>>("参数错误");
             }
-            if (!IsValidAdmin(request, out DataResponse<string[]> response)) {
+            if (!IsValidAdmin(request, out DataResponse<string[]> response, out _)) {
                 return response;
             }
             return new DataResponse<string[]> {
@@ -63,7 +63,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidAdmin(state, out ResponseBase response)) {
+                if (!IsValidAdmin(state, out ResponseBase response, out _)) {
                     return response;
                 }
                 WebApiRoot.WsServerNodeSet.SetNodeState(state);
@@ -80,7 +80,7 @@ namespace NTMiner.Controllers {
                 return ResponseBase.InvalidInput("参数错误");
             }
             try {
-                if (!IsValidAdmin(request, out ResponseBase response)) {
+                if (!IsValidAdmin(request, out ResponseBase response, out _)) {
                     return response;
                 }
                 WebApiRoot.WsServerNodeSet.RemoveNode(request.Data);