add Zones cn-east-2, ap-northeast-1

Author: lihsai0

src/Qiniu/Region.php

@@ -107,6 +107,19 @@ public static function regionHuanan()
         return $regionHuanan;
     }
 
+    //华东2 机房
+    public static function regionHuadong2()
+    {
+        return new Region(
+            array('up-cn-east-2.qiniup.com'),
+            array('upload-cn-east-2.qiniup.com'),
+            "rs-cn-east-2.qiniuapi.com",
+            "rsf-cn-east-2.qiniuapi.com",
+            "api-cn-east-2.qiniuapi.com",
+            "iovip-cn-east-2.qiniuio.com"
+        );
+    }
+
     //北美机房
     public static function regionNorthAmerica()
     {
@@ -137,6 +150,20 @@ public static function regionSingapore()
         return $regionSingapore;
     }
 
+    //首尔
+    public static function regionSeoul()
+    {
+        //首尔
+        return new Region(
+            array('up-ap-northeast-1.qiniup.com'),
+            array('upload-ap-northeast-1.qiniup.com'),
+            "rs-ap-northeast-1.qiniuapi.com",
+            "rsf-ap-northeast-1.qiniuapi.com",
+            "api-ap-northeast-1.qiniuapi.com",
+            "iovip-ap-northeast-1.qiniuio.com"
+        );
+    }
+
     /*
      * GET /v2/query?ak=<ak>&&bucket=<bucket>
      **/
@@ -177,6 +204,10 @@ public static function queryRegion($ak, $bucket)
             $Region->rsHost = "rs-z2.qbox.me";
             $Region->rsfHost = "rsf-z2.qbox.me";
             $Region->apiHost = "api-z2.qiniu.com";
+        } elseif (strstr($Region->iovipHost, "cn-east-2") !== false) {
+            $Region->rsHost = "rs-cn-east-2.qiniuapi.com";
+            $Region->rsfHost = "rsf-cn-east-2.qiniuapi.com";
+            $Region->apiHost = "api-cn-east-2.qiniuapi.com";
         } elseif (strstr($Region->iovipHost, "na0") !== false) {
             $Region->rsHost = "rs-na0.qbox.me";
             $Region->rsfHost = "rsf-na0.qbox.me";
@@ -185,6 +216,10 @@ public static function queryRegion($ak, $bucket)
             $Region->rsHost = "rs-as0.qbox.me";
             $Region->rsfHost = "rsf-as0.qbox.me";
             $Region->apiHost = "api-as0.qiniu.com";
+        } elseif (strstr($Region->iovipHost, "ap-northeast-1") !== false) {
+            $Region->rsHost = "rs-ap-northeast-1.qiniuapi.com";
+            $Region->rsfHost = "rsf-ap-northeast-1.qiniuapi.com";
+            $Region->apiHost = "api-ap-northeast-1.qiniuapi.com";
         } else {
             $Region->rsHost = "rs.qbox.me";
             $Region->rsfHost = "rsf.qbox.me";

src/Qiniu/Zone.php

@@ -20,6 +20,11 @@ public static function zonez2()
         return parent::regionHuanan();
     }
 
+    public static function zoneCnEast2()
+    {
+        return parent::regionHuadong2();
+    }
+
     public static function zoneAs0()
     {
         return parent::regionSingapore();
@@ -30,6 +35,11 @@ public static function zoneNa0()
         return parent::regionNorthAmerica();
     }
 
+    public static function zoneApNortheast1()
+    {
+        return parent::regionSeoul();
+    }
+
     public static function qvmZonez0()
     {
         return parent::qvmRegionHuadong();

tests/Qiniu/Tests/ZoneTest.php

@@ -99,6 +99,12 @@ public function testZonez2()
         $this->assertContains('upload-z2.qiniup.com', $zone->cdnUpHosts);
     }
 
+    public function testZoneCnEast2()
+    {
+        $zone = Zone::zoneCnEast2();
+        $this->assertContains('upload-cn-east-2.qiniup.com', $zone->cdnUpHosts);
+    }
+
     public function testZoneNa0()
     {
         $zone = Zone::zoneNa0();
@@ -111,6 +117,12 @@ public function testZoneAs0()
         $this->assertContains('upload-as0.qiniup.com', $zone->cdnUpHosts);
     }
 
+    public function testZoneApNortheast1()
+    {
+        $zone = Zone::zoneApNortheast1();
+        $this->assertContains('upload-ap-northeast-1.qiniup.com', $zone->cdnUpHosts);
+    }
+
     public function testQvmZonez0()
     {
         $zone = Zone::qvmZonez0();