test

src/NTMinerRpcClient/Services/OfficialServices.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Web;
-
-namespace NTMiner.Services {
+namespace NTMiner.Services {
     using Official;
 
     public class OfficialServices {
@@ -25,18 +22,5 @@ namespace NTMiner.Services {
 
         internal OfficialServices() {
         }
-
-        public string SignatureSafeUrl(Uri uri) {
-            // https://ntminer.oss-cn-beijing.aliyuncs.com/packages/HSPMinerAE2.1.2.zip?Expires=1554472712&OSSAccessKeyId=LTAIHNApO2ImeMxI&Signature=FVTf+nX4grLKcPRxpJd9nf3Py7I=
-            // Signature的值长度是28
-            string url = uri.ToString();
-            const string keyword = "Signature=";
-            int index = url.IndexOf(keyword);
-            if (index != -1) {
-                string signature = url.Substring(index + keyword.Length, 28);
-                return url.Substring(0, index) + keyword + HttpUtility.UrlEncode(signature) + url.Substring(index + keyword.Length + 28);
-            }
-            return url;
-        }
     }
 }

src/UnitTests/UnitTest1.cs

@@ -238,13 +238,6 @@ namespace UnitTests {
             Assert.AreEqual(1, (int)1.1);
         }
 
-        [TestMethod]
-        public void AliOSSUrlTest() {
-            Uri uri = new Uri($"https://ntminer.oss-cn-beijing.aliyuncs.com/packages/HSPMinerAE2.1.2.zip?Expires=1554472712&OSSAccessKeyId=LTAIHNApO2ImeMxI&Signature=FVTf+nX4grLKcPRxpJd9nf3Py7I=");
-            Console.WriteLine(uri.ToString());
-            Console.WriteLine(RpcRoot.OfficialServer.SignatureSafeUrl(uri));
-        }
-
         [TestMethod]
         public void GetIndexCharTest() {
             List<string> chars1 = new List<string>();

src/WebApiServer/Controllers/FileUrlController.cs

@@ -15,7 +15,7 @@ namespace NTMiner.Controllers {
             try {
                 var req = new GeneratePresignedUriRequest("minerjson", request.FileName, SignHttpMethod.Put);
                 var uri = WebApiRoot.OssClient.GeneratePresignedUri(req);
-                return RpcRoot.OfficialServer.SignatureSafeUrl(uri);
+                return uri.ToString();
             }
             catch (Exception e) {
                 Logger.ErrorDebugLine(e);
@@ -32,7 +32,7 @@ namespace NTMiner.Controllers {
                 Expiration = DateTime.Now.AddMinutes(10)
             };
             var uri = WebApiRoot.OssClient.GeneratePresignedUri(req);
-            return RpcRoot.OfficialServer.SignatureSafeUrl(uri);
+            return uri.ToString();
         }
 
         [HttpPost]
@@ -89,7 +89,7 @@ namespace NTMiner.Controllers {
                 }
                 var req = new GeneratePresignedUriRequest("ntminer", fileName, SignHttpMethod.Get);
                 var uri = WebApiRoot.OssClient.GeneratePresignedUri(req);
-                return RpcRoot.OfficialServer.SignatureSafeUrl(uri);
+                return uri.ToString();
             }
             catch (Exception e) {
                 Logger.ErrorDebugLine(e);
@@ -109,7 +109,7 @@ namespace NTMiner.Controllers {
                 }
                 var req = new GeneratePresignedUriRequest("ntminer", fileName, SignHttpMethod.Get);
                 var uri = WebApiRoot.OssClient.GeneratePresignedUri(req);
-                return RpcRoot.OfficialServer.SignatureSafeUrl(uri);
+                return uri.ToString();
             }
             catch (Exception e) {
                 Logger.ErrorDebugLine(e);
@@ -122,7 +122,7 @@ namespace NTMiner.Controllers {
             try {
                 var req = new GeneratePresignedUriRequest("ntminer", "LiteDBExplorerPortable.zip", SignHttpMethod.Get);
                 var uri = WebApiRoot.OssClient.GeneratePresignedUri(req);
-                return RpcRoot.OfficialServer.SignatureSafeUrl(uri);
+                return uri.ToString();
             }
             catch (Exception e) {
                 Logger.ErrorDebugLine(e);
@@ -140,7 +140,7 @@ namespace NTMiner.Controllers {
                     Expiration = DateTime.Now.AddMinutes(10)
                 };
                 var uri = WebApiRoot.OssClient.GeneratePresignedUri(req);
-                return RpcRoot.OfficialServer.SignatureSafeUrl(uri);
+                return uri.ToString();
             }
             catch (Exception e) {
                 Logger.ErrorDebugLine(e);