Skip to content

Commit 4bbddbd

Browse files
bachuebachue
authored
Merge pull request #385 from qiniu/fix/remove-deprecate-domains
remove deprecate domains
2 parents 5ec1d2a + 7baa972 commit 4bbddbd

File tree

5 files changed

+55
-50
lines changed

5 files changed

+55
-50
lines changed

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## 7.8.0 (2022-10-25)
4+
* 移除不推荐域名，并增加区域亚太-首尔和华东-浙江2
5+
* 对象存储，修复断点上传的文件内容不正确
6+
* 对象存储，优化分片上传 ctx 超时检测
7+
38
## 7.7.0 (2022-09-02)
49
* 对象存储，新增支持设置文件级别生命周期 setObjectLifecycle API
510
* 对象存储，内置增加七牛新建存储区域域名信息

‎src/Qiniu/Config.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
final class Config
55
{
6-
const SDK_VER = '7.7.0';
6+
const SDK_VER = '7.8.0';
77

88
const BLOCK_SIZE = 4194304; //4*1024*1024 分块上传块大小，该参数为接口规格，不能修改
99

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

‎src/Qiniu/Region.php

+43-43
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ class Region
2424
public function __construct(
2525
$srcUpHosts = array(),
2626
$cdnUpHosts = array(),
27-
$rsHost = "rs.qiniu.com",
28-
$rsfHost = "rsf.qiniu.com",
29-
$apiHost = "api.qiniu.com",
27+
$rsHost = "rs-z0.qiniuapi.com",
28+
$rsfHost = "rsf-z0.qiniuapi.com",
29+
$apiHost = "api.qiniuapi.com",
3030
$iovipHost = null
3131
) {
3232

@@ -42,11 +42,11 @@ public function __construct(
4242
public static function regionHuadong()
4343
{
4444
$regionHuadong = new Region(
45-
array("up.qiniup.com", 'up-jjh.qiniup.com', 'up-xs.qiniup.com'),
46-
array('upload.qiniup.com', 'upload-jjh.qiniup.com', 'upload-xs.qiniup.com'),
47-
'rs.qbox.me',
48-
'rsf.qbox.me',
49-
'api.qiniu.com',
45+
array("up.qiniup.com"),
46+
array('upload.qiniup.com'),
47+
'rs-z0.qiniuapi.com',
48+
'rsf-z0.qiniuapi.com',
49+
'api.qiniuapi.com',
5050
'iovip.qbox.me'
5151
);
5252
return $regionHuadong;
@@ -57,9 +57,9 @@ public static function qvmRegionHuadong()
5757
{
5858
$qvmRegionHuadong = new Region(
5959
array("free-qvm-z0-xs.qiniup.com"),
60-
'rs.qbox.me',
61-
'rsf.qbox.me',
62-
'api.qiniu.com',
60+
'rs-z0.qiniuapi.com',
61+
'rsf-z0.qiniuapi.com',
62+
'api.qiniuapi.com',
6363
'iovip.qbox.me'
6464
);
6565
return $qvmRegionHuadong;
@@ -70,9 +70,9 @@ public static function qvmRegionHuabei()
7070
{
7171
$qvmRegionHuabei = new Region(
7272
array("free-qvm-z1-zz.qiniup.com"),
73-
"rs-z1.qbox.me",
74-
"rsf-z1.qbox.me",
75-
"api-z1.qiniu.com",
73+
"rs-z1.qiniuapi.com",
74+
"rsf-z1.qiniuapi.com",
75+
"api-z1.qiniuapi.com",
7676
"iovip-z1.qbox.me"
7777
);
7878
return $qvmRegionHuabei;
@@ -84,9 +84,9 @@ public static function regionHuabei()
8484
$regionHuabei = new Region(
8585
array('up-z1.qiniup.com'),
8686
array('upload-z1.qiniup.com'),
87-
"rs-z1.qbox.me",
88-
"rsf-z1.qbox.me",
89-
"api-z1.qiniu.com",
87+
"rs-z1.qiniuapi.com",
88+
"rsf-z1.qiniuapi.com",
89+
"api-z1.qiniuapi.com",
9090
"iovip-z1.qbox.me"
9191
);
9292

@@ -97,11 +97,11 @@ public static function regionHuabei()
9797
public static function regionHuanan()
9898
{
9999
$regionHuanan = new Region(
100-
array('up-z2.qiniup.com', 'up-dg.qiniup.com', 'up-fs.qiniup.com'),
101-
array('upload-z2.qiniup.com', 'upload-dg.qiniup.com', 'upload-fs.qiniup.com'),
102-
"rs-z2.qbox.me",
103-
"rsf-z2.qbox.me",
104-
"api-z2.qiniu.com",
100+
array('up-z2.qiniup.com'),
101+
array('upload-z2.qiniup.com'),
102+
"rs-z2.qiniuapi.com",
103+
"rsf-z2.qiniuapi.com",
104+
"api-z2.qiniuapi.com",
105105
"iovip-z2.qbox.me"
106106
);
107107
return $regionHuanan;
@@ -127,9 +127,9 @@ public static function regionNorthAmerica()
127127
$regionNorthAmerica = new Region(
128128
array('up-na0.qiniup.com'),
129129
array('upload-na0.qiniup.com'),
130-
"rs-na0.qbox.me",
131-
"rsf-na0.qbox.me",
132-
"api-na0.qiniu.com",
130+
"rs-na0.qiniuapi.com",
131+
"rsf-na0.qiniuapi.com",
132+
"api-na0.qiniuapi.com",
133133
"iovip-na0.qbox.me"
134134
);
135135
return $regionNorthAmerica;
@@ -142,9 +142,9 @@ public static function regionSingapore()
142142
$regionSingapore = new Region(
143143
array('up-as0.qiniup.com'),
144144
array('upload-as0.qiniup.com'),
145-
"rs-as0.qbox.me",
146-
"rsf-as0.qbox.me",
147-
"api-as0.qiniu.com",
145+
"rs-as0.qiniuapi.com",
146+
"rsf-as0.qiniuapi.com",
147+
"api-as0.qiniuapi.com",
148148
"iovip-as0.qbox.me"
149149
);
150150
return $regionSingapore;
@@ -197,33 +197,33 @@ public static function queryRegion($ak, $bucket)
197197

198198
//set specific hosts
199199
if (strstr($Region->iovipHost, "z1") !== false) {
200-
$Region->rsHost = "rs-z1.qbox.me";
201-
$Region->rsfHost = "rsf-z1.qbox.me";
202-
$Region->apiHost = "api-z1.qiniu.com";
200+
$Region->rsHost = "rs-z1.qiniuapi.com";
201+
$Region->rsfHost = "rsf-z1.qiniuapi.com";
202+
$Region->apiHost = "api-z1.qiniuapi.com";
203203
} elseif (strstr($Region->iovipHost, "z2") !== false) {
204-
$Region->rsHost = "rs-z2.qbox.me";
205-
$Region->rsfHost = "rsf-z2.qbox.me";
206-
$Region->apiHost = "api-z2.qiniu.com";
204+
$Region->rsHost = "rs-z2.qiniuapi.com";
205+
$Region->rsfHost = "rsf-z2.qiniuapi.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) {
212-
$Region->rsHost = "rs-na0.qbox.me";
213-
$Region->rsfHost = "rsf-na0.qbox.me";
214-
$Region->apiHost = "api-na0.qiniu.com";
212+
$Region->rsHost = "rs-na0.qiniuapi.com";
213+
$Region->rsfHost = "rsf-na0.qiniuapi.com";
214+
$Region->apiHost = "api-na0.qiniuapi.com";
215215
} elseif (strstr($Region->iovipHost, "as0") !== false) {
216-
$Region->rsHost = "rs-as0.qbox.me";
217-
$Region->rsfHost = "rsf-as0.qbox.me";
218-
$Region->apiHost = "api-as0.qiniu.com";
216+
$Region->rsHost = "rs-as0.qiniuapi.com";
217+
$Region->rsfHost = "rsf-as0.qiniuapi.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 {
224-
$Region->rsHost = "rs.qbox.me";
225-
$Region->rsfHost = "rsf.qbox.me";
226-
$Region->apiHost = "api.qiniu.com";
224+
$Region->rsHost = "rs.qiniuapi.com";
225+
$Region->rsfHost = "rsf.qiniuapi.com";
226+
$Region->apiHost = "api.qiniuapi.com";
227227
}
228228

229229
return $Region;

‎src/Qiniu/Storage/BucketManager.php

+1-1
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

+2-2
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)