GC0202 / ThinkLibrary

src/service/ksyun/bin/unit/Test.php

Indentation +234 added lines, -234 removed lines

@@ -7,138 +7,138 @@ 
 require_once "PUnit.php";
 require_once "../lib/RequestCore.class.php";
 class SDKTest extends PUnit{
-	protected $bucket = "php-sdk-test";
-	protected $key = "test==中/文？";
-	protected $key_copy = "test中/文_copy？";
-	protected $accesskey = "";
-	protected $secrectkey = "";
-	protected $client;
+    protected $bucket = "php-sdk-test";
+    protected $key = "test==中/文？";
+    protected $key_copy = "test中/文_copy？";
+    protected $accesskey = "";
+    protected $secrectkey = "";
+    protected $client;
     protected $encryptionClient;
-	protected $cachedir;
+    protected $cachedir;
     protected $sseckey;
-	public function __construct(){
-		$this->client=new Ks3Client($this->accesskey,$this->secrectkey);
-		$this->cachedir=KS3_API_PATH.DIRECTORY_SEPARATOR."unit".DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR;
+    public function __construct(){
+        $this->client=new Ks3Client($this->accesskey,$this->secrectkey);
+        $this->cachedir=KS3_API_PATH.DIRECTORY_SEPARATOR."unit".DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR;
         $filename = "secret.key";
         $handle = fopen($filename, "r");
         $sseckey = fread($handle, filesize ($filename));
         fclose($handle);
         $this->sseckey = $sseckey;
         $this->encryptionClient = new Ks3EncryptionClient($this->accesskey,$this->secrectkey,$sseckey);
-	}
-	public function before(){
-		if($this->client->bucketExists(array("Bucket"=>$this->bucket))){
-			$keys = array();
-			$objects = $this->client->listObjects(array("Bucket"=>$this->bucket));
-			foreach ($objects["Contents"] as $object) {
-				array_push($keys, $object["Key"]);
-			}
-			$this->client->deleteObjects(array("Bucket"=>$this->bucket,"DeleteKeys"=>$keys));
-		}else{
-			$this->client->createBucket(array("Bucket"=>$this->bucket));
-		}
-	}
-	public function testListBuckets(){
-		$buckets = $this->client->listBuckets();
-		$found = FALSE;
-		foreach ($buckets as $bucket) {
-			if($bucket["Name"] == $this->bucket)
-				$found = TRUE;
-		}
-		if(!$found)
-			throw new Exception("list buckets expected found ".$this->bucket.",but not found");
+    }
+    public function before(){
+        if($this->client->bucketExists(array("Bucket"=>$this->bucket))){
+            $keys = array();
+            $objects = $this->client->listObjects(array("Bucket"=>$this->bucket));
+            foreach ($objects["Contents"] as $object) {
+                array_push($keys, $object["Key"]);
+            }
+            $this->client->deleteObjects(array("Bucket"=>$this->bucket,"DeleteKeys"=>$keys));
+        }else{
+            $this->client->createBucket(array("Bucket"=>$this->bucket));
+        }
+    }
+    public function testListBuckets(){
+        $buckets = $this->client->listBuckets();
+        $found = FALSE;
+        foreach ($buckets as $bucket) {
+            if($bucket["Name"] == $this->bucket)
+                $found = TRUE;
+        }
+        if(!$found)
+            throw new Exception("list buckets expected found ".$this->bucket.",but not found");
 			
-	}
-	public function testDeleteBucket(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>"test","Content"=>""));
-		$ex = NULL;
-		try{
-			$this->client->deleteBucket(array("Bucket"=>$this->bucket));
-		}catch(Exception $e){
-			$ex = $e;
-		}
-		if($ex == NULL||!($ex->errorCode === "BucketNotEmpty")){
-			throw new Exception("delete bucket expected BucketNotEmpty but ".$ex);
-		}
-	}
-	public function testBucketCORS(){
-		$this->client->setBucketCORS($args = array(
-       		"Bucket"=>$this->bucket,
-        	"CORS"=>array(
-        		array(
-           			"AllowedMethod"=>array("GET","PUT"),
-            		"AllowedOrigin"=>array("http://www.kingsoft.com"),
-            		"AllowedHeader"=>array("*"),
-            		"ExposeHeader"=>array("*"),
-            		"MaxAgeSeconds"=>10
-        		),
-        		array(
-         		  "AllowedMethod"=>array("GET","PUT"),
-          		  "AllowedOrigin"=>array("*"),
-          		  "AllowedHeader"=>array("*"),
-          		  "ExposeHeader"=>array("*"),
-          		  "MaxAgeSeconds"=>10
-        		)
-    		)));
- 	    $cors = $this->client->getBucketCORS(array("Bucket"=>$this->bucket));
- 	    $this->assertEquals(count($cors),2,"bucket cors count ");
-   		$this->client->deleteBucketCORS(array("Bucket"=>$this->bucket));
-   		$cors = $this->client->getBucketCORS(array("Bucket"=>$this->bucket));
-		$this->assertEquals(count($cors),0,"bucket cors count ");
-	}
-	public function testCreateBucket(){
-		$ex = NULL;
-		try{
-			$this->client->createBucket(array("Bucket"=>$this->bucket));
-		}catch(Exception $e){
-			$ex = $e;
-		}
-		if($ex == NULL||!($ex->errorCode === "BucketAlreadyExists")){
-			throw new Exception("create bucket expected BucketAlreadyExists but ".$ex);
-		}
-	}
-	public function testACL(){
-		$this->client->setBucketAcl(array("Bucket"=>$this->bucket,"ACL"=>"public-read"));
-		$acl = $this->client->getBucketAcl(array("Bucket"=>$this->bucket));
-		$this->assertEquals($acl,"public-read","bucket acl");
-	}
-	public function testBucketLogging(){
-		$this->client->setBucketLogging(array(
-        	"Bucket"=>$this->bucket,
-        	"BucketLogging"=>array(
-            	"Enable"=>TRUE,
-            	"TargetBucket"=>$this->bucket,
-            	"TargetPrefix"=>"X-KSS"
+    }
+    public function testDeleteBucket(){
+        $this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>"test","Content"=>""));
+        $ex = NULL;
+        try{
+            $this->client->deleteBucket(array("Bucket"=>$this->bucket));
+        }catch(Exception $e){
+            $ex = $e;
+        }
+        if($ex == NULL||!($ex->errorCode === "BucketNotEmpty")){
+            throw new Exception("delete bucket expected BucketNotEmpty but ".$ex);
+        }
+    }
+    public function testBucketCORS(){
+        $this->client->setBucketCORS($args = array(
+                "Bucket"=>$this->bucket,
+            "CORS"=>array(
+                array(
+                        "AllowedMethod"=>array("GET","PUT"),
+                    "AllowedOrigin"=>array("http://www.kingsoft.com"),
+                    "AllowedHeader"=>array("*"),
+                    "ExposeHeader"=>array("*"),
+                    "MaxAgeSeconds"=>10
+                ),
+                array(
+                    "AllowedMethod"=>array("GET","PUT"),
+                    "AllowedOrigin"=>array("*"),
+                    "AllowedHeader"=>array("*"),
+                    "ExposeHeader"=>array("*"),
+                    "MaxAgeSeconds"=>10
+                )
+            )));
+            $cors = $this->client->getBucketCORS(array("Bucket"=>$this->bucket));
+            $this->assertEquals(count($cors),2,"bucket cors count ");
+            $this->client->deleteBucketCORS(array("Bucket"=>$this->bucket));
+            $cors = $this->client->getBucketCORS(array("Bucket"=>$this->bucket));
+        $this->assertEquals(count($cors),0,"bucket cors count ");
+    }
+    public function testCreateBucket(){
+        $ex = NULL;
+        try{
+            $this->client->createBucket(array("Bucket"=>$this->bucket));
+        }catch(Exception $e){
+            $ex = $e;
+        }
+        if($ex == NULL||!($ex->errorCode === "BucketAlreadyExists")){
+            throw new Exception("create bucket expected BucketAlreadyExists but ".$ex);
+        }
+    }
+    public function testACL(){
+        $this->client->setBucketAcl(array("Bucket"=>$this->bucket,"ACL"=>"public-read"));
+        $acl = $this->client->getBucketAcl(array("Bucket"=>$this->bucket));
+        $this->assertEquals($acl,"public-read","bucket acl");
+    }
+    public function testBucketLogging(){
+        $this->client->setBucketLogging(array(
+            "Bucket"=>$this->bucket,
+            "BucketLogging"=>array(
+                "Enable"=>TRUE,
+                "TargetBucket"=>$this->bucket,
+                "TargetPrefix"=>"X-KSS"
             )
         ));
-    	$logging = $this->client->getBucketLogging(array("Bucket"=>$this->bucket));
-    	$this->assertEquals($logging["Enable"],TRUE,"bucket logging enable");
+        $logging = $this->client->getBucketLogging(array("Bucket"=>$this->bucket));
+        $this->assertEquals($logging["Enable"],TRUE,"bucket logging enable");
 
-    	$this->client->setBucketLogging(array(
-    		"Bucket"=>$this->bucket,
-    		"BucketLogging"=>array(
-        		"Enable"=>FALSE,//是否开启
-        	)
-    	));
-    	$logging = $this->client->getBucketLogging(array("Bucket"=>$this->bucket));
-    	$this->assertEquals($logging["Enable"],FALSE,"bucket logging enable");
-	}
-	public function testBucketLocation(){
-		$location = $this->client->getBucketLocation(array("Bucket"=>$this->bucket));
-		$this->assertEquals($location,"HANGZHOU","bucket location ");
-	}
-	public function testPutObjectByContentAndGetObjectContent(){
-		$args = array(
-        	"Bucket"=>$this->bucket,
-        	"Key"=>$this->key,
-        	"Content"=>"1234",//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
-        	"ObjectMeta"=>array(
-            	"Content-Type"=>"application/xml",
-            	"Content-Length"=>3
+        $this->client->setBucketLogging(array(
+            "Bucket"=>$this->bucket,
+            "BucketLogging"=>array(
+                "Enable"=>FALSE,//是否开启
+            )
+        ));
+        $logging = $this->client->getBucketLogging(array("Bucket"=>$this->bucket));
+        $this->assertEquals($logging["Enable"],FALSE,"bucket logging enable");
+    }
+    public function testBucketLocation(){
+        $location = $this->client->getBucketLocation(array("Bucket"=>$this->bucket));
+        $this->assertEquals($location,"HANGZHOU","bucket location ");
+    }
+    public function testPutObjectByContentAndGetObjectContent(){
+        $args = array(
+            "Bucket"=>$this->bucket,
+            "Key"=>$this->key,
+            "Content"=>"1234",//要上传的内容
+            "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+            "ObjectMeta"=>array(
+                "Content-Type"=>"application/xml",
+                "Content-Length"=>3
             ),
-        	"UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
-            	"x-kss-meta-test"=>"test"
+            "UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
+                "x-kss-meta-test"=>"test"
             )
         );
         $this->client->putObjectByContent($args);
@@ -156,21 +156,21 @@ 
         $this->assertEquals($meta["ObjectMeta"]["Content-Type"],"application/xml","Content-Type");
         $this->assertEquals($meta["ObjectMeta"]["Content-Length"],3,"Content-Length");
 
-	}
-	public function testPutObjectByFile(){
-		$args = array(
-        	"Bucket"=>$this->bucket,
-        	"Key"=>$this->key,
-        	"Content"=>array(
-        		"content"=>$this->cachedir."test_file"
-        	),//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
-        	"ObjectMeta"=>array(
-            	"Content-Type"=>"application/xml",
-            	"Content-Length"=>100
+    }
+    public function testPutObjectByFile(){
+        $args = array(
+            "Bucket"=>$this->bucket,
+            "Key"=>$this->key,
+            "Content"=>array(
+                "content"=>$this->cachedir."test_file"
+            ),//要上传的内容
+            "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+            "ObjectMeta"=>array(
+                "Content-Type"=>"application/xml",
+                "Content-Length"=>100
             ),
-        	"UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
-            	"x-kss-meta-test"=>"test"
+            "UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
+                "x-kss-meta-test"=>"test"
             )
         );
         $this->client->putObjectByFile($args);
@@ -180,47 +180,47 @@ 
         $this->assertEquals($meta["ObjectMeta"]["Content-Type"],"application/xml","Content-Type");
         $this->assertEquals($meta["ObjectMeta"]["Content-Length"],100,"Content-Length");
         $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"public-read","object acl ");
-	}
-	public function testObjectAcl(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
+    }
+    public function testObjectAcl(){
+        $this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
 "Content"=>"1234","ACL"=>"private"));
-		$this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"private","object acl");
-		$this->client->setObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key,"ACL"=>"public-read"));
-		$this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"public-read","object acl");
-	}
-	public function testDeleteObject(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
+        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"private","object acl");
+        $this->client->setObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key,"ACL"=>"public-read"));
+        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"public-read","object acl");
+    }
+    public function testDeleteObject(){
+        $this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
 "Content"=>"1234"));
-		$this->client->deleteObject(array("Bucket"=>$this->bucket,"Key"=>$this->key));
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),FALSE,"object exits");
-	}
-	public function testDeleteObjects(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
+        $this->client->deleteObject(array("Bucket"=>$this->bucket,"Key"=>$this->key));
+        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),FALSE,"object exits");
+    }
+    public function testDeleteObjects(){
+        $this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
 "Content"=>"1234"));
-		$this->client->deleteObjects(array("Bucket"=>$this->bucket,"DeleteKeys"=>array($this->key)));
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),FALSE,"object exits");		
-	}
-	public function testCopyObject(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
+        $this->client->deleteObjects(array("Bucket"=>$this->bucket,"DeleteKeys"=>array($this->key)));
+        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),FALSE,"object exits");		
+    }
+    public function testCopyObject(){
+        $this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
 "Content"=>"1234"));
