reorder query region hosts (#257)

qiniu · Jul 25, 2023 · 9e978b4 · 9e978b4
1 parent 897e658
commit 9e978b4
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 20 deletions.
diff --git a/src/Qiniu/Storage/Config.cs b/src/Qiniu/Storage/Config.cs
@@ -16,11 +16,15 @@ public class Config
         /// </summary>
         public static string DefaultUcHost = "uc.qbox.me";
         /// <summary>
-        /// 默认备用空间管理域名
+        /// 默认查询区域域名
         /// </summary>
-        public static List<string> DefaultBackupUcHosts = new List<string>
+        public static string DefaultQueryRegionHost = "kodo-config.qiniuapi.com";
+        /// <summary>
+        /// 默认备用查询区域域名
+        /// </summary>
+        public static List<string> DefaultBackupQueryRegionHosts = new List<string>
         {
-            "kodo-config.qiniuapi.com",
+            "uc.qbox.me",
             "api.qiniu.com"
         };
 
@@ -68,12 +72,15 @@ public class Config
 
         private string _ucHost = DefaultUcHost;
 
-        private List<string> _backupUcHosts = DefaultBackupUcHosts;
+        private string _queryRegionHost = DefaultQueryRegionHost;
+
+        private List<string> _backupQueryRegionHosts = DefaultBackupQueryRegionHosts;
 
         public void SetUcHost(string val)
         {
             _ucHost = val;
-            _backupUcHosts.Clear();
+            _queryRegionHost = val;
+            _backupQueryRegionHosts.Clear();
         }
 
         public string UcHost()
@@ -82,14 +89,26 @@ public string UcHost()
             return string.Format("{0}{1}", scheme, _ucHost);
         }
 
-        public void SetBackupUcHost(List<string> val)
+        public void SetQueryRegionHost(string val)
+        {
+            _queryRegionHost = val;
+            _backupQueryRegionHosts.Clear();
+        }
+
+        public string QueryRegionHost()
+        {
+            string scheme = UseHttps ? "https://" : "http://";
+            return string.Format("{0}{1}", scheme, _queryRegionHost);
+        }
+
+        public void SetBackupQueryRegionHosts(List<string> val)
         {
-            _backupUcHosts = val;
+            _backupQueryRegionHosts = val;
         }
 
-        public List<string> BackupUcHost()
+        public List<string> BackupQueryRegionHosts()
         {
-            return _backupUcHosts;
+            return _backupQueryRegionHosts;
         }
 
         /// <summary>
@@ -104,7 +123,7 @@ public string RsHost(string ak, string bucket)
             Zone z = this.Zone;
             if (z == null)
             {
-                z = ZoneHelper.QueryZone(ak, bucket, UcHost(), BackupUcHost());
+                z = ZoneHelper.QueryZone(ak, bucket, QueryRegionHost(), BackupQueryRegionHosts());
             }
             return string.Format("{0}{1}", scheme, z.RsHost);
         }
@@ -121,7 +140,7 @@ public string RsfHost(string ak, string bucket)
             Zone z = this.Zone;
             if (z == null)
             {
-                z = ZoneHelper.QueryZone(ak, bucket, UcHost(), BackupUcHost());
+                z = ZoneHelper.QueryZone(ak, bucket, QueryRegionHost(), BackupQueryRegionHosts());
             }
             return string.Format("{0}{1}", scheme, z.RsfHost);
         }
@@ -138,7 +157,7 @@ public string ApiHost(string ak, string bucket)
             Zone z = this.Zone;
             if (z == null)
             {
-                z = ZoneHelper.QueryZone(ak, bucket, UcHost(), BackupUcHost());
+                z = ZoneHelper.QueryZone(ak, bucket, QueryRegionHost(), BackupQueryRegionHosts());
             }
             return string.Format("{0}{1}", scheme, z.ApiHost);
         }
