xiaohuilam / laravel-flysystem-wantu

sdk/Core/UploadClient.php

Spacing +57 added lines, -57 removed lines

@@ -37,10 +37,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);

@@ -67,7 +67,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->_send_request('POST', $url, $uploadPolicy, $uploadOption);

 	}

 

@@ -80,8 +80,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; // 当前文件块的大小

@@ -94,8 +94,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->_send_request('POST', $url, $uploadPolicy, $uploadOption);

 				$uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID（OSS用于区分上传的id）

 				$id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID（多媒体服务用于区分上传的id）

@@ -103,16 +103,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->_send_request('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->_send_request('POST', $url, $uploadPolicy, $uploadOption); // 不判断取消分片任务返回的结果

 				}

 				return $httpRes;

@@ -125,9 +125,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->_send_request('POST', $url, $uploadPolicy, $uploadOption);

 	}

 

@@ -143,7 +143,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);

@@ -157,7 +157,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->_send_request('POST', $url, $uploadPolicy, $uploadOption);

 	}

 

@@ -170,8 +170,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; // 当前文件块的大小

@@ -184,8 +184,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->_send_request('POST', $url, $uploadPolicy, $uploadOption);

 				$uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID（OSS用于区分上传的id）

 				$id = isset($httpRes['id']) ? $httpRes['id'] : null; // 上传唯一ID（多媒体服务用于区分上传的id）

@@ -193,16 +193,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->_send_request('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->_send_request('POST', $url, $uploadPolicy, $uploadOption); // 不判断取消分片任务返回的结果

 				}

 				return $httpRes;

@@ -211,9 +211,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->_send_request('POST', $url, $uploadPolicy, $uploadOption);

 	}

 

@@ -224,17 +224,17 @@ 
 	 * @param UploadOption $uploadOption 上传选项

 	 * @return array 初始化分片上传的结果

 	 */

-	public function multipartInit($filePath, UploadPolicy $uploadPolicy,  UploadOption $uploadOption)

+	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，则生成一个默认的

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

@@ -247,10 +247,10 @@ 
 	 * @param UploadOption $uploadOption 上传选项

 	 * @return array 初始化分片上传的结果

 	 */

-	public function multipartInitByData($blockData, UploadPolicy $uploadPolicy,  UploadOption $uploadOption)

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

@@ -258,13 +258,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->_send_request('POST', $url, $uploadPolicy, $uploadOption);

 		//若成功返回，则保存初始化成功的uploadId、id 以及 partNumber、eTag

 		$uploadId = isset($httpRes['uploadId']) ? $httpRes['uploadId'] : null; // 分片上传ID（OSS用于区分上传的id）

@@ -283,14 +283,14 @@ 
 	 * @param UploadOption $uploadOption 上传选项

 	 * @return array 初始化分片上传的结果

 	 */

