xiaohuilam / laravel-flysystem-wantu

src/WantuFileServiceProvider.php

Indentation +18 added lines, -18 removed lines

@@ -10,22 +10,22 @@
 
 class WantuFileServiceProvider extends ServiceProvider
 {
-    public function boot()
-    {
-        app('filesystem')->extend('wantu', function ($app, $config) {
-            $adapter = new WantuFileAdapter(
-                $config['access_key'],
-                $config['secret_key'],
-                $config['namespace'],
-                $config['domain']
-            );
-            $flysystem = new Filesystem($adapter, new Config(['disable_asserts' => true]));
-            // $flysystem->addPlugin(new FetchFile());
-            $flysystem->addPlugin(new UploadToken());
-            $flysystem->addPlugin(new GetUrl());
-            // $flysystem->addPlugin(new PrivateDownloadUrl());
-            // $flysystem->addPlugin(new RefreshFile());
-            return $flysystem;
-        });
-    }
+	public function boot()
+	{
+		app('filesystem')->extend('wantu', function ($app, $config) {
+			$adapter = new WantuFileAdapter(
+				$config['access_key'],
+				$config['secret_key'],
+				$config['namespace'],
+				$config['domain']
+			);
+			$flysystem = new Filesystem($adapter, new Config(['disable_asserts' => true]));
+			// $flysystem->addPlugin(new FetchFile());
+			$flysystem->addPlugin(new UploadToken());
+			$flysystem->addPlugin(new GetUrl());
+			// $flysystem->addPlugin(new PrivateDownloadUrl());
+			// $flysystem->addPlugin(new RefreshFile());
+			return $flysystem;
+		});
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 {
     public function boot()
     {
-        app('filesystem')->extend('wantu', function ($app, $config) {
+        app('filesystem')->extend('wantu', function($app, $config) {
             $adapter = new WantuFileAdapter(
                 $config['access_key'],
                 $config['secret_key'],

src/Plugins/UploadToken.php

Indentation +8 added lines, -8 removed lines

@@ -5,13 +5,13 @@
 
 class UploadToken extends AbstractPlugin
 {
-    public function getMethod()
-    {
-        return 'getUploadToken';
-    }
+	public function getMethod()
+	{
+		return 'getUploadToken';
+	}
 
-    public function handle($option = null)
-    {
-        return $this->filesystem->getAdapter()->getUploadToken($option);
-    }
+	public function handle($option = null)
+	{
+		return $this->filesystem->getAdapter()->getUploadToken($option);
+	}
 }

src/Plugins/GetUrl.php

Indentation +8 added lines, -8 removed lines

@@ -5,12 +5,12 @@
 
 class GetUrl extends AbstractPlugin
 {
-    public function getMethod()
-    {
-        return 'getUrl';
-    }
-    public function handle($path)
-    {
-        return $this->filesystem->getAdapter()->getUrl($path);
-    }
+	public function getMethod()
+	{
+		return 'getUrl';
+	}
+	public function handle($path)
+	{
+		return $this->filesystem->getAdapter()->getUrl($path);
+	}
 }

src/WantuFileAdapter.php

Indentation +385 added lines, -385 removed lines

@@ -12,389 +12,389 @@
 
 class WantuFileAdapter extends AbstractAdapter
 {
-    use NotSupportingVisibilityTrait;
-
-    /**
-     * @var Client|null
-     */
-    private $client = null;
-
-    /**
-     * @var string
-     */
-    private $namespace = null;
-
-    /**
-     * @var string
-     */
-    private $domain = null;
-
-    /**
-     * @param string $accessKey
-     * @param string $secretKey
-     * @param string $namespace
-     */
-    public function __construct($accessKey, $secretKey, $namespace, $origin)
-    {
-        $client = new Client($accessKey, $secretKey, $namespace);
-        $this->setClient($client, $namespace, $origin);
-    }
-
-    public function setClient(Client $client, $namespace, $origin)
-    {
-        $this->client = $client;
-        $this->namespace = $namespace;
-        $this->domain = $origin;
-    }
-
-    /**
-     * Write a new file.
-     *
-     * @param string $path
-     * @param string $contents
-     * @param Config $config   Config object
-     *
-     * @return array|false false on failure file meta data on success
-     */
-    public function write($path, $contents, Config $config)
-    {
-        $uploadPolicy = new UploadPolicy([
-            'namespace' => $this->namespace,
-            'dir' => preg_replace('/^\./', '', dirname($path)),
-            'name' => last(explode("/", $path)),
-        ]);
-
-        return $this->client->uploadData($contents, $uploadPolicy);
-    }
-
-    /**
-     * Write a new file using a stream.
-     *
-     * @param string   $path
-     * @param resource $resource
-     * @param Config   $config   Config object
-     *
-     * @return array|false false on failure file meta data on success
-     */
-    public function writeStream($path, $resource, Config $config)
-    {
-        $contents = '';
-
-        while (!feof($resource)) {
-            $contents .= fread($resource, 1024);
-        }
-
-        $response = $this->write($path, $contents, $config);
-
-        if (false === $response) {
-            return $response;
-        }
-
-        return compact('path');
-    }
-
-    /**
-     * Update a file.
-     *
-     * @param string $path
-     * @param string $contents
-     * @param Config $config   Config object
-     *
-     * @return array|false false on failure file meta data on success
-     */
-    public function update($path, $contents, Config $config)
-    {
-        $this->delete($path);
-
-        return $this->write($path, $contents, $config);
-    }
-
-    /**
-     * Update a file using a stream.
-     *
-     * @param string   $path
-     * @param resource $resource
-     * @param Config   $config   Config object
-     *
-     * @return array|false false on failure file meta data on success
-     */
-    public function updateStream($path, $resource, Config $config)
-    {
-        $this->delete($path);
-
-        return $this->writeStream($path, $resource, $config);
-    }
-
-    public function put($path, $contents, Config $config)
-    {
-        return $this->write($path, $contents, $config);
-    }
-
-    public function putStream($path, $resource, Config $config)
-    {
-        return $this->write($path, $resource, $config);
-    }
-
-    /**
-     * Rename a file.
-     *
-     * @param string $path
-     * @param string $newpath
-     *
-     * @return bool
-     */
-    public function rename($path, $newpath)
-    {
-        return $this->client->renameFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)), preg_replace('/^\./', '', dirname($newpath)), last(explode("/", $newpath)));
-    }
-
-    /**
-     * Copy a file.
-     *
-     * @param string $path
-     * @param string $newpath
-     *
-     * @return bool
-     */
-    public function copy($path, $newpath)
-    {
-    }
-
-    /**
-     * Delete a file.
-     *
-     * @param string $path
-     *
-     * @return bool
-     */
-    public function delete($path)
-    {
-        return $this->client->deleteFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
-    }
-
-    /**
-     * Delete a directory.
-     *
-     * @param string $dirname
-     *
-     * @return bool
-     */
-    public function deleteDir($dirname)
-    {
-        return $this->client->deleteDir($this->namespace, $dirname);
-    }
-
-    /**
-     * Create a directory.
-     *
-     * @param string $dirname directory name
-     * @param Config $config
-     *
-     * @return array|false
-     */
-    public function createDir($dirname, Config $config)
-    {
-        return $this->client->createDir($this->namespace, $dirname);
-    }
-
-    /**
-     * Check whether a file exists.
-     *
-     * @param string $path
-     *
-     * @return array|bool|null
-     */
-    public function has($path)
-    {
-        if (Str::endsWith($path, "/")) {
-            return $this->client->existsFolder($this->namespace, preg_replace('/^\./', '', dirname($path)));
-        } else {
-            return $this->client->existsFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
-        }
-    }
-
-
-    /**
-     * Read a file.
-     *
-     * @param string $path
-     *
-     * @return array|false
-     */
-    public function read($path)
-    {
-        $contents = file_get_contents($this->getUrl($path));
-        return compact('contents', 'path');
-    }
-
-    /**
-     * Read a file as a stream.
-     *
-     * @param string $path
-     *
-     * @return array|false
-     */
-    public function readStream($path)
-    {
-    }
-
-    /**
-     * List contents of a directory.
-     *
-     * @param string $directory
-     * @param bool   $recursive
-     *
-     * @return array
-     */
-    public function listContents($directory = '', $recursive = false)
-    {
-        return $this->client->listFiles($this->namespace, $directory, 1, 1000);
-    }
-
-    /**
-     * Get all the meta data of a file or directory.
-     *
-     * @param string $path
-     *
-     * @return array|false
-     */
-    public function getMetadata($path)
-    {
-        return $this->client->getFileInfo($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
-    }
-
-    /**
-     * Get the size of a file.
-     *
-     * @param string $path
-     *
-     * @return array|false
-     */
-    public function getSize($path)
-    {
-    }
-
-
-    /**
-     * Fetch url to bucket.
-     *
-     * @param string $path
-     * @param string $url
-     *
-     * @return array|false
-     */
-    public function fetch($path, $url)
-    {
-    }
-
-    /**
-     * Get private file download url.
-     *
-     * @param string $path
-     * @param int    $expires
-     *
-     * @return string
-     */
-    public function privateDownloadUrl($path, $expires = 3600)
-    {
-    }
-
-    /**
-     * Refresh file cache.
-     *
-     * @param string|array $path
-     *
-     * @return array
-     */
-    public function refresh($path)
-    {
-    }
-
-
-    /**
-     * Get the mime-type of a file.
-     *
-     * @param string $path
-     *
-     * @return array|false
-     */
-    public function getMimeType($path)
-    {
-    }
-
-
-    /**
-     * Get the timestamp of a file.
-     *
-     * @param string $path
-     *
-     * @return array|false
-     */
-    public function getTimestamp($path)
-    {
-    }
-
-    /**
-     * Get the upload token.
-     *
-     * @param string|null $key
-     * @param int         $ttl
-     * @param string|null $policy
-     * @param string|null $strictPolice
-     *
-     * @return string
-     */
-    public function getUploadToken($option = null)
-    {
-        if ($option === null) {
-            $option = ['name' => null, 'ttl' => 3600, ];
-        } elseif (!isset($option['ttl']) || !$option['ttl']) {
-            $option['ttl'] = 3600;
-        }
-
-        return $this->client->getUploadToken(collect([
-            'expiration' => Carbon::now()->addSeconds($option['ttl'])->timestamp * 1000,
-            'insertOnly' => Conf::INSERT_ONLY_TRUE
-        ])->merge(collect($option)->except(['ttl',])));
-    }
-
-    /**
-     * @param array $stats
-     *
-     * @return array
-     */
-    protected function normalizeFileInfo(array $stats)
-    {
-        return [
-            'type' => 'file',
-            'path' => $stats['key'],
-            'timestamp' => floor($stats['putTime'] / 10000000),
-            'size' => $stats['fsize'],
-        ];
-    }
-
-    /**
-     * Get resource url.
-     *
-     * @param string $path
-     *
-     * @return string
-     */
-    public function getUrl($path)
-    {
-        return $this->normalizeHost($this->domain) . ltrim($path, '/');
-    }
-
-    /**
-     * @param string $domain
-     *
-     * @return string
-     */
-    protected function normalizeHost($domain)
-    {
-        if (0 !== stripos($domain, 'https://') && 0 !== stripos($domain, 'http://')) {
-            $domain = "http://{$domain}";
-        }
-        return rtrim($domain, '/') . '/';
-    }
+	use NotSupportingVisibilityTrait;
+
+	/**
+	 * @var Client|null
+	 */
+	private $client = null;
+
+	/**
+	 * @var string
+	 */
+	private $namespace = null;
+
+	/**
+	 * @var string
+	 */
+	private $domain = null;
+
+	/**
+	 * @param string $accessKey
+	 * @param string $secretKey
+	 * @param string $namespace
+	 */
+	public function __construct($accessKey, $secretKey, $namespace, $origin)
+	{
+		$client = new Client($accessKey, $secretKey, $namespace);
+		$this->setClient($client, $namespace, $origin);
+	}
+
+	public function setClient(Client $client, $namespace, $origin)
+	{
+		$this->client = $client;
+		$this->namespace = $namespace;
+		$this->domain = $origin;
+	}
+
+	/**
+	 * Write a new file.
+	 *
+	 * @param string $path
+	 * @param string $contents
+	 * @param Config $config   Config object
+	 *
+	 * @return array|false false on failure file meta data on success
+	 */
+	public function write($path, $contents, Config $config)
+	{
+		$uploadPolicy = new UploadPolicy([
+			'namespace' => $this->namespace,
+			'dir' => preg_replace('/^\./', '', dirname($path)),
+			'name' => last(explode("/", $path)),
+		]);
+
+		return $this->client->uploadData($contents, $uploadPolicy);
+	}
+
+	/**
+	 * Write a new file using a stream.
+	 *
+	 * @param string   $path
+	 * @param resource $resource
+	 * @param Config   $config   Config object
+	 *
+	 * @return array|false false on failure file meta data on success
+	 */
+	public function writeStream($path, $resource, Config $config)
+	{
+		$contents = '';
+
+		while (!feof($resource)) {
+			$contents .= fread($resource, 1024);
+		}
+
+		$response = $this->write($path, $contents, $config);
+
+		if (false === $response) {
+			return $response;
+		}
+
+		return compact('path');
+	}
+
+	/**
+	 * Update a file.
+	 *
+	 * @param string $path
+	 * @param string $contents
+	 * @param Config $config   Config object
+	 *
+	 * @return array|false false on failure file meta data on success
+	 */
+	public function update($path, $contents, Config $config)
+	{
+		$this->delete($path);
+
+		return $this->write($path, $contents, $config);
+	}
+
+	/**
+	 * Update a file using a stream.
+	 *
+	 * @param string   $path
+	 * @param resource $resource
+	 * @param Config   $config   Config object
+	 *
+	 * @return array|false false on failure file meta data on success
+	 */
+	public function updateStream($path, $resource, Config $config)
+	{
+		$this->delete($path);
+
+		return $this->writeStream($path, $resource, $config);
+	}
+
+	public function put($path, $contents, Config $config)
+	{
+		return $this->write($path, $contents, $config);
+	}
+
+	public function putStream($path, $resource, Config $config)
+	{
+		return $this->write($path, $resource, $config);
+	}
+
+	/**
+	 * Rename a file.
+	 *
+	 * @param string $path
+	 * @param string $newpath
+	 *
+	 * @return bool
+	 */
+	public function rename($path, $newpath)
+	{
+		return $this->client->renameFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)), preg_replace('/^\./', '', dirname($newpath)), last(explode("/", $newpath)));
+	}
+
+	/**
+	 * Copy a file.
+	 *
+	 * @param string $path
+	 * @param string $newpath
+	 *
+	 * @return bool
+	 */
+	public function copy($path, $newpath)
+	{
+	}
+
+	/**
+	 * Delete a file.
+	 *
+	 * @param string $path
+	 *
+	 * @return bool
+	 */
+	public function delete($path)
+	{
+		return $this->client->deleteFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
+	}
+
+	/**
+	 * Delete a directory.
+	 *
+	 * @param string $dirname
+	 *
+	 * @return bool
+	 */
+	public function deleteDir($dirname)
+	{
+		return $this->client->deleteDir($this->namespace, $dirname);
+	}
+
+	/**
+	 * Create a directory.
+	 *
+	 * @param string $dirname directory name
+	 * @param Config $config
+	 *
+	 * @return array|false
+	 */
+	public function createDir($dirname, Config $config)
+	{
+		return $this->client->createDir($this->namespace, $dirname);
+	}
+
+	/**
+	 * Check whether a file exists.
+	 *
+	 * @param string $path
+	 *
+	 * @return array|bool|null
+	 */
+	public function has($path)
+	{
+		if (Str::endsWith($path, "/")) {
+			return $this->client->existsFolder($this->namespace, preg_replace('/^\./', '', dirname($path)));
+		} else {
+			return $this->client->existsFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
+		}
+	}
+
+
+	/**
+	 * Read a file.
+	 *
+	 * @param string $path
+	 *
+	 * @return array|false
+	 */
+	public function read($path)
+	{
+		$contents = file_get_contents($this->getUrl($path));
+		return compact('contents', 'path');
+	}
+
+	/**
+	 * Read a file as a stream.
+	 *
+	 * @param string $path
+	 *
+	 * @return array|false
+	 */
+	public function readStream($path)
+	{
+	}
+
+	/**
+	 * List contents of a directory.
+	 *
+	 * @param string $directory
+	 * @param bool   $recursive
+	 *
+	 * @return array
+	 */
+	public function listContents($directory = '', $recursive = false)
+	{
+		return $this->client->listFiles($this->namespace, $directory, 1, 1000);
+	}
+
+	/**
+	 * Get all the meta data of a file or directory.
+	 *
+	 * @param string $path
+	 *
+	 * @return array|false
+	 */
+	public function getMetadata($path)
+	{
+		return $this->client->getFileInfo($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
+	}
+
+	/**
+	 * Get the size of a file.
+	 *
+	 * @param string $path
+	 *
+	 * @return array|false
+	 */
+	public function getSize($path)
+	{
+	}
+
+
+	/**
+	 * Fetch url to bucket.
+	 *
+	 * @param string $path
+	 * @param string $url
+	 *
+	 * @return array|false
+	 */
+	public function fetch($path, $url)
+	{
+	}
+
+	/**
+	 * Get private file download url.
+	 *
+	 * @param string $path
+	 * @param int    $expires
+	 *
+	 * @return string
+	 */
+	public function privateDownloadUrl($path, $expires = 3600)
+	{
+	}
+
+	/**
+	 * Refresh file cache.
+	 *
+	 * @param string|array $path
+	 *
+	 * @return array
+	 */
+	public function refresh($path)
+	{
+	}
+
+
+	/**
+	 * Get the mime-type of a file.
+	 *
+	 * @param string $path
+	 *
+	 * @return array|false
+	 */
+	public function getMimeType($path)
+	{
+	}
+
+
+	/**
+	 * Get the timestamp of a file.
+	 *
+	 * @param string $path
+	 *
+	 * @return array|false
+	 */
+	public function getTimestamp($path)
+	{
+	}
+
+	/**
+	 * Get the upload token.
+	 *
+	 * @param string|null $key
+	 * @param int         $ttl
+	 * @param string|null $policy
+	 * @param string|null $strictPolice
+	 *
+	 * @return string
+	 */
+	public function getUploadToken($option = null)
+	{
+		if ($option === null) {
+			$option = ['name' => null, 'ttl' => 3600, ];
+		} elseif (!isset($option['ttl']) || !$option['ttl']) {
+			$option['ttl'] = 3600;
+		}
+
+		return $this->client->getUploadToken(collect([
+			'expiration' => Carbon::now()->addSeconds($option['ttl'])->timestamp * 1000,
+			'insertOnly' => Conf::INSERT_ONLY_TRUE
+		])->merge(collect($option)->except(['ttl',])));
+	}
+
+	/**
+	 * @param array $stats
+	 *
+	 * @return array
+	 */
+	protected function normalizeFileInfo(array $stats)
+	{
+		return [
+			'type' => 'file',
+			'path' => $stats['key'],
+			'timestamp' => floor($stats['putTime'] / 10000000),
+			'size' => $stats['fsize'],
+		];
+	}
+
+	/**
+	 * Get resource url.
+	 *
+	 * @param string $path
+	 *
+	 * @return string
+	 */
+	public function getUrl($path)
+	{
+		return $this->normalizeHost($this->domain) . ltrim($path, '/');
+	}
+
+	/**
+	 * @param string $domain
+	 *
+	 * @return string
+	 */
+	protected function normalizeHost($domain)
+	{
+		if (0 !== stripos($domain, 'https://') && 0 !== stripos($domain, 'http://')) {
+			$domain = "http://{$domain}";
+		}
+		return rtrim($domain, '/') . '/';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -355,7 +355,7 @@
         return $this->client->getUploadToken(collect([
             'expiration' => Carbon::now()->addSeconds($option['ttl'])->timestamp * 1000,
             'insertOnly' => Conf::INSERT_ONLY_TRUE
-        ])->merge(collect($option)->except(['ttl',])));
+        ])->merge(collect($option)->except(['ttl', ])));
     }
 
     /**

sdk/Utils/UploadPolicy.php

Indentation +38 added lines, -38 removed lines

@@ -5,47 +5,47 @@
 
 class UploadPolicy
 {
-    /*如下属性是必须的[The following attributes are required]*/
-    public $namespace;                              // 多媒体服务的空间名[media namespace name]
-    public $bucket;                                 // OSS的空间名[media bucket name]
-    public $insertOnly;                             // 是否可覆盖[upload mode. it's not allowd uploading the same name files]
-    public $expiration;                             // 过期时间[expiration time, unix time, in milliseconds]
+	/*如下属性是必须的[The following attributes are required]*/
+	public $namespace;                              // 多媒体服务的空间名[media namespace name]
+	public $bucket;                                 // OSS的空间名[media bucket name]
+	public $insertOnly;                             // 是否可覆盖[upload mode. it's not allowd uploading the same name files]
+	public $expiration;                             // 过期时间[expiration time, unix time, in milliseconds]
 
-    /*如下属性是可选的[The following attributes are optional]*/
-    public $detectMime = Conf::DETECT_MIME_TRUE;                             // 是否进行类型检测[is auto detecte media file mime type, default is true]
-    public $dir;                                    // 路径[media file dir, magic vars and custom vars are supported]
-    public $name;                                   // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]
-    public $sizeLimit;                              // 文件大小限制[upload size limited, in bytes]
-    public $mimeLimit;                              // 文件类型限制[upload mime type limited]
-    public $callbackUrl;                            // 回调URL [callback urls, ip address is recommended]
-    public $callbackHost;                           // 回调时Host [callback host]
-    public $callbackBody;                           // 回调时Body [callback body, magic vars and custom vars are supported]
-    public $callbackBodyType;                       // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']
-    public $returnUrl;                              // 上传完成之后,303跳转的Url [return url, when return code is 303]
-    public $returnBody;                             // 上传完成返回体 [return body, magic vars and custom vars are supported]
-    public $mediaEncode;                            // 上传音视频时，可以指定转码策略[media encode policy after upload task has been completed. it's json string]
+	/*如下属性是可选的[The following attributes are optional]*/
+	public $detectMime = Conf::DETECT_MIME_TRUE;                             // 是否进行类型检测[is auto detecte media file mime type, default is true]
+	public $dir;                                    // 路径[media file dir, magic vars and custom vars are supported]
+	public $name;                                   // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]
+	public $sizeLimit;                              // 文件大小限制[upload size limited, in bytes]
+	public $mimeLimit;                              // 文件类型限制[upload mime type limited]
+	public $callbackUrl;                            // 回调URL [callback urls, ip address is recommended]
+	public $callbackHost;                           // 回调时Host [callback host]
+	public $callbackBody;                           // 回调时Body [callback body, magic vars and custom vars are supported]
+	public $callbackBodyType;                       // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']
+	public $returnUrl;                              // 上传完成之后,303跳转的Url [return url, when return code is 303]
+	public $returnBody;                             // 上传完成返回体 [return body, magic vars and custom vars are supported]
+	public $mediaEncode;                            // 上传音视频时，可以指定转码策略[media encode policy after upload task has been completed. it's json string]
 
-    public function __construct($option)
-    {
-        if (!isset($option['expiration']) || !$option['expiration']) {
-            $option['expiration'] = -1;
-        }
+	public function __construct($option)
+	{
+		if (!isset($option['expiration']) || !$option['expiration']) {
+			$option['expiration'] = -1;
+		}
 
-        foreach ($option as $attribute => $value) {
-            $this->{$attribute} = $value;
-        }
-    }
+		foreach ($option as $attribute => $value) {
+			$this->{$attribute} = $value;
+		}
+	}
 
-    public function toArray()
-    {
-        return (array) $this;
-        $array = [];
-        foreach ($this as $attribute => $value) {
-            if ($value !== null) {
-                $array[$attribute] = $value;
-            }
-        }
+	public function toArray()
+	{
+		return (array) $this;
+		$array = [];
+		foreach ($this as $attribute => $value) {
+			if ($value !== null) {
+				$array[$attribute] = $value;
+			}
+		}
 
-        return $array;
-    }
+		return $array;
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -6,24 +6,24 @@
 class UploadPolicy
 {
     /*如下属性是必须的[The following attributes are required]*/
-    public $namespace;                              // 多媒体服务的空间名[media namespace name]
-    public $bucket;                                 // OSS的空间名[media bucket name]
-    public $insertOnly;                             // 是否可覆盖[upload mode. it's not allowd uploading the same name files]
-    public $expiration;                             // 过期时间[expiration time, unix time, in milliseconds]
+    public $namespace; // 多媒体服务的空间名[media namespace name]
+    public $bucket; // OSS的空间名[media bucket name]
+    public $insertOnly; // 是否可覆盖[upload mode. it's not allowd uploading the same name files]
+    public $expiration; // 过期时间[expiration time, unix time, in milliseconds]
 
     /*如下属性是可选的[The following attributes are optional]*/
-    public $detectMime = Conf::DETECT_MIME_TRUE;                             // 是否进行类型检测[is auto detecte media file mime type, default is true]
-    public $dir;                                    // 路径[media file dir, magic vars and custom vars are supported]
-    public $name;                                   // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]
-    public $sizeLimit;                              // 文件大小限制[upload size limited, in bytes]
-    public $mimeLimit;                              // 文件类型限制[upload mime type limited]
-    public $callbackUrl;                            // 回调URL [callback urls, ip address is recommended]
-    public $callbackHost;                           // 回调时Host [callback host]
-    public $callbackBody;                           // 回调时Body [callback body, magic vars and custom vars are supported]
-    public $callbackBodyType;                       // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']
-    public $returnUrl;                              // 上传完成之后,303跳转的Url [return url, when return code is 303]
-    public $returnBody;                             // 上传完成返回体 [return body, magic vars and custom vars are supported]
-    public $mediaEncode;                            // 上传音视频时，可以指定转码策略[media encode policy after upload task has been completed. it's json string]
+    public $detectMime = Conf::DETECT_MIME_TRUE; // 是否进行类型检测[is auto detecte media file mime type, default is true]
+    public $dir; // 路径[media file dir, magic vars and custom vars are supported]
+    public $name; // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]
+    public $sizeLimit; // 文件大小限制[upload size limited, in bytes]
+    public $mimeLimit; // 文件类型限制[upload mime type limited]
+    public $callbackUrl; // 回调URL [callback urls, ip address is recommended]
+    public $callbackHost; // 回调时Host [callback host]
+    public $callbackBody; // 回调时Body [callback body, magic vars and custom vars are supported]
+    public $callbackBodyType; // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']
+    public $returnUrl; // 上传完成之后,303跳转的Url [return url, when return code is 303]
+    public $returnBody; // 上传完成返回体 [return body, magic vars and custom vars are supported]
+    public $mediaEncode; // 上传音视频时，可以指定转码策略[media encode policy after upload task has been completed. it's json string]
 
     public function __construct($option)
     {

sdk/Utils/ManageOption.php

Spacing +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
 final class ManageOption extends ResourceInfo
 {
     /*以下属性是”获取资源列表"方法所需的属性。即listFiles()、listDirs()方法中的参数 */
-    private $currentPage;                            //当前页号
-    private $pageSize;                               //每页的大小
+    private $currentPage; //当前页号
+    private $pageSize; //每页的大小
     /* 以下属性是"扫描黄图和广告图"方法所需的属性。即scanPorn()和scanAdvertising方法中的参数 */
     private $filesArray;
     private $urlsArray;

Indentation +179 added lines, -179 removed lines

@@ -4,192 +4,192 @@
 /**管理时的选项*/
 final class ManageOption extends ResourceInfo
 {
-    /*以下属性是”获取资源列表"方法所需的属性。即listFiles()、listDirs()方法中的参数 */
-    private $currentPage;                            //当前页号
-    private $pageSize;                               //每页的大小
-    /* 以下属性是"扫描黄图和广告图"方法所需的属性。即scanPorn()和scanAdvertising方法中的参数 */
-    private $filesArray;
-    private $urlsArray;
-    /* 以下属性是"鉴黄反馈"方法所需的属性。即pornFeedback()方法中的参数 */
-    private $pornFbArray;
-    /**
-     * UploadPolicy的构造函数
-     */
-    public function __construct($namespace = null)
-    {
-        $this->namespace = $namespace;
-        $this->currentPage = 1;
-        $this->pageSize = 10;
-    }
+	/*以下属性是”获取资源列表"方法所需的属性。即listFiles()、listDirs()方法中的参数 */
+	private $currentPage;                            //当前页号
+	private $pageSize;                               //每页的大小
+	/* 以下属性是"扫描黄图和广告图"方法所需的属性。即scanPorn()和scanAdvertising方法中的参数 */
+	private $filesArray;
+	private $urlsArray;
+	/* 以下属性是"鉴黄反馈"方法所需的属性。即pornFeedback()方法中的参数 */
+	private $pornFbArray;
+	/**
+	 * UploadPolicy的构造函数
+	 */
+	public function __construct($namespace = null)
+	{
+		$this->namespace = $namespace;
+		$this->currentPage = 1;
+		$this->pageSize = 10;
+	}
 
-    /**
-     * 生成文件列表listFiles()方法所需的参数
-     */
-    public function buildListFilesParas()
-    {
-        return "namespace=" . $this->namespace . "&dir=" . urlencode($this->dir) .
-            "&currentPage=" . $this->currentPage . "&pageSize=" . $this->pageSize;
-    }
+	/**
+	 * 生成文件列表listFiles()方法所需的参数
+	 */
+	public function buildListFilesParas()
+	{
+		return "namespace=" . $this->namespace . "&dir=" . urlencode($this->dir) .
+			"&currentPage=" . $this->currentPage . "&pageSize=" . $this->pageSize;
+	}
 
-    /**
-     * 校验待检测资源信息是否合法。如果合法，则返回http请求体<p> 返回格式{$isValid, $message, $bodyArray}
-     */
-    public function checkFilesAndUrls()
-    {
-        if (empty($this->filesArray) && empty($this->urlsArray)) {
-            return array(false, "resource's info is empty"); //待检测资源不能均为空，反馈错误
-        } elseif (!empty($this->filesArray) && !empty($this->urlsArray)) {
-            return array(false, "resource and url could not exist all at once"); //均存在时，反馈错误
-        }
-        $bodyArray = array();
-        $resourceStr = '';
-        if (!empty($this->filesArray)) {
-            //检测文件是否合法。若合法则返回http请求体所需参数
-            foreach ($this->filesArray as $resourceInfo) {
-                list($valid, $msg) = $resourceInfo->checkResourceInfo(true, true); //检测文件信息是否合法
-                if (!$valid) {
-                    return array($valid, $msg);
-                }
-                $resourceStr .= (empty($resourceStr) ? null : ';');
-                $resourceStr .= $resourceInfo->buildResourceId();
-            }
-            $bodyArray['resourceId'] = $resourceStr;
-        } elseif (!empty($this->urlsArray)) {
-            //检测URL是否合法。若合法则返回http请求体所需参数
-            foreach ($this->urlsArray as $url) {
-                if (empty($url)) {
-                    return array(false, "url's info is invalid");
-                }
-                $resourceStr .= (empty($resourceStr) ? null : ';');
-                $resourceStr .= $this->urlencodeCh($url);
-            }
-            $bodyArray['url'] = $resourceStr;
-        }
-        return array(true, 'valid', $bodyArray);
-    }
+	/**
+	 * 校验待检测资源信息是否合法。如果合法，则返回http请求体<p> 返回格式{$isValid, $message, $bodyArray}
+	 */
+	public function checkFilesAndUrls()
+	{
+		if (empty($this->filesArray) && empty($this->urlsArray)) {
+			return array(false, "resource's info is empty"); //待检测资源不能均为空，反馈错误
+		} elseif (!empty($this->filesArray) && !empty($this->urlsArray)) {
+			return array(false, "resource and url could not exist all at once"); //均存在时，反馈错误
+		}
+		$bodyArray = array();
+		$resourceStr = '';
+		if (!empty($this->filesArray)) {
+			//检测文件是否合法。若合法则返回http请求体所需参数
+			foreach ($this->filesArray as $resourceInfo) {
+				list($valid, $msg) = $resourceInfo->checkResourceInfo(true, true); //检测文件信息是否合法
+				if (!$valid) {
+					return array($valid, $msg);
+				}
+				$resourceStr .= (empty($resourceStr) ? null : ';');
+				$resourceStr .= $resourceInfo->buildResourceId();
+			}
+			$bodyArray['resourceId'] = $resourceStr;
+		} elseif (!empty($this->urlsArray)) {
+			//检测URL是否合法。若合法则返回http请求体所需参数
+			foreach ($this->urlsArray as $url) {
+				if (empty($url)) {
+					return array(false, "url's info is invalid");
+				}
+				$resourceStr .= (empty($resourceStr) ? null : ';');
+				$resourceStr .= $this->urlencodeCh($url);
+			}
+			$bodyArray['url'] = $resourceStr;
+		}
+		return array(true, 'valid', $bodyArray);
+	}
 
-    /**
-     * 生成扫描黄图scanPorn()方法所需的参数
-     */
-    public function buildScanPornParas()
-    {
-        $bodyArray = array();
-        if (!empty($this->filesArray)) {
-            $resourceStr = '';
-            foreach ($this->filesArray as $resourceInfo) {
-                $resourceStr .= (empty($resourceStr) ? null : ';');
-                $resourceStr .= $resourceInfo->buildResourceId();
-            }
-            $bodyArray['resourceId'] = $resourceStr;
-        } elseif (!empty($this->urlsArray)) {
-            $urlStr = '';
-            foreach ($this->urlsArray as $url) {
-                $urlStr .= (empty($urlStr) ? null : ';');
-                $urlStr .= urlencode($url);
-            }
-            $bodyArray['url'] = $urlStr;
-        }
-        return $bodyArray;
-    }
+	/**
+	 * 生成扫描黄图scanPorn()方法所需的参数
+	 */
+	public function buildScanPornParas()
+	{
+		$bodyArray = array();
+		if (!empty($this->filesArray)) {
+			$resourceStr = '';
+			foreach ($this->filesArray as $resourceInfo) {
+				$resourceStr .= (empty($resourceStr) ? null : ';');
+				$resourceStr .= $resourceInfo->buildResourceId();
+			}
+			$bodyArray['resourceId'] = $resourceStr;
+		} elseif (!empty($this->urlsArray)) {
+			$urlStr = '';
+			foreach ($this->urlsArray as $url) {
+				$urlStr .= (empty($urlStr) ? null : ';');
+				$urlStr .= urlencode($url);
+			}
+			$bodyArray['url'] = $urlStr;
+		}
+		return $bodyArray;
+	}
 
-    /**
-     * 生成扫描广告图scanAdvertising()方法所需的参数
-     */
-    public function buildScanAdvertisingParas()
-    {
-        return $this->buildScanPornParas();
-    }
+	/**
+	 * 生成扫描广告图scanAdvertising()方法所需的参数
+	 */
+	public function buildScanAdvertisingParas()
+	{
+		return $this->buildScanPornParas();
+	}
 
-    /**
-     * 校验鉴黄反馈信息是否合法。如果合法，则返回http请求体<p> 返回格式{$isValid, $message, $httpBody}
-     */
-    public function checkPornFeedbackInfos()
-    {
-        $httpBody = '';
-        if (empty($this->pornFbArray)) {
-            return array(false, "porn feedback info is empty", null); //鉴黄反馈信息为空，反馈错误
-        }
-        foreach ($this->pornFbArray as $pornFbInfo) {
-            $resourceInfo = $pornFbInfo['file']; //图片信息
-            list($valid, $msg) = $resourceInfo->checkResourceInfo(true, true); //检测图片信息是否合法
-            if (!$valid) {
-                return array($valid, $msg, null);
-            }
-            $type = $pornFbInfo['type'];
-            $wrong = $pornFbInfo['wrong'];
-            if (!isset($type) || ($type != 0 && $type != 1) || !is_bool($wrong)) {
-                return array(false, "parameters 'type' or 'wrong' is invalid", null); //参数type取值0、1， wrong是bool类型
-            }
-            $score = $pornFbInfo['score'];
-            if ($wrong && (!isset($score) || $score < 0 || $score > 1)) {
-                return array(false, "parameters 'score' is invalid", null); //当"wrong"=true时，参数score必须有，且取值范围为[0,1]
-            }
-            $pornFbInfo['file'] = $resourceInfo->toArray(); //将图片信息对象，转换为数组，并保存
-            $httpBody .= (empty($httpBody) ? null : '&'); //添加分隔符
-            $httpBody .= "feedback=" . urlencode(json_encode($pornFbInfo, true)); //urlencode编码
-        }
-        return array(true, "valid", $httpBody); //鉴黄反馈信息合法，并返回http请求体
-    }
-    /*###################下面是属性的get和set方法###############*/
-    /**设置当前页号*/
-    public function setCurrentPage($currentPage)
-    {
-        $this->currentPage = $currentPage;
-        return $this;
-    }
+	/**
+	 * 校验鉴黄反馈信息是否合法。如果合法，则返回http请求体<p> 返回格式{$isValid, $message, $httpBody}
+	 */
+	public function checkPornFeedbackInfos()
+	{
+		$httpBody = '';
+		if (empty($this->pornFbArray)) {
+			return array(false, "porn feedback info is empty", null); //鉴黄反馈信息为空，反馈错误
+		}
+		foreach ($this->pornFbArray as $pornFbInfo) {
+			$resourceInfo = $pornFbInfo['file']; //图片信息
+			list($valid, $msg) = $resourceInfo->checkResourceInfo(true, true); //检测图片信息是否合法
+			if (!$valid) {
+				return array($valid, $msg, null);
+			}
+			$type = $pornFbInfo['type'];
+			$wrong = $pornFbInfo['wrong'];
+			if (!isset($type) || ($type != 0 && $type != 1) || !is_bool($wrong)) {
+				return array(false, "parameters 'type' or 'wrong' is invalid", null); //参数type取值0、1， wrong是bool类型
+			}
+			$score = $pornFbInfo['score'];
+			if ($wrong && (!isset($score) || $score < 0 || $score > 1)) {
+				return array(false, "parameters 'score' is invalid", null); //当"wrong"=true时，参数score必须有，且取值范围为[0,1]
+			}
+			$pornFbInfo['file'] = $resourceInfo->toArray(); //将图片信息对象，转换为数组，并保存
+			$httpBody .= (empty($httpBody) ? null : '&'); //添加分隔符
+			$httpBody .= "feedback=" . urlencode(json_encode($pornFbInfo, true)); //urlencode编码
+		}
+		return array(true, "valid", $httpBody); //鉴黄反馈信息合法，并返回http请求体
+	}
+	/*###################下面是属性的get和set方法###############*/
+	/**设置当前页号*/
+	public function setCurrentPage($currentPage)
+	{
+		$this->currentPage = $currentPage;
+		return $this;
+	}
 
-    /**
-     * 设置每页的大小
-     */
-    public function setPageSize($pageSize)
-    {
-        $this->pageSize = $pageSize;
-        return $this;
-    }
+	/**
+	 * 设置每页的大小
+	 */
+	public function setPageSize($pageSize)
+	{
+		$this->pageSize = $pageSize;
+		return $this;
+	}
 
-    /**
-     * 添加待扫描文件信息。
-     */
-    public function addResource($namespace = null, $dir = null, $name = null)
-    {
-        if (!isset($this->filesArray)) {
-            $this->filesArray = array();
-        }
-        array_push($this->filesArray, new ResourceInfo($namespace, $dir, $name));
-    }
+	/**
+	 * 添加待扫描文件信息。
+	 */
+	public function addResource($namespace = null, $dir = null, $name = null)
+	{
+		if (!isset($this->filesArray)) {
+			$this->filesArray = array();
+		}
+		array_push($this->filesArray, new ResourceInfo($namespace, $dir, $name));
+	}
 
-    /**
-     * 添加待扫描URL信息。
-     */
-    public function addUrl($url)
-    {
-        if (!isset($this->urlsArray)) {
-            $this->urlsArray = array();
-        }
-        array_push($this->urlsArray, $url);
-    }
+	/**
+	 * 添加待扫描URL信息。
+	 */
+	public function addUrl($url)
+	{
+		if (!isset($this->urlsArray)) {
+			$this->urlsArray = array();
+		}
+		array_push($this->urlsArray, $url);
+	}
 
-    /**
-     * 添加鉴黄反馈信息。
-     * @param string $namespace 空间名[必须]。
-     * @param string $dir 路径。为空则默认根目录
-     * @param string $name 文件名。不能为空
-     * @param bool $type 黄图类型[必须]。0或者1，0是非黄图，1是黄图
-     * @param bool $wrong 鉴黄判断[必须]。true代表用户认为多媒体鉴黄服务的结果有问题。当为true的时候必须传score
-     * @param float $score 黄图分值。[可选]取值范围[0-1]，值越高则是黄图可能性越高
-     */
-    public function addPornFbInfo($namespace = null, $dir = null, $name = null, $type = null, $wrong = null, $score = null)
-    {
-        if (!isset($this->pornFbArray)) {
-            $this->pornFbArray = array();
-        }
-        $pornFbInfo = array(
-            "file" => new ResourceInfo($namespace, $dir, $name),
-            "type" => $type, "wrong" => $wrong
-        );
-        if ($wrong) {
-            $pornFbInfo['score'] = $score; //当$wrong为true的时候必须传score
-        }
-        array_push($this->pornFbArray, $pornFbInfo);
-    }
+	/**
+	 * 添加鉴黄反馈信息。
+	 * @param string $namespace 空间名[必须]。
+	 * @param string $dir 路径。为空则默认根目录
+	 * @param string $name 文件名。不能为空
+	 * @param bool $type 黄图类型[必须]。0或者1，0是非黄图，1是黄图
+	 * @param bool $wrong 鉴黄判断[必须]。true代表用户认为多媒体鉴黄服务的结果有问题。当为true的时候必须传score
+	 * @param float $score 黄图分值。[可选]取值范围[0-1]，值越高则是黄图可能性越高
+	 */
+	public function addPornFbInfo($namespace = null, $dir = null, $name = null, $type = null, $wrong = null, $score = null)
+	{
+		if (!isset($this->pornFbArray)) {
+			$this->pornFbArray = array();
+		}
+		$pornFbInfo = array(
+			"file" => new ResourceInfo($namespace, $dir, $name),
+			"type" => $type, "wrong" => $wrong
+		);
+		if ($wrong) {
+			$pornFbInfo['score'] = $score; //当$wrong为true的时候必须传score
+		}
+		array_push($this->pornFbArray, $pornFbInfo);
+	}
 }

sdk/Conf/Conf.php

Indentation +27 added lines, -27 removed lines

@@ -3,39 +3,39 @@
 
 class Conf
 {
-    const CHARSET = "UTF-8";
-    const SDK_VERSION = '2.0.3';
+	const CHARSET = "UTF-8";
+	const SDK_VERSION = '2.0.3';
 
-    const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com";        //文件上传的地址
-    const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com";            //服务管理的地址
-    const MANAGE_API_VERSION = "3.0";        //资源管理接口版本
-    const SCAN_PORN_VERSION = "3.1";        //黄图扫描接口版本
-    const MEDIA_ENCODE_VERSION = "3.0";        //媒体转码接口版本
+	const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com";        //文件上传的地址
+	const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com";            //服务管理的地址
+	const MANAGE_API_VERSION = "3.0";        //资源管理接口版本
+	const SCAN_PORN_VERSION = "3.1";        //黄图扫描接口版本
+	const MEDIA_ENCODE_VERSION = "3.0";        //媒体转码接口版本
 
-    const UPLOAD_API_UPLOAD = "/api/proxy/upload";
-    const UPLOAD_API_BLOCK_INIT = "/api/proxy/blockInit";
-    const UPLOAD_API_BLOCK_UPLOAD = "/api/proxy/blockUpload";
-    const UPLOAD_API_BLOCK_COMPLETE = "/api/proxy/blockComplete";
-    const UPLOAD_API_BLOCK_CANCEL = "/api/proxy/blockCancel";
+	const UPLOAD_API_UPLOAD = "/api/proxy/upload";
+	const UPLOAD_API_BLOCK_INIT = "/api/proxy/blockInit";
+	const UPLOAD_API_BLOCK_UPLOAD = "/api/proxy/blockUpload";
+	const UPLOAD_API_BLOCK_COMPLETE = "/api/proxy/blockComplete";
+	const UPLOAD_API_BLOCK_CANCEL = "/api/proxy/blockCancel";
 
-    const TYPE_TOP = "TOP";
-    const TYPE_CLOUD = "CLOUD";
+	const TYPE_TOP = "TOP";
+	const TYPE_CLOUD = "CLOUD";
 
-    const DETECT_MIME_TRUE = 1;            //检测MimeType
-    const DETECT_MIME_NONE = 0;            //不检测MimeType
-    const INSERT_ONLY_TRUE = 1;            //文件上传不可覆盖
-    const INSERT_ONLY_NONE = 0;            //文件上传可覆盖
+	const DETECT_MIME_TRUE = 1;            //检测MimeType
+	const DETECT_MIME_NONE = 0;            //不检测MimeType
+	const INSERT_ONLY_TRUE = 1;            //文件上传不可覆盖
+	const INSERT_ONLY_NONE = 0;            //文件上传可覆盖
 
-    const MIN_OBJ_SIZE = 1;        //1024*100;
-    const HTTP_TIMEOUT = 30;            //http的超时时间：30s
-    const HTTP_RETRY = 1;                //http失败后重试：1
+	const MIN_OBJ_SIZE = 1;        //1024*100;
+	const HTTP_TIMEOUT = 30;            //http的超时时间：30s
+	const HTTP_RETRY = 1;                //http失败后重试：1
 
-    const BLOCK_MIN_SIZE = 102400;        //文件分片最小值：1024*100; 100K
-    const BLOCK_DEFF_SIZE = 209715200;    //文件分片默认值：1024*1024*2; 2M
-    const BLOCK_MAX_SIZE = 104857600;    //文件分片最大值：1024*1024*10; 10M
+	const BLOCK_MIN_SIZE = 102400;        //文件分片最小值：1024*100; 100K
+	const BLOCK_DEFF_SIZE = 209715200;    //文件分片默认值：1024*1024*2; 2M
+	const BLOCK_MAX_SIZE = 104857600;    //文件分片最大值：1024*1024*10; 10M
 
-    const CURL_ERR_LOG = "curl_error.log";    //curl请求时的错误日志信息
+	const CURL_ERR_LOG = "curl_error.log";    //curl请求时的错误日志信息
 
-    const RUN_LEVEL_RELEASE = 1;        //release级别
-    const RUN_LEVEL_DEBUG = 2;            //debug级别
+	const RUN_LEVEL_RELEASE = 1;        //release级别
+	const RUN_LEVEL_DEBUG = 2;            //debug级别
 }

Spacing +18 added lines, -18 removed lines

@@ -6,11 +6,11 @@ 
     const CHARSET = "UTF-8";
     const SDK_VERSION = '2.0.3';
 
-    const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com";        //文件上传的地址
-    const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com";            //服务管理的地址
-    const MANAGE_API_VERSION = "3.0";        //资源管理接口版本
-    const SCAN_PORN_VERSION = "3.1";        //黄图扫描接口版本
-    const MEDIA_ENCODE_VERSION = "3.0";        //媒体转码接口版本
+    const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com"; //文件上传的地址
+    const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com"; //服务管理的地址
+    const MANAGE_API_VERSION = "3.0"; //资源管理接口版本
+    const SCAN_PORN_VERSION = "3.1"; //黄图扫描接口版本
+    const MEDIA_ENCODE_VERSION = "3.0"; //媒体转码接口版本
 
     const UPLOAD_API_UPLOAD = "/api/proxy/upload";
     const UPLOAD_API_BLOCK_INIT = "/api/proxy/blockInit";
@@ -21,21 +21,21 @@ 
     const TYPE_TOP = "TOP";
     const TYPE_CLOUD = "CLOUD";
 
-    const DETECT_MIME_TRUE = 1;            //检测MimeType
-    const DETECT_MIME_NONE = 0;            //不检测MimeType
-    const INSERT_ONLY_TRUE = 1;            //文件上传不可覆盖
-    const INSERT_ONLY_NONE = 0;            //文件上传可覆盖
+    const DETECT_MIME_TRUE = 1; //检测MimeType
+    const DETECT_MIME_NONE = 0; //不检测MimeType
+    const INSERT_ONLY_TRUE = 1; //文件上传不可覆盖
+    const INSERT_ONLY_NONE = 0; //文件上传可覆盖
 
-    const MIN_OBJ_SIZE = 1;        //1024*100;
-    const HTTP_TIMEOUT = 30;            //http的超时时间：30s
-    const HTTP_RETRY = 1;                //http失败后重试：1
+    const MIN_OBJ_SIZE = 1; //1024*100;
+    const HTTP_TIMEOUT = 30; //http的超时时间：30s
+    const HTTP_RETRY = 1; //http失败后重试：1
 
-    const BLOCK_MIN_SIZE = 102400;        //文件分片最小值：1024*100; 100K
-    const BLOCK_DEFF_SIZE = 209715200;    //文件分片默认值：1024*1024*2; 2M
-    const BLOCK_MAX_SIZE = 104857600;    //文件分片最大值：1024*1024*10; 10M
+    const BLOCK_MIN_SIZE = 102400; //文件分片最小值：1024*100; 100K
+    const BLOCK_DEFF_SIZE = 209715200; //文件分片默认值：1024*1024*2; 2M
+    const BLOCK_MAX_SIZE = 104857600; //文件分片最大值：1024*1024*10; 10M
 
-    const CURL_ERR_LOG = "curl_error.log";    //curl请求时的错误日志信息
+    const CURL_ERR_LOG = "curl_error.log"; //curl请求时的错误日志信息
 
-    const RUN_LEVEL_RELEASE = 1;        //release级别
-    const RUN_LEVEL_DEBUG = 2;            //debug级别
+    const RUN_LEVEL_RELEASE = 1; //release级别
+    const RUN_LEVEL_DEBUG = 2; //debug级别
 }

sdk/AlibabaImage.php

Indentation +234 added lines, -234 removed lines

@@ -12,238 +12,238 @@
 
 class AlibabaImage
 {
-    private $upload_client;
-    private $manage_client;
-    private $ak;
-    private $sk;
-    private $namespace;
-    private $type; // "TOP"和"CLOUD"两种模式
-
-    public static $run_level = Conf::RUN_LEVEL_RELEASE;    //设置SDK运行级别
-
-    /**
-     * 构造函数
-     *
-     * @param string $ak 云存储公钥
-     * @param string $sk 云存储私钥
-     * @param string $type 可选，兼容TOP与tea云的 ak/sk
-     * @throws \Exception
-     */
-    public function __construct($ak, $sk, $namespace, $type = Conf::TYPE_TOP)
-    {
-        $this->ak = $ak;
-        $this->sk = $sk;
-        $this->namespace = $namespace;
-        $this->type = $type;
-        $this->upload_client = new UploadClient($ak, $sk, $type);
-        $this->manage_client = new ManageClient($ak, $sk, $type);
-    }
-
-    public function getUploadToken($option)
-    {
-        if (!isset($option['name']) || !$option['name']) {
-            $option['name'] = '${uuid}.${ext}';
-        }
-        if ($option['name']) {
-            $option['dir'] = preg_replace('/^\./', '', dirname($option['name']));
-            $option['name'] = last(explode("/", $option['name']));
-        }
-        $option['namespace'] = $this->namespace;
-
-        $policy = new UploadPolicy($option);
-
-        return $this->upload_client->getUploadToken($policy);
-    }
-
-    /**
-     * 直接上传文件,适合文件比较小的情况
-     */
-    public function upload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
-    {
-        return $this->upload_client->upload($filePath, $uploadPolicy, $uploadOption);
-    }
-
-    /**
-     * 直接上传文件数据,适合数据量比较小的情况
-     */
-    public function uploadData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
-    {
-        return $this->upload_client->uploadData($data, $uploadPolicy, $uploadOption);
-    }
-
-    /**
-     * 创建分片上传任务，指定待上传的文件。即初始化分片上传
-     */
-    public function multipartInit($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
-    {
-        return $this->upload_client->multipartInit($filePath, $uploadPolicy, $uploadOption);
-    }
-
-    /**
-     * 创建分片上传任务，指定初始化分片任务的数据，即第一块数据
-     */
-    public function multipartInitByData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
-    {
-        return $this->upload_client->multipartInitByData($data, $uploadPolicy, $uploadOption);
-    }
-
-    /**
-     * 分片上传，指定待上传的文件。需要指定UploadOption中文件块编号
-     */
-    public function multipartUpload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
-    {
-        return $this->upload_client->multipartUpload($filePath, $uploadPolicy, $uploadOption);
-    }
-
-    /**
-     * 分片上传，指定待上传的数据。需要指定UploadOption中文件块编号
-     */
-    public function multipartUploadByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
-    {
-        return $this->upload_client->multipartUploadByData($blockData, $uploadPolicy, $uploadOption);
-    }
-
-    /**
-     * 完成分片上传任务。需要指定UploadOption中整个文件的md5值
-     */
-    public function multipartComplete(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
-    {
-        return $this->upload_client->multipartComplete($uploadPolicy, $uploadOption);
-    }
-
-    /**
-     * 取消分片上传任务。需要保证UploadOption中有分片任务的uploadId和id
-     */
-    public function multipartCancel(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
-    {
-        return $this->upload_client->multipartCancel($uploadPolicy, $uploadOption);
-    }
-
-    /**
-     * 查看文件是否存在
-     */
-    public function existsFile($namespace, $dir, $filename)
-    {
-        return $this->manage_client->existsFile($namespace, $dir, $filename);
-    }
-
-    /**
-     * 获取文件的元信息(meta信息)
-     */
-    public function getFileInfo($namespace, $dir, $filename)
-    {
-        return $this->manage_client->getFileInfo($namespace, $dir, $filename);
-    }
-
-    /**
-     * 重命名文件
-     */
-    public function renameFile($namespace, $dir, $filename, $newDir, $newName)
-    {
-        return $this->manage_client->renameFile($namespace, $dir, $filename, $newDir, $newName);
-    }
-
-    /**
-     * 获取指定目录下的文件列表。dir为空，表示根目录。page指定页数，pageSize指定每页显示数量
-     */
-    public function listFiles($namespace, $dir, $page = 1, $pageSize = 100)
-    {
-        return $this->manage_client->listFiles($namespace, $dir, $page, $pageSize);
-    }
-
-    /**
-     * 删除文件
-     */
-    public function deleteFile($namespace, $dir, $filename)
-    {
-        return $this->manage_client->deleteFile($namespace, $dir, $filename);
-    }
-
-    /**
-     * 查看文件夹是否存在
-     */
-    public function existsFolder($namespace, $dir)
-    {
-        return $this->manage_client->existsFolder($namespace, $dir);
-    }
-
-    /**
-     * 创建文件夹
-     */
-    public function createDir($namespace, $dir)
-    {
-        return $this->manage_client->createDir($namespace, $dir);
-    }
-
-    /**
-     * 获取子文件夹列表。dir为空，表示根目录。page指定页数，pageSize指定每页显示数量
-     */
-    public function listDirs($namespace, $dir, $page = 1, $pageSize = 100)
-    {
-        return $this->manage_client->listDirs($namespace, $dir, $page, $pageSize);
-    }
-
-    /**
-     * 删除文件夹
-     */
-    public function deleteDir($namespace, $dir)
-    {
-        return $this->manage_client->deleteDir($namespace, $dir);
-    }
-
-    /**
-     * 黄图扫描接口
-     */
-    public function scanPorn(ManageOption $resInfos)
-    {
-        return $this->manage_client->scanPorn($resInfos);
-    }
-
-    /**
-     * 鉴黄反馈feedback接口
-     */
-    public function pornFeedback(ManageOption $pornFbInfos)
-    {
-        return $this->manage_client->pornFeedback($pornFbInfos);
-    }
-
-    /**
-     * 多媒体转码接口
-     */
-    public function mediaEncode(MediaEncodeOption $encodeOption)
-    {
-        return $this->manage_client->mediaEncode($encodeOption);
-    }
-
-    /**
-     * 多媒体转码任务查询接口
-     */
-    public function mediaEncodeQuery($taskId)
-    {
-        return $this->manage_client->mediaEncodeQuery($taskId);
-    }
-
-    /**
-     * 视频截图接口
-     */
-    public function videoSnapshot(SnapShotOption $snapshotOption)
-    {
-        return $this->manage_client->videoSnapshot($snapshotOption);
-    }
-
-    /**
-     * 视频截图结果查询接口
-     */
-    public function vSnapshotQuery($taskId)
-    {
-        return $this->manage_client->vSnapshotQuery($taskId);
-    }
-
-    /**
-     * 广告图扫描接口(beta)
-     */
-    public function scanAdvertising(ManageOption $resInfos)
-    {
-        return $this->manage_client->scanAdvertising($resInfos);
-    }
+	private $upload_client;
+	private $manage_client;
+	private $ak;
+	private $sk;
+	private $namespace;
+	private $type; // "TOP"和"CLOUD"两种模式
+
+	public static $run_level = Conf::RUN_LEVEL_RELEASE;    //设置SDK运行级别
+
+	/**
+	 * 构造函数
+	 *
+	 * @param string $ak 云存储公钥
+	 * @param string $sk 云存储私钥
+	 * @param string $type 可选，兼容TOP与tea云的 ak/sk
+	 * @throws \Exception
+	 */
+	public function __construct($ak, $sk, $namespace, $type = Conf::TYPE_TOP)
+	{
+		$this->ak = $ak;
+		$this->sk = $sk;
+		$this->namespace = $namespace;
+		$this->type = $type;
+		$this->upload_client = new UploadClient($ak, $sk, $type);
+		$this->manage_client = new ManageClient($ak, $sk, $type);
+	}
+
+	public function getUploadToken($option)
+	{
+		if (!isset($option['name']) || !$option['name']) {
+			$option['name'] = '${uuid}.${ext}';
+		}
+		if ($option['name']) {
+			$option['dir'] = preg_replace('/^\./', '', dirname($option['name']));
+			$option['name'] = last(explode("/", $option['name']));
+		}
+		$option['namespace'] = $this->namespace;
+
+		$policy = new UploadPolicy($option);
+
+		return $this->upload_client->getUploadToken($policy);
+	}
+
+	/**
+	 * 直接上传文件,适合文件比较小的情况
+	 */
+	public function upload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
+	{
+		return $this->upload_client->upload($filePath, $uploadPolicy, $uploadOption);
+	}
+
+	/**
+	 * 直接上传文件数据,适合数据量比较小的情况
+	 */
+	public function uploadData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
+	{
+		return $this->upload_client->uploadData($data, $uploadPolicy, $uploadOption);
+	}
+
+	/**
+	 * 创建分片上传任务，指定待上传的文件。即初始化分片上传
+	 */
+	public function multipartInit($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
+	{
+		return $this->upload_client->multipartInit($filePath, $uploadPolicy, $uploadOption);
+	}
+
+	/**
+	 * 创建分片上传任务，指定初始化分片任务的数据，即第一块数据
+	 */
+	public function multipartInitByData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
+	{
+		return $this->upload_client->multipartInitByData($data, $uploadPolicy, $uploadOption);
+	}
+
+	/**
+	 * 分片上传，指定待上传的文件。需要指定UploadOption中文件块编号
+	 */
+	public function multipartUpload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
+	{
+		return $this->upload_client->multipartUpload($filePath, $uploadPolicy, $uploadOption);
+	}
+
+	/**
+	 * 分片上传，指定待上传的数据。需要指定UploadOption中文件块编号
+	 */
+	public function multipartUploadByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
+	{
+		return $this->upload_client->multipartUploadByData($blockData, $uploadPolicy, $uploadOption);
+	}
+
+	/**
+	 * 完成分片上传任务。需要指定UploadOption中整个文件的md5值
+	 */
+	public function multipartComplete(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
+	{
+		return $this->upload_client->multipartComplete($uploadPolicy, $uploadOption);
+	}
+
+	/**
+	 * 取消分片上传任务。需要保证UploadOption中有分片任务的uploadId和id
+	 */
+	public function multipartCancel(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
+	{
+		return $this->upload_client->multipartCancel($uploadPolicy, $uploadOption);
+	}
+
+	/**
+	 * 查看文件是否存在
+	 */
+	public function existsFile($namespace, $dir, $filename)
+	{
+		return $this->manage_client->existsFile($namespace, $dir, $filename);
+	}
+
+	/**
+	 * 获取文件的元信息(meta信息)
+	 */
+	public function getFileInfo($namespace, $dir, $filename)
+	{
+		return $this->manage_client->getFileInfo($namespace, $dir, $filename);
+	}
+
+	/**
+	 * 重命名文件
+	 */
+	public function renameFile($namespace, $dir, $filename, $newDir, $newName)
+	{
+		return $this->manage_client->renameFile($namespace, $dir, $filename, $newDir, $newName);
+	}
+
+	/**
+	 * 获取指定目录下的文件列表。dir为空，表示根目录。page指定页数，pageSize指定每页显示数量
+	 */
+	public function listFiles($namespace, $dir, $page = 1, $pageSize = 100)
+	{
+		return $this->manage_client->listFiles($namespace, $dir, $page, $pageSize);
+	}
+
+	/**
+	 * 删除文件
+	 */
+	public function deleteFile($namespace, $dir, $filename)
+	{
+		return $this->manage_client->deleteFile($namespace, $dir, $filename);
+	}
+
+	/**
+	 * 查看文件夹是否存在
+	 */
+	public function existsFolder($namespace, $dir)
+	{
+		return $this->manage_client->existsFolder($namespace, $dir);
+	}
+
+	/**
+	 * 创建文件夹
+	 */
+	public function createDir($namespace, $dir)
+	{
+		return $this->manage_client->createDir($namespace, $dir);
+	}
+
+	/**
+	 * 获取子文件夹列表。dir为空，表示根目录。page指定页数，pageSize指定每页显示数量
+	 */
+	public function listDirs($namespace, $dir, $page = 1, $pageSize = 100)
+	{
+		return $this->manage_client->listDirs($namespace, $dir, $page, $pageSize);
+	}
+
+	/**
+	 * 删除文件夹
+	 */
+	public function deleteDir($namespace, $dir)
+	{
+		return $this->manage_client->deleteDir($namespace, $dir);
+	}
+
+	/**
+	 * 黄图扫描接口
+	 */
+	public function scanPorn(ManageOption $resInfos)
+	{
+		return $this->manage_client->scanPorn($resInfos);
+	}
+
+	/**
+	 * 鉴黄反馈feedback接口
+	 */
+	public function pornFeedback(ManageOption $pornFbInfos)
+	{
+		return $this->manage_client->pornFeedback($pornFbInfos);
+	}
+
+	/**
+	 * 多媒体转码接口
+	 */
+	public function mediaEncode(MediaEncodeOption $encodeOption)
+	{
+		return $this->manage_client->mediaEncode($encodeOption);
+	}
+
+	/**
+	 * 多媒体转码任务查询接口
+	 */
+	public function mediaEncodeQuery($taskId)
+	{
+		return $this->manage_client->mediaEncodeQuery($taskId);
+	}
+
+	/**
+	 * 视频截图接口
+	 */
+	public function videoSnapshot(SnapShotOption $snapshotOption)
+	{
+		return $this->manage_client->videoSnapshot($snapshotOption);
+	}
+
+	/**
+	 * 视频截图结果查询接口
+	 */
+	public function vSnapshotQuery($taskId)
+	{
+		return $this->manage_client->vSnapshotQuery($taskId);
+	}
+
+	/**
+	 * 广告图扫描接口(beta)
+	 */
+	public function scanAdvertising(ManageOption $resInfos)
+	{
+		return $this->manage_client->scanAdvertising($resInfos);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     private $namespace;
     private $type; // "TOP"和"CLOUD"两种模式
 
-    public static $run_level = Conf::RUN_LEVEL_RELEASE;    //设置SDK运行级别
+    public static $run_level = Conf::RUN_LEVEL_RELEASE; //设置SDK运行级别
 
     /**
      * 构造函数

sdk/Core/UploadClient.php

Spacing +51 added lines, -51 removed lines

@@ -38,10 +38,10 @@ 
             return $this->errorResponse("FileNotExist", "file not exist");
         }
         if (empty($uploadOption)) {
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption，则生成一个默认的
+            $uploadOption = new UploadOption(); //如果用户没有传递UploadOption，则生成一个默认的
         }
         if (empty($uploadOption->name)) {
-            $uploadOption->name = basename($filePath);        //如果用户没有设置name属性，则使用上传时的文件名
+            $uploadOption->name = basename($filePath); //如果用户没有设置name属性，则使用上传时的文件名
         }
         // UploadPolicy 和 UploadOption检查
         list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
@@ -68,7 +68,7 @@ 
     {
         $data = file_get_contents($filePath);
         $uploadOption->setContent($data);
-        $url = $this->upload_host . Conf::UPLOAD_API_UPLOAD;        //普通上传的API
+        $url = $this->upload_host . Conf::UPLOAD_API_UPLOAD; //普通上传的API
         return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
     }
 
@@ -81,8 +81,8 @@ 
      */
     protected function uploadSuperFile($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
     {
-        $fileSize = filesize($filePath);        // 文件大小
-        $blockSize = $uploadOption->blockSize;  // 文件分片大小
+        $fileSize = filesize($filePath); // 文件大小
+        $blockSize = $uploadOption->blockSize; // 文件分片大小
         $blockNum = intval(ceil($fileSize / $blockSize)); // 文件分片后的块数
         for ($i = 0; $i < $blockNum; $i++) {
             $currentSize = $blockSize; // 当前文件块的大小
@@ -95,8 +95,8 @@ 
             $httpRes = null;
             if (0 == $i) {
                 // 分片初始化阶段
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
-                $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
+                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT; //初始化分片上传的API
+                $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD; //初始化分片时的Option类型
                 $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
                 $uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID（OSS用于区分上传的id）
                 $id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID（多媒体服务用于区分上传的id）
@@ -104,16 +104,16 @@ 
                 $uploadOption->setUniqueIdId($id);
             } else {
                 // 分片上传过程中
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
-                $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
-                $uploadOption->setPartNumber($i + 1);                           //
+                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD; //分片上传过程中的API
+                $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD; //分片上传过程中的Option类型
+                $uploadOption->setPartNumber($i + 1); //
                 $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
             }
             // 如果分片上传失败，则取消cancel分片上传任务，然后返回错误信息
             if (!$httpRes['isSuccess']) {
                 if ($uploadOption->checkMutipartParas()) {
-                    $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
-                    $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
+                    $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL; //取消分片任务的API
+                    $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD; //取消分片任务时的Option类型
                     $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption); // 不判断取消分片任务返回的结果
                 }
                 return $httpRes;
@@ -126,9 +126,9 @@ 
             $uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
         }
         // 分片上传完成
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
-        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
-        $uploadOption->setMd5(md5_file($filePath));                         //文件Md5
+        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE; //完成分片上传任务的API
+        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD; //完成分片上传任务时的Option类型
+        $uploadOption->setMd5(md5_file($filePath)); //文件Md5
         return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
     }
 
@@ -144,7 +144,7 @@ 
     public function uploadData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
     {
         if (empty($uploadOption)) {
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption，则生成一个默认的
+            $uploadOption = new UploadOption(); //如果用户没有传递UploadOption，则生成一个默认的
         }
         // UploadPolicy 和 UploadOption检查
         list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
@@ -158,7 +158,7 @@ 
         }
         // 文件不大于设定的分片大小(默认2M)，则直接上传uploadMiniFile()
         $uploadOption->setContent($data);
-        $url = $this->upload_host . Conf::UPLOAD_API_UPLOAD;        //普通上传的API
+        $url = $this->upload_host . Conf::UPLOAD_API_UPLOAD; //普通上传的API
         return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
     }
 
@@ -171,8 +171,8 @@ 
      */
     protected function uploadSuperData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
     {
-        $dataSize = strlen($data);          // 文件大小
-        $blockSize = $uploadOption->blockSize;  // 文件分片大小
+        $dataSize = strlen($data); // 文件大小
+        $blockSize = $uploadOption->blockSize; // 文件分片大小
         $blockNum = intval(ceil($dataSize / $blockSize)); // 文件分片后的块数
         for ($i = 0; $i < $blockNum; $i++) {
             $currentSize = $blockSize; // 当前文件块的大小
@@ -185,8 +185,8 @@ 
             $httpRes = null;
             if (0 == $i) {
                 // 分片初始化阶段
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
-                $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
+                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT; //初始化分片上传的API
+                $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD; //初始化分片时的Option类型
                 $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
                 $uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID（OSS用于区分上传的id）
                 $id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID（多媒体服务用于区分上传的id）
@@ -194,16 +194,16 @@ 
                 $uploadOption->setUniqueIdId($id);
             } else {
                 // 分片上传过程中
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
-                $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
-                $uploadOption->setPartNumber($i + 1);                           //
+                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD; //分片上传过程中的API
+                $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD; //分片上传过程中的Option类型
+                $uploadOption->setPartNumber($i + 1); //
                 $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
             }
             // 如果分片上传失败，则取消cancel分片上传任务，然后返回错误信息
             if (!$httpRes['isSuccess']) {
                 if ($uploadOption->checkMutipartParas()) {
-                    $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
-                    $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
+                    $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL; //取消分片任务的API
+                    $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD; //取消分片任务时的Option类型
                     $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption); // 不判断取消分片任务返回的结果
                 }
                 return $httpRes;
@@ -212,9 +212,9 @@ 
             $uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
         }
         // 分片上传完成
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
-        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
-        $uploadOption->setMd5(md5($data));                          //文件Md5
+        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE; //完成分片上传任务的API
+        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD; //完成分片上传任务时的Option类型
+        $uploadOption->setMd5(md5($data)); //文件Md5
         return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
     }
 
@@ -232,10 +232,10 @@ 
             return $this->errorResponse("FileNotExist", "file not exist");
         }
         if (empty($uploadOption)) {
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption，则生成一个默认的
+            $uploadOption = new UploadOption(); //如果用户没有传递UploadOption，则生成一个默认的
         }
         if (empty($uploadOption->name)) {
-            $uploadOption->name = basename($filePath);        //如果用户没有设置name属性，则使用上传时的文件名
+            $uploadOption->name = basename($filePath); //如果用户没有设置name属性，则使用上传时的文件名
         }
         $blockData = file_get_contents($encodePath, 0, null, 0, $uploadOption->blockSize);
         return $this->multipartInitByData($blockData, $uploadPolicy, $uploadOption);
@@ -251,7 +251,7 @@ 
     public function multipartInitByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
     {
         if (empty($uploadOption)) {
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption，则生成一个默认的
+            $uploadOption = new UploadOption(); //如果用户没有传递UploadOption，则生成一个默认的
         }
         // UploadPolicy 和 UploadOption检查
         list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
@@ -259,13 +259,13 @@ 
             return $this->errorResponse("ErrorUploadInfo", "error upload policy or option:" . $message);
         }
         // 数据大小不等于设定的分片大小(默认2M)，则无法完成初始化
-        $dataSize = strlen($blockData);         // 数据文件大小
+        $dataSize = strlen($blockData); // 数据文件大小
         if ($dataSize != ($uploadOption->blockSize)) {
             return $this->errorResponse("MultipartInitError", "UploadOption's blockSize is not equal to data's size");
         }
         $uploadOption->setContent($blockData); // 设置待上传的文件块
-        $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
+        $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD; //初始化分片时的Option类型
+        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT; //初始化分片上传的API
         $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
         //若成功返回，则保存初始化成功的uploadId、id 以及 partNumber、eTag
         $uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID（OSS用于区分上传的id）
@@ -290,8 +290,8 @@ 
         if (!file_exists($encodePath)) {
             return $this->errorResponse("FileNotExist", "file not exist");
         }
-        $fileSize = filesize($encodePath);      // 文件大小
-        $blockSize = $uploadOption->blockSize;  // 文件分片大小
+        $fileSize = filesize($encodePath); // 文件大小
+        $blockSize = $uploadOption->blockSize; // 文件分片大小
         $blockNum = intval(ceil($fileSize / $blockSize)); // 文件分片后的块数
         $currentSize = $blockSize; // 当前文件块的大小
         if ($uploadOption->getPartNumber() == $blockNum) {
@@ -317,8 +317,8 @@ 
             return $this->errorResponse("MultipartUploadError", "multipart upload's parameters(id,uploadId,partNumber) error");
         }
         $uploadOption->setContent($blockData); // 设置待上传的文件块
-        $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
+        $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD; //分片上传过程中的Option类型
+        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD; //分片上传过程中的API
         $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
         if (isset($httpRes['partNumber']) && isset($httpRes['eTag'])) {
             $uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
@@ -339,8 +339,8 @@ 
         if (!$uploadOption->checkMutipartParas() || empty($fileMd5)) {
             return $this->errorResponse("MultipartCompleteError", "multipart upload's parameters(id,uploadId,md5) error");
         }
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
-        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
+        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE; //完成分片上传任务的API
+        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD; //完成分片上传任务时的Option类型
         return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
     }
 
@@ -355,8 +355,8 @@ 
         if (!$uploadOption->checkMutipartParas()) {
             return $this->errorResponse("MultipartCancelError", "multipart upload's parameters(id,uploadId) error");
         }
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
-        $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
+        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL; //取消分片任务的API
+        $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD; //取消分片任务时的Option类型
         return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
     }
 
@@ -388,17 +388,17 @@ 
                 list($contentType, $httpBody) = $this->buildMultipartForm($uploadOption);
                 $length = @strlen($httpBody);
                 array_push($_headers, "Content-Type: {$contentType}");
-                curl_setopt($ch, CURLOPT_POSTFIELDS, $httpBody);            //请求体
+                curl_setopt($ch, CURLOPT_POSTFIELDS, $httpBody); //请求体
             }
             array_push($_headers, "Content-Length: {$length}");
-            curl_setopt($ch, CURLOPT_HEADER, 1);                            //设置头部
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $_headers);                //请求头
-            curl_setopt($ch, CURLOPT_TIMEOUT, $uploadOption->timeout);  //持续时长
-            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);               //连接超时时长
+            curl_setopt($ch, CURLOPT_HEADER, 1); //设置头部
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $_headers); //请求头
+            curl_setopt($ch, CURLOPT_TIMEOUT, $uploadOption->timeout); //持续时长
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10); //连接超时时长
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); //成功，只返回结果，不自动输出任何内容。如果失败返回FALSE
             curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
             curl_setopt($ch, CURLOPT_URL, $url);
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);           //自定义请求
+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method); //自定义请求
             //设置请求方式(GET或POST等)
             if ($method == 'PUT' || $method == 'POST') {
                 curl_setopt($ch, CURLOPT_POST, 1);
@@ -419,10 +419,10 @@ 
             } else {
                 //解析返回结果，并判断是否上传成功
                 $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-                $success = ($http_code == 200) ? true : false;                  //判断是否上传成功
+                $success = ($http_code == 200) ? true : false; //判断是否上传成功
                 $resStr = explode("\r\n\r\n", $response, 2);
                 $resBody = isset($resStr[1]) ? $resStr[1] : '';
-                $resArray = json_decode($resBody, true);                        //解析得到结果
+                $resArray = json_decode($resBody, true); //解析得到结果
                 $result = (empty($resArray) ? $result : $resArray);
             }
         } catch (Exception $e) {

Indentation +538 added lines, -538 removed lines

@@ -11,128 +11,128 @@ 
 
 class UploadClient
 {
-    private $upload_host;
-    private $ak;
-    private $sk;
-    private $type; // "CLOUD" or "TOP";
+	private $upload_host;
+	private $ak;
+	private $sk;
+	private $type; // "CLOUD" or "TOP";
 
-    public function __construct($ak, $sk, $type = Conf::TYPE_TOP)
-    {
-        $this->ak = $ak;
-        $this->sk = $sk;
-        $this->type = $type;
-        $this->upload_host = Conf::UPLOAD_HOST_MEDIA;
-    }
+	public function __construct($ak, $sk, $type = Conf::TYPE_TOP)
+	{
+		$this->ak = $ak;
+		$this->sk = $sk;
+		$this->type = $type;
+		$this->upload_host = Conf::UPLOAD_HOST_MEDIA;
+	}
 
-    /**
-     * 上传文件。根据文件大小判断是否进行分片
-     * @param string $filePath  文件路径
-     * @param UploadPolicy $uploadPolicy    上传策略
-     * @param UploadOption $uploadOption    上传选项
-     * @return array
-     */
-    public function upload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
-    {
-        $encodePath = iconv('UTF-8', 'GB2312', $filePath); //中文需要转换成gb2312，file_exist等函数才能识别
-        if (!file_exists($encodePath)) {
-            return $this->errorResponse("FileNotExist", "file not exist");
-        }
-        if (empty($uploadOption)) {
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption，则生成一个默认的
-        }
-        if (empty($uploadOption->name)) {
-            $uploadOption->name = basename($filePath);        //如果用户没有设置name属性，则使用上传时的文件名
-        }
-        // UploadPolicy 和 UploadOption检查
-        list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
-        if (!$isValid) {
-            return $this->errorResponse("ErrorUploadInfo", "error upload policy or option:" . $message);
-        }
-        $fileSize = filesize($encodePath);
-        // 文件大于设定的分片大小(默认2M)，则进行分片上传uploadSuperfile()
-        if ($fileSize > ($uploadOption->blockSize)) {
-            return $this->uploadSuperFile($encodePath, $uploadPolicy, $uploadOption);
-        }
-        // 文件不大于设定的分片大小(默认2M)，则直接上传uploadMiniFile()
-        return $this->uploadMiniFile($encodePath, $uploadPolicy, $uploadOption);
-    }
+	/**
+	 * 上传文件。根据文件大小判断是否进行分片
+	 * @param string $filePath  文件路径
+	 * @param UploadPolicy $uploadPolicy    上传策略
+	 * @param UploadOption $uploadOption    上传选项
+	 * @return array
+	 */
+	public function upload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
+	{
+		$encodePath = iconv('UTF-8', 'GB2312', $filePath); //中文需要转换成gb2312，file_exist等函数才能识别
+		if (!file_exists($encodePath)) {
+			return $this->errorResponse("FileNotExist", "file not exist");
+		}
+		if (empty($uploadOption)) {
+			$uploadOption = new UploadOption();     //如果用户没有传递UploadOption，则生成一个默认的
+		}
+		if (empty($uploadOption->name)) {
+			$uploadOption->name = basename($filePath);        //如果用户没有设置name属性，则使用上传时的文件名
+		}
+		// UploadPolicy 和 UploadOption检查
+		list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
+		if (!$isValid) {
+			return $this->errorResponse("ErrorUploadInfo", "error upload policy or option:" . $message);
+		}
+		$fileSize = filesize($encodePath);
+		// 文件大于设定的分片大小(默认2M)，则进行分片上传uploadSuperfile()
+		if ($fileSize > ($uploadOption->blockSize)) {
+			return $this->uploadSuperFile($encodePath, $uploadPolicy, $uploadOption);
+		}
+		// 文件不大于设定的分片大小(默认2M)，则直接上传uploadMiniFile()
+		return $this->uploadMiniFile($encodePath, $uploadPolicy, $uploadOption);
+	}
 
-    /**
-     * 上传小文件
-     * @param string $filePath 文件路径
-     * @param UploadPolicy $uploadPolicy 上传策略
-     * @param UploadOption $uploadOption 上传选项
-     * @return array
-     */
-    protected function uploadMiniFile($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
-    {
-        $data = file_get_contents($filePath);
-        $uploadOption->setContent($data);
-        $url = $this->upload_host . Conf::UPLOAD_API_UPLOAD;        //普通上传的API
-        return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
-    }
+	/**
+	 * 上传小文件
+	 * @param string $filePath 文件路径
+	 * @param UploadPolicy $uploadPolicy 上传策略
+	 * @param UploadOption $uploadOption 上传选项
+	 * @return array
+	 */
+	protected function uploadMiniFile($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
+	{
+		$data = file_get_contents($filePath);
+		$uploadOption->setContent($data);
+		$url = $this->upload_host . Conf::UPLOAD_API_UPLOAD;        //普通上传的API
+		return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
+	}
 
-    /**
-     * 分片上传大文件
-     * @param string $filePath 文件路径
-     * @param UploadPolicy $uploadPolicy 上传策略
-     * @param UploadOption $uploadOption 上传选项
-     * @return array
-     */
-    protected function uploadSuperFile($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
-    {
-        $fileSize = filesize($filePath);        // 文件大小
-        $blockSize = $uploadOption->blockSize;  // 文件分片大小
-        $blockNum = intval(ceil($fileSize / $blockSize)); // 文件分片后的块数
-        for ($i = 0; $i < $blockNum; $i++) {
-            $currentSize = $blockSize; // 当前文件块的大小
-            if (($i + 1) === $blockNum) {
-                $currentSize = ($fileSize - ($blockNum - 1) * $blockSize); // 计算最后一个块的大小
-            }
-            $offset = $i * $blockSize; // 当前文件块相对于文件开头的偏移量（块的起始位置）
-            $blockData = file_get_contents($filePath, 0, null, $offset, $currentSize); //当前文件块的数据
-            $uploadOption->setContent($blockData); // 设置待上传的文件块
-            $httpRes = null;
-            if (0 == $i) {
-                // 分片初始化阶段
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
-                $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
-                $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
-                $uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID（OSS用于区分上传的id）
-                $id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID（多媒体服务用于区分上传的id）
-                $uploadOption->setUploadId($uploadId);
-                $uploadOption->setUniqueIdId($id);
-            } else {
-                // 分片上传过程中
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
-                $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
-                $uploadOption->setPartNumber($i + 1);                           //
-                $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
-            }
-            // 如果分片上传失败，则取消cancel分片上传任务，然后返回错误信息
-            if (!$httpRes['isSuccess']) {
-                if ($uploadOption->checkMutipartParas()) {
-                    $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
-                    $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
-                    $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption); // 不判断取消分片任务返回的结果
-                }
-                return $httpRes;
-                //              $message = isset( $httpRes ['message'] ) ? $httpRes ['message'] : null;
-                //              $code = isset( $httpRes ['code'] ) ? $httpRes ['code'] : null;
-                //              $requestId = isset( $httpRes ['requestId'] ) ? $httpRes ['requestId'] : null;
-                //              return $this->errorResponse ( $code, "fail upload block file:" . $message, $requestId );
-            }
-            // 保存 块编号partNumber 和 标记ETag，用于分片完成时的参数设置
-            $uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
-        }
-        // 分片上传完成
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
-        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
-        $uploadOption->setMd5(md5_file($filePath));                         //文件Md5
-        return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
-    }
+	/**
+	 * 分片上传大文件
+	 * @param string $filePath 文件路径
+	 * @param UploadPolicy $uploadPolicy 上传策略
+	 * @param UploadOption $uploadOption 上传选项
+	 * @return array
+	 */
+	protected function uploadSuperFile($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
+	{
+		$fileSize = filesize($filePath);        // 文件大小
+		$blockSize = $uploadOption->blockSize;  // 文件分片大小
+		$blockNum = intval(ceil($fileSize / $blockSize)); // 文件分片后的块数
+		for ($i = 0; $i < $blockNum; $i++) {
+			$currentSize = $blockSize; // 当前文件块的大小
+			if (($i + 1) === $blockNum) {
+				$currentSize = ($fileSize - ($blockNum - 1) * $blockSize); // 计算最后一个块的大小
+			}
+			$offset = $i * $blockSize; // 当前文件块相对于文件开头的偏移量（块的起始位置）
+			$blockData = file_get_contents($filePath, 0, null, $offset, $currentSize); //当前文件块的数据
+			$uploadOption->setContent($blockData); // 设置待上传的文件块
+			$httpRes = null;
+			if (0 == $i) {
+				// 分片初始化阶段
+				$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
+				$uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
+				$httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
+				$uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID（OSS用于区分上传的id）
+				$id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID（多媒体服务用于区分上传的id）
+				$uploadOption->setUploadId($uploadId);
+				$uploadOption->setUniqueIdId($id);
+			} else {
+				// 分片上传过程中
+				$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
+				$uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
+				$uploadOption->setPartNumber($i + 1);                           //
+				$httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
+			}
+			// 如果分片上传失败，则取消cancel分片上传任务，然后返回错误信息
+			if (!$httpRes['isSuccess']) {
+				if ($uploadOption->checkMutipartParas()) {
+					$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
+					$uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
+					$this->sendRequest('POST', $url, $uploadPolicy, $uploadOption); // 不判断取消分片任务返回的结果
+				}
+				return $httpRes;
+				//              $message = isset( $httpRes ['message'] ) ? $httpRes ['message'] : null;
+				//              $code = isset( $httpRes ['code'] ) ? $httpRes ['code'] : null;
+				//              $requestId = isset( $httpRes ['requestId'] ) ? $httpRes ['requestId'] : null;
+				//              return $this->errorResponse ( $code, "fail upload block file:" . $message, $requestId );
+			}
+			// 保存 块编号partNumber 和 标记ETag，用于分片完成时的参数设置
+			$uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
+		}
+		// 分片上传完成
+		$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
+		$uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
+		$uploadOption->setMd5(md5_file($filePath));                         //文件Md5
+		return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
+	}
 
-    /**上传字符串/二进制数据
+	/**上传字符串/二进制数据
      * @param string $data
      *          文件数据
      * @param UploadPolicy $uploadPolicy
@@ -141,450 +141,450 @@ 
      *          上传选项
      * @return array
      */
-    public function uploadData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
-    {
-        if (empty($uploadOption)) {
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption，则生成一个默认的
-        }
-        // UploadPolicy 和 UploadOption检查
-        list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
-        if (!$isValid) {
-            return $this->errorResponse("ErrorUploadInfo", "error upload policy or option:" . $message);
-        }
-        $dataSize = strlen($data);
-        // 文件大于设定的分片大小(默认2M)，则进行分片上传uploadSuperfile()
-        if ($dataSize > ($uploadOption->blockSize)) {
-            return $this->uploadSuperData($data, $uploadPolicy, $uploadOption);
-        }
-        // 文件不大于设定的分片大小(默认2M)，则直接上传uploadMiniFile()
-        $uploadOption->setContent($data);
-        $url = $this->upload_host . Conf::UPLOAD_API_UPLOAD;        //普通上传的API
-        return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
-    }
+	public function uploadData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
+	{
+		if (empty($uploadOption)) {
+			$uploadOption = new UploadOption();     //如果用户没有传递UploadOption，则生成一个默认的
+		}
+		// UploadPolicy 和 UploadOption检查
+		list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
+		if (!$isValid) {
+			return $this->errorResponse("ErrorUploadInfo", "error upload policy or option:" . $message);
+		}
+		$dataSize = strlen($data);
+		// 文件大于设定的分片大小(默认2M)，则进行分片上传uploadSuperfile()
+		if ($dataSize > ($uploadOption->blockSize)) {
+			return $this->uploadSuperData($data, $uploadPolicy, $uploadOption);
+		}
+		// 文件不大于设定的分片大小(默认2M)，则直接上传uploadMiniFile()
+		$uploadOption->setContent($data);
+		$url = $this->upload_host . Conf::UPLOAD_API_UPLOAD;        //普通上传的API
+		return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
+	}
 
-    /**
-     * 分片上传大文件数据
-     * @param string $data 文件数据
-     * @param UploadPolicy $uploadPolicy 上传策略
-     * @param UploadOption $uploadOption 上传选项
-     * @return array
-     */
-    protected function uploadSuperData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
-    {
-        $dataSize = strlen($data);          // 文件大小
-        $blockSize = $uploadOption->blockSize;  // 文件分片大小
-        $blockNum = intval(ceil($dataSize / $blockSize)); // 文件分片后的块数
-        for ($i = 0; $i < $blockNum; $i++) {
-            $currentSize = $blockSize; // 当前文件块的大小
-            if (($i + 1) === $blockNum) {
-                $currentSize = ($dataSize - ($blockNum - 1) * $blockSize); // 计算最后一个块的大小
-            }
-            $offset = $i * $blockSize; // 当前文件块相对于文件开头的偏移量（块的起始位置）
-            $blockData = substr($data, $offset, $currentSize); //当前文件块的数据
-            $uploadOption->setContent($blockData); // 设置待上传的文件块
-            $httpRes = null;
-            if (0 == $i) {
-                // 分片初始化阶段
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
-                $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
-                $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
-                $uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID（OSS用于区分上传的id）
-                $id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID（多媒体服务用于区分上传的id）
-                $uploadOption->setUploadId($uploadId);
-                $uploadOption->setUniqueIdId($id);
-            } else {
-                // 分片上传过程中
-                $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
-                $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
-                $uploadOption->setPartNumber($i + 1);                           //
-                $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
-            }
-            // 如果分片上传失败，则取消cancel分片上传任务，然后返回错误信息
-            if (!$httpRes['isSuccess']) {
-                if ($uploadOption->checkMutipartParas()) {
-                    $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
-                    $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
-                    $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption); // 不判断取消分片任务返回的结果
-                }
-                return $httpRes;
-            }
-            // 保存 块编号partNumber 和 标记ETag，用于分片完成时的参数设置
-            $uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
-        }
-        // 分片上传完成
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
-        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
-        $uploadOption->setMd5(md5($data));                          //文件Md5
-        return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
-    }
+	/**
+	 * 分片上传大文件数据
+	 * @param string $data 文件数据
+	 * @param UploadPolicy $uploadPolicy 上传策略
+	 * @param UploadOption $uploadOption 上传选项
+	 * @return array
+	 */
+	protected function uploadSuperData($data, UploadPolicy $uploadPolicy, UploadOption $uploadOption = null)
+	{
+		$dataSize = strlen($data);          // 文件大小
+		$blockSize = $uploadOption->blockSize;  // 文件分片大小
+		$blockNum = intval(ceil($dataSize / $blockSize)); // 文件分片后的块数
+		for ($i = 0; $i < $blockNum; $i++) {
+			$currentSize = $blockSize; // 当前文件块的大小
+			if (($i + 1) === $blockNum) {
+				$currentSize = ($dataSize - ($blockNum - 1) * $blockSize); // 计算最后一个块的大小
+			}
+			$offset = $i * $blockSize; // 当前文件块相对于文件开头的偏移量（块的起始位置）
+			$blockData = substr($data, $offset, $currentSize); //当前文件块的数据
+			$uploadOption->setContent($blockData); // 设置待上传的文件块
+			$httpRes = null;
+			if (0 == $i) {
+				// 分片初始化阶段
+				$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
+				$uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
+				$httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
+				$uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID（OSS用于区分上传的id）
+				$id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID（多媒体服务用于区分上传的id）
+				$uploadOption->setUploadId($uploadId);
+				$uploadOption->setUniqueIdId($id);
+			} else {
+				// 分片上传过程中
+				$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
+				$uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
+				$uploadOption->setPartNumber($i + 1);                           //
+				$httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
+			}
+			// 如果分片上传失败，则取消cancel分片上传任务，然后返回错误信息
+			if (!$httpRes['isSuccess']) {
+				if ($uploadOption->checkMutipartParas()) {
+					$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
+					$uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
+					$this->sendRequest('POST', $url, $uploadPolicy, $uploadOption); // 不判断取消分片任务返回的结果
+				}
+				return $httpRes;
+			}
+			// 保存 块编号partNumber 和 标记ETag，用于分片完成时的参数设置
+			$uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
+		}
+		// 分片上传完成
+		$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
+		$uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
+		$uploadOption->setMd5(md5($data));                          //文件Md5
+		return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
+	}
 
-    /**
-     * 创建分片上传任务，指定待上传的文件。即初始化分片上传
-     * @param string $filePath 文件路径
-     * @param UploadPolicy $uploadPolicy 上传策略
-     * @param UploadOption $uploadOption 上传选项
-     * @return array 初始化分片上传的结果
-     */
-    public function multipartInit($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
-    {
-        $encodePath = iconv('UTF-8', 'GB2312', $filePath); //中文需要转换成gb2312，file_exist等函数才能识别
-        if (!file_exists($encodePath)) {
-            return $this->errorResponse("FileNotExist", "file not exist");
-        }
-        if (empty($uploadOption)) {
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption，则生成一个默认的
-        }
-        if (empty($uploadOption->name)) {
-            $uploadOption->name = basename($filePath);        //如果用户没有设置name属性，则使用上传时的文件名
-        }
-        $blockData = file_get_contents($encodePath, 0, null, 0, $uploadOption->blockSize);
-        return $this->multipartInitByData($blockData, $uploadPolicy, $uploadOption);
-    }
+	/**
+	 * 创建分片上传任务，指定待上传的文件。即初始化分片上传
+	 * @param string $filePath 文件路径
+	 * @param UploadPolicy $uploadPolicy 上传策略
+	 * @param UploadOption $uploadOption 上传选项
+	 * @return array 初始化分片上传的结果
+	 */
+	public function multipartInit($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
+	{
+		$encodePath = iconv('UTF-8', 'GB2312', $filePath); //中文需要转换成gb2312，file_exist等函数才能识别
+		if (!file_exists($encodePath)) {
+			return $this->errorResponse("FileNotExist", "file not exist");
+		}
+		if (empty($uploadOption)) {
+			$uploadOption = new UploadOption();     //如果用户没有传递UploadOption，则生成一个默认的
+		}
+		if (empty($uploadOption->name)) {
+			$uploadOption->name = basename($filePath);        //如果用户没有设置name属性，则使用上传时的文件名
+		}
+		$blockData = file_get_contents($encodePath, 0, null, 0, $uploadOption->blockSize);
+		return $this->multipartInitByData($blockData, $uploadPolicy, $uploadOption);
+	}
 
-    /**
-     * 创建分片上传任务，指定初始化分片任务的数据，即第一块数据
-     * @param string $blockData 文件数据
-     * @param UploadPolicy $uploadPolicy 上传策略
-     * @param UploadOption $uploadOption 上传选项
-     * @return array 初始化分片上传的结果
-     */
-    public function multipartInitByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
-    {
-        if (empty($uploadOption)) {
-            $uploadOption = new UploadOption();     //如果用户没有传递UploadOption，则生成一个默认的
-        }
-        // UploadPolicy 和 UploadOption检查
-        list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
-        if (!$isValid) {
-            return $this->errorResponse("ErrorUploadInfo", "error upload policy or option:" . $message);
-        }
-        // 数据大小不等于设定的分片大小(默认2M)，则无法完成初始化
-        $dataSize = strlen($blockData);         // 数据文件大小
-        if ($dataSize != ($uploadOption->blockSize)) {
-            return $this->errorResponse("MultipartInitError", "UploadOption's blockSize is not equal to data's size");
-        }
-        $uploadOption->setContent($blockData); // 设置待上传的文件块
-        $uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
-        $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
-        //若成功返回，则保存初始化成功的uploadId、id 以及 partNumber、eTag
-        $uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID（OSS用于区分上传的id）
-        $id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID（多媒体服务用于区分上传的id）
-        $uploadOption->setUploadId($uploadId);
-        $uploadOption->setUniqueIdId($id);
-        if (isset($httpRes['partNumber']) && isset($httpRes['eTag'])) {
-            $uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
-        }
-        return $httpRes;
-    }
+	/**
+	 * 创建分片上传任务，指定初始化分片任务的数据，即第一块数据
+	 * @param string $blockData 文件数据
+	 * @param UploadPolicy $uploadPolicy 上传策略
+	 * @param UploadOption $uploadOption 上传选项
+	 * @return array 初始化分片上传的结果
+	 */
+	public function multipartInitByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
+	{
+		if (empty($uploadOption)) {
+			$uploadOption = new UploadOption();     //如果用户没有传递UploadOption，则生成一个默认的
+		}
+		// UploadPolicy 和 UploadOption检查
+		list($isValid, $message) = $this->checkUploadInfo($uploadPolicy, $uploadOption);
+		if (!$isValid) {
+			return $this->errorResponse("ErrorUploadInfo", "error upload policy or option:" . $message);
+		}
+		// 数据大小不等于设定的分片大小(默认2M)，则无法完成初始化
+		$dataSize = strlen($blockData);         // 数据文件大小
+		if ($dataSize != ($uploadOption->blockSize)) {
+			return $this->errorResponse("MultipartInitError", "UploadOption's blockSize is not equal to data's size");
+		}
+		$uploadOption->setContent($blockData); // 设置待上传的文件块
+		$uploadOption->optionType = UpOptionType::BLOCK_INIT_UPLOAD;    //初始化分片时的Option类型
+		$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_INIT;        //初始化分片上传的API
+		$httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
+		//若成功返回，则保存初始化成功的uploadId、id 以及 partNumber、eTag
+		$uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID（OSS用于区分上传的id）
+		$id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID（多媒体服务用于区分上传的id）
+		$uploadOption->setUploadId($uploadId);
+		$uploadOption->setUniqueIdId($id);
+		if (isset($httpRes['partNumber']) && isset($httpRes['eTag'])) {
+			$uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
+		}
+		return $httpRes;
+	}
 
-    /**分片上传，指定待上传的文件。需要指定UploadOption中文件块编号
+	/**分片上传，指定待上传的文件。需要指定UploadOption中文件块编号
      * @param string $filePath 文件路径
      * @param UploadPolicy $uploadPolicy 上传策略
      * @param UploadOption $uploadOption 上传选项
      * @return array 初始化分片上传的结果
      */
-    public function multipartUpload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
-    {
-        $encodePath = iconv('UTF-8', 'GB2312', $filePath); //中文需要转换成gb2312，file_exist等函数才能识别
-        if (!file_exists($encodePath)) {
-            return $this->errorResponse("FileNotExist", "file not exist");
-        }
-        $fileSize = filesize($encodePath);      // 文件大小
-        $blockSize = $uploadOption->blockSize;  // 文件分片大小
-        $blockNum = intval(ceil($fileSize / $blockSize)); // 文件分片后的块数
-        $currentSize = $blockSize; // 当前文件块的大小
-        if ($uploadOption->getPartNumber() == $blockNum) {
-            $currentSize = ($fileSize - ($blockNum - 1) * $blockSize); // 计算最后一个块的大小
-        }
-        $offset = ($uploadOption->getPartNumber() - 1) * $blockSize; // 当前文件块相对于文件开头的偏移量（块的起始位置）
-        $blockData = file_get_contents($encodePath, 0, null, $offset, $currentSize);
-        return $this->multipartUploadByData($blockData, $uploadPolicy, $uploadOption);
-    }
+	public function multipartUpload($filePath, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
+	{
+		$encodePath = iconv('UTF-8', 'GB2312', $filePath); //中文需要转换成gb2312，file_exist等函数才能识别
+		if (!file_exists($encodePath)) {
+			return $this->errorResponse("FileNotExist", "file not exist");
+		}
+		$fileSize = filesize($encodePath);      // 文件大小
+		$blockSize = $uploadOption->blockSize;  // 文件分片大小
+		$blockNum = intval(ceil($fileSize / $blockSize)); // 文件分片后的块数
+		$currentSize = $blockSize; // 当前文件块的大小
+		if ($uploadOption->getPartNumber() == $blockNum) {
+			$currentSize = ($fileSize - ($blockNum - 1) * $blockSize); // 计算最后一个块的大小
+		}
+		$offset = ($uploadOption->getPartNumber() - 1) * $blockSize; // 当前文件块相对于文件开头的偏移量（块的起始位置）
+		$blockData = file_get_contents($encodePath, 0, null, $offset, $currentSize);
+		return $this->multipartUploadByData($blockData, $uploadPolicy, $uploadOption);
+	}
 
-    /**
-     * 分片上传，指定待上传的数据。需要指定UploadOption中文件块编号
-     * @param string $filePath 文件路径
-     * @param UploadPolicy $uploadPolicy 上传策略
-     * @param UploadOption $uploadOption 上传选项
-     * @return array 分片上传的结果
-     */
-    public function multipartUploadByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
-    {
-        $partNumber = $uploadOption->getPartNumber(); //php 5.3的版本使用empty()传递函数返回值会报错。所以为了兼容，增加临时变量
-        // 检查分片上传所需的参数是否设置正确
-        if (!$uploadOption->checkMutipartParas() || empty($partNumber)) {
-            return $this->errorResponse("MultipartUploadError", "multipart upload's parameters(id,uploadId,partNumber) error");
-        }
-        $uploadOption->setContent($blockData); // 设置待上传的文件块
-        $uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
-        $httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
-        if (isset($httpRes['partNumber']) && isset($httpRes['eTag'])) {
-            $uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
-        }
-        return $httpRes;
-    }
+	/**
+	 * 分片上传，指定待上传的数据。需要指定UploadOption中文件块编号
+	 * @param string $filePath 文件路径
+	 * @param UploadPolicy $uploadPolicy 上传策略
+	 * @param UploadOption $uploadOption 上传选项
+	 * @return array 分片上传的结果
+	 */
+	public function multipartUploadByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
+	{
+		$partNumber = $uploadOption->getPartNumber(); //php 5.3的版本使用empty()传递函数返回值会报错。所以为了兼容，增加临时变量
+		// 检查分片上传所需的参数是否设置正确
+		if (!$uploadOption->checkMutipartParas() || empty($partNumber)) {
+			return $this->errorResponse("MultipartUploadError", "multipart upload's parameters(id,uploadId,partNumber) error");
+		}
+		$uploadOption->setContent($blockData); // 设置待上传的文件块
+		$uploadOption->optionType = UpOptionType::BLOCK_RUN_UPLOAD;     //分片上传过程中的Option类型
+		$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_UPLOAD;      //分片上传过程中的API
+		$httpRes = $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
+		if (isset($httpRes['partNumber']) && isset($httpRes['eTag'])) {
+			$uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);
+		}
+		return $httpRes;
+	}
 
-    /**
-     * 完成分片上传任务。需要指定UploadOption中整个文件的md5值
-     * @param UploadPolicy $uploadPolicy 上传策略
-     * @param UploadOption $uploadOption 上传选项
-     * @return array 分片上传完成的结果
-     */
-    public function multipartComplete(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
-    {
+	/**
+	 * 完成分片上传任务。需要指定UploadOption中整个文件的md5值
+	 * @param UploadPolicy $uploadPolicy 上传策略
+	 * @param UploadOption $uploadOption 上传选项
+	 * @return array 分片上传完成的结果
+	 */
+	public function multipartComplete(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
+	{
  // 检查分片上传所需的参数是否设置正确
-        $fileMd5 = $uploadOption->getMd5(); //php 5.3的版本使用empty()传递函数返回值会报错。所以为了兼容，增加临时变量
-        if (!$uploadOption->checkMutipartParas() || empty($fileMd5)) {
-            return $this->errorResponse("MultipartCompleteError", "multipart upload's parameters(id,uploadId,md5) error");
-        }
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
-        $uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
-        return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
-    }
+		$fileMd5 = $uploadOption->getMd5(); //php 5.3的版本使用empty()传递函数返回值会报错。所以为了兼容，增加临时变量
+		if (!$uploadOption->checkMutipartParas() || empty($fileMd5)) {
+			return $this->errorResponse("MultipartCompleteError", "multipart upload's parameters(id,uploadId,md5) error");
+		}
+		$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE;            //完成分片上传任务的API
+		$uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD;        //完成分片上传任务时的Option类型
+		return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
+	}
 
-    /**
-     * 取消分片上传任务。需要保证UploadOption中有分片任务的uploadId和id
-     * @param UploadPolicy $uploadPolicy 上传策略
-     * @param UploadOption $uploadOption 上传选项
-     * @return array 分片上传完成的结果
-     */
-    public function multipartCancel(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
-    {
-        if (!$uploadOption->checkMutipartParas()) {
-            return $this->errorResponse("MultipartCancelError", "multipart upload's parameters(id,uploadId) error");
-        }
-        $url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
-        $uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
-        return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
-    }
+	/**
+	 * 取消分片上传任务。需要保证UploadOption中有分片任务的uploadId和id
+	 * @param UploadPolicy $uploadPolicy 上传策略
+	 * @param UploadOption $uploadOption 上传选项
+	 * @return array 分片上传完成的结果
+	 */
+	public function multipartCancel(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
+	{
+		if (!$uploadOption->checkMutipartParas()) {
+			return $this->errorResponse("MultipartCancelError", "multipart upload's parameters(id,uploadId) error");
+		}
+		$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL;      //取消分片任务的API
+		$uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD;  //取消分片任务时的Option类型
+		return $this->sendRequest('POST', $url, $uploadPolicy, $uploadOption);
+	}
 
-    /**
-     * 调用curl利用http上传数据
-     * @param string $method
-     * @param string $url
-     * @param UploadPolicy $uploadPolicy
-     * @param UploadOption $uploadOption
-     * @return array (isSuccess, ...)
-     */
-    protected function sendRequest($method, $url, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
-    {
-        $success = false;
-        $http_code = 0;
-        $result = array();
-        /**
-         * @var resource $ch
-         */
-        $ch = curl_init();
-        try {
-            //构建Http请求头和请求体
-            $_headers = array('Expect:');
-            $token = $this->getUploadToken($uploadPolicy);
-            array_push($_headers, "Authorization: {$token}");
-            array_push($_headers, "User-Agent: {$this->getUserAgent()}");
-            $length = 0;
-            if (!empty($uploadOption)) {
-                list($contentType, $httpBody) = $this->buildMultipartForm($uploadOption);
-                $length = @strlen($httpBody);
-                array_push($_headers, "Content-Type: {$contentType}");
-                curl_setopt($ch, CURLOPT_POSTFIELDS, $httpBody);            //请求体
-            }
-            array_push($_headers, "Content-Length: {$length}");
-            curl_setopt($ch, CURLOPT_HEADER, 1);                            //设置头部
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $_headers);                //请求头
-            curl_setopt($ch, CURLOPT_TIMEOUT, $uploadOption->timeout);  //持续时长
-            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);               //连接超时时长
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); //成功，只返回结果，不自动输出任何内容。如果失败返回FALSE
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
-            curl_setopt($ch, CURLOPT_URL, $url);
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);           //自定义请求
-            //设置请求方式(GET或POST等)
-            if ($method == 'PUT' || $method == 'POST') {
-                curl_setopt($ch, CURLOPT_POST, 1);
-            } else {
-                curl_setopt($ch, CURLOPT_POST, 0);
-            }
-            //执行上传，然后获取服务端返回，决定是否重试
-            $response = curl_exec($ch);
-            if ($response === false && $uploadOption->httpReTry != 0) {
-                //如果执行curl失败，且需要重试，则进行重试
-                $this->recordCurlErrorLog($ch); //记录最近一次curl执行错误日志
-                $response = curl_exec($ch);
-            }
-            if ($response === false) {
-                $this->recordCurlErrorLog($ch); //记录最近一次curl执行错误日志
-                $result = $this->errorResponse("curl error", "curl request failed");
-                $result['errno'] = curl_errno($ch); //错误码
-            } else {
-                //解析返回结果，并判断是否上传成功
-                $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-                $success = ($http_code == 200) ? true : false;                  //判断是否上传成功
-                $resStr = explode("\r\n\r\n", $response, 2);
-                $resBody = isset($resStr[1]) ? $resStr[1] : '';
-                $resArray = json_decode($resBody, true);                        //解析得到结果
-                $result = (empty($resArray) ? $result : $resArray);
-            }
-        } catch (Exception $e) {
-            $result = $this->errorResponse("HTTPRequestException#" . $e->getLine(), $e->getMessage());
-        }
+	/**
+	 * 调用curl利用http上传数据
+	 * @param string $method
+	 * @param string $url
+	 * @param UploadPolicy $uploadPolicy
+	 * @param UploadOption $uploadOption
+	 * @return array (isSuccess, ...)
+	 */
+	protected function sendRequest($method, $url, UploadPolicy $uploadPolicy, UploadOption $uploadOption)
+	{
+		$success = false;
+		$http_code = 0;
+		$result = array();
+		/**
+		 * @var resource $ch
+		 */
+		$ch = curl_init();
+		try {
+			//构建Http请求头和请求体
+			$_headers = array('Expect:');
+			$token = $this->getUploadToken($uploadPolicy);
+			array_push($_headers, "Authorization: {$token}");
+			array_push($_headers, "User-Agent: {$this->getUserAgent()}");
+			$length = 0;
+			if (!empty($uploadOption)) {
+				list($contentType, $httpBody) = $this->buildMultipartForm($uploadOption);
+				$length = @strlen($httpBody);
+				array_push($_headers, "Content-Type: {$contentType}");
+				curl_setopt($ch, CURLOPT_POSTFIELDS, $httpBody);            //请求体
+			}
+			array_push($_headers, "Content-Length: {$length}");
+			curl_setopt($ch, CURLOPT_HEADER, 1);                            //设置头部
+			curl_setopt($ch, CURLOPT_HTTPHEADER, $_headers);                //请求头
+			curl_setopt($ch, CURLOPT_TIMEOUT, $uploadOption->timeout);  //持续时长
+			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);               //连接超时时长
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); //成功，只返回结果，不自动输出任何内容。如果失败返回FALSE
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
+			curl_setopt($ch, CURLOPT_URL, $url);
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);           //自定义请求
+			//设置请求方式(GET或POST等)
+			if ($method == 'PUT' || $method == 'POST') {
+				curl_setopt($ch, CURLOPT_POST, 1);
+			} else {
+				curl_setopt($ch, CURLOPT_POST, 0);
+			}
+			//执行上传，然后获取服务端返回，决定是否重试
+			$response = curl_exec($ch);
+			if ($response === false && $uploadOption->httpReTry != 0) {
+				//如果执行curl失败，且需要重试，则进行重试
+				$this->recordCurlErrorLog($ch); //记录最近一次curl执行错误日志
+				$response = curl_exec($ch);
+			}
+			if ($response === false) {
+				$this->recordCurlErrorLog($ch); //记录最近一次curl执行错误日志
+				$result = $this->errorResponse("curl error", "curl request failed");
+				$result['errno'] = curl_errno($ch); //错误码
+			} else {
+				//解析返回结果，并判断是否上传成功
+				$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+				$success = ($http_code == 200) ? true : false;                  //判断是否上传成功
+				$resStr = explode("\r\n\r\n", $response, 2);
+				$resBody = isset($resStr[1]) ? $resStr[1] : '';
+				$resArray = json_decode($resBody, true);                        //解析得到结果
+				$result = (empty($resArray) ? $result : $resArray);
+			}
+		} catch (Exception $e) {
+			$result = $this->errorResponse("HTTPRequestException#" . $e->getLine(), $e->getMessage());
+		}
 
-        curl_close($ch); //PHP5.3中不支持finally关键字。因此，为了兼容，这里取消finally
-        if (!$success) {
-            throw new UploadException($result['message'], $http_code);
-        }
-        $result['isSuccess'] = $success;
-        return $result;
-    }
+		curl_close($ch); //PHP5.3中不支持finally关键字。因此，为了兼容，这里取消finally
+		if (!$success) {
+			throw new UploadException($result['message'], $http_code);
+		}
+		$result['isSuccess'] = $success;
+		return $result;
+	}
 
-    /**
-     * uploadPolicy和uploadOption 合法性检查
-     * @param UploadPolicy $uploadPolicy 上传策略
-     * @param UploadOption $uploadOption 上传选项
-     * @return array($isValid, $message)
-     */
-    protected function checkUploadInfo(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
-    {
-        $isValid = true;
-        $message = null;
-        // 1：判断是否设置空间名
-        if (empty($uploadPolicy->bucket) && empty($uploadPolicy->namespace)) {
-            $isValid = false;
-            $message = 'namespace or bucket is empty';
-        } elseif (empty($uploadPolicy->name)) {
-            // 2：优先使用uploadPolicy中的name，如果为空，则使用uploadOption中的name
-            if (empty($uploadOption->name)) {
-                $isValid = false;
-                $message = "file's name is empty"; // 如果uploadPolicy和uploadOption中的文件名name都为空，则返回错误信息
-            }
-        }
-        if (true === $isValid) {
-            // 3：优先使用uploadPolicy中的dir
-            if (!empty($uploadPolicy->dir)) {
-                if (strpos($uploadPolicy->dir, '/') !== 0) {
-                    $uploadPolicy->dir = '/' . $uploadPolicy->dir; //如果dir不为空，且其前面没有以"/"开头，则为其添加
-                }
-            }
-            // 4：如果uploadPolicy中的dir为空，则使用uploadOption中的dir
-            if (!empty($uploadOption->dir)) {
-                if (strpos($uploadOption->dir, '/') !== 0) {
-                    $uploadOption->dir = '/' . $uploadOption->dir; //如果dir不为空，且其前面没有以"/"开头，则为其添加
-                }
-            }
-            // 5：判断用户设置的文件分块大小，是否在指定的范围内。如果不在，则设置为默认Conf::BLOCK_DEFF_SIZE = 2M
-            if (($uploadOption->blockSize > Conf::BLOCK_MAX_SIZE) || ($uploadOption->blockSize < Conf::BLOCK_MIN_SIZE)) {
-                $uploadOption->blockSize = Conf::BLOCK_DEFF_SIZE;
-            }
-        }
-        return array($isValid, $message);
-    }
+	/**
+	 * uploadPolicy和uploadOption 合法性检查
+	 * @param UploadPolicy $uploadPolicy 上传策略
+	 * @param UploadOption $uploadOption 上传选项
+	 * @return array($isValid, $message)
+	 */
+	protected function checkUploadInfo(UploadPolicy $uploadPolicy, UploadOption $uploadOption)
+	{
+		$isValid = true;
+		$message = null;
+		// 1：判断是否设置空间名
+		if (empty($uploadPolicy->bucket) && empty($uploadPolicy->namespace)) {
+			$isValid = false;
+			$message = 'namespace or bucket is empty';
+		} elseif (empty($uploadPolicy->name)) {
+			// 2：优先使用uploadPolicy中的name，如果为空，则使用uploadOption中的name
+			if (empty($uploadOption->name)) {
+				$isValid = false;
+				$message = "file's name is empty"; // 如果uploadPolicy和uploadOption中的文件名name都为空，则返回错误信息
+			}
+		}
+		if (true === $isValid) {
+			// 3：优先使用uploadPolicy中的dir
+			if (!empty($uploadPolicy->dir)) {
+				if (strpos($uploadPolicy->dir, '/') !== 0) {
+					$uploadPolicy->dir = '/' . $uploadPolicy->dir; //如果dir不为空，且其前面没有以"/"开头，则为其添加
+				}
+			}
+			// 4：如果uploadPolicy中的dir为空，则使用uploadOption中的dir
+			if (!empty($uploadOption->dir)) {
+				if (strpos($uploadOption->dir, '/') !== 0) {
+					$uploadOption->dir = '/' . $uploadOption->dir; //如果dir不为空，且其前面没有以"/"开头，则为其添加
+				}
+			}
+			// 5：判断用户设置的文件分块大小，是否在指定的范围内。如果不在，则设置为默认Conf::BLOCK_DEFF_SIZE = 2M
+			if (($uploadOption->blockSize > Conf::BLOCK_MAX_SIZE) || ($uploadOption->blockSize < Conf::BLOCK_MIN_SIZE)) {
+				$uploadOption->blockSize = Conf::BLOCK_DEFF_SIZE;
+			}
+		}
+		return array($isValid, $message);
+	}
 
-    /**
-     * 构建Http请求的Body
-     * @param UploadOption $uploadOption
-     * @return array (contentType,httpBody)
-     */
-    protected function buildMultipartForm(UploadOption $uploadOption)
-    {
-        $bodyArray = array();
-        $mimeBoundary = md5(microtime());
-        $paraArray = $uploadOption->getParaArray();
-        foreach ($paraArray as $name => $val) {
-            if ($name != 'content') {
-                array_push($bodyArray, '--' . $mimeBoundary);
-                array_push($bodyArray, "Content-Disposition: form-data; name=\"$name\"");
-                array_push($bodyArray, 'Content-Type: text/plain; charset=UTF-8');
-                array_push($bodyArray, '');
-                array_push($bodyArray, $val);
-            }
-        }
-        if (isset($paraArray['content'])) {
-            array_push($bodyArray, '--' . $mimeBoundary);
-            $fileName = empty($uploadOption->name) ? "temp" : $uploadOption->name;
-            array_push($bodyArray, "Content-Disposition: form-data; name=\"content\"; filename=\"{$fileName}\"");
-            array_push($bodyArray, "Content-Type: application/octet-stream");
-            array_push($bodyArray, '');
-            array_push($bodyArray, $paraArray['content']);
-        }
+	/**
+	 * 构建Http请求的Body
+	 * @param UploadOption $uploadOption
+	 * @return array (contentType,httpBody)
+	 */
+	protected function buildMultipartForm(UploadOption $uploadOption)
+	{
+		$bodyArray = array();
+		$mimeBoundary = md5(microtime());
+		$paraArray = $uploadOption->getParaArray();
+		foreach ($paraArray as $name => $val) {
+			if ($name != 'content') {
+				array_push($bodyArray, '--' . $mimeBoundary);
+				array_push($bodyArray, "Content-Disposition: form-data; name=\"$name\"");
+				array_push($bodyArray, 'Content-Type: text/plain; charset=UTF-8');
+				array_push($bodyArray, '');
+				array_push($bodyArray, $val);
+			}
+		}
+		if (isset($paraArray['content'])) {
+			array_push($bodyArray, '--' . $mimeBoundary);
+			$fileName = empty($uploadOption->name) ? "temp" : $uploadOption->name;
+			array_push($bodyArray, "Content-Disposition: form-data; name=\"content\"; filename=\"{$fileName}\"");
+			array_push($bodyArray, "Content-Type: application/octet-stream");
+			array_push($bodyArray, '');
+			array_push($bodyArray, $paraArray['content']);
+		}
 
-        array_push($bodyArray, '--' . $mimeBoundary . '--');
-        array_push($bodyArray, '');
+		array_push($bodyArray, '--' . $mimeBoundary . '--');
+		array_push($bodyArray, '');
 
-        $httpBody = implode("\r\n", $bodyArray);
-        $contentType = 'multipart/form-data; boundary=' . $mimeBoundary;
-        return array(
-            $contentType,
-            $httpBody
-        );
-    }
+		$httpBody = implode("\r\n", $bodyArray);
+		$contentType = 'multipart/form-data; boundary=' . $mimeBoundary;
+		return array(
+			$contentType,
+			$httpBody
+		);
+	}
 
-    /**
-     * UserAgent用户代理
-     */
-    protected function getUserAgent()
-    {
-        if ($this->type == "TOP") {
-            return "ALIMEDIASDK_PHP_TAE/" . Conf::SDK_VERSION;
-        } else {
-            return "ALIMEDIASDK_PHP_CLOUD/" . Conf::SDK_VERSION;
-        }
-    }
+	/**
+	 * UserAgent用户代理
+	 */
+	protected function getUserAgent()
+	{
+		if ($this->type == "TOP") {
+			return "ALIMEDIASDK_PHP_TAE/" . Conf::SDK_VERSION;
+		} else {
+			return "ALIMEDIASDK_PHP_CLOUD/" . Conf::SDK_VERSION;
+		}
+	}
 
-    /**
-     * 生成上传凭证
-     * @param UploadPolicy $uploadPolicy
-     * @return string 上传时的凭证token
-     */
-    public function getUploadToken(UploadPolicy $uploadPolicy)
-    {
-        $encodedPolicy = EncodeUtils::encodeWithURLSafeBase64(json_encode($uploadPolicy->toArray()));
-        $signed = hash_hmac('sha1', $encodedPolicy, $this->sk);
-        $tempStr = $this->ak . ":" . $encodedPolicy . ":" . $signed;
-        $token = "UPLOAD_AK_" . $this->type . " " . EncodeUtils::encodeWithURLSafeBase64($tempStr);
+	/**
+	 * 生成上传凭证
+	 * @param UploadPolicy $uploadPolicy
+	 * @return string 上传时的凭证token
+	 */
+	public function getUploadToken(UploadPolicy $uploadPolicy)
+	{
+		$encodedPolicy = EncodeUtils::encodeWithURLSafeBase64(json_encode($uploadPolicy->toArray()));
+		$signed = hash_hmac('sha1', $encodedPolicy, $this->sk);
+		$tempStr = $this->ak . ":" . $encodedPolicy . ":" . $signed;
+		$token = "UPLOAD_AK_" . $this->type . " " . EncodeUtils::encodeWithURLSafeBase64($tempStr);
 
-        return $token;
-    }
+		return $token;
+	}
 
-    /**
-     * 反馈错误信息
-     */
-    protected function errorResponse($code = "UnknownError", $message = "unkonown error", $requestId = null)
-    {
-        return array(
-            "isSuccess" => false,
-            "code" => $code,
-            "message" => $message,
-            "requestId" => $requestId
-        );
-    }
+	/**
+	 * 反馈错误信息
+	 */
+	protected function errorResponse($code = "UnknownError", $message = "unkonown error", $requestId = null)
+	{
+		return array(
+			"isSuccess" => false,
+			"code" => $code,
+			"message" => $message,
+			"requestId" => $requestId
+		);
+	}
 
-    /**
-     * 记录curl错误日志
-     * @param curl-handle $ch curl句柄
-     */
-    protected function recordCurlErrorLog($ch)
-    {
-        if (AlibabaImage::$run_level == Conf::RUN_LEVEL_DEBUG) {
-            $errno = curl_errno($ch); //错误码
-            $info  = curl_getinfo($ch); //curl连接资源句柄的信息
-            $info['errno'] = $errno; //添加到连接句柄信息中
-            $content = date("Y-m-d H:i:s") . json_encode($info) . "\n";
-            $logPath = dirname(__FILE__) . "/" . Conf::CURL_ERR_LOG;
-            $this->putContentToFile($content, $logPath);
-        }
-    }
+	/**
+	 * 记录curl错误日志
+	 * @param curl-handle $ch curl句柄
+	 */
+	protected function recordCurlErrorLog($ch)
+	{
+		if (AlibabaImage::$run_level == Conf::RUN_LEVEL_DEBUG) {
+			$errno = curl_errno($ch); //错误码
+			$info  = curl_getinfo($ch); //curl连接资源句柄的信息
+			$info['errno'] = $errno; //添加到连接句柄信息中
+			$content = date("Y-m-d H:i:s") . json_encode($info) . "\n";
+			$logPath = dirname(__FILE__) . "/" . Conf::CURL_ERR_LOG;
+			$this->putContentToFile($content, $logPath);
+		}
+	}
 
-    /**
-     * 将信息追加写到文件
-     * @param string $message 日志内容。
-     * @return void
-     */
-    protected function putContentToFile($content, $filepath)
-    {
-        if (!file_exists($filepath)) {
-            $handle = fopen($filepath, 'w');
-            fclose($handle);
-        }
-        file_put_contents($filepath, $content, FILE_APPEND);
-    }
+	/**
+	 * 将信息追加写到文件
+	 * @param string $message 日志内容。
+	 * @return void
+	 */
+	protected function putContentToFile($content, $filepath)
+	{
+		if (!file_exists($filepath)) {
+			$handle = fopen($filepath, 'w');
+			fclose($handle);
+		}
+		file_put_contents($filepath, $content, FILE_APPEND);
+	}
 }