@@ -155,7 +174,7 @@ public string IovipHost(string ak, string bucket)
             Zone z = this.Zone;
             if (z == null)
             {
-                z = ZoneHelper.QueryZone(ak, bucket, UcHost(), BackupUcHost());
+                z = ZoneHelper.QueryZone(ak, bucket, QueryRegionHost(), BackupQueryRegionHosts());
             }
             return string.Format("{0}{1}", scheme, z.IovipHost);
         }
@@ -172,7 +191,7 @@ public string UpHost(string ak, string bucket)
             Zone z = this.Zone;
             if (z == null)
             {
-                z = ZoneHelper.QueryZone(ak, bucket, UcHost(), BackupUcHost());
+                z = ZoneHelper.QueryZone(ak, bucket, QueryRegionHost(), BackupQueryRegionHosts());
             }
             string upHost = z.SrcUpHosts[0];
             if (this.UseCdnDomains)

diff --git a/src/Qiniu/Storage/ZoneHelper.cs b/src/Qiniu/Storage/ZoneHelper.cs
@@ -25,7 +25,8 @@ public class ZoneHelper
         /// </summary>
         /// <param name="accessKey">AccessKey</param>
         /// <param name="bucket">空间名称</param>
-        /// <param name="ucHost">UC 域名</param>
+        /// <param name="ucHost">查询域名</param>
+        /// <param name="backupUcHosts">备用查询域名</param>
         public static Zone QueryZone(
             string accessKey,
             string bucket,
@@ -59,12 +60,12 @@ public static Zone QueryZone(
             HttpResult hr = null;
             if (String.IsNullOrEmpty(ucHost))
             {
-                ucHost = "https://" + Config.DefaultUcHost;
+                ucHost = "https://" + Config.DefaultQueryRegionHost;
             }
 
             if (backupUcHosts == null)
             {
-                backupUcHosts = Config.DefaultBackupUcHosts;
+                backupUcHosts = Config.DefaultBackupQueryRegionHosts;
             }
 
             try

diff --git a/src/QiniuTests/Storage/ZoneHelperTests.cs b/src/QiniuTests/Storage/ZoneHelperTests.cs
@@ -14,13 +14,50 @@ public void QueryZoneTest()
 
             Assert.NotNull(zone);
         }
-
+
+        [Test]
+        public void QueryZoneWithCustomQueryRegionHost()
+        {
+            Config config = new Config();
+            config.SetQueryRegionHost("uc.qbox.me");
+            config.UseHttps = true;
+
+            Zone zone = ZoneHelper.QueryZone(
+                AccessKey,
+                Bucket,
+                config.UcHost()
+            );
+            Assert.NotNull(zone);
+        }
+
         [Test]
         public void QueryZoneWithBackupHostsTest()
+        {
+            Config config = new Config();
+            config.SetQueryRegionHost("fake-uc.csharp.qiniu.com");
+            config.SetBackupQueryRegionHosts(new List<string>
+                {
+                    "unavailable-uc.csharp.qiniu.com",
+                    "uc.qbox.me"
+                }
+            );
+            config.UseHttps = true;
+
+            Zone zone = ZoneHelper.QueryZone(
+                AccessKey,
+                Bucket,
+                config.UcHost(),
+                config.BackupQueryRegionHosts()
+            );
+            Assert.NotNull(zone);
+        }
+
+        [Test]
+        public void QueryZoneWithUcAndBackupHostsTest()
         {
             Config config = new Config();
             config.SetUcHost("fake-uc.csharp.qiniu.com");
-            config.SetBackupUcHost(new List<string>
+            config.SetBackupQueryRegionHosts(new List<string>
                 {
                     "unavailable-uc.csharp.qiniu.com",
                     "uc.qbox.me"
@@ -32,7 +69,7 @@ public void QueryZoneWithBackupHostsTest()
                 AccessKey,
                 Bucket,
                 config.UcHost(),
-                config.BackupUcHost()
+                config.BackupQueryRegionHosts()
             );
             Assert.NotNull(zone);
         }