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;
+		});
+	}
 }

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, '/') . '/';
+	}
 }

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;
+	}
 }

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级别
 }

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);
+	}
 }

sdk/Utils/ResourceInfo.php

Indentation +87 added lines, -87 removed lines

@@ -4,93 +4,93 @@
 /**文件资源类*/
 class ResourceInfo
 {
-    /* 以下属性是资源ID所需的属性*/
-    protected $namespace;                              //空间名，必须
-    protected $dir;                                    //路径
-    protected $name;                                   //文件名信息
-    /* 以下属性是资源ID所需的属性*/
-    /**
-     * ResourceOption的构造函数
-     */
-    public function __construct($namespace, $dir = null, $name = null)
-    {
-        $this->namespace = $namespace;
-        $this->dir = $dir;
-        $this->name = $name;
-    }
-    /**检测资源ID的是否合法。$dirState表示是否检测dir，$nameState表示是否检测filename<p>
+	/* 以下属性是资源ID所需的属性*/
+	protected $namespace;                              //空间名，必须
+	protected $dir;                                    //路径
+	protected $name;                                   //文件名信息
+	/* 以下属性是资源ID所需的属性*/
+	/**
+	 * ResourceOption的构造函数
+	 */
+	public function __construct($namespace, $dir = null, $name = null)
+	{
+		$this->namespace = $namespace;
+		$this->dir = $dir;
+		$this->name = $name;
+	}
+	/**检测资源ID的是否合法。$dirState表示是否检测dir，$nameState表示是否检测filename<p>
      * 返回格式{$isValid, $message}*/
-    public function checkResourceInfo($dirState = false, $nameState = false)
-    {
-        if (empty($this->namespace)) {
-            return array(false, "namespace is empty.[{$this->toString()}]"); // 判断是否设置空间名
-        } else {
-            return $this->checkFileInfo($dirState, $nameState); // 判断dir和name的合法性
-        }
-    }
-    /**检测文件信息是否合法。$dirState表示是否检测dir，$nameState表示是否检测filename<p>
+	public function checkResourceInfo($dirState = false, $nameState = false)
+	{
+		if (empty($this->namespace)) {
+			return array(false, "namespace is empty.[{$this->toString()}]"); // 判断是否设置空间名
+		} else {
+			return $this->checkFileInfo($dirState, $nameState); // 判断dir和name的合法性
+		}
+	}
+	/**检测文件信息是否合法。$dirState表示是否检测dir，$nameState表示是否检测filename<p>
      * 返回格式{$isValid, $message}*/
-    public function checkFileInfo($dirState = false, $nameState = false)
-    {
-        if ($nameState && empty($this->name)) {
-            return array(false, "file's name is empty.[{$this->toString()}]"); // 1：若需要进行文件名name检测，则判断文件名是否为空
-        }
-        if ($dirState) {
-            if (empty($this->dir)) {
-                $this->dir = '/'; // 2：判断路径是否为空，若为空，则默认为根目录'/'
-            } elseif (strpos($this->dir, '/') !== 0) {
-                $this->dir = '/' . $this->dir; // 3：判断路径是否以'/'开头，若不是，则添加'/'
-            }
-        }
-        return array(true, null);
-    }
-    /**资源ID(resourceId)的生成*/
-    public function buildResourceId()
-    {
-        $jsonData = array();
-        if (!empty($this->namespace)) {
-            array_push($jsonData, urldecode($this->namespace));
-        }
-        if (!empty($this->dir)) {
-            array_push($jsonData, urldecode($this->dir));
-        }
-        if (!empty($this->name)) {
-            array_push($jsonData, urldecode($this->name));
-        }
-        return EncodeUtils::encodeWithURLSafeBase64(json_encode($jsonData, true));
-    }
-    /**对URL中文进行编码*/
-    protected function urlencodeCh($str)
-    {
-        return preg_replace_callback('/[^\0-\127]+/', function ($match) {
-            return urlencode($match[0]);
-        }, $str);
-    }
-    public function toString()
-    {
-        return "namespace={$this->namespace}, dir={$this->dir}, name={$this->name}";
-    }
-    public function toArray()
-    {
-        return array("namespace" => $this->namespace, "dir" => $this->dir, "name" => $this->name);
-    }
-    /*###################下面是属性的get和set方法###############*/
-    /**设置路径*/
-    public function setNamespace($namespace)
-    {
-        $this->namespace = $namespace;
-        return $this;
-    }
-    /**设置路径*/
-    public function setDir($dir)
-    {
-        $this->dir = $dir;
-        return $this;
-    }
-    /**设置文件名*/
-    public function setName($filename)
-    {
-        $this->name = $filename;
-        return $this;
-    }
+	public function checkFileInfo($dirState = false, $nameState = false)
+	{
+		if ($nameState && empty($this->name)) {
+			return array(false, "file's name is empty.[{$this->toString()}]"); // 1：若需要进行文件名name检测，则判断文件名是否为空
+		}
+		if ($dirState) {
+			if (empty($this->dir)) {
+				$this->dir = '/'; // 2：判断路径是否为空，若为空，则默认为根目录'/'
+			} elseif (strpos($this->dir, '/') !== 0) {
+				$this->dir = '/' . $this->dir; // 3：判断路径是否以'/'开头，若不是，则添加'/'
+			}
+		}
+		return array(true, null);
+	}
+	/**资源ID(resourceId)的生成*/
+	public function buildResourceId()
+	{
+		$jsonData = array();
+		if (!empty($this->namespace)) {
+			array_push($jsonData, urldecode($this->namespace));
+		}
+		if (!empty($this->dir)) {
+			array_push($jsonData, urldecode($this->dir));
+		}
+		if (!empty($this->name)) {
+			array_push($jsonData, urldecode($this->name));
+		}
+		return EncodeUtils::encodeWithURLSafeBase64(json_encode($jsonData, true));
+	}
+	/**对URL中文进行编码*/
+	protected function urlencodeCh($str)
+	{
+		return preg_replace_callback('/[^\0-\127]+/', function ($match) {
+			return urlencode($match[0]);
+		}, $str);
+	}
+	public function toString()
+	{
+		return "namespace={$this->namespace}, dir={$this->dir}, name={$this->name}";
+	}
+	public function toArray()
+	{
+		return array("namespace" => $this->namespace, "dir" => $this->dir, "name" => $this->name);
+	}
+	/*###################下面是属性的get和set方法###############*/
+	/**设置路径*/
+	public function setNamespace($namespace)
+	{
+		$this->namespace = $namespace;
+		return $this;
+	}
+	/**设置路径*/
+	public function setDir($dir)
+	{
+		$this->dir = $dir;
+		return $this;
+	}
+	/**设置文件名*/
+	public function setName($filename)
+	{
+		$this->name = $filename;
+		return $this;
+	}
 }

