uc query add host

Author: YangSen-qn

QiNiu_Android.iml

@@ -3,7 +3,6 @@
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
-        <option name="BUILD_FOLDER_PATH" />
         <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>

library/src/androidTest/java/com/qiniu/android/common/AutoZoneTest.java

@@ -178,11 +178,81 @@ public void complete(int code, ResponseInfo responseInfo, UploadRegionRequestMet
         });
     }
 
+    public void testAutoZone() {
+        final AutoZone zone = new AutoZone();
+        final UpToken token = UpToken.parse(TestConfig.commonToken);
+
+        final TestParam param = new TestParam();
+
+        zone.preQuery(token, new Zone.QueryHandler() {
+            @Override
+            public void complete(int code, ResponseInfo responseInfo, UploadRegionRequestMetrics metrics) {
+                ZonesInfo zonesInfo = zone.getZonesInfo(token);
+                if (zonesInfo != null){
+                    param.success = true;
+                    LogUtil.i(zonesInfo.toString());
+                } else {
+                    param.success = false;
+                }
+                param.completeCount.incrementAndGet();
+            }
+        });
+
+        wait(new WaitConditional() {
+            @Override
+            public boolean shouldWait() {
+                if (param.completeCount.intValue() > 0){
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+        }, 600);
+
+        assertTrue("preQueryHost02 test complete:" + param.success, param.success);
+    }
+
+    public void testSetUcHosts02() {
+        final AutoZone zone = new AutoZone();
+        zone.setUcServers(new String[]{Config.preQueryHost02});
+        final UpToken token = UpToken.parse(TestConfig.commonToken);
+
+        final TestParam param = new TestParam();
+
+        zone.preQuery(token, new Zone.QueryHandler() {
+            @Override
+            public void complete(int code, ResponseInfo responseInfo, UploadRegionRequestMetrics metrics) {
+                ZonesInfo zonesInfo = zone.getZonesInfo(token);
+                if (zonesInfo != null){
+                    param.success = true;
+                    LogUtil.i(zonesInfo.toString());
+                } else {
+                    param.success = false;
+                }
+                param.completeCount.incrementAndGet();
+            }
+        });
+
+        wait(new WaitConditional() {
+            @Override
+            public boolean shouldWait() {
+                if (param.completeCount.intValue() > 0){
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+        }, 60);
+
+        assertTrue("preQueryHost02 test complete:" + param.success, param.success);
+    }
+
     private interface CompleteHandlder {
         void complete(boolean isSuccess);
     }
 
     private class TestParam{
+        Boolean success = false;
         AtomicInteger completeCount = new AtomicInteger(0);
     }
 

library/src/main/java/com/qiniu/android/common/AutoZone.java

@@ -2,8 +2,8 @@
 
 import com.qiniu.android.http.ResponseInfo;
 import com.qiniu.android.http.dns.DnsPrefetchTransaction;
-import com.qiniu.android.http.request.RequestTransaction;
 import com.qiniu.android.http.metrics.UploadRegionRequestMetrics;
+import com.qiniu.android.http.request.RequestTransaction;
 import com.qiniu.android.storage.UpToken;
 import com.qiniu.android.utils.SingleFlight;
 
@@ -12,7 +12,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -48,6 +47,7 @@ public List<String> getUcServerList() {
         } else {
             ArrayList<String> serverList = new ArrayList<>();
             serverList.add(Config.preQueryHost00);
+            serverList.add(Config.preQueryHost02);
             serverList.add(Config.preQueryHost01);
             return serverList;
         }

library/src/main/java/com/qiniu/android/common/Config.java

@@ -77,6 +77,7 @@ public final class Config {
      */
     public static String preQueryHost00 = "uc.qbox.me";
     public static String preQueryHost01 = "api.qiniu.com";
+    public static String preQueryHost02 = "kodo-config.qiniuapi.com";
 
     /**
      * 当网络切换到 wifi 下，切换到此设置

library/src/main/java/com/qiniu/android/http/metrics/UploadSingleRequestMetrics.java

@@ -66,6 +66,8 @@ public Request getRequest() {
     public void setRequest(Request request) {
         if (request != null) {
             this.request = new Request(request.urlString, request.httpMethod, request.allHeaders, null, request.timeout);
+            this.request.host = request.host;
+            this.request.ip = request.ip;
 
             long headerLength = 0;
             long bodyLength = 0;