-		$this->client->copyObject(array("Bucket"=>$this->bucket,"Key"=>$this->key_copy,"CopySource"=>array("Bucket"=>$this->bucket,"Key"=>$this->key)));
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),TRUE,"object exits");
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key_copy)),TRUE
-			,"object exits");
-	}
-	public function testPutAndGetObject(){
-		$args = array(
-        	"Bucket"=>$this->bucket,
-        	"Key"=>$this->key,
-        	"Content"=>array(
-        		"content"=>$this->cachedir."test_file"
-        	),//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
-        	"ObjectMeta"=>array(
-            	"Content-Type"=>"application/xml",
+        $this->client->copyObject(array("Bucket"=>$this->bucket,"Key"=>$this->key_copy,"CopySource"=>array("Bucket"=>$this->bucket,"Key"=>$this->key)));
+        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),TRUE,"object exits");
+        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key_copy)),TRUE
+            ,"object exits");
+    }
+    public function testPutAndGetObject(){
+        $args = array(
+            "Bucket"=>$this->bucket,
+            "Key"=>$this->key,
+            "Content"=>array(
+                "content"=>$this->cachedir."test_file"
+            ),//要上传的内容
+            "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+            "ObjectMeta"=>array(
+                "Content-Type"=>"application/xml",
             ),
-        	"UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
-            	"x-kss-meta-test"=>"test"
+            "UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
+                "x-kss-meta-test"=>"test"
             )
         );
         $this->client->putObjectByFile($args);
@@ -229,49 +229,49 @@ 
         $md5pre = md5_file($this->cachedir."test_file");
         @unlink($this->cachedir."down");
         $this->assertEquals($md5,$md5pre,"contentmd5");
-	}
-	public function testPutAndGetObjectRanges(){
-		$args = array(
-        	"Bucket"=>$this->bucket,
-        	"Key"=>$this->key,
-        	"Content"=>array(
-        		"content"=>$this->cachedir."test_file"
-        	),//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
-        	"ObjectMeta"=>array(
-            	"Content-Type"=>"application/xml",
+    }
+    public function testPutAndGetObjectRanges(){
+        $args = array(
+            "Bucket"=>$this->bucket,
+            "Key"=>$this->key,
+            "Content"=>array(
+                "content"=>$this->cachedir."test_file"
+            ),//要上传的内容
+            "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+            "ObjectMeta"=>array(
+                "Content-Type"=>"application/xml",
             ),
-        	"UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
-            	"x-kss-meta-test"=>"test"
+            "UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
+                "x-kss-meta-test"=>"test"
             )
         );
         $this->client->putObjectByFile($args);
         rangeGetAndCheckMd5($this->client,$this->bucket,$this->key,$this->cachedir."down",md5_file($this->cachedir."test_file"));
-	}
-	public function testInitAndAbortMultipart(){
-		$initResult = $this->client->initMultipartUpload(array("Bucket"=>$this->bucket,"Key"=>$this->key));
-		$uid = $initResult["UploadId"];
-		$listParts = $this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
-		$this->client->abortMultipartUpload(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
-		$ex = NULL;
-		try{
-			$this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
-		}catch(Exception $e){
-			$ex = $e;
-		}
-		if($ex == NULL||!($ex->errorCode === "NoSuchUpload")){
-			throw new Exception("create bucket expected NoSuchUpload but ".$ex);
-		}
-	}
-	public function testMultipartUpload(){
-		generateFile(1024*1024,$this->cachedir."multi");
-		//初始化分开上传，获取uploadid
+    }
+    public function testInitAndAbortMultipart(){
+        $initResult = $this->client->initMultipartUpload(array("Bucket"=>$this->bucket,"Key"=>$this->key));
+        $uid = $initResult["UploadId"];
+        $listParts = $this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
+        $this->client->abortMultipartUpload(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
+        $ex = NULL;
+        try{
+            $this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
+        }catch(Exception $e){
+            $ex = $e;
+        }
+        if($ex == NULL||!($ex->errorCode === "NoSuchUpload")){
+            throw new Exception("create bucket expected NoSuchUpload but ".$ex);
+        }
+    }
+    public function testMultipartUpload(){
+        generateFile(1024*1024,$this->cachedir."multi");
+        //初始化分开上传，获取uploadid
         $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "ACL"=>"public-read",
             "UserMeta"=>array(
-            	"x-kss-meta-test"=>"example"
+                "x-kss-meta-test"=>"example"
             ),
         "ObjectMeta"=>array(
             "Content-Type"=>"application/xml"
@@ -323,21 +323,21 @@ 
         $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"],"example","x-kss-meta-test");
         rangeGetAndCheckMd5($this->client,$this->bucket,$this->key,$this->cachedir."down",md5_file($this->cachedir."multi"));
         @unlink($this->cachedir."multi");
-	}
-	public function testListBucketsPresignedUrl(){
-		$url = $this->client->generatePresignedUrl(
-			array(
-				"Method"=>"GET",
-				"Options"=>array("Expires"=>60*10),
-				"Headers"=>array("Content-Type"=>"text/plain")
-				));
-		$httpRequest = new RequestCore($url);
-		$httpRequest->set_method("GET");
+    }
+    public function testListBucketsPresignedUrl(){
+        $url = $this->client->generatePresignedUrl(
+            array(
+                "Method"=>"GET",
+                "Options"=>array("Expires"=>60*10),
+                "Headers"=>array("Content-Type"=>"text/plain")
+                ));
+        $httpRequest = new RequestCore($url);
+        $httpRequest->set_method("GET");
         $httpRequest->add_header("Content-Type","text/plain");
-		$httpRequest->send_request();
-		$body = $httpRequest->get_response_body ();	
-		$this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"list buckets status code");
-	}
+        $httpRequest->send_request();
+        $body = $httpRequest->get_response_body ();	
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"list buckets status code");
+    }
     public function testHeadBucketPresignedUrl(){
         $url = $this->client->generatePresignedUrl(
             array(
@@ -618,16 +618,16 @@ 
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Content"=>"12345",//要上传的内容
-             "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
-             "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
+                "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+                "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
                 "Content-Type"=>"binay/ocet-stream"
             ),
             "UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
-              "x-kss-meta-test"=>"test"
+                "x-kss-meta-test"=>"test"
             ),
             "SSE"=>array(
                 "Algm"=>"AES256"//暂时支持AES256
-             )
+                )
         );
         $result = $this->client->putObjectByContent($args);
         $this->assertEquals($result["SSEAlgm"],"AES256");
@@ -645,16 +645,16 @@ 
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Content"=>"12345",//要上传的内容
-             "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
-             "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
+                "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+                "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
                 "Content-Type"=>"binay/ocet-stream"
             ),
             "UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
-              "x-kss-meta-test"=>"test"
+                "x-kss-meta-test"=>"test"
             ),
             "SSEC"=>array(
                 "Key"=>$this->sseckey
-             )
+                )
         );
         $result = $this->client->putObjectByContent($args);
         $this->assertEquals($result["SSECAlgm"],"AES256");
@@ -665,7 +665,7 @@ 
             "Key"=>$this->key,
             "SSEC"=>array(
                 "Key"=>$this->sseckey
-             )
+                )
             );
         $result = $this->client->getObjectMeta($args);
         $this->assertEquals($result["ObjectMeta"]["SSECAlgm"],"AES256");
@@ -677,7 +677,7 @@ 
             "WriteTo"=>$this->cachedir."down", //文件保存路径,必须提供。可以是resource
             "SSEC"=>array(
                 "Key"=>$this->sseckey
-             )
+                )
         );
         $this->client->getObject($args);
         $this->assertEquals("12345",file_get_contents($this->cachedir."down"));
@@ -779,16 +779,16 @@ 
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Content"=>"12345",//要上传的内容
-             "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
-             "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
+                "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+                "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
                 "Content-Type"=>"binay/ocet-stream"
             ),
             "UserMeta"=>array(//可以设置object的用户元数据，需要以x-kss-meta-开头
-              "x-kss-meta-test"=>"test"
+                "x-kss-meta-test"=>"test"
             ),
             "SSEC"=>array(
                 "Key"=>$this->sseckey
-             )
+                )
         );
         $result = $this->client->putObjectByContent($args);
 
@@ -799,10 +799,10 @@ 
                 "Bucket"=>$this->bucket,
                 "Key"=>$this->key
                 ),