sdk/Utils/SnapShotOption.php

Indentation +39 added lines, -39 removed lines

@@ -5,45 +5,45 @@
 /**视频截图的参数*/
 class SnapShotOption extends MediaResOption
 {
-    /** 视频截图的位置，单位为毫秒。该属性必须*/
-    private $time;
-    /** 通知url，任务结束之后会调用这个url。该属性可选 */
-    private $notifyUrl;
-    /**检测视频截图参数是否合法。如果合法，则返回http请求体<p> 返回格式{$isValid, $message, $httpBody}*/
-    public function checkOptionParameters()
-    {
-        list($valid, $msg) = parent::checkOptionParameters(); //检测输入输出资源是否合法
-        if (!$valid) {
-            return array($valid, $msg, null);
-        }
-        if (empty($this->time) || !is_int($this->time) || $this->time < 0) {
-            return array(false, "time is empty or invalid.", null); // 是否设置时间，且时间是否合法
-        }
-        return $this->getOptionsHttpBody(); //返回http请求体
-    }
+	/** 视频截图的位置，单位为毫秒。该属性必须*/
+	private $time;
+	/** 通知url，任务结束之后会调用这个url。该属性可选 */
+	private $notifyUrl;
+	/**检测视频截图参数是否合法。如果合法，则返回http请求体<p> 返回格式{$isValid, $message, $httpBody}*/
+	public function checkOptionParameters()
+	{
+		list($valid, $msg) = parent::checkOptionParameters(); //检测输入输出资源是否合法
+		if (!$valid) {
+			return array($valid, $msg, null);
+		}
+		if (empty($this->time) || !is_int($this->time) || $this->time < 0) {
+			return array(false, "time is empty or invalid.", null); // 是否设置时间，且时间是否合法
+		}
+		return $this->getOptionsHttpBody(); //返回http请求体
+	}
 
-    /**构建多媒体转码所需的http请求体*/
-    public function getOptionsHttpBody()
-    {
-        //必须的参数
-        $httpBody = 'input=' . $this->getInputResId();
-        $httpBody .= '&output=' . $this->getOutputResId();
-        $httpBody .= '&time=' . $this->time;
-        // 可选的参数
-        if (isset($this->notifyUrl)) {
-            $httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
-        }
-        return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体
-    }
+	/**构建多媒体转码所需的http请求体*/
+	public function getOptionsHttpBody()
+	{
+		//必须的参数
+		$httpBody = 'input=' . $this->getInputResId();
+		$httpBody .= '&output=' . $this->getOutputResId();
+		$httpBody .= '&time=' . $this->time;
+		// 可选的参数
+		if (isset($this->notifyUrl)) {
+			$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
+		}
+		return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体
+	}
 
-    /**设置视频截图的位置，单位为毫秒。改参数必须设置*/
-    public function setTime($time)
-    {
-        $this->time = $time;
-    }
-    /**设置截图完成后的通知url。可选*/
-    public function setNotifyUrl($notifyUrl)
-    {
-        $this->notifyUrl = $notifyUrl;
-    }
+	/**设置视频截图的位置，单位为毫秒。改参数必须设置*/
+	public function setTime($time)
+	{
+		$this->time = $time;
+	}
+	/**设置截图完成后的通知url。可选*/
+	public function setNotifyUrl($notifyUrl)
+	{
+		$this->notifyUrl = $notifyUrl;
+	}
 }