xiaohuilam / laravel-flysystem-wantu

sdk/AlibabaImage.php

Spacing +1 added lines, -1 removed lines

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

sdk/Core/UploadClient.php

Spacing +51 added lines, -51 removed lines

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

sdk/Core/ManageClient.php

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

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/MediaEncodeOption.php

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

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请求体所需的参数*/

sdk/Utils/MediaResOption.php

Spacing +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
 /**多媒体操作的输入输出资源信息。视频截图和视频转码都继承该类*/
 abstract class MediaResOption
 {
-    private $input;                  //输入的资源
-    private $output;                 //输出的资源
+    private $input; //输入的资源
+    private $output; //输出的资源
     /**设置输入的文件。*/
     public function setInputResource($namespace = null, $dir = null, $name = null)
     {

sdk/Utils/UpOptionType.php

Spacing +5 added lines, -5 removed lines

@@ -9,9 +9,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类型
 }