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/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"两种模式
-
-    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"两种模式
+
+	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"两种模式
 
-    static $RUN_LEVEL = Conf::RUN_LEVEL_RELEASE;    //设置SDK运行级别
+    static $RUN_LEVEL = Conf::RUN_LEVEL_RELEASE; //设置SDK运行级别
 
     /**
      * 构造函数

sdk/Core/ManageClient.php

Indentation +432 added lines, -432 removed lines

@@ -10,461 +10,461 @@
 
 class ManageClient
 {
-    private $manage_host;
-    private $ak;
-    private $sk;
-    private $type;
-    public function __construct($ak, $sk, $type = Conf::TYPE_TOP)
-    {
-        $this->ak = $ak;
-        $this->sk = $sk;
-        $this->type = $type;
-        $this->manage_host = Conf::MANAGE_HOST_MEDIA;
-    }
+	private $manage_host;
+	private $ak;
+	private $sk;
+	private $type;
+	public function __construct($ak, $sk, $type = Conf::TYPE_TOP)
+	{
+		$this->ak = $ak;
+		$this->sk = $sk;
+		$this->type = $type;
+		$this->manage_host = Conf::MANAGE_HOST_MEDIA;
+	}
 
-    /**
-     * 文件是否存在
-     * @param string $namespace 空间名，必须
-     * @param string $dir 路径
-     * @param string $filename 文件名
-     * @return array
-     */
-    public function existsFile($namespace, $dir, $filename)
-    {
-        $resourceInfo = new ResourceInfo($namespace, $dir, $filename);
-        list($isValid, $message) = $resourceInfo->checkResourceInfo(true, true);
-        if (!$isValid) {
-            return $this->_errorResponse("InvalidArgument", $message);
-        }
-        $resourceId = $resourceInfo->buildResourceId(); //得到资源ID
-        $uri = '/' . Conf::MANAGE_API_VERSION . '/files/' . $resourceId . '/exist';
-        return $this->_send_request('GET', $uri);
-    }
+	/**
+	 * 文件是否存在
+	 * @param string $namespace 空间名，必须
+	 * @param string $dir 路径
+	 * @param string $filename 文件名
+	 * @return array
+	 */
+	public function existsFile($namespace, $dir, $filename)
+	{
+		$resourceInfo = new ResourceInfo($namespace, $dir, $filename);
+		list($isValid, $message) = $resourceInfo->checkResourceInfo(true, true);
+		if (!$isValid) {
+			return $this->_errorResponse("InvalidArgument", $message);
+		}
+		$resourceId = $resourceInfo->buildResourceId(); //得到资源ID
+		$uri = '/' . Conf::MANAGE_API_VERSION . '/files/' . $resourceId . '/exist';
+		return $this->_send_request('GET', $uri);
+	}
 
-    /**
-     * 获取文件的元信息(meta信息)
-     * @param string $namespace 空间名，必须
-     * @param string $dir 路径
-     * @param string $filename 文件名
-     * @return array
-     */
-    public function getFileInfo($namespace, $dir, $filename)
-    {
-        $resourceInfo = new ResourceInfo($namespace, $dir, $filename);
-        list($isValid, $message) = $resourceInfo->checkResourceInfo(true, true);
-        if (!$isValid) {
-            return $this->_errorResponse("InvalidArgument", $message);
-        }
-        $resourceId = $resourceInfo->buildResourceId(); //得到资源ID
-        $uri = '/' . Conf::MANAGE_API_VERSION . '/files/' . $resourceId;
-        return $this->_send_request('GET', $uri);
-    }
+	/**
+	 * 获取文件的元信息(meta信息)
+	 * @param string $namespace 空间名，必须
+	 * @param string $dir 路径
+	 * @param string $filename 文件名
+	 * @return array
+	 */
+	public function getFileInfo($namespace, $dir, $filename)
+	{
+		$resourceInfo = new ResourceInfo($namespace, $dir, $filename);
+		list($isValid, $message) = $resourceInfo->checkResourceInfo(true, true);
+		if (!$isValid) {
+			return $this->_errorResponse("InvalidArgument", $message);
+		}
+		$resourceId = $resourceInfo->buildResourceId(); //得到资源ID
+		$uri = '/' . Conf::MANAGE_API_VERSION . '/files/' . $resourceId;
+		return $this->_send_request('GET', $uri);
+	}
 
-    /**
-     * 重命名文件
-     * @param string $namespace 空间名，必须
-     * @param string $dir 路径
-     * @param string $filename 文件名
-     * @param string $newDir 新的路径
-     * @param string $newName 新的文件名
-     * @return array
-     */
-    public function renameFile($namespace, $dir, $filename, $newDir, $newName)
-    {
-        $resourceInfo = new ResourceInfo($namespace, $dir, $filename); //老的资源
-        list($isValid, $message) = $resourceInfo->checkResourceInfo(true, true);
-        if (!$isValid) {
-            return $this->_errorResponse("InvalidArgument", $message);
-        }
-        $newResourceInfo = new ResourceInfo($namespace, $newDir, $newName); //新的资源
-        list($isValid, $message) = $newResourceInfo->checkResourceInfo(true, true);
-        if (!$isValid) {
-            return $this->_errorResponse("InvalidArgument", $message);
-        }
-        $resourceId = $resourceInfo->buildResourceId(); //老资源ID
-        $newResourceId = $newResourceInfo->buildResourceId(); //新资源ID
-        $uri = '/' . Conf::MANAGE_API_VERSION . '/files/' . $resourceId . "/rename/" . $newResourceId;
-        return $this->_send_request('POST', $uri);
-    }
+	/**
+	 * 重命名文件
+	 * @param string $namespace 空间名，必须
+	 * @param string $dir 路径
+	 * @param string $filename 文件名
+	 * @param string $newDir 新的路径
+	 * @param string $newName 新的文件名
+	 * @return array
+	 */
+	public function renameFile($namespace, $dir, $filename, $newDir, $newName)
+	{
+		$resourceInfo = new ResourceInfo($namespace, $dir, $filename); //老的资源
+		list($isValid, $message) = $resourceInfo->checkResourceInfo(true, true);
+		if (!$isValid) {
+			return $this->_errorResponse("InvalidArgument", $message);
+		}
+		$newResourceInfo = new ResourceInfo($namespace, $newDir, $newName); //新的资源
+		list($isValid, $message) = $newResourceInfo->checkResourceInfo(true, true);
+		if (!$isValid) {
+			return $this->_errorResponse("InvalidArgument", $message);
+		}
+		$resourceId = $resourceInfo->buildResourceId(); //老资源ID
+		$newResourceId = $newResourceInfo->buildResourceId(); //新资源ID
+		$uri = '/' . Conf::MANAGE_API_VERSION . '/files/' . $resourceId . "/rename/" . $newResourceId;
+		return $this->_send_request('POST', $uri);
+	}
 