-             "SSECSource"=>array(
+                "SSECSource"=>array(
                 "Key"=>$this->sseckey
                 ),
-             "SSEC"=>array(
+                "SSEC"=>array(
                 "Key"=>$this->sseckey
                 )
             );
@@ -821,7 +821,7 @@ 
             );
             $this->encryptionClient->putObjectByContent($args);
             rangeGetAndCheckMd5($this->encryptionClient,$this->bucket,$this->key,
-               $this->cachedir."down",md5($args["Content"]));
+                $this->cachedir."down",md5($args["Content"]));
         }
     }
     public function testPutObjectByFileAndGetObjectUsingEncyptionMeta(){
@@ -835,7 +835,7 @@ 
         );
         $this->encryptionClient->putObjectByFile($args);
         rangeGetAndCheckMd5($this->encryptionClient,$this->bucket,$this->key,
-               $this->cachedir."down",md5_file($this->cachedir."test_file"));
+                $this->cachedir."down",md5_file($this->cachedir."test_file"));
     }
     public function testMultipartUploadUsingEncyptionMeta(){
         generateFile(1024*1024,$this->cachedir."multi");

src/service/ksyun/bin/unit/TestUtil.php

Indentation +44 added lines, -44 removed lines

@@ -1,53 +1,53 @@
 <?php
 function rangeGetAndCheckMd5($client,$bucket,$key,$file,$expectedMd5){
-	$args = array("Bucket"=>$bucket,"Key"=>$key);
-	$meta = $client->getObjectMeta($args);
-	$contentlength = $meta["ObjectMeta"]["Content-Length"];
+    $args = array("Bucket"=>$bucket,"Key"=>$key);
+    $meta = $client->getObjectMeta($args);
+    $contentlength = $meta["ObjectMeta"]["Content-Length"];
 
-	$filelist = array();
+    $filelist = array();
 
-	for($begin = 0;$begin <$contentlength;){
-		$index = rand((int)($contentlength/20),(int)($contentlength/4));
-		$range = array("start"=>$begin,"end"=>$begin+$index);
-		$destFile = $file.$begin."-".($begin+$index);
-		array_push($filelist,$destFile);
-		$begin += ($index+1);
-		$args = array(
-			"Bucket"=>$bucket,
-			"Key"=>$key,
-			"Range"=>$range,
-			"WriteTo"=>$destFile
-		);
-		$client->getObject($args);
-	}
+    for($begin = 0;$begin <$contentlength;){
+        $index = rand((int)($contentlength/20),(int)($contentlength/4));
+        $range = array("start"=>$begin,"end"=>$begin+$index);
+        $destFile = $file.$begin."-".($begin+$index);
+        array_push($filelist,$destFile);
+        $begin += ($index+1);
+        $args = array(
+            "Bucket"=>$bucket,
+            "Key"=>$key,
+            "Range"=>$range,
+            "WriteTo"=>$destFile
+        );
+        $client->getObject($args);
+    }
 
-	foreach ($filelist as $key => $value) {
-		$handle = fopen($value,"r");
-		$size = filesize($value);
-		if($size > 0){
-			$content = fread($handle,$size);
-			file_put_contents($file,$content,FILE_APPEND);
-		}
-		fclose($handle);
-		//@unlink($value);
-	}
-	$md5 = md5_file($file);
-	//@unlink($file);	
-	if($md5 != $expectedMd5)
-		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
-	foreach ($filelist as $key => $value) {
-		@unlink($value);
-	}
-	@unlink($file);
+    foreach ($filelist as $key => $value) {
+        $handle = fopen($value,"r");
+        $size = filesize($value);
+        if($size > 0){
+            $content = fread($handle,$size);
+            file_put_contents($file,$content,FILE_APPEND);
+        }
+        fclose($handle);
+        //@unlink($value);
+    }
+    $md5 = md5_file($file);
+    //@unlink($file);	
+    if($md5 != $expectedMd5)
+        throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
+    foreach ($filelist as $key => $value) {
+        @unlink($value);
+    }
+    @unlink($file);
 }
 function generateFile($sizeInBytes,$destFile){
-	for($i = 0;$i < $sizeInBytes/10;$i++){
-		$randpwd = "";  
-		for ($j = 0; $j < 10; $j++)  
-		{  
-			$randpwd .= chr(mt_rand(33, 126));  
-		}  
-		file_put_contents($destFile,$randpwd,FILE_APPEND);
-	}
+    for($i = 0;$i < $sizeInBytes/10;$i++){
+        $randpwd = "";  
+        for ($j = 0; $j < 10; $j++)  
+        {  
+            $randpwd .= chr(mt_rand(33, 126));  
+        }  
+        file_put_contents($destFile,$randpwd,FILE_APPEND);
+    }
 }
 ?>
\ No newline at end of file

src/service/ksyun/bin/unit/PUnit.php

Indentation +40 added lines, -40 removed lines

@@ -1,60 +1,60 @@
 <?php
 require_once "../core/Logger.php";
 class PUnit{
-	function assertEquals($value,$expected,$info = NULL){
-		if($value != $expected){
-			throw new Exception($info." expected ".$expected." but ".$value);
-		}
-	}
-	function run($torun = NULL){
-   		$r = new ReflectionClass($this);
-    	foreach($r->getMethods() as $key=>$methodObj){
-      	  if($methodObj->isPrivate())
-           		 $methods[$key]['type'] = 'private';
-        	elseif($methodObj->isProtected())
-        	     $methods[$key]['type'] = 'protected';
-      		else
-           		 $methods[$key]['type'] = 'public';
-        	$methods[$key]['name'] = $methodObj->name;
-       		$methods[$key]['class'] = $methodObj->class;
-       	}
+    function assertEquals($value,$expected,$info = NULL){
+        if($value != $expected){
+            throw new Exception($info." expected ".$expected." but ".$value);
+        }
+    }
+    function run($torun = NULL){
+            $r = new ReflectionClass($this);
+        foreach($r->getMethods() as $key=>$methodObj){
+            if($methodObj->isPrivate())
+                    $methods[$key]['type'] = 'private';
+            elseif($methodObj->isProtected())
+                    $methods[$key]['type'] = 'protected';
+                else
+                    $methods[$key]['type'] = 'public';
+            $methods[$key]['name'] = $methodObj->name;
+                $methods[$key]['class'] = $methodObj->class;
+            }
         $before = NULL;
         $after = NULL;
         foreach ($methods as $method) {
-          if($method["class"] != "PUnit"&&$method["name"] == "before"){
+            if($method["class"] != "PUnit"&&$method["name"] == "before"){
             $before = $method;
-          }
-          if($method["class"] != "PUnit"&&$method["name"] == "after"){
+            }
+            if($method["class"] != "PUnit"&&$method["name"] == "after"){
             $after = $method;
-          }
+            }
         }
-       	$error = array();
-       	$success = array();
-       	foreach ($methods as $method) {
-       		if($method["class"] != "PUnit"&&substr($method["name"],0,4) == "test"){
+            $error = array();
+            $success = array();
+            foreach ($methods as $method) {
+                if($method["class"] != "PUnit"&&substr($method["name"],0,4) == "test"){
             if($torun !== NULL){
-              if(!in_array($method["name"],$torun))
+                if(!in_array($method["name"],$torun))
                 continue;
             }
-       			try{
-       				if($method["type"] == "public"){
+                    try{
+                        if($method["type"] == "public"){
                 $log = new Logger();
                 $log->info("Run unit --->".$method["name"]);
                 if($before!=NULL)
-                  $this->$before["name"]();
-       					$this->$method["name"]();
-       					array_push($success,$method["name"]);
-       				}
-       			}catch(Exception $e){
-       				$error[$method["name"]]="".$e;
-       			}
-       		}
-       	}
-       	echo "\r\nPHP Unit-----------error"."\r\n";
-       	print_r($error);
+                    $this->$before["name"]();
+                            $this->$method["name"]();
+                            array_push($success,$method["name"]);
+                        }
+                    }catch(Exception $e){
+                        $error[$method["name"]]="".$e;
+                    }
+                }
+            }
+            echo "\r\nPHP Unit-----------error"."\r\n";
+            print_r($error);
         echo "PHP Unit-----------result"."\r\n";
         echo "total:".(count($success)+count($error)).",success:".count($success).",error:".count($error)."\r\n";
 
-	}
+    }
 }
 ?>
\ No newline at end of file

src/service/taobao/bin/dingtalk/DingTalkClient.php

Indentation +322 added lines, -322 removed lines

@@ -1,27 +1,27 @@ 
 <?php
 class DingTalkClient
 {
-	/**@Author chaohui.zch copy from TopClient and modify 2016-12-14 **/
+    /**@Author chaohui.zch copy from TopClient and modify 2016-12-14 **/
 
     /**@Author chaohui.zch modify $gatewayUrl 2017-07-18 **/
     public $gatewayUrl = "https://eco.taobao.com/router/rest";
 
-	public $format = "xml";
+    public $format = "xml";
 
-	public $connectTimeout;
+    public $connectTimeout;
 
-	public $readTimeout;
+    public $readTimeout;
 
     public $apiCallType;
 
     public $httpMethod;
 
-	/** 是否打开入参check**/
-	public $checkRequest = true;
+    /** 是否打开入参check**/
+    public $checkRequest = true;
 
-	protected $apiVersion = "2.0";
+    protected $apiVersion = "2.0";
 
-	protected $sdkVersion = "dingtalk-sdk-php-20161214";
+    protected $sdkVersion = "dingtalk-sdk-php-20161214";
 
     public function __construct($apiCallType = null, $httpMethod = null, $format = "xml"){
         $this->apiCallType = $apiCallType;
@@ -29,80 +29,80 @@ 
         $this->format = $format;
     }
 
-	public function curl($url, $postFields = null)
-	{
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_FAILONERROR, false);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		if ($this->readTimeout) {
-			curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
-		}
-		if ($this->connectTimeout) {
-			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
-		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "dingtalk-sdk-php" );
-		//https 请求
-		if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-		}
-
-		if (is_array($postFields) && 0 < count($postFields))
-		{
-			$postBodyString = "";
-			$postMultipart = false;
-			foreach ($postFields as $k => $v)
-			{
-				if("@" != substr($v, 0, 1))//判断是不是文件上传
-				{
-					$postBodyString .= "$k=" . urlencode($v) . "&"; 
-				}
-				else//文件上传用multipart/form-data，否则用www-form-urlencoded
-				{
-					$postMultipart = true;
-					if(class_exists('\CURLFile')){
-						$postFields[$k] = new \CURLFile(substr($v, 1));
-					}
-				}
-			}
-			unset($k, $v);
-			curl_setopt($ch, CURLOPT_POST, true);
-			if ($postMultipart)
-			{
-				if (class_exists('\CURLFile')) {
-				    curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);
-				} else {
-				    if (defined('CURLOPT_SAFE_UPLOAD')) {
-				        curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
-				    }
-				}
-				curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
-			}
-			else
-			{
-				$header = array("content-type: application/x-www-form-urlencoded; charset=UTF-8");
-				curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
-				curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
-			}
-		}
-		$reponse = curl_exec($ch);
+    public function curl($url, $postFields = null)
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_FAILONERROR, false);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        if ($this->readTimeout) {
+            curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
+        }
+        if ($this->connectTimeout) {
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
+        }
+        curl_setopt ( $ch, CURLOPT_USERAGENT, "dingtalk-sdk-php" );
+        //https 请求
+        if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+        }
+
+        if (is_array($postFields) && 0 < count($postFields))
+        {
+            $postBodyString = "";
+            $postMultipart = false;
+            foreach ($postFields as $k => $v)
+            {
+                if("@" != substr($v, 0, 1))//判断是不是文件上传
+                {
+                    $postBodyString .= "$k=" . urlencode($v) . "&"; 
+                }
+                else//文件上传用multipart/form-data，否则用www-form-urlencoded
+                {
+                    $postMultipart = true;
+                    if(class_exists('\CURLFile')){
+                        $postFields[$k] = new \CURLFile(substr($v, 1));
+                    }
+                }
+            }
+            unset($k, $v);
+            curl_setopt($ch, CURLOPT_POST, true);
+            if ($postMultipart)
+            {
+                if (class_exists('\CURLFile')) {
+                    curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);
+                } else {
+                    if (defined('CURLOPT_SAFE_UPLOAD')) {
+                        curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
+                    }
+                }
+                curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
+            }
+            else
+            {
+                $header = array("content-type: application/x-www-form-urlencoded; charset=UTF-8");
+                curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
+                curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
+            }
+        }
+        $reponse = curl_exec($ch);
 		
-		if (curl_errno($ch))
-		{
-			throw new Exception(curl_error($ch),0);
-		}
-		else
-		{
-			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			if (200 !== $httpStatusCode)
-			{
-				throw new Exception($reponse,$httpStatusCode);
-			}
-		}
-		curl_close($ch);
-		return $reponse;
-	}
+        if (curl_errno($ch))
+        {
+            throw new Exception(curl_error($ch),0);
+        }
+        else
+        {
+            $httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            if (200 !== $httpStatusCode)
+            {
+                throw new Exception($reponse,$httpStatusCode);
+            }
+        }
+        curl_close($ch);
+        return $reponse;
+    }
 
     public function curl_get($url,$apiFields = null)
     {
@@ -234,97 +234,97 @@ 
         return $reponse;
     }
 
