Skip to content

Commit 9b41049

Browse files
committed
remove deprecate api domain
1 parent cbee4d2 commit 9b41049

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

src/Qiniu/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ final class Config
88
const BLOCK_SIZE = 4194304; //4*1024*1024 分块上传块大小,该参数为接口规格,不能修改
99

1010
const RSF_HOST = 'rsf.qiniu.com';
11-
const API_HOST = 'api.qiniu.com';
11+
const API_HOST = 'api.qiniuapi.com';
1212
const RS_HOST = 'rs.qiniu.com'; //RS Host
1313
const UC_HOST = 'uc.qbox.me'; //UC Host
1414
const RTCAPI_HOST = 'http://rtc.qiniuapi.com';

src/Qiniu/Region.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function __construct(
2626
$cdnUpHosts = array(),
2727
$rsHost = "rs.qiniu.com",
2828
$rsfHost = "rsf.qiniu.com",
29-
$apiHost = "api.qiniu.com",
29+
$apiHost = "api.qiniuapi.com",
3030
$iovipHost = null
3131
) {
3232

@@ -46,7 +46,7 @@ public static function regionHuadong()
4646
array('upload.qiniup.com'),
4747
'rs.qbox.me',
4848
'rsf.qbox.me',
49-
'api.qiniu.com',
49+
'api.qiniuapi.com',
5050
'iovip.qbox.me'
5151
);
5252
return $regionHuadong;
@@ -59,7 +59,7 @@ public static function qvmRegionHuadong()
5959
array("free-qvm-z0-xs.qiniup.com"),
6060
'rs.qbox.me',
6161
'rsf.qbox.me',
62-
'api.qiniu.com',
62+
'api.qiniuapi.com',
6363
'iovip.qbox.me'
6464
);
6565
return $qvmRegionHuadong;
@@ -72,7 +72,7 @@ public static function qvmRegionHuabei()
7272
array("free-qvm-z1-zz.qiniup.com"),
7373
"rs-z1.qbox.me",
7474
"rsf-z1.qbox.me",
75-
"api-z1.qiniu.com",
75+
"api-z1.qiniuapi.com",
7676
"iovip-z1.qbox.me"
7777
);
7878
return $qvmRegionHuabei;
@@ -86,7 +86,7 @@ public static function regionHuabei()
8686
array('upload-z1.qiniup.com'),
8787
"rs-z1.qbox.me",
8888
"rsf-z1.qbox.me",
89-
"api-z1.qiniu.com",
89+
"api-z1.qiniuapi.com",
9090
"iovip-z1.qbox.me"
9191
);
9292

@@ -101,7 +101,7 @@ public static function regionHuanan()
101101
array('upload-z2.qiniup.com'),
102102
"rs-z2.qbox.me",
103103
"rsf-z2.qbox.me",
104-
"api-z2.qiniu.com",
104+
"api-z2.qiniuapi.com",
105105
"iovip-z2.qbox.me"
106106
);
107107
return $regionHuanan;
@@ -129,7 +129,7 @@ public static function regionNorthAmerica()
129129
array('upload-na0.qiniup.com'),
130130
"rs-na0.qbox.me",
131131
"rsf-na0.qbox.me",
132-
"api-na0.qiniu.com",
132+
"api-na0.qiniuapi.com",
133133
"iovip-na0.qbox.me"
134134
);
135135
return $regionNorthAmerica;
@@ -144,7 +144,7 @@ public static function regionSingapore()
144144
array('upload-as0.qiniup.com'),
145145
"rs-as0.qbox.me",
146146
"rsf-as0.qbox.me",
147-
"api-as0.qiniu.com",
147+
"api-as0.qiniuapi.com",
148148
"iovip-as0.qbox.me"
149149
);
150150
return $regionSingapore;
@@ -199,31 +199,31 @@ public static function queryRegion($ak, $bucket)
199199
if (strstr($Region->iovipHost, "z1") !== false) {
200200
$Region->rsHost = "rs-z1.qbox.me";
201201
$Region->rsfHost = "rsf-z1.qbox.me";
202-
$Region->apiHost = "api-z1.qiniu.com";
202+
$Region->apiHost = "api-z1.qiniuapi.com";
203203
} elseif (strstr($Region->iovipHost, "z2") !== false) {
204204
$Region->rsHost = "rs-z2.qbox.me";
205205
$Region->rsfHost = "rsf-z2.qbox.me";
206-
$Region->apiHost = "api-z2.qiniu.com";
206+
$Region->apiHost = "api-z2.qiniuapi.com";
207207
} elseif (strstr($Region->iovipHost, "cn-east-2") !== false) {
208208
$Region->rsHost = "rs-cn-east-2.qiniuapi.com";
209209
$Region->rsfHost = "rsf-cn-east-2.qiniuapi.com";
210210
$Region->apiHost = "api-cn-east-2.qiniuapi.com";
211211
} elseif (strstr($Region->iovipHost, "na0") !== false) {
212212
$Region->rsHost = "rs-na0.qbox.me";
213213
$Region->rsfHost = "rsf-na0.qbox.me";
214-
$Region->apiHost = "api-na0.qiniu.com";
214+
$Region->apiHost = "api-na0.qiniuapi.com";
215215
} elseif (strstr($Region->iovipHost, "as0") !== false) {
216216
$Region->rsHost = "rs-as0.qbox.me";
217217
$Region->rsfHost = "rsf-as0.qbox.me";
218-
$Region->apiHost = "api-as0.qiniu.com";
218+
$Region->apiHost = "api-as0.qiniuapi.com";
219219
} elseif (strstr($Region->iovipHost, "ap-northeast-1") !== false) {
220220
$Region->rsHost = "rs-ap-northeast-1.qiniuapi.com";
221221
$Region->rsfHost = "rsf-ap-northeast-1.qiniuapi.com";
222222
$Region->apiHost = "api-ap-northeast-1.qiniuapi.com";
223223
} else {
224224
$Region->rsHost = "rs.qbox.me";
225225
$Region->rsfHost = "rsf.qbox.me";
226-
$Region->apiHost = "api.qiniu.com";
226+
$Region->apiHost = "api.qiniuapi.com";
227227
}
228228

229229
return $Region;

src/Qiniu/Storage/BucketManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ public function asynchFetchStatus($zone, $id)
847847
$scheme = "https://";
848848
}
849849

850-
$url = $scheme . "api-" . $zone . ".qiniu.com/sisyphus/fetch?id=" . $id;
850+
$url = $scheme . "api-" . $zone . ".qiniuapi.com/sisyphus/fetch?id=" . $id;
851851

852852
list($ret, $err) = $this->getV2($url);
853853

tests/Qiniu/Tests/ConfigTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function testGetApiHost()
2727
$hasException = true;
2828
}
2929
$this->assertFalse($hasException);
30-
$this->assertEquals('http://api.qiniu.com', $apiHost);
30+
$this->assertEquals('http://api.qiniuapi.com', $apiHost);
3131
}
3232

3333
public function testGetApiHostErrored()
@@ -47,7 +47,7 @@ public function testGetApiHostV2()
4747
$conf = new Config();
4848
list($apiHost, $err) = $conf->getApiHostV2($this->accessKey, $this->bucketName);
4949
$this->assertNull($err);
50-
$this->assertEquals('http://api.qiniu.com', $apiHost);
50+
$this->assertEquals('http://api.qiniuapi.com', $apiHost);
5151
}
5252

5353
public function testGetApiHostV2Errored()

0 commit comments

Comments
 (0)