update QueryZone for configurable uc

Author: lihsai0

src/Qiniu/Storage/Config.cs

@@ -80,7 +80,7 @@ public string RsHost(string ak, string bucket)
             Zone z = this.Zone;
             if (z == null)
             {
-                z = ZoneHelper.QueryZone(ak, bucket, scheme);
+                z = ZoneHelper.QueryZone(ak, bucket, UcHost());
             }
             return string.Format("{0}{1}", scheme, z.RsHost);
         }
@@ -97,7 +97,7 @@ public string RsfHost(string ak, string bucket)
             Zone z = this.Zone;
             if (z == null)
             {
-                z = ZoneHelper.QueryZone(ak, bucket, scheme);
+                z = ZoneHelper.QueryZone(ak, bucket, UcHost());
             }
             return string.Format("{0}{1}", scheme, z.RsfHost);
         }
@@ -114,7 +114,7 @@ public string ApiHost(string ak, string bucket)
             Zone z = this.Zone;
             if (z == null)
             {
-                z = ZoneHelper.QueryZone(ak, bucket, scheme);
+                z = ZoneHelper.QueryZone(ak, bucket, UcHost());
             }
             return string.Format("{0}{1}", scheme, z.ApiHost);
         }
@@ -131,7 +131,7 @@ public string IovipHost(string ak, string bucket)
             Zone z = this.Zone;
             if (z == null)
             {
-                z = ZoneHelper.QueryZone(ak, bucket, scheme);
+                z = ZoneHelper.QueryZone(ak, bucket, UcHost());
             }
             return string.Format("{0}{1}", scheme, z.IovipHost);
         }
@@ -148,7 +148,7 @@ public string UpHost(string ak, string bucket)
             Zone z = this.Zone;
             if (z == null)
             {
-                z = ZoneHelper.QueryZone(ak, bucket, scheme);
+                z = ZoneHelper.QueryZone(ak, bucket, UcHost());
             }
             string upHost = z.SrcUpHosts[0];
             if (this.UseCdnDomains)

src/Qiniu/Storage/ZoneHelper.cs

@@ -21,11 +21,12 @@ public class ZoneHelper
         private static object rwLock = new object();
 
         /// <summary>
-        /// 从uc.qbox.me查询得到回复后，解析出upHost,然后根据upHost确定Zone
+        /// 从 UC 服务查询得到各个服务域名，生成 Zone 对象并返回
         /// </summary>
-        /// <param name="accessKey">AccessKek</param>
+        /// <param name="accessKey">AccessKey</param>
         /// <param name="bucket">空间名称</param>
-        public static Zone QueryZone(string accessKey, string bucket, string scheme = "https://")
+        /// <param name="ucHost">UC 域名</param>
+        public static Zone QueryZone(string accessKey, string bucket, string ucHost = null)
         {
             ZoneCacheValue zoneCacheValue = null;
             string cacheKey = string.Format("{0}:{1}", accessKey, bucket);
@@ -51,11 +52,14 @@ public static Zone QueryZone(string accessKey, string bucket, string scheme = "h
             //query from uc api
             Zone zone;
             HttpResult hr = null;
+            if (String.IsNullOrEmpty(ucHost))
+            {
+                ucHost = "https://" + Config.DefaultUcHost;
+            }
             try
             {
-                string queryUrl = string.Format("{0}{1}/v4/query?ak={2}&bucket={3}",
-                    scheme,
-                    Config.DefaultUcHost,
+                string queryUrl = string.Format("{0}/v4/query?ak={1}&bucket={2}",
+                    ucHost,
                     accessKey,
                     bucket
                 );

src/QiniuTests/Storage/ConfigTests.cs

@@ -11,15 +11,15 @@ public void UcHostTest()
         {
             Config config = new Config();
             string ucHost = config.UcHost();
-            Assert.AreEqual("http://" + Config.DefaultUcHost, ucHost);
+            Assert.AreEqual("http://uc.qbox.me", ucHost);
             config.SetUcHost("uc.example.com");
             ucHost = config.UcHost();
             Assert.AreEqual("http://uc.example.com", ucHost);
 
             config = new Config();
             config.UseHttps = true;
             ucHost = config.UcHost();
-            Assert.AreEqual("https://" + Config.DefaultUcHost, ucHost);
+            Assert.AreEqual("https://uc.qbox.me", ucHost);
             config.SetUcHost("uc.example.com");
             ucHost = config.UcHost();
             Assert.AreEqual("https://uc.example.com", ucHost);