-	public function curl_with_memory_file($url, $postFields = null, $fileFields = null)
-	{
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_FAILONERROR, false);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		if ($this->readTimeout) {
-			curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
-		}
-		if ($this->connectTimeout) {
-			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
-		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "dingtalk-sdk-php" );
-		//https 请求
-		if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-		}
-		//生成分隔符
-		$delimiter = '-------------' . uniqid();
-		//先将post的普通数据生成主体字符串
-		$data = '';
-		if($postFields != null){
-			foreach ($postFields as $name => $content) {
-			    $data .= "--" . $delimiter . "\r\n";
-			    $data .= 'Content-Disposition: form-data; name="' . $name . '"';
-			    //multipart/form-data 不需要urlencode，参见 http:stackoverflow.com/questions/6603928/should-i-url-encode-post-data
-			    $data .= "\r\n\r\n" . $content . "\r\n";
-			}
-			unset($name,$content);
-		}
-
-		//将上传的文件生成主体字符串
-		if($fileFields != null){
-			foreach ($fileFields as $name => $file) {
-			    $data .= "--" . $delimiter . "\r\n";
-			    $data .= 'Content-Disposition: form-data; name="' . $name . '"; filename="' . $file['filename'] . "\" \r\n";
-			    $data .= 'Content-Type: ' . $file['type'] . "\r\n\r\n";//多了个文档类型
-
-			    $data .= $file['content'] . "\r\n";
-			}
-			unset($name,$file);
-		}
-		//主体结束的分隔符
-		$data .= "--" . $delimiter . "--";
-
-		curl_setopt($ch, CURLOPT_POST, true);
-		curl_setopt($ch, CURLOPT_HTTPHEADER , array(
-		    'Content-Type: multipart/form-data; boundary=' . $delimiter,
-		    'Content-Length: ' . strlen($data))
-		); 
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-
-		$reponse = curl_exec($ch);
-		unset($data);
-
-		if (curl_errno($ch))
-		{
-			throw new Exception(curl_error($ch),0);
-		}
-		else
-		{
-			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			if (200 !== $httpStatusCode)
-			{
-				throw new Exception($reponse,$httpStatusCode);
-			}
-		}
-		curl_close($ch);
-		return $reponse;
-	}
-
-	protected function logCommunicationError($apiName, $requestUrl, $errorCode, $responseTxt)
-	{
-		$localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
-		$logger = new TopLogger;
-		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_" . "_" . date("Y-m-d") . ".log";
-		$logger->conf["separator"] = "^_^";
-		$logData = array(
-		date("Y-m-d H:i:s"),
-		$apiName,
-		$localIp,
-		PHP_OS,
-		$this->sdkVersion,
-		$requestUrl,
-		$errorCode,
-		str_replace("\n","",$responseTxt)
-		);
-		$logger->log($logData);
-	}
+    public function curl_with_memory_file($url, $postFields = null, $fileFields = null)
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_FAILONERROR, false);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        if ($this->readTimeout) {
+            curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
+        }
+        if ($this->connectTimeout) {
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
+        }
+        curl_setopt ( $ch, CURLOPT_USERAGENT, "dingtalk-sdk-php" );
+        //https 请求
+        if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+        }
+        //生成分隔符
+        $delimiter = '-------------' . uniqid();
+        //先将post的普通数据生成主体字符串
+        $data = '';
+        if($postFields != null){
+            foreach ($postFields as $name => $content) {
+                $data .= "--" . $delimiter . "\r\n";
+                $data .= 'Content-Disposition: form-data; name="' . $name . '"';
+                //multipart/form-data 不需要urlencode，参见 http:stackoverflow.com/questions/6603928/should-i-url-encode-post-data
+                $data .= "\r\n\r\n" . $content . "\r\n";
+            }
+            unset($name,$content);
+        }
+
+        //将上传的文件生成主体字符串
+        if($fileFields != null){
+            foreach ($fileFields as $name => $file) {
+                $data .= "--" . $delimiter . "\r\n";
+                $data .= 'Content-Disposition: form-data; name="' . $name . '"; filename="' . $file['filename'] . "\" \r\n";
+                $data .= 'Content-Type: ' . $file['type'] . "\r\n\r\n";//多了个文档类型
+
+                $data .= $file['content'] . "\r\n";
+            }
+            unset($name,$file);
+        }
+        //主体结束的分隔符
+        $data .= "--" . $delimiter . "--";
+
+        curl_setopt($ch, CURLOPT_POST, true);
+        curl_setopt($ch, CURLOPT_HTTPHEADER , array(
+            'Content-Type: multipart/form-data; boundary=' . $delimiter,
+            'Content-Length: ' . strlen($data))
+        ); 
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+
+        $reponse = curl_exec($ch);
+        unset($data);
+
+        if (curl_errno($ch))
+        {
+            throw new Exception(curl_error($ch),0);
+        }
+        else
+        {
+            $httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            if (200 !== $httpStatusCode)
+            {
+                throw new Exception($reponse,$httpStatusCode);
+            }
+        }
+        curl_close($ch);
+        return $reponse;
+    }
+
+    protected function logCommunicationError($apiName, $requestUrl, $errorCode, $responseTxt)
+    {
+        $localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
+        $logger = new TopLogger;
+        $logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_" . "_" . date("Y-m-d") . ".log";
+        $logger->conf["separator"] = "^_^";
+        $logData = array(
+        date("Y-m-d H:i:s"),
+        $apiName,
+        $localIp,
+        PHP_OS,
+        $this->sdkVersion,
+        $requestUrl,
+        $errorCode,
+        str_replace("\n","",$responseTxt)
+        );
+        $logger->log($logData);
+    }
 
     public function execute($request, $session = null,$bestUrl = null){
         if(DingTalkConstant::$CALL_TYPE_OAPI == $this->apiCallType){
@@ -342,7 +342,7 @@ 
         return $this->executeWithCorpId($request,$bestUrl, $accessKey, $accessSecret, $suiteTicket, null);
     }
 
-	public function executeWithCorpId($request, $bestUrl = null, $accessKey, $accessSecret, $suiteTicket, $corpId) {
+    public function executeWithCorpId($request, $bestUrl = null, $accessKey, $accessSecret, $suiteTicket, $corpId) {
         if(DingTalkConstant::$CALL_TYPE_OAPI == $this->apiCallType){
             return $this->_executeOapi($request, null, $bestUrl,$accessKey, $accessSecret, $suiteTicket, $corpId);
         }else{
@@ -494,160 +494,160 @@ 
     }
 
     private function _execute($request, $session = null,$bestUrl = null)
-	{
-		$result =  new ResultSet(); 
-		if($this->checkRequest) {
-			try {
-				$request->check();
-			} catch (Exception $e) {
-
-				$result->code = $e->getCode();
-				$result->msg = $e->getMessage();
-				return $result;
-			}
-		}
-		//组装系统参数
-		$sysParams["v"] = $this->apiVersion;
-		$sysParams["format"] = $this->format;
-		$sysParams["method"] = $request->getApiMethodName();
-		$sysParams["timestamp"] = date("Y-m-d H:i:s");
-		if (null != $session)
-		{
-			$sysParams["session"] = $session;
-		}
-		$apiParams = array();
-		//获取业务参数
-		$apiParams = $request->getApiParas();
-
-
-		//系统参数放入GET请求串
-		if($bestUrl){
+    {
+        $result =  new ResultSet(); 
+        if($this->checkRequest) {
+            try {
+                $request->check();
+            } catch (Exception $e) {
+
+                $result->code = $e->getCode();
+                $result->msg = $e->getMessage();
+                return $result;
+            }
+        }
+        //组装系统参数
+        $sysParams["v"] = $this->apiVersion;
+        $sysParams["format"] = $this->format;
+        $sysParams["method"] = $request->getApiMethodName();
+        $sysParams["timestamp"] = date("Y-m-d H:i:s");
+        if (null != $session)
+        {
+            $sysParams["session"] = $session;
+        }
+        $apiParams = array();
+        //获取业务参数
+        $apiParams = $request->getApiParas();
+
+
+        //系统参数放入GET请求串
+        if($bestUrl){
             if(strpos($bestUrl,'?') === false){
                 $requestUrl = $bestUrl."?";
             }else{
                 $requestUrl = $bestUrl;
             }
-			$sysParams["partner_id"] = $this->getClusterTag();
-		}else{
-			$requestUrl = $this->gatewayUrl."?";
-			$sysParams["partner_id"] = $this->sdkVersion;
-		}
-
-		foreach ($sysParams as $sysParamKey => $sysParamValue)
-		{
-			// if(strcmp($sysParamKey,"timestamp") != 0)
-			$requestUrl .= "$sysParamKey=" . urlencode($sysParamValue) . "&";
-		}
-
-		$fileFields = array();
-		foreach ($apiParams as $key => $value) {
-			if(is_array($value) && array_key_exists('type',$value) && array_key_exists('content',$value) ){
-				$value['name'] = $key;
-				$fileFields[$key] = $value;
-				unset($apiParams[$key]);
-			}
-		}
-
-		// $requestUrl .= "timestamp=" . urlencode($sysParams["timestamp"]) . "&";
-		$requestUrl = substr($requestUrl, 0, -1);
-
-		//发起HTTP请求
-		try
-		{
-			if(count($fileFields) > 0){
-				$resp = $this->curl_with_memory_file($requestUrl, $apiParams, $fileFields);
-			}else{
-				$resp = $this->curl($requestUrl, $apiParams);
-			}
-		}
-		catch (Exception $e)
-		{
-			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
-			$result->code = $e->getCode();
-			$result->msg = $e->getMessage();
-			return $result;
-		}
-
-		unset($apiParams);
-		unset($fileFields);
-		//解析TOP返回结果
-		$respWellFormed = false;
-		if ("json" == $this->format)
-		{
-			$respObject = json_decode($resp);
-			if (null !== $respObject)
-			{
-				$respWellFormed = true;
-				foreach ($respObject as $propKey => $propValue)
-				{
-					$respObject = $propValue;
-				}
-			}
-		}
-		else if("xml" == $this->format)
-		{
-			$respObject = @simplexml_load_string($resp);
-			if (false !== $respObject)
-			{
-				$respWellFormed = true;
-			}
-		}
-
-		//返回的HTTP文本不是标准JSON或者XML，记下错误日志
-		if (false === $respWellFormed)
-		{
-			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
-			$result->code = 0;
-			$result->msg = "HTTP_RESPONSE_NOT_WELL_FORMED";
-			return $result;
-		}
-
-		//如果TOP返回了错误码，记录到业务错误日志中
-		if (isset($respObject->code))
-		{
-			$logger = new TopLogger;
-			$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_biz_err_" .  "_" . date("Y-m-d") . ".log";
-			$logger->log(array(
-				date("Y-m-d H:i:s"),
-				$resp
-			));
-		}
-		return $respObject;
-	}
-
-	public function exec($paramsArray)
-	{
-		if (!isset($paramsArray["method"]))
-		{
-			trigger_error("No api name passed");
-		}
-		$inflector = new LtInflector;
-		$inflector->conf["separator"] = ".";
-		$requestClassName = ucfirst($inflector->camelize(substr($paramsArray["method"], 7))) . "Request";
-		if (!class_exists($requestClassName))
-		{
-			trigger_error("No such dingtalk-api: " . $paramsArray["method"]);
-		}
-
-		$session = isset($paramsArray["session"]) ? $paramsArray["session"] : null;
-
-		$req = new $requestClassName;
-		foreach($paramsArray as $paraKey => $paraValue)
-		{
-			$inflector->conf["separator"] = "_";
-			$setterMethodName = $inflector->camelize($paraKey);
-			$inflector->conf["separator"] = ".";
-			$setterMethodName = "set" . $inflector->camelize($setterMethodName);
-			if (method_exists($req, $setterMethodName))
-			{
-				$req->$setterMethodName($paraValue);
-			}
-		}
-		return $this->execute($req, $session);
-	}
-
-	private function getClusterTag()
+            $sysParams["partner_id"] = $this->getClusterTag();
+        }else{
+            $requestUrl = $this->gatewayUrl."?";
+            $sysParams["partner_id"] = $this->sdkVersion;
+        }
+
+        foreach ($sysParams as $sysParamKey => $sysParamValue)
+        {
+            // if(strcmp($sysParamKey,"timestamp") != 0)
+            $requestUrl .= "$sysParamKey=" . urlencode($sysParamValue) . "&";
+        }
+
+        $fileFields = array();
+        foreach ($apiParams as $key => $value) {
+            if(is_array($value) && array_key_exists('type',$value) && array_key_exists('content',$value) ){
+                $value['name'] = $key;
+                $fileFields[$key] = $value;
+                unset($apiParams[$key]);
+            }
+        }
+
+        // $requestUrl .= "timestamp=" . urlencode($sysParams["timestamp"]) . "&";
+        $requestUrl = substr($requestUrl, 0, -1);
+
+        //发起HTTP请求
+        try
+        {
+            if(count($fileFields) > 0){
+                $resp = $this->curl_with_memory_file($requestUrl, $apiParams, $fileFields);
+            }else{
+                $resp = $this->curl($requestUrl, $apiParams);
+            }
+        }
+        catch (Exception $e)
+        {
+            $this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
+            $result->code = $e->getCode();
+            $result->msg = $e->getMessage();
+            return $result;
+        }
+
+        unset($apiParams);
+        unset($fileFields);
+        //解析TOP返回结果
+        $respWellFormed = false;
+        if ("json" == $this->format)
+        {
+            $respObject = json_decode($resp);
+            if (null !== $respObject)
+            {
+                $respWellFormed = true;
+                foreach ($respObject as $propKey => $propValue)
+                {
+                    $respObject = $propValue;
+                }
+            }
+        }
+        else if("xml" == $this->format)
+        {
+            $respObject = @simplexml_load_string($resp);
+            if (false !== $respObject)
+            {
+                $respWellFormed = true;
+            }
+        }
+
+        //返回的HTTP文本不是标准JSON或者XML，记下错误日志
+        if (false === $respWellFormed)
+        {
+            $this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
+            $result->code = 0;
+            $result->msg = "HTTP_RESPONSE_NOT_WELL_FORMED";
+            return $result;
+        }
+
+        //如果TOP返回了错误码，记录到业务错误日志中
+        if (isset($respObject->code))
+        {
+            $logger = new TopLogger;
+            $logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_biz_err_" .  "_" . date("Y-m-d") . ".log";
+            $logger->log(array(
+                date("Y-m-d H:i:s"),
+                $resp
+            ));
+        }
+        return $respObject;
+    }
+
+    public function exec($paramsArray)
+    {
+        if (!isset($paramsArray["method"]))
+        {
+            trigger_error("No api name passed");
+        }
+        $inflector = new LtInflector;
+        $inflector->conf["separator"] = ".";
+        $requestClassName = ucfirst($inflector->camelize(substr($paramsArray["method"], 7))) . "Request";
+        if (!class_exists($requestClassName))
+        {
+            trigger_error("No such dingtalk-api: " . $paramsArray["method"]);
+        }
+
+        $session = isset($paramsArray["session"]) ? $paramsArray["session"] : null;
+
+        $req = new $requestClassName;
+        foreach($paramsArray as $paraKey => $paraValue)
+        {
+            $inflector->conf["separator"] = "_";
+            $setterMethodName = $inflector->camelize($paraKey);
+            $inflector->conf["separator"] = ".";
+            $setterMethodName = "set" . $inflector->camelize($setterMethodName);
+            if (method_exists($req, $setterMethodName))
+            {
+                $req->$setterMethodName($paraValue);
+            }
+        }
+        return $this->execute($req, $session);
+    }
+
+    private function getClusterTag()
     {
-	    return substr($this->sdkVersion,0,11)."-cluster".substr($this->sdkVersion,11);
+        return substr($this->sdkVersion,0,11)."-cluster".substr($this->sdkVersion,11);
     }
 }

src/service/taobao/bin/TopSdk.php

Indentation +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
  */
 if (!defined("TOP_SDK_WORK_DIR"))
 {
-	define("TOP_SDK_WORK_DIR", "/tmp/");
+    define("TOP_SDK_WORK_DIR", "/tmp/");
 }
 
 /**
@@ -25,12 +25,12 @@ 
  */
 if (!defined("TOP_SDK_DEV_MODE"))
 {
-	define("TOP_SDK_DEV_MODE", true);
+    define("TOP_SDK_DEV_MODE", true);
 }
 
 if (!defined("TOP_AUTOLOADER_PATH"))
 {
-	define("TOP_AUTOLOADER_PATH", dirname(__FILE__));
+    define("TOP_AUTOLOADER_PATH", dirname(__FILE__));
 }
 
 /**

src/service/taobao/bin/QimenCloud/QimenCloudClient.php

Indentation +375 added lines, -375 removed lines

@@ -1,384 +1,384 @@
 <?php
 class QimenCloudClient
 {
-	public $appkey;
+    public $appkey;
 
-	public $secretKey;
+    public $secretKey;
 	
-	public $targetAppkey = "";
-
-	public $gatewayUrl = null;
-
-	public $format = "xml";
-
-	public $connectTimeout;
-
-	public $readTimeout;
-
-	/** 是否打开入参check**/
-	public $checkRequest = true;
-
-	protected $signMethod = "md5";
-
-	protected $apiVersion = "2.0";
-
-	protected $sdkVersion = "top-sdk-php-20151012";
-
-	public function getAppkey()
-	{
-		return $this->appkey;
-	}
-
-	public function __construct($appkey = "",$secretKey = ""){
-		$this->appkey = $appkey;
-		$this->secretKey = $secretKey ;
-	}
-
-	protected function generateSign($params)
-	{
-		ksort($params);
-
-		$stringToBeSigned = $this->secretKey;
-		foreach ($params as $k => $v)
-		{
-			if(!is_array($v) && "@" != substr($v, 0, 1))
-			{
-				$stringToBeSigned .= "$k$v";
-			}
-		}
-		unset($k, $v);
-		$stringToBeSigned .= $this->secretKey;
-
-		return strtoupper(md5($stringToBeSigned));
-	}
-
-	public function curl($url, $postFields = null)
-	{
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_FAILONERROR, false);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		if ($this->readTimeout) {
-			curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
-		}
-		if ($this->connectTimeout) {
-			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
-		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
-		//https 请求
-		if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-		}
-
-		if (is_array($postFields) && 0 < count($postFields))
-		{
-			$postBodyString = "";
-			$postMultipart = false;
-			foreach ($postFields as $k => $v)
-			{
-				if("@" != substr($v, 0, 1))//判断是不是文件上传
-				{
-					$postBodyString .= "$k=" . urlencode($v) . "&"; 
-				}
-				else//文件上传用multipart/form-data，否则用www-form-urlencoded
-				{
-					$postMultipart = true;
-					if(class_exists('\CURLFile')){
-						$postFields[$k] = new \CURLFile(substr($v, 1));
-					}
-				}
-			}
-			unset($k, $v);
-			curl_setopt($ch, CURLOPT_POST, true);
-			if ($postMultipart)
-			{
-				if (class_exists('\CURLFile')) {
-				    curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);
-				} else {
-				    if (defined('CURLOPT_SAFE_UPLOAD')) {
-				        curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
-				    }
-				}
-				curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
-			}
-			else
-			{
-				$header = array("content-type: application/x-www-form-urlencoded; charset=UTF-8");
-				curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
-				curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
-			}
-		}
-		$reponse = curl_exec($ch);
+    public $targetAppkey = "";
+
+    public $gatewayUrl = null;
+
+    public $format = "xml";
+
+    public $connectTimeout;
+
+    public $readTimeout;
+
+    /** 是否打开入参check**/
+    public $checkRequest = true;
+
+    protected $signMethod = "md5";
+
+    protected $apiVersion = "2.0";
+
+    protected $sdkVersion = "top-sdk-php-20151012";
+
+    public function getAppkey()
+    {
+        return $this->appkey;
+    }
+
+    public function __construct($appkey = "",$secretKey = ""){
+        $this->appkey = $appkey;
+        $this->secretKey = $secretKey ;
+    }
+
+    protected function generateSign($params)
+    {
+        ksort($params);
+
+        $stringToBeSigned = $this->secretKey;
+        foreach ($params as $k => $v)
+        {
+            if(!is_array($v) && "@" != substr($v, 0, 1))
+            {
+                $stringToBeSigned .= "$k$v";
+            }
+        }
+        unset($k, $v);
+        $stringToBeSigned .= $this->secretKey;
+
+        return strtoupper(md5($stringToBeSigned));
+    }
+
+    public function curl($url, $postFields = null)
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_FAILONERROR, false);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        if ($this->readTimeout) {
+            curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
+        }
+        if ($this->connectTimeout) {
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
+        }
+        curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
+        //https 请求
+        if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+        }
+
+        if (is_array($postFields) && 0 < count($postFields))
+        {
+            $postBodyString = "";
+            $postMultipart = false;
+            foreach ($postFields as $k => $v)
+            {
+                if("@" != substr($v, 0, 1))//判断是不是文件上传
+                {
+                    $postBodyString .= "$k=" . urlencode($v) . "&"; 
+                }
+                else//文件上传用multipart/form-data，否则用www-form-urlencoded
+                {
+                    $postMultipart = true;
+                    if(class_exists('\CURLFile')){
+                        $postFields[$k] = new \CURLFile(substr($v, 1));
+                    }
+                }
+            }
+            unset($k, $v);
+            curl_setopt($ch, CURLOPT_POST, true);
+            if ($postMultipart)
+            {
+                if (class_exists('\CURLFile')) {
+                    curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);
+                } else {
+                    if (defined('CURLOPT_SAFE_UPLOAD')) {
+                        curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
+                    }
+                }
+                curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
+            }
+            else
+            {
+                $header = array("content-type: application/x-www-form-urlencoded; charset=UTF-8");
+                curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
+                curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
+            }
+        }
+        $reponse = curl_exec($ch);
 		