-	public function multipartUpload($filePath, UploadPolicy $uploadPolicy,  UploadOption $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;	// 文件分片大小

+		$fileSize = filesize($encodePath); // 文件大小

+		$blockSize = $uploadOption->blockSize; // 文件分片大小

 		$blockNum = intval(ceil($fileSize / $blockSize)); // 文件分片后的块数

 		$currentSize = $blockSize; // 当前文件块的大小

 		if ($uploadOption->getPartNumber() == $blockNum) {

@@ -308,7 +308,7 @@ 
 	 * @param UploadOption $uploadOption 上传选项

 	 * @return array 分片上传的结果

 	 */

-	public function multipartUploadByData($blockData, UploadPolicy $uploadPolicy,  UploadOption $uploadOption)

+	public function multipartUploadByData($blockData, UploadPolicy $uploadPolicy, UploadOption $uploadOption)

 	{

 		$partNumber = $uploadOption->getPartNumber(); //php 5.3的版本使用empty()传递函数返回值会报错。所以为了兼容，增加临时变量

 		// 检查分片上传所需的参数是否设置正确

@@ -316,8 +316,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->_send_request('POST', $url, $uploadPolicy, $uploadOption);

 		if (isset($httpRes['partNumber']) && isset($httpRes['eTag'])) {

 			$uploadOption->addPartNumberAndETag($httpRes['partNumber'], $httpRes['eTag']);

@@ -331,14 +331,14 @@ 
 	 * @param UploadOption $uploadOption 上传选项

 	 * @return array 分片上传完成的结果

 	 */

-	public function multipartComplete(UploadPolicy $uploadPolicy,  UploadOption $uploadOption)

+	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类型

+		$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_COMPLETE; //完成分片上传任务的API

+		$uploadOption->optionType = UpOptionType::BLOCK_COMPLETE_UPLOAD; //完成分片上传任务时的Option类型

 		return $this->_send_request('POST', $url, $uploadPolicy, $uploadOption);

 	}

 

@@ -348,13 +348,13 @@ 
 	 * @param UploadOption $uploadOption 上传选项

 	 * @return array 分片上传完成的结果

 	 */

-	public function multipartCancel(UploadPolicy $uploadPolicy,  UploadOption $uploadOption)

+	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类型

+		$url = $this->upload_host . Conf::UPLOAD_API_BLOCK_CANCEL; //取消分片任务的API

+		$uploadOption->optionType = UpOptionType::BLOCK_CANCEL_UPLOAD; //取消分片任务时的Option类型

 		return $this->_send_request('POST', $url, $uploadPolicy, $uploadOption);

 	}

 

@@ -382,17 +382,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);

@@ -413,10 +413,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) ? $result : $resArray);

 			}

 		} catch (Exception $e) {

sdk/Core/ManageClient.php

Spacing +9 added lines, -9 removed lines

@@ -326,7 +326,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)) {

@@ -345,13 +345,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);

@@ -366,10 +366,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) {

@@ -441,7 +441,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;

 	}

Braces +24 added lines, -16 removed lines

@@ -137,10 +137,12 @@ 
 	 */

 	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;

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

@@ -155,10 +157,12 @@ 
 	 */

 	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;

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

@@ -197,10 +201,12 @@ 
 	 */

 	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;

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

@@ -260,8 +266,9 @@ 
 	 */

 	public function mediaEncodeQuery($taskId)

 	{

-		if (empty($taskId))

-			return $this->_errorResponse("InvalidArgument", "taskId is empty");

+		if (empty($taskId)) {

+					return $this->_errorResponse("InvalidArgument", "taskId is empty");

+		}

 		$uri = '/' . Conf::MEDIA_ENCODE_VERSION . '/mediaEncodeResult/' . $taskId;

 		return $this->_send_request('GET', $uri);

 	}

@@ -287,8 +294,9 @@ 
 	 */

 	public function vSnapshotQuery($taskId)

 	{

-		if (empty($taskId))

-			return $this->_errorResponse("InvalidArgument", "taskId is empty");

+		if (empty($taskId)) {

+					return $this->_errorResponse("InvalidArgument", "taskId is empty");

+		}

 		$uri = '/' . Conf::MANAGE_API_VERSION . '/snapshotResult/' . $taskId;

 		return $this->_send_request('GET', $uri);

 	}

sdk/Utils/MediaEncodeOption.php

Spacing +52 added lines, -52 removed lines

@@ -2,17 +2,17 @@ 
 namespace AliMedia\Utils;

 

 /**多媒体转码的参数*/

-class MediaEncodeOption extends MediaResOption{

+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) {

@@ -20,17 +20,17 @@ 
 	}

 	/**检测多媒体转码选项是否合法。如果合法，则返回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

+		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(){

+	public function getOptionsHttpBody() {

 		//必须的参数

 		$httpBody = 'input=' . $this->getInputResId();

 		$httpBody .= '&output=' . $this->getOutputResId();

@@ -38,22 +38,22 @@ 
 		$httpBody .= '&usePreset=' . $this->usePreset;

 		$httpBody .= '&force=' . $this->force;

 		// 可选的参数

-		if (isset ( $this->watermark ))

-			$httpBody .= '&watermark=' . $this->watermark->buildResourceId ();

-		if (isset ( $this->watermarkTemplate ))

+		if (isset ($this->watermark))

+			$httpBody .= '&watermark=' . $this->watermark->buildResourceId();

+		if (isset ($this->watermarkTemplate))

 			$httpBody .= '&watermarkTemplate=' . urlencode($this->watermarkTemplate);

-		if (isset ( $this->notifyUrl ))

+		if (isset ($this->notifyUrl))

 			$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);

-		if (isset ( $this->seek ))

-			$httpBody .= '&seek=' .  $this->seek;

-		if (isset ( $this->duration ))

+		if (isset ($this->seek))

+			$httpBody .= '&seek=' . $this->seek;

+		if (isset ($this->duration))

 			$httpBody .= '&duration=' . $this->duration;

-		return array ( true, "valid", $httpBody ); //视频转码参数合法，返回http请求体

+		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 setWatermark($namespace = null, $dir = null, $name = null) {

+		$this->watermark = new ResourceInfo($namespace, $dir, $name);

 	}

 	/**设置用户自定义水印模板。可选*/

 	public function setWatermarkTemplate($watermarkTemplate) {

@@ -73,30 +73,30 @@ 
 	}

 }

 /**视频截图的参数*/

