v1.3.2:Increase language parameter & modify watermark annotation.

Author: pjy

src/Client/CPDFClient.php

@@ -89,11 +89,17 @@ public function getAuthorization(){
 
     /**
      * @param $fileKey
+     * @param null $language 1:English, 2:Chinese
      * @return mixed
      * @throws CPDFException
      */
-    public function getFileInfoByKey($fileKey){
-        return $this->httpClient->send(CPDFURL::HTTP_METHOD_GET, CPDFURL::API_V1_FILE_INFO, $this->getAuthorization(), ['fileKey'=>$fileKey]);
+    public function getFileInfoByKey($fileKey, $language = null){
+        $options = ['fileKey'=>$fileKey];
+        if($language){
+            $options['language'] = $language;
+        }
+
+        return $this->httpClient->send(CPDFURL::HTTP_METHOD_GET, CPDFURL::API_V1_FILE_INFO, $this->getAuthorization(), $options);
     }
 
     /**
@@ -118,13 +124,20 @@ public function getTaskList($page, $size){
 
     /**
      * @param $executeType
+     * @param int $language 1:English, 2:Chinese
      * @return CPDFClient
      * @throws CPDFException
      */
-    public function createTask($executeType){
+    public function createTask($executeType, $language = null){
         $url = str_replace('{executeTypeUrl}', $executeType, CPDFURL::API_V1_CREATE_TASK);
 
-        $result = $this->httpClient->send(CPDFURL::HTTP_METHOD_GET, $url, $this->getAuthorization());
+        $options = [];
+
+        if($language){
+            $options['language'] = $language;
+        }
+
+        $result = $this->httpClient->send(CPDFURL::HTTP_METHOD_GET, $url, $this->getAuthorization(), $options);
         $taskId = $result['taskId'];
 
         $this->taskResource = new CPDFTaskResource($taskId);
@@ -148,10 +161,11 @@ public function addFile($filepath){
      * @param $filePath
      * @param null $password
      * @param array $params
+     * @param int $language
      * @return mixed
      * @throws CPDFException
      */
-    public function uploadFile($taskId, $filePath, $password = null, $params = []){
+    public function uploadFile($taskId, $filePath, $password = null, $params = [], $language = null){
         if(!file_exists($filePath)){
             throw new CPDFException('uploadFile', 'File does not exist.');
         }
@@ -193,25 +207,43 @@ public function uploadFile($taskId, $filePath, $password = null, $params = []){
             $options['multipart'][] = ['name' => 'parameter', 'contents' => json_encode($params)];
         }
 
+        if($language){
+            $options['multipart'][] = ['name' => 'language', 'contents' => $language];
+        }
+
         return $this->httpClient->send(CPDFURL::HTTP_METHOD_POST, CPDFURL::API_V1_UPLOAD_FILE, $this->getAuthorization(), $options);
     }
 
     /**
      * @param $taskId
+     * @param null $language 1:English, 2:Chinese
      * @return CPDFClient
      * @throws CPDFException
      */
-    public function executeTask($taskId){
-        $this->httpClient->send(CPDFURL::HTTP_METHOD_GET, CPDFURL::API_V1_EXECUTE_TASK, $this->getAuthorization(), ['taskId'=>$taskId]);
+    public function executeTask($taskId, $language = null){
+        $options = ['taskId' => $taskId];
+
+        if($language){
+            $options['language'] = $language;
+        }
+
+        $this->httpClient->send(CPDFURL::HTTP_METHOD_GET, CPDFURL::API_V1_EXECUTE_TASK, $this->getAuthorization(), $options);
         return $this;
     }
 
     /**
      * @param $taskId
+     * @param null $language 1:English, 2:Chinese
      * @return mixed
      * @throws CPDFException
      */
-    public function getTaskInfo($taskId){
-        return $this->httpClient->send(CPDFURL::HTTP_METHOD_GET, CPDFURL::API_V1_TASK_INFO, $this->getAuthorization(), ['taskId'=>$taskId]);
+    public function getTaskInfo($taskId, $language = null){
+        $options = ['taskId' => $taskId];
+
+        if($language){
+            $options['language'] = $language;
+        }
+
+        return $this->httpClient->send(CPDFURL::HTTP_METHOD_GET, CPDFURL::API_V1_TASK_INFO, $this->getAuthorization(), $options);
     }
 }

src/Client/CPDFHttpClient.php

@@ -34,12 +34,14 @@ public function send($method, $url, $headers = [], $options = []){
         if(!empty($options)){
             if(isset($options['multipart'])){
                 $body['multipart'] = $options['multipart'];
-            }elseif($method == CPDFURL::HTTP_METHOD_POST){
-                $body['headers']['Content-Type'] = 'application/json';
-                $body['json'] = $options;
-            }elseif($method == CPDFURL::HTTP_METHOD_GET){
-                $body['headers']['Content-Type'] = 'application/json';
-                $body['query'] = $options;
+            }else{
+                if($method == CPDFURL::HTTP_METHOD_POST){
+                    $body['headers']['Content-Type'] = 'application/json';
+                    $body['json'] = $options;
+                }elseif($method == CPDFURL::HTTP_METHOD_GET){
+                    $body['headers']['Content-Type'] = 'application/json';
+                    $body['query'] = $options;
+                }
             }
         }
 

src/Constant/CPDFLanguage.php

@@ -0,0 +1,11 @@
+<?php
+
+
+namespace ComPDFKit\Constant;
+
+
+class CPDFLanguage
+{
+    const ENGLISH = 1;
+    const CHINESE = 2;
+}

src/Resource/CPDFFileResource.php

@@ -144,7 +144,10 @@ public function setTextColor($textColor){
     }
 
     /**
-     * @param string $front Is it at the front
+     * @param string $front  Setting watermark layer
+     * "0" false: No need to pin it to the top
+     * "1" true: Pin it to the top
+     * null  No need to pin it to the top
      * @return $this
      */
     public function setFront($front){
@@ -345,11 +348,12 @@ public function setImgDpi($imgDpi){
     /**
      * @param $taskId
      * @param null $password
+     * @param null $language 1:English, 2:Chinese
      * @return CPDFClient
      * @throws CPDFException
      */
-    public function uploadFile($taskId, $password = null){
-        $fileInfo = $this->client->uploadFile($taskId, $this->filepath, $password, $this->options);
+    public function uploadFile($taskId, $password = null, $language = null){
+        $fileInfo = $this->client->uploadFile($taskId, $this->filepath, $password, $this->options, $language);
         $this->fileKey = $fileInfo['fileKey'];
         $this->fileUrl = $fileInfo['fileUrl'];