Merge pull request #172 from longbai/multi_zone

multi zone

Author: longbai

CHANGELOG.md

@@ -1,5 +1,10 @@
 #Changelog
 
+## 7.0.4 (2015-06-25)
+
+### 变更
+* 多zone 支持
+
 ## 7.0.3 (2015-05-04)
 
 ### 修正

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

@@ -6,7 +6,7 @@
 
 public final class Config {
 
-    public static final String VERSION = "7.0.3";
+    public static final String VERSION = "7.0.4";
     /**
      * 断点上传时的分块大小(默认的分块大小, 不允许改变)
      */
@@ -30,14 +30,9 @@ public final class Config {
      */
     public static String IO_HOST = "http://iovip.qbox.me";
     /**
-     * 默认上传服务器
+     * 默认Zone
      */
-    public static String UP_HOST = "http://up.qiniu.com";
-    /**
-     * 备用上传服务器，当默认服务器网络链接失败时使用
-     */
-    public static String UP_HOST_BACKUP = "http://upload.qiniu.com";
-
+    public static Zone zone = Zone.zone0();
     /**
      * 如果文件大小大于此值则使用断点上传, 否则使用Form上传
      */

src/main/java/com/qiniu/common/Zone.java

@@ -0,0 +1,28 @@
+package com.qiniu.common;
+
+/**
+ * 上传多区域
+ */
+public final class Zone {
+    /**
+     * 默认上传服务器
+     */
+    public final String upHost;
+    /**
+     * 备用上传服务器，当默认服务器网络链接失败时使用
+     */
+    public final String upHostBackup;
+
+    public Zone(String upHost, String upHostBackup) {
+        this.upHost = upHost;
+        this.upHostBackup = upHostBackup;
+    }
+
+    public static Zone zone0() {
+        return new Zone("http://up.qiniu.com", "http://upload.qiniu.com");
+    }
+
+    public static Zone zone1() {
+        return new Zone("http://up-z1.qiniu.com", "http://upload-z1.qiniu.com");
+    }
+}

src/main/java/com/qiniu/storage/FormUploader.java

@@ -48,9 +48,9 @@ private FormUploader(Client client, String upToken, String key, byte[] data, Fil
     Response upload() throws QiniuException {
         buildParams();
         if (data != null) {
-            return client.multipartPost(Config.UP_HOST, params, "file", fileName, data, mime, new StringMap());
+            return client.multipartPost(Config.zone.upHost, params, "file", fileName, data, mime, new StringMap());
         }
-        return client.multipartPost(Config.UP_HOST, params, "file", fileName, file, mime, new StringMap());
+        return client.multipartPost(Config.zone.upHost, params, "file", fileName, file, mime, new StringMap());
     }
 
     private void buildParams() throws QiniuException {

src/main/java/com/qiniu/storage/ResumeUploader.java

@@ -39,12 +39,12 @@ public final class ResumeUploader {
     private final String[] contexts;
     private final Client client;
     private final byte[] blockBuffer;
-    private FileInputStream file;
-    private String host;
     private final Recorder recorder;
     private final String recorderKey;
     private final long modifyTime;
     private final RecordHelper helper;
+    private FileInputStream file;
+    private String host;
 
     ResumeUploader(Client client, String upToken, String key, File file,
                    StringMap params, String mime, Recorder recorder, String recorderKey) {
@@ -55,7 +55,7 @@ public final class ResumeUploader {
         this.size = file.length();
         this.params = params;
         this.mime = mime == null ? Client.DefaultMime : mime;
-        this.host = Config.UP_HOST;
+        this.host = Config.zone.upHost;
         long count = (size + Config.BLOCK_SIZE - 1) / Config.BLOCK_SIZE;
         this.contexts = new String[(int) count];
         this.blockBuffer = new byte[Config.BLOCK_SIZE];
@@ -89,7 +89,7 @@ public Response upload() throws QiniuException {
                 response = makeBlock(blockBuffer, blockSize);
             } catch (QiniuException e) {
                 if (e.code() < 0) {
-                    host = Config.UP_HOST_BACKUP;
+                    host = Config.zone.upHostBackup;
                 }
                 if (e.response == null || e.response.needRetry()) {
                     retry = true;