-class SnapShotOption extends MediaResOption{

+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 ); // 是否设置时间，且时间是否合法

+		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(){

+	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请求体

+		if (isset ($this->notifyUrl))

+			$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);

+		return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体

 	}

 

 	/**设置视频截图的位置，单位为毫秒。改参数必须设置*/

@@ -110,27 +110,27 @@ 
 }

 /**多媒体操作的输入输出资源信息。视频截图和视频转码都继承该类*/

 abstract class MediaResOption {

-	private $input;                  //输入的资源

-	private $output;                 //输出的资源

+	private $input; //输入的资源

+	private $output; //输出的资源

 	/**设置输入的文件。*/

-	public function setInputResource($namespace=null, $dir=null, $name=null) {

-		$this->input = new ResourceInfo($namespace,$dir,$name);

+	public function setInputResource($namespace = null, $dir = null, $name = null) {

+		$this->input = new ResourceInfo($namespace, $dir, $name);

 	}

 	/**设置输出的文件。*/

-	public function setOutputResource($namespace=null, $dir=null, $name=null) {

-		$this->output = new ResourceInfo($namespace,$dir,$name);

+	public function setOutputResource($namespace = null, $dir = null, $name = null) {

+		$this->output = new ResourceInfo($namespace, $dir, $name);

 	}

 	/**检测参数选项是否合法*/

 	public function checkOptionParameters() {

-		if ( empty($this->input) || empty($this->output) )

-			return array ( false, "input or output resources is empty." ); // 判断是否设置输入输出文件，或者转码模板

-		list ( $valid, $msg ) = $this->input->checkResourceInfo(true,true);//检测输入的资源信息是否合法

-		if(!$valid)

-			return array ( $valid, $msg );

-		list ( $valid, $msg ) = $this->output->checkResourceInfo(true,true);//检测输入的资源信息是否合法

-		if(!$valid)

-			return array ( $valid, $msg );

-		return array( true, null);

+		if (empty($this->input) || empty($this->output))

+			return array(false, "input or output resources is empty."); // 判断是否设置输入输出文件，或者转码模板

+		list ($valid, $msg) = $this->input->checkResourceInfo(true, true); //检测输入的资源信息是否合法

+		if (!$valid)

+			return array($valid, $msg);

+		list ($valid, $msg) = $this->output->checkResourceInfo(true, true); //检测输入的资源信息是否合法

+		if (!$valid)

+			return array($valid, $msg);

+		return array(true, null);

 	}

 	public function getInputResId() {

 		return $this->input->buildResourceId();

Braces +46 added lines, -28 removed lines

@@ -21,12 +21,17 @@ 
 	/**检测多媒体转码选项是否合法。如果合法，则返回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

+		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请求体*/

@@ -38,16 +43,21 @@ 
 		$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;

+		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方法#######################*/

@@ -81,10 +91,13 @@ 
 	/**检测视频截图参数是否合法。如果合法，则返回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 ); // 是否设置时间，且时间是否合法

+		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请求体*/

@@ -94,8 +107,9 @@ 
 		$httpBody .= '&output=' . $this->getOutputResId();

 		$httpBody .= '&time=' . $this->time;

 		// 可选的参数

-		if (isset ( $this->notifyUrl ))

-			$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl) ;

+		if (isset ( $this->notifyUrl )) {

+					$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl) ;

+		}

 		return array ( true, "valid", $httpBody ); //视频转码参数合法，返回http请求体

 	}

 

@@ -122,14 +136,18 @@ 
 	}

 	/**检测参数选项是否合法*/

 	public function checkOptionParameters() {

-		if ( empty($this->input) || empty($this->output) )

-			return array ( false, "input or output resources is empty." ); // 判断是否设置输入输出文件，或者转码模板

+		if ( empty($this->input) || empty($this->output) ) {

+					return array ( false, "input or output resources is empty." );

+		}

+		// 判断是否设置输入输出文件，或者转码模板

 		list ( $valid, $msg ) = $this->input->checkResourceInfo(true,true);//检测输入的资源信息是否合法

-		if(!$valid)

-			return array ( $valid, $msg );

+		if(!$valid) {

+					return array ( $valid, $msg );

+		}

 		list ( $valid, $msg ) = $this->output->checkResourceInfo(true,true);//检测输入的资源信息是否合法

-		if(!$valid)

-			return array ( $valid, $msg );

+		if(!$valid) {

+					return array ( $valid, $msg );

+		}

 		return array( true, null);

 	}

 	public function getInputResId() {

sdk/Utils/UploadOption.php

Spacing +23 added lines, -23 removed lines

@@ -9,34 +9,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请求体所需的参数*/

@@ -172,9 +172,9 @@ 
 class UpOptionType

 {

 	//下面的常量用于标识UploadOption对象适用的类型

-	const COMMON_UPLOAD_TYPE = 0;		//普通上传时的UploadOption类型

-	const BLOCK_INIT_UPLOAD = 1;		//分片初始化时的UploadOption类型

-	const BLOCK_RUN_UPLOAD = 2;			//分片上传过程中的UploadOption类型

-	const BLOCK_COMPLETE_UPLOAD = 3;	//分片上传完成时的UploadOption类型

-	const BLOCK_CANCEL_UPLOAD = 4;		//分片上传取消时的UploadOption类型

+	const COMMON_UPLOAD_TYPE = 0; //普通上传时的UploadOption类型

+	const BLOCK_INIT_UPLOAD = 1; //分片初始化时的UploadOption类型

+	const BLOCK_RUN_UPLOAD = 2; //分片上传过程中的UploadOption类型

+	const BLOCK_COMPLETE_UPLOAD = 3; //分片上传完成时的UploadOption类型

+	const BLOCK_CANCEL_UPLOAD = 4; //分片上传取消时的UploadOption类型

 }

Braces +6 added lines, -4 removed lines

@@ -60,10 +60,12 @@
 	private function getParas_Common_BlockInit()

 	{

 		$paraArray = array();

-		if (isset($this->dir))

-			$paraArray['dir'] = $this->dir;

-		if (isset($this->name))

-			$paraArray['name'] = $this->name;

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

sdk/Utils/UploadPolicy.php

Indentation +38 added lines, -38 removed lines

@@ -5,47 +5,47 @@
 

 class UploadPolicy

 {

-    /*如下属性是必须的[The following attributes are required]*/

-    public $namespace;                              // 多媒体服务的空间名[media namespace name]

-    public $bucket;                                 // OSS的空间名[media bucket name]

-    public $insertOnly;                             // 是否可覆盖[upload mode. it's not allowd uploading the same name files]

-    public $expiration;                             // 过期时间[expiration time, unix time, in milliseconds]

+	/*如下属性是必须的[The following attributes are required]*/

+	public $namespace;                              // 多媒体服务的空间名[media namespace name]

+	public $bucket;                                 // OSS的空间名[media bucket name]

+	public $insertOnly;                             // 是否可覆盖[upload mode. it's not allowd uploading the same name files]

+	public $expiration;                             // 过期时间[expiration time, unix time, in milliseconds]

 

-    /*如下属性是可选的[The following attributes are optional]*/

-    public $detectMime = Conf::DETECT_MIME_TRUE;                             // 是否进行类型检测[is auto detecte media file mime type, default is true]

-    public $dir;                                    // 路径[media file dir, magic vars and custom vars are supported]

-    public $name;                                   // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]

-    public $sizeLimit;                              // 文件大小限制[upload size limited, in bytes]

-    public $mimeLimit;                              // 文件类型限制[upload mime type limited]

-    public $callbackUrl;                            // 回调URL [callback urls, ip address is recommended]

-    public $callbackHost;                           // 回调时Host [callback host]

-    public $callbackBody;                           // 回调时Body [callback body, magic vars and custom vars are supported]

-    public $callbackBodyType;                       // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']

-    public $returnUrl;                              // 上传完成之后,303跳转的Url [return url, when return code is 303]

-    public $returnBody;                             // 上传完成返回体 [return body, magic vars and custom vars are supported]

-    public $mediaEncode;                            // 上传音视频时，可以指定转码策略[media encode policy after upload task has been completed. it's json string]

+	/*如下属性是可选的[The following attributes are optional]*/

+	public $detectMime = Conf::DETECT_MIME_TRUE;                             // 是否进行类型检测[is auto detecte media file mime type, default is true]

+	public $dir;                                    // 路径[media file dir, magic vars and custom vars are supported]

+	public $name;                                   // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]

+	public $sizeLimit;                              // 文件大小限制[upload size limited, in bytes]

+	public $mimeLimit;                              // 文件类型限制[upload mime type limited]

+	public $callbackUrl;                            // 回调URL [callback urls, ip address is recommended]

+	public $callbackHost;                           // 回调时Host [callback host]

+	public $callbackBody;                           // 回调时Body [callback body, magic vars and custom vars are supported]

+	public $callbackBodyType;                       // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']

+	public $returnUrl;                              // 上传完成之后,303跳转的Url [return url, when return code is 303]

+	public $returnBody;                             // 上传完成返回体 [return body, magic vars and custom vars are supported]

+	public $mediaEncode;                            // 上传音视频时，可以指定转码策略[media encode policy after upload task has been completed. it's json string]

 

-    public function __construct($option)

-    {

-        if (!isset($option['expiration']) || !$option['expiration']) {

-            $option['expiration'] = -1;

-        }

+	public function __construct($option)

+	{

+		if (!isset($option['expiration']) || !$option['expiration']) {

+			$option['expiration'] = -1;

+		}

 

-        foreach ($option as $attribute => $value) {

-            $this->{$attribute} = $value;

-        }

-    }

+		foreach ($option as $attribute => $value) {

+			$this->{$attribute} = $value;

+		}

+	}

 

-    public function toArray()

-    {

-        return (array) $this;

-        $array = [];

-        foreach ($this as $attribute => $value) {

-            if ($value !== null) {

-                $array[$attribute] = $value;

-            }

-        }

+	public function toArray()

+	{

+		return (array) $this;

+		$array = [];

+		foreach ($this as $attribute => $value) {

+			if ($value !== null) {

+				$array[$attribute] = $value;

+			}

+		}

 

-        return $array;

-    }

+		return $array;

+	}

 }

Spacing +16 added lines, -16 removed lines

@@ -6,24 +6,24 @@
 class UploadPolicy

 {

     /*如下属性是必须的[The following attributes are required]*/

-    public $namespace;                              // 多媒体服务的空间名[media namespace name]

-    public $bucket;                                 // OSS的空间名[media bucket name]

-    public $insertOnly;                             // 是否可覆盖[upload mode. it's not allowd uploading the same name files]

-    public $expiration;                             // 过期时间[expiration time, unix time, in milliseconds]

+    public $namespace; // 多媒体服务的空间名[media namespace name]

+    public $bucket; // OSS的空间名[media bucket name]

+    public $insertOnly; // 是否可覆盖[upload mode. it's not allowd uploading the same name files]

+    public $expiration; // 过期时间[expiration time, unix time, in milliseconds]

 

     /*如下属性是可选的[The following attributes are optional]*/

-    public $detectMime = Conf::DETECT_MIME_TRUE;                             // 是否进行类型检测[is auto detecte media file mime type, default is true]

-    public $dir;                                    // 路径[media file dir, magic vars and custom vars are supported]

-    public $name;                                   // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]

-    public $sizeLimit;                              // 文件大小限制[upload size limited, in bytes]

-    public $mimeLimit;                              // 文件类型限制[upload mime type limited]

-    public $callbackUrl;                            // 回调URL [callback urls, ip address is recommended]

-    public $callbackHost;                           // 回调时Host [callback host]

-    public $callbackBody;                           // 回调时Body [callback body, magic vars and custom vars are supported]

-    public $callbackBodyType;                       // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']

-    public $returnUrl;                              // 上传完成之后,303跳转的Url [return url, when return code is 303]

-    public $returnBody;                             // 上传完成返回体 [return body, magic vars and custom vars are supported]

-    public $mediaEncode;                            // 上传音视频时，可以指定转码策略[media encode policy after upload task has been completed. it's json string]

+    public $detectMime = Conf::DETECT_MIME_TRUE; // 是否进行类型检测[is auto detecte media file mime type, default is true]

+    public $dir; // 路径[media file dir, magic vars and custom vars are supported]

+    public $name; // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]

+    public $sizeLimit; // 文件大小限制[upload size limited, in bytes]

+    public $mimeLimit; // 文件类型限制[upload mime type limited]

+    public $callbackUrl; // 回调URL [callback urls, ip address is recommended]

+    public $callbackHost; // 回调时Host [callback host]

+    public $callbackBody; // 回调时Body [callback body, magic vars and custom vars are supported]

+    public $callbackBodyType; // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']

+    public $returnUrl; // 上传完成之后,303跳转的Url [return url, when return code is 303]

+    public $returnBody; // 上传完成返回体 [return body, magic vars and custom vars are supported]

+    public $mediaEncode; // 上传音视频时，可以指定转码策略[media encode policy after upload task has been completed. it's json string]

 

     public function __construct($option)

     {

sdk/Utils/ManageOption.php

Spacing +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
 final class ManageOption extends ResourceInfo

 {

 	/*以下属性是”获取资源列表"方法所需的属性。即listFiles()、listDirs()方法中的参数 */

-	private $currentPage;                            //当前页号

-	private $pageSize;                               //每页的大小

+	private $currentPage; //当前页号

+	private $pageSize; //每页的大小

 	/* 以下属性是"扫描黄图和广告图"方法所需的属性。即scanPorn()和scanAdvertising方法中的参数 */

 	private $filesArray;

 	private $urlsArray;

sdk/Utils/ResourceInfo.php

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的构造函数

@@ -57,7 +57,7 @@ 
 	/**对URL中文进行编码*/

 	protected function urlencode_ch($str)

 	{

-		return preg_replace_callback('/[^\0-\127]+/', function ($match) {

+		return preg_replace_callback('/[^\0-\127]+/', function($match) {

 			return urlencode($match[0]);

 		}, $str);

 	}

Braces +25 added lines, -14 removed lines

@@ -22,10 +22,14 @@ 
 	 * 返回格式{$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的合法性

+		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}*/

@@ -35,10 +39,14 @@ 
 			return array(false, "file's name is empty.[{$this->toString()}]"); // 1：若需要进行文件名name检测，则判断文件名是否为空

 		}

 		if ($dirState) {

-			if (empty($this->dir))

-				$this->dir = '/'; // 2：判断路径是否为空，若为空，则默认为根目录'/'

-			else if (strpos($this->dir, '/') !== 0)

-				$this->dir = '/' . $this->dir; // 3：判断路径是否以'/'开头，若不是，则添加'/'

+			if (empty($this->dir)) {

+							$this->dir = '/';

+			}

+			// 2：判断路径是否为空，若为空，则默认为根目录'/'

+			else if (strpos($this->dir, '/') !== 0) {

+							$this->dir = '/' . $this->dir;

+			}

+			// 3：判断路径是否以'/'开头，若不是，则添加'/'

 		}

 		return array(true, null);

 	}

@@ -46,12 +54,15 @@ 
 	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));

+		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中文进行编码*/

sdk/AlibabaImage.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 	private $namespace;

 	private $type; // "TOP"和"CLOUD"两种模式

 

-	static $RUN_LEVEL = Conf::RUN_LEVEL_RELEASE;	//设置SDK运行级别

+	static $RUN_LEVEL = Conf::RUN_LEVEL_RELEASE; //设置SDK运行级别

 

 	/**

 	 * 构造函数

@@ -106,7 +106,7 @@ 
 	/**

 	 * 完成分片上传任务。需要指定UploadOption中整个文件的md5值

 	 */

-	public function multipartComplete(UploadPolicy $uploadPolicy,  UploadOption $uploadOption)

+	public function multipartComplete(UploadPolicy $uploadPolicy, UploadOption $uploadOption)

 	{

 		return $this->upload_client->multipartComplete($uploadPolicy, $uploadOption);

 	}

@@ -114,7 +114,7 @@ 
 	/**

 	 * 取消分片上传任务。需要保证UploadOption中有分片任务的uploadId和id

 	 */

-	public function multipartCancel(UploadPolicy $uploadPolicy,  UploadOption $uploadOption)

+	public function multipartCancel(UploadPolicy $uploadPolicy, UploadOption $uploadOption)

 	{

 		return $this->upload_client->multipartCancel($uploadPolicy, $uploadOption);

 	}

sdk/Conf/Conf.php

Indentation +27 added lines, -27 removed lines

@@ -3,39 +3,39 @@
 

 class Conf

 {

-    const CHARSET = "UTF-8";

-    const SDK_VERSION = '2.0.3';

+	const CHARSET = "UTF-8";

+	const SDK_VERSION = '2.0.3';

 

-    const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com";        //文件上传的地址

-    const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com";            //服务管理的地址

-    const MANAGE_API_VERSION = "3.0";        //资源管理接口版本

-    const SCAN_PORN_VERSION = "3.1";        //黄图扫描接口版本

-    const MEDIA_ENCODE_VERSION = "3.0";        //媒体转码接口版本

+	const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com";        //文件上传的地址

+	const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com";            //服务管理的地址

+	const MANAGE_API_VERSION = "3.0";        //资源管理接口版本

+	const SCAN_PORN_VERSION = "3.1";        //黄图扫描接口版本

+	const MEDIA_ENCODE_VERSION = "3.0";        //媒体转码接口版本

 

-    const UPLOAD_API_UPLOAD = "/api/proxy/upload";

-    const UPLOAD_API_BLOCK_INIT = "/api/proxy/blockInit";

-    const UPLOAD_API_BLOCK_UPLOAD = "/api/proxy/blockUpload";

-    const UPLOAD_API_BLOCK_COMPLETE = "/api/proxy/blockComplete";

-    const UPLOAD_API_BLOCK_CANCEL = "/api/proxy/blockCancel";

+	const UPLOAD_API_UPLOAD = "/api/proxy/upload";

+	const UPLOAD_API_BLOCK_INIT = "/api/proxy/blockInit";

+	const UPLOAD_API_BLOCK_UPLOAD = "/api/proxy/blockUpload";

+	const UPLOAD_API_BLOCK_COMPLETE = "/api/proxy/blockComplete";

+	const UPLOAD_API_BLOCK_CANCEL = "/api/proxy/blockCancel";

 

-    const TYPE_TOP = "TOP";

-    const TYPE_CLOUD = "CLOUD";

+	const TYPE_TOP = "TOP";

+	const TYPE_CLOUD = "CLOUD";

 

-    const DETECT_MIME_TRUE = 1;            //检测MimeType

-    const DETECT_MIME_NONE = 0;            //不检测MimeType

-    const INSERT_ONLY_TRUE = 1;            //文件上传不可覆盖

-    const INSERT_ONLY_NONE = 0;            //文件上传可覆盖

+	const DETECT_MIME_TRUE = 1;            //检测MimeType

+	const DETECT_MIME_NONE = 0;            //不检测MimeType

+	const INSERT_ONLY_TRUE = 1;            //文件上传不可覆盖

+	const INSERT_ONLY_NONE = 0;            //文件上传可覆盖

 

-    const MIN_OBJ_SIZE = 102400;        //1024*100;

-    const HTTP_TIMEOUT = 30;            //http的超时时间：30s

-    const HTTP_RETRY = 1;                //http失败后重试：1

+	const MIN_OBJ_SIZE = 102400;        //1024*100;

+	const HTTP_TIMEOUT = 30;            //http的超时时间：30s

+	const HTTP_RETRY = 1;                //http失败后重试：1

 

-    const BLOCK_MIN_SIZE = 102400;        //文件分片最小值：1024*100; 100K

-    const BLOCK_DEFF_SIZE = 2097152;    //文件分片默认值：1024*1024*2; 2M

-    const BLOCK_MAX_SIZE = 10485760;    //文件分片最大值：1024*1024*10; 10M

+	const BLOCK_MIN_SIZE = 102400;        //文件分片最小值：1024*100; 100K

+	const BLOCK_DEFF_SIZE = 2097152;    //文件分片默认值：1024*1024*2; 2M

+	const BLOCK_MAX_SIZE = 10485760;    //文件分片最大值：1024*1024*10; 10M

 

-    const CURL_ERR_LOG = "curl_error.log";    //curl请求时的错误日志信息

+	const CURL_ERR_LOG = "curl_error.log";    //curl请求时的错误日志信息

 

-    const RUN_LEVEL_RELEASE = 1;        //release级别

-    const RUN_LEVEL_DEBUG = 2;            //debug级别

+	const RUN_LEVEL_RELEASE = 1;        //release级别

+	const RUN_LEVEL_DEBUG = 2;            //debug级别

 }

Spacing +18 added lines, -18 removed lines

@@ -6,11 +6,11 @@ 
     const CHARSET = "UTF-8";

     const SDK_VERSION = '2.0.3';

 

-    const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com";        //文件上传的地址

-    const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com";            //服务管理的地址

-    const MANAGE_API_VERSION = "3.0";        //资源管理接口版本

-    const SCAN_PORN_VERSION = "3.1";        //黄图扫描接口版本

-    const MEDIA_ENCODE_VERSION = "3.0";        //媒体转码接口版本

+    const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com"; //文件上传的地址

+    const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com"; //服务管理的地址

+    const MANAGE_API_VERSION = "3.0"; //资源管理接口版本

+    const SCAN_PORN_VERSION = "3.1"; //黄图扫描接口版本

+    const MEDIA_ENCODE_VERSION = "3.0"; //媒体转码接口版本

 

     const UPLOAD_API_UPLOAD = "/api/proxy/upload";

     const UPLOAD_API_BLOCK_INIT = "/api/proxy/blockInit";

@@ -21,21 +21,21 @@ 
     const TYPE_TOP = "TOP";

     const TYPE_CLOUD = "CLOUD";

 

-    const DETECT_MIME_TRUE = 1;            //检测MimeType

-    const DETECT_MIME_NONE = 0;            //不检测MimeType

-    const INSERT_ONLY_TRUE = 1;            //文件上传不可覆盖

-    const INSERT_ONLY_NONE = 0;            //文件上传可覆盖

+    const DETECT_MIME_TRUE = 1; //检测MimeType

+    const DETECT_MIME_NONE = 0; //不检测MimeType

+    const INSERT_ONLY_TRUE = 1; //文件上传不可覆盖

+    const INSERT_ONLY_NONE = 0; //文件上传可覆盖

 

-    const MIN_OBJ_SIZE = 102400;        //1024*100;

-    const HTTP_TIMEOUT = 30;            //http的超时时间：30s

-    const HTTP_RETRY = 1;                //http失败后重试：1

+    const MIN_OBJ_SIZE = 102400; //1024*100;

+    const HTTP_TIMEOUT = 30; //http的超时时间：30s

+    const HTTP_RETRY = 1; //http失败后重试：1

 

-    const BLOCK_MIN_SIZE = 102400;        //文件分片最小值：1024*100; 100K

-    const BLOCK_DEFF_SIZE = 2097152;    //文件分片默认值：1024*1024*2; 2M

-    const BLOCK_MAX_SIZE = 10485760;    //文件分片最大值：1024*1024*10; 10M

+    const BLOCK_MIN_SIZE = 102400; //文件分片最小值：1024*100; 100K

+    const BLOCK_DEFF_SIZE = 2097152; //文件分片默认值：1024*1024*2; 2M

+    const BLOCK_MAX_SIZE = 10485760; //文件分片最大值：1024*1024*10; 10M

 

-    const CURL_ERR_LOG = "curl_error.log";    //curl请求时的错误日志信息

+    const CURL_ERR_LOG = "curl_error.log"; //curl请求时的错误日志信息

 

-    const RUN_LEVEL_RELEASE = 1;        //release级别

-    const RUN_LEVEL_DEBUG = 2;            //debug级别

+    const RUN_LEVEL_RELEASE = 1; //release级别

+    const RUN_LEVEL_DEBUG = 2; //debug级别

 }