-		if (curl_errno($ch))
-		{
-			throw new Exception(curl_error($ch),0);
-		}
-		else
-		{
-			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			if (200 !== $httpStatusCode)
-			{
-				throw new Exception($reponse,$httpStatusCode);
-			}
-		}
-		curl_close($ch);
-		return $reponse;
-	}
-	public function curl_with_memory_file($url, $postFields = null, $fileFields = null)
-	{
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_FAILONERROR, false);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		if ($this->readTimeout) {
-			curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
-		}
-		if ($this->connectTimeout) {
-			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
-		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
-		//https 请求
-		if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-		}
-		//生成分隔符
-		$delimiter = '-------------' . uniqid();
-		//先将post的普通数据生成主体字符串
-		$data = '';
-		if($postFields != null){
-			foreach ($postFields as $name => $content) {
-			    $data .= "--" . $delimiter . "\r\n";
-			    $data .= 'Content-Disposition: form-data; name="' . $name . '"';
-			    //multipart/form-data 不需要urlencode，参见 http:stackoverflow.com/questions/6603928/should-i-url-encode-post-data
-			    $data .= "\r\n\r\n" . $content . "\r\n";
-			}
-			unset($name,$content);
-		}
-
-		//将上传的文件生成主体字符串
-		if($fileFields != null){
-			foreach ($fileFields as $name => $file) {
-			    $data .= "--" . $delimiter . "\r\n";
-			    $data .= 'Content-Disposition: form-data; name="' . $name . '"; filename="' . $file['name'] . "\" \r\n";
-			    $data .= 'Content-Type: ' . $file['type'] . "\r\n\r\n";//多了个文档类型
-
-			    $data .= $file['content'] . "\r\n";
-			}
-			unset($name,$file);
-		}
-		//主体结束的分隔符
-		$data .= "--" . $delimiter . "--";
-
-		curl_setopt($ch, CURLOPT_POST, true);
-		curl_setopt($ch, CURLOPT_HTTPHEADER , array(
-		    'Content-Type: multipart/form-data; boundary=' . $delimiter,
-		    'Content-Length: ' . strlen($data))
-		); 
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-
-		$reponse = curl_exec($ch);
-		unset($data);
-
-		if (curl_errno($ch))
-		{
-			throw new Exception(curl_error($ch),0);
-		}
-		else
-		{
-			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			if (200 !== $httpStatusCode)
-			{
-				throw new Exception($reponse,$httpStatusCode);
-			}
-		}
-		curl_close($ch);
-		return $reponse;
-	}
-
-	protected function logCommunicationError($apiName, $requestUrl, $errorCode, $responseTxt)
-	{
-		$localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
-		$logger = new TopLogger;
-		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_" . $this->appkey . "_" . date("Y-m-d") . ".log";
-		$logger->conf["separator"] = "^_^";
-		$logData = array(
-		date("Y-m-d H:i:s"),
-		$apiName,
-		$this->appkey,
-		$localIp,
-		PHP_OS,
-		$this->sdkVersion,
-		$requestUrl,
-		$errorCode,
-		str_replace("\n","",$responseTxt)
-		);
-		$logger->log($logData);
-	}
-
-	public function execute($request, $session = null,$bestUrl = null)
-	{
-		if($this->gatewayUrl == null) {
-			throw new Exception("client-check-error:Need Set gatewayUrl.", 40);
-		}
-
-		$result =  new ResultSet(); 
-		if($this->checkRequest) {
-			try {
-				$request->check();
-			} catch (Exception $e) {
-
-				$result->code = $e->getCode();
-				$result->msg = $e->getMessage();
-				return $result;
-			}
-		}
-		//组装系统参数
-		$sysParams["app_key"] = $this->appkey;
-		$sysParams["v"] = $this->apiVersion;
-		$sysParams["format"] = $this->format;
-		$sysParams["sign_method"] = $this->signMethod;
-		$sysParams["method"] = $request->getApiMethodName();
-		$sysParams["timestamp"] = date("Y-m-d H:i:s");
-		$sysParams["target_app_key"] = $this->targetAppkey;
-		if (null != $session)
-		{
-			$sysParams["session"] = $session;
-		}
-		$apiParams = array();
-		//获取业务参数
-		$apiParams = $request->getApiParas();
-
-
-		//系统参数放入GET请求串
-		if($bestUrl){
-			$requestUrl = $bestUrl."?";
-			$sysParams["partner_id"] = $this->getClusterTag();
-		}else{
-			$requestUrl = $this->gatewayUrl."?";
-			$sysParams["partner_id"] = $this->sdkVersion;
-		}
-		//签名
-		$sysParams["sign"] = $this->generateSign(array_merge($apiParams, $sysParams));
-
-		foreach ($sysParams as $sysParamKey => $sysParamValue)
-		{
-			// if(strcmp($sysParamKey,"timestamp") != 0)
-			$requestUrl .= "$sysParamKey=" . urlencode($sysParamValue) . "&";
-		}
-
-		$fileFields = array();
-		foreach ($apiParams as $key => $value) {
-			if(is_array($value) && array_key_exists('type',$value) && array_key_exists('content',$value) ){
-				$value['name'] = $key;
-				$fileFields[$key] = $value;
-				unset($apiParams[$key]);
-			}
-		}
-
-		// $requestUrl .= "timestamp=" . urlencode($sysParams["timestamp"]) . "&";
-		$requestUrl = substr($requestUrl, 0, -1);
-
-		//发起HTTP请求
-		try
-		{
-			if(count($fileFields) > 0){
-				$resp = $this->curl_with_memory_file($requestUrl, $apiParams, $fileFields);
-			}else{
-				$resp = $this->curl($requestUrl, $apiParams);
-			}
-		}
-		catch (Exception $e)
-		{
-			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
-			$result->code = $e->getCode();
-			$result->msg = $e->getMessage();
-			return $result;
-		}
-
-		unset($apiParams);
-		unset($fileFields);
-		//解析TOP返回结果
-		$respWellFormed = false;
-		if ("json" == $this->format)
-		{
-			$respObject = json_decode($resp);
-			if (null !== $respObject)
-			{
-				$respWellFormed = true;
-				foreach ($respObject as $propKey => $propValue)
-				{
-					$respObject = $propValue;
-				}
-			}
-		}
-		else if("xml" == $this->format)
-		{
-			$respObject = @simplexml_load_string($resp);
-			if (false !== $respObject)
-			{
-				$respWellFormed = true;
-			}
-		}
-
-		//返回的HTTP文本不是标准JSON或者XML，记下错误日志
-		if (false === $respWellFormed)
-		{
-			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
-			$result->code = 0;
-			$result->msg = "HTTP_RESPONSE_NOT_WELL_FORMED";
-			return $result;
-		}
-
-		//如果TOP返回了错误码，记录到业务错误日志中
-		if (isset($respObject->code))
-		{
-			$logger = new TopLogger;
-			$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_biz_err_" . $this->appkey . "_" . date("Y-m-d") . ".log";
-			$logger->log(array(
-				date("Y-m-d H:i:s"),
-				$resp
-			));
-		}
-		return $respObject;
-	}
-
-	public function exec($paramsArray)
-	{
-		if (!isset($paramsArray["method"]))
-		{
-			trigger_error("No api name passed");
-		}
-		$inflector = new LtInflector;
-		$inflector->conf["separator"] = ".";
-		$requestClassName = ucfirst($inflector->camelize(substr($paramsArray["method"], 7))) . "Request";
-		if (!class_exists($requestClassName))
-		{
-			trigger_error("No such api: " . $paramsArray["method"]);
-		}
-
-		$session = isset($paramsArray["session"]) ? $paramsArray["session"] : null;
-
-		$req = new $requestClassName;
-		foreach($paramsArray as $paraKey => $paraValue)
-		{
-			$inflector->conf["separator"] = "_";
-			$setterMethodName = $inflector->camelize($paraKey);
-			$inflector->conf["separator"] = ".";
-			$setterMethodName = "set" . $inflector->camelize($setterMethodName);
-			if (method_exists($req, $setterMethodName))
-			{
-				$req->$setterMethodName($paraValue);
-			}
-		}
-		return $this->execute($req, $session);
-	}
-
-	private function getClusterTag()
+        if (curl_errno($ch))
+        {
+            throw new Exception(curl_error($ch),0);
+        }
+        else
+        {
+            $httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            if (200 !== $httpStatusCode)
+            {
+                throw new Exception($reponse,$httpStatusCode);
+            }
+        }
+        curl_close($ch);
+        return $reponse;
+    }
+    public function curl_with_memory_file($url, $postFields = null, $fileFields = null)
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_FAILONERROR, false);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        if ($this->readTimeout) {
+            curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
+        }
+        if ($this->connectTimeout) {
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
+        }
+        curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
+        //https 请求
+        if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+        }
+        //生成分隔符
+        $delimiter = '-------------' . uniqid();
+        //先将post的普通数据生成主体字符串
+        $data = '';
+        if($postFields != null){
+            foreach ($postFields as $name => $content) {
+                $data .= "--" . $delimiter . "\r\n";
+                $data .= 'Content-Disposition: form-data; name="' . $name . '"';
+                //multipart/form-data 不需要urlencode，参见 http:stackoverflow.com/questions/6603928/should-i-url-encode-post-data
+                $data .= "\r\n\r\n" . $content . "\r\n";
+            }
+            unset($name,$content);
+        }
+
+        //将上传的文件生成主体字符串
+        if($fileFields != null){
+            foreach ($fileFields as $name => $file) {
+                $data .= "--" . $delimiter . "\r\n";
+                $data .= 'Content-Disposition: form-data; name="' . $name . '"; filename="' . $file['name'] . "\" \r\n";
+                $data .= 'Content-Type: ' . $file['type'] . "\r\n\r\n";//多了个文档类型
+
+                $data .= $file['content'] . "\r\n";
+            }
+            unset($name,$file);
+        }
+        //主体结束的分隔符
+        $data .= "--" . $delimiter . "--";
+
+        curl_setopt($ch, CURLOPT_POST, true);
+        curl_setopt($ch, CURLOPT_HTTPHEADER , array(
+            'Content-Type: multipart/form-data; boundary=' . $delimiter,
+            'Content-Length: ' . strlen($data))
+        ); 
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+
+        $reponse = curl_exec($ch);
+        unset($data);
+
+        if (curl_errno($ch))
+        {
+            throw new Exception(curl_error($ch),0);
+        }
+        else
+        {
+            $httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            if (200 !== $httpStatusCode)
+            {
+                throw new Exception($reponse,$httpStatusCode);
+            }
+        }
+        curl_close($ch);
+        return $reponse;
+    }
+
+    protected function logCommunicationError($apiName, $requestUrl, $errorCode, $responseTxt)
+    {
+        $localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
+        $logger = new TopLogger;
+        $logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_" . $this->appkey . "_" . date("Y-m-d") . ".log";
+        $logger->conf["separator"] = "^_^";
+        $logData = array(
+        date("Y-m-d H:i:s"),
+        $apiName,
+        $this->appkey,
+        $localIp,
+        PHP_OS,
+        $this->sdkVersion,
+        $requestUrl,
+        $errorCode,
+        str_replace("\n","",$responseTxt)
+        );
+        $logger->log($logData);
+    }
+
+    public function execute($request, $session = null,$bestUrl = null)
+    {
+        if($this->gatewayUrl == null) {
+            throw new Exception("client-check-error:Need Set gatewayUrl.", 40);
+        }
+
+        $result =  new ResultSet(); 
+        if($this->checkRequest) {
+            try {
+                $request->check();
+            } catch (Exception $e) {
+
+                $result->code = $e->getCode();
+                $result->msg = $e->getMessage();
+                return $result;
+            }
+        }
+        //组装系统参数
+        $sysParams["app_key"] = $this->appkey;
+        $sysParams["v"] = $this->apiVersion;
+        $sysParams["format"] = $this->format;
+        $sysParams["sign_method"] = $this->signMethod;
+        $sysParams["method"] = $request->getApiMethodName();
+        $sysParams["timestamp"] = date("Y-m-d H:i:s");
+        $sysParams["target_app_key"] = $this->targetAppkey;
+        if (null != $session)
+        {
+            $sysParams["session"] = $session;
+        }
+        $apiParams = array();
+        //获取业务参数
+        $apiParams = $request->getApiParas();
+
+
+        //系统参数放入GET请求串
+        if($bestUrl){
+            $requestUrl = $bestUrl."?";
+            $sysParams["partner_id"] = $this->getClusterTag();
+        }else{
+            $requestUrl = $this->gatewayUrl."?";
+            $sysParams["partner_id"] = $this->sdkVersion;
+        }
+        //签名
+        $sysParams["sign"] = $this->generateSign(array_merge($apiParams, $sysParams));
+
+        foreach ($sysParams as $sysParamKey => $sysParamValue)
+        {
+            // if(strcmp($sysParamKey,"timestamp") != 0)
+            $requestUrl .= "$sysParamKey=" . urlencode($sysParamValue) . "&";
+        }
+
+        $fileFields = array();
+        foreach ($apiParams as $key => $value) {
+            if(is_array($value) && array_key_exists('type',$value) && array_key_exists('content',$value) ){
+                $value['name'] = $key;
+                $fileFields[$key] = $value;
+                unset($apiParams[$key]);
+            }
+        }
+
+        // $requestUrl .= "timestamp=" . urlencode($sysParams["timestamp"]) . "&";
+        $requestUrl = substr($requestUrl, 0, -1);
+
+        //发起HTTP请求
+        try
+        {
+            if(count($fileFields) > 0){
+                $resp = $this->curl_with_memory_file($requestUrl, $apiParams, $fileFields);
+            }else{
+                $resp = $this->curl($requestUrl, $apiParams);
+            }
+        }
+        catch (Exception $e)
+        {
+            $this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
+            $result->code = $e->getCode();
+            $result->msg = $e->getMessage();
+            return $result;
+        }
+
+        unset($apiParams);
+        unset($fileFields);
+        //解析TOP返回结果
+        $respWellFormed = false;
+        if ("json" == $this->format)
+        {
+            $respObject = json_decode($resp);
+            if (null !== $respObject)
+            {
+                $respWellFormed = true;
+                foreach ($respObject as $propKey => $propValue)
+                {
+                    $respObject = $propValue;
+                }
+            }
+        }
+        else if("xml" == $this->format)
+        {
+            $respObject = @simplexml_load_string($resp);
+            if (false !== $respObject)
+            {
+                $respWellFormed = true;
+            }
+        }
+
+        //返回的HTTP文本不是标准JSON或者XML，记下错误日志
+        if (false === $respWellFormed)
+        {
+            $this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
+            $result->code = 0;
+            $result->msg = "HTTP_RESPONSE_NOT_WELL_FORMED";
+            return $result;
+        }
+
+        //如果TOP返回了错误码，记录到业务错误日志中
+        if (isset($respObject->code))
+        {
+            $logger = new TopLogger;
+            $logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_biz_err_" . $this->appkey . "_" . date("Y-m-d") . ".log";
+            $logger->log(array(
+                date("Y-m-d H:i:s"),
+                $resp
+            ));
+        }
+        return $respObject;
+    }
+
+    public function exec($paramsArray)
+    {
+        if (!isset($paramsArray["method"]))
+        {
+            trigger_error("No api name passed");
+        }
+        $inflector = new LtInflector;
+        $inflector->conf["separator"] = ".";
+        $requestClassName = ucfirst($inflector->camelize(substr($paramsArray["method"], 7))) . "Request";
+        if (!class_exists($requestClassName))
+        {
+            trigger_error("No such api: " . $paramsArray["method"]);
+        }
+
+        $session = isset($paramsArray["session"]) ? $paramsArray["session"] : null;
+
+        $req = new $requestClassName;
+        foreach($paramsArray as $paraKey => $paraValue)
+        {
+            $inflector->conf["separator"] = "_";
+            $setterMethodName = $inflector->camelize($paraKey);
+            $inflector->conf["separator"] = ".";
+            $setterMethodName = "set" . $inflector->camelize($setterMethodName);
+            if (method_exists($req, $setterMethodName))
+            {
+                $req->$setterMethodName($paraValue);
+            }
+        }
+        return $this->execute($req, $session);
+    }
+
+    private function getClusterTag()
     {
-	    return substr($this->sdkVersion,0,11)."-cluster".substr($this->sdkVersion,11);
+        return substr($this->sdkVersion,0,11)."-cluster".substr($this->sdkVersion,11);
     }
 }

