Merge pull request #130 from rwifeng/multi_zone

Multi zone

Author: longbai

Zone.php

@@ -5,18 +5,24 @@ final class Config
 {
     const SDK_VER = '7.0.2';
 
+    const BLOCK_SIZE = 4194304; //4*1024*1024 分块上传块大小，该参数为接口规格，暂不支持修改
+
     const IO_HOST  = 'http://iovip.qbox.me';            // 七牛源站Host
     const RS_HOST  = 'http://rs.qbox.me';               // 文件元信息管理操作Host
     const RSF_HOST = 'http://rsf.qbox.me';              // 列举操作Host
     const API_HOST = 'http://api.qiniu.com';            // 数据处理操作Host
 
-    const UPAUTO_HOST = 'http://up.qiniu.com';          // 默认上传Host
-    const UPDX_HOST = 'http://updx.qiniu.com';          // 电信上传Host
-    const UPLT_HOST = 'http://uplt.qiniu.com';          // 联通上传Host
-    const UPYD_HOST = 'http://upyd.qiniu.com';          // 移动上传Host
-    const UPBACKUP_HOST = 'http://upload.qiniu.com';    // 备用上传Host
-
-    const BLOCK_SIZE = 4194304; //4*1024*1024 分块上传块大小，该参数为接口规格，暂不支持修改
+    public static $upHost;                              // 上传Host
+    public static $upHostBackup;                        // 上传备用Host
 
-    public static $defaultHost = self::UPAUTO_HOST;     // 设置为默认上传Host
+    public function __construct()                       // 构造函数，默认为zone0
+    {
+        self::setZone(Zone::zone0());
+    }
+    
+    public static function setZone(Zone $z)
+    {
+        self::$upHost = $z->upHost;
+        self::$upHostBackup = $z->upHostBackup;
+    }
 }

src/Qiniu/Config.php

@@ -11,6 +11,7 @@ public static function put(
         $upToken,
         $key,
         $data,
+        $config,
         $params,
         $mime,
         $checkCrc
@@ -31,9 +32,9 @@ public static function put(
             }
         }
 
-        $response = Client::multipartPost(Config::$defaultHost, $fields, 'file', $fname, $data, $mime);
+        $response = Client::multipartPost($config::$upHost, $fields, 'file', $fname, $data, $mime);
         if (!$response->ok()) {
-            return array(null, new Error(Config::$defaultHost, $response));
+            return array(null, new Error($config::$upHost, $response));
         }
         return array($response->json(), null);
     }
@@ -42,6 +43,7 @@ public static function putFile(
         $upToken,
         $key,
         $filePath,
+        $config,
         $params,
         $mime,
         $checkCrc
@@ -63,9 +65,9 @@ public static function putFile(
             }
         }
         $headers =array('Content-Type' => 'multipart/form-data');
-        $response = client::post(Config::$defaultHost, $fields, $headers);
+        $response = client::post($config::$upHost, $fields, $headers);
         if (!$response->ok()) {
-            return array(null, new Error(Config::$defaultHost, $response));
+            return array(null, new Error($config::$upHost, $response));
         }
         return array($response->json(), null);
     }

src/Qiniu/Storage/FormUploader.php

@@ -43,15 +43,16 @@ public function __construct(
         $inputStream,
         $size,
         $params,
-        $mime
+        $mime,
+        $config
     ) {
         $this->upToken = $upToken;
         $this->key = $key;
         $this->inputStream = $inputStream;
         $this->size = $size;
         $this->params = $params;
         $this->mime = $mime;
-        $this->host = Config::$defaultHost;
+        $this->host = $config::$upHost;
         $this->contexts = array();
     }
 
@@ -76,7 +77,7 @@ public function upload()
                 $ret = $response->json();
             }
             if ($response->statusCode < 0) {
-                $this->host = Config::UPBACKUP_HOST;
+                $this->host = $config::$upHostBackup;
             }
             if ($response->needRetry() || !isset($ret['crc32']) || $crc != $ret['crc32']) {
                 $response = $this->makeBlock($data, $blockSize);

src/Qiniu/Storage/ResumeUploader.php

@@ -13,8 +13,14 @@
  */
 final class UploadManager
 {
-    public function __construct()
+    public $config;
+
+    public function __construct($config = null)
     {
+        if ($config === null) {
+            $config = new Config();
+        }
+        $this->config = $config;
     }
 
     /**
@@ -47,6 +53,7 @@ public function put(
             $upToken,
             $key,
             $data,
+            $this->config,
             $params,
             $mime,
             $checkCrc
@@ -96,6 +103,7 @@ public function putFile(
                 $upToken,
                 $key,
                 $data,
+                $this->config,
                 $params,
                 $mime,
                 $checkCrc
@@ -108,7 +116,7 @@ public function putFile(
             $size,
             $params,
             $mime,
-            $checkCrc
+            $this->config
         );
         return $up->upload();
     }

src/Qiniu/Storage/UploadManager.php

@@ -0,0 +1,24 @@
+<?php
+namespace Qiniu;
+
+final class Zone
+{
+    public $upHost;
+    public $upHostBackup;
+
+    public function __construct($upHost, $upHostBackup)
+    {
+        $this->upHost = $upHost;
+        $this->upHostBackup = $upHostBackup;
+    }
+
+    public static function zone0()
+    {
+        return new self('http://up.qiniu.com', 'http://upload.qiniu.com');
+    }
+
+    public static function zone1()
+    {
+        return new self('http://up-z1.qiniu.com', 'http://upload-z1.qiniu.com');
+    }
+}

src/Qiniu/Zone.php

@@ -3,23 +3,28 @@
 
 use Qiniu\Storage\FormUploader;
 use Qiniu\Storage\UploadManager;
+use Qiniu\Config;
 
 class FormUpTest extends \PHPUnit_Framework_TestCase
 {
     protected $bucketName;
     protected $auth;
+    protected $cfg;
+
     protected function setUp()
     {
         global $bucketName;
         $this->bucketName = $bucketName;
 
         global $testAuth;
         $this->auth = $testAuth;
+        $this->cfg = new Config();
     }
+
     public function testData()
     {
         $token = $this->auth->uploadToken($this->bucketName);
-        list($ret, $error) = FormUploader::put($token, 'formput', 'hello world', null, 'text/plain', true);
+        list($ret, $error) = FormUploader::put($token, 'formput', 'hello world', $this->cfg, null, 'text/plain', true);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }
@@ -37,7 +42,7 @@ public function testFile()
     {
         $key = 'formPutFile';
         $token = $this->auth->uploadToken($this->bucketName, $key);
-        list($ret, $error) = FormUploader::putFile($token, $key, __file__, null, 'text/plain', true);
+        list($ret, $error) = FormUploader::putFile($token, $key, __file__, $this->cfg, null, 'text/plain', true);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }