xiaohuilam / laravel-flysystem-wantu

sdk/AlibabaImage.php

Indentation +234 added lines, -234 removed lines

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

Spacing +1 added lines, -1 removed lines

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

sdk/Core/UploadClient.php

Indentation +538 added lines, -538 removed lines

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

Spacing +51 added lines, -51 removed lines

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

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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('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->sendRequest('POST', $uri, $httpBody);
+	}
 
-    /**
-     * 调用curl利用http上传数据
-     * @param string $method
-     * @param string $uri
-     * @param array $bodyArray
-     * @param array $headers
-     * @return array (isSuccess, ...)
-     */
-    protected function sendRequest($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->getManageUrl($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 sendRequest($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->getManageUrl($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 getManageUrl($uri)
-    {
-        return Conf::MANAGE_HOST_MEDIA . $uri;
-    }
-    protected function getNamespaceKey()
-    {
-        if ($this->type == "TOP") {
-            return "namespace";
-        } else {
-            return "bucketName";
-        }
-    }
+	/**
+	 * 根据管理接口uri拼接成完整的URL
+	 */
+	protected function getManageUrl($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 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;
+	}
 }

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 urlencodeCh($str)
     {
-        return preg_replace_callback('/[^\0-\127]+/', function ($match) {
+        return preg_replace_callback('/[^\0-\127]+/', function($match) {
             return urlencode($match[0]);
         }, $str);
     }

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

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 getMimetype($ext)
-    {
-        $ext = strtolower($ext);
-        return (isset(self::$mime_types[$ext]) ? self::$mime_types[$ext] : 'application/octet-stream');
-    }
+	public static function getMimetype($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 newEncodeWithUrlSafeBase64($arg)
-    {
-        if ($arg === null || empty($arg)) {
-            return null;
-        }
-        $result = preg_replace(array("/\r/", "/\n/"), "", rtrim(base64_encode($arg), '='));
-        return $result;
-    }
+	public static function newEncodeWithUrlSafeBase64($arg)
+	{
+		if ($arg === null || empty($arg)) {
+			return null;
+		}
+		$result = preg_replace(array("/\r/", "/\n/"), "", rtrim(base64_encode($arg), '='));
+		return $result;
+	}
 }

sdk/Utils/MediaEncodeOption.php

Indentation +83 added lines, -83 removed lines

@@ -5,88 +5,88 @@
 /**多媒体转码的参数*/
 class MediaEncodeOption extends MediaResOption
 {
-    /* 以下属性是"视频转码"方法必须的属性 */
-    private $encodeTemplate;          //模板名称。可以设置系统或者用户自定义模板。用户模板名称可以登录后台查看和设置，系统模板见附录系统模板列表
-    public $usePreset = 0;            //是否使用系统模板。默认0。如果为1，则encodeTemplate必须设置系统模板名称
-    public $force = 0;                //是否强制覆盖。默认0，如果为1，当output文件已经存在的时候会强制覆盖，否则不执行转码并结束任务
-    /* 以下属性是"视频转码"方法可选的属性 */
-    private $watermark;               //水印资源
-    private $watermarkTemplate;       //用户自定义水印模板
-    private $notifyUrl;               //通知url，任务结束之后会调用这个url
-    private $seek;                    //截取音视频的开始位置
-    private $duration;                //截取音视频的长度
+	/* 以下属性是"视频转码"方法必须的属性 */
+	private $encodeTemplate;          //模板名称。可以设置系统或者用户自定义模板。用户模板名称可以登录后台查看和设置，系统模板见附录系统模板列表
+	public $usePreset = 0;            //是否使用系统模板。默认0。如果为1，则encodeTemplate必须设置系统模板名称
+	public $force = 0;                //是否强制覆盖。默认0，如果为1，当output文件已经存在的时候会强制覆盖，否则不执行转码并结束任务
+	/* 以下属性是"视频转码"方法可选的属性 */
+	private $watermark;               //水印资源
+	private $watermarkTemplate;       //用户自定义水印模板
+	private $notifyUrl;               //通知url，任务结束之后会调用这个url
+	private $seek;                    //截取音视频的开始位置
+	private $duration;                //截取音视频的长度
 
-    /**设置转码模板。必须。模板在顽兔控制台"多媒体处理"中配置*/
-    public function setEncodeTemplate($encodeTemplate)
-    {
-        $this->encodeTemplate = $encodeTemplate;
-    }
-    /**检测多媒体转码选项是否合法。如果合法，则返回http请求体<p> 返回格式{$isValid, $message, $httpBody}*/
-    public function checkOptionParameters()
-    {
-        list($valid, $msg) = parent::checkOptionParameters(); //检测输入输出资源是否合法
-        if (!$valid) {
-            return array($valid, $msg, null);
-        }
-        if (empty($this->encodeTemplate)) {
-            return array(false, "encodeTemplate is empty.", null); // 判断是否设置输入输出文件，或者转码模板
-        }
-        if (($this->usePreset != 0 && $this->usePreset != 1) || ($this->force != 0 && $this->force != 1)) {
-            return array(false, "parameters 'usePreset' or 'force' is invalid.", null); // 判断usePreset和force参数是否为0或1
-        }
-        return $this->getOptionsHttpBody(); //返回http请求体
-    }
-    /**构建多媒体转码所需的http请求体*/
-    public function getOptionsHttpBody()
-    {
-        //必须的参数
-        $httpBody = 'input=' . $this->getInputResId();
-        $httpBody .= '&output=' . $this->getOutputResId();
-        $httpBody .= '&encodeTemplate=' . urlencode($this->encodeTemplate);
-        $httpBody .= '&usePreset=' . $this->usePreset;
-        $httpBody .= '&force=' . $this->force;
-        // 可选的参数
-        if (isset($this->watermark)) {
-            $httpBody .= '&watermark=' . $this->watermark->buildResourceId();
-        }
-        if (isset($this->watermarkTemplate)) {
-            $httpBody .= '&watermarkTemplate=' . urlencode($this->watermarkTemplate);
-        }
-        if (isset($this->notifyUrl)) {
-            $httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
-        }
-        if (isset($this->seek)) {
-            $httpBody .= '&seek=' .  $this->seek;
-        }
-        if (isset($this->duration)) {
-            $httpBody .= '&duration=' . $this->duration;
-        }
-        return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体
-    }
-    /*######################以下是可选的参数set方法#######################*/
-    /**设置水印。可选*/
-    public function setWatermark($namespace = null, $dir = null, $name = null)
-    {
-        $this->watermark = new ResourceInfo($namespace, $dir, $name);
-    }
-    /**设置用户自定义水印模板。可选*/
-    public function setWatermarkTemplate($watermarkTemplate)
-    {
-        $this->watermarkTemplate = $watermarkTemplate;
-    }
-    /**设置转码完成后的通知url。可选*/
-    public function setNotifyUrl($notifyUrl)
-    {
-        $this->notifyUrl = $notifyUrl;
-    }
-    /**设置转码起始位置。可选*/
-    public function setSeek($seek)
-    {
-        $this->seek = $seek;
-    }
-    /**设置转码长度。可选*/
-    public function setDuration($duration)
-    {
-        $this->duration = $duration;
-    }
+	/**设置转码模板。必须。模板在顽兔控制台"多媒体处理"中配置*/
+	public function setEncodeTemplate($encodeTemplate)
+	{
+		$this->encodeTemplate = $encodeTemplate;
+	}
+	/**检测多媒体转码选项是否合法。如果合法，则返回http请求体<p> 返回格式{$isValid, $message, $httpBody}*/
+	public function checkOptionParameters()
+	{
+		list($valid, $msg) = parent::checkOptionParameters(); //检测输入输出资源是否合法
+		if (!$valid) {
+			return array($valid, $msg, null);
+		}
+		if (empty($this->encodeTemplate)) {
+			return array(false, "encodeTemplate is empty.", null); // 判断是否设置输入输出文件，或者转码模板
+		}
+		if (($this->usePreset != 0 && $this->usePreset != 1) || ($this->force != 0 && $this->force != 1)) {
+			return array(false, "parameters 'usePreset' or 'force' is invalid.", null); // 判断usePreset和force参数是否为0或1
+		}
+		return $this->getOptionsHttpBody(); //返回http请求体
+	}
+	/**构建多媒体转码所需的http请求体*/
+	public function getOptionsHttpBody()
+	{
+		//必须的参数
+		$httpBody = 'input=' . $this->getInputResId();
+		$httpBody .= '&output=' . $this->getOutputResId();
+		$httpBody .= '&encodeTemplate=' . urlencode($this->encodeTemplate);
+		$httpBody .= '&usePreset=' . $this->usePreset;
+		$httpBody .= '&force=' . $this->force;
+		// 可选的参数
+		if (isset($this->watermark)) {
+			$httpBody .= '&watermark=' . $this->watermark->buildResourceId();
+		}
+		if (isset($this->watermarkTemplate)) {
+			$httpBody .= '&watermarkTemplate=' . urlencode($this->watermarkTemplate);
+		}
+		if (isset($this->notifyUrl)) {
+			$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
+		}
+		if (isset($this->seek)) {
+			$httpBody .= '&seek=' .  $this->seek;
+		}
+		if (isset($this->duration)) {
+			$httpBody .= '&duration=' . $this->duration;
+		}
+		return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体
+	}
+	/*######################以下是可选的参数set方法#######################*/
+	/**设置水印。可选*/
+	public function setWatermark($namespace = null, $dir = null, $name = null)
+	{
+		$this->watermark = new ResourceInfo($namespace, $dir, $name);
+	}
+	/**设置用户自定义水印模板。可选*/
+	public function setWatermarkTemplate($watermarkTemplate)
+	{
+		$this->watermarkTemplate = $watermarkTemplate;
+	}
+	/**设置转码完成后的通知url。可选*/
+	public function setNotifyUrl($notifyUrl)
+	{
+		$this->notifyUrl = $notifyUrl;
+	}
+	/**设置转码起始位置。可选*/
+	public function setSeek($seek)
+	{
+		$this->seek = $seek;
+	}
+	/**设置转码长度。可选*/
+	public function setDuration($duration)
+	{
+		$this->duration = $duration;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -6,15 +6,15 @@ 
 class MediaEncodeOption extends MediaResOption
 {
     /* 以下属性是"视频转码"方法必须的属性 */
-    private $encodeTemplate;          //模板名称。可以设置系统或者用户自定义模板。用户模板名称可以登录后台查看和设置，系统模板见附录系统模板列表
-    public $usePreset = 0;            //是否使用系统模板。默认0。如果为1，则encodeTemplate必须设置系统模板名称
-    public $force = 0;                //是否强制覆盖。默认0，如果为1，当output文件已经存在的时候会强制覆盖，否则不执行转码并结束任务
+    private $encodeTemplate; //模板名称。可以设置系统或者用户自定义模板。用户模板名称可以登录后台查看和设置，系统模板见附录系统模板列表
+    public $usePreset = 0; //是否使用系统模板。默认0。如果为1，则encodeTemplate必须设置系统模板名称
+    public $force = 0; //是否强制覆盖。默认0，如果为1，当output文件已经存在的时候会强制覆盖，否则不执行转码并结束任务
     /* 以下属性是"视频转码"方法可选的属性 */
-    private $watermark;               //水印资源
-    private $watermarkTemplate;       //用户自定义水印模板
-    private $notifyUrl;               //通知url，任务结束之后会调用这个url
-    private $seek;                    //截取音视频的开始位置
-    private $duration;                //截取音视频的长度
+    private $watermark; //水印资源
+    private $watermarkTemplate; //用户自定义水印模板
+    private $notifyUrl; //通知url，任务结束之后会调用这个url
+    private $seek; //截取音视频的开始位置
+    private $duration; //截取音视频的长度
 
     /**设置转码模板。必须。模板在顽兔控制台"多媒体处理"中配置*/
     public function setEncodeTemplate($encodeTemplate)
@@ -56,7 +56,7 @@ 
             $httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
         }
         if (isset($this->seek)) {
-            $httpBody .= '&seek=' .  $this->seek;
+            $httpBody .= '&seek=' . $this->seek;
         }
         if (isset($this->duration)) {
             $httpBody .= '&duration=' . $this->duration;

sdk/Utils/UploadOption.php

Indentation +154 added lines, -154 removed lines

@@ -6,164 +6,164 @@
 
 class UploadOption
 {
-    /*optionType用于标识UploadOption的类型，即：普通上传、初始化分片上传、分片上传、分片上传完成*/
-    public $optionType;
+	/*optionType用于标识UploadOption的类型，即：普通上传、初始化分片上传、分片上传、分片上传完成*/
+	public $optionType;
 
-    /*以下属性是上传时的可选参数。即Rest API中Http请求Body中所需的可选参数*/
-    public $dir;                                    // 顽兔空间的图片路径(如果UploadPolicy中不指定dir属性，则生效)
-    public $name;                                   // 上传到服务端的文件名(如果UploadPolicy中不指定name属性，则生效)
-    public $metaArray;                              // 用户自定义的文件meta信息("meta-"为参数前缀, "*"为用户用于渲染的自定义Meta信息名)
-    public $varArray;                               // 用户自定义的魔法变量("var-"为参数前缀, "*"为用户用于渲染的自定义魔法变量名)
-    private $md5;                                   // 文件md5值(推荐提供此参数进行一致性检查)
-    private $size;                                  // 文件大小
-    private $content;                               // 文件内容(在http请求体Body中必须位于参数的最后一位)
+	/*以下属性是上传时的可选参数。即Rest API中Http请求Body中所需的可选参数*/
+	public $dir;                                    // 顽兔空间的图片路径(如果UploadPolicy中不指定dir属性，则生效)
+	public $name;                                   // 上传到服务端的文件名(如果UploadPolicy中不指定name属性，则生效)
+	public $metaArray;                              // 用户自定义的文件meta信息("meta-"为参数前缀, "*"为用户用于渲染的自定义Meta信息名)
+	public $varArray;                               // 用户自定义的魔法变量("var-"为参数前缀, "*"为用户用于渲染的自定义魔法变量名)
+	private $md5;                                   // 文件md5值(推荐提供此参数进行一致性检查)
+	private $size;                                  // 文件大小
+	private $content;                               // 文件内容(在http请求体Body中必须位于参数的最后一位)
 
-    /*以下属性是用户根据自己应用需求，可选的配置*/
-    public $blockSize;                              // 文件分片的大小。针对分片上传。
-    public $timeout;                                // 进行http连接的超时时间
-    public $httpReTry;                              // http失败自动重试。0 or 1
+	/*以下属性是用户根据自己应用需求，可选的配置*/
+	public $blockSize;                              // 文件分片的大小。针对分片上传。
+	public $timeout;                                // 进行http连接的超时时间
+	public $httpReTry;                              // http失败自动重试。0 or 1
 
-    /*以下属性是用于分片上传时的参数，仅用于分片上传。用户在调用分片上传时可以选择配置。*/
-    private $uploadId;                              // OSS分片上传ID（OSS用于区分上传的id）
-    private $uniqueId;                              // 服务上传唯一ID（多媒体服务用于区分上传的id）
-    private $partNumber;                            // 分片文件块上传成功后返回的文件块编号
-    private $eTag;                                  // 分片文件块上传成功后返回的Tag标签(由md5和其他标记组成)
-    private $array_PartNum_ETag;                    // 分片上传服务端返回的所有 块编号partNumber 和 标记ETag
+	/*以下属性是用于分片上传时的参数，仅用于分片上传。用户在调用分片上传时可以选择配置。*/
+	private $uploadId;                              // OSS分片上传ID（OSS用于区分上传的id）
+	private $uniqueId;                              // 服务上传唯一ID（多媒体服务用于区分上传的id）
+	private $partNumber;                            // 分片文件块上传成功后返回的文件块编号
+	private $eTag;                                  // 分片文件块上传成功后返回的Tag标签(由md5和其他标记组成)
+	private $array_PartNum_ETag;                    // 分片上传服务端返回的所有 块编号partNumber 和 标记ETag
 
-    public function __construct()
-    {
-        $this->optionType = UpOptionType::COMMON_UPLOAD_TYPE; //默认普通上传类型
-        $this->metaArray = array();
-        $this->varArray = array();
-        $this->blockSize = Conf::BLOCK_DEFF_SIZE;   //默认2M
-        $this->timeout = Conf::HTTP_TIMEOUT;        //默认超时30s
-        $this->httpReTry = Conf::HTTP_RETRY;       //默认重试
-        $this->array_PartNum_ETag = array();
-    }
-    /**得到上传时http请求体所需的参数*/
-    public function getParaArray()
-    {
-        switch ($this->optionType) {
-            case UpOptionType::COMMON_UPLOAD_TYPE:
-            case UpOptionType::BLOCK_INIT_UPLOAD:
-                return $this->getParasCommonBlockInit();
-            case UpOptionType::BLOCK_RUN_UPLOAD:
-                return $this->getParasBlockRun();
-            case UpOptionType::BLOCK_COMPLETE_UPLOAD:
-                return $this->getParasBlockComplete();
-            case UpOptionType::BLOCK_CANCEL_UPLOAD:
-                return $this->getParasBlockCancel();
-            default:
-                return null;
-        }
-    }
-    /** 构造 普通上传 或者 初始化分片上传 所需的参数 */
-    private function getParasCommonBlockInit()
-    {
-        $paraArray = array();
-        if (isset($this->dir)) {
-            $paraArray['dir'] = $this->dir;
-        }
-        if (isset($this->name)) {
-            $paraArray['name'] = $this->name;
-        }
-        $paraArray['md5'] = md5($this->content); // 计算文件md5
-        $paraArray['size'] = strlen($this->content); // 计算文件大小
-        $paraArray['content'] = $this->content;
-        $this->createMetaVars($paraArray, "meta", $this->metaArray);
-        $this->createMetaVars($paraArray, "var", $this->varArray);
-        return $paraArray;
-    }
-    /** 构造 分片上传过程中 所需的参数 */
-    private function getParasBlockRun()
-    {
-        $paraArray = array();
-        $paraArray['uploadId'] = $this->uploadId;
-        $paraArray['id'] = $this->uniqueId;
-        $paraArray['partNumber'] = $this->partNumber;
-        $paraArray['md5'] = md5($this->content); // 计算文件md5
-        $paraArray['size'] = strlen($this->content); // 计算文件大小
-        $paraArray['content'] = $this->content;
-        return $paraArray;
-    }
-    /** 构造 分片上传完成时 所需的参数 */
-    private function getParasBlockComplete()
-    {
-        $paraArray = array();
-        $paraArray['uploadId'] = $this->uploadId;
-        $paraArray['id'] = $this->uniqueId;
-        $paraArray['md5'] = $this->md5;
-        $parts = EncodeUtils::encodeWithURLSafeBase64(json_encode($this->array_PartNum_ETag));
-        $paraArray['parts'] = $parts; // 所有文件块的编号partNumber 和 标记ETag，需要进行base64的编码
-        return $paraArray;
-    }
-    /** 构造 分片上传取消 所需的参数 */
-    private function getParasBlockCancel()
-    {
-        return array('id' => $this->uniqueId, 'uploadId' => $this->uploadId);
-    }
-    /**
-     * 构建上传http请求体的meta-*和var-*选项参数。将tempArr中的元素加上前缀prefix，然后保存到paraArr中
-     * @param array $paraArr 最终的数组
-     * @param string $prefix 前缀
-     * @param array $tempArr 待添加的数组
-     * @return array $paraArr 最终的数组
-     */
-    private function createMetaVars($paraArr, $prefix, $tempArr)
-    {
-        foreach ($tempArr as $key => $val) {
-            $key = $prefix . '-' . $key;
-            $paraArr[$key] = $val;
-        }
-        return $paraArr;
-    }
-    /**设置待上传的数据。该方法开发者不需要调用，该方法根据用户数据自动调用
+	public function __construct()
+	{
+		$this->optionType = UpOptionType::COMMON_UPLOAD_TYPE; //默认普通上传类型
+		$this->metaArray = array();
+		$this->varArray = array();
+		$this->blockSize = Conf::BLOCK_DEFF_SIZE;   //默认2M
+		$this->timeout = Conf::HTTP_TIMEOUT;        //默认超时30s
+		$this->httpReTry = Conf::HTTP_RETRY;       //默认重试
+		$this->array_PartNum_ETag = array();
+	}
+	/**得到上传时http请求体所需的参数*/
+	public function getParaArray()
+	{
+		switch ($this->optionType) {
+			case UpOptionType::COMMON_UPLOAD_TYPE:
+			case UpOptionType::BLOCK_INIT_UPLOAD:
+				return $this->getParasCommonBlockInit();
+			case UpOptionType::BLOCK_RUN_UPLOAD:
+				return $this->getParasBlockRun();
+			case UpOptionType::BLOCK_COMPLETE_UPLOAD:
+				return $this->getParasBlockComplete();
+			case UpOptionType::BLOCK_CANCEL_UPLOAD:
+				return $this->getParasBlockCancel();
+			default:
+				return null;
+		}
+	}
+	/** 构造 普通上传 或者 初始化分片上传 所需的参数 */
+	private function getParasCommonBlockInit()
+	{
+		$paraArray = array();
+		if (isset($this->dir)) {
+			$paraArray['dir'] = $this->dir;
+		}
+		if (isset($this->name)) {
+			$paraArray['name'] = $this->name;
+		}
+		$paraArray['md5'] = md5($this->content); // 计算文件md5
+		$paraArray['size'] = strlen($this->content); // 计算文件大小
+		$paraArray['content'] = $this->content;
+		$this->createMetaVars($paraArray, "meta", $this->metaArray);
+		$this->createMetaVars($paraArray, "var", $this->varArray);
+		return $paraArray;
+	}
+	/** 构造 分片上传过程中 所需的参数 */
+	private function getParasBlockRun()
+	{
+		$paraArray = array();
+		$paraArray['uploadId'] = $this->uploadId;
+		$paraArray['id'] = $this->uniqueId;
+		$paraArray['partNumber'] = $this->partNumber;
+		$paraArray['md5'] = md5($this->content); // 计算文件md5
+		$paraArray['size'] = strlen($this->content); // 计算文件大小
+		$paraArray['content'] = $this->content;
+		return $paraArray;
+	}
+	/** 构造 分片上传完成时 所需的参数 */
+	private function getParasBlockComplete()
+	{
+		$paraArray = array();
+		$paraArray['uploadId'] = $this->uploadId;
+		$paraArray['id'] = $this->uniqueId;
+		$paraArray['md5'] = $this->md5;
+		$parts = EncodeUtils::encodeWithURLSafeBase64(json_encode($this->array_PartNum_ETag));
+		$paraArray['parts'] = $parts; // 所有文件块的编号partNumber 和 标记ETag，需要进行base64的编码
+		return $paraArray;
+	}
+	/** 构造 分片上传取消 所需的参数 */
+	private function getParasBlockCancel()
+	{
+		return array('id' => $this->uniqueId, 'uploadId' => $this->uploadId);
+	}
+	/**
+	 * 构建上传http请求体的meta-*和var-*选项参数。将tempArr中的元素加上前缀prefix，然后保存到paraArr中
+	 * @param array $paraArr 最终的数组
+	 * @param string $prefix 前缀
+	 * @param array $tempArr 待添加的数组
+	 * @return array $paraArr 最终的数组
+	 */
+	private function createMetaVars($paraArr, $prefix, $tempArr)
+	{
+		foreach ($tempArr as $key => $val) {
+			$key = $prefix . '-' . $key;
+			$paraArr[$key] = $val;
+		}
+		return $paraArr;
+	}
+	/**设置待上传的数据。该方法开发者不需要调用，该方法根据用户数据自动调用
      * @param string $data 字符串 */
-    public function setContent($data)
-    {
-        $this->content = $data;
-    }
-    /**设置MD5值。该方法主要用于在分片上传完成时调用
+	public function setContent($data)
+	{
+		$this->content = $data;
+	}
+	/**设置MD5值。该方法主要用于在分片上传完成时调用
      * @param string $value md5值 */
-    public function setMd5($value)
-    {
-        $this->md5 = $value;
-    }
-    /**得到MD5值。该方法主要用于在分片上传完成时调用*/
-    public function getMd5()
-    {
-        return $this->md5;
-    }
-    /*下面四个函数均是用于分片上传时的设置，开发者不需要调用*/
-    /**分片上传时用于设置uploadId */
-    public function setUploadId($uploadId)
-    {
-        $this->uploadId = $uploadId;
-    }
-    /**分片上传时用于设置id */
-    public function setUniqueIdId($id)
-    {
-        $this->uniqueId = $id;
-    }
-    /**分片上传时，用于获取分片上传时的块编号partNumber */
-    public function getPartNumber()
-    {
-        return $this->partNumber;
-    }
-    /**分片上传时，用于设置分片上传时的块编号partNumber */
-    public function setPartNumber($partNumber)
-    {
-        $this->partNumber = $partNumber;
-    }
-    /**分片上传过程中，用于保存所有的 块编号partNumber 和 标记ETag*/
-    public function addPartNumberAndETag($partNumber, $eTag)
-    {
-        $this->eTag = $eTag;
-        array_push($this->array_PartNum_ETag, array("partNumber" => $partNumber, "eTag" => $eTag));
-    }
-    /**检测分片上传的参数。即uploadId、uniqueId是否有值*/
-    public function checkMutipartParas()
-    {
-        return isset($this->uploadId) && isset($this->uniqueId);
-    }
+	public function setMd5($value)
+	{
+		$this->md5 = $value;
+	}
+	/**得到MD5值。该方法主要用于在分片上传完成时调用*/
+	public function getMd5()
+	{
+		return $this->md5;
+	}
+	/*下面四个函数均是用于分片上传时的设置，开发者不需要调用*/
+	/**分片上传时用于设置uploadId */
+	public function setUploadId($uploadId)
+	{
+		$this->uploadId = $uploadId;
+	}
+	/**分片上传时用于设置id */
+	public function setUniqueIdId($id)
+	{
+		$this->uniqueId = $id;
+	}
+	/**分片上传时，用于获取分片上传时的块编号partNumber */
+	public function getPartNumber()
+	{
+		return $this->partNumber;
+	}
+	/**分片上传时，用于设置分片上传时的块编号partNumber */
+	public function setPartNumber($partNumber)
+	{
+		$this->partNumber = $partNumber;
+	}
+	/**分片上传过程中，用于保存所有的 块编号partNumber 和 标记ETag*/
+	public function addPartNumberAndETag($partNumber, $eTag)
+	{
+		$this->eTag = $eTag;
+		array_push($this->array_PartNum_ETag, array("partNumber" => $partNumber, "eTag" => $eTag));
+	}
+	/**检测分片上传的参数。即uploadId、uniqueId是否有值*/
+	public function checkMutipartParas()
+	{
+		return isset($this->uploadId) && isset($this->uniqueId);
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -10,34 +10,34 @@
     public $optionType;
 
     /*以下属性是上传时的可选参数。即Rest API中Http请求Body中所需的可选参数*/
-    public $dir;                                    // 顽兔空间的图片路径(如果UploadPolicy中不指定dir属性，则生效)
-    public $name;                                   // 上传到服务端的文件名(如果UploadPolicy中不指定name属性，则生效)
-    public $metaArray;                              // 用户自定义的文件meta信息("meta-"为参数前缀, "*"为用户用于渲染的自定义Meta信息名)
-    public $varArray;                               // 用户自定义的魔法变量("var-"为参数前缀, "*"为用户用于渲染的自定义魔法变量名)
-    private $md5;                                   // 文件md5值(推荐提供此参数进行一致性检查)
-    private $size;                                  // 文件大小
-    private $content;                               // 文件内容(在http请求体Body中必须位于参数的最后一位)
+    public $dir; // 顽兔空间的图片路径(如果UploadPolicy中不指定dir属性，则生效)
+    public $name; // 上传到服务端的文件名(如果UploadPolicy中不指定name属性，则生效)
+    public $metaArray; // 用户自定义的文件meta信息("meta-"为参数前缀, "*"为用户用于渲染的自定义Meta信息名)
+    public $varArray; // 用户自定义的魔法变量("var-"为参数前缀, "*"为用户用于渲染的自定义魔法变量名)
+    private $md5; // 文件md5值(推荐提供此参数进行一致性检查)
+    private $size; // 文件大小
+    private $content; // 文件内容(在http请求体Body中必须位于参数的最后一位)
 
     /*以下属性是用户根据自己应用需求，可选的配置*/
-    public $blockSize;                              // 文件分片的大小。针对分片上传。
-    public $timeout;                                // 进行http连接的超时时间
-    public $httpReTry;                              // http失败自动重试。0 or 1
+    public $blockSize; // 文件分片的大小。针对分片上传。
+    public $timeout; // 进行http连接的超时时间
+    public $httpReTry; // http失败自动重试。0 or 1
 
     /*以下属性是用于分片上传时的参数，仅用于分片上传。用户在调用分片上传时可以选择配置。*/
-    private $uploadId;                              // OSS分片上传ID（OSS用于区分上传的id）
-    private $uniqueId;                              // 服务上传唯一ID（多媒体服务用于区分上传的id）
-    private $partNumber;                            // 分片文件块上传成功后返回的文件块编号
-    private $eTag;                                  // 分片文件块上传成功后返回的Tag标签(由md5和其他标记组成)
-    private $array_PartNum_ETag;                    // 分片上传服务端返回的所有 块编号partNumber 和 标记ETag
+    private $uploadId; // OSS分片上传ID（OSS用于区分上传的id）
+    private $uniqueId; // 服务上传唯一ID（多媒体服务用于区分上传的id）
+    private $partNumber; // 分片文件块上传成功后返回的文件块编号
+    private $eTag; // 分片文件块上传成功后返回的Tag标签(由md5和其他标记组成)
+    private $array_PartNum_ETag; // 分片上传服务端返回的所有 块编号partNumber 和 标记ETag
 
     public function __construct()
     {
         $this->optionType = UpOptionType::COMMON_UPLOAD_TYPE; //默认普通上传类型
         $this->metaArray = array();
         $this->varArray = array();
-        $this->blockSize = Conf::BLOCK_DEFF_SIZE;   //默认2M
-        $this->timeout = Conf::HTTP_TIMEOUT;        //默认超时30s
-        $this->httpReTry = Conf::HTTP_RETRY;       //默认重试
+        $this->blockSize = Conf::BLOCK_DEFF_SIZE; //默认2M
+        $this->timeout = Conf::HTTP_TIMEOUT; //默认超时30s
+        $this->httpReTry = Conf::HTTP_RETRY; //默认重试
         $this->array_PartNum_ETag = array();
     }
     /**得到上传时http请求体所需的参数*/