src/service/taobao/bin/top/HttpdnsGetRequest.php

Indentation +14 added lines, -14 removed lines

@@ -2,22 +2,22 @@
 
 class HttpdnsGetRequest
 {
-	private $apiParas = array();
+    private $apiParas = array();
 	
-	public function getApiMethodName()
-	{
-		return "taobao.httpdns.get";
-	}
+    public function getApiMethodName()
+    {
+        return "taobao.httpdns.get";
+    }
 	
-	public function getApiParas()
-	{
-		return $this->apiParas;
-	}
+    public function getApiParas()
+    {
+        return $this->apiParas;
+    }
 	
-	public function check(){}
+    public function check(){}
 	
-	public function putOtherTextParam($key, $value) {
-		$this->apiParas[$key] = $value;
-		$this->$key = $value;
-	}
+    public function putOtherTextParam($key, $value) {
+        $this->apiParas[$key] = $value;
+        $this->$key = $value;
+    }
 }

src/service/taobao/bin/top/SpiUtils.php

Indentation +214 added lines, -214 removed lines

@@ -1,219 +1,219 @@
 <?php
 class SpiUtils{
-	private static $top_sign_list = "HTTP_TOP_SIGN_LIST";
-	private static $timestamp = "timestamp";
-	private static $header_real_ip = array("X_Real_IP", "X_Forwarded_For", "Proxy_Client_IP",
-											"WL_Proxy_Client_IP", "HTTP_CLIENT_IP", "HTTP_X_FORWARDED_FOR");
-	/**
-	 * 校验SPI请求签名，适用于所有GET请求，及不包含文件参数的POST请求。
-	 * 
-	 * @param request 请求对象
-	 * @param secret app对应的secret
-	 * @return true：校验通过；false：校验不通过
-	 */
-	public static function checkSign4FormRequest($secret){
-		return self::checkSign(null,null,$secret);
-	}
-
-	/**
-	 * 校验SPI请求签名，适用于请求体是xml/json等可用文本表示的POST请求。
-	 * 
-	 * @param request 请求对象
-	 * @param body 请求体的文本内容
-	 * @param secret app对应的secret
-	 * @return true：校验通过；false：校验不通过
-	 */
-	public static function checkSign4TextRequest($body,$secret){
-		return self::checkSign(null,$body,$secret);
-	}
+    private static $top_sign_list = "HTTP_TOP_SIGN_LIST";
+    private static $timestamp = "timestamp";
+    private static $header_real_ip = array("X_Real_IP", "X_Forwarded_For", "Proxy_Client_IP",
+                                            "WL_Proxy_Client_IP", "HTTP_CLIENT_IP", "HTTP_X_FORWARDED_FOR");
+    /**
+     * 校验SPI请求签名，适用于所有GET请求，及不包含文件参数的POST请求。
+     * 
+     * @param request 请求对象
+     * @param secret app对应的secret
+     * @return true：校验通过；false：校验不通过
+     */
+    public static function checkSign4FormRequest($secret){
+        return self::checkSign(null,null,$secret);
+    }
+
+    /**
+     * 校验SPI请求签名，适用于请求体是xml/json等可用文本表示的POST请求。
+     * 
+     * @param request 请求对象
+     * @param body 请求体的文本内容
+     * @param secret app对应的secret
+     * @return true：校验通过；false：校验不通过
+     */
+    public static function checkSign4TextRequest($body,$secret){
+        return self::checkSign(null,$body,$secret);
+    }
 	
-	/**
-	 * 校验SPI请求签名，适用于带文件上传的POST请求。
-	 * 
-	 * @param request 请求对象
-	 * @param form 除了文件参数以外的所有普通文本参数的map集合
-	 * @param secret app对应的secret
-	 * @return true：校验通过；false：校验不通过
-	 */
-	public static function checkSign4FileRequest($form, $secret){
-		return self::checkSign($form, null, $secret);
-	}
-
-	private static function checkSign($form, $body, $secret) {
-		$params = array();
-		// 1. 获取header参数
-		$headerMap = self::getHeaderMap();
-		foreach ($headerMap as $k => $v){
-			$params[$k] = $v ;
-		}
-
-		// 2. 获取url参数
-		$queryMap = self::getQueryMap();
-		foreach ($queryMap as $k => $v){
-			$params[$k] = $v ;
-		}
-
-		// 3. 获取form参数
-		if ($form == null && $body == null) {
-			$formMap = self::getFormMap();
-			foreach ($formMap as $k => $v){
-				$params[$k] = $v ;
-			}
-		} else if ($form != null) {
-			foreach ($form as $k => $v){
-				$params[$k] = $v ;
-			}
-		}
-
-		if($body == null){
-			$body = file_get_contents('php://input');
-		}
-
-		$remoteSign = $queryMap["sign"];
-		$localSign = self::sign($params, $body, $secret);
-		if (strcmp($remoteSign, $localSign) == 0) {
-			return true;
-		} else {
-			$paramStr = self::getParamStrFromMap($params);
-			self::logCommunicationError($remoteSign,$localSign,$paramStr,$body);
-			return false;
-		}
-	}
-
-	private static function getHeaderMap() {
-		$headerMap = array();
-		$signList = $_SERVER['HTTP_TOP_SIGN_LIST']; // 只获取参与签名的头部字段
-
-		if(!$signList) {
-			return $headerMap;
-		}
-
-		$signList = trim($signList);
-		if (strlen($signList) > 0){
-			$params = split(",", $signList);
-			foreach ($_SERVER as $k => $v){
-				if (substr($k, 0, 5) == 'HTTP_'){
-					foreach($params as $kk){
-						$upperkey = strtoupper($kk);
-						if(self::endWith($k,$upperkey)){
-							$headerMap[$kk] = $v;
-						}
-					}
-				}
-			}
-		}
-		return $headerMap;
-	}
-
-	private static function getQueryMap(){
-		$queryStr = $_SERVER["QUERY_STRING"];
-		$resultArray = array();
-		foreach (explode('&', $queryStr) as $pair) {
-		    list($key, $value) = explode('=', $pair);
-		    if (strpos($key, '.') !== false) {
-		        list($subKey, $subVal) = explode('.', $key);
-
-		        if (preg_match('/(?P<name>\w+)\[(?P<index>\w+)\]/', $subKey, $matches)) {
-		            $resultArray[$matches['name']][$matches['index']][$subVal] = $value;
-		        } else {
-		            $resultArray[$subKey][$subVal] = urldecode($value);
-		        }
-		    } else {
-		        $resultArray[$key] = urldecode($value);
-		    }
-		}
-		return $resultArray;
-	}
-
-	private static function checkRemoteIp(){
-		$remoteIp = $_SERVER["REMOTE_ADDR"];
-		foreach ($header_real_ip as $k){
-			$realIp = $_SERVER[$k];
-			$realIp = trim($realIp);
-			if(strlen($realIp) > 0 && strcasecmp("unknown",$realIp)){
-				$remoteIp = $realIp;
-				break;
-			}
-		}
-		return self::startsWith($remoteIp,"140.205.144.") || self::startsWith($remoteIp,"40.205.145.");
-	}
-
-	private static function getFormMap(){
-		$resultArray = array();
-		foreach($_POST as $key=>$v) { 
-			$resultArray[$key] = $v ;
-		}
-		return $resultArray ;	
-	}
-
-	private static function startsWith($haystack, $needle) {
-    	return $needle === "" || strpos($haystack, $needle) === 0;
-	}
-
-	private static function endWith($haystack, $needle) {   
-	    $length = strlen($needle);  
-	    if($length == 0)
-	    {    
-	        return true;  
-	    }  
-	    return (substr($haystack, -$length) === $needle);
- 	}
-
-	private static function checkTimestamp(){
-		$ts = $_POST['timestamp'];
-		if($ts){
-			$clientTimestamp = strtotime($ts);
-			$current = $_SERVER['REQUEST_TIME'];
-			return ($current - $clientTimestamp) <= 5*60*1000;
-		}else{
-			return false;
-		}
-	}
-
-	private static function getParamStrFromMap($params){
-		ksort($params);
-		$stringToBeSigned = "";
-		foreach ($params as $k => $v)
-		{
-			if(strcmp("sign", $k) != 0)
-			{
-				$stringToBeSigned .= "$k$v";
-			}
-		}
-		unset($k, $v);
-		return $stringToBeSigned;
-	}
-
-	private static function sign($params,$body,$secret){
-		ksort($params);
-
-		$stringToBeSigned = $secret;
-		$stringToBeSigned .= self::getParamStrFromMap($params);
-
-		if($body)
-			$stringToBeSigned .= $body;
-		$stringToBeSigned .= $secret;
-		return strtoupper(md5($stringToBeSigned));
-	}
-
-	protected static function logCommunicationError($remoteSign, $localSign, $paramStr, $body)
-	{
-		$localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
-		$logger = new TopLogger;
-		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_". date("Y-m-d") . ".log";
-		$logger->conf["separator"] = "^_^";
-		$logData = array(
-		"checkTopSign error" ,
-		"remoteSign=".$remoteSign ,
-		"localSign=".$localSign ,
-		"paramStr=".$paramStr ,
-		"body=".$body
-		);
-		$logger->log($logData);
-	}
-	private static function clear_blank($str, $glue='')
-	{
-		$replace = array(" ", "\r", "\n", "\t"); return str_replace($replace, $glue, $str);
-	}
+    /**
+     * 校验SPI请求签名，适用于带文件上传的POST请求。
+     * 
+     * @param request 请求对象
+     * @param form 除了文件参数以外的所有普通文本参数的map集合
+     * @param secret app对应的secret
+     * @return true：校验通过；false：校验不通过
+     */
+    public static function checkSign4FileRequest($form, $secret){
+        return self::checkSign($form, null, $secret);
+    }
+
+    private static function checkSign($form, $body, $secret) {
+        $params = array();
+        // 1. 获取header参数
+        $headerMap = self::getHeaderMap();
+        foreach ($headerMap as $k => $v){
+            $params[$k] = $v ;
+        }
+
+        // 2. 获取url参数
+        $queryMap = self::getQueryMap();
+        foreach ($queryMap as $k => $v){
+            $params[$k] = $v ;
+        }
+
+        // 3. 获取form参数
+        if ($form == null && $body == null) {
+            $formMap = self::getFormMap();
+            foreach ($formMap as $k => $v){
+                $params[$k] = $v ;
+            }
+        } else if ($form != null) {
+            foreach ($form as $k => $v){
+                $params[$k] = $v ;
+            }
+        }
+
+        if($body == null){
+            $body = file_get_contents('php://input');
+        }
+
+        $remoteSign = $queryMap["sign"];
+        $localSign = self::sign($params, $body, $secret);
+        if (strcmp($remoteSign, $localSign) == 0) {
+            return true;
+        } else {
+            $paramStr = self::getParamStrFromMap($params);
+            self::logCommunicationError($remoteSign,$localSign,$paramStr,$body);
+            return false;
+        }
+    }
+
+    private static function getHeaderMap() {
+        $headerMap = array();
+        $signList = $_SERVER['HTTP_TOP_SIGN_LIST']; // 只获取参与签名的头部字段
+
+        if(!$signList) {
+            return $headerMap;
+        }
+
+        $signList = trim($signList);
+        if (strlen($signList) > 0){
+            $params = split(",", $signList);
+            foreach ($_SERVER as $k => $v){
+                if (substr($k, 0, 5) == 'HTTP_'){
+                    foreach($params as $kk){
+                        $upperkey = strtoupper($kk);
+                        if(self::endWith($k,$upperkey)){
+                            $headerMap[$kk] = $v;
+                        }
+                    }
+                }
+            }
+        }
+        return $headerMap;
+    }
+
+    private static function getQueryMap(){
+        $queryStr = $_SERVER["QUERY_STRING"];
+        $resultArray = array();
+        foreach (explode('&', $queryStr) as $pair) {
+            list($key, $value) = explode('=', $pair);
+            if (strpos($key, '.') !== false) {
+                list($subKey, $subVal) = explode('.', $key);
+
+                if (preg_match('/(?P<name>\w+)\[(?P<index>\w+)\]/', $subKey, $matches)) {
+                    $resultArray[$matches['name']][$matches['index']][$subVal] = $value;
+                } else {
+                    $resultArray[$subKey][$subVal] = urldecode($value);
+                }
+            } else {
+                $resultArray[$key] = urldecode($value);
+            }
+        }
+        return $resultArray;
+    }
+
+    private static function checkRemoteIp(){
+        $remoteIp = $_SERVER["REMOTE_ADDR"];
+        foreach ($header_real_ip as $k){
+            $realIp = $_SERVER[$k];
+            $realIp = trim($realIp);
+            if(strlen($realIp) > 0 && strcasecmp("unknown",$realIp)){
+                $remoteIp = $realIp;
+                break;
+            }
+        }
+        return self::startsWith($remoteIp,"140.205.144.") || self::startsWith($remoteIp,"40.205.145.");
+    }
+
+    private static function getFormMap(){
+        $resultArray = array();
+        foreach($_POST as $key=>$v) { 
+            $resultArray[$key] = $v ;
+        }
+        return $resultArray ;	
+    }
+
+    private static function startsWith($haystack, $needle) {
+        return $needle === "" || strpos($haystack, $needle) === 0;
+    }
+
+    private static function endWith($haystack, $needle) {   
+        $length = strlen($needle);  
+        if($length == 0)
+        {    
+            return true;  
+        }  
+        return (substr($haystack, -$length) === $needle);
+        }
+
+    private static function checkTimestamp(){
+        $ts = $_POST['timestamp'];
+        if($ts){
+            $clientTimestamp = strtotime($ts);
+            $current = $_SERVER['REQUEST_TIME'];
+            return ($current - $clientTimestamp) <= 5*60*1000;
+        }else{
+            return false;
+        }
+    }
+
+    private static function getParamStrFromMap($params){
+        ksort($params);
+        $stringToBeSigned = "";
+        foreach ($params as $k => $v)
+        {
+            if(strcmp("sign", $k) != 0)
+            {
+                $stringToBeSigned .= "$k$v";
+            }
+        }
+        unset($k, $v);
+        return $stringToBeSigned;
+    }
+
+    private static function sign($params,$body,$secret){
+        ksort($params);
+
+        $stringToBeSigned = $secret;
+        $stringToBeSigned .= self::getParamStrFromMap($params);
+
+        if($body)
+            $stringToBeSigned .= $body;
+        $stringToBeSigned .= $secret;
+        return strtoupper(md5($stringToBeSigned));
+    }
+
+    protected static function logCommunicationError($remoteSign, $localSign, $paramStr, $body)
+    {
+        $localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
+        $logger = new TopLogger;
+        $logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_". date("Y-m-d") . ".log";
+        $logger->conf["separator"] = "^_^";
+        $logData = array(
+        "checkTopSign error" ,
+        "remoteSign=".$remoteSign ,
+        "localSign=".$localSign ,
+        "paramStr=".$paramStr ,
+        "body=".$body
+        );
+        $logger->log($logData);
+    }
+    private static function clear_blank($str, $glue='')
+    {
+        $replace = array(" ", "\r", "\n", "\t"); return str_replace($replace, $glue, $str);
+    }
 }
 ?>
