Skip to content

Commit b94c674

Browse files
rwifengrwifeng
committed
Merge remote-tracking branch 'qiniu/master' into develop
2 parents d3d2773 + 4c4f9b8 commit b94c674

File tree

10 files changed

+186
-48
lines changed

10 files changed

+186
-48
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## 7.2.6 (2018-05-18)
4+
* 修复rs，rsf在不同机房默认的https域名
5+
6+
## 7.2.5 (2018-05-10)
7+
* 修复表单上传中多余的参数checkCrc导致的fname错位问题
8+
9+
## 7.2.4 (2018-05-09)
10+
### 增加
11+
* 连麦功能
12+
313
## 7.2.3 (2018-01-20)
414
### 增加
515
* 新加坡机房

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Qiniu Resource Storage SDK for PHP
1+
# Qiniu Cloud SDK for PHP
22
[![doxygen.io](http://doxygen.io/github.com/qiniu/php-sdk/?status.svg)](http://doxygen.io/github.com/qiniu/php-sdk/)
33
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE)
44
[![Build Status](https://travis-ci.org/qiniu/php-sdk.svg)](https://travis-ci.org/qiniu/php-sdk)

‎docs/rtc/README.md‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
## Features
44

5-
- App
6-
- [x] 创建房间: App->createApp()
7-
- [x] 查看房间: App->getApp()
8-
- [x] 删除房间: App->deleteApp()
9-
- [x] 生成房间token: App->AppToken()
5+
- Appclient
6+
- [x] 创建房间: client->createApp()
7+
- [x] 查看房间: client->getApp()
8+
- [x] 删除房间: client->deleteApp()
9+
- [x] 生成房间token: client->appToken()
1010

1111

1212

@@ -31,41 +31,41 @@
3131
```php
3232
$ak = "gwd_gV4gPKZZsmEOvAuNU1AcumicmuHooTfu64q5";
3333
$sk = "xxxx";
34-
$mac = new QiniuRtc\Mac($ak, $sk);
35-
$client = new QiniuRtc\AppClient($mac);
34+
$auth = new Auth($ak, $sk);
35+
$client = new Qiniu\Rtc\AppClient($auth);
3636
$resp=$client->createApp("901","testApp");
3737
print_r($resp);
3838
```
3939

40-
#### Get a app
40+
#### Get an app
4141

4242
```php
4343
$ak = "gwd_gV4gPKZZsmEOvAuNU1AcumicmuHooTfu64q5";
4444
$sk = "xxxx";
45-
$mac = new QiniuRtc\Mac($ak, $sk);
46-
$client = new QiniuRtc\AppClient($mac);
45+
$auth = new Auth($ak, $sk);
46+
$client = new Qiniu\Rtc\AppClient($auth);
4747
$resp=$client->getApp("deq02uhb6");
4848
print_r($resp);
4949
```
5050

51-
#### Delete a app
51+
#### Delete an app
5252

5353
```php
5454
$ak = "gwd_gV4gPKZZsmEOvAuNU1AcumicmuHooTfu64q5";
5555
$sk = "xxxx";
56-
$mac = new QiniuRtc\Mac($ak, $sk);
57-
$client = new QiniuRtc\AppClient($mac);
56+
$auth = new Auth($ak, $sk);
57+
$client = new Qiniu\Rtc\AppClient($auth);
5858
$resp=$client->deleteApp("deq02uhb6");
5959
print_r($resp);
6060
```
6161

62-
#### Generate a app token
62+
#### Generate an app token
6363

6464
```php
6565
$ak = "gwd_gV4gPKZZsmEOvAuNU1AcumicmuHooTfu64q5";
6666
$sk = "xxxx";
67-
$mac = new QiniuRtc\Mac($ak, $sk);
68-
$client = new QiniuRtc\AppClient($mac);
67+
$auth = new Auth($ak, $sk);
68+
$client = new Qiniu\Rtc\AppClient($auth);
6969
$resp=$client->appToken("deq02uhb6", "lfx", '1111', (time()+3600), 'user');
7070
print_r($resp);
7171
```

‎examples/pulpvideo.php‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?php
2+
3+
require_once __DIR__ . '/../autoload.php';
4+
5+
use Qiniu\Auth;
6+
use Qiniu\Http\Client;
7+
8+
$accessKey = getenv('QINIU_ACCESS_KEY');
9+
$secretKey = getenv('QINIU_SECRET_KEY');
10+
$auth = new Auth($accessKey, $secretKey);
11+
$config = new \Qiniu\Config();
12+
$argusManager = new \Qiniu\Storage\ArgusManager($auth, $config);
13+
14+
$reqBody = array();
15+
$reqBody['uri'] = "xxxx";
16+
17+
$ops = array();
18+
$ops = array(
19+
array(
20+
'op' => 'pulp',
21+
'params' => array(
22+
'labels' => array(
23+
array(
24+
'label' => "1",
25+
'select' => 1,
26+
'score' => 2,
27+
),
28+
)
29+
)
30+
),
31+
);
32+
33+
$params = array();
34+
$params = array(
35+
'async' => false,
36+
'vframe' => array(
37+
'mode' => 1,
38+
'interval' => 8,
39+
)
40+
);
41+
42+
$req = array();
43+
$req['data'] = $reqBody;
44+
$req['ops'] = $ops;
45+
$req['params'] = $params;
46+
$body = json_encode($req);
47+
48+
$vid = "xxxx";
49+
list($ret, $err) = $argusManager->pulpVideo($body, $vid);
50+
51+
if ($err !== null) {
52+
var_dump($err);
53+
} else {
54+
var_dump($ret);
55+
}

‎src/Qiniu/Config.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
final class Config
55
{
6-
const SDK_VER = '7.2.3';
6+
const SDK_VER = '7.2.5';
77

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

@@ -12,6 +12,7 @@ final class Config
1212
const RS_HOST = 'rs.qiniu.com'; //RS Host
1313
const UC_HOST = 'https://api.qiniu.com'; //UC Host
1414
const RTCAPI_HOST = 'http://rtc.qiniuapi.com';
15+
const ARGUS_HOST = 'argus.atlab.ai';
1516
const RTCAPI_VERSION = 'v3';
1617

1718
// Zone 空间对应的机房

‎src/Qiniu/Rtc/AppClient.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public function listActiveRooms($appId, $prefix = null, $offset = null, $limit =
138138
if (isset($limit)) {
139139
$query['limit'] = $limit;
140140
}
141-
if ($query != null) {
141+
if (isset($query) && !empty($query)) {
142142
$query = '?' . http_build_query($query);
143143
$url = sprintf("%s/%s/rooms%s", $this->baseURL, $appId, $query);
144144
} else {
@@ -170,7 +170,7 @@ public function appToken($appId, $roomName, $userId, $expireAt, $permission)
170170

171171
private function get($url, $cType = null)
172172
{
173-
$rtcToken = $this->auth->authorizationV2($url, "GET", $body, $cType);
173+
$rtcToken = $this->auth->authorizationV2($url, "GET", null, $cType);
174174
$rtcToken['Content-Type'] = $cType;
175175
$ret = Client::get($url, $rtcToken);
176176
if (!$ret->ok()) {
@@ -179,21 +179,21 @@ private function get($url, $cType = null)
179179
return array($ret->json(), null);
180180
}
181181

182-
private function delete($url, $cType = 'application/json')
182+
private function delete($url, $contentType = 'application/json')
183183
{
184-
$rtcToken = $this->auth->authorizationV2($url, "DELETE", $body, $cType);
185-
$rtcToken['Content-Type'] = $cType;
184+
$rtcToken = $this->auth->authorizationV2($url, "DELETE", null, $contentType);
185+
$rtcToken['Content-Type'] = $contentType;
186186
$ret = Client::delete($url, $rtcToken);
187187
if (!$ret->ok()) {
188188
return array(null, new Error($url, $ret));
189189
}
190190
return array($ret->json(), null);
191191
}
192192

193-
private function post($url, $body, $cType = 'application/json')
193+
private function post($url, $body, $contentType = 'application/json')
194194
{
195-
$rtcToken = $this->auth->authorizationV2($url, "POST", $body, $cType);
196-
$rtcToken['Content-Type'] = $cType;
195+
$rtcToken = $this->auth->authorizationV2($url, "POST", $body, $contentType);
196+
$rtcToken['Content-Type'] = $contentType;
197197
$ret = Client::post($url, $body, $rtcToken);
198198
if (!$ret->ok()) {
199199
return array(null, new Error($url, $ret));

‎src/Qiniu/Storage/ArgusManager.php‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<?php
2+
namespace Qiniu\Storage;
3+
4+
use Qiniu\Auth;
5+
use Qiniu\Config;
6+
use Qiniu\Zone;
7+
use Qiniu\Http\Client;
8+
use Qiniu\Http\Error;
9+
10+
/**
11+
* 主要涉及了鉴黄接口的实现，具体的接口规格可以参考
12+
*
13+
* @link https://developer.qiniu.com/dora/manual/3674/kodo-product-introduction
14+
*/
15+
final class ArgusManager
16+
{
17+
private $auth;
18+
private $config;
19+
20+
public function __construct(Auth $auth, Config $config = null)
21+
{
22+
$this->auth = $auth;
23+
if ($config == null) {
24+
$this->config = new Config();
25+
} else {
26+
$this->config = $config;
27+
}
28+
}
29+
30+
/**
31+
* 视频鉴黄
32+
*
33+
* @param $body body信息
34+
* @param $vid videoID
35+
*
36+
* @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error
37+
* @link https://developer.qiniu.com/dora/manual/4258/video-pulp
38+
*/
39+
public function pulpVideo($body, $vid)
40+
{
41+
$path = '/v1/video/' . $vid;
42+
43+
return $this->arPost($path, $body);
44+
}
45+
46+
private function getArHost()
47+
{
48+
$scheme = "http://";
49+
if ($this->config->useHTTPS == true) {
50+
$scheme = "https://";
51+
}
52+
return $scheme . Config::ARGUS_HOST;
53+
}
54+
55+
private function arPost($path, $body = null)
56+
{
57+
$url = $this->getArHost() . $path;
58+
return $this->post($url, $body);
59+
}
60+
61+
private function post($url, $body)
62+
{
63+
$headers = $this->auth->authorizationV2($url, 'POST', $body, 'application/json');
64+
$headers['Content-Type']='application/json';
65+
$ret = Client::post($url, $body, $headers);
66+
if (!$ret->ok()) {
67+
print($ret->statusCode);
68+
return array(null, new Error($url, $ret));
69+
}
70+
$r = ($ret->body === null) ? array() : $ret->json();
71+
return array($r, null);
72+
}
73+
}

‎src/Qiniu/Storage/UploadManager.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ public function putFile(
108108
$this->config,
109109
$params,
110110
$mime,
111-
$checkCrc,
112111
basename($filePath)
113112
);
114113
}

‎src/Qiniu/Zone.php‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public static function zone0()
4444
$Zone_z0 = new Zone(
4545
array("up.qiniup.com", 'up-jjh.qiniup.com', 'up-xs.qiniup.com'),
4646
array('upload.qiniup.com', 'upload-jjh.qiniup.com', 'upload-xs.qiniup.com'),
47-
'rs.qiniu.com',
48-
'rsf.qiniu.com',
47+
'rs.qbox.me',
48+
'rsf.qbox.me',
4949
'api.qiniu.com',
5050
'iovip.qbox.me'
5151
);
@@ -58,8 +58,8 @@ public static function zone1()
5858
$Zone_z1 = new Zone(
5959
array('up-z1.qiniup.com'),
6060
array('upload-z1.qiniup.com'),
61-
"rs-z1.qiniu.com",
62-
"rsf-z1.qiniu.com",
61+
"rs-z1.qbox.me",
62+
"rsf-z1.qbox.me",
6363
"api-z1.qiniu.com",
6464
"iovip-z1.qbox.me"
6565
);
@@ -73,8 +73,8 @@ public static function zone2()
7373
$Zone_z2 = new Zone(
7474
array('up-z2.qiniup.com', 'up-dg.qiniup.com', 'up-fs.qiniup.com'),
7575
array('upload-z2.qiniup.com', 'upload-dg.qiniup.com', 'upload-fs.qiniup.com'),
76-
"rs-z2.qiniu.com",
77-
"rsf-z2.qiniu.com",
76+
"rs-z2.qbox.me",
77+
"rsf-z2.qbox.me",
7878
"api-z2.qiniu.com",
7979
"iovip-z2.qbox.me"
8080
);
@@ -88,8 +88,8 @@ public static function zoneNa0()
8888
$Zone_na0 = new Zone(
8989
array('up-na0.qiniup.com'),
9090
array('upload-na0.qiniup.com'),
91-
"rs-na0.qiniu.com",
92-
"rsf-na0.qiniu.com",
91+
"rs-na0.qbox.me",
92+
"rsf-na0.qbox.me",
9393
"api-na0.qiniu.com",
9494
"iovip-na0.qbox.me"
9595
);
@@ -103,8 +103,8 @@ public static function zoneAs0()
103103
$Zone_as0 = new Zone(
104104
array('up-as0.qiniup.com'),
105105
array('upload-as0.qiniup.com'),
106-
"rs-as0.qiniu.com",
107-
"rsf-as0.qiniu.com",
106+
"rs-as0.qbox.me",
107+
"rsf-as0.qbox.me",
108108
"api-as0.qiniu.com",
109109
"iovip-as0.qbox.me"
110110
);
@@ -145,24 +145,24 @@ public static function queryZone($ak, $bucket)
145145

146146
//set specific hosts
147147
if (strstr($zone->iovipHost, "z1") !== false) {
148-
$zone->rsHost = "rs-z1.qiniu.com";
149-
$zone->rsfHost = "rsf-z1.qiniu.com";
148+
$zone->rsHost = "rs-z1.qbox.me";
149+
$zone->rsfHost = "rsf-z1.qbox.me";
150150
$zone->apiHost = "api-z1.qiniu.com";
151151
} elseif (strstr($zone->iovipHost, "z2") !== false) {
152-
$zone->rsHost = "rs-z2.qiniu.com";
153-
$zone->rsfHost = "rsf-z2.qiniu.com";
152+
$zone->rsHost = "rs-z2.qbox.me";
153+
$zone->rsfHost = "rsf-z2.qbox.me";
154154
$zone->apiHost = "api-z2.qiniu.com";
155155
} elseif (strstr($zone->iovipHost, "na0") !== false) {
156-
$zone->rsHost = "rs-na0.qiniu.com";
157-
$zone->rsfHost = "rsf-na0.qiniu.com";
156+
$zone->rsHost = "rs-na0.qbox.me";
157+
$zone->rsfHost = "rsf-na0.qbox.me";
158158
$zone->apiHost = "api-na0.qiniu.com";
159159
} elseif (strstr($zone->iovipHost, "as0") !== false) {
160-
$zone->rsHost = "rs-as0.qiniu.com";
161-
$zone->rsfHost = "rsf-as0.qiniu.com";
160+
$zone->rsHost = "rs-as0.qbox.me";
161+
$zone->rsfHost = "rsf-as0.qbox.me";
162162
$zone->apiHost = "api-as0.qiniu.com";
163163
} else {
164-
$zone->rsHost = "rs.qiniu.com";
165-
$zone->rsfHost = "rsf.qiniu.com";
164+
$zone->rsHost = "rs.qbox.me";
165+
$zone->rsfHost = "rsf.qbox.me";
166166
$zone->apiHost = "api.qiniu.com";
167167
}
168168

‎src/Qiniu/functions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ function explodeUpToken($upToken)
255255
return array(null, null, "invalid uptoken");
256256
}
257257
$accessKey = $items[0];
258-
$putPolicy = json_decode(base64_decode($items[2]));
258+
$putPolicy = json_decode(base64_urlSafeDecode($items[2]));
259259
$scope = $putPolicy->scope;
260260
$scopeItems = explode(':', $scope);
261261
$bucket = $scopeItems[0];

0 commit comments

Comments
 (0)