-    /**
-     * 获取指定目录下的文件列表
-     * @param string $namespace 空间名，必须
-     * @param string $dir 路径
-     * @param number $page 页数
-     * @param number $pageSize 每页显示的记录数
-     */
-    public function listFiles($namespace, $dir, $page = 1, $pageSize = 100)
-    {
-        $manageOption = new ManageOption($namespace);
-        $manageOption->setDir($dir)->setCurrentPage($page)->setPageSize($pageSize);
-        list($isValid, $message) = $manageOption->checkResourceInfo(true);
-        if ($page <= 0 || $pageSize <= 0) {
-            $isValid = false;
-            $message = "Invalid parameters page or pageSize";
-        }
-        if (!$isValid) {
-            return $this->_errorResponse("InvalidArgument", $message);
-        }
-        $queryParas = $manageOption->buildListFilesParas(); //查询query参数
-        $uri = '/' . Conf::MANAGE_API_VERSION . '/files?' . $queryParas;
-        return $this->_send_request('GET', $uri);
-    }
+	/**
+	 * 获取指定目录下的文件列表
+	 * @param string $namespace 空间名，必须
+	 * @param string $dir 路径
+	 * @param number $page 页数
+	 * @param number $pageSize 每页显示的记录数
+	 */
+	public function listFiles($namespace, $dir, $page = 1, $pageSize = 100)
+	{
+		$manageOption = new ManageOption($namespace);
+		$manageOption->setDir($dir)->setCurrentPage($page)->setPageSize($pageSize);
+		list($isValid, $message) = $manageOption->checkResourceInfo(true);
+		if ($page <= 0 || $pageSize <= 0) {
+			$isValid = false;
+			$message = "Invalid parameters page or pageSize";
+		}
+		if (!$isValid) {
+			return $this->_errorResponse("InvalidArgument", $message);
+		}
+		$queryParas = $manageOption->buildListFilesParas(); //查询query参数
+		$uri = '/' . Conf::MANAGE_API_VERSION . '/files?' . $queryParas;
+		return $this->_send_request('GET', $uri);
+	}
 
-    /**
-     * 删除文件
-     * @param string $namespace 空间名，必须
-     * @param string $dir 路径
-     * @param string $filename 文件名
-     * @return array
-     */
-    public function deleteFile($namespace, $dir, $filename)
-    {
-        $resourceInfo = new ResourceInfo($namespace, $dir, $filename);
-        list($isValid, $message) = $resourceInfo->checkResourceInfo(true, true);
-        if (!$isValid) {
-            return $this->_errorResponse("InvalidArgument", $message);
-        }
-        $resourceId = $resourceInfo->buildResourceId(); //得到资源ID
-        $uri = '/' . Conf::MANAGE_API_VERSION . '/files/' . $resourceId;
-        return $this->_send_request('DELETE', $uri);
-    }
+	/**
+	 * 删除文件
+	 * @param string $namespace 空间名，必须
+	 * @param string $dir 路径
+	 * @param string $filename 文件名
+	 * @return array
+	 */
+	public function deleteFile($namespace, $dir, $filename)
+	{
+		$resourceInfo = new ResourceInfo($namespace, $dir, $filename);
+		list($isValid, $message) = $resourceInfo->checkResourceInfo(true, true);
+		if (!$isValid) {
+			return $this->_errorResponse("InvalidArgument", $message);
+		}
+		$resourceId = $resourceInfo->buildResourceId(); //得到资源ID
+		$uri = '/' . Conf::MANAGE_API_VERSION . '/files/' . $resourceId;
+		return $this->_send_request('DELETE', $uri);
+	}
 
-    /**
-     * 文件夹是否存在
-     * @param string $namespace 空间名，必须
-     * @param string $dir 路径，即文件夹
-     * @return array
-     */
-    public function existsFolder($namespace, $dir)
-    {
-        if (empty($namespace) || empty($dir)) {
-            return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
-        }
-        if (strpos($dir, '/') !== 0) {
-            $dir = '/' . $dir;
-        }
-        $resourceInfo = new ResourceInfo($namespace, $dir);
-        $resourceId = $resourceInfo->buildResourceId(); //得到资源ID
-        $uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId . '/exist';
-        return $this->_send_request('GET', $uri);
-    }
+	/**
+	 * 文件夹是否存在
+	 * @param string $namespace 空间名，必须
+	 * @param string $dir 路径，即文件夹
+	 * @return array
+	 */
+	public function existsFolder($namespace, $dir)
+	{
+		if (empty($namespace) || empty($dir)) {
+			return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
+		}
+		if (strpos($dir, '/') !== 0) {
+			$dir = '/' . $dir;
+		}
+		$resourceInfo = new ResourceInfo($namespace, $dir);
+		$resourceId = $resourceInfo->buildResourceId(); //得到资源ID
+		$uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId . '/exist';
+		return $this->_send_request('GET', $uri);
+	}
 
-    /**
-     * 创建文件夹
-     * @param string $namespace 空间名，必须
-     * @param string $dir 路径，即文件夹
-     * @return array
-     */
-    public function createDir($namespace, $dir)
-    {
-        if (empty($namespace) || empty($dir)) {
-            return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
-        }
-        if (strpos($dir, '/') !== 0) {
-            $dir = '/' . $dir;
-        }
-        $resourceInfo = new ResourceInfo($namespace, $dir);
-        $resourceId = $resourceInfo->buildResourceId(); //得到资源ID
-        $uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId;
-        return $this->_send_request('POST', $uri);
-    }
+	/**
+	 * 创建文件夹
+	 * @param string $namespace 空间名，必须
+	 * @param string $dir 路径，即文件夹
+	 * @return array
+	 */
+	public function createDir($namespace, $dir)
+	{
+		if (empty($namespace) || empty($dir)) {
+			return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
+		}
+		if (strpos($dir, '/') !== 0) {
+			$dir = '/' . $dir;
+		}
+		$resourceInfo = new ResourceInfo($namespace, $dir);
+		$resourceId = $resourceInfo->buildResourceId(); //得到资源ID
+		$uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId;
+		return $this->_send_request('POST', $uri);
+	}
 
-    /**
-     * 获取指定目录下的文件夹列表
-     * @param string $namespace 空间名，必须
-     * @param string $dir 路径，指定目录
-     * @param number $page 页数
-     * @param number $pageSize 每页显示的记录数
-     */
-    public function listDirs($namespace, $dir, $page = 1, $pageSize = 100)
-    {
-        $manageOption = new ManageOption($namespace);
-        $manageOption->setDir($dir)->setCurrentPage($page)->setPageSize($pageSize);
-        list($isValid, $message) = $manageOption->checkResourceInfo(true);
-        if ($page <= 0 || $pageSize <= 0) {
-            $isValid = false;
-            $message = "Invalid parameters page or pageSize";
-        }
-        if (!$isValid) {
-            return $this->_errorResponse("InvalidArgument", $message);
-        }
-        $queryParas = $manageOption->buildListFilesParas(); //查询query参数
-        $uri = '/' . Conf::MANAGE_API_VERSION . '/folders?' . $queryParas;
-        return $this->_send_request('GET', $uri);
-    }
+	/**
+	 * 获取指定目录下的文件夹列表
+	 * @param string $namespace 空间名，必须
+	 * @param string $dir 路径，指定目录
+	 * @param number $page 页数
+	 * @param number $pageSize 每页显示的记录数
+	 */
+	public function listDirs($namespace, $dir, $page = 1, $pageSize = 100)
+	{
+		$manageOption = new ManageOption($namespace);
+		$manageOption->setDir($dir)->setCurrentPage($page)->setPageSize($pageSize);
+		list($isValid, $message) = $manageOption->checkResourceInfo(true);
+		if ($page <= 0 || $pageSize <= 0) {
+			$isValid = false;
+			$message = "Invalid parameters page or pageSize";
+		}
+		if (!$isValid) {
+			return $this->_errorResponse("InvalidArgument", $message);
+		}
+		$queryParas = $manageOption->buildListFilesParas(); //查询query参数
+		$uri = '/' . Conf::MANAGE_API_VERSION . '/folders?' . $queryParas;
+		return $this->_send_request('GET', $uri);
+	}
 
-    /**
-     * 删除文件夹
-     * @param string $namespace 空间名，必须
-     * @param string $dir 路径，即文件夹
-     * @return array
-     */
-    public function deleteDir($namespace, $dir)
-    {
-        if (empty($namespace) || empty($dir)) {
-            return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
-        }
-        if (strpos($dir, '/') !== 0) {
-            $dir = '/' . $dir;
-        }
-        $resourceInfo = new ResourceInfo($namespace, $dir);
-        $resourceId = $resourceInfo->buildResourceId(); //得到资源ID
-        $uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId;
-        return $this->_send_request('DELETE', $uri);
-    }
-    /*######################################华丽的分界线#######################################*/
-    /*#######################上面是文件或文件夹的管理，下面是特色服务接口########################*/
-    /*########################################################################################*/
-    /**黄图扫描接口
+	/**
+	 * 删除文件夹
+	 * @param string $namespace 空间名，必须
+	 * @param string $dir 路径，即文件夹
+	 * @return array
+	 */
+	public function deleteDir($namespace, $dir)
+	{
+		if (empty($namespace) || empty($dir)) {
+			return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
+		}
+		if (strpos($dir, '/') !== 0) {
+			$dir = '/' . $dir;
+		}
+		$resourceInfo = new ResourceInfo($namespace, $dir);
+		$resourceId = $resourceInfo->buildResourceId(); //得到资源ID
+		$uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId;
+		return $this->_send_request('DELETE', $uri);
+	}
+	/*######################################华丽的分界线#######################################*/
+	/*#######################上面是文件或文件夹的管理，下面是特色服务接口########################*/
+	/*########################################################################################*/
+	/**黄图扫描接口
      * @param ManageOption $resInfos 待扫描图片资源
      * @return array
      */
-    public function scanPorn(ManageOption $resInfos)
-    {
-        $uri = '/' . Conf::SCAN_PORN_VERSION . '/scanPorn';
-        list($isValid, $message, $bodyArray) = $resInfos->checkFilesAndUrls(); //检测并得到黄图扫描所需参数
-        if (!$isValid) {
-            return $this->_errorResponse("InvalidArgument", $message);
-        }
-        $httpBody = $this->createHttpBody($bodyArray); //http body字符串信息
-        return $this->_send_request('POST', $uri, $httpBody);
-    }
+	public function scanPorn(ManageOption $resInfos)
+	{
+		$uri = '/' . Conf::SCAN_PORN_VERSION . '/scanPorn';
+		list($isValid, $message, $bodyArray) = $resInfos->checkFilesAndUrls(); //检测并得到黄图扫描所需参数
+		if (!$isValid) {
+			return $this->_errorResponse("InvalidArgument", $message);
+		}
+		$httpBody = $this->createHttpBody($bodyArray); //http body字符串信息
+		return $this->_send_request('POST', $uri, $httpBody);
+	}
 
-    /**
-     * 鉴黄反馈feedback接口
-     * @param ManageOption $pornFbInfos 反馈信息
-     * @return array
-     */
-    public function pornFeedback(ManageOption $pornFbInfos)
-    {
-        $uri = '/' . Conf::SCAN_PORN_VERSION . '/feedback';
-        list($isValid, $message, $httpBody) = $pornFbInfos->checkPornFeedbackInfos();
-        if (!$isValid) {
-            return $this->_errorResponse("InvalidArgument", $message);
-        }
-        return $this->_send_request('POST', $uri, $httpBody);
-    }
+	/**
+	 * 鉴黄反馈feedback接口
+	 * @param ManageOption $pornFbInfos 反馈信息
+	 * @return array
+	 */
+	public function pornFeedback(ManageOption $pornFbInfos)
+	{
+		$uri = '/' . Conf::SCAN_PORN_VERSION . '/feedback';
+		list($isValid, $message, $httpBody) = $pornFbInfos->checkPornFeedbackInfos();
+		if (!$isValid) {
+			return $this->_errorResponse("InvalidArgument", $message);
+		}
+		return $this->_send_request('POST', $uri, $httpBody);
+	}
 
-    /**
-     * 多媒体(音视频)转码服务接口
-     * @param MediaResOption $encodeOption 转码参数选项
-     * @return array
-     */
-    public function mediaEncode(MediaResOption $encodeOption)
-    {
-        $uri = '/' . Conf::MEDIA_ENCODE_VERSION . '/mediaEncode';
-        list($isValid, $message, $httpBody) = $encodeOption->checkOptionParameters();
-        if (!$isValid) {
-            return $this->_errorResponse("InvalidArgument", $message);
-        }
-        return $this->_send_request('POST', $uri, $httpBody);
-    }
+	/**
+	 * 多媒体(音视频)转码服务接口
+	 * @param MediaResOption $encodeOption 转码参数选项
+	 * @return array
+	 */
+	public function mediaEncode(MediaResOption $encodeOption)
+	{
+		$uri = '/' . Conf::MEDIA_ENCODE_VERSION . '/mediaEncode';
+		list($isValid, $message, $httpBody) = $encodeOption->checkOptionParameters();
+		if (!$isValid) {
+			return $this->_errorResponse("InvalidArgument", $message);
+		}
+		return $this->_send_request('POST', $uri, $httpBody);
+	}
 
-    /**
-     * 多媒体转码任务查询接口
-     * @param string $taskId 转码任务ID
-     */
-    public function mediaEncodeQuery($taskId)
-    {
-        if (empty($taskId)) {
-            return $this->_errorResponse("InvalidArgument", "taskId is empty");
-        }
-        $uri = '/' . Conf::MEDIA_ENCODE_VERSION . '/mediaEncodeResult/' . $taskId;
-        return $this->_send_request('GET', $uri);
-    }
+	/**
+	 * 多媒体转码任务查询接口
+	 * @param string $taskId 转码任务ID
+	 */
+	public function mediaEncodeQuery($taskId)
+	{
+		if (empty($taskId)) {
+			return $this->_errorResponse("InvalidArgument", "taskId is empty");
+		}
+		$uri = '/' . Conf::MEDIA_ENCODE_VERSION . '/mediaEncodeResult/' . $taskId;
+		return $this->_send_request('GET', $uri);
+	}
 