\ No newline at end of file

src/service/taobao/bin/top/TopClient.php

Indentation +370 added lines, -370 removed lines

@@ -1,377 +1,377 @@
 <?php
 class TopClient
 {
-	public $appkey;
-
-	public $secretKey;
-
-	public $gatewayUrl = "http://gw.api.taobao.com/router/rest";
-
-	public $format = "xml";
-
-	public $connectTimeout;
-
-	public $readTimeout;
-
-	/** 是否打开入参check**/
-	public $checkRequest = true;
-
-	protected $signMethod = "md5";
-
-	protected $apiVersion = "2.0";
-
-	protected $sdkVersion = "top-sdk-php-20180326";
-
-	public function getAppkey()
-	{
-		return $this->appkey;
-	}
-
-	public function __construct($appkey = "",$secretKey = ""){
-		$this->appkey = $appkey;
-		$this->secretKey = $secretKey ;
-	}
-
-	protected function generateSign($params)
-	{
-		ksort($params);
-
-		$stringToBeSigned = $this->secretKey;
-		foreach ($params as $k => $v)
-		{
-			if(!is_array($v) && "@" != substr($v, 0, 1))
-			{
-				$stringToBeSigned .= "$k$v";
-			}
-		}
-		unset($k, $v);
-		$stringToBeSigned .= $this->secretKey;
-
-		return strtoupper(md5($stringToBeSigned));
-	}
-
-	public function curl($url, $postFields = null)
-	{
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_FAILONERROR, false);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		if ($this->readTimeout) {
-			curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
-		}
-		if ($this->connectTimeout) {
-			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
-		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
-		//https 请求
-		if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-		}
-
-		if (is_array($postFields) && 0 < count($postFields))
-		{
-			$postBodyString = "";
-			$postMultipart = false;
-			foreach ($postFields as $k => $v)
-			{
-				if("@" != substr($v, 0, 1))//判断是不是文件上传
-				{
-					$postBodyString .= "$k=" . urlencode($v) . "&"; 
-				}
-				else//文件上传用multipart/form-data，否则用www-form-urlencoded
-				{
-					$postMultipart = true;
-					if(class_exists('\CURLFile')){
-						$postFields[$k] = new \CURLFile(substr($v, 1));
-					}
-				}
-			}
-			unset($k, $v);
-			curl_setopt($ch, CURLOPT_POST, true);
-			if ($postMultipart)
-			{
-				if (class_exists('\CURLFile')) {
-				    curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);
-				} else {
-				    if (defined('CURLOPT_SAFE_UPLOAD')) {
-				        curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
-				    }
-				}
-				curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
-			}
-			else
-			{
-				$header = array("content-type: application/x-www-form-urlencoded; charset=UTF-8");
-				curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
-				curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
-			}
-		}
-		$reponse = curl_exec($ch);
+    public $appkey;
+
+    public $secretKey;
+
+    public $gatewayUrl = "http://gw.api.taobao.com/router/rest";
+
+    public $format = "xml";
+
+    public $connectTimeout;
+
+    public $readTimeout;
+
+    /** 是否打开入参check**/
+    public $checkRequest = true;
+
+    protected $signMethod = "md5";
+
+    protected $apiVersion = "2.0";
+
+    protected $sdkVersion = "top-sdk-php-20180326";
+
+    public function getAppkey()
+    {
+        return $this->appkey;
+    }
+
+    public function __construct($appkey = "",$secretKey = ""){
+        $this->appkey = $appkey;
+        $this->secretKey = $secretKey ;
+    }
+
+    protected function generateSign($params)
+    {
+        ksort($params);
+
+        $stringToBeSigned = $this->secretKey;
+        foreach ($params as $k => $v)
+        {
+            if(!is_array($v) && "@" != substr($v, 0, 1))
+            {
+                $stringToBeSigned .= "$k$v";
+            }
+        }
+        unset($k, $v);
+        $stringToBeSigned .= $this->secretKey;
+
+        return strtoupper(md5($stringToBeSigned));
+    }
+
+    public function curl($url, $postFields = null)
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_FAILONERROR, false);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        if ($this->readTimeout) {
+            curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
+        }
+        if ($this->connectTimeout) {
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
+        }
+        curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
+        //https 请求
+        if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+        }
+
+        if (is_array($postFields) && 0 < count($postFields))
+        {
+            $postBodyString = "";
+            $postMultipart = false;
+            foreach ($postFields as $k => $v)
+            {
+                if("@" != substr($v, 0, 1))//判断是不是文件上传
+                {
+                    $postBodyString .= "$k=" . urlencode($v) . "&"; 
+                }
+                else//文件上传用multipart/form-data，否则用www-form-urlencoded
+                {
+                    $postMultipart = true;
+                    if(class_exists('\CURLFile')){
+                        $postFields[$k] = new \CURLFile(substr($v, 1));
+                    }
+                }
+            }
+            unset($k, $v);
+            curl_setopt($ch, CURLOPT_POST, true);
+            if ($postMultipart)
+            {
+                if (class_exists('\CURLFile')) {
+                    curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);
+                } else {
+                    if (defined('CURLOPT_SAFE_UPLOAD')) {
+                        curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
+                    }
+                }
+                curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
+            }
+            else
+            {
+                $header = array("content-type: application/x-www-form-urlencoded; charset=UTF-8");
+                curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
+                curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
+            }
+        }
+        $reponse = curl_exec($ch);
 		
