[更新]Composer组件更新

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitcec999826fe83b0c9b320b555c760b92::getLoader();
+return ComposerAutoloaderInit78f9a02e77fad1b99d68824fc75d2c98::getLoader();

vendor/composer/autoload_classmap.php

@@ -82,6 +82,7 @@ return array(
     'OSS\\Result\\Result' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/Result.php',
     'OSS\\Result\\UploadPartResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/UploadPartResult.php',
     'Qiniu\\Auth' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Auth.php',
+    'Qiniu\\Cdn\\CdnManager' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Cdn/CdnManager.php',
     'Qiniu\\Config' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Config.php',
     'Qiniu\\Etag' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Etag.php',
     'Qiniu\\Http\\Client' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Http/Client.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitcec999826fe83b0c9b320b555c760b92
+class ComposerAutoloaderInit78f9a02e77fad1b99d68824fc75d2c98
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInitcec999826fe83b0c9b320b555c760b92
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitcec999826fe83b0c9b320b555c760b92', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit78f9a02e77fad1b99d68824fc75d2c98', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitcec999826fe83b0c9b320b555c760b92', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit78f9a02e77fad1b99d68824fc75d2c98', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInitcec999826fe83b0c9b320b555c760b92::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit78f9a02e77fad1b99d68824fc75d2c98::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInitcec999826fe83b0c9b320b555c760b92
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInitcec999826fe83b0c9b320b555c760b92::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit78f9a02e77fad1b99d68824fc75d2c98::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirecec999826fe83b0c9b320b555c760b92($fileIdentifier, $file);
+            composerRequire78f9a02e77fad1b99d68824fc75d2c98($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequirecec999826fe83b0c9b320b555c760b92($fileIdentifier, $file)
+function composerRequire78f9a02e77fad1b99d68824fc75d2c98($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitcec999826fe83b0c9b320b555c760b92
+class ComposerStaticInit78f9a02e77fad1b99d68824fc75d2c98
 {
     public static $files = array (
         '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
@@ -165,6 +165,7 @@ class ComposerStaticInitcec999826fe83b0c9b320b555c760b92
         'OSS\\Result\\Result' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/Result.php',
         'OSS\\Result\\UploadPartResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/UploadPartResult.php',
         'Qiniu\\Auth' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Auth.php',
+        'Qiniu\\Cdn\\CdnManager' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Cdn/CdnManager.php',
         'Qiniu\\Config' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Config.php',
         'Qiniu\\Etag' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Etag.php',
         'Qiniu\\Http\\Client' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Http/Client.php',
@@ -384,9 +385,9 @@ class ComposerStaticInitcec999826fe83b0c9b320b555c760b92
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitcec999826fe83b0c9b320b555c760b92::$prefixLengthsPsr4;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit78f9a02e77fad1b99d68824fc75d2c98::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitcec999826fe83b0c9b320b555c760b92::$prefixDirsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit78f9a02e77fad1b99d68824fc75d2c98::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitcec999826fe83b0c9b320b555c760b92::$classMap;
+            $loader->classMap = ComposerStaticInit78f9a02e77fad1b99d68824fc75d2c98::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/composer/installed.json

@@ -80,17 +80,17 @@
     },
     {
         "name": "qiniu/php-sdk",
-        "version": "v7.1.3",
+        "version": "v7.2.1",
-        "version_normalized": "7.1.3.0",
+        "version_normalized": "7.2.1.0",
         "source": {
             "type": "git",
             "url": "https://github.com/qiniu/php-sdk.git",
-            "reference": "b91653485e36b4797d7a302cc86c49695e47a642"
+            "reference": "8c7ba738bd4443ee3569a07441913b07c4b2c4a2"
         },
         "dist": {
             "type": "zip",
-            "url": "https://files.phpcomposer.com/files/qiniu/php-sdk/b91653485e36b4797d7a302cc86c49695e47a642.zip",
+            "url": "https://files.phpcomposer.com/files/qiniu/php-sdk/8c7ba738bd4443ee3569a07441913b07c4b2c4a2.zip",
-            "reference": "b91653485e36b4797d7a302cc86c49695e47a642",
+            "reference": "8c7ba738bd4443ee3569a07441913b07c4b2c4a2",
             "shasum": ""
         },
         "require": {
@@ -100,7 +100,7 @@
             "phpunit/phpunit": "~4.0",
             "squizlabs/php_codesniffer": "~2.3"
         },
-        "time": "2016-11-18T02:57:31+00:00",
+        "time": "2017-08-26T00:46:11+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -381,23 +381,23 @@
     },
     {
         "name": "symfony/options-resolver",
-        "version": "v3.3.6",
+        "version": "v3.3.8",
-        "version_normalized": "3.3.6.0",
+        "version_normalized": "3.3.8.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/options-resolver.git",
-            "reference": "ff48982d295bcac1fd861f934f041ebc73ae40f0"
+            "reference": "ee4e22978fe885b54ee5da8c7964f0a5301abfb6"
         },
         "dist": {
             "type": "zip",
-            "url": "https://files.phpcomposer.com/files/symfony/options-resolver/ff48982d295bcac1fd861f934f041ebc73ae40f0.zip",
+            "url": "https://files.phpcomposer.com/files/symfony/options-resolver/ee4e22978fe885b54ee5da8c7964f0a5301abfb6.zip",
-            "reference": "ff48982d295bcac1fd861f934f041ebc73ae40f0",
+            "reference": "ee4e22978fe885b54ee5da8c7964f0a5301abfb6",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.5.9"
+            "php": "^5.5.9|>=7.0.8"
         },
-        "time": "2017-04-12T14:14:56+00:00",
+        "time": "2017-07-29T21:54:42+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {

vendor/qiniu/php-sdk/.gitignore

@@ -9,3 +9,4 @@ phpunit.functional.xml
 composer.lock
 vendor
 src/package.xml
+.idea/

vendor/qiniu/php-sdk/.travis.yml

@@ -1,22 +1,24 @@
-# using docker container
 sudo: false
-
 language: php
+
 php:
   - 5.3
   - 5.4
   - 5.5
   - 5.6
   - 7.0
+
 before_script:
   - export QINIU_TEST_ENV="travis"
   - travis_retry composer self-update
   - travis_retry composer install --no-interaction --prefer-source --dev
+
 script:
   - ./vendor/bin/phpcs --standard=PSR2 src
   - ./vendor/bin/phpcs --standard=PSR2 examples
   - ./vendor/bin/phpcs --standard=PSR2 tests
   - ./vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover tests/Qiniu/Tests/
+
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover coverage.clover

vendor/qiniu/php-sdk/CHANGELOG.md

@@ -1,4 +1,11 @@
-#Changelog
+# Changelog
+
+## 7.1.4 (2017-06-21)
+### 增加
+* cdn 文件/目录 刷新
+* cdn 获取 流量/带宽 
+* cdn 获取域名的访问日志列表
+* cdn 对资源链接进行时间戳防盗链签名
 
 ## 7.1.3 (2016-11-18)
 ### 增加

vendor/qiniu/php-sdk/examples/auth.php

@@ -1,11 +0,0 @@
-<?php
-require_once __DIR__ . '/../autoload.php';
-
-use Qiniu\Auth;
-
-// 用于签名的公钥和私钥. http://developer.qiniu.com/docs/v6/api/overview/security.html#aksk
-$accessKey = 'Access_Key';
-$secretKey = 'Secret_Key';
-
-// 初始化签权对象。
-$auth = new Auth($accessKey, $secretKey);

vendor/qiniu/php-sdk/examples/bucket_mgr.php

@@ -1,56 +0,0 @@
-<?php
-require_once __DIR__ . '/../autoload.php';
-
-use Qiniu\Auth;
-use Qiniu\Storage\BucketManager;
-
-$accessKey = 'Access_Key';
-$secretKey = 'Secret_Key';
-
-//初始化Auth状态：
-$auth = new Auth($accessKey, $secretKey);
-
-//初始化BucketManager
-$bucketMgr = new BucketManager($auth);
-
-//你要测试的空间， 并且这个key在你空间中存在
-$bucket = 'Bucket_Name';
-$key = 'php-logo.png';
-
-//获取文件的状态信息
-list($ret, $err) = $bucketMgr->stat($bucket, $key);
-echo "\n====> $key stat : \n";
-if ($err !== null) {
-    var_dump($err);
-} else {
-    var_dump($ret);
-}
-
-//将文件从文件$key 复制到文件$key2。 可以在不同bucket复制
-$key2 = 'php-logo2.png';
-$err = $bucketMgr->copy($bucket, $key, $bucket, $key2);
-echo "\n====> copy $key to $key2 : \n";
-if ($err !== null) {
-    var_dump($err);
-} else {
-    echo "Success!";
-}
-
-//将文件从文件$key2 移动到文件$key3。 可以在不同bucket移动
-$key3 = 'php-logo3.png';
-$err = $bucketMgr->move($bucket, $key2, $bucket, $key3);
-echo "\n====> move $key2 to $key3 : \n";
-if ($err !== null) {
-    var_dump($err);
-} else {
-    echo "Success!";
-}
-
-//删除$bucket 中的文件 $key
-$err = $bucketMgr->delete($bucket, $key3);
-echo "\n====> delete $key3 : \n";
-if ($err !== null) {
-    var_dump($err);
-} else {
-    echo "Success!";
-}

vendor/qiniu/php-sdk/examples/bucket_mgr_init.php

@@ -1,14 +0,0 @@
-<?php
-require_once __DIR__ . '/../autoload.php';
-
-use Qiniu\Auth;
-use Qiniu\Storage\BucketManager;
-
-$accessKey = 'Access_Key';
-$secretKey = 'Secret_Key';
-
-//初始化Auth状态：
-$auth = new Auth($accessKey, $secretKey);
-
-//初始化BucketManager
-$bucketMgr = new BucketManager($auth);

vendor/qiniu/php-sdk/examples/cdn_get_bandwidth.php

@@ -0,0 +1,40 @@
+<?php
+
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Cdn\CdnManager;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+
+$auth = new Qiniu\Auth($accessKey, $secretKey);
+$cdnManager = new CdnManager($auth);
+
+//获取流量和带宽数据
+//参考文档：http://developer.qiniu.com/article/fusion/api/traffic-bandwidth.html
+
+$domains = array(
+    "javasdk.qiniudn.com",
+    "phpsdk.qiniudn.com"
+);
+
+$startDate = "2017-08-20";
+$endDate = "2017-08-21";
+
+//5min or hour or day
+$granularity = "day";
+
+//获取带宽数据
+list($bandwidthData, $getBandwidthErr) = $cdnManager->getBandwidthData(
+    $domains,
+    $startDate,
+    $endDate,
+    $granularity
+);
+
+if ($getBandwidthErr != null) {
+    var_dump($getBandwidthErr);
+} else {
+    echo "get bandwidth data success\n";
+    print_r($bandwidthData);
+}

vendor/qiniu/php-sdk/examples/cdn_get_flux.php

@@ -0,0 +1,34 @@
+<?php
+
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Cdn\CdnManager;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+
+$auth = new Qiniu\Auth($accessKey, $secretKey);
+$cdnManager = new CdnManager($auth);
+
+//获取流量和带宽数据
+//参考文档：http://developer.qiniu.com/article/fusion/api/traffic-bandwidth.html
+
+$domains = array(
+    "javasdk.qiniudn.com",
+    "phpsdk.qiniudn.com"
+);
+
+$startDate = "2017-08-20";
+$endDate = "2017-08-21";
+
+//5min or hour or day
+$granularity = "day";
+
+//获取流量数据
+list($fluxData, $getFluxErr) = $cdnManager->getFluxData($domains, $startDate, $endDate, $granularity);
+if ($getFluxErr != null) {
+    var_dump($getFluxErr);
+} else {
+    echo "get flux data success\n";
+    print_r($fluxData);
+}

vendor/qiniu/php-sdk/examples/cdn_get_log_list.php

@@ -0,0 +1,29 @@
+<?php
+
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Cdn\CdnManager;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+
+$auth = new Qiniu\Auth($accessKey, $secretKey);
+$cdnManager = new CdnManager($auth);
+
+$domains = array(
+    "javasdk.qiniudn.com",
+    "phpsdk.qiniudn.com"
+);
+
+$logDate = '2017-08-20';
+
+//获取日志下载链接
+//参考文档：http://developer.qiniu.com/article/fusion/api/log.html
+
+list($logListData, $getLogErr) = $cdnManager->getCdnLogList($domains, $logDate);
+if ($getLogErr != null) {
+    var_dump($getLogErr);
+} else {
+    echo "get cdn log list success\n";
+    print_r($logListData);
+}

vendor/qiniu/php-sdk/examples/cdn_refresh_urls_dirs.php

@@ -0,0 +1,52 @@
+<?php
+
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Cdn\CdnManager;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+
+$auth = new Qiniu\Auth($accessKey, $secretKey);
+
+//待刷新的文件列表和目录，文件列表最多一次100个，目录最多一次10个
+//参考文档：http://developer.qiniu.com/article/fusion/api/refresh.html
+$urls = array(
+    "http://phpsdk.qiniudn.com/qiniu.jpg",
+    "http://phpsdk.qiniudn.com/qiniu2.jpg",
+);
+
+//刷新目录需要联系七牛技术支持开通账户权限
+$dirs = array(
+    "http://phpsdk.qiniudn.com/test/"
+);
+
+$cdnManager = new CdnManager($auth);
+
+// 目前客户默认没有目录刷新权限，刷新会有400038报错，参考：https://developer.qiniu.com/fusion/api/1229/cache-refresh
+// 需要刷新目录请工单联系技术支持 https://support.qiniu.com/tickets/category
+list($refreshResult, $refreshErr) = $cdnManager->refreshUrlsAndDirs($urls, $dirs);
+if ($refreshErr != null) {
+    var_dump($refreshErr);
+} else {
+    echo "refresh request sent\n";
+    print_r($refreshResult);
+}
+
+//如果只有刷新链接或者目录的需求，可以分布使用
+
+list($refreshResult, $refreshErr) = $cdnManager->refreshUrls($urls);
+if ($refreshErr != null) {
+    var_dump($refreshErr);
+} else {
+    echo "refresh request sent\n";
+    print_r($refreshResult);
+}
+
+list($refreshResult, $refreshErr) = $cdnManager->refreshDirs($dirs);
+if ($refreshErr != null) {
+    var_dump($refreshErr);
+} else {
+    echo "refresh request sent\n";
+    print_r($refreshResult);
+}

vendor/qiniu/php-sdk/examples/cdn_timestamp_antileech.php

@@ -0,0 +1,19 @@
+<?php
+
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Cdn\CdnManager;
+
+//创建时间戳防盗链
+//时间戳防盗链密钥，后台获取
+$encryptKey = 'your_domain_timestamp_antileech_encryptkey';
+
+//带访问协议的域名
+$url1 = 'http://phpsdk.qiniuts.com/24.jpg?avinfo';
+$url2 = 'http://phpsdk.qiniuts.com/24.jpg';
+
+//有效期时间（单位秒）
+$durationInSeconds = 3600;
+
+$signedUrl = CdnManager::createTimestampAntiLeechUrl($url1, $encryptKey, $durationInSeconds);
+print($signedUrl);

vendor/qiniu/php-sdk/examples/fetch.php

@@ -1,23 +0,0 @@
-<?php
-require_once __DIR__ . '/../autoload.php';
-
-use Qiniu\Auth;
-use Qiniu\Storage\BucketManager;
-
-$accessKey = 'Access_Key';
-$secretKey = 'Secret_Key';
-
-$auth = new Auth($accessKey, $secretKey);
-$bmgr = new BucketManager($auth);
-
-$url = 'http://php.net/favicon.ico';
-$bucket = 'Bucket_Name';
-$key = time() . '.ico';
-
-list($ret, $err) = $bmgr->fetch($url, $bucket, $key);
-echo "=====> fetch $url to bucket: $bucket  key: $key\n";
-if ($err !== null) {
-    var_dump($err);
-} else {
-    echo 'Success';
-}

vendor/qiniu/php-sdk/examples/file_copy.php

@@ -1,28 +0,0 @@
-<?php
-require_once __DIR__ . '/../autoload.php';
-
-use Qiniu\Auth;
-use Qiniu\Storage\BucketManager;
-
-$accessKey = 'Access_Key';
-$secretKey = 'Secret_Key';
-
-//初始化Auth状态：
-$auth = new Auth($accessKey, $secretKey);
-
-//初始化BucketManager
-$bucketMgr = new BucketManager($auth);
-
-//你要测试的空间， 并且这个key在你空间中存在
-$bucket = 'Bucket_Name';
-$key = 'php-logo.png';
-
-//将文件从文件$key 复制到文件$key2。 可以在不同bucket复制
-$key2 = 'php-logo2.png';
-$err = $bucketMgr->copy($bucket, $key, $bucket, $key2);
-echo "\n====> copy $key to $key2 : \n";
-if ($err !== null) {
-    var_dump($err);
-} else {
-    echo "Success!";
-}

vendor/qiniu/php-sdk/examples/file_delete.php

@@ -1,27 +0,0 @@
-<?php
-require_once __DIR__ . '/../autoload.php';
-
-use Qiniu\Auth;
-use Qiniu\Storage\BucketManager;
-
-$accessKey = 'Access_Key';
-$secretKey = 'Secret_Key';
-
-//初始化Auth状态：
-$auth = new Auth($accessKey, $secretKey);
-
-//初始化BucketManager
-$bucketMgr = new BucketManager($auth);
-
-//你要测试的空间， 并且这个key在你空间中存在
-$bucket = 'Bucket_Name';
-$key = 'php-logo.png';
-
-//删除$bucket 中的文件 $key
-$err = $bucketMgr->delete($bucket, $key);
-echo "\n====> delete $key : \n";
-if ($err !== null) {
-    var_dump($err);
-} else {
-    echo "Success!";
-}

vendor/qiniu/php-sdk/examples/file_move.php

@@ -1,28 +0,0 @@
-<?php
-require_once __DIR__ . '/../autoload.php';
-
-use Qiniu\Auth;
-use Qiniu\Storage\BucketManager;
-
-$accessKey = 'Access_Key';
-$secretKey = 'Secret_Key';
-
-//初始化Auth状态：
-$auth = new Auth($accessKey, $secretKey);
-
-//初始化BucketManager
-$bucketMgr = new BucketManager($auth);
-
-//你要测试的空间， 并且这个key在你空间中存在
-$bucket = 'Bucket_Name';
-$key = 'php-logo.png';
-
-//将文件从文件$key 改成文件名$key2。 可以在不同bucket移动
-$key3 = 'php-logo3.png';
-$err = $bucketMgr->move($bucket, $key2, $bucket, $key3);
-echo "\n====> move $key to $key2 : \n";
-if ($err !== null) {
-    var_dump($err);
-} else {
-    echo "Success!";
-}

vendor/qiniu/php-sdk/examples/file_stat.php

@@ -1,27 +0,0 @@
-<?php
-require_once __DIR__ . '/../autoload.php';
-
-use Qiniu\Auth;
-use Qiniu\Storage\BucketManager;
-
-$accessKey = 'Access_Key';
-$secretKey = 'Secret_Key';
-
-//初始化Auth状态：
-$auth = new Auth($accessKey, $secretKey);
-
-//初始化BucketManager
-$bucketMgr = new BucketManager($auth);
-
-//你要测试的空间， 并且这个key在你空间中存在
-$bucket = 'Bucket_Name';
-$key = 'php-logo.png';
-
-//获取文件的状态信息
-list($ret, $err) = $bucketMgr->stat($bucket, $key);
-echo "\n====> $key stat : \n";
-if ($err !== null) {
-    var_dump($err);
-} else {
-    var_dump($ret);
-}

vendor/qiniu/php-sdk/examples/notify.php

@@ -1,7 +0,0 @@
-<?php
-
-// 获取notify通知的body信息
-$notifyBody = file_get_contents('php://input');
-
-// 业务服务器处理通知信息， 这里直接打印在log中
-error_log($notifyBody);

vendor/qiniu/php-sdk/examples/pfop_mkzip.php

@@ -5,22 +5,20 @@ use Qiniu\Auth;
 use Qiniu\Processing\PersistentFop;
 
 // 去我们的portal 后台来获取AK, SK
-$accessKey = 'Access_Key';
+$accessKey = getenv('QINIU_ACCESS_KEY');
-$secretKey = 'Secret_Key';
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+$key = 'qiniu.png';
+
 $auth = new Auth($accessKey, $secretKey);
-
-
-$bucket = 'Bucket_Name';
-$key = '1.png';
-
 // 异步任务的队列， 去后台新建： https://portal.qiniu.com/mps/pipeline
-$pipeline = 'pipeline_name';
+$pipeline = 'sdktest';
 
-$pfop = new PersistentFop($auth, $bucket, $pipeline);
+$pfop = new PersistentFop($auth, null);
 
 // 进行zip压缩的url
-$url1 = 'http://rwxf.qiniudn.com/php-logo.png';
+$url1 = 'http://phpsdk.qiniudn.com/php-logo.png';
-$url2 = 'http://rwxf.qiniudn.com/1.png';
+$url2 = 'http://phpsdk.qiniudn.com/1.png';
 
 //压缩后的key
 $zipKey = 'test.zip';
@@ -29,14 +27,17 @@ $fops = 'mkzip/2/url/' . \Qiniu\base64_urlSafeEncode($url1);
 $fops .= '/url/' . \Qiniu\base64_urlSafeEncode($url2);
 $fops .= '|saveas/' . \Qiniu\base64_urlSafeEncode("$bucket:$zipKey");
 
-list($id, $err) = $pfop->execute($key, $fops);
+$notify_url = null;
+$force = false;
+
+list($id, $err) = $pfop->execute($bucket, $key, $fops, $pipeline, $notify_url, $force);
 
 echo "\n====> pfop mkzip result: \n";
 if ($err != null) {
     var_dump($err);
 } else {
     echo "PersistentFop Id: $id\n";
-    
+
     $res = "http://api.qiniu.com/status/get/prefop?id=$id";
     echo "Processing result: $res";
 }

vendor/qiniu/php-sdk/examples/pfop_vframe.php

@@ -5,26 +5,30 @@ use Qiniu\Auth;
 use Qiniu\Processing\PersistentFop;
 
 //对已经上传到七牛的视频发起异步转码操作 
-
+$accessKey = getenv('QINIU_ACCESS_KEY');
-$accessKey = 'Access_Key';
+$secretKey = getenv('QINIU_SECRET_KEY');
-$secretKey = 'Secret_Key';
+$bucket = getenv('QINIU_TEST_BUCKET');
 $auth = new Auth($accessKey, $secretKey);
 
 //要转码的文件所在的空间和文件名。
-$bucket = 'Bucket_Name';
+$key = 'qiniu.mp4';
-$key = 'File_Name_On_Qiniu';
 
 //转码是使用的队列名称。 https://portal.qiniu.com/mps/pipeline
-$pipeline = 'pipeline_name';
+$pipeline = 'sdktest';
 
 //转码完成后通知到你的业务服务器。
 $notifyUrl = 'http://375dec79.ngrok.com/notify.php';
-$pfop = new PersistentFop($auth, $bucket, $pipeline, $notifyUrl);
+$force = false;
+
+$config = new \Qiniu\Config();
+$config->useHTTPS = true;
+$pfop = new PersistentFop($auth, $config);
 
 //要进行视频截图操作
-$fops = "vframe/jpg/offset/1/w/480/h/360/rotate/90";
+$fops = "vframe/jpg/offset/1/w/480/h/360/rotate/90|saveas/" .
+    \Qiniu\base64_urlSafeEncode($bucket . ":qiniu_480x360.jpg");
 
-list($id, $err) = $pfop->execute($key, $fops);
+list($id, $err) = $pfop->execute($bucket, $key, $fops, $pipeline, $notifyUrl, $force);
 echo "\n====> pfop avthumb result: \n";
 if ($err != null) {
     var_dump($err);

vendor/qiniu/php-sdk/examples/pfop_video_avthumb.php

@@ -4,27 +4,32 @@ require_once __DIR__ . '/../autoload.php';
 use Qiniu\Auth;
 use Qiniu\Processing\PersistentFop;
 
-//对已经上传到七牛的视频发起异步转码操作 
+//对已经上传到七牛的视频发起异步转码操作
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
 
-$accessKey = 'Access_Key';
-$secretKey = 'Secret_Key';
 $auth = new Auth($accessKey, $secretKey);
 
 //要转码的文件所在的空间和文件名。
-$bucket = 'Bucket_Name';
+$key = 'qiniu.mp4';
-$key = 'File_Name_On_Qiniu';
 
 //转码是使用的队列名称。 https://portal.qiniu.com/mps/pipeline
-$pipeline = 'pipeline_name';
+$pipeline = 'sdktest';
+$force = false;
 
 //转码完成后通知到你的业务服务器。
 $notifyUrl = 'http://375dec79.ngrok.com/notify.php';
-$pfop = new PersistentFop($auth, $bucket, $pipeline, $notifyUrl);
+$config = new \Qiniu\Config();
+//$config->useHTTPS=true;
+
+$pfop = new PersistentFop($auth, $config);
 
 //要进行转码的转码操作。 http://developer.qiniu.com/docs/v6/api/reference/fop/av/avthumb.html
-$fops = "avthumb/mp4/s/640x360/vb/1.4m";
+$fops = "avthumb/mp4/s/640x360/vb/1.4m|saveas/" . \Qiniu\base64_urlSafeEncode($bucket . ":qiniu_640x360.mp4");
 
-list($id, $err) = $pfop->execute($key, $fops);
+list($id, $err) = $pfop->execute($bucket, $key, $fops, $pipeline, $notifyUrl, $force);
 echo "\n====> pfop avthumb result: \n";
 if ($err != null) {
     var_dump($err);

vendor/qiniu/php-sdk/examples/pfop_watermark.php

@@ -6,29 +6,35 @@ use Qiniu\Processing\PersistentFop;
 
 //对已经上传到七牛的视频发起异步转码操作 
 
-$accessKey = 'Access_Key';
+$accessKey = getenv('QINIU_ACCESS_KEY');
-$secretKey = 'Secret_Key';
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
 $auth = new Auth($accessKey, $secretKey);
 
 //要转码的文件所在的空间和文件名。
-$bucket = 'Bucket_Name';
+$key = 'qiniu.mp4';
-$key = 'File_Name_On_Qiniu';
 
 //转码是使用的队列名称。 https://portal.qiniu.com/mps/pipeline
-$pipeline = 'pipeline_name';
+$pipeline = 'sdktest';
 
 //转码完成后通知到你的业务服务器。
 $notifyUrl = 'http://375dec79.ngrok.com/notify.php';
-$pfop = new PersistentFop($auth, $bucket, $pipeline, $notifyUrl);
+$force = false;
+
+$config = new \Qiniu\Config();
+//$config->useHTTPS=true;
+$pfop = new PersistentFop($auth, $config);
 
 //需要添加水印的图片UrlSafeBase64
 //可以参考http://developer.qiniu.com/code/v6/api/dora-api/av/video-watermark.html
-$base64URL = Qiniu\base64_urlSafeEncode('http://developer.qiniu.com/resource/logo-2.jpg');
+$base64URL = Qiniu\base64_urlSafeEncode('http://devtools.qiniu.com/qiniu.png');
 
 //水印参数
-$fops = "avthumb/mp4/s/640x360/vb/1.4m/image/".$base64URL;
+$fops = "avthumb/mp4/s/640x360/vb/1.4m/image/" . $base64URL . "|saveas/"
+    . \Qiniu\base64_urlSafeEncode($bucket . ":qiniu_wm.mp4");
 
-list($id, $err) = $pfop->execute($key, $fops);
+list($id, $err) = $pfop->execute($bucket, $key, $fops, $pipeline, $notifyUrl, $force);
 echo "\n====> pfop avthumb result: \n";
 if ($err != null) {
     var_dump($err);

vendor/qiniu/php-sdk/examples/prefop.php

@@ -0,0 +1,29 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use Qiniu\Auth;
+use Qiniu\Processing\PersistentFop;
+
+$accessKey = 'Access_Key';
+$secretKey = 'Secret_Key';
+$auth = new Auth($accessKey, $secretKey);
+
+//要持久化处理的文件所在的空间和文件名。
+$bucket = 'Bucket_Name';
+
+//持久化处理使用的队列名称。 https://portal.qiniu.com/mps/pipeline
+$pipeline = 'pipeline_name';
+
+//持久化处理完成后通知到你的业务服务器。
+$notifyUrl = 'http://375dec79.ngrok.com/notify.php';
+$pfop = new PersistentFop($auth, $bucket, $pipeline, $notifyUrl);
+
+$id = "z2.5955c739e3d0041bf80c9baa";
+//查询持久化处理的进度和状态
+list($ret, $err) = $pfop->status($id);
+echo "\n====> pfop avthumb status: \n";
+if ($err != null) {
+    var_dump($err);
+} else {
+    var_dump($ret);
+}

vendor/qiniu/php-sdk/examples/qetag.php

@@ -2,9 +2,10 @@
 require_once __DIR__ . '/../autoload.php';
 use Qiniu\Etag;
 
-list($etag, $err) = Etag::sum(__file__);
+$localFile = "/Users/jemy/Documents/qiniu.mp4";
+list($etag, $err) = Etag::sum($localFile);
 if ($err == null) {
-    echo  "Etag: $etag";
+    echo "Etag: $etag";
 } else {
     var_dump($err);
 }

vendor/qiniu/php-sdk/examples/rs_batch_change_mime.php

@@ -0,0 +1,28 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+
+//每次最多不能超过1000个
+$keyMimePairs = array(
+    'qiniu.mp4' => 'video/x-mp4',
+    'qiniu.png' => 'image/x-png',
+    'qiniu.jpg' => 'image/x-jpg'
+);
+
+$ops = $bucketManager->buildBatchChangeMime($bucket, $keyMimePairs);
+list($ret, $err) = $bucketManager->batch($ops);
+if ($err) {
+    print_r($err);
+} else {
+    print_r($ret);
+}

vendor/qiniu/php-sdk/examples/rs_batch_change_type.php

@@ -0,0 +1,34 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+
+//每次最多不能超过1000个
+$keys = array(
+    'qiniu.mp4',
+    'qiniu.png',
+    'qiniu.jpg'
+);
+
+$keyTypePairs = array();
+//type=0表示普通存储，type=1表示低频存储
+foreach ($keys as $key) {
+    $keyTypePairs[$key] = 1;
+}
+
+$ops = $bucketManager->buildBatchChangeType($bucket, $keyTypePairs);
+list($ret, $err) = $bucketManager->batch($ops);
+if ($err) {
+    print_r($err);
+} else {
+    print_r($ret);
+}

vendor/qiniu/php-sdk/examples/rs_batch_copy.php

@@ -0,0 +1,36 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+
+//每次最多不能超过1000个
+$keys = array(
+    'qiniu.mp4',
+    'qiniu.png',
+    'qiniu.jpg'
+);
+
+$keyPairs = array();
+foreach ($keys as $key) {
+    $keyPairs[$key] = $key . "_copy";
+}
+
+$srcBucket = $bucket;
+$destBucket = $bucket;
+
+$ops = $bucketManager->buildBatchCopy($srcBucket, $keyPairs, $destBucket, true);
+list($ret, $err) = $bucketManager->batch($ops);
+if ($err) {
+    print_r($err);
+} else {
+    print_r($ret);
+}

vendor/qiniu/php-sdk/examples/rs_batch_delete.php

@@ -0,0 +1,28 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+
+//每次最多不能超过1000个
+$keys = array(
+    'qiniu.mp4',
+    'qiniu.png',
+    'qiniu.jpg'
+);
+
+$ops = $bucketManager->buildBatchDelete($bucket, $keys);
+list($ret, $err) = $bucketManager->batch($ops);
+if ($err) {
+    print_r($err);
+} else {
+    print_r($ret);
+}

vendor/qiniu/php-sdk/examples/rs_batch_delete_after_days.php

@@ -0,0 +1,34 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+
+//每次最多不能超过1000个
+$keys = array(
+    'qiniu.mp4',
+    'qiniu.png',
+    'qiniu.jpg'
+);
+
+$keyDayPairs = array();
+//day=0表示永久存储
+foreach ($keys as $key) {
+    $keyDayPairs[$key] = 0;
+}
+
+$ops = $bucketManager->buildBatchDeleteAfterDays($bucket, $keyDayPairs);
+list($ret, $err) = $bucketManager->batch($ops);
+if ($err) {
+    print_r($err);
+} else {
+    print_r($ret);
+}

vendor/qiniu/php-sdk/examples/rs_batch_move.php

@@ -0,0 +1,36 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+
+//每次最多不能超过1000个
+$keys = array(
+    'qiniu.mp4',
+    'qiniu.png',
+    'qiniu.jpg'
+);
+
+$keyPairs = array();
+foreach ($keys as $key) {
+    $keyPairs[$key . "_copy"] = $key . "_move";
+}
+
+$srcBucket = $bucket;
+$destBucket = $bucket;
+
+$ops = $bucketManager->buildBatchMove($srcBucket, $keyPairs, $destBucket, true);
+list($ret, $err) = $bucketManager->batch($ops);
+if ($err) {
+    print_r($err);
+} else {
+    print_r($ret);
+}

vendor/qiniu/php-sdk/examples/rs_batch_stat.php

@@ -0,0 +1,28 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+
+//每次最多不能超过1000个
+$keys = array(
+    'qiniu.mp4',
+    'qiniu.png',
+    'qiniu.jpg'
+);
+
+$ops = $bucketManager->buildBatchStat($bucket, $keys);
+list($ret, $err) = $bucketManager->batch($ops);
+if ($err) {
+    print_r($err);
+} else {
+    print_r($ret);
+}

vendor/qiniu/php-sdk/examples/rs_bucket_domains.php

@@ -0,0 +1,19 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+list($domains, $err) = $bucketManager->domains($bucket);
+if ($err) {
+    print_r($err);
+} else {
+    print_r($domains);
+}

vendor/qiniu/php-sdk/examples/rs_buckets.php

@@ -0,0 +1,19 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+list($buckets, $err) = $bucketManager->buckets(true);
+if ($err) {
+    print_r($err);
+} else {
+    print_r($buckets);
+}

vendor/qiniu/php-sdk/examples/rs_change_mime.php

@@ -0,0 +1,20 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+$key = 'qiniu.mp4';
+$newMime = 'video/x-mp4';
+
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+
+$err = $bucketManager->changeMime($bucket, $key, $newMime);
+if ($err) {
+    print_r($err);
+}

vendor/qiniu/php-sdk/examples/rs_change_type.php

@@ -0,0 +1,20 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+$key = "qiniu.mp4";
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+
+$fileType = 1;//0 表示普通存储，1表示低频存储
+
+$err = $bucketManager->changeType($bucket, $key, $fileType);
+if ($err) {
+    print_r($err);
+}

vendor/qiniu/php-sdk/examples/rs_copy.php

@@ -0,0 +1,22 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+$key = "qiniu.mp4";
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+
+$srcBucket = $bucket;
+$destBucket = $bucket;
+$srcKey = $key;
+$destKey = $key . "_copy";
+$err = $bucketManager->copy($srcBucket, $srcKey, $destBucket, $destKey, true);
+if ($err) {
+    print_r($err);
+}

vendor/qiniu/php-sdk/examples/rs_delete.php

@@ -0,0 +1,17 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+$key = "qiniu.mp4_copy";
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+$err = $bucketManager->delete($bucket, $key);
+if ($err) {
+    print_r($err);
+}

vendor/qiniu/php-sdk/examples/rs_delete_after_days.php

@@ -0,0 +1,20 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+$key = 'qiniu.mp4';
+$days = 10;
+
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+
+$err = $bucketManager->deleteAfterDays($bucket, $key, $days);
+if ($err) {
+    print_r($err);
+}

vendor/qiniu/php-sdk/examples/rs_download_urls.php

@@ -3,14 +3,14 @@ require_once __DIR__ . '/../autoload.php';
 
 use Qiniu\Auth;
 
-$accessKey = 'Access_Key';
+$accessKey = getenv('QINIU_ACCESS_KEY');
-$secretKey = 'Secret_Key';
+$secretKey = getenv('QINIU_SECRET_KEY');
 
 // 构建Auth对象
 $auth = new Auth($accessKey, $secretKey);
 
 // 私有空间中的外链 http://<domain>/<file_key>
-$baseUrl = 'http://sslayer.qiniudn.com/1.jpg?imageView2/1/h/500';
+$baseUrl = 'http://if-pri.qiniudn.com/qiniu.png?imageView2/1/h/500';
 // 对链接进行签名
 $signedUrl = $auth->privateDownloadUrl($baseUrl);
 

vendor/qiniu/php-sdk/examples/rs_fetch.php

@@ -0,0 +1,34 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use Qiniu\Auth;
+use Qiniu\Storage\BucketManager;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+$auth = new Auth($accessKey, $secretKey);
+$bucketManager = new BucketManager($auth);
+
+$url = 'http://devtools.qiniu.com/qiniu.png';
+$key = time() . '.png';
+
+// 指定抓取的文件保存名称
+list($ret, $err) = $bucketManager->fetch($url, $bucket, $key);
+echo "=====> fetch $url to bucket: $bucket  key: $key\n";
+if ($err !== null) {
+    var_dump($err);
+} else {
+    print_r($ret);
+}
+
+// 不指定key时，以文件内容的hash作为文件名
+$key = null;
+list($ret, $err) = $bucketManager->fetch($url, $bucket, $key);
+echo "=====> fetch $url to bucket: $bucket  key: $(etag)\n";
+if ($err !== null) {
+    var_dump($err);
+} else {
+    print_r($ret);
+}

vendor/qiniu/php-sdk/examples/rs_move.php

@@ -0,0 +1,22 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+$key = "qiniu.mp4";
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+
+$srcBucket = $bucket;
+$destBucket = $bucket;
+$srcKey = $key . "_copy";
+$destKey = $key . "_move";
+$err = $bucketManager->move($srcBucket, $srcKey, $destBucket, $destKey, true);
+if ($err) {
+    print_r($err);
+}

vendor/qiniu/php-sdk/examples/rs_prefetch.php

@@ -0,0 +1,17 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+$key = "qiniu.mp4";
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+$err = $bucketManager->prefetch($bucket, $key);
+if ($err) {
+    print_r($err);
+}

vendor/qiniu/php-sdk/examples/rs_stat.php

@@ -0,0 +1,19 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+$key = "qiniu.mp4";
+$auth = new Auth($accessKey, $secretKey);
+$config = new \Qiniu\Config();
+$bucketManager = new \Qiniu\Storage\BucketManager($auth, $config);
+list($fileInfo, $err) = $bucketManager->stat($bucket, $key);
+if ($err) {
+    print_r($err);
+} else {
+    print_r($fileInfo);
+}

vendor/qiniu/php-sdk/examples/rsf_list_bucket.php

@@ -0,0 +1,46 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use Qiniu\Auth;
+use Qiniu\Storage\BucketManager;
+
+// http://developer.qiniu.com/docs/v6/api/reference/rs/list.html#list-description
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+$auth = new Auth($accessKey, $secretKey);
+$bucketManager = new BucketManager($auth);
+
+
+// 要列取文件的公共前缀
+$prefix = '';
+
+// 上次列举返回的位置标记，作为本次列举的起点信息。
+$marker = '';
+
+// 本次列举的条目数
+$limit = 200;
+
+$delimiter = '/';
+
+// 列举文件
+do {
+    list($ret, $err) = $bucketManager->listFiles($bucket, $prefix, $marker, $limit, $delimiter);
+    if ($err !== null) {
+        echo "\n====> list file err: \n";
+        var_dump($err);
+    } else {
+        $marker = null;
+        if (array_key_exists('marker', $ret)) {
+            $marker = $ret['marker'];
+        }
+        echo "Marker: $marker\n";
+        echo "\nList Items====>\n";
+        //var_dump($ret['items']);
+        print('items count:' . count($ret['items']) . "\n");
+        if (array_key_exists('commonPrefixes', $ret)) {
+            print_r($ret['commonPrefixes']);
+        }
+    }
+} while (!empty($marker));

vendor/qiniu/php-sdk/examples/rsf_list_files.php

@@ -4,14 +4,14 @@ require_once __DIR__ . '/../autoload.php';
 use Qiniu\Auth;
 use Qiniu\Storage\BucketManager;
 
-$accessKey = 'Access_Key';
-$secretKey = 'Secret_Key';
-$auth = new Auth($accessKey, $secretKey);
-$bucketMgr = new BucketManager($auth);
-
 // http://developer.qiniu.com/docs/v6/api/reference/rs/list.html#list-description
-// 要列取的空间名称
+
-$bucket = 'Bucket_Name';
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+$auth = new Auth($accessKey, $secretKey);
+$bucketManager = new BucketManager($auth);
+
 
 // 要列取文件的公共前缀
 $prefix = '';
@@ -20,15 +20,19 @@ $prefix = '';
 $marker = '';
 
 // 本次列举的条目数
-$limit = 3;
+$limit = 100;
+
+$delimiter = '/';
 
 // 列举文件
-list($iterms, $marker, $err) = $bucketMgr->listFiles($bucket, $prefix, $marker, $limit);
+list($ret, $err) = $bucketManager->listFiles($bucket, $prefix, $marker, $limit, $delimiter);
 if ($err !== null) {
     echo "\n====> list file err: \n";
     var_dump($err);
 } else {
-    echo "Marker: $marker\n";
+    if (array_key_exists('marker', $ret)) {
+        echo "Marker:" . $ret["marker"] . "\n";
+    }
     echo "\nList Iterms====>\n";
-    var_dump($iterms);
+    //var_dump($ret['items']);
 }

vendor/qiniu/php-sdk/examples/saveas.php

@@ -0,0 +1,28 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use Qiniu\Auth;
+use Qiniu\Processing\PersistentFop;
+
+// 后台来获取AK, SK
+$accessKey = 'Access_Key';
+$secretKey = 'Secret_Key';
+
+//生成EncodedEntryURI的值
+$entry = '<bucket>:<Key>';//<Key>为生成缩略图的文件名
+//生成的值
+$encodedEntryURI = \Qiniu\base64_urlSafeEncode($entry);
+
+//使用SecretKey对新的下载URL进行HMAC1-SHA1签名
+$newurl = "78re52.com1.z0.glb.clouddn.com/resource/Ship.jpg?imageView2/2/w/200/h/200|saveas/" . $encodedEntryURI;
+
+$sign = hash_hmac("sha1", $newurl, $secretKey, true);
+
+//对签名进行URL安全的Base64编码
+$encodedSign = \Qiniu\base64_urlSafeEncode($sign);
+//最终得到的完整下载URL
+$finalURL = "http://" . $newurl . "/sign/" . $accessKey . ":" . $encodedSign;
+
+$callbackBody = file_get_contents("$finalURL");
+
+echo $callbackBody;

vendor/qiniu/php-sdk/examples/upload_and_callback.php

@@ -4,15 +4,15 @@ require_once __DIR__ . '/../autoload.php';
 use Qiniu\Auth;
 use Qiniu\Storage\UploadManager;
 
-$accessKey = 'Access_Key';
+$accessKey = getenv('QINIU_ACCESS_KEY');
-$secretKey = 'Secret_Key';
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
 $auth = new Auth($accessKey, $secretKey);
 
-$bucket = 'Bucket_Name';
 // 上传文件到七牛后， 七牛将文件名和文件大小回调给业务服务器.
 // 可参考文档: http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html
 $policy = array(
-    'callbackUrl' => 'http://your.domain.com/callback.php',
+    'callbackUrl' => 'http://your.domain.com/upload_verify_callback.php',
     'callbackBody' => 'filename=$(fname)&filesize=$(fsize)'
 );
 $uptoken = $auth->uploadToken($bucket, null, 3600, $policy);

vendor/qiniu/php-sdk/examples/upload_and_pfop.php

@@ -4,25 +4,24 @@ require_once __DIR__ . '/../autoload.php';
 use Qiniu\Auth;
 use Qiniu\Storage\UploadManager;
 
-$accessKey = 'Access_Key';
+$accessKey = getenv('QINIU_ACCESS_KEY');
-$secretKey = 'Secret_Key';
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
 $auth = new Auth($accessKey, $secretKey);
 
-$bucket = 'Bucket_Name';
+
 // 在七牛保存的文件名
 $key = 'php-logo.png';
 $token = $auth->uploadToken($bucket);
 $uploadMgr = new UploadManager();
 
-//上传视频，上传完成后进行m3u8的转码， 并给视频打水印
+$pfop = "imageMogr2/rotate/90|saveas/" . \Qiniu\base64_urlSafeEncode($bucket . ":php-logo-rotate.png");
-$wmImg = Qiniu\base64_urlSafeEncode('http://Bucket_Name.qiniudn.com/logo-s.png');
-$pfop = "avthumb/m3u8/wmImage/$wmImg";
 
 //转码完成后通知到你的业务服务器。（公网可以访问，并相应200 OK）
 $notifyUrl = 'http://notify.fake.com';
 
 //独立的转码队列：https://portal.qiniu.com/mps/pipeline
-$pipeline = 'pipeline_name';
+$pipeline = 'sdktest';
 
 $policy = array(
     'persistentOps' => $pfop,

vendor/qiniu/php-sdk/examples/upload_multi_demos.php

@@ -4,11 +4,12 @@ require_once __DIR__ . '/../autoload.php';
 use Qiniu\Auth;
 use Qiniu\Storage\UploadManager;
 
-$accessKey = 'Access_Key';
+$accessKey = getenv('QINIU_ACCESS_KEY');
-$secretKey = 'Secret_Key';
+$secretKey = getenv('QINIU_SECRET_KEY');
-$auth = new Auth($accessKey, $secretKey);
+$bucket = getenv('QINIU_TEST_BUCKET');
+$pipeline = 'sdktest';
 
-$bucket = 'Bucket_Name';
+$auth = new Auth($accessKey, $secretKey);
 $token = $auth->uploadToken($bucket);
 $uploadMgr = new UploadManager();
 
@@ -40,7 +41,7 @@ if ($err !== null) {
 // 上传文件到七牛后， 七牛将文件名和文件大小回调给业务服务器.
 // 可参考文档: http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html
 $policy = array(
-    'callbackUrl' => 'http://172.30.251.210/callback.php',
+    'callbackUrl' => 'http://172.30.251.210/upload_verify_callback.php',
     'callbackBody' => 'filename=$(fname)&filesize=$(fsize)'
 //  'callbackBodyType' => 'application/json',                       
 //  'callbackBody' => '{"filename":$(fname), "filesize": $(fsize)}'  //设置application/json格式回调
@@ -59,14 +60,14 @@ if ($err !== null) {
 
 //----------------------------------------upload demo4 ----------------------------------------
 //上传视频，上传完成后进行m3u8的转码， 并给视频打水印
-$wmImg = Qiniu\base64_urlSafeEncode('http://Bucket_Name.qiniudn.com/logo-s.png');
+$wmImg = Qiniu\base64_urlSafeEncode('http://devtools.qiniudn.com/qiniu.png');
 $pfop = "avthumb/m3u8/wmImage/$wmImg";
 
 //转码完成后回调到业务服务器。（公网可以访问，并相应200 OK）
 $notifyUrl = 'http://notify.fake.com';
 
 //独立的转码队列：https://portal.qiniu.com/mps/pipeline
-$pipeline = 'abc';
+
 
 $policy = array(
     'persistentOps' => $pfop,
@@ -74,7 +75,7 @@ $policy = array(
     'persistentPipeline' => $pipeline
 );
 $token = $auth->uploadToken($bucket, null, 3600, $policy);
-
+print($token);
 list($ret, $err) = $uploadMgr->putFile($token, null, $key);
 echo "\n====> putFile result: \n";
 if ($err !== null) {

vendor/qiniu/php-sdk/examples/upload_simple_file.php

@@ -8,15 +8,13 @@ use Qiniu\Auth;
 use Qiniu\Storage\UploadManager;
 
 // 需要填写你的 Access Key 和 Secret Key
-$accessKey = 'Access_Key';
+$accessKey = getenv('QINIU_ACCESS_KEY');
-$secretKey = 'Secret_Key';
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
 
 // 构建鉴权对象
 $auth = new Auth($accessKey, $secretKey);
 
-// 要上传的空间
-$bucket = 'Bucket_Name';
-
 // 生成上传 Token
 $token = $auth->uploadToken($bucket);
 

vendor/qiniu/php-sdk/examples/upload_token.php

@@ -1,13 +0,0 @@
-<?php
-require_once __DIR__ . '/../autoload.php';
-
-use Qiniu\Auth;
-
-$accessKey = 'Access_Key';
-$secretKey = 'Secret_Key';
-$auth = new Auth($accessKey, $secretKey);
-
-$bucket = 'Bucket_Name';
-$upToken = $auth->uploadToken($bucket);
-
-echo $upToken;

vendor/qiniu/php-sdk/examples/upload_tokens.php

@@ -0,0 +1,68 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use \Qiniu\Auth;
+
+$accessKey = getenv('QINIU_ACCESS_KEY');
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
+// 初始化Auth状态
+$auth = new Auth($accessKey, $secretKey);
+
+// 简单上传凭证
+$expires = 3600;
+
+$policy = null;
+$upToken = $auth->uploadToken($bucket, null, $expires, $policy, true);
+print($upToken . "\n");
+
+// 自定义凭证有效期（示例2小时）
+$expires = 7200;
+$upToken = $auth->uploadToken($bucket, null, $expires, $policy, true);
+print($upToken . "\n");
+
+// 覆盖上传凭证
+$expires = 3600;
+$keyToOverwrite = 'qiniu.mp4';
+$upToken = $auth->uploadToken($bucket, $keyToOverwrite, $expires, $policy, true);
+print($upToken . "\n");
+
+//自定义上传回复（非callback模式）凭证
+$returnBody = '{"key":"$(key)","hash":"$(etag)","fsize":$(fsize),"bucket":"$(bucket)","name":"$(x:name)"}';
+$policy = array(
+    'returnBody' => $returnBody
+);
+$upToken = $auth->uploadToken($bucket, null, $expires, $policy, true);
+print($upToken . "\n");
+
+//带回调业务服务器的凭证（application/json）
+$policy = array(
+    'callbackUrl' => 'http://api.example.com/qiniu/upload/callback',
+    'callbackBody' => '{"key":"$(key)","hash":"$(etag)","fsize":$(fsize),"bucket":"$(bucket)","name":"$(x:name)"}',
+    'callbackBodyType' => 'application/json'
+);
+$upToken = $auth->uploadToken($bucket, null, $expires, $policy, true);
+print($upToken . "\n");
+
+
+//带回调业务服务器的凭证（application/x-www-form-urlencoded）
+$policy = array(
+    'callbackUrl' => 'http://api.example.com/qiniu/upload/callback',
+    'callbackBody' => 'key=$(key)&hash=$(etag)&bucket=$(bucket)&fsize=$(fsize)&name=$(x:name)'
+);
+$upToken = $auth->uploadToken($bucket, null, $expires, $policy, true);
+print($upToken . "\n");
+
+//带数据处理的凭证
+$saveMp4Entry = \Qiniu\base64_urlSafeEncode($bucket . ":avthumb_test_target.mp4");
+$saveJpgEntry = \Qiniu\base64_urlSafeEncode($bucket . ":vframe_test_target.jpg");
+$avthumbMp4Fop = "avthumb/mp4|saveas/" . $saveMp4Entry;
+$vframeJpgFop = "vframe/jpg/offset/1|saveas/" . $saveJpgEntry;
+$policy = array(
+    'persistentOps' => $avthumbMp4Fop . ";" . $vframeJpgFop,
+    'persistentPipeline' => "video-pipe",
+    'persistentNotifyUrl' => "http://api.example.com/qiniu/pfop/notify",
+);
+$upToken = $auth->uploadToken($bucket, null, $expires, $policy, true);
+print($upToken . "\n");

vendor/qiniu/php-sdk/examples/upload_verify_callback.php

@@ -3,8 +3,10 @@ require_once __DIR__ . '/../autoload.php';
 
 use Qiniu\Auth;
 
-$accessKey = 'Access_Key';
+$accessKey = getenv('QINIU_ACCESS_KEY');
-$secretKey = 'Secret_Key';
+$secretKey = getenv('QINIU_SECRET_KEY');
+$bucket = getenv('QINIU_TEST_BUCKET');
+
 $auth = new Auth($accessKey, $secretKey);
 
 //获取回调的body信息
@@ -17,7 +19,7 @@ $contentType = 'application/x-www-form-urlencoded';
 $authorization = $_SERVER['HTTP_AUTHORIZATION'];
 
 //七牛回调的url，具体可以参考：http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html
-$url = 'http://172.30.251.210/callback.php';
+$url = 'http://172.30.251.210/upload_verify_callback.php';
 
 $isQiniuCallback = $auth->verifyCallback($contentType, $authorization, $url, $callbackBody);
 

vendor/qiniu/php-sdk/src/Qiniu/Auth.php

@@ -1,7 +1,6 @@
 <?php
 namespace Qiniu;
 
-use Qiniu;
 use Qiniu\Zone;
 
 final class Auth
@@ -28,8 +27,8 @@ final class Auth
 
     public function signWithData($data)
     {
-        $data = \Qiniu\base64_urlSafeEncode($data);
+        $encodedData = \Qiniu\base64_urlSafeEncode($data);
-        return $this->sign($data) . ':' . $data;
+        return $this->sign($encodedData) . ':' . $encodedData;
     }
 
     public function signRequest($urlString, $body, $contentType = null)
@@ -77,28 +76,18 @@ final class Auth
         $key = null,
         $expires = 3600,
         $policy = null,
-        $strictPolicy = true,
+        $strictPolicy = true
-        Zone $zone = null
     ) {
         $deadline = time() + $expires;
         $scope = $bucket;
         if ($key !== null) {
             $scope .= ':' . $key;
         }
-        $args = array();
+
         $args = self::copyPolicy($args, $policy, $strictPolicy);
         $args['scope'] = $scope;
         $args['deadline'] = $deadline;
 
-        if ($zone === null) {
-            $zone = new Zone();
-        }
-
-        list($upHosts, $err) = $zone->getUpHosts($this->accessKey, $bucket);
-        if ($err === null) {
-            $args['upHosts'] = $upHosts;
-        }
-        
         $b = json_encode($args);
         return $this->signWithData($b);
     }
@@ -129,14 +118,10 @@ final class Auth
         'persistentOps',
         'persistentNotifyUrl',
         'persistentPipeline',
-        
+
         'deleteAfterDays',
-
+        'fileType',
-        'upHosts',
+        'isPrefixalScope',
-    );
-
-    private static $deprecatedPolicyFields = array(
-        'asyncOps',
     );
 
     private static function copyPolicy(&$policy, $originPolicy, $strictPolicy)
@@ -145,10 +130,7 @@ final class Auth
             return array();
         }
         foreach ($originPolicy as $key => $value) {
-            if (in_array((string) $key, self::$deprecatedPolicyFields, true)) {
+            if (!$strictPolicy || in_array((string)$key, self::$policyFields, true)) {
-                throw new \InvalidArgumentException("{$key} has deprecated");
-            }
-            if (!$strictPolicy || in_array((string) $key, self::$policyFields, true)) {
                 $policy[$key] = $value;
             }
         }

vendor/qiniu/php-sdk/src/Qiniu/Cdn/CdnManager.php

@@ -0,0 +1,190 @@
+<?php
+
+namespace Qiniu\Cdn;
+
+use Qiniu\Auth;
+use Qiniu\Http\Error;
+use Qiniu\Http\Client;
+
+final class CdnManager
+{
+
+    private $auth;
+    private $server;
+
+    public function __construct(Auth $auth)
+    {
+        $this->auth = $auth;
+        $this->server = 'http://fusion.qiniuapi.com';
+    }
+
+    /**
+     * @param array $urls 待刷新的文件链接数组
+     * @return array
+     */
+    public function refreshUrls(array $urls)
+    {
+        return $this->refreshUrlsAndDirs($urls, array());
+    }
+
+    /**
+     * @param array $dirs 待刷新的文件链接数组
+     * @return array
+     * 目前客户默认没有目录刷新权限，刷新会有400038报错，参考：https://developer.qiniu.com/fusion/api/1229/cache-refresh
+     * 需要刷新目录请工单联系技术支持 https://support.qiniu.com/tickets/category
+     */
+    public function refreshDirs(array $dirs)
+    {
+        return $this->refreshUrlsAndDirs(array(), $dirs);
+    }
+
+    /**
+     * @param array $urls 待刷新的文件链接数组
+     * @param array $dirs 待刷新的目录链接数组
+     *
+     * @return array 刷新的请求回复和错误，参考 examples/cdn_manager.php 代码
+     * @link http://developer.qiniu.com/article/fusion/api/refresh.html
+     *
+     * 目前客户默认没有目录刷新权限，刷新会有400038报错，参考：https://developer.qiniu.com/fusion/api/1229/cache-refresh
+     * 需要刷新目录请工单联系技术支持 https://support.qiniu.com/tickets/category
+     */
+    public function refreshUrlsAndDirs(array $urls, array  $dirs)
+    {
+        $req = array();
+        if (!empty($urls)) {
+            $req['urls'] = $urls;
+        }
+        if (!empty($dirs)) {
+            $req['dirs'] = $dirs;
+        }
+
+        $url = $this->server . '/v2/tune/refresh';
+        $body = json_encode($req);
+        return $this->post($url, $body);
+    }
+
+    /**
+     * @param array $urls 待预取的文件链接数组
+     *
+     * @return array 预取的请求回复和错误，参考 examples/cdn_manager.php 代码
+     *
+     * @link http://developer.qiniu.com/article/fusion/api/refresh.html
+     */
+    public function prefetchUrls(array $urls)
+    {
+        $req = array(
+            'urls' => $urls,
+        );
+
+        $url = $this->server . '/v2/tune/prefetch';
+        $body = json_encode($req);
+        return $this->post($url, $body);
+    }
+
+    /**
+     * @param array $domains 待获取带宽数据的域名数组
+     * @param string $startDate 开始的日期，格式类似 2017-01-01
+     * @param string $endDate 结束的日期，格式类似 2017-01-01
+     * @param string $granularity 获取数据的时间间隔，可以是 5min, hour 或者 day
+     *
+     * @return array 带宽数据和错误信息，参考 examples/cdn_manager.php 代码
+     *
+     * @link http://developer.qiniu.com/article/fusion/api/traffic-bandwidth.html
+     */
+    public function getBandwidthData(array $domains, $startDate, $endDate, $granularity)
+    {
+        $req = array();
+        $req['domains'] = implode(';', $domains);
+        $req['startDate'] = $startDate;
+        $req['endDate'] = $endDate;
+        $req['granularity'] = $granularity;
+
+        $url = $this->server . '/v2/tune/bandwidth';
+        $body = json_encode($req);
+        return $this->post($url, $body);
+    }
+
+    /**
+     * @param array $domains 待获取流量数据的域名数组
+     * @param string $startDate 开始的日期，格式类似 2017-01-01
+     * @param string $endDate 结束的日期，格式类似 2017-01-01
+     * @param string $granularity 获取数据的时间间隔，可以是 5min, hour 或者 day
+     *
+     * @return array 流量数据和错误信息，参考 examples/cdn_manager.php 代码
+     *
+     * @link http://developer.qiniu.com/article/fusion/api/traffic-bandwidth.html
+     */
+    public function getFluxData(array $domains, $startDate, $endDate, $granularity)
+    {
+        $req = array();
+        $req['domains'] = implode(';', $domains);
+        $req['startDate'] = $startDate;
+        $req['endDate'] = $endDate;
+        $req['granularity'] = $granularity;
+
+        $url = $this->server . '/v2/tune/flux';
+        $body = json_encode($req);
+        return $this->post($url, $body);
+    }
+
+    /**
+     * @param array $domains 待获取日志下载链接的域名数组
+     * @param string $logDate 获取指定日期的日志下载链接，格式类似 2017-01-01
+     *
+     * @return array 日志下载链接数据和错误信息，参考 examples/cdn_manager.php 代码
+     *
+     * @link http://developer.qiniu.com/article/fusion/api/log.html
+     */
+    public function getCdnLogList(array $domains, $logDate)
+    {
+        $req = array();
+        $req['domains'] = implode(';', $domains);
+        $req['day'] = $logDate;
+
+        $url = $this->server . '/v2/tune/log/list';
+        $body = json_encode($req);
+        return $this->post($url, $body);
+    }
+
+    private function post($url, $body)
+    {
+        $headers = $this->auth->authorization($url, $body, 'application/json');
+        $headers['Content-Type'] = 'application/json';
+        $ret = Client::post($url, $body, $headers);
+        if (!$ret->ok()) {
+            return array(null, new Error($url, $ret));
+        }
+        $r = ($ret->body === null) ? array() : $ret->json();
+        return array($r, null);
+    }
+
+    /**
+     * 构建时间戳防盗链鉴权的访问外链
+     *
+     * @param string $rawUrl 需要签名的资源url
+     * @param string $encryptKey 时间戳防盗链密钥
+     * @param string $durationInSeconds 链接的有效期（以秒为单位）
+     *
+     * @return string 带鉴权信息的资源外链，参考 examples/cdn_timestamp_antileech.php 代码
+     */
+    public static function createTimestampAntiLeechUrl($rawUrl, $encryptKey, $durationInSeconds)
+    {
+
+        $parsedUrl = parse_url($rawUrl);
+
+        $deadline = time() + $durationInSeconds;
+        $expireHex = dechex($deadline);
+        $path = isset($parsedUrl['path']) ? $parsedUrl['path'] : '';
+
+        $strToSign = $encryptKey . $path . $expireHex;
+        $signStr = md5($strToSign);
+
+        if (isset($parsedUrl['query'])) {
+            $signedUrl = $rawUrl . '&sign=' . $signStr . '&t=' . $expireHex;
+        } else {
+            $signedUrl = $rawUrl . '?sign=' . $signStr . '&t=' . $expireHex;
+        }
+
+        return $signedUrl;
+    }
+}

vendor/qiniu/php-sdk/src/Qiniu/Config.php

@@ -1,25 +1,134 @@
 <?php
 namespace Qiniu;
 
-use Qiniu\Zone;
-
 final class Config
 {
-    const SDK_VER = '7.1.3';
+    const SDK_VER = '7.2.1';
 
     const BLOCK_SIZE = 4194304; //4*1024*1024 分块上传块大小，该参数为接口规格，不能修改
 
-    const RS_HOST  = 'http://rs.qbox.me';               // 文件元信息管理操作Host
+    const RSF_HOST = 'rsf.qiniu.com';
-    const RSF_HOST = 'http://rsf.qbox.me';              // 列举操作Host
+    const API_HOST = 'api.qiniu.com';
-    const API_HOST = 'http://api.qiniu.com';            // 数据处理操作Host
+    const RS_HOST = 'rs.qiniu.com';      //RS Host
-    const UC_HOST  = 'http://uc.qbox.me';              // Host
+    const UC_HOST = 'https://uc.qbox.me';              //UC Host
 
+    // Zone 空间对应的机房
     public $zone;
+    //BOOL 是否使用https域名
+    public $useHTTPS;
+    //BOOL 是否使用CDN加速上传域名
+    public $useCdnDomains;
+    // Zone Cache
+    private $zoneCache;
 
-    public function __construct(Zone $z = null)         // 构造函数，默认为zone0
+    // 构造函数
+    public function __construct(Zone $z = null)
     {
-        // if ($z === null) {
+        $this->zone = $z;
-            $this->zone = new Zone();
+        $this->useHTTPS = false;
-        // }
+        $this->useCdnDomains = false;
+        $this->zoneCache = array();
+    }
+
+    public function getUpHost($accessKey, $bucket)
+    {
+        $zone = $this->getZone($accessKey, $bucket);
+        if ($this->useHTTPS === true) {
+            $scheme = "https://";
+        } else {
+            $scheme = "http://";
+        }
+
+        $host = $zone->srcUpHosts[0];
+        if ($this->useCdnDomains === true) {
+            $host = $zone->cdnUpHosts[0];
+        }
+
+        return $scheme . $host;
+    }
+
+    public function getUpBackupHost($accessKey, $bucket)
+    {
+        $zone = $this->getZone($accessKey, $bucket);
+        if ($this->useHTTPS === true) {
+            $scheme = "https://";
+        } else {
+            $scheme = "http://";
+        }
+
+        $host = $zone->cdnUpHosts[0];
+        if ($this->useCdnDomains === true) {
+            $host = $zone->srcUpHosts[0];
+        }
+
+        return $scheme . $host;
+    }
+
+    public function getRsHost($accessKey, $bucket)
+    {
+        $zone = $this->getZone($accessKey, $bucket);
+
+        if ($this->useHTTPS === true) {
+            $scheme = "https://";
+        } else {
+            $scheme = "http://";
+        }
+
+        return $scheme . $zone->rsHost;
+    }
+
+    public function getRsfHost($accessKey, $bucket)
+    {
+        $zone = $this->getZone($accessKey, $bucket);
+
+        if ($this->useHTTPS === true) {
+            $scheme = "https://";
+        } else {
+            $scheme = "http://";
+        }
+
+        return $scheme . $zone->rsfHost;
+    }
+
+    public function getIovipHost($accessKey, $bucket)
+    {
+        $zone = $this->getZone($accessKey, $bucket);
+
+        if ($this->useHTTPS === true) {
+            $scheme = "https://";
+        } else {
+            $scheme = "http://";
+        }
+
+        return $scheme . $zone->iovipHost;
+    }
+
+    public function getApiHost($accessKey, $bucket)
+    {
+        $zone = $this->getZone($accessKey, $bucket);
+
+        if ($this->useHTTPS === true) {
+            $scheme = "https://";
+        } else {
+            $scheme = "http://";
+        }
+
+        return $scheme . $zone->apiHost;
+    }
+
+    private function getZone($accessKey, $bucket)
+    {
+        $cacheId = "$accessKey:$bucket";
+
+        if (isset($this->zoneCache[$cacheId])) {
+            $zone = $this->zoneCache[$cacheId];
+        } elseif (isset($this->zone)) {
+            $zone = $this->zone;
+            $this->zoneCache[$cacheId] = $zone;
+        } else {
+            $zone = Zone::queryZone($accessKey, $bucket);
+            $this->zoneCache[$cacheId] = $zone;
+        }
+        return $zone;
     }
 }

vendor/qiniu/php-sdk/src/Qiniu/Etag.php

@@ -13,7 +13,7 @@ final class Etag
 
     private static function blockCount($fsize)
     {
-        return (($fsize + (Config::BLOCK_SIZE - 1)) / Config::BLOCK_SIZE);
+        return intval(($fsize + (Config::BLOCK_SIZE - 1)) / Config::BLOCK_SIZE);
     }
 
     private static function calcSha1($data)
@@ -38,7 +38,7 @@ final class Etag
 
         $fstat = fstat($fhandler);
         $fsize = $fstat['size'];
-        if ((int) $fsize === 0) {
+        if ((int)$fsize === 0) {
             fclose($fhandler);
             return array('Fto5o-5ea0sNMlW_75VgGJCv2AcJ', null);
         }
@@ -52,12 +52,12 @@ final class Etag
                 fclose($fhandler);
                 return array(null, $err);
             }
-            list($sha1Code, ) = self::calcSha1($fdata);
+            list($sha1Code,) = self::calcSha1($fdata);
             $sha1Buf = array_merge($sha1Buf, $sha1Code);
         } else {
             array_push($sha1Buf, 0x96);
             $sha1BlockBuf = array();
-            for ($i=0; $i < $blockCnt; $i++) {
+            for ($i = 0; $i < $blockCnt; $i++) {
                 $fdata = fread($fhandler, Config::BLOCK_SIZE);
                 list($sha1Code, $err) = self::calcSha1($fdata);
                 if ($err !== null) {
@@ -67,7 +67,7 @@ final class Etag
                 $sha1BlockBuf = array_merge($sha1BlockBuf, $sha1Code);
             }
             $tmpData = self::packArray('C*', $sha1BlockBuf);
-            list($sha1Final, ) = self::calcSha1($tmpData);
+            list($sha1Final,) = self::calcSha1($tmpData);
             $sha1Buf = array_merge($sha1Buf, $sha1Final);
         }
         $etag = \Qiniu\base64_urlSafeEncode(self::packArray('C*', $sha1Buf));

vendor/qiniu/php-sdk/src/Qiniu/Http/Client.php

@@ -39,10 +39,10 @@ final class Client
         }
 
         array_push($data, '--' . $mimeBoundary);
-        $mimeType = empty($mimeType) ? 'application/octet-stream' : $mimeType;
+        $finalMimeType = empty($mimeType) ? 'application/octet-stream' : $mimeType;
-        $fileName = self::escapeQuotes($fileName);
+        $finalFileName = self::escapeQuotes($fileName);
-        array_push($data, "Content-Disposition: form-data; name=\"$name\"; filename=\"$fileName\"");
+        array_push($data, "Content-Disposition: form-data; name=\"$name\"; filename=\"$finalFileName\"");
-        array_push($data, "Content-Type: $mimeType");
+        array_push($data, "Content-Type: $finalMimeType");
         array_push($data, '');
         array_push($data, $fileBody);
 
@@ -82,7 +82,7 @@ final class Client
             CURLOPT_SSL_VERIFYHOST => false,
             CURLOPT_HEADER => true,
             CURLOPT_NOBODY => false,
-            CURLOPT_CUSTOMREQUEST  => $request->method,
+            CURLOPT_CUSTOMREQUEST => $request->method,
             CURLOPT_URL => $request->url
         );
 
@@ -106,7 +106,7 @@ final class Client
         curl_setopt_array($ch, $options);
         $result = curl_exec($ch);
         $t2 = microtime(true);
-        $duration = round($t2-$t1, 3);
+        $duration = round($t2 - $t1, 3);
         $ret = curl_errno($ch);
         if ($ret !== 0) {
             $r = new Response(-1, $duration, array(), null, curl_error($ch));
@@ -128,7 +128,7 @@ final class Client
         foreach ($headerLines as $line) {
             $headerLine = trim($line);
             $kv = explode(':', $headerLine);
-            if (count($kv) >1) {
+            if (count($kv) > 1) {
                 $headers[$kv[0]] = trim($kv[1]);
             }
         }

vendor/qiniu/php-sdk/src/Qiniu/Http/Error.php

@@ -1,6 +1,12 @@
 <?php
 namespace Qiniu\Http;
 
+/**
+ * 七牛业务请求逻辑错误封装类，主要用来解析API请求返回如下的内容：
+ * <pre>
+ *     {"error" : "detailed error message"}
+ * </pre>
+ */
 final class Error
 {
     private $url;

vendor/qiniu/php-sdk/src/Qiniu/Http/Response.php

@@ -104,7 +104,7 @@ final class Response
         if (self::isJson($headers)) {
             try {
                 $jsonData = self::bodyJson($body);
-                if ($code >=400) {
+                if ($code >= 400) {
                     $this->error = $body;
                     if ($jsonData['error'] !== null) {
                         $this->error = $jsonData['error'];
@@ -117,7 +117,7 @@ final class Response
                     $this->error = $e->getMessage();
                 }
             }
-        } elseif ($code >=400) {
+        } elseif ($code >= 400) {
             $this->error = $body;
         }
         return;
@@ -130,7 +130,7 @@ final class Response
 
     private static function bodyJson($body)
     {
-        return \Qiniu\json_decode((string) $body, true, 512);
+        return \Qiniu\json_decode((string)$body, true, 512);
     }
 
     public function xVia()
@@ -163,7 +163,7 @@ final class Response
     public function needRetry()
     {
         $code = $this->statusCode;
-        if ($code< 0 || ($code / 100 === 5 and $code !== 579) || $code === 996) {
+        if ($code < 0 || ($code / 100 === 5 and $code !== 579) || $code === 996) {
             return true;
         }
     }

vendor/qiniu/php-sdk/src/Qiniu/Processing/ImageUrlBuilder.php

@@ -57,39 +57,39 @@ final class ImageUrlBuilder
         $quality = null,
         $ignoreError = 1
     ) {
-    
+
         // url合法效验
-        if (! $this->isUrl($url)) {
+        if (!$this->isUrl($url)) {
             return $url;
         }
 
         // 参数合法性效验
-        if (! in_array(intval($mode), $this->modeArr, true)) {
+        if (!in_array(intval($mode), $this->modeArr, true)) {
             return $url;
         }
 
-        if (! $width || ! $height) {
+        if (!$width || !$height) {
             return $url;
         }
 
         $thumbStr = 'imageView2/' . $mode . '/w/' . $width . '/h/' . $height . '/';
 
         // 拼接输出格式
-        if (! is_null($format)
+        if (!is_null($format)
             && in_array($format, $this->formatArr)
         ) {
             $thumbStr .= 'format/' . $format . '/';
         }
 
         // 拼接渐进显示
-        if (! is_null($interlace)
+        if (!is_null($interlace)
             && in_array(intval($interlace), array(0, 1), true)
         ) {
             $thumbStr .= 'interlace/' . $interlace . '/';
         }
 
         // 拼接图片质量
-        if (! is_null($quality)
+        if (!is_null($quality)
             && intval($quality) >= 0
             && intval($quality) <= 100
         ) {
@@ -126,7 +126,7 @@ final class ImageUrlBuilder
         $watermarkScale = null
     ) {
         // url合法效验
-        if (! $this->isUrl($url)) {
+        if (!$this->isUrl($url)) {
             return $url;
         }
 
@@ -145,21 +145,21 @@ final class ImageUrlBuilder
         }
 
         // 拼接横轴边距
-        if (! is_null($dx)
+        if (!is_null($dx)
             && is_numeric($dx)
         ) {
             $waterStr .= 'dx/' . $dx . '/';
         }
 
         // 拼接纵轴边距
-        if (! is_null($dy)
+        if (!is_null($dy)
             && is_numeric($dy)
         ) {
             $waterStr .= 'dy/' . $dy . '/';
         }
 
         // 拼接自适应原图的短边比例
-        if (! is_null($watermarkScale)
+        if (!is_null($watermarkScale)
             && is_numeric($watermarkScale)
             && $watermarkScale > 0
             && $watermarkScale < 1
@@ -199,7 +199,7 @@ final class ImageUrlBuilder
         $dy = null
     ) {
         // url合法效验
-        if (! $this->isUrl($url)) {
+        if (!$this->isUrl($url)) {
             return $url;
         }
 
@@ -213,7 +213,7 @@ final class ImageUrlBuilder
         }
 
         // 拼接文字颜色
-        if (! is_null($fontColor)
+        if (!is_null($fontColor)
             && $fontColor
         ) {
             $waterStr .= 'fill/' . \Qiniu\base64_urlSafeEncode($fontColor) . '/';
@@ -232,14 +232,14 @@ final class ImageUrlBuilder
         }
 
         // 拼接横轴边距
-        if (! is_null($dx)
+        if (!is_null($dx)
             && is_numeric($dx)
         ) {
             $waterStr .= 'dx/' . $dx . '/';
         }
 
         // 拼接纵轴边距
-        if (! is_null($dy)
+        if (!is_null($dy)
             && is_numeric($dy)
         ) {
             $waterStr .= 'dy/' . $dy . '/';
@@ -261,9 +261,9 @@ final class ImageUrlBuilder
         $urlArr = parse_url($url);
 
         return $urlArr['scheme']
-            && in_array($urlArr['scheme'], array('http', 'https'))
+        && in_array($urlArr['scheme'], array('http', 'https'))
-            && $urlArr['host']
+        && $urlArr['host']
-            && $urlArr['path'];
+        && $urlArr['path'];
     }
 
     /**
@@ -277,6 +277,6 @@ final class ImageUrlBuilder
     {
         $urlArr = parse_url($url);
 
-        return ! empty($urlArr['query']);
+        return !empty($urlArr['query']);
     }
 }

vendor/qiniu/php-sdk/src/Qiniu/Processing/Operation.php

@@ -50,7 +50,7 @@ final class Operation
             $fops = implode('|', $fops);
         }
 
-        $url = $protocol."://$this->domain/$key?$fops";
+        $url = $protocol . "://$this->domain/$key?$fops";
         if ($this->auth !== null) {
             $url = $this->auth->privateDownloadUrl($url, $this->token_expire);
         }

vendor/qiniu/php-sdk/src/Qiniu/Processing/PersistentFop.php

@@ -18,60 +18,54 @@ final class PersistentFop
      */
     private $auth;
 
-    /**
+    /*
-     * @var 操作资源所在空间
+     * @var 配置对象，Config 对象
-     */
+     * */
-    private $bucket;
+    private $config;
-
-    /**
-     * @var 多媒体处理队列，详见 https://portal.qiniu.com/mps/pipeline
-     */
-    private $pipeline;
-
-    /**
-     * @var 持久化处理结果通知URL
-     */
-    private $notify_url;
-
-    /**
-     * @var boolean 是否强制覆盖已有的重名文件
-     */
-    private $force;
 
 
-    public function __construct($auth, $bucket, $pipeline = null, $notify_url = null, $force = false)
+    public function __construct($auth, $config = null)
     {
         $this->auth = $auth;
-        $this->bucket = $bucket;
+        if ($config == null) {
-        $this->pipeline = $pipeline;
+            $this->config = new Config();
-        $this->notify_url = $notify_url;
+        } else {
-        $this->force = $force;
+            $this->config = $config;
+        }
     }
 
     /**
      * 对资源文件进行异步持久化处理
+     * @param $bucket     资源所在空间
+     * @param $key        待处理的源文件
+     * @param $fops       string|array  待处理的pfop操作，多个pfop操作以array的形式传入。
+     *                    eg. avthumb/mp3/ab/192k, vframe/jpg/offset/7/w/480/h/360
+     * @param $pipeline   资源处理队列
+     * @param $notify_url 处理结果通知地址
+     * @param $force      是否强制执行一次新的指令
      *
-     * @param $key   待处理的源文件
-     * @param $fops  string|array  待处理的pfop操作，多个pfop操作以array的形式传入。
-     *                eg. avthumb/mp3/ab/192k, vframe/jpg/offset/7/w/480/h/360
      *
      * @return array 返回持久化处理的persistentId, 和返回的错误。
      *
      * @link http://developer.qiniu.com/docs/v6/api/reference/fop/
      */
-    public function execute($key, $fops)
+    public function execute($bucket, $key, $fops, $pipeline = null, $notify_url = null, $force = false)
     {
         if (is_array($fops)) {
             $fops = implode(';', $fops);
         }
-        $params = array('bucket' => $this->bucket, 'key' => $key, 'fops' => $fops);
+        $params = array('bucket' => $bucket, 'key' => $key, 'fops' => $fops);
-        \Qiniu\setWithoutEmpty($params, 'pipeline', $this->pipeline);
+        \Qiniu\setWithoutEmpty($params, 'pipeline', $pipeline);
-        \Qiniu\setWithoutEmpty($params, 'notifyURL', $this->notify_url);
+        \Qiniu\setWithoutEmpty($params, 'notifyURL', $notify_url);
-        if ($this->force) {
+        if ($force) {
             $params['force'] = 1;
         }
         $data = http_build_query($params);
-        $url = Config::API_HOST . '/pfop/';
+        $scheme = "http://";
+        if ($this->config->useHTTPS === true) {
+            $scheme = "https://";
+        }
+        $url = $scheme . Config::API_HOST . '/pfop/';
         $headers = $this->auth->authorization($url, $data, 'application/x-www-form-urlencoded');
         $headers['Content-Type'] = 'application/x-www-form-urlencoded';
         $response = Client::post($url, $data, $headers);
@@ -83,9 +77,14 @@ final class PersistentFop
         return array($id, null);
     }
 
-    public static function status($id)
+    public function status($id)
     {
-        $url = Config::API_HOST . "/status/get/prefop?id=$id";
+        $scheme = "http://";
+
+        if ($this->config->useHTTPS === true) {
+            $scheme = "https://";
+        }
+        $url = $scheme . Config::API_HOST . "/status/get/prefop?id=$id";
         $response = Client::get($url);
         if (!$response->ok()) {
             return array(null, new Error($url, $response));

vendor/qiniu/php-sdk/src/Qiniu/Storage/BucketManager.php

@@ -10,18 +10,20 @@ use Qiniu\Http\Error;
 /**
  * 主要涉及了空间资源管理及批量操作接口的实现，具体的接口规格可以参考
  *
- * @link http://developer.qiniu.com/docs/v6/api/reference/rs/
+ * @link https://developer.qiniu.com/kodo/api/1274/rs
  */
 final class BucketManager
 {
     private $auth;
-    private $zone;
+    private $config;
 
-    public function __construct(Auth $auth, Zone $zone = null)
+    public function __construct(Auth $auth, Config $config = null)
     {
         $this->auth = $auth;
-        if ($zone === null) {
+        if ($config == null) {
-            $this->zone = new Zone();
+            $this->config = new Config();
+        } else {
+            $this->config = $config;
         }
     }
 
@@ -30,11 +32,30 @@ final class BucketManager
      *
      * @return string[] 包含所有空间名
      */
-    public function buckets()
+    public function buckets($shared = true)
     {
-        return $this->rsGet('/buckets');
+        $includeShared = "false";
+        if ($shared === true) {
+            $includeShared = "true";
+        }
+        return $this->rsGet('/buckets?shared=' . $includeShared);
     }
 
+    /**
+     * 获取指定空间绑定的所有的域名
+     *
+     * @return string[] 包含所有空间域名
+     */
+    public function domains($bucket)
+    {
+        return $this->apiGet('/v6/domain/list?tbl=' . $bucket);
+    }
+
+    /**
+     * 获取空间绑定的域名列表
+     * @return string[] 包含空间绑定的所有域名
+     */
+
     /**
      * 列取空间的文件列表
      *
@@ -62,13 +83,8 @@ final class BucketManager
         \Qiniu\setWithoutEmpty($query, 'marker', $marker);
         \Qiniu\setWithoutEmpty($query, 'limit', $limit);
         \Qiniu\setWithoutEmpty($query, 'delimiter', $delimiter);
-        $url = Config::RSF_HOST . '/list?' . http_build_query($query);
+        $url = $this->getRsfHost() . '/list?' . http_build_query($query);
-        list($ret, $error) = $this->get($url);
+        return $this->get($url);
-        if ($ret === null) {
-            return array(null, null, $error);
-        }
-        $marker = array_key_exists('marker', $ret) ? $ret['marker'] : null;
-        return array($ret['items'], $marker, null);
     }
 
     /**
@@ -81,8 +97,9 @@ final class BucketManager
      *                                              [
      *                                                  "hash" => "<Hash string>",
      *                                                  "key" => "<Key string>",
-     *                                                  "fsize" => "<file size>",
+     *                                                  "fsize" => <file size>,
      *                                                  "putTime" => "<file modify time>"
+     *                                                  "fileType" => <file type>
      *                                              ]
      *
      * @link  http://developer.qiniu.com/docs/v6/api/reference/rs/stat.html
@@ -140,7 +157,7 @@ final class BucketManager
         $from = \Qiniu\entry($from_bucket, $from_key);
         $to = \Qiniu\entry($to_bucket, $to_key);
         $path = '/copy/' . $from . '/' . $to;
-        if ($force) {
+        if ($force === true) {
             $path .= '/force/true';
         }
         list(, $error) = $this->rsPost($path);
@@ -184,11 +201,31 @@ final class BucketManager
     {
         $resource = \Qiniu\entry($bucket, $key);
         $encode_mime = \Qiniu\base64_urlSafeEncode($mime);
-        $path = '/chgm/' . $resource . '/mime/' .$encode_mime;
+        $path = '/chgm/' . $resource . '/mime/' . $encode_mime;
         list(, $error) = $this->rsPost($path);
         return $error;
     }
 
+
+    /**
+     * 修改指定资源的存储类型
+     *
+     * @param $bucket     待操作资源所在空间
+     * @param $key        待操作资源文件名
+     * @param $fileType       待操作文件目标文件类型
+     *
+     * @return mixed      成功返回NULL，失败返回对象Qiniu\Http\Error
+     * @link  https://developer.qiniu.com/kodo/api/3710/modify-the-file-type
+     */
+    public function changeType($bucket, $key, $fileType)
+    {
+        $resource = \Qiniu\entry($bucket, $key);
+        $path = '/chtype/' . $resource . '/type/' . $fileType;
+        list(, $error) = $this->rsPost($path);
+        return $error;
+    }
+
+
     /**
      * 从指定URL抓取资源，并将该资源存储到指定空间中
      *
@@ -219,7 +256,7 @@ final class BucketManager
         $path = '/fetch/' . $resource . '/to/' . $to;
 
         $ak = $this->auth->getAccessKey();
-        $ioHost = $this->zone->getIoHost($ak, $bucket);
+        $ioHost = $this->config->getIovipHost($ak, $bucket);
 
         $url = $ioHost . $path;
         return $this->post($url, null);
@@ -240,7 +277,7 @@ final class BucketManager
         $path = '/prefetch/' . $resource;
 
         $ak = $this->auth->getAccessKey();
-        $ioHost = $this->zone->getIoHost($ak, $bucket);
+        $ioHost = $this->config->getIovipHost($ak, $bucket);
 
         $url = $ioHost . $path;
         list(, $error) = $this->post($url, null);
@@ -269,24 +306,69 @@ final class BucketManager
         return $this->rsPost('/batch', $params);
     }
 
+    /**
+     * 设置文件的生命周期
+     *
+     * @param $bucket 设置文件生命周期文件所在的空间
+     * @param $key    设置文件生命周期文件的文件名
+     * @param $days   设置该文件多少天后删除，当$days设置为0时表示取消该文件的生命周期
+     *
+     * @return Mixed
+     * @link https://developer.qiniu.com/kodo/api/update-file-lifecycle
+     */
+    public function deleteAfterDays($bucket, $key, $days)
+    {
+        $entry = \Qiniu\entry($bucket, $key);
+        $path = "/deleteAfterDays/$entry/$days";
+        list(, $error) = $this->rsPost($path);
+        return $error;
+    }
+
+    private function getRsfHost()
+    {
+        $scheme = "http://";
+        if ($this->config->useHTTPS == true) {
+            $scheme = "https://";
+        }
+        return $scheme . Config::RSF_HOST;
+    }
+
+    private function getRsHost()
+    {
+        $scheme = "http://";
+        if ($this->config->useHTTPS == true) {
+            $scheme = "https://";
+        }
+        return $scheme . Config::RS_HOST;
+    }
+
+    private function getApiHost()
+    {
+        $scheme = "http://";
+        if ($this->config->useHTTPS == true) {
+            $scheme = "https://";
+        }
+        return $scheme . Config::API_HOST;
+    }
+
     private function rsPost($path, $body = null)
     {
-        $url = Config::RS_HOST . $path;
+        $url = $this->getRsHost() . $path;
         return $this->post($url, $body);
     }
 
+    private function apiGet($path)
+    {
+        $url = $this->getApiHost() . $path;
+        return $this->get($url);
+    }
+
     private function rsGet($path)
     {
-        $url = Config::RS_HOST . $path;
+        $url = $this->getRsHost() . $path;
         return $this->get($url);
     }
 
-    private function ioPost($path, $body = null)
-    {
-        $url = Config::IO_HOST . $path;
-        return $this->post($url, $body);
-    }
-
     private function get($url)
     {
         $headers = $this->auth->authorization($url);
@@ -308,33 +390,60 @@ final class BucketManager
         return array($r, null);
     }
 
-    public static function buildBatchCopy($source_bucket, $key_pairs, $target_bucket)
+    public static function buildBatchCopy($source_bucket, $key_pairs, $target_bucket, $force)
     {
-        return self::twoKeyBatch('copy', $source_bucket, $key_pairs, $target_bucket);
+        return self::twoKeyBatch('/copy', $source_bucket, $key_pairs, $target_bucket, $force);
     }
 
 
-    public static function buildBatchRename($bucket, $key_pairs)
+    public static function buildBatchRename($bucket, $key_pairs, $force)
     {
-        return self::buildBatchMove($bucket, $key_pairs, $bucket);
+        return self::buildBatchMove($bucket, $key_pairs, $bucket, $force);
     }
 
 
-    public static function buildBatchMove($source_bucket, $key_pairs, $target_bucket)
+    public static function buildBatchMove($source_bucket, $key_pairs, $target_bucket, $force)
     {
-        return self::twoKeyBatch('move', $source_bucket, $key_pairs, $target_bucket);
+        return self::twoKeyBatch('/move', $source_bucket, $key_pairs, $target_bucket, $force);
     }
 
 
     public static function buildBatchDelete($bucket, $keys)
     {
-        return self::oneKeyBatch('delete', $bucket, $keys);
+        return self::oneKeyBatch('/delete', $bucket, $keys);
     }
 
 
     public static function buildBatchStat($bucket, $keys)
     {
-        return self::oneKeyBatch('stat', $bucket, $keys);
+        return self::oneKeyBatch('/stat', $bucket, $keys);
+    }
+
+    public static function buildBatchDeleteAfterDays($bucket, $key_day_pairs)
+    {
+        $data = array();
+        foreach ($key_day_pairs as $key => $day) {
+            array_push($data, '/deleteAfterDays/' . \Qiniu\entry($bucket, $key) . '/' . $day);
+        }
+        return $data;
+    }
+
+    public static function buildBatchChangeMime($bucket, $key_mime_pairs)
+    {
+        $data = array();
+        foreach ($key_mime_pairs as $key => $mime) {
+            array_push($data, '/chgm/' . \Qiniu\entry($bucket, $key) . '/mime/' . base64_encode($mime));
+        }
+        return $data;
+    }
+
+    public static function buildBatchChangeType($bucket, $key_type_pairs)
+    {
+        $data = array();
+        foreach ($key_type_pairs as $key => $type) {
+            array_push($data, '/chtype/' . \Qiniu\entry($bucket, $key) . '/type/' . $type);
+        }
+        return $data;
     }
 
     private static function oneKeyBatch($operation, $bucket, $keys)
@@ -346,16 +455,20 @@ final class BucketManager
         return $data;
     }
 
-    private static function twoKeyBatch($operation, $source_bucket, $key_pairs, $target_bucket)
+    private static function twoKeyBatch($operation, $source_bucket, $key_pairs, $target_bucket, $force)
     {
         if ($target_bucket === null) {
             $target_bucket = $source_bucket;
         }
         $data = array();
+        $forceOp = "false";
+        if ($force) {
+            $forceOp = "true";
+        }
         foreach ($key_pairs as $from_key => $to_key) {
             $from = \Qiniu\entry($source_bucket, $from_key);
             $to = \Qiniu\entry($target_bucket, $to_key);
-            array_push($data, $operation . '/' . $from . '/' . $to);
+            array_push($data, $operation . '/' . $from . '/' . $to . "/force/" . $forceOp);
         }
         return $data;
     }

vendor/qiniu/php-sdk/src/Qiniu/Storage/FormUploader.php

@@ -13,10 +13,10 @@ final class FormUploader
      * @param $upToken    上传凭证
      * @param $key        上传文件名
      * @param $data       上传二进制流
+     * @param $config     上传配置
      * @param $params     自定义变量，规格参考
      *                    http://developer.qiniu.com/docs/v6/api/overview/up/response/vars.html#xvar
      * @param $mime       上传数据的mimeType
-     * @param $checkCrc   是否校验crc32
      *
      * @return array    包含已上传文件的信息，类似：
      *                                              [
@@ -30,9 +30,9 @@ final class FormUploader
         $data,
         $config,
         $params,
-        $mime,
+        $mime
-        $checkCrc
     ) {
+
         $fields = array('token' => $upToken);
         if ($key === null) {
             $fname = 'filename';
@@ -40,20 +40,23 @@ final class FormUploader
             $fname = $key;
             $fields['key'] = $key;
         }
-        if ($checkCrc) {
+
-            $fields['crc32'] = \Qiniu\crc32_data($data);
+        //enable crc32 check by default
-        }
+        $fields['crc32'] = \Qiniu\crc32_data($data);
+
         if ($params) {
             foreach ($params as $k => $v) {
                 $fields[$k] = $v;
             }
         }
 
-        list($upHost, $err) = $config->zone->getUpHostByToken($upToken);
+        list($accessKey, $bucket, $err) = \Qiniu\explodeUpToken($upToken);
         if ($err != null) {
             return array(null, $err);
         }
 
+        $upHost = $config->getUpHost($accessKey, $bucket);
+
         $response = Client::multipartPost($upHost, $fields, 'file', $fname, $data, $mime);
         if (!$response->ok()) {
             return array(null, new Error($upHost, $response));
@@ -67,10 +70,10 @@ final class FormUploader
      * @param $upToken    上传凭证
      * @param $key        上传文件名
      * @param $filePath   上传文件的路径
+     * @param $config     上传配置
      * @param $params     自定义变量，规格参考
      *                    http://developer.qiniu.com/docs/v6/api/overview/up/response/vars.html#xvar
      * @param $mime       上传数据的mimeType
-     * @param $checkCrc   是否校验crc32
      *
      * @return array    包含已上传文件的信息，类似：
      *                                              [
@@ -84,31 +87,33 @@ final class FormUploader
         $filePath,
         $config,
         $params,
-        $mime,
+        $mime
-        $checkCrc
     ) {
 
+
         $fields = array('token' => $upToken, 'file' => self::createFile($filePath, $mime));
         if ($key !== null) {
             $fields['key'] = $key;
         }
-        if ($checkCrc) {
+
-            $fields['crc32'] = \Qiniu\crc32_file($filePath);
+        $fields['crc32'] = \Qiniu\crc32_file($filePath);
-        }
+
         if ($params) {
             foreach ($params as $k => $v) {
                 $fields[$k] = $v;
             }
         }
         $fields['key'] = $key;
-        $headers =array('Content-Type' => 'multipart/form-data');
+        $headers = array('Content-Type' => 'multipart/form-data');
 
-        list($upHost, $err) = $config->zone->getUpHostByToken($upToken);
+        list($accessKey, $bucket, $err) = \Qiniu\explodeUpToken($upToken);
         if ($err != null) {
             return array(null, $err);
         }
-        
+
-        $response = client::post($upHost, $fields, $headers);
+        $upHost = $config->getUpHost($accessKey, $bucket);
+
+        $response = Client::post($upHost, $fields, $headers);
         if (!$response->ok()) {
             return array(null, new Error($upHost, $response));
         }

vendor/qiniu/php-sdk/src/Qiniu/Storage/ResumeUploader.php

@@ -46,6 +46,7 @@ final class ResumeUploader
         $mime,
         $config
     ) {
+
         $this->upToken = $upToken;
         $this->key = $key;
         $this->inputStream = $inputStream;
@@ -55,9 +56,14 @@ final class ResumeUploader
         $this->contexts = array();
         $this->config = $config;
 
-        list($upHost, $err) = $config->zone->getUpHostByToken($upToken);
+        list($accessKey, $bucket, $err) = \Qiniu\explodeUpToken($upToken);
         if ($err != null) {
-            throw new \Exception($err, 1);
+            return array(null, $err);
+        }
+
+        $upHost = $config->getUpHost($accessKey, $bucket);
+        if ($err != null) {
+            throw new \Exception($err->message(), 1);
         }
         $this->host = $upHost;
     }
@@ -81,18 +87,20 @@ final class ResumeUploader
                 $ret = $response->json();
             }
             if ($response->statusCode < 0) {
-                list($bakHost, $err) = $this->config->zone->getBackupUpHostByToken($this->upToken);
+                list($accessKey, $bucket, $err) = \Qiniu\explodeUpToken($this->upToken);
                 if ($err != null) {
                     return array(null, $err);
                 }
-                $this->host = $bakHost;
+
+                $upHostBackup = $this->config->getUpBackupHost($accessKey, $bucket);
+                $this->host = $upHostBackup;
             }
             if ($response->needRetry() || !isset($ret['crc32']) || $crc != $ret['crc32']) {
                 $response = $this->makeBlock($data, $blockSize);
                 $ret = $response->json();
             }
 
-            if (! $response->ok() || !isset($ret['crc32'])|| $crc != $ret['crc32']) {
+            if (!$response->ok() || !isset($ret['crc32']) || $crc != $ret['crc32']) {
                 return array(null, new Error($this->currentUrl, $response));
             }
             array_push($this->contexts, $ret['ctx']);
@@ -119,7 +127,7 @@ final class ResumeUploader
         }
         if (!empty($this->params)) {
             foreach ($this->params as $key => $value) {
-                $val =  \Qiniu\base64_urlSafeEncode($value);
+                $val = \Qiniu\base64_urlSafeEncode($value);
                 $url .= "/$key/$val";
             }
         }
@@ -137,7 +145,7 @@ final class ResumeUploader
         if ($response->needRetry()) {
             $response = $this->post($url, $body);
         }
-        if (! $response->ok()) {
+        if (!$response->ok()) {
             return array(null, new Error($this->currentUrl, $response));
         }
         return array($response->json(), null);
@@ -155,6 +163,6 @@ final class ResumeUploader
         if ($this->size < $uploaded + Config::BLOCK_SIZE) {
             return $this->size - $uploaded;
         }
-        return  Config::BLOCK_SIZE;
+        return Config::BLOCK_SIZE;
     }
 }

vendor/qiniu/php-sdk/src/Qiniu/Zone.php

@@ -6,180 +6,146 @@ use Qiniu\Http\Error;
 
 final class Zone
 {
-    public $ioHost;            // 七牛源站Host
-    public $upHost;
-    public $upHostBackup;
 
-    //array(
+    //源站上传域名
-    //    <scheme>:<ak>:<bucket> ==>
+    public $srcUpHosts;
-    //        array('deadline' => 'xxx', 'upHosts' => array(), 'ioHost' => 'xxx.com')
+    //CDN加速上传域名
-    //)
+    public $cdnUpHosts;
-    public $hostCache;
+    //资源管理域名
-    public $scheme = 'http';
+    public $rsHost;
+    //资源列举域名
+    public $rsfHost;
+    //资源处理域名
+    public $apiHost;
+    //IOVIP域名
+    public $iovipHost;
 
-    public function __construct($scheme = null)
+    //构造一个Zone对象
-    {
+    public function __construct(
-        $this->hostCache = array();
+        $srcUpHosts = array(),
-        if ($scheme != null) {
+        $cdnUpHosts = array(),
-            $this->scheme = $scheme;
+        $rsHost = "rs.qiniu.com",
-        }
+        $rsfHost = "rsf.qiniu.com",
+        $apiHost = "api.qiniu.com",
+        $iovipHost = null
+    ) {
+
+        $this->srcUpHosts = $srcUpHosts;
+        $this->cdnUpHosts = $cdnUpHosts;
+        $this->rsHost = $rsHost;
+        $this->rsfHost = $rsfHost;
+        $this->apiHost = $apiHost;
+        $this->iovipHost = $iovipHost;
     }
 
-    public function getUpHostByToken($uptoken)
+    //华东机房
+    public static function zone0()
     {
-        list($ak, $bucket) = $this->unmarshalUpToken($uptoken);
+        $Zone_z0 = new Zone(
-        list($upHosts, $err) = $this->getUpHosts($ak, $bucket);
+            array("up.qiniup.com", 'up-nb.qiniup.com', 'up-xs.qiniup.com'),
-        return array($upHosts[0], $err);
+            array('upload.qiniup.com', 'upload-nb.qiniup.com', 'upload-xs.qiniup.com'),
+            'rs.qiniu.com',
+            'rsf.qiniu.com',
+            'api.qiniu.com',
+            'iovip.qbox.me'
+        );
+        return $Zone_z0;
     }
 
-    public function getBackupUpHostByToken($uptoken)
+    //华北机房
+    public static function zone1()
     {
-        list($ak, $bucket) = $this->unmarshalUpToken($uptoken);
+        $Zone_z1 = new Zone(
-        list($upHosts, $err) = $this->getUpHosts($ak, $bucket);
+            array('up-z1.qiniup.com'),
-
+            array('upload-z1.qiniup.com'),
-        $upHost = isset($upHosts[1]) ? $upHosts[1] : $upHosts[0];
+            "rs-z1.qiniu.com",
-        return array($upHost, $err);
+            "rsf-z1.qiniu.com",
-    }
+            "api-z1.qiniu.com",
-
+            "iovip-z1.qbox.me"
-    public function getIoHost($ak, $bucket)
-    {
-        list($bucketHosts,) = $this->getBucketHosts($ak, $bucket);
-        $ioHosts = $bucketHosts['ioHost'];
-        return $ioHosts[0];
-    }
-
-    public function getUpHosts($ak, $bucket)
-    {
-        list($bucketHosts, $err) = $this->getBucketHosts($ak, $bucket);
-        if ($err !== null) {
-            return array(null, $err);
-        }
-
-        $upHosts = $bucketHosts['upHosts'];
-        return array($upHosts, null);
-    }
-
-    private function unmarshalUpToken($uptoken)
-    {
-        $token = explode(':', $uptoken);
-        if (count($token) !== 3) {
-            throw new \Exception("Invalid Uptoken", 1);
-        }
-
-        $ak = $token[0];
-        $policy = base64_urlSafeDecode($token[2]);
-        $policy = json_decode($policy, true);
-
-        $scope = $policy['scope'];
-        $bucket = $scope;
-
-        if (strpos($scope, ':')) {
-            $scopes = explode(':', $scope);
-            $bucket = $scopes[0];
-        }
-
-        return array($ak, $bucket);
-    }
-
-    public function getBucketHosts($ak, $bucket)
-    {
-        $key = $this->scheme . ":$ak:$bucket";
-
-        $bucketHosts = $this->getBucketHostsFromCache($key);
-        if (count($bucketHosts) > 0) {
-            return array($bucketHosts, null);
-        }
-
-        list($hosts, $err) = $this->bucketHosts($ak, $bucket);
-        if ($err !== null) {
-            return array(null , $err);
-        }
-
-        $schemeHosts = $hosts[$this->scheme];
-        $bucketHosts = array(
-            'upHosts' => $schemeHosts['up'],
-            'ioHost' => $schemeHosts['io'],
-            'deadline' => time() + $hosts['ttl']
         );
 
-        $this->setBucketHostsToCache($key, $bucketHosts);
+        return $Zone_z1;
-        return array($bucketHosts, null);
     }
 
-    private function getBucketHostsFromCache($key)
+    //华南机房
+    public static function zone2()
     {
-        $ret = array();
+        $Zone_z2 = new Zone(
-        if (count($this->hostCache) === 0) {
+            array('up-z2.qiniup.com', 'up-gz.qiniup.com', 'up-fs.qiniup.com'),
-            $this->hostCacheFromFile();
+            array('upload-z2.qiniup.com', 'upload-gz.qiniup.com', 'upload-fs.qiniup.com'),
-        }
+            "rs-z2.qiniu.com",
-
+            "rsf-z2.qiniu.com",
-        if (!array_key_exists($key, $this->hostCache)) {
+            "api-z2.qiniu.com",
-            return $ret;
+            "iovip-z2.qbox.me"
-        }
+        );
-
+        return $Zone_z2;
-        if ($this->hostCache[$key]['deadline'] > time()) {
-            $ret = $this->hostCache[$key];
-        }
-
-        return $ret;
     }
 
-    private function setBucketHostsToCache($key, $val)
+    //北美机房
+    public static function zoneNa0()
     {
-        $this->hostCache[$key] = $val;
+        //北美机房
-        $this->hostCacheToFile();
+        $Zone_na0 = new Zone(
-        return;
+            array('up-na0.qiniup.com'),
+            array('upload-na0.qiniup.com'),
+            "rs-na0.qiniu.com",
+            "rsf-na0.qiniu.com",
+            "api-na0.qiniu.com",
+            "iovip-na0.qbox.me"
+        );
+        return $Zone_na0;
     }
 
-    private function hostCacheFromFile()
+    /*
-    {
+     * GET /v2/query?ak=<ak>&&bucket=<bucket>
-
-        $path = $this->hostCacheFilePath();
-        if (!file_exists($path)) {
-            return;
-        }
-
-        $bucketHosts = file_get_contents($path);
-        $this->hostCache = json_decode($bucketHosts, true);
-        return;
-    }
-
-    private function hostCacheToFile()
-    {
-        $path = $this->hostCacheFilePath();
-        file_put_contents($path, json_encode($this->hostCache), LOCK_EX);
-        return;
-    }
-
-    private function hostCacheFilePath()
-    {
-        return sys_get_temp_dir() . '/.qiniu_phpsdk_hostscache.json';
-    }
-
-    /*  请求包：
-     *   GET /v1/query?ak=<ak>&&bucket=<bucket>
-     *  返回包：
-     *  
-     *  200 OK {
-     *    "ttl": <ttl>,              // 有效时间
-     *    "http": {
-     *      "up": [],
-     *      "io": [],                // 当bucket为global时，我们不需要iohost, io缺省
-     *    },
-     *    "https": {
-     *      "up": [],
-     *      "io": [],                // 当bucket为global时，我们不需要iohost, io缺省
-     *    }
-     *  }
      **/
-    private function bucketHosts($ak, $bucket)
+    public static function queryZone($ak, $bucket)
     {
-        $url = Config::UC_HOST . '/v1/query' . "?ak=$ak&bucket=$bucket";
+        $zone = new Zone();
+        $url = Config::UC_HOST . '/v2/query' . "?ak=$ak&bucket=$bucket";
         $ret = Client::Get($url);
         if (!$ret->ok()) {
             return array(null, new Error($url, $ret));
         }
         $r = ($ret->body === null) ? array() : $ret->json();
-        return array($r, null);
+        //parse zone;
+
+        $iovipHost = $r['io']['src']['main'][0];
+        $zone->iovipHost = $iovipHost;
+        $accMain = $r['up']['acc']['main'][0];
+        array_push($zone->cdnUpHosts, $accMain);
+        if (isset($r['up']['acc']['backup'])) {
+            foreach ($r['up']['acc']['backup'] as $key => $value) {
+                array_push($zone->cdnUpHosts, $value);
+            }
+        }
+        $srcMain = $r['up']['src']['main'][0];
+        array_push($zone->srcUpHosts, $srcMain);
+        if (isset($r['up']['src']['backup'])) {
+            foreach ($r['up']['src']['backup'] as $key => $value) {
+                array_push($zone->srcUpHosts, $value);
+            }
+        }
+
+        //set specific hosts
+        if (strstr($zone->iovipHost, "z1") !== false) {
+            $zone->rsHost = "rs-z1.qiniu.com";
+            $zone->rsfHost = "rsf-z1.qiniu.com";
+            $zone->apiHost = "api-z1.qiniu.com";
+        } elseif (strstr($zone->iovipHost, "z2") !== false) {
+            $zone->rsHost = "rs-z2.qiniu.com";
+            $zone->rsfHost = "rsf-z2.qiniu.com";
+            $zone->apiHost = "api-z2.qiniu.com";
+        } elseif (strstr($zone->iovipHost, "na0") !== false) {
+            $zone->rsHost = "rs-na0.qiniu.com";
+            $zone->rsfHost = "rsf-na0.qiniu.com";
+            $zone->apiHost = "api-na0.qiniu.com";
+        } else {
+            $zone->rsHost = "rs.qiniu.com";
+            $zone->rsfHost = "rsf.qiniu.com";
+            $zone->apiHost = "api.qiniu.com";
+        }
+
+        return $zone;
     }
 }

vendor/qiniu/php-sdk/src/Qiniu/functions.php

@@ -7,7 +7,7 @@ use Qiniu\Config;
 if (!defined('QINIU_FUNCTIONS_VERSION')) {
     define('QINIU_FUNCTIONS_VERSION', Config::SDK_VER);
 
-   /**
+    /**
      * 计算文件的crc32检验码:
      *
      * @param $file string  待计算校验码的文件路径
@@ -21,7 +21,7 @@ if (!defined('QINIU_FUNCTIONS_VERSION')) {
         return sprintf('%u', $array[1]);
     }
 
-   /**
+    /**
      * 计算输入流的crc32检验码
      *
      * @param $data 待计算校验码的字符串
@@ -35,7 +35,7 @@ if (!defined('QINIU_FUNCTIONS_VERSION')) {
         return sprintf('%u', $array[1]);
     }
 
-   /**
+    /**
      * 对提供的数据进行urlsafe的base64编码。
      *
      * @param string $data 待编码的数据，一般为字符串
@@ -50,7 +50,7 @@ if (!defined('QINIU_FUNCTIONS_VERSION')) {
         return str_replace($find, $replace, base64_encode($data));
     }
 
-   /**
+    /**
      * 对提供的urlsafe的base64编码的数据进行解码
      *
      * @param string $str 待解码的数据，一般为字符串
@@ -64,14 +64,14 @@ if (!defined('QINIU_FUNCTIONS_VERSION')) {
         return base64_decode(str_replace($find, $replace, $str));
     }
 
-   /**
+    /**
      * Wrapper for JSON decode that implements error detection with helpful
      * error messages.
      *
-     * @param string $json    JSON data to parse
+     * @param string $json JSON data to parse
-     * @param bool $assoc     When true, returned objects will be converted
+     * @param bool $assoc When true, returned objects will be converted
      *                        into associative arrays.
-     * @param int    $depth   User specified recursion depth.
+     * @param int $depth User specified recursion depth.
      *
      * @return mixed
      * @throws \InvalidArgumentException if the JSON cannot be parsed.
@@ -105,7 +105,7 @@ if (!defined('QINIU_FUNCTIONS_VERSION')) {
         return $data;
     }
 
-   /**
+    /**
      * 计算七牛API中的数据格式
      *
      * @param $bucket 待操作的空间名
@@ -139,7 +139,7 @@ if (!defined('QINIU_FUNCTIONS_VERSION')) {
         }
         return $array;
     }
-    
+
     /**
      * 缩略图链接拼接
      *
@@ -165,6 +165,7 @@ if (!defined('QINIU_FUNCTIONS_VERSION')) {
         $interlace = null,
         $ignoreError = 1
     ) {
+
         static $imageUrlBuilder = null;
         if (is_null($imageUrlBuilder)) {
             $imageUrlBuilder = new \Qiniu\Processing\ImageUrlBuilder;
@@ -196,6 +197,7 @@ if (!defined('QINIU_FUNCTIONS_VERSION')) {
         $dy = null,
         $watermarkScale = null
     ) {
+
         static $imageUrlBuilder = null;
         if (is_null($imageUrlBuilder)) {
             $imageUrlBuilder = new \Qiniu\Processing\ImageUrlBuilder;
@@ -231,6 +233,7 @@ if (!defined('QINIU_FUNCTIONS_VERSION')) {
         $dx = null,
         $dy = null
     ) {
+
         static $imageUrlBuilder = null;
         if (is_null($imageUrlBuilder)) {
             $imageUrlBuilder = new \Qiniu\Processing\ImageUrlBuilder;
@@ -238,4 +241,24 @@ if (!defined('QINIU_FUNCTIONS_VERSION')) {
 
         return call_user_func_array(array($imageUrlBuilder, 'waterText'), func_get_args());
     }
+
+    /**
+     *  从uptoken解析accessKey和bucket
+     *
+     * @param $upToken
+     * @return array(ak,bucket,err=null)
+     */
+    function explodeUpToken($upToken)
+    {
+        $items = explode(':', $upToken);
+        if (count($items) != 3) {
+            return array(null, null, "invalid uptoken");
+        }
+        $accessKey = $items[0];
+        $putPolicy = json_decode(base64_decode($items[2]));
+        $scope = $putPolicy->scope;
+        $scopeItems = explode(':', $scope);
+        $bucket = $scopeItems[0];
+        return array($accessKey, $bucket, null);
+    }
 }

vendor/qiniu/php-sdk/test-env.sh

@@ -0,0 +1,4 @@
+export QINIU_ACCESS_KEY=xxx
+export QINIU_SECRET_KEY=xxx
+export QINIU_TEST_BUCKET=phpsdk
+export QINIU_TEST_DOMAIN=phpsdk.qiniudn.com

vendor/qiniu/php-sdk/tests/Qiniu/Tests/AuthTest.php

@@ -1,9 +1,7 @@
 <?php
 // Hack to override the time returned from the S3SignatureV4
 // @codingStandardsIgnoreStart
-namespace Qiniu
+namespace Qiniu {
-
-{
     function time()
     {
         return isset($_SERVER['override_qiniu_auth_time'])
@@ -12,9 +10,7 @@ namespace Qiniu
     }
 }
 
-namespace Qiniu\Tests
+namespace Qiniu\Tests {
-
-{
     use Qiniu\Auth;
 
     // @codingStandardsIgnoreEnd
@@ -50,27 +46,17 @@ namespace Qiniu\Tests
         {
             global $dummyAuth;
             $_SERVER['override_qiniu_auth_time'] = true;
-            $url =  $dummyAuth->privateDownloadUrl('http://www.qiniu.com?go=1');
+            $url = $dummyAuth->privateDownloadUrl('http://www.qiniu.com?go=1');
             $expect = 'http://www.qiniu.com?go=1&e=1234571490&token=abcdefghklmnopq:8vzBeLZ9W3E4kbBLFLW0Xe0u7v4=';
             $this->assertEquals($expect, $url);
             unset($_SERVER['override_qiniu_auth_time']);
         }
 
-        /**
-        * @expectedException        InvalidArgumentException
-        * @expectedExceptionMessage asyncOps has deprecated
-        */
-        public function testDeprecatedPolicy()
-        {
-            global $dummyAuth;
-            $token = $dummyAuth->uploadToken('1', null, 3600, array('asyncOps'=> 1));
-        }
-
         public function testUploadToken()
         {
             global $dummyAuth;
             $_SERVER['override_qiniu_auth_time'] = true;
-            $token = $dummyAuth->uploadToken('1', '2', 3600, array('endUser'=> 'y'));
+            $token = $dummyAuth->uploadToken('1', '2', 3600, array('endUser' => 'y'));
             // @codingStandardsIgnoreStart
             $exp = 'abcdefghklmnopq:yyeexeUkPOROoTGvwBjJ0F0VLEo=:eyJlbmRVc2VyIjoieSIsInNjb3BlIjoiMToyIiwiZGVhZGxpbmUiOjEyMzQ1NzE0OTB9';
             // @codingStandardsIgnoreEnd

vendor/qiniu/php-sdk/tests/Qiniu/Tests/BucketTest.php

@@ -10,6 +10,7 @@ class BucketTest extends \PHPUnit_Framework_TestCase
     protected $bucketName;
     protected $key;
     protected $key2;
+
     protected function setUp()
     {
         global $bucketName;
@@ -41,9 +42,9 @@ class BucketTest extends \PHPUnit_Framework_TestCase
 
     public function testList()
     {
-        list($items, $marker, $error) = $this->bucketManager->listFiles($this->bucketName, null, null, 2);
+        list($ret, $error) = $this->bucketManager->listFiles($this->bucketName, null, null, 10);
-        $this->assertNotNull($items[0]);
+        $this->assertNotNull($ret['items'][0]);
-        $this->assertNotNull($marker);
+        $this->assertNotNull($ret['marker']);
     }
 
     public function testStat()
@@ -109,7 +110,6 @@ class BucketTest extends \PHPUnit_Framework_TestCase
         list($key2Stat,) = $this->bucketManager->stat($this->bucketName, $this->key2);
         list($key2CopiedStat,) = $this->bucketManager->stat($this->bucketName, $key);
 
-        var_dump($key2Stat);
         $this->assertEquals($key2Stat['hash'], $key2CopiedStat['hash']);
 
         $error = $this->bucketManager->delete($this->bucketName, $key);
@@ -153,7 +153,7 @@ class BucketTest extends \PHPUnit_Framework_TestCase
         );
         $this->assertArrayHasKey('key', $ret);
         $this->assertNull($error);
- 
+
         list($ret, $error) = $this->bucketManager->fetch(
             'http://developer.qiniu.com/docs/v6/sdk/php-sdk.html',
             $this->bucketName
@@ -168,7 +168,8 @@ class BucketTest extends \PHPUnit_Framework_TestCase
         $ops = BucketManager::buildBatchCopy(
             $this->bucketName,
             array($this->key => $key),
-            $this->bucketName
+            $this->bucketName,
+            true
         );
         list($ret, $error) = $this->bucketManager->batch($ops);
         $this->assertEquals(200, $ret[0]['code']);
@@ -179,13 +180,14 @@ class BucketTest extends \PHPUnit_Framework_TestCase
 
     public function testBatchMove()
     {
-        $key = 'movefrom'. rand();
+        $key = 'movefrom' . rand();
         $this->bucketManager->copy($this->bucketName, $this->key, $this->bucketName, $key);
         $key2 = $key . 'to';
         $ops = BucketManager::buildBatchMove(
             $this->bucketName,
             array($key => $key2),
-            $this->bucketName
+            $this->bucketName,
+            true
         );
         list($ret, $error) = $this->bucketManager->batch($ops);
         $this->assertEquals(200, $ret[0]['code']);
@@ -198,7 +200,7 @@ class BucketTest extends \PHPUnit_Framework_TestCase
         $key = 'rename' . rand();
         $this->bucketManager->copy($this->bucketName, $this->key, $this->bucketName, $key);
         $key2 = $key . 'to';
-        $ops = BucketManager::buildBatchRename($this->bucketName, array($key => $key2));
+        $ops = BucketManager::buildBatchRename($this->bucketName, array($key => $key2), true);
         list($ret, $error) = $this->bucketManager->batch($ops);
         $this->assertEquals(200, $ret[0]['code']);
         $error = $this->bucketManager->delete($this->bucketName, $key2);
@@ -211,4 +213,15 @@ class BucketTest extends \PHPUnit_Framework_TestCase
         list($ret, $error) = $this->bucketManager->batch($ops);
         $this->assertEquals(200, $ret[0]['code']);
     }
+
+    public function testDeleteAfterDays()
+    {
+        $key = rand();
+        $err = $this->bucketManager->deleteAfterDays($this->bucketName, $key, 1);
+        $this->assertEquals(612, $err->code());
+
+        $this->bucketManager->copy($this->bucketName, $this->key, $this->bucketName, $key);
+        $err = $this->bucketManager->deleteAfterDays($this->bucketName, $key, 1);
+        $this->assertEquals(null, $err);
+    }
 }

vendor/qiniu/php-sdk/tests/Qiniu/Tests/CdnManagerTest.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Created by IntelliJ IDEA.
+ * User: wf
+ * Date: 2017/6/21
+ * Time: AM8:46
+ */
+
+namespace Qiniu\Tests;
+
+use Qiniu\Cdn\CdnManager;
+use Qiniu\Http\Client;
+
+class CdnManagerTest extends \PHPUnit_Framework_TestCase
+{
+    protected $cdnManager;
+    protected $encryptKey;
+    protected $imgUrl;
+
+    protected function setUp()
+    {
+        global $timestampAntiLeechEncryptKey;
+        global $customDomain;
+        global $testAuth;
+
+        $this->cdnManager = new CdnManager($testAuth);
+        $this->encryptKey = $timestampAntiLeechEncryptKey;
+        $this->imgUrl = $customDomain . '/24.jpg';
+    }
+
+    public function testCreateTimestampAntiLeechUrl()
+    {
+
+        $signUrl = $this->cdnManager->createTimestampAntiLeechUrl($this->imgUrl, $this->encryptKey, 3600);
+
+        $response = Client::get($signUrl);
+        $this->assertEquals($response->statusCode, 200);
+        $this->assertNull($response->error);
+
+        $url2 = $this->imgUrl . '?imageInfo';
+        $signUrl2 = $this->cdnManager->createTimestampAntiLeechUrl($url2, $this->encryptKey, 3600);
+
+        $response = Client::get($signUrl2);
+        $imgInfo = $response->json();
+
+        $this->assertEquals($response->statusCode, 200);
+        $this->assertEquals($imgInfo['size'], 2196145);
+        $this->assertNull($response->error);
+    }
+}

vendor/qiniu/php-sdk/tests/Qiniu/Tests/EtagTest.php

@@ -16,37 +16,37 @@ class EtagTest extends \PHPUnit_Framework_TestCase
 
     public function testLess4M()
     {
-        $file = qiniuTempFile(3*1024*1024);
+        $file = qiniuTempFile(3 * 1024 * 1024);
         list($r, $error) = Etag::sum($file);
         unlink($file);
-        $this->assertEquals('lrGEYiVvREEgGl_foQEnZ5a5BqwZ', $r);
+        $this->assertEquals('Fs5BpnAjRykYTg6o5E09cjuXrDkG', $r);
         $this->assertNull($error);
     }
 
     public function test4M()
     {
-        $file = qiniuTempFile(4*1024*1024);
+        $file = qiniuTempFile(4 * 1024 * 1024);
         list($r, $error) = Etag::sum($file);
         unlink($file);
-        $this->assertEquals('lvOwUCzD-YVymzwJLRGZR3eD__GV', $r);
+        $this->assertEquals('FiuKULnybewpEnrfTmxjsxc-3dWp', $r);
         $this->assertNull($error);
     }
 
     public function testMore4M()
     {
-        $file = qiniuTempFile(5*1024*1024);
+        $file = qiniuTempFile(5 * 1024 * 1024);
         list($r, $error) = Etag::sum($file);
         unlink($file);
-        $this->assertEquals('lqtEDHt7Yo5j1a2mjlB2Ds8DUYNM', $r);
+        $this->assertEquals('lhvyfIWMYFTq4s4alzlhXoAkqfVL', $r);
         $this->assertNull($error);
     }
 
     public function test8M()
     {
-        $file = qiniuTempFile(8*1024*1024);
+        $file = qiniuTempFile(8 * 1024 * 1024);
         list($r, $error) = Etag::sum($file);
         unlink($file);
-        $this->assertEquals('ljpekgMJ9VSYlE8hMX06GIWXxfDI', $r);
+        $this->assertEquals('lmRm9ZfGZ86bnMys4wRTWtJj9ClG', $r);
         $this->assertNull($error);
     }
 }

vendor/qiniu/php-sdk/tests/Qiniu/Tests/HttpTest.php

@@ -16,7 +16,7 @@ class HttpTest extends \PHPUnit_Framework_TestCase
     public function testGetQiniu()
     {
         $response = Client::get('up.qiniu.com');
-        $this->assertEquals(404, $response->statusCode);
+        $this->assertEquals(405, $response->statusCode);
         $this->assertNotNull($response->body);
         $this->assertNotNull($response->xReqId());
         $this->assertNotNull($response->xLog());

vendor/qiniu/php-sdk/tests/Qiniu/Tests/ImageUrlBuilderTest.php

@@ -67,7 +67,7 @@ class ImageUrlBuilderTest extends \PHPUnit_Framework_TestCase
             $url . '?imageView2/1/w/200/h/200/format/png/interlace/1/ignore-error/1/',
             \Qiniu\thumbnail($url, 1, 200, 200, 'png', 1, 101)
         );
-    
+
         // 多参数测试
         $this->assertEquals(
             $url2 . '|imageView2/1/w/200/h/200/ignore-error/1/',
@@ -114,7 +114,7 @@ class ImageUrlBuilderTest extends \PHPUnit_Framework_TestCase
             . '/dissolve/100/gravity/SouthEast/',
             \Qiniu\waterImg($url, $image)
         );
-        
+
         // 横轴边距测试
         $this->assertEquals(
             $url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
@@ -126,7 +126,7 @@ class ImageUrlBuilderTest extends \PHPUnit_Framework_TestCase
             . '/dissolve/100/gravity/SouthEast/',
             \Qiniu\waterImg($url, $image, 100, 'SouthEast', 'sad')
         );
-        
+
         // 纵轴边距测试
         $this->assertEquals(
             $url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
@@ -138,7 +138,7 @@ class ImageUrlBuilderTest extends \PHPUnit_Framework_TestCase
             . '/dissolve/100/gravity/SouthEast/',
             \Qiniu\waterImg($url, $image, 100, 'SouthEast', 'sad', 'asdf')
         );
-        
+
         // 自适应原图的短边比例测试
         $this->assertEquals(
             $url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
@@ -150,7 +150,7 @@ class ImageUrlBuilderTest extends \PHPUnit_Framework_TestCase
             . '/dissolve/100/gravity/SouthEast/',
             \Qiniu\waterImg($url, $image, 100, 'SouthEast', 'sad', 'asdf', 2)
         );
-    
+
         // 多参数测试
         $this->assertEquals(
             $url2 . '|watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
@@ -201,7 +201,7 @@ class ImageUrlBuilderTest extends \PHPUnit_Framework_TestCase
             . '/dissolve/100/gravity/SouthEast/',
             \Qiniu\waterText($url, $text, $font, 'sdf', $fontColor)
         );
-        
+
         // 透明度测试
         $this->assertEquals(
             $url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA=='
@@ -213,7 +213,7 @@ class ImageUrlBuilderTest extends \PHPUnit_Framework_TestCase
             . '/gravity/SouthEast/',
             \Qiniu\waterText($url, $text, $font, 'sdf', $fontColor, 101)
         );
-        
+
         // 水印位置测试
         $this->assertEquals(
             $url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA=='

vendor/qiniu/php-sdk/tests/Qiniu/Tests/PfopTest.php

@@ -11,12 +11,12 @@ class PfopTest extends \PHPUnit_Framework_TestCase
         global $testAuth;
         $bucket = 'testres';
         $key = 'sintel_trailer.mp4';
-        $pfop = new PersistentFop($testAuth, $bucket);
+        $pfop = new PersistentFop($testAuth, null);
-        
+
         $fops = 'avthumb/m3u8/segtime/10/vcodec/libx264/s/320x240';
-        list($id, $error) = $pfop->execute($key, $fops);
+        list($id, $error) = $pfop->execute($bucket, $key, $fops);
         $this->assertNull($error);
-        list($status, $error) = PersistentFop::status($id);
+        list($status, $error) = $pfop->status($id);
         $this->assertNotNull($status);
         $this->assertNull($error);
     }
@@ -28,15 +28,15 @@ class PfopTest extends \PHPUnit_Framework_TestCase
         $bucket = 'testres';
         $key = 'sintel_trailer.mp4';
         $fops = array(
-                'avthumb/m3u8/segtime/10/vcodec/libx264/s/320x240',
+            'avthumb/m3u8/segtime/10/vcodec/libx264/s/320x240',
-                'vframe/jpg/offset/7/w/480/h/360',
+            'vframe/jpg/offset/7/w/480/h/360',
-            );
+        );
-        $pfop = new PersistentFop($testAuth, $bucket);
+        $pfop = new PersistentFop($testAuth, null);
 
-        list($id, $error) = $pfop->execute($key, $fops);
+        list($id, $error) = $pfop->execute($bucket, $key, $fops);
         $this->assertNull($error);
 
-        list($status, $error) = PersistentFop::status($id);
+        list($status, $error) = $pfop->status($id);
         $this->assertNotNull($status);
         $this->assertNull($error);
     }
@@ -46,7 +46,7 @@ class PfopTest extends \PHPUnit_Framework_TestCase
         global $testAuth;
         $bucket = 'phpsdk';
         $key = 'php-logo.png';
-        $pfop = new PersistentFop($testAuth, $bucket);
+        $pfop = new PersistentFop($testAuth, null);
 
         $url1 = 'http://phpsdk.qiniudn.com/php-logo.png';
         $url2 = 'http://phpsdk.qiniudn.com/php-sdk.html';
@@ -56,10 +56,10 @@ class PfopTest extends \PHPUnit_Framework_TestCase
         $fops .= '/url/' . \Qiniu\base64_urlSafeEncode($url2);
         $fops .= '|saveas/' . \Qiniu\base64_urlSafeEncode("$bucket:$zipKey");
 
-        list($id, $error) = $pfop->execute($key, $fops);
+        list($id, $error) = $pfop->execute($bucket, $key, $fops);
         $this->assertNull($error);
 
-        list($status, $error) = PersistentFop::status($id);
+        list($status, $error) = $pfop->status($id);
         $this->assertNotNull($status);
         $this->assertNull($error);
     }

vendor/qiniu/php-sdk/tests/Qiniu/Tests/ResumeUpTest.php

@@ -10,6 +10,7 @@ class ResumeUpTest extends \PHPUnit_Framework_TestCase
 {
     protected $bucketName;
     protected $auth;
+
     protected function setUp()
     {
         global $bucketName;
@@ -24,7 +25,7 @@ class ResumeUpTest extends \PHPUnit_Framework_TestCase
         $key = 'resumePutFile4ML';
         $upManager = new UploadManager();
         $token = $this->auth->uploadToken($this->bucketName, $key);
-        $tempFile = qiniuTempFile(4*1024*1024+10);
+        $tempFile = qiniuTempFile(4 * 1024 * 1024 + 10);
         list($ret, $error) = $upManager->putFile($token, $key, $tempFile);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
@@ -34,16 +35,17 @@ class ResumeUpTest extends \PHPUnit_Framework_TestCase
     public function test4ML2()
     {
         $key = 'resumePutFile4ML';
-        $zone = new Zone('http://up.fake.qiniu.com', 'http://up.qiniu.com');
+        $zone = new Zone(array('up.fake.qiniu.com'), array('up.qiniup.com'));
         $cfg = new Config($zone);
         $upManager = new UploadManager($cfg);
         $token = $this->auth->uploadToken($this->bucketName, $key);
-        $tempFile = qiniuTempFile(4*1024*1024+10);
+        $tempFile = qiniuTempFile(4 * 1024 * 1024 + 10);
         list($ret, $error) = $upManager->putFile($token, $key, $tempFile);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
         unlink($tempFile);
     }
+
     // public function test8M()
     // {
     //     $key = 'resumePutFile8M';

vendor/qiniu/php-sdk/tests/Qiniu/Tests/ZoneTest.php

@@ -35,93 +35,26 @@ class ZoneTest extends \PHPUnit_Framework_TestCase
 
     public function testUpHosts()
     {
+        $zone = Zone::queryZone($this->ak, $this->bucketName);
+        print_r($zone);
+        $this->assertContains('upload.qiniup.com', $zone->cdnUpHosts);
 
-        // test nb http
+        $zone = Zone::queryZone($this->ak, $this->bucketNameBC);
-        list($upHosts, $err) = $this->zone->getUpHosts($this->ak, $this->bucketName);
+        $this->assertContains('upload-z1.qiniup.com', $zone->cdnUpHosts);
-        $this->assertNull($err);
-        $this->assertEquals('http://up.qiniu.com', $upHosts[0]);
-        $this->assertEquals('http://upload.qiniu.com', $upHosts[1]);
 
-        // test bc http
+        $zone = Zone::queryZone($this->ak, $this->bucketNameNA);
-        list($upHosts, $err) = $this->zone->getUpHosts($this->ak, $this->bucketNameBC);
+        $this->assertContains('upload-na0.qiniup.com', $zone->cdnUpHosts);
-        $this->assertNull($err);
-        $this->assertEquals('http://up-z1.qiniu.com', $upHosts[0]);
-        $this->assertEquals('http://upload-z1.qiniu.com', $upHosts[1]);
-
-        // test na http
-        list($upHosts, $err) = $this->zone->getUpHosts($this->ak, $this->bucketNameNA);
-        $this->assertNull($err);
-        $this->assertEquals('http://up-na0.qiniu.com', $upHosts[0]);
-
-        // test nb https
-        list($upHosts, $err) = $this->zoneHttps->getUpHosts($this->ak, $this->bucketName);
-        $this->assertNull($err);
-        $this->assertEquals('https://up.qbox.me', $upHosts[0]);
-
-        // test bc https
-        list($upHosts, $err) = $this->zoneHttps->getUpHosts($this->ak, $this->bucketNameBC);
-        $this->assertNull($err);
-        $this->assertEquals('https://up-z1.qbox.me', $upHosts[0]);
-
-        // test na https
-        list($upHosts, $err) = $this->zoneHttps->getUpHosts($this->ak, $this->bucketNameNA);
-        $this->assertNull($err);
-        $this->assertEquals('https://up-na0.qbox.me', $upHosts[0]);
-    }
-
-    public function testUpHostByToken()
-    {
-        $uptoken_bc = 'QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm:bl77a3xPdTyBNYFGVRy
-        oIQNyp_s=:eyJzY29wZSI6InBocHNkay1iYyIsImRlYWRsaW5lIjoxNDcwNzI1MzE1LCJ1cEhvc
-        3RzIjpbImh0dHA6XC9cL3VwLXoxLnFpbml1LmNvbSIsImh0dHA6XC9cL3VwbG9hZC16MS5xaW5p
-        dS5jb20iLCItSCB1cC16MS5xaW5pdS5jb20gaHR0cDpcL1wvMTA2LjM4LjIyNy4yNyJdfQ==';
-
-        list($upHost, $err) = $this->zone->getUpHostByToken($uptoken_bc);
-        $this->assertEquals('http://up-z1.qiniu.com', $upHost);
-        $this->assertEquals(null, $err);
-
-        list($upHostBackup, $err) = $this->zone->getBackupUpHostByToken($uptoken_bc);
-        $this->assertEquals('http://upload-z1.qiniu.com', $upHostBackup);
-        $this->assertEquals(null, $err);
-
-
-        $uptoken_bc_https = 'QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm:7I47O-vFcN5TKO
-        6D7cobHPVkyIA=:eyJzY29wZSI6InBocHNkay1iYyIsImRlYWRsaW5lIjoxNDcwNzIyNzQ1LCJ1c
-        Ehvc3RzIjpbImh0dHBzOlwvXC91cC16MS5xYm94Lm1lIl19';
-        list($upHost, $err) = $this->zoneHttps->getUpHostByToken($uptoken_bc_https);
-        $this->assertEquals('https://up-z1.qbox.me', $upHost);
-        $this->assertEquals(null, $err);
-
-        list($upHostBackup, $err) = $this->zoneHttps->getBackupUpHostByToken($uptoken_bc_https);
-        $this->assertEquals('https://up-z1.qbox.me', $upHostBackup);
-        $this->assertEquals(null, $err);
     }
 
     public function testIoHosts()
     {
+        $zone = Zone::queryZone($this->ak, $this->bucketName);
+        $this->assertEquals($zone->iovipHost, 'iovip.qbox.me');
 
-        // test nb http
+        $zone = Zone::queryZone($this->ak, $this->bucketNameBC);
-        $ioHost = $this->zone->getIoHost($this->ak, $this->bucketName);
+        $this->assertEquals($zone->iovipHost, 'iovip-z1.qbox.me');
-        $this->assertEquals('http://iovip.qbox.me', $ioHost);
 
-        // test bc http
+        $zone = Zone::queryZone($this->ak, $this->bucketNameNA);
-        $ioHost = $this->zone->getIoHost($this->ak, $this->bucketNameBC);
+        $this->assertEquals($zone->iovipHost, 'iovip-na0.qbox.me');
-        $this->assertEquals('http://iovip-z1.qbox.me', $ioHost);
-
-        // test na http
-        $ioHost = $this->zone->getIoHost($this->ak, $this->bucketNameNA);
-        $this->assertEquals('http://iovip-na0.qbox.me', $ioHost);
-
-        // test nb https
-        $ioHost = $this->zoneHttps->getIoHost($this->ak, $this->bucketName);
-        $this->assertEquals('https://iovip.qbox.me', $ioHost);
-
-        // test bc https
-        $ioHost = $this->zoneHttps->getIoHost($this->ak, $this->bucketNameBC);
-        $this->assertEquals('https://iovip-z1.qbox.me', $ioHost);
-
-        // test na https
-        $ioHost = $this->zoneHttps->getIoHost($this->ak, $this->bucketNameNA);
-        $this->assertEquals('https://iovip-na0.qbox.me', $ioHost);
     }
 }

vendor/qiniu/php-sdk/tests/bootstrap.php

@@ -1,15 +1,17 @@
 <?php
 // @codingStandardsIgnoreFile
-require_once __DIR__.'/../vendor/autoload.php';
+require_once __DIR__ . '/../autoload.php';
 
 use Qiniu\Auth;
 
-$accessKey = 'QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm';
+$accessKey = getenv('QINIU_ACCESS_KEY');
-$secretKey = 'Bxckh6FA-Fbs9Yt3i3cbKVK22UPBmAOHJcL95pGz';
+$secretKey = getenv('QINIU_SECRET_KEY');
 $testAuth = new Auth($accessKey, $secretKey);
+
 $bucketName = 'phpsdk';
 $key = 'php-logo.png';
 $key2 = 'niu.jpg';
+
 $bucketNameBC = 'phpsdk-bc';
 $bucketNameNA = 'phpsdk-na';
 
@@ -17,10 +19,11 @@ $dummyAccessKey = 'abcdefghklmnopq';
 $dummySecretKey = '1234567890';
 $dummyAuth = new Auth($dummyAccessKey, $dummySecretKey);
 
+//cdn
+$timestampAntiLeechEncryptKey = getenv('QINIU_TIMESTAMP_ENCRPTKEY');
+$customDomain = "http://phpsdk.qiniuts.com";
+
 $tid = getenv('TRAVIS_JOB_NUMBER');
-
-$testEnv = getenv('QINIU_TEST_ENV');
-
 if (!empty($tid)) {
     $pid = getmypid();
     $tid = strstr($tid, '.');
@@ -32,7 +35,7 @@ function qiniuTempFile($size)
     $fileName = tempnam(sys_get_temp_dir(), 'qiniu_');
     $file = fopen($fileName, 'wb');
     if ($size > 0) {
-        fseek($file, $size-1);
+        fseek($file, $size - 1);
         fwrite($file, ' ');
     }
     fclose($file);

vendor/symfony/options-resolver/composer.json

@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=5.5.9"
+        "php": "^5.5.9|>=7.0.8"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\OptionsResolver\\": "" },