-    /**
-     * 视频截图接口
-     * @param MediaResOption $snapshotOption 截图参数选项
-     * @return array
-     */
-    public function videoSnapshot(MediaResOption $snapshotOption)
-    {
-        $uri = '/' . Conf::MANAGE_API_VERSION . '/snapshot';
-        list($isValid, $message, $httpBody) = $snapshotOption->checkOptionParameters();
-        if (!$isValid) {
-            return $this->_errorResponse("InvalidArgument", $message);
-        }
-        return $this->_send_request('POST', $uri, $httpBody);
-    }
+	/**
+	 * 视频截图接口
+	 * @param MediaResOption $snapshotOption 截图参数选项
+	 * @return array
+	 */
+	public function videoSnapshot(MediaResOption $snapshotOption)
+	{
+		$uri = '/' . Conf::MANAGE_API_VERSION . '/snapshot';
+		list($isValid, $message, $httpBody) = $snapshotOption->checkOptionParameters();
+		if (!$isValid) {
+			return $this->_errorResponse("InvalidArgument", $message);
+		}
+		return $this->_send_request('POST', $uri, $httpBody);
+	}
 
-    /**
-     * 视频截图结果查询接口
-     * @param string $taskId 转码任务ID
-     */
-    public function vSnapshotQuery($taskId)
-    {
-        if (empty($taskId)) {
-            return $this->_errorResponse("InvalidArgument", "taskId is empty");
-        }
-        $uri = '/' . Conf::MANAGE_API_VERSION . '/snapshotResult/' . $taskId;
-        return $this->_send_request('GET', $uri);
-    }
+	/**
+	 * 视频截图结果查询接口
+	 * @param string $taskId 转码任务ID
+	 */
+	public function vSnapshotQuery($taskId)
+	{
+		if (empty($taskId)) {
+			return $this->_errorResponse("InvalidArgument", "taskId is empty");
+		}
+		$uri = '/' . Conf::MANAGE_API_VERSION . '/snapshotResult/' . $taskId;
+		return $this->_send_request('GET', $uri);
+	}
 
-    /**
-     *
-     * 广告图扫描接口(beta)
-     * @param ManageOption $resInfos 待扫描图片资源
-     * @return array
-     */
-    public function scanAdvertising(ManageOption $resInfos)
-    {
-        $uri = '/3.1/scanAdvertising';
-        list($isValid, $message, $bodyArray) = $resInfos->checkFilesAndUrls(); //检测并得到广告图图扫描所需参数
-        if (!$isValid) {
-            return $this->_errorResponse("InvalidArgument", $message);
-        }
-        $httpBody = $this->createHttpBody($bodyArray); //http body字符串信息
-        return $this->_send_request('POST', $uri, $httpBody);
-    }
+	/**
+	 *
+	 * 广告图扫描接口(beta)
+	 * @param ManageOption $resInfos 待扫描图片资源
+	 * @return array
+	 */
+	public function scanAdvertising(ManageOption $resInfos)
+	{
+		$uri = '/3.1/scanAdvertising';
+		list($isValid, $message, $bodyArray) = $resInfos->checkFilesAndUrls(); //检测并得到广告图图扫描所需参数
+		if (!$isValid) {
+			return $this->_errorResponse("InvalidArgument", $message);
+		}
+		$httpBody = $this->createHttpBody($bodyArray); //http body字符串信息
+		return $this->_send_request('POST', $uri, $httpBody);
+	}
 
-    /**
-     * 调用curl利用http上传数据
-     * @param string $method
-     * @param string $uri
-     * @param array $bodyArray
-     * @param array $headers
-     * @return array (isSuccess, ...)
-     */
-    protected function _send_request($method, $uri, $httpBody = null, $headers = null)
-    {
-        $success = false;
-        $result = null;
-        //构建Http请求头
-        $_headers = array('Expect:');
-        $date = $this->currentMilliSecond(); //得到当前的时间戳，毫秒
-        array_push($_headers, "Date: {$date}");
-        $authorization = $this->_getAuthorization($uri, $date, $httpBody);  //Http的Body需要加入管理鉴权
-        array_push($_headers, "Authorization: {$authorization}");
-        array_push($_headers, "User-Agent: {$this->_getUserAgent()}");
-        if (!is_null($headers) && is_array($headers)) {
-            foreach ($headers as $k => $v) {
-                array_push($_headers, "{$k}: {$v}");
-            }
-        }
-        $url = $this->_get_manage_url($uri); //根据管理接口uri拼接成URL
-        $ch = curl_init($url);
-        try {
-            //构建http请求体，并设置header部分属性
-            $length = 0;
-            if (!empty($httpBody)) {
-                $length = @strlen($httpBody);
-                curl_setopt($ch, CURLOPT_POSTFIELDS, $httpBody);
-                array_push($_headers, "Content-Type: application/x-www-form-urlencoded");
-            }
-            array_push($_headers, "Content-Length: {$length}");
-            curl_setopt($ch, CURLOPT_HEADER, 1);                            //设置头部
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $_headers);                //请求头
-            curl_setopt($ch, CURLOPT_TIMEOUT, Conf::HTTP_TIMEOUT);      //超时时长
-            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);               //连接超时时长
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); //成功，只返回结果，不自动输出任何内容。如果失败返回FALSE
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
-            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) {
-                $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);
-                $resBody = isset($resStr[1]) ? $resStr[1] : '';
-                $resArray = json_decode($resBody, true);                        //解析得到结果
-                $result = (empty($resArray)) ? array() : $resArray;
-            }
-        } catch (Exception $e) {
-            $success = false;
-            $result = $this->_errorResponse("HTTPRequestException#" . $e->getCode(), $e->getMessage());
-        }
-        curl_close($ch); //PHP5.3中不支持finally关键字。因此，为了兼容，这里取消finally
-        $result['isSuccess'] = $success;
-        return $result;
-    }
+	/**
+	 * 调用curl利用http上传数据
+	 * @param string $method
+	 * @param string $uri
+	 * @param array $bodyArray
+	 * @param array $headers
+	 * @return array (isSuccess, ...)
+	 */
+	protected function _send_request($method, $uri, $httpBody = null, $headers = null)
+	{
+		$success = false;
+		$result = null;
+		//构建Http请求头
+		$_headers = array('Expect:');
+		$date = $this->currentMilliSecond(); //得到当前的时间戳，毫秒
+		array_push($_headers, "Date: {$date}");
+		$authorization = $this->_getAuthorization($uri, $date, $httpBody);  //Http的Body需要加入管理鉴权
+		array_push($_headers, "Authorization: {$authorization}");
+		array_push($_headers, "User-Agent: {$this->_getUserAgent()}");
+		if (!is_null($headers) && is_array($headers)) {
+			foreach ($headers as $k => $v) {
+				array_push($_headers, "{$k}: {$v}");
+			}
+		}
+		$url = $this->_get_manage_url($uri); //根据管理接口uri拼接成URL
+		$ch = curl_init($url);
+		try {
+			//构建http请求体，并设置header部分属性
+			$length = 0;
+			if (!empty($httpBody)) {
+				$length = @strlen($httpBody);
+				curl_setopt($ch, CURLOPT_POSTFIELDS, $httpBody);
+				array_push($_headers, "Content-Type: application/x-www-form-urlencoded");
+			}
+			array_push($_headers, "Content-Length: {$length}");
+			curl_setopt($ch, CURLOPT_HEADER, 1);                            //设置头部
+			curl_setopt($ch, CURLOPT_HTTPHEADER, $_headers);                //请求头
+			curl_setopt($ch, CURLOPT_TIMEOUT, Conf::HTTP_TIMEOUT);      //超时时长
+			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);               //连接超时时长
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); //成功，只返回结果，不自动输出任何内容。如果失败返回FALSE
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
+			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) {
+				$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);
+				$resBody = isset($resStr[1]) ? $resStr[1] : '';
+				$resArray = json_decode($resBody, true);                        //解析得到结果
+				$result = (empty($resArray)) ? array() : $resArray;
+			}
+		} catch (Exception $e) {
+			$success = false;
+			$result = $this->_errorResponse("HTTPRequestException#" . $e->getCode(), $e->getMessage());
+		}
+		curl_close($ch); //PHP5.3中不支持finally关键字。因此，为了兼容，这里取消finally
+		$result['isSuccess'] = $success;
+		return $result;
+	}
 