-		if (curl_errno($ch))
-		{
-			throw new Exception(curl_error($ch),0);
-		}
-		else
-		{
-			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			if (200 !== $httpStatusCode)
-			{
-				throw new Exception($reponse,$httpStatusCode);
-			}
-		}
-		curl_close($ch);
-		return $reponse;
-	}
-	public function curl_with_memory_file($url, $postFields = null, $fileFields = null)
-	{
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_FAILONERROR, false);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		if ($this->readTimeout) {
-			curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
-		}
-		if ($this->connectTimeout) {
-			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
-		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
-		//https 请求
-		if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-		}
-		//生成分隔符
-		$delimiter = '-------------' . uniqid();
-		//先将post的普通数据生成主体字符串
-		$data = '';
-		if($postFields != null){
-			foreach ($postFields as $name => $content) {
-			    $data .= "--" . $delimiter . "\r\n";
-			    $data .= 'Content-Disposition: form-data; name="' . $name . '"';
-			    //multipart/form-data 不需要urlencode，参见 http:stackoverflow.com/questions/6603928/should-i-url-encode-post-data
-			    $data .= "\r\n\r\n" . $content . "\r\n";
-			}
-			unset($name,$content);
-		}
-
-		//将上传的文件生成主体字符串
-		if($fileFields != null){
-			foreach ($fileFields as $name => $file) {
-			    $data .= "--" . $delimiter . "\r\n";
-			    $data .= 'Content-Disposition: form-data; name="' . $name . '"; filename="' . $file['name'] . "\" \r\n";
-			    $data .= 'Content-Type: ' . $file['type'] . "\r\n\r\n";//多了个文档类型
-
-			    $data .= $file['content'] . "\r\n";
-			}
-			unset($name,$file);
-		}
-		//主体结束的分隔符
-		$data .= "--" . $delimiter . "--";
-
-		curl_setopt($ch, CURLOPT_POST, true);
-		curl_setopt($ch, CURLOPT_HTTPHEADER , array(
-		    'Content-Type: multipart/form-data; boundary=' . $delimiter,
-		    'Content-Length: ' . strlen($data))
-		); 
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-
-		$reponse = curl_exec($ch);
-		unset($data);
-
-		if (curl_errno($ch))
-		{
-			throw new Exception(curl_error($ch),0);
-		}
-		else
-		{
-			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			if (200 !== $httpStatusCode)
-			{
-				throw new Exception($reponse,$httpStatusCode);
-			}
-		}
-		curl_close($ch);
-		return $reponse;
-	}
-
-	protected function logCommunicationError($apiName, $requestUrl, $errorCode, $responseTxt)
-	{
-		$localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
-		$logger = new TopLogger;
-		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_" . $this->appkey . "_" . date("Y-m-d") . ".log";
-		$logger->conf["separator"] = "^_^";
-		$logData = array(
-		date("Y-m-d H:i:s"),
-		$apiName,
-		$this->appkey,
-		$localIp,
-		PHP_OS,
-		$this->sdkVersion,
-		$requestUrl,
-		$errorCode,
-		str_replace("\n","",$responseTxt)
-		);
-		$logger->log($logData);
-	}
-
-	public function execute($request, $session = null,$bestUrl = null)
-	{
-		$result =  new ResultSet(); 
-		if($this->checkRequest) {
-			try {
-				$request->check();
-			} catch (Exception $e) {
-
-				$result->code = $e->getCode();
-				$result->msg = $e->getMessage();
-				return $result;
-			}
-		}
-		//组装系统参数
-		$sysParams["app_key"] = $this->appkey;
-		$sysParams["v"] = $this->apiVersion;
-		$sysParams["format"] = $this->format;
-		$sysParams["sign_method"] = $this->signMethod;
-		$sysParams["method"] = $request->getApiMethodName();
-		$sysParams["timestamp"] = date("Y-m-d H:i:s");
-		if (null != $session)
-		{
-			$sysParams["session"] = $session;
-		}
-		$apiParams = array();
-		//获取业务参数
-		$apiParams = $request->getApiParas();
-
-
-		//系统参数放入GET请求串
-		if($bestUrl){
-			$requestUrl = $bestUrl."?";
-			$sysParams["partner_id"] = $this->getClusterTag();
-		}else{
-			$requestUrl = $this->gatewayUrl."?";
-			$sysParams["partner_id"] = $this->sdkVersion;
-		}
-		//签名
-		$sysParams["sign"] = $this->generateSign(array_merge($apiParams, $sysParams));
-
-		foreach ($sysParams as $sysParamKey => $sysParamValue)
-		{
-			// if(strcmp($sysParamKey,"timestamp") != 0)
-			$requestUrl .= "$sysParamKey=" . urlencode($sysParamValue) . "&";
-		}
-
-		$fileFields = array();
-		foreach ($apiParams as $key => $value) {
-			if(is_array($value) && array_key_exists('type',$value) && array_key_exists('content',$value) ){
-				$value['name'] = $key;
-				$fileFields[$key] = $value;
-				unset($apiParams[$key]);
-			}
-		}
-
-		// $requestUrl .= "timestamp=" . urlencode($sysParams["timestamp"]) . "&";
-		$requestUrl = substr($requestUrl, 0, -1);
-
-		//发起HTTP请求
-		try
-		{
-			if(count($fileFields) > 0){
-				$resp = $this->curl_with_memory_file($requestUrl, $apiParams, $fileFields);
-			}else{
-				$resp = $this->curl($requestUrl, $apiParams);
-			}
-		}
-		catch (Exception $e)
-		{
-			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
-			$result->code = $e->getCode();
-			$result->msg = $e->getMessage();
-			return $result;
-		}
-
-		unset($apiParams);
-		unset($fileFields);
-		//解析TOP返回结果
-		$respWellFormed = false;
-		if ("json" == $this->format)
-		{
-			$respObject = json_decode($resp);
-			if (null !== $respObject)
-			{
-				$respWellFormed = true;
-				foreach ($respObject as $propKey => $propValue)
-				{
-					$respObject = $propValue;
-				}
-			}
-		}
-		else if("xml" == $this->format)
-		{
-			$respObject = @simplexml_load_string($resp);
-			if (false !== $respObject)
-			{
-				$respWellFormed = true;
-			}
-		}
-
-		//返回的HTTP文本不是标准JSON或者XML，记下错误日志
-		if (false === $respWellFormed)
-		{
-			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
-			$result->code = 0;
-			$result->msg = "HTTP_RESPONSE_NOT_WELL_FORMED";
-			return $result;
-		}
-
-		//如果TOP返回了错误码，记录到业务错误日志中
-		if (isset($respObject->code))
-		{
-			$logger = new TopLogger;
-			$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_biz_err_" . $this->appkey . "_" . date("Y-m-d") . ".log";
-			$logger->log(array(
-				date("Y-m-d H:i:s"),
-				$resp
-			));
-		}
-		return $respObject;
-	}
-
-	public function exec($paramsArray)
-	{
-		if (!isset($paramsArray["method"]))
-		{
-			trigger_error("No api name passed");
-		}
-		$inflector = new LtInflector;
-		$inflector->conf["separator"] = ".";
-		$requestClassName = ucfirst($inflector->camelize(substr($paramsArray["method"], 7))) . "Request";
-		if (!class_exists($requestClassName))
-		{
-			trigger_error("No such api: " . $paramsArray["method"]);
-		}
-
-		$session = isset($paramsArray["session"]) ? $paramsArray["session"] : null;
-
-		$req = new $requestClassName;
-		foreach($paramsArray as $paraKey => $paraValue)
-		{
-			$inflector->conf["separator"] = "_";
-			$setterMethodName = $inflector->camelize($paraKey);
-			$inflector->conf["separator"] = ".";
-			$setterMethodName = "set" . $inflector->camelize($setterMethodName);
-			if (method_exists($req, $setterMethodName))
-			{
-				$req->$setterMethodName($paraValue);
-			}
-		}
-		return $this->execute($req, $session);
-	}
-
-	private function getClusterTag()
+        if (curl_errno($ch))
+        {
+            throw new Exception(curl_error($ch),0);
+        }
+        else
+        {
+            $httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            if (200 !== $httpStatusCode)
+            {
+                throw new Exception($reponse,$httpStatusCode);
+            }
+        }
+        curl_close($ch);
+        return $reponse;
+    }
+    public function curl_with_memory_file($url, $postFields = null, $fileFields = null)
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_FAILONERROR, false);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        if ($this->readTimeout) {
+            curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
+        }
+        if ($this->connectTimeout) {
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
+        }
+        curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
+        //https 请求
+        if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+        }
+        //生成分隔符
+        $delimiter = '-------------' . uniqid();
+        //先将post的普通数据生成主体字符串
+        $data = '';
+        if($postFields != null){
+            foreach ($postFields as $name => $content) {
+                $data .= "--" . $delimiter . "\r\n";
+                $data .= 'Content-Disposition: form-data; name="' . $name . '"';
+                //multipart/form-data 不需要urlencode，参见 http:stackoverflow.com/questions/6603928/should-i-url-encode-post-data
+                $data .= "\r\n\r\n" . $content . "\r\n";
+            }
+            unset($name,$content);
+        }
+
+        //将上传的文件生成主体字符串
+        if($fileFields != null){
+            foreach ($fileFields as $name => $file) {
+                $data .= "--" . $delimiter . "\r\n";
+                $data .= 'Content-Disposition: form-data; name="' . $name . '"; filename="' . $file['name'] . "\" \r\n";
+                $data .= 'Content-Type: ' . $file['type'] . "\r\n\r\n";//多了个文档类型
+
+                $data .= $file['content'] . "\r\n";
+            }
+            unset($name,$file);
+        }
+        //主体结束的分隔符
+        $data .= "--" . $delimiter . "--";
+
+        curl_setopt($ch, CURLOPT_POST, true);
+        curl_setopt($ch, CURLOPT_HTTPHEADER , array(
+            'Content-Type: multipart/form-data; boundary=' . $delimiter,
+            'Content-Length: ' . strlen($data))
+        ); 
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+
+        $reponse = curl_exec($ch);
+        unset($data);
+
+        if (curl_errno($ch))
+        {
+            throw new Exception(curl_error($ch),0);
+        }
+        else
+        {
+            $httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            if (200 !== $httpStatusCode)
+            {
+                throw new Exception($reponse,$httpStatusCode);
+            }
+        }
+        curl_close($ch);
+        return $reponse;
+    }
+
+    protected function logCommunicationError($apiName, $requestUrl, $errorCode, $responseTxt)
+    {
+        $localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
+        $logger = new TopLogger;
+        $logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_" . $this->appkey . "_" . date("Y-m-d") . ".log";
+        $logger->conf["separator"] = "^_^";
+        $logData = array(
+        date("Y-m-d H:i:s"),
+        $apiName,
+        $this->appkey,
+        $localIp,
+        PHP_OS,
+        $this->sdkVersion,
+        $requestUrl,
+        $errorCode,
+        str_replace("\n","",$responseTxt)
+        );
+        $logger->log($logData);
+    }
+
+    public function execute($request, $session = null,$bestUrl = null)
+    {
+        $result =  new ResultSet(); 
+        if($this->checkRequest) {
+            try {
+                $request->check();
+            } catch (Exception $e) {
+
+                $result->code = $e->getCode();
+                $result->msg = $e->getMessage();
+                return $result;
+            }
+        }
+        //组装系统参数
+        $sysParams["app_key"] = $this->appkey;
+        $sysParams["v"] = $this->apiVersion;
+        $sysParams["format"] = $this->format;
+        $sysParams["sign_method"] = $this->signMethod;
+        $sysParams["method"] = $request->getApiMethodName();
+        $sysParams["timestamp"] = date("Y-m-d H:i:s");
+        if (null != $session)
+        {
+            $sysParams["session"] = $session;
+        }
+        $apiParams = array();
+        //获取业务参数
+        $apiParams = $request->getApiParas();
+
+
+        //系统参数放入GET请求串
+        if($bestUrl){
+            $requestUrl = $bestUrl."?";
+            $sysParams["partner_id"] = $this->getClusterTag();
+        }else{
+            $requestUrl = $this->gatewayUrl."?";
+            $sysParams["partner_id"] = $this->sdkVersion;
+        }
+        //签名
+        $sysParams["sign"] = $this->generateSign(array_merge($apiParams, $sysParams));
+
+        foreach ($sysParams as $sysParamKey => $sysParamValue)
+        {
+            // if(strcmp($sysParamKey,"timestamp") != 0)
+            $requestUrl .= "$sysParamKey=" . urlencode($sysParamValue) . "&";
+        }
+
+        $fileFields = array();
+        foreach ($apiParams as $key => $value) {
+            if(is_array($value) && array_key_exists('type',$value) && array_key_exists('content',$value) ){
+                $value['name'] = $key;
+                $fileFields[$key] = $value;
+                unset($apiParams[$key]);
+            }
+        }
+
+        // $requestUrl .= "timestamp=" . urlencode($sysParams["timestamp"]) . "&";
+        $requestUrl = substr($requestUrl, 0, -1);
+
+        //发起HTTP请求
+        try
+        {
+            if(count($fileFields) > 0){
+                $resp = $this->curl_with_memory_file($requestUrl, $apiParams, $fileFields);
+            }else{
+                $resp = $this->curl($requestUrl, $apiParams);
+            }
+        }
+        catch (Exception $e)
+        {
+            $this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
+            $result->code = $e->getCode();
+            $result->msg = $e->getMessage();
+            return $result;
+        }
+
+        unset($apiParams);
+        unset($fileFields);
+        //解析TOP返回结果
+        $respWellFormed = false;
+        if ("json" == $this->format)
+        {
+            $respObject = json_decode($resp);
+            if (null !== $respObject)
+            {
+                $respWellFormed = true;
+                foreach ($respObject as $propKey => $propValue)
+                {
+                    $respObject = $propValue;
+                }
+            }
+        }
+        else if("xml" == $this->format)
+        {
+            $respObject = @simplexml_load_string($resp);
+            if (false !== $respObject)
+            {
+                $respWellFormed = true;
+            }
+        }
+
+        //返回的HTTP文本不是标准JSON或者XML，记下错误日志
+        if (false === $respWellFormed)
+        {
+            $this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
+            $result->code = 0;
+            $result->msg = "HTTP_RESPONSE_NOT_WELL_FORMED";
+            return $result;
+        }
+
+        //如果TOP返回了错误码，记录到业务错误日志中
+        if (isset($respObject->code))
+        {
+            $logger = new TopLogger;
+            $logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_biz_err_" . $this->appkey . "_" . date("Y-m-d") . ".log";
+            $logger->log(array(
+                date("Y-m-d H:i:s"),
+                $resp
+            ));
+        }
+        return $respObject;
+    }
+
+    public function exec($paramsArray)
+    {
+        if (!isset($paramsArray["method"]))
+        {
+            trigger_error("No api name passed");
+        }
+        $inflector = new LtInflector;
+        $inflector->conf["separator"] = ".";
+        $requestClassName = ucfirst($inflector->camelize(substr($paramsArray["method"], 7))) . "Request";
+        if (!class_exists($requestClassName))
+        {
+            trigger_error("No such api: " . $paramsArray["method"]);
+        }
+
+        $session = isset($paramsArray["session"]) ? $paramsArray["session"] : null;
+
+        $req = new $requestClassName;
+        foreach($paramsArray as $paraKey => $paraValue)
+        {
+            $inflector->conf["separator"] = "_";
+            $setterMethodName = $inflector->camelize($paraKey);
+            $inflector->conf["separator"] = ".";
+            $setterMethodName = "set" . $inflector->camelize($setterMethodName);
+            if (method_exists($req, $setterMethodName))
+            {
+                $req->$setterMethodName($paraValue);
+            }
+        }
+        return $this->execute($req, $session);
+    }
+
+    private function getClusterTag()
     {
-	    return substr($this->sdkVersion,0,11)."-cluster".substr($this->sdkVersion,11);
+        return substr($this->sdkVersion,0,11)."-cluster".substr($this->sdkVersion,11);
     }
 }