From 8a25c52d0b7decf86cfb7329b31c512d5510e176 Mon Sep 17 00:00:00 2001
From: yangsen <yang_sen_ysys@163.com>
Date: Mon, 24 Jun 2024 14:03:18 +0800
Subject: [PATCH] Support acc (#511)

---
 .idea/misc.xml                                |  1 -
 build.gradle                                  |  1 +
 .../java/com/qiniu/android/TestConfig.java    | 14 ++--
 .../qiniu/android/http/dns/DnsApiTest.java    |  4 +-
 .../android/http/dns/DnsTransactionTest.java  |  2 +-
 .../qiniu/android/http/dns/SystemDnsTest.java |  6 +-
 .../serverRegion/UploadDomainRegionTest.java  |  2 +-
 .../android/collect/UploadInfoReporter.java   |  4 +-
 .../com/qiniu/android/common/AutoZone.java    | 73 ++++++++++++-----
 .../java/com/qiniu/android/common/Config.java |  3 +-
 .../com/qiniu/android/common/FixedZone.java   | 41 ++++++++--
 .../java/com/qiniu/android/common/Zone.java   | 24 ++++++
 .../com/qiniu/android/common/ZoneInfo.java    | 65 +++++++++++++---
 .../com/qiniu/android/http/ResponseInfo.java  | 33 +++++++-
 .../http/dns/DnsPrefetchTransaction.java      | 19 ++++-
 .../qiniu/android/http/dns/DnsPrefetcher.java | 26 +++++--
 .../http/request/HttpRegionRequest.java       |  2 +-
 .../http/request/HttpSingleRequest.java       |  2 +-
 .../http/request/RequestTransaction.java      |  4 +-
 .../request/httpclient/SystemHttpClient.java  |  7 +-
 .../http/serverRegion/UploadDomainRegion.java | 78 ++++++++++++++++---
 .../com/qiniu/android/storage/BaseUpload.java | 35 +++++----
 .../qiniu/android/storage/Configuration.java  | 19 +++++
 .../qiniu/android/storage/PartsUpload.java    |  2 +-
 .../android/storage/PartsUploadPerformer.java |  2 +-
 .../qiniu/android/storage/UploadManager.java  |  4 +-
 .../com/qiniu/android/utils/ListUtils.java    | 10 +++
 .../com/qiniu/android/utils/MapUtils.java     |  9 +++
 28 files changed, 392 insertions(+), 100 deletions(-)
 create mode 100644 library/src/main/java/com/qiniu/android/utils/ListUtils.java
 create mode 100644 library/src/main/java/com/qiniu/android/utils/MapUtils.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index c4aa05ee..d5328a40 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavadocGenerationManager">
     <option name="OUTPUT_DIRECTORY" value="$USER_HOME$/AndroidUploadDocumnet" />
diff --git a/build.gradle b/build.gradle
index 32c07dda..9ee00d9e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,6 +19,7 @@ allprojects {
     repositories {
         jcenter()
         google()
+        mavenCentral()
     }
 //    gradle.projectsEvaluated {
 //        tasks.withType(JavaCompile) {
diff --git a/library/src/androidTest/java/com/qiniu/android/TestConfig.java b/library/src/androidTest/java/com/qiniu/android/TestConfig.java
index 86d73309..2500a381 100644
--- a/library/src/androidTest/java/com/qiniu/android/TestConfig.java
+++ b/library/src/androidTest/java/com/qiniu/android/TestConfig.java
@@ -10,23 +10,23 @@ public final class TestConfig {
     // TODO: 2020-05-09 bad token for testPutBytesWithFixedZoneUseBackupDomains
     // 华东上传凭证
     public static final String bucket_z0 = "kodo-phone-zone0-space";
-    public static final String token_z0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:kCuN1lxE7wby0SgsYmgleVQh5pk=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTcwMjk1Mzg5MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
+    public static final String token_z0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:gHBZrJTOKxxJlXjYoUxWmRSvuU8=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTcyMTcwMDU5MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
     // 华北上传凭证
     public static final String bucket_z1 = "kodo-phone-zone1-space";
-    public static final String token_z1 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:6GJohI_Ldf_hBwGATV3iYeuMVZ0=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTEtc3BhY2UiLCJkZWFkbGluZSI6MTcwMjk1Mzg5MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
+    public static final String token_z1 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:8kFB5kF7f3INNSUZLToOBDTGMbU=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTEtc3BhY2UiLCJkZWFkbGluZSI6MTcyMTcwMDU5MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
     // 华南上传凭证
     public static final String bucket_z2 = "kodo-phone-zone2-space";
-    public static final String token_z2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:gy-wF5GQuoffNKUmRMKC0wVQDHQ=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTItc3BhY2UiLCJkZWFkbGluZSI6MTcwMjk1Mzg5MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
+    public static final String token_z2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:CR7NjzaMWAqQAt6b7mPuwvwIzLs=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTItc3BhY2UiLCJkZWFkbGluZSI6MTcyMTcwMDU5MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
     // 北美上传凭证
     public static final String bucket_na0 = "kodo-phone-zone-na0-space";
-    public static final String token_na0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:mEbYwqz9BbvKpjemh7arZA01SCY=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1uYTAtc3BhY2UiLCJkZWFkbGluZSI6MTcwMjk1Mzg5MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
+    public static final String token_na0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:4TBEbspih6VzaNbPYlrpRIkm7xU=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1uYTAtc3BhY2UiLCJkZWFkbGluZSI6MTcyMTcwMDU5MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
     // 东南亚上传凭证
     public static final String bucket_as0 = "kodo-phone-zone-as0-space";
-    public static final String token_as0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:b5V9b1I3FCrNYJ1aQznlcGvyKe0=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1hczAtc3BhY2UiLCJkZWFkbGluZSI6MTcwMjk1Mzg5MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
+    public static final String token_as0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:JczpyfXUYEan2qrimbu6GlOCADo=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1hczAtc3BhY2UiLCJkZWFkbGluZSI6MTcyMTcwMDU5MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
     // 华北浙江2上传凭证
     public static final String bucket_cn_east_2 = "kodo-phone-cn-east-2";
-    public static final String token_cn_east_2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:5wMZsrDWTJuYW-aYz6AsBJJhol4=:eyJzY29wZSI6ImtvZG8tcGhvbmUtY24tZWFzdC0yIiwiZGVhZGxpbmUiOjE3MDI5NTM4OTEsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKSwgXCJmc2l6ZVwiOiQoZnNpemUpfSJ9";
-    public static final String invalidBucketToken = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:AF6tAFx4teQul_zEMXWzbN79_eI=:eyJzY29wZSI6InpvbmVfaW52YWxpZCIsImRlYWRsaW5lIjoxNzAyOTUzODkxLCAicmV0dXJuQm9keSI6IntcImZvb1wiOiQoeDpmb28pLCBcImJhclwiOiQoeDpiYXIpLCBcIm1pbWVUeXBlXCI6JChtaW1lVHlwZSksIFwiaGFzaFwiOiQoZXRhZyksIFwia2V5XCI6JChrZXkpLCBcImZuYW1lXCI6JChmbmFtZSksIFwiZnNpemVcIjokKGZzaXplKX0ifQ==";
+    public static final String token_cn_east_2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:LWCzEeHkDWcYVBViMzZdJ4IaZ0U=:eyJzY29wZSI6ImtvZG8tcGhvbmUtY24tZWFzdC0yIiwiZGVhZGxpbmUiOjE3MjE3MDA1OTIsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKSwgXCJmc2l6ZVwiOiQoZnNpemUpfSJ9";
+    public static final String invalidBucketToken = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:FLgR-iEqqbGw-2vCdA9m5X7nOTY=:eyJzY29wZSI6InpvbmVfaW52YWxpZCIsImRlYWRsaW5lIjoxNzIxNzAwNTkyLCAicmV0dXJuQm9keSI6IntcImZvb1wiOiQoeDpmb28pLCBcImJhclwiOiQoeDpiYXIpLCBcIm1pbWVUeXBlXCI6JChtaW1lVHlwZSksIFwiaGFzaFwiOiQoZXRhZyksIFwia2V5XCI6JChrZXkpLCBcImZuYW1lXCI6JChmbmFtZSksIFwiZnNpemVcIjokKGZzaXplKX0ifQ==";
 
     // -----------
     public static final String ak = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
diff --git a/library/src/androidTest/java/com/qiniu/android/http/dns/DnsApiTest.java b/library/src/androidTest/java/com/qiniu/android/http/dns/DnsApiTest.java
index 6805b664..20220b07 100644
--- a/library/src/androidTest/java/com/qiniu/android/http/dns/DnsApiTest.java
+++ b/library/src/androidTest/java/com/qiniu/android/http/dns/DnsApiTest.java
@@ -67,7 +67,7 @@ public void testPreFetch() {
         FixedZone fixedZone = new FixedZone(new String[]{host});
 
         final DnsPrefetcher dnsPrefetcher = DnsPrefetcher.getInstance();
-        dnsPrefetcher.checkAndPrefetchDnsIfNeed(fixedZone, UpToken.parse(TestConfig.token_z0));
+        dnsPrefetcher.checkAndPrefetchDnsIfNeed(null, fixedZone, UpToken.parse(TestConfig.token_z0));
 
         wait(new WaitConditional() {
             @Override
@@ -95,7 +95,7 @@ public void testMutiThreadPrefetch(){
             new Thread(new Runnable() {
                 @Override
                 public void run() {
-                    boolean isSuccess = DnsPrefetchTransaction.addDnsCheckAndPrefetchTransaction(zone, UpToken.parse(TestConfig.token_z0));
+                    boolean isSuccess = DnsPrefetchTransaction.addDnsCheckAndPrefetchTransaction(null, zone, UpToken.parse(TestConfig.token_z0));
                     synchronized (this){
                         if (isSuccess){
                             param.successCount += 1;
diff --git a/library/src/androidTest/java/com/qiniu/android/http/dns/DnsTransactionTest.java b/library/src/androidTest/java/com/qiniu/android/http/dns/DnsTransactionTest.java
index 0fb00af4..04521d38 100644
--- a/library/src/androidTest/java/com/qiniu/android/http/dns/DnsTransactionTest.java
+++ b/library/src/androidTest/java/com/qiniu/android/http/dns/DnsTransactionTest.java
@@ -68,7 +68,7 @@ public void test_CheckAndPrefetch(){
                 @Override
                 public void run() {
 
-                    boolean isSuccess = DnsPrefetchTransaction.addDnsCheckAndPrefetchTransaction(zone, UpToken.parse(TestConfig.token_z0));
+                    boolean isSuccess = DnsPrefetchTransaction.addDnsCheckAndPrefetchTransaction(null, zone, UpToken.parse(TestConfig.token_z0));
                     synchronized (this) {
                         if (isSuccess) {
                             successCount += 1;
diff --git a/library/src/androidTest/java/com/qiniu/android/http/dns/SystemDnsTest.java b/library/src/androidTest/java/com/qiniu/android/http/dns/SystemDnsTest.java
index f7b5226e..39e86ca2 100644
--- a/library/src/androidTest/java/com/qiniu/android/http/dns/SystemDnsTest.java
+++ b/library/src/androidTest/java/com/qiniu/android/http/dns/SystemDnsTest.java
@@ -16,9 +16,9 @@ public class SystemDnsTest extends BaseTest {
 
     @Test
     public void testDnsLookup() {
-        SystemDns dns = new SystemDns(5);
+        SystemDns dns = new SystemDns(10);
         try {
-            List<IDnsNetworkAddress> result = dns.lookup("upload.qiniup.com");
+            List<IDnsNetworkAddress> result = dns.lookup("uplog.qbox.me");
             assertTrue("testDnsLookup fail:", result != null && result.size() > 0);
         } catch (UnknownHostException e) {
             e.printStackTrace();
@@ -32,7 +32,7 @@ public void testDnsTimeout() {
         int timeout = 5;
         SystemDns dns = new SystemDns(timeout);
         try {
-            List<IDnsNetworkAddress> result = dns.lookup("a.a.a.cn");
+            List<IDnsNetworkAddress> result = dns.lookup("abc.mock.cn");
             assertTrue("testDnsTimeout fail:", result == null || result.size() == 0);
         } catch (UnknownHostException e) {
             e.printStackTrace();
diff --git a/library/src/androidTest/java/com/qiniu/android/http/serverRegion/UploadDomainRegionTest.java b/library/src/androidTest/java/com/qiniu/android/http/serverRegion/UploadDomainRegionTest.java
index 256db5da..36a40e93 100644
--- a/library/src/androidTest/java/com/qiniu/android/http/serverRegion/UploadDomainRegionTest.java
+++ b/library/src/androidTest/java/com/qiniu/android/http/serverRegion/UploadDomainRegionTest.java
@@ -21,7 +21,7 @@ public void testGetOneServer(){
         String type = Utils.getIpType(null, host);
         FixedZone zone = new FixedZone(new String[]{host});
 
-        UploadDomainRegion region = new UploadDomainRegion();
+        UploadDomainRegion region = new UploadDomainRegion(null);
         region.setupRegionData(zone.getZonesInfo(null).zonesInfo.get(0));
 
         UploadServerFreezeManager.getInstance().freezeType(type, 100);
diff --git a/library/src/main/java/com/qiniu/android/collect/UploadInfoReporter.java b/library/src/main/java/com/qiniu/android/collect/UploadInfoReporter.java
index e2d57f1c..87a65cd5 100644
--- a/library/src/main/java/com/qiniu/android/collect/UploadInfoReporter.java
+++ b/library/src/main/java/com/qiniu/android/collect/UploadInfoReporter.java
@@ -7,7 +7,6 @@
 import com.qiniu.android.http.request.RequestTransaction;
 import com.qiniu.android.storage.UpToken;
 import com.qiniu.android.transaction.TransactionManager;
-import com.qiniu.android.utils.AsyncRun;
 import com.qiniu.android.utils.LogUtil;
 import com.qiniu.android.utils.StringUtils;
 import com.qiniu.android.utils.Utils;
@@ -24,7 +23,6 @@
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -254,7 +252,7 @@ private byte[] getLogData() {
             randomAccessFile = new RandomAccessFile(recorderTempFile, "r");
             ByteArrayOutputStream out = new ByteArrayOutputStream(fileSize);
             int len = 0;
-            byte[] buff = new byte[fileSize];
+            byte[] buff = new byte[32*1024];
             while ((len = randomAccessFile.read(buff)) >= 0) {
                 out.write(buff, 0, len);
             }
diff --git a/library/src/main/java/com/qiniu/android/common/AutoZone.java b/library/src/main/java/com/qiniu/android/common/AutoZone.java
index 22d22fd8..0b597b7b 100644
--- a/library/src/main/java/com/qiniu/android/common/AutoZone.java
+++ b/library/src/main/java/com/qiniu/android/common/AutoZone.java
@@ -4,8 +4,11 @@
 import com.qiniu.android.http.dns.DnsPrefetchTransaction;
 import com.qiniu.android.http.metrics.UploadRegionRequestMetrics;
 import com.qiniu.android.http.request.RequestTransaction;
+import com.qiniu.android.storage.Configuration;
 import com.qiniu.android.storage.UpToken;
+import com.qiniu.android.storage.UploadOptions;
 import com.qiniu.android.utils.Cache;
+import com.qiniu.android.utils.ListUtils;
 import com.qiniu.android.utils.SingleFlight;
 import com.qiniu.android.utils.UrlSafeBase64;
 
@@ -14,7 +17,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -111,11 +113,12 @@ private String[] getUcServerArray() {
     }
 
     @Override
+    @Deprecated
     public ZonesInfo getZonesInfo(UpToken token) {
         if (token == null) {
             return null;
         }
-        String cacheKey = makeCacheKey(token.index());
+        String cacheKey = makeCacheKey(null, token.index());
         ZonesInfo zonesInfo = zonesInfoMap.get(cacheKey);
         if (zonesInfo != null) {
             try {
@@ -128,15 +131,35 @@ public ZonesInfo getZonesInfo(UpToken token) {
 
     @Override
     public void preQuery(final UpToken token, final QueryHandler completeHandler) {
+        query(null, token, new QueryHandlerV2() {
+            @Override
+            public void complete(ResponseInfo responseInfo, UploadRegionRequestMetrics metrics, ZonesInfo zonesInfo) {
+                if (completeHandler != null) {
+                    int code = ResponseInfo.NetworkError;
+                    if (responseInfo != null) {
+                        if (responseInfo.isOK()) {
+                            code = 0;
+                        } else {
+                            code = responseInfo.statusCode;
+                        }
+                    }
+                    completeHandler.complete(code, responseInfo, metrics);
+                }
+            }
+        });
+    }
+
+    @Override
+    public void query(Configuration configuration, UpToken token, QueryHandlerV2 completeHandler) {
         if (token == null || !token.isValid()) {
-            completeHandler.complete(-1, ResponseInfo.invalidToken("invalid token"), null);
+            completeHandler.complete(ResponseInfo.invalidToken("invalid token"), null, null);
             return;
         }
 
         UploadRegionRequestMetrics localMetrics = new UploadRegionRequestMetrics(null);
         localMetrics.start();
 
-        final String cacheKey = makeCacheKey(token.index());
+        final String cacheKey = makeCacheKey(configuration, token.index());
 
         ZonesInfo zonesInfo = null;
         Cache.Object object = zoneCache.cacheForKey(cacheKey);
@@ -147,7 +170,7 @@ public void preQuery(final UpToken token, final QueryHandler completeHandler) {
         if (zonesInfo != null && zonesInfo.isValid()) {
             localMetrics.end();
             zonesInfoMap.put(cacheKey, zonesInfo);
-            completeHandler.complete(0, ResponseInfo.successResponse(), localMetrics);
+            completeHandler.complete(ResponseInfo.successResponse(), localMetrics, zonesInfo);
             return;
         }
 
@@ -159,7 +182,7 @@ public void preQuery(final UpToken token, final QueryHandler completeHandler) {
                 @Override
                 public void action(final com.qiniu.android.utils.SingleFlight.CompleteHandler<SingleFlightValue> completeHandler) throws Exception {
 
-                    final RequestTransaction transaction = createUploadRequestTransaction(token);
+                    final RequestTransaction transaction = createUploadRequestTransaction(configuration, token);
                     transaction.queryUploadHosts(true, new RequestTransaction.RequestCompleteHandler() {
                         @Override
                         public void complete(ResponseInfo responseInfo, UploadRegionRequestMetrics requestMetrics, JSONObject response) {
@@ -186,22 +209,29 @@ public void complete(SingleFlightValue singleFlightValue) {
                         if (zonesInfoP.isValid()) {
                             zoneCache.cache(cacheKey, zonesInfoP, true);
                             zonesInfoMap.put(cacheKey, zonesInfoP);
-                            completeHandler.complete(0, responseInfo, requestMetrics);
+                            completeHandler.complete(responseInfo, requestMetrics, zonesInfoP);
                         } else {
-                            completeHandler.complete(ResponseInfo.ParseError, responseInfo, requestMetrics);
+                            responseInfo = ResponseInfo.parseError("origin response:" + responseInfo);
+                            completeHandler.complete(responseInfo, requestMetrics, null);
                         }
                     } else {
                         if (defaultZone != null) {
                             // 备用只能用一次
                             ZonesInfo defaultZoneZonesInfo = defaultZone.getZonesInfo(token);
                             zonesInfoMap.put(cacheKey, defaultZoneZonesInfo);
-                            completeHandler.complete(0, responseInfo, requestMetrics);
+                            String message = "origin response:" + responseInfo;
+                            responseInfo = ResponseInfo.successResponse();
+                            responseInfo.message = message;
+                            completeHandler.complete(responseInfo, requestMetrics, defaultZoneZonesInfo);
                         } else if (finalZonesInfo != null) {
                             // 缓存有，但是失效也可使用
                             zonesInfoMap.put(cacheKey, finalZonesInfo);
-                            completeHandler.complete(0, responseInfo, requestMetrics);
+                            String message = "origin response:" + responseInfo;
+                            responseInfo = ResponseInfo.successResponse();
+                            responseInfo.message = message;
+                            completeHandler.complete(responseInfo, requestMetrics, finalZonesInfo);
                         } else {
-                            completeHandler.complete(ResponseInfo.NetworkError, responseInfo, requestMetrics);
+                            completeHandler.complete(responseInfo, requestMetrics, null);
                         }
                     }
                 }
@@ -209,13 +239,17 @@ public void complete(SingleFlightValue singleFlightValue) {
 
         } catch (Exception e) {
             /// 此处永远不会执行，回调只为占位
-            completeHandler.complete(ResponseInfo.NetworkError, ResponseInfo.localIOError(e.toString()), null);
+            completeHandler.complete(ResponseInfo.localIOError(e.toString()), null, null);
         }
     }
 
-    private String makeCacheKey(String akAndBucket) {
+    private String makeCacheKey(Configuration configuration, String akAndBucket) {
+        String key = akAndBucket;
+        if (configuration != null) {
+            key += akAndBucket + ":" + configuration.accelerateUploading;
+        }
         List<String> ucHosts = getUcServerList();
-        if (ucHosts == null || ucHosts.isEmpty()) {
+        if (ListUtils.isEmpty(ucHosts)) {
             return akAndBucket;
         }
 
@@ -227,13 +261,16 @@ private String makeCacheKey(String akAndBucket) {
             hosts.append(host).append(":");
         }
 
-        return UrlSafeBase64.encodeToString(hosts + akAndBucket);
+        return UrlSafeBase64.encodeToString(hosts + key);
     }
 
-    private RequestTransaction createUploadRequestTransaction(UpToken token) {
+    private RequestTransaction createUploadRequestTransaction(Configuration configuration, UpToken token) {
         List<String> hosts = getUcServerList();
-
-        RequestTransaction transaction = new RequestTransaction(hosts, ZoneInfo.EmptyRegionId, token);
+        if (configuration == null) {
+            configuration = new Configuration.Builder().build();
+        }
+        RequestTransaction transaction = new RequestTransaction(configuration, UploadOptions.defaultOptions(),
+                hosts, ZoneInfo.EmptyRegionId, null, token);
         transactions.add(transaction);
         return transaction;
     }
diff --git a/library/src/main/java/com/qiniu/android/common/Config.java b/library/src/main/java/com/qiniu/android/common/Config.java
index 592bc354..dd3c48c4 100644
--- a/library/src/main/java/com/qiniu/android/common/Config.java
+++ b/library/src/main/java/com/qiniu/android/common/Config.java
@@ -87,6 +87,7 @@ public final class Config {
     /**
      * preQuery host
      */
+    @Deprecated
     public static String preQueryHost03 = "api.qiniu.com";
 
     /**
@@ -95,7 +96,7 @@ public final class Config {
      * @return preQuery hosts
      */
     public static String[] preQueryHosts() {
-        return new String[]{preQueryHost00, preQueryHost01, preQueryHost02, preQueryHost03};
+        return new String[]{preQueryHost00, preQueryHost01, preQueryHost02};
     }
 
     /**
diff --git a/library/src/main/java/com/qiniu/android/common/FixedZone.java b/library/src/main/java/com/qiniu/android/common/FixedZone.java
index 6ae125c0..f7d11d6d 100644
--- a/library/src/main/java/com/qiniu/android/common/FixedZone.java
+++ b/library/src/main/java/com/qiniu/android/common/FixedZone.java
@@ -1,5 +1,8 @@
 package com.qiniu.android.common;
 
+import com.qiniu.android.http.ResponseInfo;
+import com.qiniu.android.http.metrics.UploadRegionRequestMetrics;
+import com.qiniu.android.storage.Configuration;
 import com.qiniu.android.storage.UpToken;
 
 import java.util.ArrayList;
@@ -175,23 +178,40 @@ private FixedZone(String[] upDomains, String[] oldUpDomains, String regionId) {
         this.zonesInfo = createZonesInfo(upDomains, oldUpDomains, regionId);
     }
 
+    public FixedZone(String[] accUpDomains,String[] upDomains, String[] oldUpDomains, String regionId) {
+        this.zonesInfo = createZonesInfo(accUpDomains, upDomains, oldUpDomains, regionId);
+    }
+
     private ZonesInfo createZonesInfo(String[] upDomains,
                                       String[] oldUpDomains,
                                       String regionId) {
+        return createZonesInfo(null, upDomains, oldUpDomains, regionId);
+    }
 
-        if (upDomains == null || upDomains.length == 0) {
+    private ZonesInfo createZonesInfo(String[] accDomains,
+                                      String[] upDomains,
+                                      String[] oldUpDomains,
+                                      String regionId) {
+
+        if ((accDomains == null || accDomains.length == 0) &&
+                (upDomains == null || upDomains.length == 0)) {
             return null;
         }
 
-        List<String> upDomainsList = new ArrayList<String>(Arrays.asList(upDomains));
-        List<String> oldUpDomainsList = null;
+        List<String> accDomainsList = new ArrayList<>();
+        List<String> upDomainsList = new ArrayList<>();
+        List<String> oldUpDomainsList = new ArrayList<>();
+        if (accDomains != null && accDomains.length > 0) {
+            accDomainsList = new ArrayList<>(Arrays.asList(accDomains));
+        }
+        if (upDomains != null && upDomains.length > 0) {
+            upDomainsList = new ArrayList<>(Arrays.asList(upDomains));
+        }
         if (oldUpDomains != null && oldUpDomains.length > 0) {
-            oldUpDomainsList = new ArrayList<String>(Arrays.asList(oldUpDomains));
-        } else {
-            oldUpDomainsList = new ArrayList<>();
+            oldUpDomainsList = new ArrayList<>(Arrays.asList(oldUpDomains));
         }
 
-        ZoneInfo zoneInfo = ZoneInfo.buildInfo(upDomainsList, oldUpDomainsList, regionId);
+        ZoneInfo zoneInfo = ZoneInfo.buildInfo(accDomainsList, upDomainsList, oldUpDomainsList, regionId);
         if (zoneInfo == null) {
             return null;
         }
@@ -212,4 +232,11 @@ public void preQuery(UpToken token, QueryHandler completeHandler) {
             completeHandler.complete(0, null, null);
         }
     }
+
+    @Override
+    public void query(Configuration configuration, UpToken token, QueryHandlerV2 completeHandler) {
+        if (completeHandler != null) {
+            completeHandler.complete(ResponseInfo.successResponse(), null, zonesInfo);
+        }
+    }
 }
diff --git a/library/src/main/java/com/qiniu/android/common/Zone.java b/library/src/main/java/com/qiniu/android/common/Zone.java
index c2e6bb3a..adbe0a5a 100644
--- a/library/src/main/java/com/qiniu/android/common/Zone.java
+++ b/library/src/main/java/com/qiniu/android/common/Zone.java
@@ -2,6 +2,7 @@
 
 import com.qiniu.android.http.ResponseInfo;
 import com.qiniu.android.http.metrics.UploadRegionRequestMetrics;
+import com.qiniu.android.storage.Configuration;
 import com.qiniu.android.storage.UpToken;
 
 /**
@@ -29,8 +30,18 @@ protected Zone() {
      * @param token           上传 token
      * @param completeHandler 预查询结束回调
      */
+    @Deprecated
     public abstract void preQuery(UpToken token, QueryHandler completeHandler);
 
+    /**
+     * 根据上传 token 对区域进行预查询
+     *
+     * @param configuration   配置信息
+     * @param token           上传 token
+     * @param completeHandler 预查询结束回调
+     */
+    public abstract void query(Configuration configuration, UpToken token, final QueryHandlerV2 completeHandler);
+
     /**
      * 预查询结束回调
      */
@@ -44,4 +55,17 @@ public interface QueryHandler {
          */
         void complete(int code, ResponseInfo responseInfo, UploadRegionRequestMetrics metrics);
     }
+
+    /**
+     * 预查询结束回调
+     */
+    public interface QueryHandlerV2 {
+        /**
+         * 预查询结束回调
+         *
+         * @param responseInfo 查询响应
+         * @param metrics      查询指标
+         */
+        void complete(ResponseInfo responseInfo, UploadRegionRequestMetrics metrics, ZonesInfo zonesInfo);
+    }
 }
diff --git a/library/src/main/java/com/qiniu/android/common/ZoneInfo.java b/library/src/main/java/com/qiniu/android/common/ZoneInfo.java
index 2b51e55a..07a2c632 100644
--- a/library/src/main/java/com/qiniu/android/common/ZoneInfo.java
+++ b/library/src/main/java/com/qiniu/android/common/ZoneInfo.java
@@ -1,5 +1,7 @@
 package com.qiniu.android.common;
 
+import com.qiniu.android.utils.ListUtils;
+import com.qiniu.android.utils.StringUtils;
 import com.qiniu.android.utils.Utils;
 
 import org.json.JSONArray;
@@ -50,10 +52,15 @@ public class ZoneInfo implements Cloneable {
     public final boolean ipv6;
 
     /**
-     * 主要域名
+     * 加速域名
      */
     public final List<String> domains;
 
+    /**
+     * 主要域名
+     */
+    public final List<String> accelerateDomains;
+
     /**
      * 备用域名
      */
@@ -85,7 +92,7 @@ public class ZoneInfo implements Cloneable {
      */
     public static ZoneInfo buildInfo(List<String> mainHosts,
                                      String regionId) {
-        return buildInfo(mainHosts, null, regionId);
+        return buildInfo(null, mainHosts, null, regionId);
     }
 
     /**
@@ -99,15 +106,37 @@ public static ZoneInfo buildInfo(List<String> mainHosts,
     public static ZoneInfo buildInfo(List<String> mainHosts,
                                      List<String> oldHosts,
                                      String regionId) {
-        if (mainHosts == null) {
+        return buildInfo(null, mainHosts, oldHosts, regionId);
+    }
+
+    /**
+     * 构造函数
+     *
+     * @param accelerateHosts 加速域名
+     * @param mainHosts         主要域名
+     * @param oldHosts          备用域名
+     * @param regionId          区域 ID
+     * @return ZoneInfo
+     */
+    public static ZoneInfo buildInfo(List<String> accelerateHosts,
+                                     List<String> mainHosts,
+                                     List<String> oldHosts,
+                                     String regionId) {
+        if (accelerateHosts == null && mainHosts == null) {
             return null;
         }
 
         HashMap<String, Object> up = new HashMap<>();
-        up.put("domains", new JSONArray(mainHosts));
+        if (accelerateHosts != null) {
+            up.put("acc_domains", new JSONArray(accelerateHosts));
+        }
+        if (mainHosts != null) {
+            up.put("domains", new JSONArray(mainHosts));
+        }
         if (oldHosts != null) {
             up.put("old", new JSONArray(oldHosts));
         }
+
         JSONObject upJson = new JSONObject(up);
 
         if (regionId == null) {
@@ -132,6 +161,7 @@ private ZoneInfo(int ttl,
                      boolean http3Enabled,
                      boolean ipv6,
                      String regionId,
+                     List<String> accelerateDomains,
                      List<String> domains,
                      List<String> old_domains,
                      Date buildDate) {
@@ -140,9 +170,13 @@ private ZoneInfo(int ttl,
         this.ipv6 = ipv6;
         this.regionId = regionId;
         this.domains = domains;
+        this.accelerateDomains = accelerateDomains;
         this.old_domains = old_domains;
         this.buildDate = buildDate != null ? buildDate : new Date();
         List<String> allHosts = new ArrayList<>();
+        if (accelerateDomains != null) {
+            allHosts.addAll(accelerateDomains);
+        }
         if (domains != null) {
             allHosts.addAll(domains);
         }
@@ -198,29 +232,41 @@ public static ZoneInfo buildFromJson(JSONObject obj) throws JSONException {
         if (domainsJson != null && domainsJson.length() > 0) {
             for (int i = 0; i < domainsJson.length(); i++) {
                 String domain = domainsJson.optString(i);
-                if (domain != null && domain.length() > 0) {
+                if (!StringUtils.isNullOrEmpty(domain)) {
                     domains.add(domain);
                 }
             }
         }
 
+        List<String> accelerateDomains = new ArrayList<>();
+        JSONArray accelerateDomainsJson = up.optJSONArray("acc_domains");
+        if (accelerateDomainsJson != null && accelerateDomainsJson.length() > 0) {
+            for (int i = 0; i < accelerateDomainsJson.length(); i++) {
+                String domain = accelerateDomainsJson.optString(i);
+                if (!StringUtils.isNullOrEmpty(domain)) {
+                    accelerateDomains.add(domain);
+                }
+            }
+        }
+
         List<String> old_domains = new ArrayList<>();
         JSONArray old_domainsJson = up.optJSONArray("old");
         if (old_domainsJson != null && old_domainsJson.length() > 0) {
             for (int i = 0; i < old_domainsJson.length(); i++) {
                 String domain = old_domainsJson.optString(i);
-                if (domain != null && domain.length() > 0) {
+                if (!StringUtils.isNullOrEmpty(domain)) {
                     old_domains.add(domain);
                 }
             }
         }
 
-        if (domains.size() == 0 && old_domains.size() == 0) {
+        if (ListUtils.isEmpty(accelerateDomains) && ListUtils.isEmpty(domains)) {
             return null;
         }
 
         Date buildDate = new Date(timestamp * 1000);
-        ZoneInfo zoneInfo = new ZoneInfo(ttl, http3Enabled, ipv6Enabled, regionId, domains, old_domains, buildDate);
+        ZoneInfo zoneInfo = new ZoneInfo(ttl, http3Enabled, ipv6Enabled, regionId,
+                accelerateDomains, domains, old_domains, buildDate);
         zoneInfo.detailInfo = obj;
 
         return zoneInfo;
@@ -271,7 +317,8 @@ public boolean isValid() {
      */
     @Override
     protected Object clone() throws CloneNotSupportedException {
-        ZoneInfo info = new ZoneInfo(ttl, http3Enabled, ipv6, regionId, domains, old_domains, buildDate);
+        ZoneInfo info = new ZoneInfo(ttl, http3Enabled, ipv6, regionId,
+                accelerateDomains, domains, old_domains, buildDate);
         info.detailInfo = detailInfo;
         return info;
     }
diff --git a/library/src/main/java/com/qiniu/android/http/ResponseInfo.java b/library/src/main/java/com/qiniu/android/http/ResponseInfo.java
index cfd5538f..b94f7448 100644
--- a/library/src/main/java/com/qiniu/android/http/ResponseInfo.java
+++ b/library/src/main/java/com/qiniu/android/http/ResponseInfo.java
@@ -93,7 +93,6 @@ public final class ResponseInfo {
     /**
      * 未知错误
      */
-    @Deprecated
     public static final int UnknownError = 10000;
 
     // <-- error code copy from ios
@@ -349,6 +348,16 @@ public static ResponseInfo sdkInteriorError(String desc) {
         return errorInfo(SDKInteriorError, desc);
     }
 
+    /**
+     * 解析错误
+     *
+     * @param desc 描述信息
+     * @return ResponseInfo
+     */
+    public static ResponseInfo parseError(String desc) {
+        return errorInfo(ParseError, desc);
+    }
+
     /**
      * 构造系统调用异常响应
      *
@@ -484,6 +493,10 @@ public boolean couldRetry() {
             return true;
         }
 
+        if (isTransferAccelerationConfigureError()) {
+            return true;
+        }
+
         if (isCancelled()
                 || statusCode == 100
                 || (statusCode > 300 && statusCode < 400)
@@ -508,6 +521,10 @@ public boolean couldRegionRetry() {
             return true;
         }
 
+        if (isTransferAccelerationConfigureError()) {
+            return true;
+        }
+
         if (isCancelled()
                 || statusCode == 100
                 || (statusCode > 300 && statusCode < 500 && statusCode != 406)
@@ -532,6 +549,10 @@ public boolean couldHostRetry() {
             return true;
         }
 
+        if (isTransferAccelerationConfigureError()) {
+            return false;
+        }
+
         if (isCancelled()
                 || statusCode == 100
                 || (statusCode > 300 && statusCode < 500 && statusCode != 406)
@@ -580,7 +601,8 @@ public boolean canConnectToHost() {
      */
     public boolean isHostUnavailable() {
         // 基本不可恢复，注：会影响下次请求，范围太大可能会造成大量的timeout
-        if (statusCode == 502 || statusCode == 503 || statusCode == 504 || statusCode == 599) {
+        if (isTransferAccelerationConfigureError() ||
+                statusCode == 502 || statusCode == 503 || statusCode == 504 || statusCode == 599) {
             return true;
         } else {
             return false;
@@ -596,6 +618,13 @@ public boolean isCtxExpiredError() {
         return statusCode == 701 || (statusCode == 612 && error != null && error.contains("no such uploadId"));
     }
 
+    public boolean isTransferAccelerationConfigureError() {
+        if (error == null) {
+            return false;
+        }
+        return error.contains("transfer acceleration is not configured on this bucket");
+    }
+
     /**
      * 请求是否因网络问题而失败
      *
diff --git a/library/src/main/java/com/qiniu/android/http/dns/DnsPrefetchTransaction.java b/library/src/main/java/com/qiniu/android/http/dns/DnsPrefetchTransaction.java
index 341f076b..5ef5f50a 100644
--- a/library/src/main/java/com/qiniu/android/http/dns/DnsPrefetchTransaction.java
+++ b/library/src/main/java/com/qiniu/android/http/dns/DnsPrefetchTransaction.java
@@ -1,8 +1,10 @@
 package com.qiniu.android.http.dns;
 
 import com.qiniu.android.common.Zone;
+import com.qiniu.android.storage.Configuration;
 import com.qiniu.android.storage.UpToken;
 import com.qiniu.android.transaction.TransactionManager;
+import com.qiniu.android.utils.StringUtils;
 
 /**
  * Created by yangsen on 2020/6/4
@@ -50,12 +52,25 @@ public void run() {
      * @param token       上传 token
      * @return 添加是否成功
      */
+    @Deprecated
     public static synchronized boolean addDnsCheckAndPrefetchTransaction(final Zone currentZone, final UpToken token) {
+        return addDnsCheckAndPrefetchTransaction(null, currentZone, token);
+    }
+
+    /**
+     * 将 zone 中使用域名的 Dns 预解析操作添加到周期性的事务中
+     *
+     * @param configuration 配置信息
+     * @param currentZone   zone
+     * @param token         上传 token
+     * @return 添加是否成功
+     */
+    public static synchronized boolean addDnsCheckAndPrefetchTransaction(Configuration configuration, final Zone currentZone, final UpToken token) {
         if (!DnsPrefetcher.getInstance().isDnsOpen()) {
             return false;
         }
 
-        if (token == null || token.token == null || token.token.length() == 0) {
+        if (token == null || StringUtils.isNullOrEmpty(token.token)) {
             return false;
         }
 
@@ -67,7 +82,7 @@ public static synchronized boolean addDnsCheckAndPrefetchTransaction(final Zone
         TransactionManager.Transaction loadDns = new TransactionManager.Transaction(token.token, 0, new Runnable() {
             @Override
             public void run() {
-                DnsPrefetcher.getInstance().checkAndPrefetchDnsIfNeed(currentZone, token);
+                DnsPrefetcher.getInstance().checkAndPrefetchDnsIfNeed(configuration, currentZone, token);
             }
         });
         manager.addTransaction(loadDns);
diff --git a/library/src/main/java/com/qiniu/android/http/dns/DnsPrefetcher.java b/library/src/main/java/com/qiniu/android/http/dns/DnsPrefetcher.java
index 7d7e4a74..0f0078d3 100644
--- a/library/src/main/java/com/qiniu/android/http/dns/DnsPrefetcher.java
+++ b/library/src/main/java/com/qiniu/android/http/dns/DnsPrefetcher.java
@@ -6,9 +6,11 @@
 import com.qiniu.android.common.ZonesInfo;
 import com.qiniu.android.http.ResponseInfo;
 import com.qiniu.android.http.metrics.UploadRegionRequestMetrics;
+import com.qiniu.android.storage.Configuration;
 import com.qiniu.android.storage.GlobalConfiguration;
 import com.qiniu.android.storage.UpToken;
 import com.qiniu.android.utils.AndroidNetwork;
+import com.qiniu.android.utils.ListUtils;
 import com.qiniu.android.utils.Utils;
 import com.qiniu.android.utils.Wait;
 
@@ -95,8 +97,13 @@ public void localFetch() {
      * @param token       上传 Token
      * @return 是否配置成功
      */
+    @Deprecated
     public boolean checkAndPrefetchDnsIfNeed(Zone currentZone, UpToken token) {
-        return addPreFetchHosts(getCurrentZoneHosts(currentZone, token));
+        return checkAndPrefetchDnsIfNeed(null, currentZone, token);
+    }
+
+    public boolean checkAndPrefetchDnsIfNeed(Configuration configuration, Zone currentZone, UpToken token) {
+        return addPreFetchHosts(getCurrentZoneHosts(configuration, currentZone, token));
     }
 
     /**
@@ -440,25 +447,31 @@ private String[] getLocalPreHost() {
         return new String[]{Config.upLogURL};
     }
 
-    private String[] getCurrentZoneHosts(Zone currentZone, UpToken token) {
+    private String[] getCurrentZoneHosts(Configuration configuration, Zone currentZone, UpToken token) {
         if (currentZone == null || token == null) {
             return null;
         }
 
         final Wait wait = new Wait();
 
-        currentZone.preQuery(token, new Zone.QueryHandler() {
+        final ZonesInfo[] zonesInfoArray = {null};
+        currentZone.query(configuration, token, new Zone.QueryHandlerV2() {
             @Override
-            public void complete(int code, ResponseInfo responseInfo, UploadRegionRequestMetrics metrics) {
+            public void complete(ResponseInfo responseInfo, UploadRegionRequestMetrics metrics, ZonesInfo zonesInfo) {
+                zonesInfoArray[0] = zonesInfo;
                 wait.stopWait();
             }
         });
 
         wait.startWait();
 
-        ZonesInfo autoZonesInfo = currentZone.getZonesInfo(token);
+        if (zonesInfoArray[0] == null) {
+            return new String[]{};
+        }
+
+        ZonesInfo autoZonesInfo = zonesInfoArray[0];
         ArrayList<String> autoHosts = new ArrayList<>();
-        if (autoZonesInfo != null && autoZonesInfo.zonesInfo != null && autoZonesInfo.zonesInfo.size() > 0) {
+        if (!ListUtils.isEmpty(autoZonesInfo.zonesInfo)) {
             for (ZoneInfo zoneInfo : autoZonesInfo.zonesInfo) {
                 if (zoneInfo != null && zoneInfo.allHosts != null) {
                     autoHosts.addAll(zoneInfo.allHosts);
@@ -474,6 +487,7 @@ private String[] getCacheHosts() {
 
     /**
      * 获取 Dns 配置是否打开
+     *
      * @return Dns 配置是否打开
      */
     public boolean isDnsOpen() {
diff --git a/library/src/main/java/com/qiniu/android/http/request/HttpRegionRequest.java b/library/src/main/java/com/qiniu/android/http/request/HttpRegionRequest.java
index 9071ebfa..bcee5798 100644
--- a/library/src/main/java/com/qiniu/android/http/request/HttpRegionRequest.java
+++ b/library/src/main/java/com/qiniu/android/http/request/HttpRegionRequest.java
@@ -91,7 +91,7 @@ private void performRequest(final IUploadServer server,
                                 final RequestProgressHandler progressHandler,
                                 final RequestCompleteHandler completeHandler) {
 
-        if (server == null || server.getHost() == null || server.getHost().length() == 0) {
+        if (server == null || StringUtils.isNullOrEmpty(server.getHost())) {
             ResponseInfo responseInfo = ResponseInfo.sdkInteriorError("server error");
             completeAction(responseInfo, null, completeHandler);
             return;
diff --git a/library/src/main/java/com/qiniu/android/http/request/HttpSingleRequest.java b/library/src/main/java/com/qiniu/android/http/request/HttpSingleRequest.java
index 81ff9266..1ece9646 100644
--- a/library/src/main/java/com/qiniu/android/http/request/HttpSingleRequest.java
+++ b/library/src/main/java/com/qiniu/android/http/request/HttpSingleRequest.java
@@ -86,7 +86,7 @@ private void retryRequest(final Request request,
             @Override
             public boolean checkCancel() {
                 boolean isCancelled = requestState.isUserCancel();
-                if (!isCancelled && uploadOption.cancellationSignal != null) {
+                if (!isCancelled && uploadOption != null && uploadOption.cancellationSignal != null) {
                     isCancelled = uploadOption.cancellationSignal.isCancelled();
                 }
                 return isCancelled;
diff --git a/library/src/main/java/com/qiniu/android/http/request/RequestTransaction.java b/library/src/main/java/com/qiniu/android/http/request/RequestTransaction.java
index 8356d50d..fac9802f 100644
--- a/library/src/main/java/com/qiniu/android/http/request/RequestTransaction.java
+++ b/library/src/main/java/com/qiniu/android/http/request/RequestTransaction.java
@@ -85,7 +85,7 @@ public RequestTransaction(Configuration config,
                               String key,
                               UpToken token) {
         this(config, uploadOption, key, token);
-        IUploadRegion region = new UploadDomainRegion();
+        IUploadRegion region = new UploadDomainRegion(config);
         region.setupRegionData(ZoneInfo.buildInfo(hosts, regionId));
         this.initData(region, region);
     }
@@ -129,7 +129,7 @@ private void initData(IUploadRegion targetRegion,
                           IUploadRegion currentRegion) {
 
         this.requestState = new UploadRequestState();
-        this.requestState.setCouldUseHttp3(config.requestClient != null);
+        this.requestState.setCouldUseHttp3(config != null && config.requestClient != null);
         this.requestInfo = new UploadRequestInfo();
         this.requestInfo.targetRegionId = targetRegion.getZoneInfo().getRegionId();
         this.requestInfo.currentRegionId = currentRegion.getZoneInfo().getRegionId();
diff --git a/library/src/main/java/com/qiniu/android/http/request/httpclient/SystemHttpClient.java b/library/src/main/java/com/qiniu/android/http/request/httpclient/SystemHttpClient.java
index 4ae5b74a..bc51a23b 100644
--- a/library/src/main/java/com/qiniu/android/http/request/httpclient/SystemHttpClient.java
+++ b/library/src/main/java/com/qiniu/android/http/request/httpclient/SystemHttpClient.java
@@ -501,11 +501,12 @@ private void handleResponse(Request request,
 
         if (responseBody == null) {
             errorMessage = response.message();
-        } else if (responseContentType(response) != "application/json") {
+        } else if (!responseContentType(response).equals("application/json")) {
             String responseString = new String(responseBody);
-            if (responseString.length() > 0) {
+            if (!responseString.isEmpty()) {
                 try {
-                    responseJson = new JSONObject(responseString);
+                    responseJson = new JSONObject();
+                    responseJson.put("error", responseString);
                 } catch (Exception ignored) {
                 }
             }
diff --git a/library/src/main/java/com/qiniu/android/http/serverRegion/UploadDomainRegion.java b/library/src/main/java/com/qiniu/android/http/serverRegion/UploadDomainRegion.java
index 177a0fed..0a4a3172 100644
--- a/library/src/main/java/com/qiniu/android/http/serverRegion/UploadDomainRegion.java
+++ b/library/src/main/java/com/qiniu/android/http/serverRegion/UploadDomainRegion.java
@@ -8,14 +8,18 @@
 import com.qiniu.android.http.request.IUploadRegion;
 import com.qiniu.android.http.request.IUploadServer;
 import com.qiniu.android.http.request.UploadRequestState;
+import com.qiniu.android.storage.Configuration;
 import com.qiniu.android.storage.GlobalConfiguration;
+import com.qiniu.android.utils.ListUtils;
 import com.qiniu.android.utils.LogUtil;
+import com.qiniu.android.utils.MapUtils;
 import com.qiniu.android.utils.StringUtils;
 import com.qiniu.android.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * region domain 管理对象
@@ -37,16 +41,31 @@ public class UploadDomainRegion implements IUploadRegion {
     private final UploadServerFreezeManager partialHttp2Freezer = new UploadServerFreezeManager();
     private final UploadServerFreezeManager partialHttp3Freezer = new UploadServerFreezeManager();
 
+    // 是否使用加速上传域名
+    private boolean enableAccelerateUpload = false;
+
+    // 非加速域名
     private ArrayList<String> domainHostList;
     private HashMap<String, UploadServerDomain> domainHashMap;
     private ArrayList<String> oldDomainHostList;
     private HashMap<String, UploadServerDomain> oldDomainHashMap;
+    private ArrayList<String> accelerateDomainHostList;
+    private HashMap<String, UploadServerDomain> accelerateDomainHashMap;
+
     private ZoneInfo zoneInfo;
 
     /**
      * 构造函数
      */
+    @Deprecated
     public UploadDomainRegion() {
+        this(null);
+    }
+
+    public UploadDomainRegion(Configuration configuration) {
+        if (configuration != null) {
+            this.enableAccelerateUpload = configuration.accelerateUploading;
+        }
     }
 
     /**
@@ -91,7 +110,9 @@ public boolean isEqual(IUploadRegion region) {
      */
     @Override
     public boolean isValid() {
-        return !isAllFrozen && (domainHostList.size() > 0 || oldDomainHostList.size() > 0);
+        return !isAllFrozen &&
+                (!domainHostList.isEmpty() || !oldDomainHostList.isEmpty() ||
+                        (enableAccelerateUpload && !accelerateDomainHostList.isEmpty()));
     }
 
     /**
@@ -118,9 +139,15 @@ public void setupRegionData(ZoneInfo zoneInfo) {
         this.zoneInfo = zoneInfo;
 
         isAllFrozen = false;
-
         ipv6Enabled = zoneInfo.ipv6;
 
+        ArrayList<String> accDomainHostList = new ArrayList<>();
+        if (zoneInfo.accelerateDomains != null) {
+            accDomainHostList.addAll(zoneInfo.accelerateDomains);
+        }
+        this.accelerateDomainHostList = accDomainHostList;
+        this.accelerateDomainHashMap = createDomainDictionary(accDomainHostList);
+
         ArrayList<String> domainHostList = new ArrayList<>();
         if (zoneInfo.domains != null) {
             domainHostList.addAll(zoneInfo.domains);
@@ -165,13 +192,44 @@ public IUploadServer getNextServer(UploadRequestState requestState, ResponseInfo
 
         freezeServerIfNeed(responseInfo, freezeServer);
 
-        ArrayList<String> hostList = domainHostList;
-        HashMap<String, UploadServerDomain> domainInfo = domainHashMap;
-        if (requestState.isUseOldServer()
-                && oldDomainHostList != null && oldDomainHostList.size() > 0
-                && oldDomainHashMap != null && oldDomainHashMap.size() > 0) {
-            hostList = oldDomainHostList;
-            domainInfo = oldDomainHashMap;
+        boolean accelerate = true;
+        synchronized (this) {
+            if (enableAccelerateUpload &&
+                    responseInfo != null &&
+                    responseInfo.isTransferAccelerationConfigureError()) {
+                enableAccelerateUpload = false;
+            }
+            accelerate = enableAccelerateUpload;
+        }
+
+        ArrayList<String> hostList = new ArrayList<>();
+        HashMap<String, UploadServerDomain> domainInfo = new HashMap<>();
+
+        if (requestState.isUseOldServer()) {
+            // SNI
+            if (!ListUtils.isEmpty(oldDomainHostList) &&
+                    !MapUtils.isEmpty(oldDomainHashMap)) {
+                hostList.addAll(oldDomainHostList);
+                domainInfo.putAll(oldDomainHashMap);
+            }
+        } else {
+            // 优先使用 acc
+            if (accelerate &&
+                    !ListUtils.isEmpty(accelerateDomainHostList) &&
+                    !MapUtils.isEmpty(accelerateDomainHashMap)) {
+                hostList.addAll(accelerateDomainHostList);
+                domainInfo.putAll(accelerateDomainHashMap);
+            }
+
+            if (!ListUtils.isEmpty(domainHostList) &&
+                    !MapUtils.isEmpty(domainHashMap)) {
+                hostList.addAll(domainHostList);
+                domainInfo.putAll(domainHashMap);
+            }
+        }
+
+        if (ListUtils.isEmpty(hostList) || MapUtils.isEmpty(domainInfo)) {
+            return null;
         }
 
         // 1. 优先选择http3
@@ -257,7 +315,7 @@ public boolean condition(String host, UploadServer serverP, UploadServer filterS
         }
 
         UploadServer server = (UploadServer) UploadServerNetworkStatus.getBetterNetworkServer(http3Server, http2Server);
-        if (server == null && !hasFreezeHost && hostList.size() > 0) {
+        if (server == null && !hasFreezeHost && !hostList.isEmpty()) {
             int index = (int) (Math.random() * hostList.size());
             String host = hostList.get(index);
             UploadServerDomain domain = domainInfo.get(host);
diff --git a/library/src/main/java/com/qiniu/android/storage/BaseUpload.java b/library/src/main/java/com/qiniu/android/storage/BaseUpload.java
index 7b5aca97..9726f736 100644
--- a/library/src/main/java/com/qiniu/android/storage/BaseUpload.java
+++ b/library/src/main/java/com/qiniu/android/storage/BaseUpload.java
@@ -8,6 +8,7 @@
 import com.qiniu.android.http.metrics.UploadRegionRequestMetrics;
 import com.qiniu.android.http.metrics.UploadTaskMetrics;
 import com.qiniu.android.http.serverRegion.UploadDomainRegion;
+import com.qiniu.android.utils.ListUtils;
 
 import org.json.JSONObject;
 
@@ -96,12 +97,18 @@ public void run() {
     private void innerRun() {
         metrics.start();
 
-        config.zone.preQuery(token, new Zone.QueryHandler() {
+        config.zone.query(config, token, new Zone.QueryHandlerV2() {
             @Override
-            public void complete(int code, ResponseInfo responseInfo, UploadRegionRequestMetrics requestMetrics) {
+            public void complete(ResponseInfo responseInfo, UploadRegionRequestMetrics requestMetrics, ZonesInfo zonesInfo) {
                 metrics.setUcQueryMetrics(requestMetrics);
 
-                if (code == 0) {
+                if (responseInfo != null && responseInfo.isOK() && zonesInfo != null) {
+                    if (!setupRegions(zonesInfo)) {
+                        responseInfo = ResponseInfo.invalidArgument("setup regions host fail, origin response:" + responseInfo);
+                        completeAction(responseInfo, responseInfo.response);
+                        return;
+                    }
+
                     int prepareCode = prepareToUpload();
                     if (prepareCode == 0) {
                         startToUpload();
@@ -110,6 +117,10 @@ public void complete(int code, ResponseInfo responseInfo, UploadRegionRequestMet
                         completeAction(responseInfoP, null);
                     }
                 } else {
+                    if (responseInfo == null) {
+                        // responseInfo 一定会有值
+                        responseInfo = ResponseInfo.sdkInteriorError("can't get regions");
+                    }
                     completeAction(responseInfo, responseInfo.response);
                 }
             }
@@ -121,11 +132,7 @@ protected boolean reloadUploadInfo() {
     }
 
     protected int prepareToUpload() {
-        int ret = 0;
-        if (!setupRegions()) {
-            ret = -1;
-        }
-        return ret;
+        return 0;
     }
 
     protected void startToUpload() {
@@ -165,19 +172,15 @@ protected void completeAction(ResponseInfo responseInfo, JSONObject response) {
         }
     }
 
-    private boolean setupRegions() {
-        if (config == null || config.zone == null) {
-            return false;
-        }
-        ZonesInfo zonesInfo = config.zone.getZonesInfo(token);
-        if (zonesInfo == null || zonesInfo.zonesInfo == null || zonesInfo.zonesInfo.size() == 0) {
+    private boolean setupRegions(ZonesInfo zonesInfo) {
+        if (zonesInfo == null || ListUtils.isEmpty(zonesInfo.zonesInfo)) {
             return false;
         }
         ArrayList<ZoneInfo> zoneInfos = zonesInfo.zonesInfo;
 
         ArrayList<IUploadRegion> defaultRegions = new ArrayList<>();
         for (ZoneInfo zoneInfo : zoneInfos) {
-            UploadDomainRegion region = new UploadDomainRegion();
+            UploadDomainRegion region = new UploadDomainRegion(config);
             region.setupRegionData(zoneInfo);
             if (region.isValid()) {
                 defaultRegions.add(region);
@@ -185,7 +188,7 @@ private boolean setupRegions() {
         }
         regions = defaultRegions;
         metrics.regions = defaultRegions;
-        return defaultRegions.size() > 0;
+        return !defaultRegions.isEmpty();
     }
 
     protected void insertRegionAtFirst(IUploadRegion region) {
diff --git a/library/src/main/java/com/qiniu/android/storage/Configuration.java b/library/src/main/java/com/qiniu/android/storage/Configuration.java
index 5b12eb8c..32c47909 100644
--- a/library/src/main/java/com/qiniu/android/storage/Configuration.java
+++ b/library/src/main/java/com/qiniu/android/storage/Configuration.java
@@ -92,6 +92,11 @@ public final class Configuration {
      */
     public final int concurrentTaskCount;
 
+    /**
+     * 是否允许使用加速域名，默认为 false
+     */
+    public final boolean accelerateUploading;
+
     /**
      * 重试时是否允许使用备用上传域名，默认为true
      */
@@ -152,6 +157,7 @@ private Configuration(Builder builder) {
         retryInterval = builder.retryInterval;
 
         allowBackupHost = builder.allowBackupHost;
+        accelerateUploading = builder.accelerateUploading;
 
         proxy = builder.proxy;
 
@@ -200,6 +206,7 @@ public static class Builder {
         private int responseTimeout = 10;
         private int retryMax = 1;
         private int retryInterval = 500;
+        private boolean accelerateUploading = false;
         private boolean allowBackupHost = true;
         private UrlConverter urlConverter = null;
         private boolean useConcurrentResumeUpload = false;
@@ -346,6 +353,18 @@ public Builder retryInterval(int retryInterval) {
             return this;
         }
 
+        /**
+         * 配置是否允许使用加速域名
+         * 注：加速域名会额外收费
+         *
+         * @param isAllow 是否允许使用加速域名
+         * @return Builder
+         */
+        public Builder accelerateUploading(boolean isAllow) {
+            this.accelerateUploading = isAllow;
+            return this;
+        }
+
         /**
          * 配置是否允许使用备用域名，如果不允许则仅会使用一个域名进行上传
          * 注：如果配置为 false 可能会影响上传的成功率
diff --git a/library/src/main/java/com/qiniu/android/storage/PartsUpload.java b/library/src/main/java/com/qiniu/android/storage/PartsUpload.java
index 14c58094..8ee40df6 100644
--- a/library/src/main/java/com/qiniu/android/storage/PartsUpload.java
+++ b/library/src/main/java/com/qiniu/android/storage/PartsUpload.java
@@ -84,7 +84,7 @@ protected int prepareToUpload() {
             LogUtil.i("key:" + StringUtils.toNonnullString(key) + " region:" + StringUtils.toNonnullString(uploadPerformer.currentRegion.getZoneInfo().regionId));
         }
 
-        if (!uploadPerformer.canReadFile()) {
+        if (uploadPerformer == null || !uploadPerformer.canReadFile()) {
             code = ResponseInfo.LocalIOError;
         }
 
diff --git a/library/src/main/java/com/qiniu/android/storage/PartsUploadPerformer.java b/library/src/main/java/com/qiniu/android/storage/PartsUploadPerformer.java
index 8e4b9f0e..06291624 100644
--- a/library/src/main/java/com/qiniu/android/storage/PartsUploadPerformer.java
+++ b/library/src/main/java/com/qiniu/android/storage/PartsUploadPerformer.java
@@ -181,7 +181,7 @@ void recoverUploadInfoFromRecord() {
 
                 recoverUploadInfo.checkInfoStateAndUpdate();
                 uploadInfo = recoverUploadInfo;
-                UploadDomainRegion region = new UploadDomainRegion();
+                UploadDomainRegion region = new UploadDomainRegion(config);
                 region.setupRegionData(zoneInfo);
                 currentRegion = region;
                 targetRegion = region;
diff --git a/library/src/main/java/com/qiniu/android/storage/UploadManager.java b/library/src/main/java/com/qiniu/android/storage/UploadManager.java
index 45ec5aa6..1b55e5a7 100644
--- a/library/src/main/java/com/qiniu/android/storage/UploadManager.java
+++ b/library/src/main/java/com/qiniu/android/storage/UploadManager.java
@@ -362,7 +362,7 @@ private void putData(final byte[] data,
             return;
         }
 
-        DnsPrefetchTransaction.addDnsCheckAndPrefetchTransaction(config.zone, t);
+        DnsPrefetchTransaction.addDnsCheckAndPrefetchTransaction(config, config.zone, t);
         ServerConfigMonitor.setToken(token);
 
         BaseUpload.UpTaskCompletionHandler completionHandlerP = new BaseUpload.UpTaskCompletionHandler() {
@@ -392,7 +392,7 @@ private void putSource(final UploadSource source,
             return;
         }
 
-        DnsPrefetchTransaction.addDnsCheckAndPrefetchTransaction(config.zone, t);
+        DnsPrefetchTransaction.addDnsCheckAndPrefetchTransaction(config, config.zone, t);
         ServerConfigMonitor.setToken(token);
 
         if (source.getSize() > 0 && source.getSize() <= config.putThreshold) {
diff --git a/library/src/main/java/com/qiniu/android/utils/ListUtils.java b/library/src/main/java/com/qiniu/android/utils/ListUtils.java
new file mode 100644
index 00000000..b7a50379
--- /dev/null
+++ b/library/src/main/java/com/qiniu/android/utils/ListUtils.java
@@ -0,0 +1,10 @@
+package com.qiniu.android.utils;
+
+import java.util.List;
+
+public class ListUtils {
+
+    public static <T> boolean isEmpty(List<T> objects) {
+        return objects == null || objects.isEmpty();
+    }
+}
diff --git a/library/src/main/java/com/qiniu/android/utils/MapUtils.java b/library/src/main/java/com/qiniu/android/utils/MapUtils.java
new file mode 100644
index 00000000..5df8e9c3
--- /dev/null
+++ b/library/src/main/java/com/qiniu/android/utils/MapUtils.java
@@ -0,0 +1,9 @@
+package com.qiniu.android.utils;
+
+import java.util.Map;
+
+public class MapUtils {
+    public static <K,V> boolean isEmpty(Map<K,V> objects) {
+        return objects == null || objects.isEmpty();
+    }
+}