-    /**
-     * 根据$bodyArray构建http请求体。多个字段之间用&号分割
-     */
-    protected function createHttpBody($bodyArray)
-    {
-        $bodyStr = '';
-        foreach ($bodyArray as $key => $value) {
-            $bodyStr .= (empty($bodyStr) ? null : '&'); //添加分隔符
-            $bodyStr .= "{$key}=" . urlencode($value);
-        }
-        return $bodyStr;
-    }
+	/**
+	 * 根据$bodyArray构建http请求体。多个字段之间用&号分割
+	 */
+	protected function createHttpBody($bodyArray)
+	{
+		$bodyStr = '';
+		foreach ($bodyArray as $key => $value) {
+			$bodyStr .= (empty($bodyStr) ? null : '&'); //添加分隔符
+			$bodyStr .= "{$key}=" . urlencode($value);
+		}
+		return $bodyStr;
+	}
 
-    /**
-     * 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;
+		}
+	}
 
-    /**
-     * 根据管理接口uri拼接成完整的URL
-     */
-    protected function _get_manage_url($uri)
-    {
-        return Conf::MANAGE_HOST_MEDIA . $uri;
-    }
-    protected function _getNamespaceKey()
-    {
-        if ($this->type == "TOP") {
-            return "namespace";
-        } else {
-            return "bucketName";
-        }
-    }
+	/**
+	 * 根据管理接口uri拼接成完整的URL
+	 */
+	protected function _get_manage_url($uri)
+	{
+		return Conf::MANAGE_HOST_MEDIA . $uri;
+	}
+	protected function _getNamespaceKey()
+	{
+		if ($this->type == "TOP") {
+			return "namespace";
+		} else {
+			return "bucketName";
+		}
+	}
 
-    /**
-     * 获取管理鉴权信息
-     */
-    protected function _getAuthorization($uri, $date, $httpBody)
-    {
-        $stringBeforeSign = "{$uri}\n{$httpBody}\n{$date}"; //1.生成待加签的原始字符串
-        $signStr = hash_hmac('sha1', $stringBeforeSign, $this->sk); //2.使用SK对字符串计算HMAC-SHA1签名
-        $preenCode = $this->ak . ":" . $signStr; //3.将签名与AK进行拼接
-        $encodedStr = EncodeUtils::encodeWithURLSafeBase64($preenCode); //4.对拼接后的结果进行URL安全的Base64编码
-        $manageToken = "ACL_" . $this->type . " " . $encodedStr; //5.最后为编码结果加上得到管理凭证
-        return $manageToken;
-    }
+	/**
+	 * 获取管理鉴权信息
+	 */
+	protected function _getAuthorization($uri, $date, $httpBody)
+	{
+		$stringBeforeSign = "{$uri}\n{$httpBody}\n{$date}"; //1.生成待加签的原始字符串
+		$signStr = hash_hmac('sha1', $stringBeforeSign, $this->sk); //2.使用SK对字符串计算HMAC-SHA1签名
+		$preenCode = $this->ak . ":" . $signStr; //3.将签名与AK进行拼接
+		$encodedStr = EncodeUtils::encodeWithURLSafeBase64($preenCode); //4.对拼接后的结果进行URL安全的Base64编码
+		$manageToken = "ACL_" . $this->type . " " . $encodedStr; //5.最后为编码结果加上得到管理凭证
+		return $manageToken;
+	}
 
-    /**
-     * 得到当前时间的毫秒数
-     */
-    protected function currentMilliSecond()
-    {
-        list($microSec, $stampSec) = explode(' ', microtime());
-        $tempMilli =  sprintf('%03s', intval($microSec * 1000));
-        $currentMilli = $stampSec . $tempMilli;
-        return $currentMilli;
-    }
+	/**
+	 * 得到当前时间的毫秒数
+	 */
+	protected function currentMilliSecond()
+	{
+		list($microSec, $stampSec) = explode(' ', microtime());
+		$tempMilli =  sprintf('%03s', intval($microSec * 1000));
+		$currentMilli = $stampSec . $tempMilli;
+		return $currentMilli;
+	}
 
-    /**
-     * 反馈错误信息
-     */
-    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
+		);
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -335,7 +335,7 @@ 
         $_headers = array('Expect:');
         $date = $this->currentMilliSecond(); //得到当前的时间戳，毫秒
         array_push($_headers, "Date: {$date}");
-        $authorization = $this->_getAuthorization($uri, $date, $httpBody);  //Http的Body需要加入管理鉴权
+        $authorization = $this->_getAuthorization($uri, $date, $httpBody); //Http的Body需要加入管理鉴权
         array_push($_headers, "Authorization: {$authorization}");
         array_push($_headers, "User-Agent: {$this->_getUserAgent()}");
         if (!is_null($headers) && is_array($headers)) {
@@ -354,13 +354,13 @@ 
                 array_push($_headers, "Content-Type: application/x-www-form-urlencoded");
             }
             array_push($_headers, "Content-Length: {$length}");
-            curl_setopt($ch, CURLOPT_HEADER, 1);                            //设置头部
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $_headers);                //请求头
-            curl_setopt($ch, CURLOPT_TIMEOUT, Conf::HTTP_TIMEOUT);      //超时时长
-            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);               //连接超时时长
+            curl_setopt($ch, CURLOPT_HEADER, 1); //设置头部
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $_headers); //请求头
+            curl_setopt($ch, CURLOPT_TIMEOUT, Conf::HTTP_TIMEOUT); //超时时长
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10); //连接超时时长
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); //成功，只返回结果，不自动输出任何内容。如果失败返回FALSE
             curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
-            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);
@@ -375,10 +375,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);
                 $resBody = isset($resStr[1]) ? $resStr[1] : '';
-                $resArray = json_decode($resBody, true);                        //解析得到结果
+                $resArray = json_decode($resBody, true); //解析得到结果
                 $result = (empty($resArray)) ? array() : $resArray;
             }
         } catch (Exception $e) {
@@ -450,7 +450,7 @@ 
     protected function currentMilliSecond()
     {
         list($microSec, $stampSec) = explode(' ', microtime());
-        $tempMilli =  sprintf('%03s', intval($microSec * 1000));
+        $tempMilli = sprintf('%03s', intval($microSec * 1000));
         $currentMilli = $stampSec . $tempMilli;
         return $currentMilli;
     }

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 urlencode_ch($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 urlencode_ch($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;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -5,9 +5,9 @@ 
 class ResourceInfo
 {
     /* 以下属性是资源ID所需的属性*/
-    protected $namespace;                              //空间名，必须
-    protected $dir;                                    //路径
-    protected $name;                                   //文件名信息
+    protected $namespace; //空间名，必须
+    protected $dir; //路径
+    protected $name; //文件名信息
     /* 以下属性是资源ID所需的属性*/
     /**
      * ResourceOption的构造函数
@@ -62,7 +62,7 @@ 
     /**对URL中文进行编码*/
     protected function urlencode_ch($str)
     {
-        return preg_replace_callback('/[^\0-\127]+/', function ($match) {
+        return preg_replace_callback('/[^\0-\127]+/', function($match) {
             return urlencode($match[0]);
         }, $str);
     }

sdk/Utils/MimeTypes.php

Indentation +133 added lines, -133 removed lines

@@ -3,138 +3,138 @@
 
 class MimeTypes
 {
-    public static $mime_types = array(
-        '3gp' => 'video/3gpp', 'ai' => 'application/postscript',
-        'aif' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff',
-        'aiff' => 'audio/x-aiff', 'asc' => 'text/plain',
-        'atom' => 'application/atom+xml', 'au' => 'audio/basic',
-        'avi' => 'video/x-msvideo', 'bcpio' => 'application/x-bcpio',
-        'bin' => 'application/octet-stream', 'bmp' => 'image/bmp',
-        'cdf' => 'application/x-netcdf', 'cgm' => 'image/cgm',
-        'class' => 'application/octet-stream',
-        'cpio' => 'application/x-cpio',
-        'cpt' => 'application/mac-compactpro',
-        'csh' => 'application/x-csh', 'css' => 'text/css',
-        'dcr' => 'application/x-director', 'dif' => 'video/x-dv',
-        'dir' => 'application/x-director', 'djv' => 'image/vnd.djvu',
-        'djvu' => 'image/vnd.djvu',
-        'dll' => 'application/octet-stream',
-        'dmg' => 'application/octet-stream',
-        'dms' => 'application/octet-stream',
-        'doc' => 'application/msword', 'dtd' => 'application/xml-dtd',
-        'dv' => 'video/x-dv', 'dvi' => 'application/x-dvi',
-        'dxr' => 'application/x-director',
-        'eps' => 'application/postscript', 'etx' => 'text/x-setext',
-        'exe' => 'application/octet-stream',
-        'ez' => 'application/andrew-inset', 'flv' => 'video/x-flv',
-        'gif' => 'image/gif', 'gram' => 'application/srgs',
-        'grxml' => 'application/srgs+xml',
-        'gtar' => 'application/x-gtar', 'gz' => 'application/x-gzip',
-        'hdf' => 'application/x-hdf',
-        'hqx' => 'application/mac-binhex40', 'htm' => 'text/html',
-        'html' => 'text/html', 'ice' => 'x-conference/x-cooltalk',
-        'ico' => 'image/x-icon', 'ics' => 'text/calendar',
-        'ief' => 'image/ief', 'ifb' => 'text/calendar',
-        'iges' => 'model/iges', 'igs' => 'model/iges',
-        'jnlp' => 'application/x-java-jnlp-file', 'jp2' => 'image/jp2',
-        'jpe' => 'image/jpeg', 'jpeg' => 'image/jpeg',
-        'jpg' => 'image/jpeg', 'js' => 'application/x-javascript',
-        'kar' => 'audio/midi', 'latex' => 'application/x-latex',
-        'lha' => 'application/octet-stream',
-        'lzh' => 'application/octet-stream',
-        'm3u' => 'audio/x-mpegurl', 'm4a' => 'audio/mp4a-latm',
-        'm4p' => 'audio/mp4a-latm', 'm4u' => 'video/vnd.mpegurl',
-        'm4v' => 'video/x-m4v', 'mac' => 'image/x-macpaint',
-        'man' => 'application/x-troff-man',
-        'mathml' => 'application/mathml+xml',
-        'me' => 'application/x-troff-me', 'mesh' => 'model/mesh',
-        'mid' => 'audio/midi', 'midi' => 'audio/midi',
-        'mif' => 'application/vnd.mif', 'mov' => 'video/quicktime',
-        'movie' => 'video/x-sgi-movie', 'mp2' => 'audio/mpeg',
-        'mp3' => 'audio/mpeg', 'mp4' => 'video/mp4',
-        'mpe' => 'video/mpeg', 'mpeg' => 'video/mpeg',
-        'mpg' => 'video/mpeg', 'mpga' => 'audio/mpeg',
-        'ms' => 'application/x-troff-ms', 'msh' => 'model/mesh',
-        'mxu' => 'video/vnd.mpegurl', 'nc' => 'application/x-netcdf',
-        'oda' => 'application/oda', 'ogg' => 'application/ogg',
-        'ogv' => 'video/ogv', 'pbm' => 'image/x-portable-bitmap',
-        'pct' => 'image/pict', 'pdb' => 'chemical/x-pdb',
-        'pdf' => 'application/pdf',
-        'pgm' => 'image/x-portable-graymap',
-        'pgn' => 'application/x-chess-pgn', 'pic' => 'image/pict',
-        'pict' => 'image/pict', 'png' => 'image/png',
-        'pnm' => 'image/x-portable-anymap',
-        'pnt' => 'image/x-macpaint', 'pntg' => 'image/x-macpaint',
-        'ppm' => 'image/x-portable-pixmap',
-        'ppt' => 'application/vnd.ms-powerpoint',
-        'ps' => 'application/postscript', 'qt' => 'video/quicktime',
-        'qti' => 'image/x-quicktime', 'qtif' => 'image/x-quicktime',
-        'ra' => 'audio/x-pn-realaudio',
-        'ram' => 'audio/x-pn-realaudio', 'ras' => 'image/x-cmu-raster',
-        'rdf' => 'application/rdf+xml', 'rgb' => 'image/x-rgb',
-        'rm' => 'application/vnd.rn-realmedia',
-        'roff' => 'application/x-troff', 'rtf' => 'text/rtf',
-        'rtx' => 'text/richtext', 'sgm' => 'text/sgml',
-        'sgml' => 'text/sgml', 'sh' => 'application/x-sh',
-        'shar' => 'application/x-shar', 'silo' => 'model/mesh',
-        'sit' => 'application/x-stuffit',
-        'skd' => 'application/x-koan', 'skm' => 'application/x-koan',
-        'skp' => 'application/x-koan', 'skt' => 'application/x-koan',
-        'smi' => 'application/smil', 'smil' => 'application/smil',
-        'snd' => 'audio/basic', 'so' => 'application/octet-stream',
-        'spl' => 'application/x-futuresplash',
-        'src' => 'application/x-wais-source',
-        'sv4cpio' => 'application/x-sv4cpio',
-        'sv4crc' => 'application/x-sv4crc', 'svg' => 'image/svg+xml',
-        'swf' => 'application/x-shockwave-flash',
-        't' => 'application/x-troff', 'tar' => 'application/x-tar',
-        'tcl' => 'application/x-tcl', 'tex' => 'application/x-tex',
-        'texi' => 'application/x-texinfo',
-        'texinfo' => 'application/x-texinfo', 'tif' => 'image/tiff',
-        'tiff' => 'image/tiff', 'tr' => 'application/x-troff',
-        'tsv' => 'text/tab-separated-values', 'txt' => 'text/plain',
-        'ustar' => 'application/x-ustar',
-        'vcd' => 'application/x-cdlink', 'vrml' => 'model/vrml',
-        'vxml' => 'application/voicexml+xml', 'wav' => 'audio/x-wav',
-        'wbmp' => 'image/vnd.wap.wbmp',
-        'wbxml' => 'application/vnd.wap.wbxml', 'webm' => 'video/webm',
-        'wml' => 'text/vnd.wap.wml',
-        'wmlc' => 'application/vnd.wap.wmlc',
-        'wmls' => 'text/vnd.wap.wmlscript',
-        'wmlsc' => 'application/vnd.wap.wmlscriptc',
-        'wmv' => 'video/x-ms-wmv', 'wrl' => 'model/vrml',
-        'xbm' => 'image/x-xbitmap', 'xht' => 'application/xhtml+xml',
-        'xhtml' => 'application/xhtml+xml',
-        'xls' => 'application/vnd.ms-excel',
-        'xml' => 'application/xml', 'xpm' => 'image/x-xpixmap',
-        'xsl' => 'application/xml', 'xslt' => 'application/xslt+xml',
-        'xul' => 'application/vnd.mozilla.xul+xml',
-        'xwd' => 'image/x-xwindowdump', 'xyz' => 'chemical/x-xyz',
-        'zip' => 'application/zip',
-        "apk" => "application/vnd.android.package-archive",
-        "bin" => "application/octet-stream",
-        "cab" => "application/vnd.ms-cab-compressed",
-        "gb" => "application/chinese-gb",
-        "gba" => "application/octet-stream",
-        "gbc" => "application/octet-stream",
-        "jad" => "text/vnd.sun.j2me.app-descriptor",
-        "jar" => "application/java-archive",
-        "nes" => "application/octet-stream",
-        "rar" => "application/x-rar-compressed",
-        "sis" => "application/vnd.symbian.install",
-        "sisx" => "x-epoc/x-sisx-app",
-        "smc" => "application/octet-stream",
-        "smd" => "application/octet-stream",
-        "swf" => "application/x-shockwave-flash",
-        "zip" => "application/x-zip-compressed",
-        "wap" => "text/vnd.wap.wml wml", "mrp" => "application/mrp",
-        "wma" => "audio/x-ms-wma",
-        "lrc" => "application/lrc"
-    );
+	public static $mime_types = array(
+		'3gp' => 'video/3gpp', 'ai' => 'application/postscript',
+		'aif' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff',
+		'aiff' => 'audio/x-aiff', 'asc' => 'text/plain',
+		'atom' => 'application/atom+xml', 'au' => 'audio/basic',
+		'avi' => 'video/x-msvideo', 'bcpio' => 'application/x-bcpio',
+		'bin' => 'application/octet-stream', 'bmp' => 'image/bmp',
+		'cdf' => 'application/x-netcdf', 'cgm' => 'image/cgm',
+		'class' => 'application/octet-stream',
+		'cpio' => 'application/x-cpio',
+		'cpt' => 'application/mac-compactpro',
+		'csh' => 'application/x-csh', 'css' => 'text/css',
+		'dcr' => 'application/x-director', 'dif' => 'video/x-dv',
+		'dir' => 'application/x-director', 'djv' => 'image/vnd.djvu',
+		'djvu' => 'image/vnd.djvu',
+		'dll' => 'application/octet-stream',
+		'dmg' => 'application/octet-stream',
+		'dms' => 'application/octet-stream',
+		'doc' => 'application/msword', 'dtd' => 'application/xml-dtd',
+		'dv' => 'video/x-dv', 'dvi' => 'application/x-dvi',
+		'dxr' => 'application/x-director',
+		'eps' => 'application/postscript', 'etx' => 'text/x-setext',
+		'exe' => 'application/octet-stream',
+		'ez' => 'application/andrew-inset', 'flv' => 'video/x-flv',
+		'gif' => 'image/gif', 'gram' => 'application/srgs',
+		'grxml' => 'application/srgs+xml',
+		'gtar' => 'application/x-gtar', 'gz' => 'application/x-gzip',
+		'hdf' => 'application/x-hdf',
+		'hqx' => 'application/mac-binhex40', 'htm' => 'text/html',
+		'html' => 'text/html', 'ice' => 'x-conference/x-cooltalk',
+		'ico' => 'image/x-icon', 'ics' => 'text/calendar',
+		'ief' => 'image/ief', 'ifb' => 'text/calendar',
+		'iges' => 'model/iges', 'igs' => 'model/iges',
+		'jnlp' => 'application/x-java-jnlp-file', 'jp2' => 'image/jp2',
+		'jpe' => 'image/jpeg', 'jpeg' => 'image/jpeg',
+		'jpg' => 'image/jpeg', 'js' => 'application/x-javascript',
+		'kar' => 'audio/midi', 'latex' => 'application/x-latex',
+		'lha' => 'application/octet-stream',
+		'lzh' => 'application/octet-stream',
+		'm3u' => 'audio/x-mpegurl', 'm4a' => 'audio/mp4a-latm',
+		'm4p' => 'audio/mp4a-latm', 'm4u' => 'video/vnd.mpegurl',
+		'm4v' => 'video/x-m4v', 'mac' => 'image/x-macpaint',
+		'man' => 'application/x-troff-man',
+		'mathml' => 'application/mathml+xml',
+		'me' => 'application/x-troff-me', 'mesh' => 'model/mesh',
+		'mid' => 'audio/midi', 'midi' => 'audio/midi',
+		'mif' => 'application/vnd.mif', 'mov' => 'video/quicktime',
+		'movie' => 'video/x-sgi-movie', 'mp2' => 'audio/mpeg',
+		'mp3' => 'audio/mpeg', 'mp4' => 'video/mp4',
+		'mpe' => 'video/mpeg', 'mpeg' => 'video/mpeg',
+		'mpg' => 'video/mpeg', 'mpga' => 'audio/mpeg',
+		'ms' => 'application/x-troff-ms', 'msh' => 'model/mesh',
+		'mxu' => 'video/vnd.mpegurl', 'nc' => 'application/x-netcdf',
+		'oda' => 'application/oda', 'ogg' => 'application/ogg',
+		'ogv' => 'video/ogv', 'pbm' => 'image/x-portable-bitmap',
+		'pct' => 'image/pict', 'pdb' => 'chemical/x-pdb',
+		'pdf' => 'application/pdf',
+		'pgm' => 'image/x-portable-graymap',
+		'pgn' => 'application/x-chess-pgn', 'pic' => 'image/pict',
+		'pict' => 'image/pict', 'png' => 'image/png',
+		'pnm' => 'image/x-portable-anymap',
+		'pnt' => 'image/x-macpaint', 'pntg' => 'image/x-macpaint',
+		'ppm' => 'image/x-portable-pixmap',
+		'ppt' => 'application/vnd.ms-powerpoint',
+		'ps' => 'application/postscript', 'qt' => 'video/quicktime',
+		'qti' => 'image/x-quicktime', 'qtif' => 'image/x-quicktime',
+		'ra' => 'audio/x-pn-realaudio',
+		'ram' => 'audio/x-pn-realaudio', 'ras' => 'image/x-cmu-raster',
+		'rdf' => 'application/rdf+xml', 'rgb' => 'image/x-rgb',
+		'rm' => 'application/vnd.rn-realmedia',
+		'roff' => 'application/x-troff', 'rtf' => 'text/rtf',
+		'rtx' => 'text/richtext', 'sgm' => 'text/sgml',
+		'sgml' => 'text/sgml', 'sh' => 'application/x-sh',
+		'shar' => 'application/x-shar', 'silo' => 'model/mesh',
+		'sit' => 'application/x-stuffit',
+		'skd' => 'application/x-koan', 'skm' => 'application/x-koan',
+		'skp' => 'application/x-koan', 'skt' => 'application/x-koan',
+		'smi' => 'application/smil', 'smil' => 'application/smil',
+		'snd' => 'audio/basic', 'so' => 'application/octet-stream',
+		'spl' => 'application/x-futuresplash',
+		'src' => 'application/x-wais-source',
+		'sv4cpio' => 'application/x-sv4cpio',
+		'sv4crc' => 'application/x-sv4crc', 'svg' => 'image/svg+xml',
+		'swf' => 'application/x-shockwave-flash',
+		't' => 'application/x-troff', 'tar' => 'application/x-tar',
+		'tcl' => 'application/x-tcl', 'tex' => 'application/x-tex',
+		'texi' => 'application/x-texinfo',
+		'texinfo' => 'application/x-texinfo', 'tif' => 'image/tiff',
+		'tiff' => 'image/tiff', 'tr' => 'application/x-troff',
+		'tsv' => 'text/tab-separated-values', 'txt' => 'text/plain',
+		'ustar' => 'application/x-ustar',
+		'vcd' => 'application/x-cdlink', 'vrml' => 'model/vrml',
+		'vxml' => 'application/voicexml+xml', 'wav' => 'audio/x-wav',
+		'wbmp' => 'image/vnd.wap.wbmp',
+		'wbxml' => 'application/vnd.wap.wbxml', 'webm' => 'video/webm',
+		'wml' => 'text/vnd.wap.wml',
+		'wmlc' => 'application/vnd.wap.wmlc',
+		'wmls' => 'text/vnd.wap.wmlscript',
+		'wmlsc' => 'application/vnd.wap.wmlscriptc',
+		'wmv' => 'video/x-ms-wmv', 'wrl' => 'model/vrml',
+		'xbm' => 'image/x-xbitmap', 'xht' => 'application/xhtml+xml',
+		'xhtml' => 'application/xhtml+xml',
+		'xls' => 'application/vnd.ms-excel',
+		'xml' => 'application/xml', 'xpm' => 'image/x-xpixmap',
+		'xsl' => 'application/xml', 'xslt' => 'application/xslt+xml',
+		'xul' => 'application/vnd.mozilla.xul+xml',
+		'xwd' => 'image/x-xwindowdump', 'xyz' => 'chemical/x-xyz',
+		'zip' => 'application/zip',
+		"apk" => "application/vnd.android.package-archive",
+		"bin" => "application/octet-stream",
+		"cab" => "application/vnd.ms-cab-compressed",
+		"gb" => "application/chinese-gb",
+		"gba" => "application/octet-stream",
+		"gbc" => "application/octet-stream",
+		"jad" => "text/vnd.sun.j2me.app-descriptor",
+		"jar" => "application/java-archive",
+		"nes" => "application/octet-stream",
+		"rar" => "application/x-rar-compressed",
+		"sis" => "application/vnd.symbian.install",
+		"sisx" => "x-epoc/x-sisx-app",
+		"smc" => "application/octet-stream",
+		"smd" => "application/octet-stream",
+		"swf" => "application/x-shockwave-flash",
+		"zip" => "application/x-zip-compressed",
+		"wap" => "text/vnd.wap.wml wml", "mrp" => "application/mrp",
+		"wma" => "audio/x-ms-wma",
+		"lrc" => "application/lrc"
+	);
 
-    public static function get_mimetype($ext)
-    {
-        $ext = strtolower($ext);
-        return (isset(self::$mime_types[$ext]) ? self::$mime_types[$ext] : 'application/octet-stream');
-    }
+	public static function get_mimetype($ext)
+	{
+		$ext = strtolower($ext);
+		return (isset(self::$mime_types[$ext]) ? self::$mime_types[$ext] : 'application/octet-stream');
+	}
 }

sdk/Utils/EncodeUtils.php

Indentation +18 added lines, -18 removed lines

@@ -4,27 +4,27 @@
 class EncodeUtils
 {
 
-    /*
+	/*
      * URL安全的Base64编码适用于以URL方式传递Base64编码结果的场景。
      * 该编码方式的基本过程是先将内容以Base64格式编码为字符串，
      * 然后检查该结果字符串，将字符串中的加号+换成中划线-，并且将斜杠/换成下划线_，同时尾部去除等号padding。
      */
-    public static function encodeWithURLSafeBase64($arg)
-    {
-        if ($arg === null || empty($arg)) {
-            return null;
-        }
-        $result = base64_encode($arg);
-        $result = str_replace(array('+', '/', '='), array('-', '_', ''), $result);
-        return $result;
-    }
+	public static function encodeWithURLSafeBase64($arg)
+	{
+		if ($arg === null || empty($arg)) {
+			return null;
+		}
+		$result = base64_encode($arg);
+		$result = str_replace(array('+', '/', '='), array('-', '_', ''), $result);
+		return $result;
+	}
 
-    public static function new_encodeWithURLSafeBase64($arg)
-    {
-        if ($arg === null || empty($arg)) {
-            return null;
-        }
-        $result = preg_replace(array("/\r/", "/\n/"), "", rtrim(base64_encode($arg), '='));
-        return $result;
-    }
+	public static function new_encodeWithURLSafeBase64($arg)
+	{
+		if ($arg === null || empty($arg)) {
+			return null;
+		}
+		$result = preg_replace(array("/\r/", "/\n/"), "", rtrim(base64_encode($arg), '='));
+		return $result;
+	}
 }